apexdevkit 1.33.1__tar.gz → 2.0.2__tar.gz

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/PKG-INFO

@@ -1,20 +1,19 @@
 Metadata-Version: 2.4
 Name: apexdevkit
-Version: 1.33.1
+Version: 2.0.2
 Summary: Apex Development Tools for python.
 License-File: LICENSE
 Author: Apex Dev
 Author-email: dev@apex.ge
-Requires-Python: >=3.11,<4
+Requires-Python: >=3.12,<4
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: fastapi
-Requires-Dist: httpx
 Requires-Dist: pydantic
 Requires-Dist: pymssql (==2.*)
+Requires-Dist: pypebbles (==0.3.*)
 Requires-Dist: python-dotenv
 Requires-Dist: sentry-sdk[fastapi]
 Requires-Dist: uvicorn

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/annotation/deprecate.py

@@ -33,7 +33,7 @@ def deprecated(warning: str) -> Callable[[F], F]:
     return decorator
 
 
-def _wrap_function(func: F, warning: str) -> F:
+def _wrap_function[F: Callable[..., Any]](func: F, warning: str) -> F:
     def wrapper(*args: Any, **kwargs: dict[str, Any]) -> Any:
         warn(warning, category=DeprecationWarning, stacklevel=2)
         return func(*args, **kwargs)

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/date.py

@@ -39,16 +39,11 @@ class 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)
+        dt = datetime.strptime(date, "%Y-%m-%d")
+        dt = dt.replace(tzinfo=time_zone)
+        timestamp_ms = int(dt.timestamp() * 1000)
 
-        except ValueError as e:
-            raise ValueError(
-                f"Invalid date format: '{date}'. Expected 'yyyy-mm-dd'."
-            ) from e
+        return cls(timestamp_ms=timestamp_ms)
 
     # Date in format of "yyyy-mm-ddTHH:MM:SS"
     @classmethod
@@ -58,16 +53,11 @@ class 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
+        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)
 
     @classmethod
     def from_timestamp(cls, timestamp: float) -> DateTime:

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/error.py

@@ -31,7 +31,7 @@ class ExistsError(Exception):
     def __str__(self) -> str:
         return ",".join([f"{criteria(self.item)}" for criteria in self._duplicates])
 
-    def fire(self) -> None:
+    def fire(self) -> None:  # pragma: no cover
         if self._duplicates:
             raise self
 

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/fastapi/builder.py

@@ -65,7 +65,7 @@ class FastApiBuilder:
 
         return self
 
-    def with_frontend(self, origin: str) -> Self:
+    def with_frontend(self, origin: str) -> Self:  # pragma: no cover
         self.app.add_middleware(
             CORSMiddleware,
             allow_origins=[origin],
@@ -76,7 +76,7 @@ class FastApiBuilder:
 
         return self
 
-    def with_swagger(self, **config: Any) -> Self:
+    def with_swagger(self, **config: Any) -> Self:  # pragma: no cover
         self.app.swagger_ui_parameters = config
 
         return self
@@ -120,5 +120,5 @@ class _Endpoint:
     def normilized(self) -> str:
         return f"/{self.raw.replace('_', '-')}"
 
-    def __str__(self) -> str:
+    def __str__(self) -> str:  # pragma: no cover
         return self.normilized()

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/fastapi/docs.py

@@ -1,11 +1,11 @@
-from typing import Generic, TypeVar
+from typing import TypeVar
 
 from pydantic import BaseModel
 
 PayloadT = TypeVar("PayloadT")
 
 
-class Response(BaseModel, Generic[PayloadT]):
+class Response[PayloadT](BaseModel):
     status: str
     code: int
     data: PayloadT

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/fastapi/name.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from apexdevkit.http import HttpUrl
+from pypebbles.http import HttpUrl
 
 
 @dataclass

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/fastapi/router.py

@@ -5,13 +5,13 @@ from typing import Annotated, Any, Protocol, Self, TypeVar
 
 from fastapi import APIRouter, Depends, Path, Query
 from fastapi.responses import JSONResponse
+from pypebbles import FluentDict
 
 from apexdevkit.fastapi.name import RestfulName
 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
-from apexdevkit.fluent import FluentDict
+from apexdevkit.fastapi.service import RawItem, RestfulService
 
 
 class RouterWithHiddenUnderscoreRoutes(APIRouter):
@@ -144,30 +144,6 @@ class RestfulRouter:
 
         return self
 
-    def with_create_many(
-        self,
-        dependency: Dependency | None = None,
-        is_documented: bool = True,
-    ) -> Self:
-        self.router.add_api_route(
-            "/batch",
-            self.resource.create_many(
-                Service=self._resolve(dependency),
-                Collection=Annotated[
-                    RawCollection,
-                    Depends(self._schema.for_create_many()),
-                ],
-            ),
-            methods=["POST"],
-            status_code=201,
-            responses={409: {}},
-            response_model=self._schema.for_collection(),
-            include_in_schema=is_documented,
-            summary="Create Many",
-        )
-
-        return self
-
     def with_read_one(
         self,
         dependency: Dependency | None = None,
@@ -217,50 +193,6 @@ class RestfulRouter:
 
         return self
 
-    def with_filter(
-        self,
-        dependency: Dependency | None = None,
-        is_documented: bool = True,
-    ) -> Self:
-        self.router.add_api_route(
-            "/filter",
-            self.resource.filter_with(
-                Service=self._resolve(dependency),
-                QueryOptions=Annotated[RawItem, Depends(self._schema.for_filters())],
-            ),
-            methods=["POST"],
-            status_code=200,
-            responses={},
-            response_model=self._schema.for_collection(),
-            include_in_schema=is_documented,
-            summary="Read Filtered",
-        )
-
-        return self
-
-    def with_aggregation(
-        self,
-        dependency: Dependency | None = None,
-        is_documented: bool = True,
-    ) -> Self:
-        self.router.add_api_route(
-            "/aggregation",
-            self.resource.aggregation_with(
-                Service=self._resolve(dependency),
-                FilterOptions=Annotated[
-                    RawItem, Depends(self._schema.for_aggregation())
-                ],
-            ),
-            methods=["POST"],
-            status_code=200,
-            responses={},
-            response_model=self._schema.for_aggregation_result(),
-            include_in_schema=is_documented,
-            summary="Aggregation",
-        )
-
-        return self
-
     def with_read_all(
         self,
         dependency: Dependency | None = None,
@@ -307,30 +239,6 @@ class RestfulRouter:
 
         return self
 
-    def with_update_many(
-        self,
-        dependency: Dependency | None = None,
-        is_documented: bool = True,
-    ) -> Self:
-        self.router.add_api_route(
-            "",
-            self.resource.update_many(
-                Service=self._resolve(dependency),
-                Collection=Annotated[
-                    RawCollection,
-                    Depends(self._schema.for_update_many()),
-                ],
-            ),
-            methods=["PATCH"],
-            status_code=200,
-            responses={},
-            response_model=self._schema.for_no_data(),
-            include_in_schema=is_documented,
-            summary="Update Many",
-        )
-
-        return self
-
     def with_replace_one(
         self,
         dependency: Dependency | None = None,
@@ -355,30 +263,6 @@ class RestfulRouter:
 
         return self
 
-    def with_replace_many(
-        self,
-        dependency: Dependency | None = None,
-        is_documented: bool = True,
-    ) -> Self:
-        self.router.add_api_route(
-            "/batch",
-            self.resource.replace_many(
-                Service=self._resolve(dependency),
-                Collection=Annotated[
-                    RawCollection,
-                    Depends(self._schema.for_replace_many()),
-                ],
-            ),
-            methods=["PUT"],
-            status_code=200,
-            responses={},
-            response_model=self._schema.for_no_data(),
-            include_in_schema=is_documented,
-            summary="Replace Many",
-        )
-
-        return self
-
     def with_delete_one(
         self,
         dependency: Dependency | None = None,
@@ -412,11 +296,9 @@ class RestfulRouter:
     def default(self) -> Self:
         return (
             self.with_create_one()
-            .with_create_many()
             .with_read_one()
             .with_read_all()
             .with_update_one()
-            .with_update_many()
             .with_delete_one()
         )
 

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/fastapi/schema.py

@@ -1,20 +1,13 @@
 from abc import ABC, abstractmethod
-from collections.abc import Callable, Iterable, Iterator
+from collections.abc import Callable, Iterator
 from dataclasses import dataclass
 from functools import cached_property
 from typing import Any
 
 from pydantic import BaseModel, create_model
+from pypebbles import FluentDict
 
 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):
@@ -27,15 +20,6 @@ class SchemaFields(ABC):
     def editable(self) -> FluentDict[type]:
         return self.readable().drop("id")
 
-    def filters(self) -> FluentDict[type]:
-        return JsonDict()
-
-    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
@@ -49,21 +33,22 @@ class RestfulSchema:
 
     def __post_init__(self) -> None:
         schema = self._schema_for("", self.fields.readable())
-        create_schema = self._schema_for("Create", self.fields.writable())
-        self._schema_for("Update", self.fields.editable())
-        replace_schema = self._schema_for("Replace", self.fields.readable())
-        update_many_item = self._schema_for(
-            "UpdateManyItem", self.fields.editable().merge(self.fields.id())
+        self._schema_for(
+            "Item",
+            {
+                self.name.singular: schema,
+            },
         )
-        self._schema_for("Filter", self.fields.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})
-        self._schema_for("CreateMany", {self.name.plural: list[create_schema]})
-        self._schema_for("UpdateMany", {self.name.plural: list[update_many_item]})
-        self._schema_for("ReplaceMany", {self.name.plural: list[replace_schema]})
+        self._schema_for(
+            "Collection",
+            {
+                self.name.plural: list[schema],
+                "count": int,
+            },
+        )
+        self._schema_for("Create", self.fields.writable())
+        self._schema_for("Update", self.fields.editable())
+        self._schema_for("Replace", self.fields.readable())
 
     def _schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
         if action not in self._models:
@@ -113,14 +98,6 @@ class RestfulSchema:
 
         return _
 
-    def for_create_many(self) -> Callable[[BaseModel], Iterable[dict[str, Any]]]:
-        schema = self._models["CreateMany"]
-
-        def _(request: schema) -> Iterable[dict[str, Any]]:
-            return [dict(item) for item in request.model_dump()[self.name.plural]]
-
-        return _
-
     def for_update_one(self) -> Callable[[BaseModel], dict[str, Any]]:
         schema = self._models["Update"]
 
@@ -129,14 +106,6 @@ class RestfulSchema:
 
         return _
 
-    def for_update_many(self) -> Callable[[BaseModel], Iterable[dict[str, Any]]]:
-        schema = self._models["UpdateMany"]
-
-        def _(request: schema) -> Iterable[dict[str, Any]]:
-            return [dict(item) for item in request.model_dump()[self.name.plural]]
-
-        return _
-
     def for_replace_one(self) -> Callable[[BaseModel], dict[str, Any]]:
         schema = self._models["Replace"]
 
@@ -145,39 +114,6 @@ class RestfulSchema:
 
         return _
 
-    def for_replace_many(self) -> Callable[[BaseModel], Iterable[dict[str, Any]]]:
-        schema = self._models["ReplaceMany"]
-
-        def _(request: schema) -> Iterable[dict[str, Any]]:
-            return [dict(item) for item in request.model_dump()[self.name.plural]]
-
-        return _
-
-    def for_filters(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self._models["Filter"]
-
-        def _(request: schema) -> dict[str, Any]:
-            return request.model_dump()
-
-        return _
-
-    def for_aggregation(self) -> Callable[[BaseModel], dict[str, Any]]:
-        schema = self._models["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._models["AggregationResult"]),
-        )
-
 
 @dataclass(frozen=True)
 class Schema:

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/fastapi/service.py

@@ -3,11 +3,10 @@ from __future__ import annotations
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, Generic
+from typing import Any
 
 from apexdevkit.formatter import Formatter
-from apexdevkit.repository import BruteForceBatch, Repository
-from apexdevkit.repository.core import ItemT
+from apexdevkit.repository import BruteForceBatch, Entity, Repository
 from apexdevkit.repository.core.interface import BatchRepository
 
 RawItem = Mapping[str, Any]
@@ -61,7 +60,7 @@ class RestfulService:  # pragma: no cover
 
 
 @dataclass(frozen=True)
-class RestfulRepository(RestfulService, Generic[ItemT]):
+class RestfulRepository[ItemT: Entity](RestfulService):
     repository: Repository[ItemT]
 
     formatter: Formatter[Mapping[str, Any], ItemT]

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/formatter.py

@@ -4,34 +4,29 @@ import pickle
 from collections.abc import Mapping
 from copy import deepcopy
 from dataclasses import asdict, dataclass, field, fields, is_dataclass
-from typing import Any, Generic, Protocol, Self, TypeVar, get_args, get_type_hints
+from typing import Any, Protocol, Self, get_args, get_type_hints
 
-from apexdevkit.fluent import FluentDict
-from apexdevkit.value import Value
+from pypebbles import FluentDict
 
-_SourceT = TypeVar("_SourceT")
-_TargetT = TypeVar("_TargetT")
-_ItemT = TypeVar("_ItemT")
 
-
-class Formatter(Protocol[_SourceT, _TargetT]):  # pragma: no cover
-    def load(self, source: _SourceT) -> _TargetT:
+class Formatter[SourceT, TargetT](Protocol):  # pragma: no cover
+    def load(self, source: SourceT) -> TargetT:
         pass
 
-    def dump(self, target: _TargetT) -> _SourceT:
+    def dump(self, target: TargetT) -> SourceT:
         pass
 
 
 @dataclass(frozen=True)
-class AliasFormatter(Formatter[Mapping[str, Any], _TargetT]):
-    inner: Formatter[Mapping[str, Any], _TargetT]
+class AliasFormatter[TargetT](Formatter[Mapping[str, Any], TargetT]):
+    inner: Formatter[Mapping[str, Any], TargetT]
 
     alias: AliasMapping
 
-    def load(self, source: Mapping[str, Any]) -> _TargetT:
+    def load(self, source: Mapping[str, Any]) -> TargetT:
         return self.inner.load(self.alias.reverse().translate(source))
 
-    def dump(self, target: _TargetT) -> Mapping[str, Any]:
+    def dump(self, target: TargetT) -> Mapping[str, Any]:
         return self.alias.translate(self.inner.dump(target))
 
 
@@ -53,28 +48,28 @@ class AliasMapping:
         return self.alias.get(key, key)
 
 
-class PickleFormatter(Generic[_ItemT]):
-    def dump(self, item: _ItemT) -> bytes:
+class PickleFormatter[ItemT]:
+    def dump(self, item: ItemT) -> bytes:
         return pickle.dumps(item)
 
-    def load(self, raw: bytes) -> _ItemT:
+    def load(self, raw: bytes) -> ItemT:
         return pickle.loads(raw)  # type: ignore
 
 
 @dataclass
-class ListFormatter(Generic[_SourceT, _TargetT]):
-    inner: Formatter[_SourceT, _TargetT]
+class ListFormatter[SourceT, TargetT]:
+    inner: Formatter[SourceT, TargetT]
 
-    def load(self, source: list[_SourceT]) -> list[_TargetT]:
+    def load(self, source: list[SourceT]) -> list[TargetT]:
         return [self.inner.load(item) for item in source]
 
-    def dump(self, target: list[_TargetT]) -> list[_SourceT]:
+    def dump(self, target: list[TargetT]) -> list[SourceT]:
         return [self.inner.dump(item) for item in target]
 
 
 @dataclass
-class DataclassFormatter(Generic[_TargetT]):
-    resource: type[_TargetT]
+class DataclassFormatter[TargetT]:
+    resource: type[TargetT]
     sub_formatters: dict[str, Formatter[Any, Any]] = field(default_factory=dict)
 
     def and_nested(self, **formatters: Formatter[Any, Any]) -> Self:
@@ -85,7 +80,7 @@ class DataclassFormatter(Generic[_TargetT]):
 
         return self
 
-    def load(self, source: Mapping[str, Any]) -> _TargetT:
+    def load(self, source: Mapping[str, Any]) -> TargetT:
         source = FluentDict[Any](deepcopy(source)).select(
             *self.resource.__annotations__.keys(),
             "id",
@@ -114,13 +109,5 @@ class DataclassFormatter(Generic[_TargetT]):
 
         return self.resource(**source)
 
-    def dump(self, target: _TargetT) -> Mapping[str, Any]:
+    def dump(self, target: TargetT) -> Mapping[str, Any]:
         return asdict(target)  # type: ignore
-
-
-class ValueFormatter:
-    def load(self, raw: Mapping[str, Any]) -> Value:
-        return DataclassFormatter(Value).load(raw)
-
-    def dump(self, value: Value) -> Mapping[str, Any]:
-        return DataclassFormatter(Value).dump(value)

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/query/generator.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections import defaultdict
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass, field
-from typing import Any, ClassVar, Generic, Protocol, TypeVar
+from typing import Any, ClassVar, Protocol, TypeVar
 
 from apexdevkit.annotation import deprecated
 from apexdevkit.error import ForbiddenError
@@ -33,7 +33,7 @@ class _Loader(Protocol[ItemT]):
 
 
 @dataclass
-class DefaultMsSqlFilter(Generic[ItemT]):
+class DefaultMsSqlFilter[ItemT]:
     _database: Database = field(init=False)
     _query_builder: MsSqlQueryBuilder = field(init=False)
     _options: QueryOptions = field(init=False)

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/repository/core/mixin.py

@@ -1,10 +1,10 @@
-from typing import Generic
+from typing import Any
 
 from apexdevkit.error import DoesNotExistError
-from apexdevkit.repository.core import Entity, ItemT
+from apexdevkit.repository.core import Entity
 
 
-class ContainsMixin(Generic[ItemT]):
+class ContainsMixin:
     def __contains__(self, item: object) -> bool:
         match item:
             case Entity():
@@ -20,5 +20,5 @@ class ContainsMixin(Generic[ItemT]):
 
         return True
 
-    def read(self, item_id: str) -> ItemT:
+    def read(self, item_id: str) -> Any:
         raise NotImplementedError

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/repository/in_memory/repository.py

@@ -12,7 +12,7 @@ from .store import InMemoryByteStore, KeyValueStore
 
 
 @dataclass(frozen=True)
-class InMemoryRepository(ContainsMixin[ItemT], Repository[ItemT]):
+class InMemoryRepository(ContainsMixin, Repository[ItemT]):
     store: KeyValueStore[ItemT] = field(default_factory=InMemoryByteStore)
     keys: list[KeyFn[ItemT]] = field(default_factory=lambda: [AttributeKey("id")])
 

{apexdevkit-1.33.1 → apexdevkit-2.0.2}/apexdevkit/repository/in_memory/store.py

@@ -2,13 +2,12 @@ from __future__ import annotations
 
 from collections.abc import Iterable
 from dataclasses import dataclass, field
-from typing import Generic, Protocol
+from typing import Protocol
 
 from apexdevkit.formatter import Formatter, PickleFormatter
-from apexdevkit.repository.core.interface import ItemT
 
 
-class KeyValueStore(Protocol[ItemT]):  # pragma: no cover
+class KeyValueStore[ItemT](Protocol):  # pragma: no cover
     def count(self) -> int:
         pass
 
@@ -25,8 +24,8 @@ class KeyValueStore(Protocol[ItemT]):  # pragma: no cover
         pass
 
 
-@dataclass
-class InMemoryByteStore(Generic[ItemT]):
+@dataclass(frozen=True)
+class InMemoryByteStore[ItemT]:
     formatter: Formatter[bytes, ItemT] = field(default_factory=PickleFormatter)
 
     items: dict[str, bytes] = field(default_factory=dict)