apexdevkit 1.5.24__tar.gz → 1.6.1__tar.gz

{apexdevkit-1.5.24 → apexdevkit-1.6.1}/PKG-INFO

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

apexdevkit-1.6.1/apexdevkit/fastapi/dependable.py

@@ -0,0 +1,100 @@
+from dataclasses import dataclass, field
+from typing import Annotated, Any, Callable, Protocol, Self
+
+from fastapi import Depends, Path
+from fastapi.requests import Request
+
+from apexdevkit.fastapi import RestfulServiceBuilder
+from apexdevkit.fastapi.service import RestfulService
+from apexdevkit.testing import RestfulName
+
+
+def inject(dependency: str) -> Any:  # pragma: no cover
+    def get(request: Request) -> Any:
+        return getattr(request.app.state, dependency)
+
+    return Depends(get)
+
+
+class _Dependency(Protocol):
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        pass
+
+
+@dataclass
+class ServiceDependency:
+    dependency: _Dependency
+
+    def as_dependable(self) -> type[RestfulService]:
+        Builder = self.dependency.as_dependable()
+
+        def _(builder: Builder) -> RestfulService:
+            return builder.build()
+
+        return Annotated[RestfulService, Depends(_)]
+
+
+@dataclass
+class ParentDependency:
+    parent: RestfulName
+    dependency: _Dependency
+
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        Builder = self.dependency.as_dependable()
+        ParentId = Annotated[str, Path(alias=self.parent.singular + "_id")]
+
+        def _(builder: Builder, parent_id: ParentId) -> RestfulServiceBuilder:
+            return builder.with_parent(parent_id)
+
+        return Annotated[RestfulServiceBuilder, Depends(_)]
+
+
+@dataclass
+class UserDependency:
+    extract_user: Callable[..., Any]
+    dependency: _Dependency
+
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        Builder = self.dependency.as_dependable()
+        User = Annotated[Any, Depends(self.extract_user)]
+
+        def _(builder: Builder, user: User) -> RestfulServiceBuilder:
+            return builder.with_user(user)
+
+        return Annotated[RestfulServiceBuilder, Depends(_)]
+
+
+@dataclass
+class InfraDependency:
+    infra: RestfulServiceBuilder
+
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        def _() -> RestfulServiceBuilder:
+            return self.infra
+
+        return Annotated[RestfulServiceBuilder, Depends(_)]
+
+
+@dataclass
+class DependableBuilder:
+    dependency: _Dependency = field(init=False)
+
+    def from_infra(self, value: RestfulServiceBuilder) -> Self:
+        self.dependency = InfraDependency(value)
+
+        return self
+
+    def with_parent(self, value: RestfulName) -> Self:
+        dependable = DependableBuilder()
+        dependable.dependency = ParentDependency(value, self.dependency)
+
+        return dependable
+
+    def with_user(self, extract_user: Callable[..., Any]) -> Self:
+        dependable = DependableBuilder()
+        dependable.dependency = UserDependency(extract_user, self.dependency)
+
+        return dependable
+
+    def as_dependable(self) -> type[RestfulService]:
+        return ServiceDependency(self.dependency).as_dependable()

{apexdevkit-1.5.24 → apexdevkit-1.6.1}/apexdevkit/fastapi/router.py

@@ -1,14 +1,12 @@
 from dataclasses import dataclass, field
 from functools import cached_property
-from typing import Annotated, Any, Callable, Self, Type, TypeVar
+from typing import Annotated, Any, Protocol, Self, TypeVar
 
-from fastapi import APIRouter, Depends, HTTPException, Path
+from fastapi import APIRouter, Depends, Path
 from fastapi.responses import JSONResponse
 
-from apexdevkit.error import DoesNotExistError
 from apexdevkit.fastapi.builder import RestfulServiceBuilder
 from apexdevkit.fastapi.resource import RestfulResource
-from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.schema import RestfulSchema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
 from apexdevkit.testing import RestfulName
@@ -18,6 +16,11 @@ _Response = JSONResponse | dict[str, Any]
 T = TypeVar("T")
 
 
+class Dependable(Protocol):
+    def as_dependable(self) -> type[RestfulService]:
+        pass
+
+
 @dataclass
 class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
     service: RestfulService
@@ -26,27 +29,13 @@ class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
         return self.service
 
 
-def no_user() -> None:
-    pass
-
-
 @dataclass
 class RestfulRouter:
-    service: RestfulService | None = None
-
     router: APIRouter = field(default_factory=APIRouter)
 
     name: RestfulName = field(init=False)
     fields: SchemaFields = field(init=False)
 
-    parent: str = field(init=False, default="")
-
-    infra: RestfulServiceBuilder = field(init=False)
-
-    def __post_init__(self) -> None:  # pragma: no cover
-        if self.service:
-            self.with_infra(PreBuiltRestfulService(self.service))
-
     @cached_property
     def schema(self) -> RestfulSchema:
         return RestfulSchema(name=self.name, fields=self.fields)
@@ -59,10 +48,6 @@ class RestfulRouter:
     def id_alias(self) -> str:
         return self.name.singular + "_id"
 
-    @property
-    def parent_id_alias(self) -> str:
-        return self.parent + "_id"
-
     @property
     def item_path(self) -> str:
         return "/{" + self.id_alias + "}"
@@ -77,25 +62,15 @@ class RestfulRouter:
 
         return self
 
-    def with_parent(self, name: str) -> Self:
-        self.parent = name
-
-        return self
-
-    def with_infra(self, value: RestfulServiceBuilder) -> Self:
-        self.infra = value
-
-        return self
-
     def with_create_one_endpoint(
         self,
+        dependable: Dependable,
         is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.create_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Item=Annotated[
                     RawItem,
                     Depends(self.schema.for_create_one()),
@@ -112,14 +87,12 @@ class RestfulRouter:
         return self
 
     def with_create_many_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "/batch",
             self.resource.create_many(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_create_many()),
@@ -136,14 +109,12 @@ class RestfulRouter:
         return self
 
     def with_read_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
             self.resource.read_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -160,14 +131,12 @@ class RestfulRouter:
         return self
 
     def with_read_all_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.read_all(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
             ),
             methods=["GET"],
             status_code=200,
@@ -180,14 +149,12 @@ class RestfulRouter:
         return self
 
     def with_update_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
             self.resource.update_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -208,14 +175,12 @@ class RestfulRouter:
         return self
 
     def with_update_many_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.update_many(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_update_many()),
@@ -232,14 +197,12 @@ class RestfulRouter:
         return self
 
     def with_replace_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.replace_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Item=Annotated[
                     RawItem,
                     Depends(self.schema.for_replace_one()),
@@ -256,14 +219,12 @@ class RestfulRouter:
         return self
 
     def with_replace_many_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "/batch",
             self.resource.replace_many(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_replace_many()),
@@ -280,14 +241,12 @@ class RestfulRouter:
         return self
 
     def with_delete_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
             self.resource.delete_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -309,45 +268,16 @@ class RestfulRouter:
 
         return self
 
-    def default(self) -> Self:
+    def default(self, dependable: Dependable) -> Self:
         return (
-            self.with_create_one_endpoint()
-            .with_create_many_endpoint()
-            .with_read_one_endpoint()
-            .with_read_all_endpoint()
-            .with_update_one_endpoint()
-            .with_update_many_endpoint()
-            .with_delete_one_endpoint()
+            self.with_create_one_endpoint(dependable)
+            .with_create_many_endpoint(dependable)
+            .with_read_one_endpoint(dependable)
+            .with_read_all_endpoint(dependable)
+            .with_update_one_endpoint(dependable)
+            .with_update_many_endpoint(dependable)
+            .with_delete_one_endpoint(dependable)
         )
 
     def build(self) -> APIRouter:
         return self.router
-
-    def _service(
-        self, extract_user: Callable[..., Any] = no_user
-    ) -> Type[RestfulService]:
-        User = Annotated[Any, Depends(extract_user)]
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def srv_child(user: User, parent_id: ParentId) -> RestfulService:
-            try:
-                return self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                raise HTTPException(
-                    status_code=404,
-                    detail=RestfulResponse(RestfulName(self.parent)).not_found(e),
-                )
-
-        def srv_root(user: User) -> RestfulService:
-            try:
-                return self.infra.with_user(user).build()
-            except DoesNotExistError as e:
-                raise HTTPException(
-                    status_code=404,
-                    detail=RestfulResponse(RestfulName(self.parent)).not_found(e),
-                )
-
-        if self.parent:
-            return Annotated[RestfulService, Depends(srv_child)]  # type: ignore
-        else:
-            return Annotated[RestfulService, Depends(srv_root)]  # type: ignore

{apexdevkit-1.5.24 → apexdevkit-1.6.1}/apexdevkit/http/httpx.py

@@ -4,34 +4,37 @@ from dataclasses import dataclass, field
 from typing import Any, Iterator, Mapping, Self
 
 import httpx
+from httpx import Client
 
 from apexdevkit.http.fluent import HttpMethod, HttpResponse
 from apexdevkit.http.json import JsonDict
-from apexdevkit.http.url import HttpUrl
+
+
+def default_config() -> HttpxConfig:
+    return HttpxConfig()
 
 
 @dataclass(frozen=True)
 class Httpx:
-    url: HttpUrl
-    config: HttpxConfig
+    client: httpx.Client
+
+    config: HttpxConfig = field(default_factory=default_config)
 
     @classmethod
     def create_for(cls, url: str) -> Self:
-        return cls(HttpUrl(url), HttpxConfig())
+        return cls(Client(base_url=url), HttpxConfig())
 
     def with_header(self, key: str, value: str) -> Httpx:
-        return Httpx(self.url, self.config.with_header(key, value))
+        return Httpx(self.client, self.config.with_header(key, value))
 
     def with_param(self, key: str, value: str) -> Httpx:
-        return Httpx(self.url, self.config.with_param(key, value))
+        return Httpx(self.client, self.config.with_param(key, value))
 
     def with_json(self, value: JsonDict) -> Httpx:
-        return Httpx(self.url, self.config.with_json(value))
+        return Httpx(self.client, self.config.with_json(value))
 
     def request(self, method: HttpMethod, endpoint: str) -> HttpResponse:
-        return _HttpxResponse(
-            httpx.request(method.name, self.url + endpoint, **self.config)
-        )
+        return _HttpxResponse(self.client.request(method.name, endpoint, **self.config))
 
 
 @dataclass

{apexdevkit-1.5.24 → apexdevkit-1.6.1}/apexdevkit/testing/rest.py

@@ -5,67 +5,76 @@ from dataclasses import dataclass, field
 from functools import cached_property
 from typing import Any, Iterable, Self
 
-import httpx
 from fastapi.testclient import TestClient
 
-from apexdevkit.http import HttpUrl, JsonDict
+from apexdevkit.http import Http, HttpUrl, JsonDict
+from apexdevkit.http.fluent import HttpMethod, HttpResponse
+from apexdevkit.http.httpx import Httpx
 
 
 @dataclass
 class RestResource:
-    http: TestClient
+    http: TestClient | Http
     name: RestfulName
 
+    def __post_init__(self) -> None:
+        if isinstance(self.http, TestClient):
+            self.http = Httpx(self.http)
+
+    @property
+    def _http(self) -> Http:
+        assert not isinstance(self.http, TestClient)
+
+        return self.http
+
     def create_one(self) -> CreateOne:
-        return CreateOne(self.name, self.http)
+        return CreateOne(self.name, self._http)
 
     def create_many(self) -> CreateMany:
-        return CreateMany(self.name, self.http)
+        return CreateMany(self.name, self._http)
 
     def read_one(self) -> ReadOne:
-        return ReadOne(self.name, self.http)
+        return ReadOne(self.name, self._http)
 
     def read_all(self) -> ReadAll:
-        return ReadAll(self.name, self.http)
+        return ReadAll(self.name, self._http)
 
     def update_one(self) -> UpdateOne:
-        return UpdateOne(self.name, self.http)
+        return UpdateOne(self.name, self._http)
 
     def update_many(self) -> UpdateMany:
-        return UpdateMany(self.name, self.http)
+        return UpdateMany(self.name, self._http)
 
     def replace_one(self) -> ReplaceOne:
-        return ReplaceOne(self.name, self.http)
+        return ReplaceOne(self.name, self._http)
 
     def replace_many(self) -> ReplaceMany:
-        return ReplaceMany(self.name, self.http)
+        return ReplaceMany(self.name, self._http)
 
     def delete_one(self) -> DeleteOne:
-        return DeleteOne(self.name, self.http)
+        return DeleteOne(self.name, self._http)
 
 
 @dataclass
 class RestCollection(RestResource):
     def sub_resource(self, name: str) -> RestItem:
-        return RestItem(
-            TestClient(
-                self.http.app,
-                base_url=HttpUrl(str(self.http.base_url)) + self.name.plural,
-            ),
-            RestfulName(name),
-        )
+        assert isinstance(self.http, Httpx), "sub resource only works with Httpx"
+
+        client = self.http.client
+        client.base_url = client.base_url.join(self.name.plural)
+
+        return RestItem(self.http, RestfulName(name))
 
 
 @dataclass
 class RestItem(RestResource):
     def sub_resource(self, name: str) -> RestItem:
-        return RestItem(
-            TestClient(
-                self.http.app,
-                base_url=HttpUrl(str(self.http.base_url)) + self.name.singular,
-            ),
-            RestfulName(name),
-        )
+        assert isinstance(self.http, Httpx), "sub resource only works with Httpx"
+
+        client = self.http.client
+        client.base_url = client.base_url.join(self.name.plural)
+
+        return RestItem(self.http, RestfulName(name))
 
 
 @dataclass
@@ -103,11 +112,11 @@ def as_plural(singular: str) -> str:
 @dataclass
 class RestRequest:
     resource: RestfulName
-    http: TestClient
+    http: Http
 
     @abstractmethod
     @cached_property
-    def response(self) -> httpx.Response:  # pragma: no cover
+    def response(self) -> HttpResponse:  # pragma: no cover
         pass
 
     def unpack(self) -> JsonDict:
@@ -122,7 +131,7 @@ class RestRequest:
         return RestResponse(
             resource=self.resource,
             json=JsonDict(self.response.json()),
-            http_code=self.response.status_code,
+            http_code=self.response.code(),
         )
 
 
@@ -136,8 +145,11 @@ class CreateOne(RestRequest):
         return self
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.post(self.resource + "", json=dict(self.data))
+    def response(self) -> HttpResponse:
+        return self.http.with_json(self.data).request(
+            method=HttpMethod.post,
+            endpoint=self.resource + "",
+        )
 
 
 @dataclass
@@ -145,8 +157,11 @@ class ReadOne(RestRequest):
     item_id: str = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.get(self.resource + str(self.item_id))
+    def response(self) -> HttpResponse:
+        return self.http.request(
+            method=HttpMethod.get,
+            endpoint=self.resource + str(self.item_id),
+        )
 
     def with_id(self, value: Any) -> Self:
         self.item_id = str(value)
@@ -159,8 +174,12 @@ class ReadAll(RestRequest):
     params: dict[str, Any] = field(init=False, default_factory=dict)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.get(self.resource + "", params=self.params)
+    def response(self) -> HttpResponse:
+        http = self.http
+        for param, value in self.params.items():
+            http = http.with_param(param, value)
+
+        return http.request(method=HttpMethod.get, endpoint=self.resource + "")
 
     def with_params(self, **kwargs: Any) -> Self:
         self.params = {**kwargs}
@@ -174,8 +193,11 @@ class UpdateOne(RestRequest):
     data: JsonDict = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.patch(self.resource + str(self.item_id), json=dict(self.data))
+    def response(self) -> HttpResponse:
+        return self.http.with_json(self.data).request(
+            method=HttpMethod.patch,
+            endpoint=self.resource + str(self.item_id),
+        )
 
     def with_id(self, value: Any) -> Self:
         self.item_id = str(value)
@@ -193,8 +215,11 @@ class ReplaceOne(RestRequest):
     data: JsonDict = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.put(self.resource + "", json=dict(self.data))
+    def response(self) -> HttpResponse:
+        return self.http.with_json(self.data).request(
+            method=HttpMethod.put,
+            endpoint=self.resource + "",
+        )
 
     def from_data(self, value: JsonDict) -> Self:
         self.data = value
@@ -207,10 +232,12 @@ class CreateMany(RestRequest):
     data: list[JsonDict] = field(default_factory=list)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.post(
-            self.resource + "batch",
-            json={self.resource.plural: [dict(data) for data in self.data]},
+    def response(self) -> HttpResponse:
+        json = JsonDict({self.resource.plural: [dict(data) for data in self.data]})
+
+        return self.http.with_json(json).request(
+            method=HttpMethod.post,
+            endpoint=self.resource + "batch",
         )
 
     def from_data(self, value: JsonDict) -> Self:
@@ -227,10 +254,12 @@ class UpdateMany(RestRequest):
     data: list[JsonDict] = field(default_factory=list)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.patch(
-            self.resource + "",
-            json={self.resource.plural: [dict(data) for data in self.data]},
+    def response(self) -> HttpResponse:
+        json = JsonDict({self.resource.plural: [dict(data) for data in self.data]})
+
+        return self.http.with_json(json).request(
+            method=HttpMethod.patch,
+            endpoint=self.resource + "",
         )
 
     def from_data(self, value: JsonDict) -> Self:
@@ -247,10 +276,12 @@ class ReplaceMany(RestRequest):
     data: list[JsonDict] = field(default_factory=list)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.put(
-            self.resource + "batch",
-            json={self.resource.plural: [dict(data) for data in self.data]},
+    def response(self) -> HttpResponse:
+        json = JsonDict({self.resource.plural: [dict(data) for data in self.data]})
+
+        return self.http.with_json(json).request(
+            method=HttpMethod.put,
+            endpoint=self.resource + "batch",
         )
 
     def from_data(self, value: JsonDict) -> Self:
@@ -267,8 +298,11 @@ class DeleteOne(RestRequest):
     item_id: str = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.delete(self.resource + str(self.item_id))
+    def response(self) -> HttpResponse:
+        return self.http.request(
+            method=HttpMethod.delete,
+            endpoint=self.resource + str(self.item_id),
+        )
 
     def with_id(self, value: Any) -> Self:
         self.item_id = str(value)

{apexdevkit-1.5.24 → apexdevkit-1.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.5.24"
+version = "1.6.1"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"
@@ -25,7 +25,7 @@ ruff = "*"
 python_version = "3.11"
 ignore_missing_imports = true
 strict = true
-exclude = ["apexdevkit/fastapi/schema.py"]
+exclude = ["apexdevkit/fastapi/schema.py", "apexdevkit/fastapi/dependable.py"]
 
 [tool.ruff]
 target-version = "py311"

apexdevkit-1.5.24/apexdevkit/fastapi/dependable.py

@@ -1,11 +0,0 @@
-from typing import Any
-
-from fastapi import Depends
-from fastapi.requests import Request
-
-
-def inject(dependency: str) -> Any:  # pragma: no cover
-    def get(request: Request) -> Any:
-        return getattr(request.app.state, dependency)
-
-    return Depends(get)