works, debug

konfig-dev · Nov 2, 2023 · d1eb091 · d1eb091
1 parent ff09d2d
commit d1eb091
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/...vely-convert-to-models/python/python_pydantic_recursively_convert_to_models/api_client.py b/...vely-convert-to-models/python/python_pydantic_recursively_convert_to_models/api_client.py
@@ -68,12 +68,23 @@ def __eq__(self, other):
         return self.__dict__ == other.__dict__
 
 
-def handle_response(model: BaseModel):
+T = typing.TypeVar('T', bound=BaseModel)
+
+
+def construct_model_instance(model: typing.Type[T], data: dict) -> T:
     """
-    Since BaseModel#model_construct does not recursively construct models, we need to do it ourselves.
-    This is a recursive function that will construct the model and all of its child models.
+    Recursively construct an instance of a Pydantic model along with its nested models.
     """
-    pass
+    for field_name, field_type in model.__annotations__.items():
+        if field_name in data:
+            if typing_extensions.get_origin(field_type) is list:
+                list_item_type = typing_extensions.get_args(field_type)[0]
+                if issubclass(list_item_type, BaseModel):
+                    data[field_name] = [construct_model_instance(list_item_type, item) for item in data[field_name]]
+            elif issubclass(field_type, BaseModel):
+                data[field_name] = construct_model_instance(field_type, data[field_name])
+
+    return model(**data)
 
 
 class Dictionary(BaseModel):

diff --git a/...onvert-to-models/python/python_pydantic_recursively_convert_to_models/paths/object/get.py b/...onvert-to-models/python/python_pydantic_recursively_convert_to_models/paths/object/get.py
@@ -294,7 +294,7 @@ def fetch(
         )
         if validate:
             return TestFetchResponsePydantic(**raw_response.body)
-        return TestFetchResponsePydantic.model_construct(**raw_response.body)
+        return api_client.construct_model_instance(TestFetchResponsePydantic, raw_response.body)
 
 
 class ApiForget(BaseApi):

diff --git a/...nvert-to-models/python/python_pydantic_recursively_convert_to_models/paths/object/get.pyi b/...nvert-to-models/python/python_pydantic_recursively_convert_to_models/paths/object/get.pyi
@@ -286,7 +286,7 @@ class Fetch(BaseApi):
         )
         if validate:
             return TestFetchResponsePydantic(**raw_response.body)
-        return TestFetchResponsePydantic.model_construct(**raw_response.body)
+        return api_client.construct_model_instance(TestFetchResponsePydantic, raw_response.body)
 
 
 class ApiForget(BaseApi):

diff --git a/...-pydantic-recursively-convert-to-models/python/test/test_recursively_convert_to_models.py b/...-pydantic-recursively-convert-to-models/python/test/test_recursively_convert_to_models.py
@@ -28,11 +28,6 @@ def test_recursively_convert_to_models(self):
         self.assertIsNotNone(response.a.id)
         self.assertIsNotNone(response.b[0].id)
 
-    def test_recursively_convert_to_models(self):
-        response = self.client.test.fetch()
-        self.assertIsNotNone(response.a.id)
-        self.assertIsNotNone(response.b[0].id)
-
     def test_validate_recursively_converts(self):
         response = self.client.test.fetch(validate=True)
         self.assertIsNotNone(response.a.id)