apexdevkit 1.23.4__tar.gz → 1.23.6__tar.gz

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

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

apexdevkit-1.23.6/apexdevkit/date.py

@@ -0,0 +1,79 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import UTC, datetime
+from zoneinfo import ZoneInfo
+
+
+@dataclass(frozen=True)
+class DateTime:
+    timestamp_ms: int
+
+    # Date in format of "yyyy-mm-dd"
+    def as_date(self, time_zone: ZoneInfo | None = None) -> str:
+        if time_zone is None:
+            time_zone = ZoneInfo("UTC")
+
+        dt = datetime.fromtimestamp(self.as_timestamp(), tz=UTC)
+        local_dt = dt.astimezone(time_zone)
+        return local_dt.strftime("%Y-%m-%d")
+
+    # Date in format of "yyyy-mm-ddTHH:MM:SS"
+    def as_date_time(self, time_zone: ZoneInfo | None = None) -> str:
+        if time_zone is None:
+            time_zone = ZoneInfo("UTC")
+
+        dt = datetime.fromtimestamp(self.as_timestamp(), tz=UTC)
+        local_dt = dt.astimezone(time_zone)
+        return local_dt.strftime("%Y-%m-%dT%H:%M:%S")
+
+    def as_timestamp(self) -> float:
+        return float(self.timestamp_ms) / 1000.0
+
+    def as_timestamp_ms(self) -> int:
+        return self.timestamp_ms
+
+    # Date in format of "yyyy-mm-dd"
+    @classmethod
+    def from_date(cls, date: str, time_zone: ZoneInfo | None = None) -> DateTime:
+        if time_zone is None:
+            time_zone = ZoneInfo("UTC")
+
+        try:
+            dt = datetime.strptime(date, "%Y-%m-%d")
+            dt = dt.replace(tzinfo=time_zone)
+            timestamp_ms = int(dt.timestamp() * 1000)
+            return cls(timestamp_ms=timestamp_ms)
+
+        except ValueError as e:
+            raise ValueError(
+                f"Invalid date format: '{date}'. Expected 'yyyy-mm-dd'."
+            ) from e
+
+    # Date in format of "yyyy-mm-ddTHH:MM:SS"
+    @classmethod
+    def from_date_time(
+        cls, date_time: str, time_zone: ZoneInfo | None = None
+    ) -> DateTime:
+        if time_zone is None:
+            time_zone = ZoneInfo("UTC")
+
+        try:
+            dt = datetime.strptime(date_time, "%Y-%m-%dT%H:%M:%S")
+            dt = dt.replace(tzinfo=time_zone)
+            timestamp_ms = int(dt.timestamp() * 1000)
+            return cls(timestamp_ms=timestamp_ms)
+        except ValueError as e:
+            raise ValueError(
+                f"Invalid datetime format: '{date_time}'."
+                f" Expected 'yyyy-mm-ddTHH:MM:SS'."
+            ) from e
+
+    @classmethod
+    def from_timestamp(cls, timestamp: float) -> DateTime:
+        timestamp_ms = int(timestamp * 1000)
+        return cls(timestamp_ms=timestamp_ms)
+
+    @classmethod
+    def from_timestamp_ms(cls, timestamp_ms: int) -> DateTime:
+        return cls(timestamp_ms=timestamp_ms)

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

@@ -79,12 +79,10 @@ 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)
 

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

@@ -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={},

{apexdevkit-1.23.4 → apexdevkit-1.23.6}/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,9 @@ class SchemaFields(ABC):
     def editable(self) -> FluentDict[type]:
         return self.readable().drop("id")
 
+    def filters(self) -> FluentDict[type]:
+        return JsonDict()
+
     @abstractmethod
     def readable(self) -> FluentDict[type]:  # pragma: no cover
         pass
@@ -38,6 +42,7 @@ 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("Item", {self.name.singular: schema})
         self._schema_for("Collection", {self.name.plural: list[schema], "count": int})
@@ -130,6 +135,14 @@ 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 _
+
 
 @dataclass(frozen=True)
 class Schema:

{apexdevkit-1.23.4 → apexdevkit-1.23.6}/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,7 @@ 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 read_all(self) -> RawCollection:

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

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