apexdevkit 1.25.1__tar.gz → 1.25.3__tar.gz

{apexdevkit-1.25.1 → apexdevkit-1.25.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apexdevkit
-Version: 1.25.1
+Version: 1.25.3
 Summary: Apex Development Tools for python.
 License-File: LICENSE
 Author: Apex Dev

{apexdevkit-1.25.1 → apexdevkit-1.25.3}/apexdevkit/fastapi/builder.py

@@ -6,8 +6,8 @@ from dataclasses import dataclass, field
 from typing import Any, Self
 
 from fastapi import APIRouter, FastAPI
-from starlette.middleware.cors import CORSMiddleware
-from starlette.responses import JSONResponse
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
 
 from apexdevkit.error import ApiError
 from apexdevkit.fastapi.service import RestfulService
@@ -51,14 +51,16 @@ class FastApiBuilder:
     def with_routes(self, values: Mapping[str, APIRouter]) -> Self:
         for key, value in values.items():
             self.app.include_router(
-                value, prefix=f"/{key}", tags=value.tags or [key.title()]
+                value,
+                prefix=_Endpoint(key).normilized(),
+                tags=value.tags or [key.title()],
             )
 
         return self
 
     def with_mounted(self, **apps: FastAPI) -> Self:
         for path, app in apps.items():
-            self.app.mount(f"/{path.replace('_', '-')}", app)
+            self.app.mount(_Endpoint(path).normilized(), app)
 
         return self
 
@@ -105,3 +107,14 @@ class PreBuilt(RestfulServiceBuilder):  # pragma: no cover
 
     def build(self) -> RestfulService:
         return self.service
+
+
+@dataclass(frozen=True)
+class _Endpoint:
+    raw: str
+
+    def normilized(self) -> str:
+        return f"/{self.raw.replace('_', '-')}"
+
+    def __str__(self) -> str:
+        return self.normilized()

{apexdevkit-1.25.1 → apexdevkit-1.25.3}/apexdevkit/fastapi/router.py

@@ -60,10 +60,23 @@ class RestfulRouter:
         return "/{" + self.id_alias + "}"
 
     def with_fields(self, value: SchemaFields) -> Self:
-        self._schema = RestfulSchema(name=self.name, fields=value)
+        self._schema = RestfulSchema(
+            name=self.name,
+            fields=value,
+            generator=self._schema_generator,
+        )
 
         return self
 
+    @property
+    def _schema_generator(self) -> Schema:
+        if self.parent:
+            return Schema(
+                self.parent.singular.capitalize() + self.name.singular.capitalize()
+            )
+
+        return Schema(self.name.singular.capitalize())
+
     def with_tag(self, value: list[str | Enum]) -> Self:
         self.router.tags = value
 
@@ -157,7 +170,8 @@ class RestfulRouter:
             self.resource.read_many(
                 Service=self._resolve(dependency),
                 QueryParams=Annotated[
-                    Schema(self.name).optional_schema_for("ReadMany", query), Query()
+                    Schema(self.name.singular).optional_schema_for("ReadMany", query),
+                    Query(),
                 ],
             ),
             methods=["GET"],

{apexdevkit-1.25.1 → apexdevkit-1.25.3}/apexdevkit/fastapi/schema.py

@@ -45,6 +45,7 @@ class SchemaFields(ABC):
 class RestfulSchema:
     name: RestfulName
     fields: SchemaFields
+    generator: "Schema"
 
     def __post_init__(self) -> None:
         schema = self._schema_for("", self.fields.readable())
@@ -66,7 +67,7 @@ class RestfulSchema:
 
     def _schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
         if action not in self.schemas:
-            self.schemas[action] = Schema(self.name).schema_for(action, fields)
+            self.schemas[action] = self.generator.schema_for(action, fields)
 
         return self.schemas[action]
 
@@ -177,16 +178,16 @@ class RestfulSchema:
 
 @dataclass(frozen=True)
 class Schema:
-    name: RestfulName
+    resource: str
 
     def schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
-        return self._nested_schema_for(self.name.singular.capitalize() + action, fields)
+        return self._nested_schema_for(self.resource + action, fields)
 
     def optional_schema_for(
         self, action: str, fields: dict[str, Any]
     ) -> type[BaseModel]:
         return create_model(
-            self.name.singular.capitalize() + action,
+            self.resource + action,
             **{
                 field_name: (field_type | None, None)
                 for field_name, field_type in fields.items()
@@ -199,9 +200,7 @@ class Schema:
         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
-                    ),
+                    self._nested_schema_for(name + field_name.capitalize(), field_type),
                     ...,
                 )
             else:

{apexdevkit-1.25.1 → apexdevkit-1.25.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexdevkit"
-version = "1.25.1"
+version = "1.25.3"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [