apexdevkit 1.17.3__tar.gz → 1.17.5__tar.gz

{apexdevkit-1.17.3 → apexdevkit-1.17.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apexdevkit
-Version: 1.17.3
+Version: 1.17.5
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexdevkit-1.17.3 → apexdevkit-1.17.5}/apexdevkit/fastapi/schema.py

@@ -135,13 +135,7 @@ class Schema:
     name: RestfulName
 
     def schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
-        return create_model(
-            self.name.singular.capitalize() + action,
-            **{
-                field_name: (field_type, ...)
-                for field_name, field_type in fields.items()
-            },
-        )
+        return self._nested_schema_for(self.name.singular.capitalize() + action, fields)
 
     def optional_schema_for(
         self, action: str, fields: dict[str, Any]
@@ -153,3 +147,19 @@ class Schema:
                 for field_name, field_type in fields.items()
             },
         )
+
+    def _nested_schema_for(self, name: str, fields: dict[str, Any]) -> type[BaseModel]:
+        model_fields = {}
+
+        for field_name, field_type in fields.items():
+            if isinstance(field_type, dict):
+                model_fields[field_name] = (
+                    self._nested_schema_for(
+                        name.capitalize() + field_name.capitalize(), field_type
+                    ),
+                    ...,
+                )
+            else:
+                model_fields[field_name] = (field_type, ...)
+
+        return create_model(name, **model_fields)

{apexdevkit-1.17.3 → apexdevkit-1.17.5}/apexdevkit/formatter.py

@@ -2,9 +2,12 @@ from __future__ import annotations
 
 import pickle
 from copy import deepcopy
-from dataclasses import asdict, dataclass, field
-from typing import Any, Generic, Protocol, Self, TypeVar
+from dataclasses import asdict, dataclass, field, fields, is_dataclass
+from typing import Any, Generic, Protocol, Self, TypeVar, get_args
 
+from typing_extensions import get_type_hints
+
+from apexdevkit.fluent import FluentDict
 from apexdevkit.value import Value
 
 _SourceT = TypeVar("_SourceT")
@@ -53,11 +56,29 @@ class DataclassFormatter(Generic[_TargetT]):
         return self
 
     def load(self, raw: dict[str, Any]) -> _TargetT:
-        raw = deepcopy(raw)
-
-        for key, formatter in self.sub_formatters.items():
-            if key in raw:
-                raw[key] = formatter.load(raw.pop(key)) if raw[key] else raw[key]
+        raw = FluentDict[Any](deepcopy(raw)).select(
+            *self.resource.__annotations__.keys()
+        )
+
+        for key in fields(self.resource):  # type: ignore
+            types = get_type_hints(self.resource)
+            key_type = types[key.name]
+            if key.name not in raw:
+                continue
+            elif key.name in self.sub_formatters.keys():
+                raw[key.name] = (
+                    self.sub_formatters[key.name].load(raw.pop(key.name))
+                    if raw[key.name]
+                    else raw[key.name]
+                )
+            elif is_dataclass(key_type):
+                raw[key.name] = DataclassFormatter(key_type).load(raw[key.name])  # type: ignore
+            else:
+                args = get_args(key_type)
+                if len(args) == 1 and is_dataclass(args[0]):
+                    raw[key.name] = ListFormatter(DataclassFormatter(args[0])).load(  # type: ignore
+                        raw[key.name]
+                    )
 
         return self.resource(**raw)
 

{apexdevkit-1.17.3 → apexdevkit-1.17.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.17.3"
+version = "1.17.5"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"