apexdevkit 1.20.3__tar.gz → 1.20.5__tar.gz

{apexdevkit-1.20.3 → apexdevkit-1.20.5}/PKG-INFO

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

{apexdevkit-1.20.3 → apexdevkit-1.20.5}/apexdevkit/fastapi/__init__.py

@@ -1,10 +1,10 @@
 from apexdevkit.fastapi.builder import FastApiBuilder, RestfulServiceBuilder
 from apexdevkit.fastapi.dependable import inject
-from apexdevkit.fastapi.service import RestfulRepositoryBuilder
+from apexdevkit.fastapi.service import RestfulRepository
 
 __all__ = [
     "FastApiBuilder",
     "RestfulServiceBuilder",
     "inject",
-    "RestfulRepositoryBuilder",
+    "RestfulRepository",
 ]

{apexdevkit-1.20.3 → apexdevkit-1.20.5}/apexdevkit/fastapi/builder.py

@@ -76,3 +76,11 @@ class RestfulServiceBuilder(ABC):
     @abstractmethod
     def build(self) -> RestfulService:  # pragma: no cover
         pass
+
+
+@dataclass
+class PreBuilt(RestfulServiceBuilder):  # pragma: no cover
+    service: RestfulService
+
+    def build(self) -> RestfulService:
+        return self.service

{apexdevkit-1.20.3 → apexdevkit-1.20.5}/apexdevkit/fastapi/dependable.py

@@ -4,9 +4,9 @@ from typing import Annotated, Any, Callable, Protocol
 from fastapi import Depends, Path
 from fastapi.requests import Request
 
-from apexdevkit.annotation import deprecated
 from apexdevkit.error import ApiError, DoesNotExistError
 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
@@ -72,17 +72,6 @@ class UserDependency:
         return Annotated[RestfulServiceBuilder, Depends(_)]
 
 
-@dataclass(frozen=True)
-class InfraDependency:
-    infra: RestfulServiceBuilder
-
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
-        def _() -> RestfulServiceBuilder:
-            return self.infra
-
-        return Annotated[RestfulServiceBuilder, Depends(_)]
-
-
 _BuilderCallable = Callable[..., RestfulServiceBuilder]
 
 
@@ -99,32 +88,25 @@ class BuilderCallableDependency:
 
 @dataclass(frozen=True)
 class DependableBuilder:
-    dependency: _Dependency | None = None
+    dependency: _Dependency
 
     @classmethod
     def from_callable(cls, value: _BuilderCallable) -> "DependableBuilder":
-        return DependableBuilder(BuilderCallableDependency(value))
+        return cls(BuilderCallableDependency(value))
 
-    @deprecated(
-        """
-        DependableBuilder().from_infra() is deprecated,
-        use DependencyBuilder.from_callable() instead
-        """
-    )
-    def from_infra(self, value: RestfulServiceBuilder) -> "DependableBuilder":
-        return DependableBuilder(InfraDependency(value))
+    @classmethod
+    def from_builder(cls, value: RestfulServiceBuilder) -> "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":
-        if self.dependency is None:
-            raise RuntimeError("RestfulServiceBuilder type not set")
         return DependableBuilder(ParentDependency(value, self.dependency))
 
     def with_user(self, extract_user: Callable[..., Any]) -> "DependableBuilder":
-        if self.dependency is None:
-            raise RuntimeError("RestfulServiceBuilder type not set")
         return DependableBuilder(UserDependency(extract_user, self.dependency))
 
     def as_dependable(self) -> type[RestfulService]:
-        if self.dependency is None:
-            raise RuntimeError("RestfulServiceBuilder type not set")
         return ServiceDependency(self.dependency).as_dependable()

{apexdevkit-1.20.3 → apexdevkit-1.20.5}/apexdevkit/fastapi/router.py

@@ -6,7 +6,6 @@ from typing import Annotated, Any, Protocol, Self, TypeVar
 from fastapi import APIRouter, Depends, Path, Query
 from fastapi.responses import JSONResponse
 
-from apexdevkit.fastapi.builder import RestfulServiceBuilder
 from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.resource import RestfulResource, SummaryResponse
 from apexdevkit.fastapi.response import RestfulResponse
@@ -24,14 +23,6 @@ class Dependency(Protocol):  # pragma: no cover
         pass
 
 
-@dataclass
-class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
-    service: RestfulService
-
-    def build(self) -> RestfulService:
-        return self.service
-
-
 @dataclass
 class RestfulRouter:
     router: APIRouter = field(default_factory=APIRouter)

{apexdevkit-1.20.3 → apexdevkit-1.20.5}/apexdevkit/fastapi/service.py

@@ -63,30 +63,10 @@ ItemT = TypeVar("ItemT")
 
 
 @dataclass(frozen=True)
-class RestfulRepositoryBuilder(Generic[ItemT]):
-    formatter: Formatter[Mapping[str, Any], ItemT] | None = None
-    repository: Repository[ItemT] | None = None
-
-    def with_formatter(
-        self, formatter: Formatter[Mapping[str, Any], ItemT]
-    ) -> RestfulRepositoryBuilder[ItemT]:
-        return RestfulRepositoryBuilder[ItemT](formatter, self.repository)
-
-    def with_repository(
-        self, repository: Repository[ItemT]
-    ) -> RestfulRepositoryBuilder[ItemT]:
-        return RestfulRepositoryBuilder[ItemT](self.formatter, repository)
-
-    def build(self) -> RestfulService:
-        if self.formatter is None or self.repository is None:
-            raise RuntimeError("Formatter or repository not provided.")
-        return _RestfulRepository(self.formatter, self.repository)
-
+class RestfulRepository(RestfulService, Generic[ItemT]):
+    repository: Repository[ItemT]
 
-@dataclass(frozen=True)
-class _RestfulRepository(RestfulService, Generic[ItemT]):
     formatter: Formatter[Mapping[str, Any], ItemT]
-    repository: Repository[ItemT]
 
     def create_one(self, item: RawItem) -> RawItem:
         return self.formatter.dump(self.repository.create(self.formatter.load(item)))

{apexdevkit-1.20.3 → apexdevkit-1.20.5}/pyproject.toml

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