diff --git a/Dockerfile b/Dockerfile index cbad6134a..ce4d48d35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /usr/src/ COPY . /usr/src/ -RUN poetry install +RUN poetry update && poetry install # Set the default command to bash. CMD ["bash"] diff --git a/generate/generate.py b/generate/generate.py index cee33af77..12ec7e19b 100755 --- a/generate/generate.py +++ b/generate/generate.py @@ -261,6 +261,8 @@ response: Response[""" + success_type + """] = await """ + fn_name + """.asyncio f.write("\t\t\"headers\": headers,\n") f.write("\t\t\"cookies\": cookies,\n") f.write("\t\t\"timeout\": client.get_timeout(),\n") + if request_body_type: + f.write("\t\t\"content\": body,\n") f.write("\t}\n") # Define the parse reponse. @@ -864,7 +866,7 @@ def generateType(path: str, name: str, schema: dict): property_name + ": Union[Unset, datetime.datetime]\n") f.write( - "\t\tif not isinstance(_" + property_name + ", Unset):\n") + "\t\tif isinstance(_" + property_name + ", Unset):\n") f.write("\t\t\t" + property_name + " = UNSET\n") f.write("\t\telse:\n") f.write("\t\t\t" + property_name + @@ -918,7 +920,7 @@ def generateType(path: str, name: str, schema: dict): f.write("\t\t" + property_name + ": Union[Unset, " + ref + "]\n") f.write( - "\t\tif not isinstance(_" + + "\t\tif isinstance(_" + property_name + ", Unset):\n") f.write("\t\t\t" + property_name + " = UNSET\n") diff --git a/kittycad/api/file/post_file_conversion.py b/kittycad/api/file/post_file_conversion.py index d5b530e90..ba19499c3 100644 --- a/kittycad/api/file/post_file_conversion.py +++ b/kittycad/api/file/post_file_conversion.py @@ -26,6 +26,7 @@ def _get_kwargs( "headers": headers, "cookies": cookies, "timeout": client.get_timeout(), + "content": body, } diff --git a/kittycad/client_test.py b/kittycad/client_test.py index e25533283..2e038f448 100644 --- a/kittycad/client_test.py +++ b/kittycad/client_test.py @@ -3,7 +3,7 @@ import pytest import asyncio from .client import ClientFromEnv -from .models import FileConversion, ValidOutputFileFormat, ValidSourceFileFormat, AuthSession, Instance, PongMessage +from .models import FileConversion, ValidOutputFileFormat, ValidSourceFileFormat, AuthSession, Instance, PongMessage, FileConversionStatus from .api.file import post_file_conversion_with_base64_helper from .api.meta import auth_session, instance_metadata, ping @@ -103,6 +103,12 @@ def test_file_convert_stl(): print(f"FileConversion: {fc}") + assert fc.id is not None + + assert fc.status == FileConversionStatus.COMPLETED + + print(f"FileConversion: {fc}") + @pytest.mark.asyncio async def test_file_convert_stl_async(): @@ -120,3 +126,7 @@ async def test_file_convert_stl_async(): assert fc is not None print(f"FileConversion: {fc}") + + assert fc.id is not None + + print(f"FileConversion: {fc}") diff --git a/kittycad/models/auth_session.py b/kittycad/models/auth_session.py index d4fe479e9..2617df1ac 100644 --- a/kittycad/models/auth_session.py +++ b/kittycad/models/auth_session.py @@ -62,7 +62,7 @@ class AuthSession: d = src_dict.copy() _created_at = d.pop("created_at", UNSET) created_at: Union[Unset, datetime.datetime] - if not isinstance(_created_at, Unset): + if isinstance(_created_at, Unset): created_at = UNSET else: created_at = isoparse(_created_at) diff --git a/kittycad/models/file_conversion.py b/kittycad/models/file_conversion.py index f9fbbc0fe..7f62b1d87 100644 --- a/kittycad/models/file_conversion.py +++ b/kittycad/models/file_conversion.py @@ -75,14 +75,14 @@ class FileConversion: d = src_dict.copy() _completed_at = d.pop("completed_at", UNSET) completed_at: Union[Unset, datetime.datetime] - if not isinstance(_completed_at, Unset): + if isinstance(_completed_at, Unset): completed_at = UNSET else: completed_at = isoparse(_completed_at) _created_at = d.pop("created_at", UNSET) created_at: Union[Unset, datetime.datetime] - if not isinstance(_created_at, Unset): + if isinstance(_created_at, Unset): created_at = UNSET else: created_at = isoparse(_created_at) @@ -93,28 +93,28 @@ class FileConversion: _output_format = d.pop("output_format", UNSET) output_format: Union[Unset, ValidOutputFileFormat] - if not isinstance(_output_format, Unset): + if isinstance(_output_format, Unset): output_format = UNSET else: output_format = ValidOutputFileFormat(_output_format) _src_format = d.pop("src_format", UNSET) src_format: Union[Unset, ValidSourceFileFormat] - if not isinstance(_src_format, Unset): + if isinstance(_src_format, Unset): src_format = UNSET else: src_format = ValidSourceFileFormat(_src_format) _started_at = d.pop("started_at", UNSET) started_at: Union[Unset, datetime.datetime] - if not isinstance(_started_at, Unset): + if isinstance(_started_at, Unset): started_at = UNSET else: started_at = isoparse(_started_at) _status = d.pop("status", UNSET) status: Union[Unset, FileConversionStatus] - if not isinstance(_status, Unset): + if isinstance(_status, Unset): status = UNSET else: status = FileConversionStatus(_status) diff --git a/kittycad/models/instance.py b/kittycad/models/instance.py index f26fcc893..43a47f771 100644 --- a/kittycad/models/instance.py +++ b/kittycad/models/instance.py @@ -77,7 +77,7 @@ class Instance: _environment = d.pop("environment", UNSET) environment: Union[Unset, ServerEnv] - if not isinstance(_environment, Unset): + if isinstance(_environment, Unset): environment = UNSET else: environment = ServerEnv(_environment) diff --git a/kittycad/models/pong_message.py b/kittycad/models/pong_message.py index 1ce0293a9..e604e8075 100644 --- a/kittycad/models/pong_message.py +++ b/kittycad/models/pong_message.py @@ -33,7 +33,7 @@ class PongMessage: d = src_dict.copy() _message = d.pop("message", UNSET) message: Union[Unset, PongEnum] - if not isinstance(_message, Unset): + if isinstance(_message, Unset): message = UNSET else: message = PongEnum(_message)