apexdevkit 1.22.2__tar.gz → 1.23.2__tar.gz

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.3
 Name: apexdevkit
-Version: 1.22.2
+Version: 1.23.2
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.11
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/annotation/deprecate.py

@@ -1,5 +1,6 @@
 import inspect
-from typing import Any, Callable, TypeVar, cast
+from collections.abc import Callable
+from typing import Any, TypeVar, cast
 from warnings import warn
 
 F = TypeVar("F", bound=Callable[..., Any])
@@ -23,12 +24,11 @@ def deprecated(warning: str) -> Callable[[F], F]:
     def decorator(obj: F) -> F:
         if inspect.isfunction(obj) or inspect.ismethod(obj):
             return cast(F, _wrap_function(obj, warning))
-        elif inspect.isclass(obj):
+        if inspect.isclass(obj):
             return cast(F, _deprecate_class(obj, warning))
-        else:
-            raise TypeError(
-                f"Unsupported type for deprecation: {type(obj)}"
-            )  # pragma: no cover
+        raise TypeError(
+            f"Unsupported type for deprecation: {type(obj)}"
+        )  # pragma: no cover
 
     return decorator
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/error.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Any, Callable, Self
+from typing import Any, Self
 
 Criteria = Callable[[Any], str]
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/fastapi/builder.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from collections.abc import Mapping
 from dataclasses import dataclass, field
-from typing import Any, Mapping, Self
+from typing import Any, Self
 
 from fastapi import APIRouter, FastAPI
 from starlette.middleware.cors import CORSMiddleware
@@ -19,7 +20,7 @@ class FastApiBuilder:
     def build(self) -> FastAPI:
         self.app.add_exception_handler(
             ApiError,
-            lambda request, exc: JSONResponse(content=exc.data, status_code=exc.code),
+            lambda _, exc: JSONResponse(content=exc.data, status_code=exc.code),
         )
         return self.app
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/fastapi/dependable.py

@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Annotated, Any, Callable, Protocol
+from typing import Annotated, Any, Protocol
 
 from fastapi import Depends, Path
 from fastapi.requests import Request
@@ -52,7 +53,7 @@ class ParentDependency:
             try:
                 return builder.with_parent(parent_id)
             except DoesNotExistError as e:
-                raise ApiError(404, RestfulResponse(self.parent).not_found(e))
+                raise ApiError(404, RestfulResponse(self.parent).not_found(e)) from e
 
         return Annotated[RestfulServiceBuilder, Depends(_)]
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/fastapi/resource.py

@@ -1,6 +1,7 @@
 import re
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, Callable, Union
+from typing import Any, Union
 
 from pydantic import BaseModel
 from starlette.responses import JSONResponse

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/fastapi/response.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Any, Iterable
+from typing import Any
 
 from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
 from apexdevkit.fastapi.name import RestfulName

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/fastapi/schema.py

@@ -1,7 +1,8 @@
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, Callable, Iterable, List
+from typing import Any
 
 from pydantic import BaseModel, create_model
 
@@ -39,10 +40,10 @@ class RestfulSchema:
         )
 
         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("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]})
 
     def _schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
         if action not in self.schemas:

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/fastapi/service.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from abc import ABC
+from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, Dict, Generic, Iterable, Mapping, TypeVar
+from typing import Any, Generic, TypeVar
 
 from apexdevkit.formatter import Formatter
 from apexdevkit.query.query import FooterOptions, QueryOptions, Summary
@@ -14,7 +14,7 @@ RawItem = Mapping[str, Any]
 RawCollection = Iterable[RawItem]
 
 
-class _RawItemWithId(Dict[str, Any]):
+class _RawItemWithId(dict[str, Any]):
     def __post_init__(self) -> None:
         assert "id" in self
 
@@ -22,7 +22,7 @@ class _RawItemWithId(Dict[str, Any]):
 RawCollectionWithId = Iterable[_RawItemWithId]
 
 
-class RestfulService(ABC):  # pragma: no cover
+class RestfulService:  # pragma: no cover
     def create_one(self, item: RawItem) -> RawItem:
         raise NotImplementedError(self.create_one.__name__)
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/fluent.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, Callable, Generic, TypeVar
+from typing import Any, Generic, TypeVar
 
 ItemT = TypeVar("ItemT")
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/formatter.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 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, Mapping, Protocol, Self, TypeVar, get_args
-
-from typing_extensions import get_type_hints
+from typing import Any, Generic, Protocol, Self, TypeVar, get_args, get_type_hints
 
 from apexdevkit.fluent import FluentDict
 from apexdevkit.value import Value
@@ -96,7 +95,7 @@ class DataclassFormatter(Generic[_TargetT]):
             key_type = types[key.name]
             if key.name not in raw:
                 continue
-            elif key.name in self.sub_formatters.keys():
+            if key.name in self.sub_formatters:
                 raw[key.name] = (
                     self.sub_formatters[key.name].load(raw.pop(key.name))
                     if raw[key.name]

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/http/fluent.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import Enum, auto
-from typing import Any, Protocol, Type
+from typing import Any, Protocol
 
 from apexdevkit.http.json import JsonDict
 
@@ -103,25 +103,25 @@ class FluentHttpRequest:
 class FluentHttpResponse:
     response: HttpResponse
 
-    def on_bad_request(self, raises: Exception | Type[Exception]) -> FluentHttpResponse:
+    def on_bad_request(self, raises: Exception | type[Exception]) -> FluentHttpResponse:
         if self.response.code() == 400:
             raise raises
 
         return self
 
-    def on_conflict(self, raises: Exception | Type[Exception]) -> FluentHttpResponse:
+    def on_conflict(self, raises: Exception | type[Exception]) -> FluentHttpResponse:
         if self.response.code() == 409:
             raise raises
 
         return self
 
-    def on_not_found(self, raises: Exception | Type[Exception]) -> FluentHttpResponse:
+    def on_not_found(self, raises: Exception | type[Exception]) -> FluentHttpResponse:
         if self.response.code() == 404:
             raise raises
 
         return self
 
-    def on_failure(self, raises: Type[Exception]) -> FluentHttpResponse:
+    def on_failure(self, raises: type[Exception]) -> FluentHttpResponse:
         if self.response.code() < 200 or self.response.code() > 299:
             raise raises(self.response.raw(), self.response.code())
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/http/httpx/client.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable, Iterator, Mapping
 from dataclasses import dataclass, field
-from typing import Any, Callable, Iterator, Mapping
+from typing import Any
 
 import httpx
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/id.py

@@ -30,7 +30,7 @@ class ApexID:
                 cls.sequence = 0
 
             if cls.sequence > cls._sequence_bitmask:
-                raise DuplicateIDException("Duplicate ID Generated")
+                raise DuplicateIDError("Duplicate ID Generated")
 
             cls.last_timestamp = current_timestamp
 
@@ -50,5 +50,5 @@ class ApexID:
         return int(os.getenv("APEX_ID_METADATA", "0"))
 
 
-class DuplicateIDException(Exception):
+class DuplicateIDError(Exception):
     pass

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/query/generator.py

@@ -1,8 +1,9 @@
 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, Iterable, Mapping, Protocol, TypeVar
+from typing import Any, ClassVar, Generic, Protocol, TypeVar
 
 from apexdevkit.annotation import deprecated
 from apexdevkit.error import ForbiddenError

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/query/query.py

@@ -59,7 +59,7 @@ class SummaryExtractor:
     def _value(self, value: Any) -> NumericValue | DateValue | StringValue | NullValue:
         if value is None:
             return NullValue()
-        if isinstance(value, (int, float, Decimal)):
+        if isinstance(value, int | float | Decimal):
             return NumericValue.from_decimal(Decimal(value))
         if self.aggregation.name and (
             "date" in self.aggregation.name.lower()

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/base.py

@@ -1,4 +1,5 @@
-from typing import Any, Generic, Iterator
+from collections.abc import Iterator
+from typing import Any, Generic
 
 from apexdevkit.repository.interface import ItemT, Repository
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/connector.py

@@ -4,7 +4,7 @@ import sqlite3
 from contextlib import AbstractContextManager
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, ContextManager
+from typing import Any
 
 import pymssql
 from pymssql import Connection as _Connection
@@ -17,7 +17,7 @@ from apexdevkit.repository import Connection
 class SqliteFileConnector:
     dsn: str
 
-    def connect(self) -> ContextManager[Connection]:
+    def connect(self) -> AbstractContextManager[Connection]:
         connection = sqlite3.connect(self.dsn)
         connection.row_factory = sqlite3.Row
 
@@ -28,11 +28,11 @@ class SqliteFileConnector:
 class SqliteInMemoryConnector:
     dsn: str = ":memory:"
 
-    def connect(self) -> ContextManager[Connection]:
+    def connect(self) -> AbstractContextManager[Connection]:
         return self._connection
 
     @cached_property
-    def _connection(self) -> ContextManager[Connection]:
+    def _connection(self) -> AbstractContextManager[Connection]:
         connection = sqlite3.connect(self.dsn, check_same_thread=False)
         connection.row_factory = sqlite3.Row
 
@@ -48,7 +48,7 @@ class MsSqlConnector:
     db_tds_version = "7.0"
     db_port: str | None = None
 
-    def connect(self) -> ContextManager[Connection]:
+    def connect(self) -> AbstractContextManager[Connection]:
         return ConnectionContextManager(self._connection())
 
     def _connection(self) -> Connection:
@@ -96,16 +96,16 @@ class MsSqlCursorAdapter:
     cursor: Cursor
 
     def execute(self, *args: Any, **kwargs: Any) -> Any:
-        self.cursor.execute(*args, **kwargs)  # type : ignore
+        self.cursor.execute(*args, **kwargs)
 
     def executemany(self, *args: Any, **kwargs: Any) -> Any:
-        self.cursor.executemany(*args, **kwargs)  # type : ignore
+        self.cursor.executemany(*args, **kwargs)
 
-    def fetchone(self, *args: Any, **kwargs: Any) -> Any:
-        return self.cursor.fetchone()  # type : ignore
+    def fetchone(self, *_: Any, **__: Any) -> Any:
+        return self.cursor.fetchone()
 
-    def fetchall(self, *args: Any, **kwargs: Any) -> Any:
-        return self.cursor.fetchall()  # type : ignore
+    def fetchall(self, *_: Any, **__: Any) -> Any:
+        return self.cursor.fetchall()
 
     def close(self) -> None:
         self.cursor.close()  # type : ignore

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/database.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
+from collections.abc import Iterable, Mapping
+from contextlib import AbstractContextManager
 from copy import deepcopy
 from dataclasses import dataclass, field
-from typing import Any, ContextManager, Iterable, Mapping, Protocol
+from typing import Any, Protocol
 
 _RawData = Mapping[str, Any]
 
@@ -45,7 +47,7 @@ class Database:
 
 
 class Connector(Protocol):  # pragma: no cover
-    def connect(self) -> ContextManager[Connection]:
+    def connect(self) -> AbstractContextManager[Connection]:
         pass
 
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/decorator.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterable, Iterator
 from dataclasses import dataclass
-from typing import Any, Generic, Iterable, Iterator
+from typing import Any, Generic
 
 from apexdevkit.repository.interface import ItemT, Repository
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/in_memory.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Callable, Iterable, Iterator
 from contextlib import suppress
 from dataclasses import dataclass, field
-from typing import Any, Callable, Generic, Iterable, Iterator, Protocol, Self
+from typing import Any, Generic, Protocol, Self
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.formatter import Formatter, PickleFormatter
@@ -107,7 +108,7 @@ class _SingleKeyRepository(RepositoryBase[ItemT]):
     store: KeyValueStore[ItemT]
     pk: _KeyFunction[ItemT]
 
-    def bind(self, **kwargs: Any) -> Self:  # pragma: no cover
+    def bind(self, **_: Any) -> Self:  # pragma: no cover
         return self
 
     def create(self, item: ItemT) -> ItemT:
@@ -131,14 +132,14 @@ class _SingleKeyRepository(RepositoryBase[ItemT]):
     def delete(self, item_id: str) -> None:
         try:
             self.store.drop(item_id)
-        except KeyError:
-            raise DoesNotExistError(item_id)
+        except KeyError as e:
+            raise DoesNotExistError(item_id) from e
 
     def read(self, item_id: str) -> ItemT:
         try:
             return self.store.get(item_id)
-        except KeyError:
-            raise DoesNotExistError(item_id)
+        except KeyError as e:
+            raise DoesNotExistError(item_id) from e
 
     def __iter__(self) -> Iterator[ItemT]:
         return iter(self.store.values())
@@ -153,7 +154,7 @@ class _ManyKeyRepository(RepositoryBase[ItemT]):
 
     keys: list[_KeyFunction[ItemT]] = field(default_factory=list)
 
-    def bind(self, **kwargs: Any) -> Self:  # pragma: no cover
+    def bind(self, **_: Any) -> Self:  # pragma: no cover
         return self
 
     def create(self, item: ItemT) -> ItemT:

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/interface.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
-from typing import Any, Iterator, Protocol, TypeVar
+from collections.abc import Iterable, Iterator
+from typing import Any, Protocol, TypeVar
 
 ItemT = TypeVar("ItemT")
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/mssql.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Iterable, Iterator, Mapping
 from dataclasses import dataclass
-from typing import Any, Generic, Iterable, Iterator, Mapping, TypeVar
+from typing import Any, Generic, TypeVar
 
 from pymssql.exceptions import DatabaseError, OperationalError
 
@@ -27,8 +28,8 @@ class MsSqlRepository(RepositoryBase[ItemT]):
 
         try:
             return int(raw["n_items"])
-        except KeyError:
-            raise UnknownError(raw)
+        except KeyError as e:
+            raise UnknownError(raw) from e
 
     def delete(self, item_id: str) -> None:
         self.db.execute(self.table.delete(item_id)).fetch_none()
@@ -40,21 +41,18 @@ class MsSqlRepository(RepositoryBase[ItemT]):
         try:
             return self.table.load(self.db.execute(self.table.insert(item)).fetch_one())
         except DatabaseError as e:
-            e = MssqlException(e)
+            if MssqlException(e).is_duplication():
+                raise self.table.exists(item) from e
 
-            if e.is_duplication():
-                raise self.table.exists(item)
-
-            raise UnknownError(e.message)
+            raise UnknownError(MssqlException(e).message) from e
 
     def read(self, item_id: str) -> ItemT:
         try:
             raw = self.db.execute(self.table.select(item_id)).fetch_one()
         except OperationalError as e:
             if "Conversion failed" in str(e):
-                raise DoesNotExistError(item_id)
-            else:
-                raise e
+                raise DoesNotExistError(item_id) from e
+            raise e
 
         if not raw:
             raise DoesNotExistError(item_id)
@@ -273,7 +271,7 @@ class DefaultSqlTable(SqlTable[ItemT]):
             [f"%({key.name})s" for key in self.fields if key.include_in_insert]
         )
         try:
-            self.fields.id
+            _ = self.fields.id
             output = ", ".join(
                 ["[" + field.name + "] AS " + field.name for field in self.fields]
             )
@@ -368,12 +366,11 @@ class DefaultSqlTable(SqlTable[ItemT]):
     def exists(self, duplicate: ItemT) -> ExistsError:
         raw = self.formatter.dump(duplicate)
         return ExistsError(duplicate).with_duplicate(
-            lambda i: f"{self.fields.id}<{raw[self.fields.id]}>"
+            lambda _: f"{self.fields.id}<{raw[self.fields.id]}>"
         )
 
     @property
     def _user_check(self) -> str:
         if self.username is not None:
             return f"EXECUTE AS USER = '{self.username}'"
-        else:
-            return ""
+        return ""

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/repository.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable, Iterator
 from dataclasses import dataclass, field
-from typing import Callable, Generic, Iterator, TypeVar
+from typing import Generic, TypeVar
 
 from apexdevkit.error import DoesNotExistError
 from apexdevkit.formatter import Formatter
@@ -74,23 +75,35 @@ class MultipleRepositoryBuilder(Generic[ItemT]):
     def with_repository(
         self,
         repository: Repository[ItemT],
-        condition: Callable[[ItemT], bool] = lambda item: True,
-        formatter: Formatter[ItemT, ItemT] = NoFormatter[ItemT](),
+        condition: Callable[[ItemT], bool] = lambda _: True,
+        formatter: Formatter[ItemT, ItemT] | None = None,
         id_prefix: str = "",
     ) -> MultipleRepositoryBuilder[ItemT]:
         return MultipleRepositoryBuilder[ItemT](
             self.repositories
-            + [_InnerRepository(repository, condition, formatter, id_prefix)]
+            + [
+                _InnerRepository(
+                    repository,
+                    condition,
+                    formatter or NoFormatter[ItemT](),
+                    id_prefix,
+                )
+            ]
         )
 
     def and_repository(
         self,
         repository: Repository[ItemT],
-        condition: Callable[[ItemT], bool] = lambda item: True,
-        formatter: Formatter[ItemT, ItemT] = NoFormatter[ItemT](),
+        condition: Callable[[ItemT], bool] = lambda _: True,
+        formatter: Formatter[ItemT, ItemT] | None = None,
         id_prefix: str = "",
     ) -> MultipleRepositoryBuilder[ItemT]:
-        return self.with_repository(repository, condition, formatter, id_prefix)
+        return self.with_repository(
+            repository,
+            condition,
+            formatter or NoFormatter[ItemT](),
+            id_prefix,
+        )
 
     def build(self) -> MultipleRepository[ItemT]:
         return MultipleRepository[ItemT](self.repositories)
@@ -99,7 +112,7 @@ class MultipleRepositoryBuilder(Generic[ItemT]):
 @dataclass(frozen=True)
 class _InnerRepository(Generic[ItemT]):
     inner: Repository[ItemT]
-    condition: Callable[[ItemT], bool] = lambda item: True
+    condition: Callable[[ItemT], bool] = lambda _: True
     formatter: Formatter[ItemT, ItemT] = field(
         default_factory=lambda: NoFormatter[ItemT]()
     )

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/sql.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Iterator, Mapping
 from dataclasses import dataclass, field
-from typing import Any, Iterator, Mapping
+from typing import Any
 
 
 @dataclass(frozen=True)
@@ -144,8 +145,8 @@ class SqlFieldManager:
         ]
         if len(ordering) > 0:
             return "ORDER BY " + ", ".join(order_clauses)
-        else:
-            return ""
+
+        return ""
 
     def __iter__(self) -> Iterator[_SqlField]:
         yield from self.fields
@@ -162,8 +163,8 @@ class SqlFieldManager:
         ]
         if len(statements) > 0:
             return "WHERE " + " AND ".join(statements)
-        else:
-            return ""
+
+        return ""
 
     def with_fixed(self, raw: Mapping[str, Any]) -> dict[str, Any]:
         data = dict(raw)
@@ -184,14 +185,13 @@ class SqlFieldManager:
         if result is not None:
             if result.parent_value is None:
                 return self.key_formatter.replace("x", result.name) + " IS NULL"
-            else:
-                return (
-                    self.key_formatter.replace("x", result.name)
-                    + " = "
-                    + self.value_formatter.replace("x", result.name)
-                )
-        else:
-            return ""
+            return (
+                self.key_formatter.replace("x", result.name)
+                + " = "
+                + self.value_formatter.replace("x", result.name)
+            )
+
+        return ""
 
     def _id_filter(self, include_id: bool, read_id: bool) -> str:
         return (

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/repository/sqlite.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Iterable, Iterator, Mapping
 from dataclasses import dataclass
 from sqlite3 import IntegrityError
-from typing import Any, Generic, Iterable, Iterator, Mapping
+from typing import Any, Generic
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.formatter import Formatter
@@ -28,8 +29,8 @@ class SqliteRepository(RepositoryBase[ItemT]):
 
         try:
             return int(raw["n_items"])
-        except KeyError:
-            raise UnknownError(raw)
+        except KeyError as e:
+            raise UnknownError(raw) from e
 
     def create(self, item: ItemT) -> ItemT:
         try:
@@ -60,7 +61,7 @@ class SqliteRepository(RepositoryBase[ItemT]):
 
 
 class SqlTable(Generic[ItemT]):  # pragma: no cover
-    def bind(self, **kwargs: Any) -> SqlTable[ItemT]:
+    def bind(self, **_: Any) -> SqlTable[ItemT]:
         return self
 
     def count_all(self) -> DatabaseCommand:
@@ -91,7 +92,7 @@ class SqlTable(Generic[ItemT]):  # pragma: no cover
         raise NotImplementedError
 
     def duplicate(self, item: ItemT) -> ExistsError:
-        return ExistsError(item).with_duplicate(lambda i: "Unknown")
+        return ExistsError(item).with_duplicate(lambda _: "Unknown")
 
 
 @dataclass
@@ -183,7 +184,7 @@ class _DefaultSqlTable(SqlTable[ItemT]):
 
         return DatabaseCommand(f"""
             SELECT
-                {columns} 
+                {columns}
             FROM {self.table_name.upper()}
             {self.fields.where_statement(include_id=True)};
         """).with_data(self.fields.with_fixed({self.fields.id: item_id}))
@@ -198,7 +199,7 @@ class _DefaultSqlTable(SqlTable[ItemT]):
 
         return DatabaseCommand(f"""
             SELECT
-                {columns} 
+                {columns}
             FROM {self.table_name.upper()}
             WHERE {duplicates};
         """).with_data({key: raw[key] for key in raw if key in self.fields.composite})
@@ -250,7 +251,7 @@ class _DefaultSqlTable(SqlTable[ItemT]):
     def duplicate(self, item: ItemT) -> ExistsError:
         raw = self.formatter.dump(item)
         return ExistsError(item).with_duplicate(
-            lambda i: ",".join(
+            lambda _: ",".join(
                 [f"{key}<{raw[key]}>" for key in raw if key in self.fields.composite]
             )
         )

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/server.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import logging.config
+from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Any, Callable
+from typing import Any
 
 import sentry_sdk
 import uvicorn

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/synchronization.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Iterable, Iterator
 from dataclasses import dataclass
-from typing import Generic, Iterable, Iterator, Protocol, TypeVar
+from typing import Generic, Protocol, TypeVar
 
 ItemT = TypeVar("ItemT")
 

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/testing/database.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from contextlib import nullcontext
+from contextlib import AbstractContextManager, nullcontext
 from dataclasses import dataclass, field
-from typing import Any, ContextManager, Self
+from typing import Any, Self
 
 from apexdevkit.repository import DatabaseCommand
 
@@ -27,7 +27,7 @@ class FakeConnector:
     def fetchall(self) -> list[dict[str, Any]]:
         return self.results.pop()  # type: ignore
 
-    def connect(self) -> ContextManager[Self]:
+    def connect(self) -> AbstractContextManager[Self]:
         return nullcontext(self)
 
     def cursor(self) -> Self:

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/testing/fake.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import random
 from dataclasses import dataclass, field
 from functools import cached_property
-from typing import Any, Generic, Type, TypeVar
+from typing import Any, Generic, TypeVar
 
 from faker import Faker
 
@@ -70,7 +70,7 @@ class Fake:
 
 @dataclass(frozen=True)
 class FakeResource(Generic[ItemT]):
-    item_type: Type[ItemT] = field()
+    item_type: type[ItemT] = field()
     fake: Fake = field(default_factory=Fake)
 
     @cached_property
@@ -89,7 +89,7 @@ class FakeResource(Generic[ItemT]):
 
 @dataclass(frozen=True)
 class FakeValue(FakeResource[Value]):
-    item_type: Type[Value] = field(default=Value)
+    item_type: type[Value] = field(default=Value)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -101,7 +101,7 @@ class FakeValue(FakeResource[Value]):
 
 @dataclass(frozen=True)
 class FakeNumericValue(FakeResource[NumericValue]):
-    item_type: Type[NumericValue] = field(default=NumericValue)
+    item_type: type[NumericValue] = field(default=NumericValue)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -113,7 +113,7 @@ class FakeNumericValue(FakeResource[NumericValue]):
 
 @dataclass(frozen=True)
 class FakeStringValue(FakeResource[StringValue]):
-    item_type: Type[StringValue] = field(default=StringValue)
+    item_type: type[StringValue] = field(default=StringValue)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -124,7 +124,7 @@ class FakeStringValue(FakeResource[StringValue]):
 
 @dataclass(frozen=True)
 class FakeDateValue(FakeResource[DateValue]):
-    item_type: Type[DateValue] = field(default=DateValue)
+    item_type: type[DateValue] = field(default=DateValue)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -134,7 +134,7 @@ class FakeDateValue(FakeResource[DateValue]):
 @dataclass(frozen=True)
 class FakeLeaf(FakeResource[Leaf]):
     values: list[NumericValue | StringValue | DateValue] = field(default_factory=list)
-    item_type: Type[Leaf] = field(default=Leaf)
+    item_type: type[Leaf] = field(default=Leaf)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -147,7 +147,7 @@ class FakeLeaf(FakeResource[Leaf]):
 @dataclass(frozen=True)
 class FakeOperator(FakeResource[Operator]):
     operands: list[Operator | Leaf] = field(default_factory=list)
-    item_type: Type[Operator] = field(default=Operator)
+    item_type: type[Operator] = field(default=Operator)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -160,7 +160,7 @@ class FakeOperator(FakeResource[Operator]):
 @dataclass(frozen=True)
 class FakeSort(FakeResource[Sort]):
     is_descending: bool | None = None
-    item_type: Type[Sort] = field(default=Sort)
+    item_type: type[Sort] = field(default=Sort)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -174,7 +174,7 @@ class FakeSort(FakeResource[Sort]):
 
 @dataclass(frozen=True)
 class FakePage(FakeResource[Page]):
-    item_type: Type[Page] = field(default=Page)
+    item_type: type[Page] = field(default=Page)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -188,7 +188,7 @@ class FakePage(FakeResource[Page]):
 @dataclass(frozen=True)
 class FakeFilter(FakeResource[Filter]):
     args: list[NumericValue | StringValue] = field(default_factory=list)
-    item_type: Type[Filter] = field(default=Filter)
+    item_type: type[Filter] = field(default=Filter)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -203,7 +203,7 @@ class FakeQueryOptions(FakeResource[QueryOptions]):
     condition: Operator | None = None
     ordering: list[Sort] = field(default_factory=list)
     paging: Page | None = None
-    item_type: Type[QueryOptions] = field(default=QueryOptions)
+    item_type: type[QueryOptions] = field(default=QueryOptions)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:
@@ -217,7 +217,7 @@ class FakeQueryOptions(FakeResource[QueryOptions]):
 
 @dataclass(frozen=True)
 class FakeAggregationOption(FakeResource[AggregationOption]):
-    item_type: Type[AggregationOption] = field(default=AggregationOption)
+    item_type: type[AggregationOption] = field(default=AggregationOption)
 
     @cached_property
     def _raw(self) -> dict[str, Any]:

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/apexdevkit/testing/rest.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Iterable
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, Iterable, Self
+from typing import Any, Self
 
 from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.request import HttpRequest

{apexdevkit-1.22.2 → apexdevkit-1.23.2}/pyproject.toml

@@ -1,16 +1,19 @@
-[tool.poetry]
+[project]
 name = "apexdevkit"
-version = "1.22.2"
+version = "1.23.2"
 description = "Apex Development Tools for python."
-authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"
+authors = [
+    { name = "Apex Dev", email = "dev@apex.ge" }
+]
+dynamic = ["dependencies"]
+requires-python = ">=3.11"
 
 [tool.poetry.dependencies]
-python = "^3.11"
 httpx = "*"
 fastapi = "*"
 uvicorn = "*"
-sentry-sdk = {extras = ["fastapi"], version = "*"}
+sentry-sdk = { extras = ["fastapi"], version = "*" }
 python-dotenv = "*"
 pymssql = "2.3.2"
 
@@ -22,14 +25,12 @@ pytest-cov = "*"
 pytest-recording = "*"
 coverage = "*"
 faker = "*"
-mongomock = "*"
 
 [tool.poetry.group.lint.dependencies]
 mypy = "*"
 ruff = "*"
 
 [tool.mypy]
-python_version = "3.11"
 ignore_missing_imports = true
 strict = true
 exclude = [
@@ -38,7 +39,6 @@ exclude = [
 ]
 
 [tool.ruff]
-target-version = "py311"
 line-length = 88
 
 exclude = [
@@ -48,10 +48,29 @@ exclude = [
     "venv",
 ]
 
-lint.select = ["E", "F", "I"]
-lint.ignore = []
-lint.fixable = ["A", "B", "C", "D", "E", "F", "I"]
-lint.unfixable = []
+[tool.ruff.lint]
+select = [
+    "A",    # flake8-builtins
+    "ARG",  # flake8-unused-arguments
+    "B",    # flake8-bugbear
+    "C4",   # flake8-comprehensions
+    "PT",   # flake8-pytest-style
+    "RSE",  # flake8-raise
+    "RET",  # flake8-return
+    "SIM",  # flake8-simplify
+    "T20",  # flake8-print
+    "E",    # pycodestyle errors
+    "W",    # pycodestyle warnings
+    "F",    # pyflakes
+    "I",    # isort
+    "N",    # pep8-naming
+    "UP",   # pyupgrade
+]
+
+[tool.ruff.lint.per-file-ignores]
+"apexdevkit/fastapi/resource.py" = ["N803"]
+"apexdevkit/fastapi/dependable.py" = ["N806"]
+
 
 [tool.ruff.lint.mccabe]
 max-complexity = 10