apexdevkit 1.23.11__tar.gz → 1.23.13__tar.gz

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/PKG-INFO

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

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/apexdevkit/fastapi/resource.py

@@ -7,7 +7,6 @@ from pydantic import BaseModel
 from starlette.responses import JSONResponse
 
 from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
-from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.query.query import (
     Aggregation,
@@ -88,13 +87,13 @@ class RestfulResource:
 
         return endpoint
 
-    def sum_with(self, Service, FilterOptions) -> _Endpoint:  # type: ignore
+    def aggregation_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),
+                    "aggregations": service.aggregation_with(options),
                 }
             except ForbiddenError as e:
                 return JSONResponse(self.response.forbidden(e), 403)
@@ -110,19 +109,6 @@ class RestfulResource:
 
         return endpoint
 
-    def aggregate_with(self, Service) -> _Endpoint:  # type: ignore
-        def endpoint(service: Service, options: _FooterOptions) -> _Response:
-            try:
-                return RestfulResponse(RestfulName("summary")).found_many(
-                    list(service.aggregate_with(options.to_footer_options()))
-                )
-            except ForbiddenError as e:
-                return JSONResponse(
-                    RestfulResponse(RestfulName("summary")).forbidden(e), 403
-                )
-
-        return endpoint
-
     def update_one(self, Service, ItemId, Updates) -> _Endpoint:  # type: ignore
         def endpoint(service: Service, item_id: ItemId, updates: Updates) -> _Response:
             try:

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/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, SumResponse
+from apexdevkit.fastapi.resource import RestfulResource
 from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.schema import RestfulSchema, Schema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
@@ -185,23 +185,25 @@ class RestfulRouter:
 
         return self
 
-    def with_sum_endpoint(
+    def with_aggregation_endpoint(
         self,
         dependency: Dependency | None = None,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(
-            "/sum",
-            self.resource.sum_with(
+            "/aggregation",
+            self.resource.aggregation_with(
                 Service=self._resolve(dependency),
-                FilterOptions=Annotated[RawItem, Depends(self.schema.for_sum())],
+                FilterOptions=Annotated[
+                    RawItem, Depends(self.schema.for_aggregation())
+                ],
             ),
             methods=["POST"],
             status_code=200,
             responses={},
-            response_model=SumResponse,
+            response_model=self.schema.for_aggregation_result(),
             include_in_schema=is_documented,
-            summary="Sum",
+            summary="Aggregation",
         )
 
         return self
@@ -224,24 +226,6 @@ class RestfulRouter:
 
         return self
 
-    def with_aggregate_endpoint(
-        self,
-        dependency: Dependency | None = None,
-        is_documented: bool = True,
-    ) -> Self:
-        self.router.add_api_route(
-            "/aggregate",
-            self.resource.aggregate_with(Service=self._resolve(dependency)),
-            methods=["POST"],
-            status_code=200,
-            responses={},
-            response_model=SummaryResponse,
-            include_in_schema=is_documented,
-            summary="Read Aggregated",
-        )
-
-        return self
-
     def with_update_one_endpoint(
         self,
         dependency: Dependency | None = None,

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/apexdevkit/fastapi/schema.py

@@ -9,6 +9,12 @@ from pydantic import BaseModel, create_model
 from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fluent import FluentDict
 from apexdevkit.http import JsonDict
+from apexdevkit.value import Value
+
+
+class AggregationResult(BaseModel):
+    field: str
+    aggregation: Value
 
 
 class SchemaFields(ABC):
@@ -24,9 +30,12 @@ class SchemaFields(ABC):
     def filters(self) -> FluentDict[type]:
         return JsonDict()
 
-    def sum_filters(self) -> FluentDict[type]:
+    def aggregation_filters(self) -> FluentDict[type]:
         return JsonDict()
 
+    def aggregation_result(self) -> FluentDict[type]:
+        return JsonDict().with_a(count=int).and_a(sums=list[AggregationResult])
+
     @abstractmethod
     def readable(self) -> FluentDict[type]:  # pragma: no cover
         pass
@@ -46,7 +55,8 @@ 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("Aggregation", self.fields.aggregation_filters())
+        self._schema_for("AggregationResult", self.fields.aggregation_result())
 
         self._schema_for("Item", {self.name.singular: schema})
         self._schema_for("Collection", {self.name.plural: list[schema], "count": int})
@@ -147,14 +157,23 @@ class RestfulSchema:
 
         return _
 
-    def for_sum(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self.schemas["Sum"]
+    def for_aggregation(self) -> Callable[[BaseModel], dict[str, Any]]:
+        schema = self.schemas["Aggregation"]
 
         def _(request: schema) -> dict[str, Any]:
             return request.model_dump()
 
         return _
 
+    def for_aggregation_result(self) -> type[BaseModel]:
+        return self._schema_for(
+            "AggregationResultResponse",
+            FluentDict[type]()
+            .with_a(status=str)
+            .and_a(code=int)
+            .and_a(aggregations=self.schemas["AggregationResult"]),
+        )
+
 
 @dataclass(frozen=True)
 class Schema:

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/apexdevkit/fastapi/service.py

@@ -6,7 +6,6 @@ from functools import cached_property
 from typing import Any, Generic, TypeVar
 
 from apexdevkit.formatter import Formatter
-from apexdevkit.query.query import FooterOptions, Summary
 from apexdevkit.repository.decorator import BruteForceBatch
 from apexdevkit.repository.interface import Repository
 
@@ -38,15 +37,12 @@ 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:
+    def aggregation_with(self, options: RawItem) -> RawItem:
         raise NotImplementedError(self.filter_with.__name__)
 
     def read_all(self) -> RawCollection:
         raise NotImplementedError(self.read_all.__name__)
 
-    def aggregate_with(self, options: FooterOptions) -> Iterable[Summary]:
-        raise NotImplementedError(self.aggregate_with.__name__)
-
     def update_one(self, item_id: str, **with_fields: Any) -> RawItem:
         raise NotImplementedError(self.update_one.__name__)
 

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/apexdevkit/http/httpx/client.py

@@ -54,6 +54,7 @@ class Httpx:
 
     @dataclass
     class Builder:
+        timeout_s: int = field(default_factory=lambda: 30)
         config: HttpxConfig = field(default_factory=default_config)
 
         request_handlers: list[_RequestHandler] = field(default_factory=list)
@@ -66,6 +67,11 @@ class Httpx:
 
             return self
 
+        def with_timeout(self, timeout_s: int) -> Httpx.Builder:
+            self.timeout_s = timeout_s
+
+            return self
+
         def and_config(self, value: HttpxConfig) -> Httpx.Builder:
             self.config = value
 
@@ -87,6 +93,7 @@ class Httpx:
         def _build_client(self) -> httpx.Client:
             return httpx.Client(
                 base_url=self.url,
+                timeout=self.timeout_s,
                 event_hooks={
                     "request": self._build_before_request_hooks(),
                     "response": self._build_after_response_hooks(),

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/apexdevkit/testing/rest.py

@@ -59,12 +59,12 @@ class _RestResource:
             ),
         )
 
-    def sum_with(self) -> _TestRequest:
+    def aggregation_with(self) -> _TestRequest:
         return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.post,
-                self.http.with_endpoint(self.name.plural).with_endpoint("sum"),
+                self.http.with_endpoint(self.name.plural).with_endpoint("aggregation"),
             ),
         )
 
@@ -77,15 +77,6 @@ class _RestResource:
             ),
         )
 
-    def aggregate_with(self) -> _TestRequest:
-        return _TestRequest(
-            RestfulName("summary"),
-            HttpRequest(
-                HttpMethod.post,
-                self.http.with_endpoint(self.name.plural).with_endpoint("aggregate"),
-            ),
-        )
-
     def update_one(self) -> _TestRequest:
         return _TestRequest(
             self.name,

{apexdevkit-1.23.11 → apexdevkit-1.23.13}/pyproject.toml

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