apexdevkit 1.20.2__tar.gz → 1.20.4__tar.gz

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/PKG-INFO

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

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/fastapi/__init__.py

@@ -1,10 +1,10 @@
 from apexdevkit.fastapi.builder import FastApiBuilder, RestfulServiceBuilder
 from apexdevkit.fastapi.dependable import inject
-from apexdevkit.fastapi.service import RestfulRepositoryBuilder
+from apexdevkit.fastapi.service import RestfulRepository
 
 __all__ = [
     "FastApiBuilder",
     "RestfulServiceBuilder",
     "inject",
-    "RestfulRepositoryBuilder",
+    "RestfulRepository",
 ]

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/fastapi/builder.py

@@ -76,3 +76,11 @@ class RestfulServiceBuilder(ABC):
     @abstractmethod
     def build(self) -> RestfulService:  # pragma: no cover
         pass
+
+
+@dataclass
+class PreBuilt(RestfulServiceBuilder):  # pragma: no cover
+    service: RestfulService
+
+    def build(self) -> RestfulService:
+        return self.service

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/fastapi/dependable.py

@@ -4,7 +4,6 @@ from typing import Annotated, Any, Callable, Protocol
 from fastapi import Depends, Path
 from fastapi.requests import Request
 
-from apexdevkit.annotation import deprecated
 from apexdevkit.error import ApiError, DoesNotExistError
 from apexdevkit.fastapi import RestfulServiceBuilder
 from apexdevkit.fastapi.name import RestfulName
@@ -72,17 +71,6 @@ class UserDependency:
         return Annotated[RestfulServiceBuilder, Depends(_)]
 
 
-@dataclass(frozen=True)
-class InfraDependency:
-    infra: RestfulServiceBuilder
-
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
-        def _() -> RestfulServiceBuilder:
-            return self.infra
-
-        return Annotated[RestfulServiceBuilder, Depends(_)]
-
-
 _BuilderCallable = Callable[..., RestfulServiceBuilder]
 
 
@@ -99,32 +87,17 @@ class BuilderCallableDependency:
 
 @dataclass(frozen=True)
 class DependableBuilder:
-    dependency: _Dependency | None = None
+    dependency: _Dependency
 
     @classmethod
     def from_callable(cls, value: _BuilderCallable) -> "DependableBuilder":
-        return DependableBuilder(BuilderCallableDependency(value))
-
-    @deprecated(
-        """
-        DependableBuilder().from_infra() is deprecated,
-        use DependencyBuilder.from_callable() instead
-        """
-    )
-    def from_infra(self, value: RestfulServiceBuilder) -> "DependableBuilder":
-        return DependableBuilder(InfraDependency(value))
+        return cls(BuilderCallableDependency(value))
 
     def with_parent(self, value: RestfulName) -> "DependableBuilder":
-        if self.dependency is None:
-            raise RuntimeError("RestfulServiceBuilder type not set")
         return DependableBuilder(ParentDependency(value, self.dependency))
 
     def with_user(self, extract_user: Callable[..., Any]) -> "DependableBuilder":
-        if self.dependency is None:
-            raise RuntimeError("RestfulServiceBuilder type not set")
         return DependableBuilder(UserDependency(extract_user, self.dependency))
 
     def as_dependable(self) -> type[RestfulService]:
-        if self.dependency is None:
-            raise RuntimeError("RestfulServiceBuilder type not set")
         return ServiceDependency(self.dependency).as_dependable()

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/fastapi/router.py

@@ -6,7 +6,6 @@ from typing import Annotated, Any, Protocol, Self, TypeVar
 from fastapi import APIRouter, Depends, Path, Query
 from fastapi.responses import JSONResponse
 
-from apexdevkit.fastapi.builder import RestfulServiceBuilder
 from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.resource import RestfulResource, SummaryResponse
 from apexdevkit.fastapi.response import RestfulResponse
@@ -24,14 +23,6 @@ class Dependency(Protocol):  # pragma: no cover
         pass
 
 
-@dataclass
-class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
-    service: RestfulService
-
-    def build(self) -> RestfulService:
-        return self.service
-
-
 @dataclass
 class RestfulRouter:
     router: APIRouter = field(default_factory=APIRouter)

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/fastapi/service.py

@@ -2,14 +2,14 @@ from __future__ import annotations
 
 from abc import ABC
 from dataclasses import dataclass
-from typing import Any, Dict, Generic, Iterable, TypeVar
+from typing import Any, Dict, Generic, Iterable, Mapping, TypeVar
 
 from apexdevkit.formatter import Formatter
 from apexdevkit.query.query import FooterOptions, QueryOptions, Summary
 from apexdevkit.repository.decorator import BatchRepositoryDecorator
 from apexdevkit.repository.interface import Repository
 
-RawItem = dict[str, Any]
+RawItem = Mapping[str, Any]
 RawCollection = Iterable[RawItem]
 
 
@@ -63,31 +63,11 @@ ItemT = TypeVar("ItemT")
 
 
 @dataclass(frozen=True)
-class RestfulRepositoryBuilder(Generic[ItemT]):
-    formatter: Formatter[dict[str, Any], ItemT] | None = None
-    repository: Repository[ItemT] | None = None
-
-    def with_formatter(
-        self, formatter: Formatter[dict[str, Any], ItemT]
-    ) -> RestfulRepositoryBuilder[ItemT]:
-        return RestfulRepositoryBuilder[ItemT](formatter, self.repository)
-
-    def with_repository(
-        self, repository: Repository[ItemT]
-    ) -> RestfulRepositoryBuilder[ItemT]:
-        return RestfulRepositoryBuilder[ItemT](self.formatter, repository)
-
-    def build(self) -> RestfulService:
-        if self.formatter is None or self.repository is None:
-            raise RuntimeError("Formatter or repository not provided.")
-        return _RestfulRepository(self.formatter, self.repository)
-
-
-@dataclass(frozen=True)
-class _RestfulRepository(RestfulService, Generic[ItemT]):
-    formatter: Formatter[dict[str, Any], ItemT]
+class RestfulRepository(RestfulService, Generic[ItemT]):
     repository: Repository[ItemT]
 
+    formatter: Formatter[Mapping[str, Any], ItemT]
+
     def create_one(self, item: RawItem) -> RawItem:
         return self.formatter.dump(self.repository.create(self.formatter.load(item)))
 
@@ -106,7 +86,7 @@ class _RestfulRepository(RestfulService, Generic[ItemT]):
         return [self.formatter.dump(item) for item in self.repository]
 
     def update_one(self, item_id: str, **with_fields: Any) -> RawItem:
-        data = self.formatter.dump(self.repository.read(item_id))
+        data = dict(self.formatter.dump(self.repository.read(item_id)))
         data.update(**with_fields)
 
         self.repository.update(self.formatter.load(data))
@@ -116,7 +96,7 @@ class _RestfulRepository(RestfulService, Generic[ItemT]):
     def update_many(self, items: RawCollectionWithId) -> RawCollection:
         updates = []
         for fields in items:
-            data = self.formatter.dump(self.repository.read(fields["id"]))
+            data = dict(self.formatter.dump(self.repository.read(fields["id"])))
             data.update(**fields)
 
             updates.append(self.formatter.load(data))

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/formatter.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import pickle
 from copy import deepcopy
 from dataclasses import asdict, dataclass, field, fields, is_dataclass
-from typing import Any, Generic, Protocol, Self, TypeVar, get_args
+from typing import Any, Generic, Mapping, Protocol, Self, TypeVar, get_args
 
 from typing_extensions import get_type_hints
 
@@ -23,6 +23,37 @@ class Formatter(Protocol[_SourceT, _TargetT]):  # pragma: no cover
         pass
 
 
+@dataclass(frozen=True)
+class AliasFormatter(Formatter[Mapping[str, Any], _TargetT]):
+    inner: Formatter[Mapping[str, Any], _TargetT]
+
+    alias: AliasMapping
+
+    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]:
+        return self.alias.translate(self.inner.dump(target))
+
+
+@dataclass(frozen=True)
+class AliasMapping:
+    alias: Mapping[str, str]
+
+    @classmethod
+    def parse(cls, **alias: str) -> AliasMapping:
+        return cls(alias)
+
+    def reverse(self) -> AliasMapping:
+        return AliasMapping({value: key for key, value in self.alias.items()})
+
+    def translate(self, mapping: Mapping[str, Any]) -> Mapping[str, Any]:
+        return {self.value_of(key): value for key, value in mapping.items()}
+
+    def value_of(self, key: str) -> str:
+        return self.alias.get(key, key)
+
+
 class PickleFormatter(Generic[_ItemT]):
     def dump(self, item: _ItemT) -> bytes:
         return pickle.dumps(item)
@@ -55,7 +86,7 @@ class DataclassFormatter(Generic[_TargetT]):
 
         return self
 
-    def load(self, raw: dict[str, Any]) -> _TargetT:
+    def load(self, raw: Mapping[str, Any]) -> _TargetT:
         raw = FluentDict[Any](deepcopy(raw)).select(
             *self.resource.__annotations__.keys()
         )
@@ -82,13 +113,13 @@ class DataclassFormatter(Generic[_TargetT]):
 
         return self.resource(**raw)
 
-    def dump(self, item: _TargetT) -> dict[str, Any]:
+    def dump(self, item: _TargetT) -> Mapping[str, Any]:
         return asdict(item)  # type: ignore
 
 
 class ValueFormatter:
-    def load(self, raw: dict[str, Any]) -> Value:
+    def load(self, raw: Mapping[str, Any]) -> Value:
         return DataclassFormatter(Value).load(raw)
 
-    def dump(self, value: Value) -> dict[str, Any]:
+    def dump(self, value: Value) -> Mapping[str, Any]:
         return DataclassFormatter(Value).dump(value)

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/query/generator.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections import defaultdict
 from dataclasses import dataclass, field
-from typing import Any, ClassVar, Generic, Iterable, Protocol, TypeVar
+from typing import Any, ClassVar, Generic, Iterable, Mapping, Protocol, TypeVar
 
 from apexdevkit.annotation import deprecated
 from apexdevkit.error import ForbiddenError
@@ -27,7 +27,7 @@ ItemT = TypeVar("ItemT", covariant=True)
 
 
 class _Loader(Protocol[ItemT]):
-    def load(self, raw: dict[str, Any]) -> ItemT:
+    def load(self, raw: Mapping[str, Any]) -> ItemT:
         pass
 
 

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/repository/database.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from copy import deepcopy
 from dataclasses import dataclass, field
-from typing import Any, ContextManager, Iterable, Protocol
+from typing import Any, ContextManager, Iterable, Mapping, Protocol
 
-_RawData = dict[str, Any]
+_RawData = Mapping[str, Any]
 
 
 @dataclass(frozen=True)

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/repository/mongo.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, ContextManager, Generic, Iterator, Protocol, TypeVar
+from typing import Any, ContextManager, Generic, Iterator, Mapping, Protocol, TypeVar
 
 from pymongo import MongoClient, ReturnDocument
 from pymongo.collection import Collection
@@ -24,7 +24,7 @@ class MongoRepository(Generic[ItemT]):
     connector: MongoConnector
     database_name: str
     collection_name: str
-    formatter: Formatter[dict[str, Any], ItemT]
+    formatter: Formatter[Mapping[str, Any], ItemT]
 
     def collection(self, client: MongoClient[Any]) -> Collection[Any]:
         return client[self.database_name][self.collection_name]

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/repository/mssql.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Generic, Iterable, Iterator, TypeVar
+from typing import Any, Generic, Iterable, Iterator, Mapping, TypeVar
 
 from pymssql.exceptions import DatabaseError
 
@@ -81,7 +81,7 @@ class SqlTable(Generic[ItemT]):  # pragma: no cover
     def update(self, item: ItemT) -> DatabaseCommand:
         raise NotImplementedError
 
-    def load(self, data: dict[str, Any]) -> ItemT:
+    def load(self, data: Mapping[str, Any]) -> ItemT:
         raise NotImplementedError
 
     def exists(self, duplicate: ItemT) -> ExistsError:
@@ -143,7 +143,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
     username: str | None = None
     schema: str | None = None
     table: str | None = None
-    formatter: Formatter[dict[str, Any], ItemT] | None = None
+    formatter: Formatter[Mapping[str, Any], ItemT] | None = None
     fields: list[_SqlField] | None = None
 
     def with_username(self, value: str) -> MsSqlTableBuilder[ItemT]:
@@ -174,7 +174,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
         )
 
     def with_formatter(
-        self, value: Formatter[dict[str, Any], ItemT]
+        self, value: Formatter[Mapping[str, Any], ItemT]
     ) -> MsSqlTableBuilder[ItemT]:
         return MsSqlTableBuilder[ItemT](
             self.username,
@@ -226,7 +226,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
 class DefaultSqlTable(SqlTable[ItemT]):
     schema: str
     table: str
-    formatter: Formatter[dict[str, Any], ItemT]
+    formatter: Formatter[Mapping[str, Any], ItemT]
     fields: SqlFieldManager
     username: str | None = None
 
@@ -336,7 +336,7 @@ class DefaultSqlTable(SqlTable[ItemT]):
             REVERT
         """).with_data(self.fields.with_fixed({}))
 
-    def load(self, data: dict[str, Any]) -> ItemT:
+    def load(self, data: Mapping[str, Any]) -> ItemT:
         return self.formatter.load(data)
 
     def exists(self, duplicate: ItemT) -> ExistsError:

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/repository/sql.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Any, Iterator
+from typing import Any, Iterator, Mapping
 
 
 @dataclass(frozen=True)
@@ -155,7 +155,9 @@ class SqlFieldManager:
         else:
             return ""
 
-    def with_fixed(self, data: dict[str, Any]) -> dict[str, Any]:
+    def with_fixed(self, raw: Mapping[str, Any]) -> dict[str, Any]:
+        data = dict(raw)
+
         for key in self.fields:
             if key.is_parent:
                 data[key.name] = key.parent_value

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/apexdevkit/repository/sqlite.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from sqlite3 import IntegrityError
-from typing import Any, Generic, Iterable, Iterator
+from typing import Any, Generic, Iterable, Iterator, Mapping
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.formatter import Formatter
@@ -87,7 +87,7 @@ class SqlTable(Generic[ItemT]):  # pragma: no cover
     def delete_all(self) -> DatabaseCommand:
         raise NotImplementedError
 
-    def load(self, data: dict[str, Any]) -> ItemT:
+    def load(self, data: Mapping[str, Any]) -> ItemT:
         raise NotImplementedError
 
     def duplicate(self, item: ItemT) -> ExistsError:
@@ -96,20 +96,20 @@ class SqlTable(Generic[ItemT]):  # pragma: no cover
 
 @dataclass
 class UnknownError(Exception):
-    raw: dict[str, Any]
+    raw: Mapping[str, Any]
 
 
 @dataclass(frozen=True)
 class SqliteTableBuilder(Generic[ItemT]):
     table_name: str | None = None
-    formatter: Formatter[dict[str, Any], ItemT] | None = None
+    formatter: Formatter[Mapping[str, Any], ItemT] | None = None
     fields: list[_SqlField] | None = None
 
     def with_name(self, value: str) -> SqliteTableBuilder[ItemT]:
         return SqliteTableBuilder[ItemT](value, self.formatter, self.fields)
 
     def with_formatter(
-        self, value: Formatter[dict[str, Any], ItemT]
+        self, value: Formatter[Mapping[str, Any], ItemT]
     ) -> SqliteTableBuilder[ItemT]:
         return SqliteTableBuilder[ItemT](self.table_name, value, self.fields)
 
@@ -150,7 +150,7 @@ class SqliteTableBuilder(Generic[ItemT]):
 @dataclass(frozen=True)
 class _DefaultSqlTable(SqlTable[ItemT]):
     table_name: str
-    formatter: Formatter[dict[str, Any], ItemT]
+    formatter: Formatter[Mapping[str, Any], ItemT]
     fields: SqlFieldManager
 
     def count_all(self) -> DatabaseCommand:
@@ -244,7 +244,7 @@ class _DefaultSqlTable(SqlTable[ItemT]):
             {self.fields.where_statement(include_id=False)};
         """).with_data(self.fields.with_fixed({}))
 
-    def load(self, data: dict[str, Any]) -> ItemT:
+    def load(self, data: Mapping[str, Any]) -> ItemT:
         return self.formatter.load(data)
 
     def duplicate(self, item: ItemT) -> ExistsError:

{apexdevkit-1.20.2 → apexdevkit-1.20.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.20.2"
+version = "1.20.4"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"