apexdevkit 1.23.5__tar.gz → 1.23.7__tar.gz

{apexdevkit-1.23.5 → apexdevkit-1.23.7}/PKG-INFO

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

{apexdevkit-1.23.5 → apexdevkit-1.23.7}/apexdevkit/fastapi/resource.py

@@ -79,12 +79,23 @@ class RestfulResource:
 
         return endpoint
 
-    def filter_with(self, Service) -> _Endpoint:  # type: ignore
-        def endpoint(service: Service, options: _QueryOptions) -> _Response:
+    def filter_with(self, Service, QueryOptions) -> _Endpoint:  # type: ignore
+        def endpoint(service: Service, options: QueryOptions) -> _Response:
             try:
-                return self.response.found_many(
-                    list(service.filter_with(options.to_query_options()))
-                )
+                return self.response.found_many(list(service.filter_with(options)))
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+        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)
 
@@ -314,3 +325,9 @@ class SummaryResponse(BaseModel):
     status: str
     code: int
     data: _SummaryListEnvelope
+
+
+class SumResponse(BaseModel):
+    status: str
+    code: int
+    count: int

{apexdevkit-1.23.5 → apexdevkit-1.23.7}/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
@@ -171,7 +171,10 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             "/filter",
-            self.resource.filter_with(Service=self._resolve(dependency)),
+            self.resource.filter_with(
+                Service=self._resolve(dependency),
+                QueryOptions=Annotated[RawItem, Depends(self.schema.for_filters())],
+            ),
             methods=["POST"],
             status_code=200,
             responses={},
@@ -182,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.5 → apexdevkit-1.23.7}/apexdevkit/fastapi/schema.py

@@ -8,6 +8,7 @@ from pydantic import BaseModel, create_model
 
 from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fluent import FluentDict
+from apexdevkit.http import JsonDict
 
 
 class SchemaFields(ABC):
@@ -20,6 +21,12 @@ class SchemaFields(ABC):
     def editable(self) -> FluentDict[type]:
         return self.readable().drop("id")
 
+    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
@@ -38,6 +45,8 @@ class RestfulSchema:
         update_many_item = self._schema_for(
             "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})
@@ -130,6 +139,22 @@ class RestfulSchema:
 
         return _
 
+    def for_filters(self) -> Callable[[BaseModel], dict[str, Any]]:
+        schema = self.schemas["Filter"]
+
+        def _(request: schema) -> dict[str, Any]:
+            return request.model_dump()
+
+        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.5 → apexdevkit-1.23.7}/apexdevkit/fastapi/service.py

@@ -6,7 +6,7 @@ from functools import cached_property
 from typing import Any, Generic, TypeVar
 
 from apexdevkit.formatter import Formatter
-from apexdevkit.query.query import FooterOptions, QueryOptions, Summary
+from apexdevkit.query.query import FooterOptions, Summary
 from apexdevkit.repository.decorator import BruteForceBatch
 from apexdevkit.repository.interface import Repository
 
@@ -35,7 +35,10 @@ class RestfulService:  # pragma: no cover
     def read_many(self, **params: Any) -> RawCollection:
         raise NotImplementedError(self.read_many.__name__)
 
-    def filter_with(self, options: QueryOptions) -> RawCollection:
+    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:

{apexdevkit-1.23.5 → apexdevkit-1.23.7}/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.5 → apexdevkit-1.23.7}/pyproject.toml

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