apexdevkit 1.25.3__tar.gz → 1.26.1__tar.gz

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

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

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

@@ -10,6 +10,7 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 
 from apexdevkit.error import ApiError
+from apexdevkit.fastapi.dependable import DependableBuilder
 from apexdevkit.fastapi.service import RestfulService
 
 
@@ -86,6 +87,9 @@ class RestfulServiceBuilder(ABC):
     parent_id: str = field(init=False)
     user: Any = field(init=False)
 
+    def as_dependable(self) -> DependableBuilder:
+        return DependableBuilder.from_builder(self)
+
     def with_user(self, user: Any) -> RestfulServiceBuilder:
         self.user = user
 

{apexdevkit-1.25.3 → apexdevkit-1.26.1}/apexdevkit/fastapi/dependable.py

@@ -6,8 +6,6 @@ from fastapi import Depends, Path
 from fastapi.requests import Request
 
 from apexdevkit.error import ApiError, DoesNotExistError, ForbiddenError
-from apexdevkit.fastapi import RestfulServiceBuilder
-from apexdevkit.fastapi.builder import PreBuilt
 from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.service import RestfulService
@@ -20,8 +18,19 @@ def inject(dependency: str) -> Any:  # pragma: no cover
     return Depends(get)
 
 
+class _ServiceBuilder(Protocol):
+    def with_user(self, user: Any) -> "_ServiceBuilder":
+        pass
+
+    def with_parent(self, identity: str) -> "_ServiceBuilder":
+        pass
+
+    def build(self) -> RestfulService:  # pragma: no cover
+        pass
+
+
 class _Dependency(Protocol):
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
+    def as_dependable(self) -> type[_ServiceBuilder]:
         pass
 
 
@@ -48,19 +57,19 @@ class ParentDependency:
     parent: RestfulName
     dependency: _Dependency
 
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
+    def as_dependable(self) -> type[_ServiceBuilder]:
         Builder = self.dependency.as_dependable()
         ParentId = Annotated[
             str, Path(alias=self.parent.singular.replace("-", "_") + "_id")
         ]
 
-        def _(builder: Builder, parent_id: ParentId) -> RestfulServiceBuilder:
+        def _(builder: Builder, parent_id: ParentId) -> _ServiceBuilder:
             try:
                 return builder.with_parent(parent_id)
             except DoesNotExistError as e:
                 raise ApiError(404, RestfulResponse(self.parent).not_found(e)) from e
 
-        return Annotated[RestfulServiceBuilder, Depends(_)]
+        return Annotated[_ServiceBuilder, Depends(_)]
 
 
 @dataclass(frozen=True)
@@ -68,28 +77,28 @@ class UserDependency:
     extract_user: Callable[..., Any]
     dependency: _Dependency
 
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
+    def as_dependable(self) -> type[_ServiceBuilder]:
         Builder = self.dependency.as_dependable()
         User = Annotated[Any, Depends(self.extract_user)]
 
-        def _(builder: Builder, user: User) -> RestfulServiceBuilder:
+        def _(builder: Builder, user: User) -> _ServiceBuilder:
             return builder.with_user(user)
 
-        return Annotated[RestfulServiceBuilder, Depends(_)]
+        return Annotated[_ServiceBuilder, Depends(_)]
 
 
-_BuilderCallable = Callable[..., RestfulServiceBuilder]
+_BuilderCallable = Callable[..., _ServiceBuilder]
 
 
 @dataclass(frozen=True)
 class BuilderCallableDependency:
     create_builder: _BuilderCallable
 
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
-        def _() -> RestfulServiceBuilder:
+    def as_dependable(self) -> type[_ServiceBuilder]:
+        def _() -> _ServiceBuilder:
             return self.create_builder()
 
-        return Annotated[RestfulServiceBuilder, Depends(_)]
+        return Annotated[_ServiceBuilder, Depends(_)]
 
 
 @dataclass(frozen=True)
@@ -101,13 +110,9 @@ class DependableBuilder:
         return cls(BuilderCallableDependency(value))
 
     @classmethod
-    def from_builder(cls, value: RestfulServiceBuilder) -> "DependableBuilder":
+    def from_builder(cls, value: _ServiceBuilder) -> "DependableBuilder":
         return cls(BuilderCallableDependency(lambda: value))
 
-    @classmethod
-    def from_service(cls, value: RestfulService) -> "DependableBuilder":
-        return cls(BuilderCallableDependency(lambda: PreBuilt(value)))
-
     def with_parent(self, value: RestfulName) -> "DependableBuilder":
         return DependableBuilder(ParentDependency(value, self.dependency))
 

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

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from collections.abc import Callable, Iterable
+from collections.abc import Callable, Iterable, Iterator
 from dataclasses import dataclass
 from functools import cached_property
 from typing import Any
@@ -66,15 +66,18 @@ class RestfulSchema:
         self._schema_for("ReplaceMany", {self.name.plural: list[replace_schema]})
 
     def _schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
-        if action not in self.schemas:
-            self.schemas[action] = self.generator.schema_for(action, fields)
+        if action not in self._models:
+            self._models[action] = self.generator.schema_for(action, fields)
 
-        return self.schemas[action]
+        return self._models[action]
 
     @cached_property
-    def schemas(self) -> dict[str, type[BaseModel]]:
+    def _models(self) -> dict[str, type[BaseModel]]:
         return {}
 
+    def __iter__(self) -> Iterator[type[BaseModel]]:
+        return iter(self._models.values())
+
     def for_no_data(self) -> type[BaseModel]:
         class NoData(BaseModel):
             pass
@@ -90,7 +93,7 @@ class RestfulSchema:
             FluentDict[type]()
             .with_a(status=str)
             .and_a(code=int)
-            .and_a(data=self.schemas["Item"]),
+            .and_a(data=self._models["Item"]),
         )
 
     def for_collection(self) -> type[BaseModel]:
@@ -99,11 +102,11 @@ class RestfulSchema:
             FluentDict[type]()
             .with_a(status=str)
             .and_a(code=int)
-            .and_a(data=self.schemas["Collection"]),
+            .and_a(data=self._models["Collection"]),
         )
 
     def for_create_one(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self.schemas["Create"]
+        schema = self._models["Create"]
 
         def _(request: schema) -> dict[str, Any]:
             return request.model_dump()
@@ -111,7 +114,7 @@ class RestfulSchema:
         return _
 
     def for_create_many(self) -> Callable[[BaseModel], Iterable[dict[str, Any]]]:
-        schema = self.schemas["CreateMany"]
+        schema = self._models["CreateMany"]
 
         def _(request: schema) -> Iterable[dict[str, Any]]:
             return [dict(item) for item in request.model_dump()[self.name.plural]]
@@ -119,7 +122,7 @@ class RestfulSchema:
         return _
 
     def for_update_one(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self.schemas["Update"]
+        schema = self._models["Update"]
 
         def _(request: schema):
             return request.model_dump()
@@ -127,7 +130,7 @@ class RestfulSchema:
         return _
 
     def for_update_many(self) -> Callable[[BaseModel], Iterable[dict[str, Any]]]:
-        schema = self.schemas["UpdateMany"]
+        schema = self._models["UpdateMany"]
 
         def _(request: schema) -> Iterable[dict[str, Any]]:
             return [dict(item) for item in request.model_dump()[self.name.plural]]
@@ -135,7 +138,7 @@ class RestfulSchema:
         return _
 
     def for_replace_one(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self.schemas["Replace"]
+        schema = self._models["Replace"]
 
         def _(request: schema) -> dict[str, Any]:
             return request.model_dump()
@@ -143,7 +146,7 @@ class RestfulSchema:
         return _
 
     def for_replace_many(self) -> Callable[[BaseModel], Iterable[dict[str, Any]]]:
-        schema = self.schemas["ReplaceMany"]
+        schema = self._models["ReplaceMany"]
 
         def _(request: schema) -> Iterable[dict[str, Any]]:
             return [dict(item) for item in request.model_dump()[self.name.plural]]
@@ -151,7 +154,7 @@ class RestfulSchema:
         return _
 
     def for_filters(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self.schemas["Filter"]
+        schema = self._models["Filter"]
 
         def _(request: schema) -> dict[str, Any]:
             return request.model_dump()
@@ -159,7 +162,7 @@ class RestfulSchema:
         return _
 
     def for_aggregation(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self.schemas["Aggregation"]
+        schema = self._models["Aggregation"]
 
         def _(request: schema) -> dict[str, Any]:
             return request.model_dump()
@@ -172,7 +175,7 @@ class RestfulSchema:
             FluentDict[type]()
             .with_a(status=str)
             .and_a(code=int)
-            .and_a(aggregations=self.schemas["AggregationResult"]),
+            .and_a(aggregations=self._models["AggregationResult"]),
         )
 
 
@@ -199,11 +202,11 @@ class Schema:
 
         for field_name, field_type in fields.items():
             if isinstance(field_type, dict):
-                model_fields[field_name] = (
-                    self._nested_schema_for(name + field_name.capitalize(), field_type),
-                    ...,
+                model_fields[field_name] = self._nested_schema_for(
+                    name + field_name.capitalize(),
+                    field_type,
                 )
             else:
-                model_fields[field_name] = (field_type, ...)
+                model_fields[field_name] = field_type
 
         return create_model(name, **model_fields)

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

@@ -1,6 +1,6 @@
 [project]
 name = "apexdevkit"
-version = "1.25.3"
+version = "1.26.1"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [
@@ -18,7 +18,7 @@ python-dotenv = "*"
 pymssql = "2.3.2"
 
 [tool.poetry.group.dev.dependencies]
-approvaltests = "*"
+approvaltests = "17.3.0"  # pinned because later version has a bug.
 pytest = "*"
 pytest-approvaltests = "*"
 pytest-cov = "*"