apexdevkit 1.2.3__tar.gz → 1.3.1__tar.gz

{apexdevkit-1.2.3 → apexdevkit-1.3.1}/PKG-INFO

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

{apexdevkit-1.2.3 → apexdevkit-1.3.1}/apexdevkit/fastapi/router.py

@@ -1,11 +1,12 @@
 from dataclasses import dataclass, field
+from functools import cached_property
 from typing import Annotated, Any, Iterable, Self, TypeVar
 
 from fastapi import APIRouter, Depends
 from fastapi.responses import JSONResponse
 
 from apexdevkit.error import DoesNotExistError, ExistsError
-from apexdevkit.fastapi.schema import RestfulSchema
+from apexdevkit.fastapi.schema import DataclassFields, RestfulSchema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
 from apexdevkit.testing import RestfulName
 
@@ -16,10 +17,6 @@ _Response = JSONResponse | dict[str, Any]
 class RestfulResponse:
     name: RestfulName
 
-    @classmethod
-    def from_dataclass(cls, value: type[Any]) -> "RestfulResponse":
-        return cls(name=RestfulName(value.__name__.lower()))
-
     def _response(self, code: int, data: Any, error: str = "") -> dict[str, Any]:
         content: dict[str, Any] = {"code": code, "status": "success"}
 
@@ -76,32 +73,33 @@ T = TypeVar("T")
 
 @dataclass
 class RestfulRouter:
-    schema: RestfulSchema = field(init=False)
-    response: RestfulResponse = field(init=False)
-    service: RestfulService = field(init=False)
+    service: RestfulService
 
-    router: APIRouter = field(init=False, default_factory=APIRouter)
+    router: APIRouter = field(default_factory=APIRouter)
 
-    @classmethod
-    def from_dataclass(cls, value: Any) -> "RestfulRouter":
-        return (
-            cls()
-            .with_schema(RestfulSchema.from_dataclass(value))
-            .with_response(RestfulResponse.from_dataclass(value))
-        )
+    name: RestfulName = field(init=False)
+    fields: SchemaFields = field(init=False)
 
-    def with_schema(self, value: RestfulSchema) -> Self:
-        self.schema = value
+    @cached_property
+    def response(self) -> RestfulResponse:
+        return RestfulResponse(name=self.name)
 
-        return self
+    @cached_property
+    def schema(self) -> RestfulSchema:
+        return RestfulSchema(name=self.name, fields=self.fields)
+
+    def with_dataclass(self, value: Any) -> Self:
+        return self.with_name(RestfulName(value.__name__.lower())).with_fields(
+            DataclassFields(value)
+        )
 
-    def with_response(self, value: RestfulResponse) -> Self:
-        self.response = value
+    def with_name(self, value: RestfulName) -> Self:
+        self.name = value
 
         return self
 
-    def with_service(self, value: RestfulService) -> Self:
-        self.service = value
+    def with_fields(self, value: SchemaFields) -> Self:
+        self.fields = value
 
         return self
 

{apexdevkit-1.2.3 → apexdevkit-1.3.1}/apexdevkit/fastapi/schema.py

@@ -1,4 +1,6 @@
-from dataclasses import dataclass, field
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from functools import cached_property
 from typing import Any, Callable, Iterable, List
 
 from pydantic import BaseModel, create_model
@@ -7,17 +9,35 @@ from apexdevkit.http import JsonDict
 from apexdevkit.testing import RestfulName
 
 
+class SchemaFields(ABC):
+    def writable(self) -> JsonDict:
+        return self.editable()
+
+    def editable(self) -> JsonDict:
+        return self.readable().drop("id")
+
+    @abstractmethod
+    def readable(self) -> JsonDict:
+        pass
+
+
+@dataclass
+class DataclassFields(SchemaFields):
+    source: Any
+
+    def readable(self) -> JsonDict:
+        return JsonDict(self.source.__annotations__)
+
+
 @dataclass
 class RestfulSchema:
     name: RestfulName
-    fields: JsonDict
-
-    schemas: dict[str, type[BaseModel]] = field(default_factory=dict)
+    fields: SchemaFields
 
     def __post_init__(self) -> None:
-        schema = self._schema_for("", self.fields)
-        create_schema = self._schema_for("Create", self.fields.drop("id"))
-        self._schema_for("Update", self.fields.drop("id"))
+        schema = self._schema_for("", self.fields.readable())
+        create_schema = self._schema_for("Create", self.fields.writable())
+        self._schema_for("Update", self.fields.editable())
 
         self._schema_for(
             "Item",
@@ -37,12 +57,21 @@ class RestfulSchema:
             JsonDict({self.name.plural: List[schema]}),
         )
 
-    @classmethod
-    def from_dataclass(cls, value: Any) -> "RestfulSchema":
-        return cls(
-            name=RestfulName(value.__name__.lower()),
-            fields=JsonDict(value.__annotations__),
-        )
+    def _schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
+        if action not in self.schemas:
+            self.schemas[action] = create_model(
+                self.name.singular.capitalize() + action,
+                **{
+                    field_name: (field_type, ...)
+                    for field_name, field_type in fields.items()
+                },
+            )
+
+        return self.schemas[action]
+
+    @cached_property
+    def schemas(self) -> dict[str, type[BaseModel]]:
+        return {}
 
     def for_no_data(self) -> type[BaseModel]:
         class NoData(BaseModel):
@@ -102,15 +131,3 @@ class RestfulSchema:
             return [dict(item) for item in request.model_dump()[self.name.plural]]
 
         return _
-
-    def _schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
-        if action not in self.schemas:
-            self.schemas[action] = create_model(
-                self.name.singular.capitalize() + action,
-                **{
-                    field_name: (field_type, ...)
-                    for field_name, field_type in fields.items()
-                },
-            )
-
-        return self.schemas[action]

{apexdevkit-1.2.3 → apexdevkit-1.3.1}/pyproject.toml

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