fix mypy (#267)

* better default types

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* more mypy fixes

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* more fixes for mypy

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix mypy;

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix mypy;

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* I have generated the latest API!

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/build-test.yml

@@ -22,6 +22,7 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         python-version: [3.8, 3.9]
 

generate/generate.py

@@ -82,6 +82,7 @@ client = ClientFromEnv()
 
     f = open(examples_test_path, "w")
     f.write("import pytest\n\n")
+    f.write("import datetime\n\n")
     f.write("\n\n".join(examples))
     f.close()
 
@@ -140,7 +141,12 @@ def generatePaths(cwd: str, parser: dict) -> dict:
 
 
 def generateTypeAndExamplePython(
-    name: str, schema: dict, data: dict, import_path: Optional[str], tag: Optional[str]
+    name: str,
+    schema: dict,
+    data: dict,
+    import_path: Optional[str],
+    tag: Optional[str],
+    wrapper: Optional[str] = None,
 ) -> Tuple[str, str, str]:
     parameter_type = ""
     parameter_example = ""
@@ -173,6 +179,64 @@ def generateTypeAndExamplePython(
             else:
                 parameter_type = "str"
                 parameter_example = '"<uuid>"'
+        if "format" in schema and schema["format"] == "date-time":
+            if name != "":
+                parameter_type = name
+                if import_path is None:
+                    example_imports = example_imports + (
+                        "from kittycad.models."
+                        + camel_to_snake(parameter_type)
+                        + " import "
+                        + parameter_type
+                        + "\n"
+                    )
+                else:
+                    example_imports = example_imports + (
+                        "from kittycad.models."
+                        + ip
+                        + " import "
+                        + parameter_type
+                        + "\n"
+                    )
+
+                parameter_example = parameter_type + "(datetime.datetime.now())"
+            else:
+                parameter_type = "datetime"
+                parameter_example = "datetime.datetime.now()"
+        elif "format" in schema and schema["format"] == "byte":
+            if name != "":
+                parameter_type = name
+                if import_path is None:
+                    example_imports = example_imports + (
+                        "from kittycad.models."
+                        + camel_to_snake(parameter_type)
+                        + " import "
+                        + parameter_type
+                        + "\n"
+                    )
+                else:
+                    example_imports = example_imports + (
+                        "from kittycad.models."
+                        + ip
+                        + " import "
+                        + parameter_type
+                        + "\n"
+                    )
+
+                example_imports = (
+                    example_imports
+                    + "from kittycad.models.base64data import Base64Data\n"
+                )
+
+                parameter_example = parameter_type + 'Base64Data(b"<bytes>")'
+            else:
+                example_imports = (
+                    example_imports
+                    + "from kittycad.models.base64data import Base64Data\n"
+                )
+                parameter_type = "Base64Data"
+                parameter_example = 'Base64Data(b"<bytes>")'
+
         elif (
             schema["type"] == "string" and "enum" in schema and len(schema["enum"]) > 0
         ):
@@ -300,6 +364,13 @@ def generateTypeAndExamplePython(
                     )
 
             parameter_example = parameter_example + ")"
+
+            if wrapper is not None:
+                if wrapper != "WebSocketRequest":
+                    example_imports = example_imports + (
+                        "from kittycad.models." + ip + " import " + wrapper + "\n"
+                    )
+                    parameter_example = wrapper + "(" + parameter_example + ")"
         elif (
             schema["type"] == "object"
             and "additionalProperties" in schema
@@ -346,6 +417,7 @@ def generateTypeAndExamplePython(
                 data,
                 camel_to_snake(name),
                 tag,
+                name,
             )
         else:
             return generateTypeAndExamplePython(name, one_of, data, None, None)
@@ -1670,12 +1742,20 @@ def generateObjectTypeCode(
                 field_type = getTypeName(property_schema)
                 if property_name not in required:
                     if "default" in property_schema:
-                        field_type += (
+                        if field_type == "str":
-                            ' = "' + property_schema["default"] + '"'
+                            field_type += ' = "' + property_schema["default"] + '"'
-                            if field_type == "str"
+                        elif isinstance(property_schema["default"], str):
-                            or isinstance(property_schema["default"], str)
+                            field_type += (
-                            else " = " + str(property_schema["default"])
+                                ' = "' + property_schema["default"] + '" # type: ignore'
-                        )
+                            )
+                        elif "allOf" in property_schema:
+                            field_type += (
+                                " = "
+                                + str(property_schema["default"])
+                                + " # type: ignore"
+                            )
+                        else:
+                            field_type += " = " + str(property_schema["default"])
                     else:
                         field_type = "Optional[" + field_type + "] = None"
                 field2: FieldType = {

generate/object.py.jinja2

@@ -1,4 +1,5 @@
 import datetime
+import json
 from typing import List, Optional, Dict, Union, Any, Literal
 from uuid import UUID
 

generate/run.sh

@@ -22,7 +22,7 @@ poetry run python generate/generate.py
 poetry run isort .
 poetry run ruff check --fix .
 poetry run ruff format
-poetry run mypy . --exclude venv || true
+poetry run mypy .
 
 
 # Run the tests.

kittycad/examples_test.py

@@ -1,3 +1,4 @@
+import datetime
 from typing import List, Optional, Union
 
 import pytest
@@ -220,14 +221,15 @@ from kittycad.models.add_org_member import AddOrgMember
 from kittycad.models.api_call_query_group_by import ApiCallQueryGroupBy
 from kittycad.models.api_call_status import ApiCallStatus
 from kittycad.models.api_token_uuid import ApiTokenUuid
+from kittycad.models.base64data import Base64Data
 from kittycad.models.billing_info import BillingInfo
 from kittycad.models.code_language import CodeLanguage
 from kittycad.models.created_at_sort_mode import CreatedAtSortMode
 from kittycad.models.email_authentication_form import EmailAuthenticationForm
-from kittycad.models.event import modeling_app_event
+from kittycad.models.event import Event, modeling_app_event
 from kittycad.models.file_export_format import FileExportFormat
 from kittycad.models.file_import_format import FileImportFormat
-from kittycad.models.idp_metadata_source import base64_encoded_xml
+from kittycad.models.idp_metadata_source import IdpMetadataSource, base64_encoded_xml
 from kittycad.models.kcl_code_completion_params import KclCodeCompletionParams
 from kittycad.models.kcl_code_completion_request import KclCodeCompletionRequest
 from kittycad.models.ml_feedback import MlFeedback
@@ -251,7 +253,7 @@ from kittycad.models.source_position import SourcePosition
 from kittycad.models.source_range import SourceRange
 from kittycad.models.source_range_prompt import SourceRangePrompt
 from kittycad.models.store_coupon_params import StoreCouponParams
-from kittycad.models.subscription_tier_price import per_user
+from kittycad.models.subscription_tier_price import SubscriptionTierPrice, per_user
 from kittycad.models.text_to_cad_create_body import TextToCadCreateBody
 from kittycad.models.text_to_cad_iteration_body import TextToCadIterationBody
 from kittycad.models.unit_angle import UnitAngle
@@ -573,7 +575,7 @@ def test_get_api_call():
 
     result: Optional[Union[ApiCallWithPrice, Error]] = get_api_call.sync(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     if isinstance(result, Error) or result is None:
@@ -587,7 +589,7 @@ def test_get_api_call():
     response: Response[Optional[Union[ApiCallWithPrice, Error]]] = (
         get_api_call.sync_detailed(
             client=client,
-            id="<uuid>",
+            id="<string>",
         )
     )
 
@@ -601,7 +603,7 @@ async def test_get_api_call_async():
 
     result: Optional[Union[ApiCallWithPrice, Error]] = await get_api_call.asyncio(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     # OR run async with more info
@@ -609,7 +611,7 @@ async def test_get_api_call_async():
         Optional[Union[ApiCallWithPrice, Error]]
     ] = await get_api_call.asyncio_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -820,7 +822,7 @@ def test_get_async_operation():
         ]
     ] = get_async_operation.sync(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     if isinstance(result, Error) or result is None:
@@ -856,7 +858,7 @@ def test_get_async_operation():
         ]
     ] = get_async_operation.sync_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -881,7 +883,7 @@ async def test_get_async_operation_async():
         ]
     ] = await get_async_operation.asyncio(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     # OR run async with more info
@@ -901,7 +903,7 @@ async def test_get_async_operation_async():
         ]
     ] = await get_async_operation.asyncio_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -1020,7 +1022,7 @@ def test_get_auth_saml():
 
     result: Optional[Error] = get_auth_saml.sync(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         callback_url=None,  # Optional[str]
     )
 
@@ -1034,7 +1036,7 @@ def test_get_auth_saml():
     # OR if you need more info (e.g. status_code)
     response: Response[Optional[Error]] = get_auth_saml.sync_detailed(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         callback_url=None,  # Optional[str]
     )
 
@@ -1048,14 +1050,14 @@ async def test_get_auth_saml_async():
 
     result: Optional[Error] = await get_auth_saml.asyncio(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         callback_url=None,  # Optional[str]
     )
 
     # OR run async with more info
     response: Response[Optional[Error]] = await get_auth_saml.asyncio_detailed(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         callback_url=None,  # Optional[str]
     )
 
@@ -1067,7 +1069,7 @@ def test_post_auth_saml():
 
     result: Optional[Error] = post_auth_saml.sync(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         body=bytes("some bytes", "utf-8"),
     )
 
@@ -1081,7 +1083,7 @@ def test_post_auth_saml():
     # OR if you need more info (e.g. status_code)
     response: Response[Optional[Error]] = post_auth_saml.sync_detailed(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         body=bytes("some bytes", "utf-8"),
     )
 
@@ -1095,14 +1097,14 @@ async def test_post_auth_saml_async():
 
     result: Optional[Error] = await post_auth_saml.asyncio(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         body=bytes("some bytes", "utf-8"),
     )
 
     # OR run async with more info
     response: Response[Optional[Error]] = await post_auth_saml.asyncio_detailed(
         client=client,
-        provider_id=Uuid("<uuid>"),
+        provider_id=Uuid("<string>"),
         body=bytes("some bytes", "utf-8"),
     )
 
@@ -1157,12 +1159,14 @@ def test_create_event():
 
     result: Optional[Error] = create_event.sync(
         client=client,
-        body=modeling_app_event(
+        body=Event(
-            created_at="<string>",
+            modeling_app_event(
-            event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
+                created_at=datetime.datetime.now(),
-            project_name="<string>",
+                event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
-            source_id="<uuid>",
+                project_name="<string>",
-            user_id="<string>",
+                source_id="<string>",
+                user_id="<string>",
+            )
         ),
     )
 
@@ -1176,12 +1180,14 @@ def test_create_event():
     # OR if you need more info (e.g. status_code)
     response: Response[Optional[Error]] = create_event.sync_detailed(
         client=client,
-        body=modeling_app_event(
+        body=Event(
-            created_at="<string>",
+            modeling_app_event(
-            event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
+                created_at=datetime.datetime.now(),
-            project_name="<string>",
+                event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
-            source_id="<uuid>",
+                project_name="<string>",
-            user_id="<string>",
+                source_id="<string>",
+                user_id="<string>",
+            )
         ),
     )
 
@@ -1195,24 +1201,28 @@ async def test_create_event_async():
 
     result: Optional[Error] = await create_event.asyncio(
         client=client,
-        body=modeling_app_event(
+        body=Event(
-            created_at="<string>",
+            modeling_app_event(
-            event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
+                created_at=datetime.datetime.now(),
-            project_name="<string>",
+                event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
-            source_id="<uuid>",
+                project_name="<string>",
-            user_id="<string>",
+                source_id="<string>",
+                user_id="<string>",
+            )
         ),
     )
 
     # OR run async with more info
     response: Response[Optional[Error]] = await create_event.asyncio_detailed(
         client=client,
-        body=modeling_app_event(
+        body=Event(
-            created_at="<string>",
+            modeling_app_event(
-            event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
+                created_at=datetime.datetime.now(),
-            project_name="<string>",
+                event_type=ModelingAppEventType.SUCCESSFUL_COMPILE_BEFORE_CLOSE,
-            source_id="<uuid>",
+                project_name="<string>",
-            user_id="<string>",
+                source_id="<string>",
+                user_id="<string>",
+            )
         ),
     )
 
@@ -1776,7 +1786,7 @@ def test_get_ml_prompt():
 
     result: Optional[Union[MlPrompt, Error]] = get_ml_prompt.sync(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     if isinstance(result, Error) or result is None:
@@ -1789,7 +1799,7 @@ def test_get_ml_prompt():
     # OR if you need more info (e.g. status_code)
     response: Response[Optional[Union[MlPrompt, Error]]] = get_ml_prompt.sync_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -1802,7 +1812,7 @@ async def test_get_ml_prompt_async():
 
     result: Optional[Union[MlPrompt, Error]] = await get_ml_prompt.asyncio(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     # OR run async with more info
@@ -1810,7 +1820,7 @@ async def test_get_ml_prompt_async():
         Optional[Union[MlPrompt, Error]]
     ] = await get_ml_prompt.asyncio_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -2282,7 +2292,7 @@ def test_get_api_call_for_org():
 
     result: Optional[Union[ApiCallWithPrice, Error]] = get_api_call_for_org.sync(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     if isinstance(result, Error) or result is None:
@@ -2296,7 +2306,7 @@ def test_get_api_call_for_org():
     response: Response[Optional[Union[ApiCallWithPrice, Error]]] = (
         get_api_call_for_org.sync_detailed(
             client=client,
-            id="<uuid>",
+            id="<string>",
         )
     )
 
@@ -2312,7 +2322,7 @@ async def test_get_api_call_for_org_async():
         Union[ApiCallWithPrice, Error]
     ] = await get_api_call_for_org.asyncio(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     # OR run async with more info
@@ -2320,7 +2330,7 @@ async def test_get_api_call_for_org_async():
         Optional[Union[ApiCallWithPrice, Error]]
     ] = await get_api_call_for_org.asyncio_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -2451,7 +2461,7 @@ def test_get_org_member():
 
     result: Optional[Union[OrgMember, Error]] = get_org_member.sync(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
     )
 
     if isinstance(result, Error) or result is None:
@@ -2465,7 +2475,7 @@ def test_get_org_member():
     response: Response[Optional[Union[OrgMember, Error]]] = (
         get_org_member.sync_detailed(
             client=client,
-            user_id=Uuid("<uuid>"),
+            user_id=Uuid("<string>"),
         )
     )
 
@@ -2479,7 +2489,7 @@ async def test_get_org_member_async():
 
     result: Optional[Union[OrgMember, Error]] = await get_org_member.asyncio(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
     )
 
     # OR run async with more info
@@ -2487,7 +2497,7 @@ async def test_get_org_member_async():
         Optional[Union[OrgMember, Error]]
     ] = await get_org_member.asyncio_detailed(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
     )
 
 
@@ -2498,7 +2508,7 @@ def test_update_org_member():
 
     result: Optional[Union[OrgMember, Error]] = update_org_member.sync(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
         body=UpdateMemberToOrgBody(
             role=UserOrgRole.ADMIN,
         ),
@@ -2515,7 +2525,7 @@ def test_update_org_member():
     response: Response[Optional[Union[OrgMember, Error]]] = (
         update_org_member.sync_detailed(
             client=client,
-            user_id=Uuid("<uuid>"),
+            user_id=Uuid("<string>"),
             body=UpdateMemberToOrgBody(
                 role=UserOrgRole.ADMIN,
             ),
@@ -2532,7 +2542,7 @@ async def test_update_org_member_async():
 
     result: Optional[Union[OrgMember, Error]] = await update_org_member.asyncio(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
         body=UpdateMemberToOrgBody(
             role=UserOrgRole.ADMIN,
         ),
@@ -2543,7 +2553,7 @@ async def test_update_org_member_async():
         Optional[Union[OrgMember, Error]]
     ] = await update_org_member.asyncio_detailed(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
         body=UpdateMemberToOrgBody(
             role=UserOrgRole.ADMIN,
         ),
@@ -2557,7 +2567,7 @@ def test_delete_org_member():
 
     result: Optional[Error] = delete_org_member.sync(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
     )
 
     if isinstance(result, Error) or result is None:
@@ -2570,7 +2580,7 @@ def test_delete_org_member():
     # OR if you need more info (e.g. status_code)
     response: Response[Optional[Error]] = delete_org_member.sync_detailed(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
     )
 
 
@@ -2583,13 +2593,13 @@ async def test_delete_org_member_async():
 
     result: Optional[Error] = await delete_org_member.asyncio(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
     )
 
     # OR run async with more info
     response: Response[Optional[Error]] = await delete_org_member.asyncio_detailed(
         client=client,
-        user_id=Uuid("<uuid>"),
+        user_id=Uuid("<string>"),
     )
 
 
@@ -3390,8 +3400,10 @@ def test_update_org_saml_idp():
         client=client,
         body=SamlIdentityProviderCreate(
             idp_entity_id="<string>",
-            idp_metadata_source=base64_encoded_xml(
+            idp_metadata_source=IdpMetadataSource(
-                data="<string>",
+                base64_encoded_xml(
+                    data=Base64Data(b"<bytes>"),
+                )
             ),
             technical_contact_email="<string>",
         ),
@@ -3410,8 +3422,10 @@ def test_update_org_saml_idp():
             client=client,
             body=SamlIdentityProviderCreate(
                 idp_entity_id="<string>",
-                idp_metadata_source=base64_encoded_xml(
+                idp_metadata_source=IdpMetadataSource(
-                    data="<string>",
+                    base64_encoded_xml(
+                        data=Base64Data(b"<bytes>"),
+                    )
                 ),
                 technical_contact_email="<string>",
             ),
@@ -3432,8 +3446,10 @@ async def test_update_org_saml_idp_async():
         client=client,
         body=SamlIdentityProviderCreate(
             idp_entity_id="<string>",
-            idp_metadata_source=base64_encoded_xml(
+            idp_metadata_source=IdpMetadataSource(
-                data="<string>",
+                base64_encoded_xml(
+                    data=Base64Data(b"<bytes>"),
+                )
             ),
             technical_contact_email="<string>",
         ),
@@ -3446,8 +3462,10 @@ async def test_update_org_saml_idp_async():
         client=client,
         body=SamlIdentityProviderCreate(
             idp_entity_id="<string>",
-            idp_metadata_source=base64_encoded_xml(
+            idp_metadata_source=IdpMetadataSource(
-                data="<string>",
+                base64_encoded_xml(
+                    data=Base64Data(b"<bytes>"),
+                )
             ),
             technical_contact_email="<string>",
         ),
@@ -3463,8 +3481,10 @@ def test_create_org_saml_idp():
         client=client,
         body=SamlIdentityProviderCreate(
             idp_entity_id="<string>",
-            idp_metadata_source=base64_encoded_xml(
+            idp_metadata_source=IdpMetadataSource(
-                data="<string>",
+                base64_encoded_xml(
+                    data=Base64Data(b"<bytes>"),
+                )
             ),
             technical_contact_email="<string>",
         ),
@@ -3483,8 +3503,10 @@ def test_create_org_saml_idp():
             client=client,
             body=SamlIdentityProviderCreate(
                 idp_entity_id="<string>",
-                idp_metadata_source=base64_encoded_xml(
+                idp_metadata_source=IdpMetadataSource(
-                    data="<string>",
+                    base64_encoded_xml(
+                        data=Base64Data(b"<bytes>"),
+                    )
                 ),
                 technical_contact_email="<string>",
             ),
@@ -3505,8 +3527,10 @@ async def test_create_org_saml_idp_async():
         client=client,
         body=SamlIdentityProviderCreate(
             idp_entity_id="<string>",
-            idp_metadata_source=base64_encoded_xml(
+            idp_metadata_source=IdpMetadataSource(
-                data="<string>",
+                base64_encoded_xml(
+                    data=Base64Data(b"<bytes>"),
+                )
             ),
             technical_contact_email="<string>",
         ),
@@ -3519,8 +3543,10 @@ async def test_create_org_saml_idp_async():
         client=client,
         body=SamlIdentityProviderCreate(
             idp_entity_id="<string>",
-            idp_metadata_source=base64_encoded_xml(
+            idp_metadata_source=IdpMetadataSource(
-                data="<string>",
+                base64_encoded_xml(
+                    data=Base64Data(b"<bytes>"),
+                )
             ),
             technical_contact_email="<string>",
         ),
@@ -3832,7 +3858,7 @@ def test_get_any_org():
 
     result: Optional[Union[Org, Error]] = get_any_org.sync(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
     if isinstance(result, Error) or result is None:
@@ -3845,7 +3871,7 @@ def test_get_any_org():
     # OR if you need more info (e.g. status_code)
     response: Response[Optional[Union[Org, Error]]] = get_any_org.sync_detailed(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
 
@@ -3858,7 +3884,7 @@ async def test_get_any_org_async():
 
     result: Optional[Union[Org, Error]] = await get_any_org.asyncio(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
     # OR run async with more info
@@ -3866,7 +3892,7 @@ async def test_get_any_org_async():
         Optional[Union[Org, Error]]
     ] = await get_any_org.asyncio_detailed(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
 
@@ -3878,10 +3904,12 @@ def test_update_enterprise_pricing_for_org():
     result: Optional[Union[ZooProductSubscriptions, Error]] = (
         update_enterprise_pricing_for_org.sync(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
-            body=per_user(
+            body=SubscriptionTierPrice(
-                interval=PlanInterval.DAY,
+                per_user(
-                price=3.14,
+                    interval=PlanInterval.DAY,
+                    price=3.14,
+                )
             ),
         )
     )
@@ -3897,10 +3925,12 @@ def test_update_enterprise_pricing_for_org():
     response: Response[Optional[Union[ZooProductSubscriptions, Error]]] = (
         update_enterprise_pricing_for_org.sync_detailed(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
-            body=per_user(
+            body=SubscriptionTierPrice(
-                interval=PlanInterval.DAY,
+                per_user(
-                price=3.14,
+                    interval=PlanInterval.DAY,
+                    price=3.14,
+                )
             ),
         )
     )
@@ -3917,10 +3947,12 @@ async def test_update_enterprise_pricing_for_org_async():
         Union[ZooProductSubscriptions, Error]
     ] = await update_enterprise_pricing_for_org.asyncio(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
-        body=per_user(
+        body=SubscriptionTierPrice(
-            interval=PlanInterval.DAY,
+            per_user(
-            price=3.14,
+                interval=PlanInterval.DAY,
+                price=3.14,
+            )
         ),
     )
 
@@ -3929,10 +3961,12 @@ async def test_update_enterprise_pricing_for_org_async():
         Optional[Union[ZooProductSubscriptions, Error]]
     ] = await update_enterprise_pricing_for_org.asyncio_detailed(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
-        body=per_user(
+        body=SubscriptionTierPrice(
-            interval=PlanInterval.DAY,
+            per_user(
-            price=3.14,
+                interval=PlanInterval.DAY,
+                price=3.14,
+            )
         ),
     )
 
@@ -3945,7 +3979,7 @@ def test_get_payment_balance_for_any_org():
     result: Optional[Union[CustomerBalance, Error]] = (
         get_payment_balance_for_any_org.sync(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
         )
     )
 
@@ -3960,7 +3994,7 @@ def test_get_payment_balance_for_any_org():
     response: Response[Optional[Union[CustomerBalance, Error]]] = (
         get_payment_balance_for_any_org.sync_detailed(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
         )
     )
 
@@ -3976,7 +4010,7 @@ async def test_get_payment_balance_for_any_org_async():
         Union[CustomerBalance, Error]
     ] = await get_payment_balance_for_any_org.asyncio(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
     # OR run async with more info
@@ -3984,7 +4018,7 @@ async def test_get_payment_balance_for_any_org_async():
         Optional[Union[CustomerBalance, Error]]
     ] = await get_payment_balance_for_any_org.asyncio_detailed(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
 
@@ -3996,7 +4030,7 @@ def test_update_payment_balance_for_any_org():
     result: Optional[Union[CustomerBalance, Error]] = (
         update_payment_balance_for_any_org.sync(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
             body=UpdatePaymentBalance(),
         )
     )
@@ -4012,7 +4046,7 @@ def test_update_payment_balance_for_any_org():
     response: Response[Optional[Union[CustomerBalance, Error]]] = (
         update_payment_balance_for_any_org.sync_detailed(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
             body=UpdatePaymentBalance(),
         )
     )
@@ -4029,7 +4063,7 @@ async def test_update_payment_balance_for_any_org_async():
         Union[CustomerBalance, Error]
     ] = await update_payment_balance_for_any_org.asyncio(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
         body=UpdatePaymentBalance(),
     )
 
@@ -4038,7 +4072,7 @@ async def test_update_payment_balance_for_any_org_async():
         Optional[Union[CustomerBalance, Error]]
     ] = await update_payment_balance_for_any_org.asyncio_detailed(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
         body=UpdatePaymentBalance(),
     )
 
@@ -5155,7 +5189,7 @@ def test_get_api_call_for_user():
 
     result: Optional[Union[ApiCallWithPrice, Error]] = get_api_call_for_user.sync(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     if isinstance(result, Error) or result is None:
@@ -5169,7 +5203,7 @@ def test_get_api_call_for_user():
     response: Response[Optional[Union[ApiCallWithPrice, Error]]] = (
         get_api_call_for_user.sync_detailed(
             client=client,
-            id="<uuid>",
+            id="<string>",
         )
     )
 
@@ -5185,7 +5219,7 @@ async def test_get_api_call_for_user_async():
         Union[ApiCallWithPrice, Error]
     ] = await get_api_call_for_user.asyncio(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     # OR run async with more info
@@ -5193,7 +5227,7 @@ async def test_get_api_call_for_user_async():
         Optional[Union[ApiCallWithPrice, Error]]
     ] = await get_api_call_for_user.asyncio_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -6433,7 +6467,7 @@ def test_get_text_to_cad_model_for_user():
 
     result: Optional[Union[TextToCad, Error]] = get_text_to_cad_model_for_user.sync(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     if isinstance(result, Error) or result is None:
@@ -6447,7 +6481,7 @@ def test_get_text_to_cad_model_for_user():
     response: Response[Optional[Union[TextToCad, Error]]] = (
         get_text_to_cad_model_for_user.sync_detailed(
             client=client,
-            id="<uuid>",
+            id="<string>",
         )
     )
 
@@ -6463,7 +6497,7 @@ async def test_get_text_to_cad_model_for_user_async():
         Union[TextToCad, Error]
     ] = await get_text_to_cad_model_for_user.asyncio(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
     # OR run async with more info
@@ -6471,7 +6505,7 @@ async def test_get_text_to_cad_model_for_user_async():
         Optional[Union[TextToCad, Error]]
     ] = await get_text_to_cad_model_for_user.asyncio_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
     )
 
 
@@ -6482,7 +6516,7 @@ def test_create_text_to_cad_model_feedback():
 
     result: Optional[Error] = create_text_to_cad_model_feedback.sync(
         client=client,
-        id="<uuid>",
+        id="<string>",
         feedback=MlFeedback.THUMBS_UP,
     )
 
@@ -6497,7 +6531,7 @@ def test_create_text_to_cad_model_feedback():
     response: Response[Optional[Error]] = (
         create_text_to_cad_model_feedback.sync_detailed(
             client=client,
-            id="<uuid>",
+            id="<string>",
             feedback=MlFeedback.THUMBS_UP,
         )
     )
@@ -6512,7 +6546,7 @@ async def test_create_text_to_cad_model_feedback_async():
 
     result: Optional[Error] = await create_text_to_cad_model_feedback.asyncio(
         client=client,
-        id="<uuid>",
+        id="<string>",
         feedback=MlFeedback.THUMBS_UP,
     )
 
@@ -6521,7 +6555,7 @@ async def test_create_text_to_cad_model_feedback_async():
         Optional[Error]
     ] = await create_text_to_cad_model_feedback.asyncio_detailed(
         client=client,
-        id="<uuid>",
+        id="<string>",
         feedback=MlFeedback.THUMBS_UP,
     )
 
@@ -6799,7 +6833,7 @@ def test_get_payment_balance_for_any_user():
     result: Optional[Union[CustomerBalance, Error]] = (
         get_payment_balance_for_any_user.sync(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
         )
     )
 
@@ -6814,7 +6848,7 @@ def test_get_payment_balance_for_any_user():
     response: Response[Optional[Union[CustomerBalance, Error]]] = (
         get_payment_balance_for_any_user.sync_detailed(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
         )
     )
 
@@ -6830,7 +6864,7 @@ async def test_get_payment_balance_for_any_user_async():
         Union[CustomerBalance, Error]
     ] = await get_payment_balance_for_any_user.asyncio(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
     # OR run async with more info
@@ -6838,7 +6872,7 @@ async def test_get_payment_balance_for_any_user_async():
         Optional[Union[CustomerBalance, Error]]
     ] = await get_payment_balance_for_any_user.asyncio_detailed(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
     )
 
 
@@ -6850,7 +6884,7 @@ def test_update_payment_balance_for_any_user():
     result: Optional[Union[CustomerBalance, Error]] = (
         update_payment_balance_for_any_user.sync(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
             body=UpdatePaymentBalance(),
         )
     )
@@ -6866,7 +6900,7 @@ def test_update_payment_balance_for_any_user():
     response: Response[Optional[Union[CustomerBalance, Error]]] = (
         update_payment_balance_for_any_user.sync_detailed(
             client=client,
-            id=Uuid("<uuid>"),
+            id=Uuid("<string>"),
             body=UpdatePaymentBalance(),
         )
     )
@@ -6883,7 +6917,7 @@ async def test_update_payment_balance_for_any_user_async():
         Union[CustomerBalance, Error]
     ] = await update_payment_balance_for_any_user.asyncio(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
         body=UpdatePaymentBalance(),
     )
 
@@ -6892,7 +6926,7 @@ async def test_update_payment_balance_for_any_user_async():
         Optional[Union[CustomerBalance, Error]]
     ] = await update_payment_balance_for_any_user.asyncio_detailed(
         client=client,
-        id=Uuid("<uuid>"),
+        id=Uuid("<string>"),
         body=UpdatePaymentBalance(),
     )
 

kittycad/models/card_details.py

@@ -10,7 +10,7 @@ class CardDetails(BaseModel):
 
     brand: Optional[str] = None
 
-    checks: PaymentMethodCardChecks = {}
+    checks: PaymentMethodCardChecks = {}  # type: ignore
 
     country: Optional[str] = None
 

kittycad/models/connection.py

@@ -23,7 +23,7 @@ class Connection(BaseModel):
         "name": "",
         "tls_timeout": 0,
         "urls": [],
-    }
+    }  # type: ignore
 
     config_load_time: datetime.datetime
 
@@ -39,7 +39,7 @@ class Connection(BaseModel):
         "name": "",
         "port": 0,
         "tls_timeout": 0,
-    }
+    }  # type: ignore
 
     git_commit: str = ""
 
@@ -75,9 +75,9 @@ class Connection(BaseModel):
             "reserved_store": 0,
             "store": 0,
         },
-    }
+    }  # type: ignore
 
-    leaf: LeafNode = {"auth_timeout": 0, "host": "", "port": 0, "tls_timeout": 0}
+    leaf: LeafNode = {"auth_timeout": 0, "host": "", "port": 0, "tls_timeout": 0}  # type: ignore
 
     leafnodes: int = 0
 

kittycad/models/customer.py

@@ -16,7 +16,7 @@ class Customer(BaseModel):
 
     created_at: datetime.datetime
 
-    currency: Currency = "usd"
+    currency: Currency = "usd"  # type: ignore
 
     delinquent: bool = False
 

kittycad/models/invoice.py

@@ -24,7 +24,7 @@ class Invoice(BaseModel):
 
     created_at: datetime.datetime
 
-    currency: Currency = "usd"
+    currency: Currency = "usd"  # type: ignore
 
     customer_email: Optional[str] = None
 

kittycad/models/invoice_line_item.py

@@ -10,7 +10,7 @@ class InvoiceLineItem(BaseModel):
 
     amount: float = 0.0
 
-    currency: Currency = "usd"
+    currency: Currency = "usd"  # type: ignore
 
     description: Optional[str] = None
 

kittycad/models/jetstream.py

@@ -13,9 +13,9 @@ class Jetstream(BaseModel):
         "max_memory": 0,
         "max_storage": 0,
         "store_dir": "",
-    }
+    }  # type: ignore
 
-    meta: MetaClusterInfo = {"cluster_size": 0, "leader": "", "name": ""}
+    meta: MetaClusterInfo = {"cluster_size": 0, "leader": "", "name": ""}  # type: ignore
 
     stats: JetstreamStats = {
         "accounts": 0,
@@ -25,6 +25,6 @@ class Jetstream(BaseModel):
         "reserved_memory": 0,
         "reserved_store": 0,
         "store": 0,
-    }
+    }  # type: ignore
 
     model_config = ConfigDict(protected_namespaces=())

kittycad/models/jetstream_stats.py

@@ -8,7 +8,7 @@ class JetstreamStats(BaseModel):
 
     accounts: int = 0
 
-    api: JetstreamApiStats = {"errors": 0, "inflight": 0, "total": 0}
+    api: JetstreamApiStats = {"errors": 0, "inflight": 0, "total": 0}  # type: ignore
 
     ha_assets: int = 0
 

kittycad/models/kcl_code_completion_request.py

@@ -8,7 +8,7 @@ from ..models.kcl_code_completion_params import KclCodeCompletionParams
 class KclCodeCompletionRequest(BaseModel):
     """A request to generate KCL code completions."""
 
-    extra: KclCodeCompletionParams = {"language": "", "trim_by_indentation": False}
+    extra: KclCodeCompletionParams = {"language": "", "trim_by_indentation": False}  # type: ignore
 
     max_tokens: Optional[int] = None
 

kittycad/models/modeling_cmd.py

@@ -674,7 +674,7 @@ class solid3d_get_prev_adjacent_edge(BaseModel):
 class solid3d_fillet_edge(BaseModel):
     """Fillets the given edge with the specified radius."""
 
-    cut_type: CutType = "fillet"
+    cut_type: CutType = "fillet"  # type: ignore
 
     edge_id: str
 

kittycad/models/transform.py

@@ -13,10 +13,10 @@ class Transform(BaseModel):
         "angle": {"unit": "degrees", "value": 0.0},
         "axis": {"x": 0.0, "y": 0.0, "z": 1.0},
         "origin": {"type": "local"},
-    }
+    }  # type: ignore
 
-    scale: Point3d = {"x": 1.0, "y": 1.0, "z": 1.0}
+    scale: Point3d = {"x": 1.0, "y": 1.0, "z": 1.0}  # type: ignore
 
-    translate: Point3d = {"x": 0.0, "y": 0.0, "z": 0.0}
+    translate: Point3d = {"x": 0.0, "y": 0.0, "z": 0.0}  # type: ignore
 
     model_config = ConfigDict(protected_namespaces=())

kittycad/models/zoo_product_subscriptions_org_request.py

@@ -8,6 +8,6 @@ from ..models.modeling_app_organization_subscription_tier import (
 class ZooProductSubscriptionsOrgRequest(BaseModel):
     """A struct of Zoo product subscriptions an organization can request."""
 
-    modeling_app: ModelingAppOrganizationSubscriptionTier = "team"
+    modeling_app: ModelingAppOrganizationSubscriptionTier = "team"  # type: ignore
 
     model_config = ConfigDict(protected_namespaces=())

kittycad/models/zoo_product_subscriptions_user_request.py

@@ -8,6 +8,6 @@ from ..models.modeling_app_individual_subscription_tier import (
 class ZooProductSubscriptionsUserRequest(BaseModel):
     """A struct of Zoo product subscriptions a user can request."""
 
-    modeling_app: ModelingAppIndividualSubscriptionTier = "free"
+    modeling_app: ModelingAppIndividualSubscriptionTier = "free"  # type: ignore
 
     model_config = ConfigDict(protected_namespaces=())

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kittycad"
-version = "0.6.24"
+version = "0.7.0"
 description = "A client library for accessing KittyCAD"
 
 authors = []
@@ -81,7 +81,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 "examples_test.py" = ["F841"]
 
 [tool.mypy]
-exclude = []
+exclude = ["venv"]
 show_error_codes = true
 ignore_missing_imports = true
 check_untyped_defs = true