apexdevkit 1.23.6__tar.gz → 1.23.8__tar.gz

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/PKG-INFO

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

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/fastapi/resource.py

@@ -88,6 +88,19 @@ class RestfulResource:
 
         return endpoint
 
+    def sum_with(self, Service, FilterOptions) -> _Endpoint:  # type: ignore
+        def endpoint(service: Service, options: FilterOptions) -> _Response:
+            try:
+                return {
+                    "status": "success",
+                    "code": 200,
+                    "count": service.sum_with(options),
+                }
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+        return endpoint
+
     def read_all(self, Service) -> _Endpoint:  # type: ignore
         def endpoint(service: Service) -> _Response:
             try:
@@ -312,3 +325,9 @@ class SummaryResponse(BaseModel):
     status: str
     code: int
     data: _SummaryListEnvelope
+
+
+class SumResponse(BaseModel):
+    status: str
+    code: int
+    count: int

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/fastapi/router.py

@@ -7,7 +7,7 @@ from fastapi import APIRouter, Depends, Path, Query
 from fastapi.responses import JSONResponse
 
 from apexdevkit.fastapi.name import RestfulName
-from apexdevkit.fastapi.resource import RestfulResource, SummaryResponse
+from apexdevkit.fastapi.resource import RestfulResource, SummaryResponse, SumResponse
 from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.schema import RestfulSchema, Schema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
@@ -185,6 +185,27 @@ class RestfulRouter:
 
         return self
 
+    def with_sum_endpoint(
+        self,
+        dependency: Dependency | None = None,
+        is_documented: bool = True,
+    ) -> Self:
+        self.router.add_api_route(
+            "/sum",
+            self.resource.sum_with(
+                Service=self._resolve(dependency),
+                FilterOptions=Annotated[RawItem, Depends(self.schema.for_sum())],
+            ),
+            methods=["POST"],
+            status_code=200,
+            responses={},
+            response_model=SumResponse,
+            include_in_schema=is_documented,
+            summary="Sum",
+        )
+
+        return self
+
     def with_read_all_endpoint(
         self,
         dependency: Dependency | None = None,

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/fastapi/schema.py

@@ -24,6 +24,9 @@ class SchemaFields(ABC):
     def filters(self) -> FluentDict[type]:
         return JsonDict()
 
+    def sum_filters(self) -> FluentDict[type]:
+        return JsonDict()
+
     @abstractmethod
     def readable(self) -> FluentDict[type]:  # pragma: no cover
         pass
@@ -43,6 +46,7 @@ class RestfulSchema:
             "UpdateManyItem", self.fields.editable().merge(self.fields.id())
         )
         self._schema_for("Filter", self.fields.filters())
+        self._schema_for("Sum", self.fields.sum_filters())
 
         self._schema_for("Item", {self.name.singular: schema})
         self._schema_for("Collection", {self.name.plural: list[schema], "count": int})
@@ -143,6 +147,14 @@ class RestfulSchema:
 
         return _
 
+    def for_sum(self) -> Callable[[BaseModel], dict[str, Any]]:
+        schema = self.schemas["Sum"]
+
+        def _(request: schema) -> dict[str, Any]:
+            return request.model_dump()
+
+        return _
+
 
 @dataclass(frozen=True)
 class Schema:

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/fastapi/service.py

@@ -38,6 +38,9 @@ class RestfulService:  # pragma: no cover
     def filter_with(self, options: RawItem) -> RawCollection:
         raise NotImplementedError(self.filter_with.__name__)
 
+    def sum_with(self, options: RawItem) -> int:
+        raise NotImplementedError(self.filter_with.__name__)
+
     def read_all(self) -> RawCollection:
         raise NotImplementedError(self.read_all.__name__)
 

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/http/fake.py

@@ -45,7 +45,7 @@ class FakeHttp:
     headers: dict[str, str] = field(default_factory=dict)
     params: dict[str, str] = field(default_factory=dict)
     json: JsonDict = field(default_factory=JsonDict)
-    data: JsonDict = field(default_factory=JsonDict)
+    data: Any = field(default_factory=JsonDict)
 
     _request: InterceptedRequest = field(init=False)
 
@@ -67,7 +67,7 @@ class FakeHttp:
 
         return self
 
-    def with_data(self, value: JsonDict) -> Self:
+    def with_data(self, value: Any) -> Self:
         self.data = value
 
         return self

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/http/fluent.py

@@ -20,7 +20,7 @@ class Http(Protocol):  # pragma: no cover
     def with_json(self, value: JsonDict) -> Http:
         pass
 
-    def with_data(self, value: JsonDict) -> Http:
+    def with_data(self, value: Any) -> Http:
         pass
 
     def request(self, method: HttpMethod, endpoint: str = "") -> HttpResponse:
@@ -68,10 +68,10 @@ class FluentHttp:
     def with_json(self, value: JsonDict) -> FluentHttp:
         return FluentHttp(self.http.with_json(value))
 
-    def and_data(self, value: JsonDict) -> FluentHttp:
+    def and_data(self, value: Any) -> FluentHttp:
         return self.with_data(value)
 
-    def with_data(self, value: JsonDict) -> FluentHttp:
+    def with_data(self, value: Any) -> FluentHttp:
         return FluentHttp(self.http.with_data(value))
 
     def post(self) -> FluentHttpRequest:

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/http/httpx/client.py

@@ -38,7 +38,7 @@ class Httpx:
     def with_param(self, key: str, value: str) -> Httpx:
         return Httpx(self.client, self.config.with_param(key, value))
 
-    def with_data(self, value: JsonDict) -> Httpx:
+    def with_data(self, value: Any) -> Httpx:
         return Httpx(self.client, self.config.with_data(value))
 
     def with_json(self, value: JsonDict) -> Httpx:
@@ -120,7 +120,7 @@ class HttpxConfig(Mapping[str, Any]):
     headers: JsonDict = field(default_factory=JsonDict)
     params: JsonDict = field(default_factory=JsonDict)
     json: JsonDict | None = None
-    data: JsonDict | None = None
+    data: Any | None = None
 
     def with_endpoint(self, endpoint: str) -> HttpxConfig:
         return HttpxConfig(
@@ -149,7 +149,7 @@ class HttpxConfig(Mapping[str, Any]):
             data=self.data,
         )
 
-    def with_data(self, value: JsonDict) -> HttpxConfig:
+    def with_data(self, value: Any) -> HttpxConfig:
         return HttpxConfig(
             endpoint=self.endpoint,
             headers=self.headers,
@@ -173,9 +173,14 @@ class HttpxConfig(Mapping[str, Any]):
             "headers": dict(self.headers),
             "params": dict(self.params),
             "json": dict(self.json) if self.json is not None else None,
-            "data": dict(self.data) if self.data is not None else None,
+            "data": self._data() if self.data is not None else None,
         }
 
+    def _data(self) -> Any:
+        if isinstance(self.data, Mapping):
+            return dict(self.data)
+        return str(self.data)
+
     def __len__(self) -> int:
         return len(self.as_dict())
 

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/apexdevkit/testing/rest.py

@@ -59,6 +59,15 @@ class _RestResource:
             ),
         )
 
+    def sum_with(self) -> _TestRequest:
+        return _TestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.post,
+                self.http.with_endpoint(self.name.plural).with_endpoint("sum"),
+            ),
+        )
+
     def read_all(self) -> _TestRequest:
         return _TestRequest(
             self.name,

{apexdevkit-1.23.6 → apexdevkit-1.23.8}/pyproject.toml

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