apexdevkit 2.1.2__tar.gz → 2.1.4__tar.gz

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apexdevkit
-Version: 2.1.2
+Version: 2.1.4
 Summary: Apex Development Tools for python.
 License-File: LICENSE
 Author: Apex Dev
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: fastapi
 Requires-Dist: pydantic
 Requires-Dist: pymssql (==2.*)
-Requires-Dist: pypebbles (==0.3.*)
+Requires-Dist: pypebbles (==0.4.*)
 Requires-Dist: python-dotenv
 Requires-Dist: sentry-sdk[fastapi]
 Requires-Dist: uvicorn

apexdevkit-2.1.4/apexdevkit/__init__.py

@@ -0,0 +1,9 @@
+from dotenv import load_dotenv
+from fastapi import APIRouter, FastAPI, HTTPException
+
+__all__ = [
+    "APIRouter",
+    "FastAPI",
+    "HTTPException",
+    "load_dotenv",
+]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/annotation/deprecate.py

@@ -25,7 +25,7 @@ def deprecated(warning: str) -> Callable[[F], F]:
         if inspect.isfunction(obj) or inspect.ismethod(obj):
             return _wrap_function(obj, warning)
         if inspect.isclass(obj):
-            return cast(F, _deprecate_class(obj, warning))
+            return cast("F", _deprecate_class(obj, warning))
         raise TypeError(
             f"Unsupported type for deprecation: {type(obj)}"
         )  # pragma: no cover
@@ -38,7 +38,7 @@ def _wrap_function[F: Callable[..., Any]](func: F, warning: str) -> F:
         warn(warning, category=DeprecationWarning, stacklevel=2)
         return func(*args, **kwargs)
 
-    return cast(F, wrapper)
+    return cast("F", wrapper)
 
 
 def _deprecate_class(cls: type, warning: str) -> type:
@@ -47,4 +47,4 @@ def _deprecate_class(cls: type, warning: str) -> type:
             warn(warning, category=DeprecationWarning, stacklevel=2)
             super().__init__(*args, **kwargs)
 
-    return cast(type, DeprecatedClass)
+    return cast("type", DeprecatedClass)

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/date.py

@@ -36,28 +36,28 @@ class DateTime:
     # 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")
-
-        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)
+        return cls(
+            timestamp_ms=int(
+                datetime.strptime(date, "%Y-%m-%d")
+                .replace(tzinfo=time_zone or ZoneInfo("UTC"))
+                .timestamp()
+                * 1000
+            )
+        )
 
     # 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")
-
-        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)
+        return cls(
+            timestamp_ms=int(
+                datetime.strptime(date_time, "%Y-%m-%dT%H:%M:%S")
+                .replace(tzinfo=time_zone or ZoneInfo("UTC"))
+                .timestamp()
+                * 1000
+            )
+        )
 
     @classmethod
     def from_timestamp(cls, timestamp: float) -> DateTime:

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/fastapi/__init__.py

@@ -5,9 +5,9 @@ from apexdevkit.fastapi.service import RestfulRepository
 
 __all__ = [
     "FastApiBuilder",
-    "RestfulServiceBuilder",
-    "inject",
     "RestfulRepository",
     "RestfulRouter",
+    "RestfulServiceBuilder",
     "RouterWithHiddenUnderscoreRoutes",
+    "inject",
 ]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/fastapi/builder.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from collections.abc import Mapping, MutableSet
 from dataclasses import dataclass, field
-from typing import Any, Protocol, Self
+from typing import TYPE_CHECKING, Any, Protocol, Self
 
 from fastapi import APIRouter, FastAPI
 from fastapi.middleware.cors import CORSMiddleware
@@ -12,7 +11,11 @@ from fastapi.responses import JSONResponse
 from apexdevkit.annotation import deprecated
 from apexdevkit.error import ApiError
 from apexdevkit.fastapi.dependable import DependableBuilder
-from apexdevkit.fastapi.service import RestfulService
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping, MutableSet
+
+    from apexdevkit.fastapi.service import RestfulService
 
 
 @dataclass

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/fastapi/router.py

@@ -123,6 +123,7 @@ class RestfulRouter:
     def with_create_one(
         self,
         dependency: Dependency | None = None,
+        *,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(
@@ -147,6 +148,7 @@ class RestfulRouter:
     def with_read_one(
         self,
         dependency: Dependency | None = None,
+        *,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(
@@ -172,6 +174,7 @@ class RestfulRouter:
         self,
         query: FluentDict[Any],
         dependency: Dependency | None = None,
+        *,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(
@@ -196,6 +199,7 @@ class RestfulRouter:
     def with_read_all(
         self,
         dependency: Dependency | None = None,
+        *,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(
@@ -214,6 +218,7 @@ class RestfulRouter:
     def with_update_one(
         self,
         dependency: Dependency | None = None,
+        *,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(
@@ -242,6 +247,7 @@ class RestfulRouter:
     def with_replace_one(
         self,
         dependency: Dependency | None = None,
+        *,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(
@@ -266,6 +272,7 @@ class RestfulRouter:
     def with_delete_one(
         self,
         dependency: Dependency | None = None,
+        *,
         is_documented: bool = True,
     ) -> Self:
         self.router.add_api_route(

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/fastapi/service.py

@@ -3,11 +3,13 @@ from __future__ import annotations
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
-from apexdevkit.formatter import Formatter
 from apexdevkit.repository import BruteForceBatch, Entity, Repository
-from apexdevkit.repository.core.interface import BatchRepository
+
+if TYPE_CHECKING:
+    from apexdevkit.formatter import Formatter
+    from apexdevkit.repository.core.interface import BatchRepository
 
 RawItem = Mapping[str, Any]
 RawCollection = Iterable[RawItem]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/query/generator.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from collections.abc import Iterable, Mapping
 from dataclasses import dataclass, field
-from typing import Any, ClassVar, Protocol, TypeVar
+from typing import TYPE_CHECKING, Any, ClassVar, Protocol
 
 from apexdevkit.annotation import deprecated
 from apexdevkit.error import ForbiddenError
@@ -24,44 +23,45 @@ from apexdevkit.query.query import (
 )
 from apexdevkit.repository import Database, DatabaseCommand
 
-ItemT = TypeVar("ItemT", covariant=True)
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
 
 
-class _Loader(Protocol[ItemT]):
-    def load(self, raw: Mapping[str, Any]) -> ItemT:
+class _Loader[T](Protocol):
+    def load(self, raw: Mapping[str, Any]) -> T:
         pass
 
 
 @dataclass
-class DefaultMsSqlFilter[ItemT]:
+class DefaultMsSqlFilter[T]:
     _database: Database = field(init=False)
     _query_builder: MsSqlQueryBuilder = field(init=False)
     _options: QueryOptions = field(init=False)
-    _formatter: _Loader[ItemT] = field(init=False)
+    _formatter: _Loader[T] = field(init=False)
 
-    def with_database(self, value: Database) -> DefaultMsSqlFilter[ItemT]:
+    def with_database(self, value: Database) -> DefaultMsSqlFilter[T]:
         self._database = value
 
         return self
 
-    def with_query_builder(self, value: MsSqlQueryBuilder) -> DefaultMsSqlFilter[ItemT]:
+    def with_query_builder(self, value: MsSqlQueryBuilder) -> DefaultMsSqlFilter[T]:
         self._query_builder = value
 
         return self
 
-    def with_options(self, value: QueryOptions) -> DefaultMsSqlFilter[ItemT]:
+    def with_options(self, value: QueryOptions) -> DefaultMsSqlFilter[T]:
         self._options = value
 
         return self
 
-    def with_formatter(self, value: _Loader[ItemT]) -> DefaultMsSqlFilter[ItemT]:
+    def with_formatter(self, value: _Loader[T]) -> DefaultMsSqlFilter[T]:
         self._formatter = value
 
         return self
 
-    def retrieve(self) -> Iterable[ItemT]:
+    def retrieve(self) -> Iterable[T]:
         if not any(sort.name == "id" for sort in self._options.ordering):
-            self._options.ordering.append(Sort("id", False))
+            self._options.ordering.append(Sort(name="id", is_descending=False))
 
         result = self._database.execute(
             self._query_builder.filter(self._options)
@@ -101,7 +101,7 @@ class DefaultMsSqlAggregate:
             for aggregation in self._options.aggregations
             for value in [
                 result[
-                    f"{aggregation.name if aggregation.name else 'general'}"
+                    f"{aggregation.name or 'general'}"
                     f"_{aggregation.aggregation.value.lower()}"
                 ]
             ]
@@ -215,7 +215,7 @@ class MsSqlField:
 
         return result
 
-    def as_order_part(self, is_descending: bool = False) -> str:
+    def as_order_part(self, *, is_descending: bool = False) -> str:
         result = self.name
 
         if is_descending:
@@ -278,7 +278,7 @@ class MsSqlOrderGenerator:
         return f"ORDER BY {clause}"
 
     def generate_one(self, item: Sort) -> str:
-        return self.field_for(item.name).as_order_part(item.is_descending)
+        return self.field_for(item.name).as_order_part(is_descending=item.is_descending)
 
     def field_for(self, name: str) -> MsSqlField:
         for f in self.fields:

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/__init__.py

@@ -19,23 +19,20 @@ from .in_memory import (
 from .sql import MsSqlRepository, SqliteRepository
 
 __all__ = [
-    "Entity",
-    # Core
     "BruteForceBatch",
+    "CacheMixin",
     "Connection",
     "Connector",
     "Cursor",
     "Database",
     "DatabaseCommand",
-    "NoRepository",
-    "Repository",
-    "RepositoryDecorator",
-    # In-memory
-    "CacheMixin",
+    "Entity",
     "InMemoryByteStore",
     "InMemoryRepository",
     "KeyValueStore",
-    # SQL
     "MsSqlRepository",
+    "NoRepository",
+    "Repository",
+    "RepositoryDecorator",
     "SqliteRepository",
 ]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/core/__init__.py

@@ -11,22 +11,18 @@ from .interface import Entity, ItemT, KeyFn, Repository
 from .mixin import ContainsMixin
 
 __all__ = [
-    # Database
+    "BruteForceBatch",
     "Connection",
     "ConnectionContextManager",
     "Connector",
+    "ContainsMixin",
     "Cursor",
     "Database",
     "DatabaseCommand",
-    # Decorator
-    "RepositoryDecorator",
-    "BruteForceBatch",
-    # Interface
     "Entity",
     "ItemT",
     "KeyFn",
-    "Repository",
     "NoRepository",
-    # Mixin
-    "ContainsMixin",
+    "Repository",
+    "RepositoryDecorator",
 ]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/core/database.py

@@ -106,6 +106,6 @@ class ConnectionContextManager(AbstractContextManager[Connection]):
     def __enter__(self) -> Connection:
         return self.connection
 
-    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+    def __exit__(self, exc_type: object, exc_value: object, traceback: object) -> None:
         self.connection.cursor().close()
         self.connection.close()

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/in_memory/__init__.py

@@ -4,7 +4,7 @@ from .store import InMemoryByteStore, KeyValueStore
 
 __all__ = [
     "CacheMixin",
-    "InMemoryRepository",
     "InMemoryByteStore",
+    "InMemoryRepository",
     "KeyValueStore",
 ]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/in_memory/repository.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from collections.abc import Iterator
 from contextlib import suppress
 from dataclasses import dataclass, field
+from typing import TYPE_CHECKING
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.key_fn import AttributeKey
@@ -10,6 +10,9 @@ from apexdevkit.repository.core import ContainsMixin, ItemT, KeyFn, Repository
 
 from .store import InMemoryByteStore, KeyValueStore
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 
 @dataclass(frozen=True)
 class InMemoryRepository(ContainsMixin, Repository[ItemT]):

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/in_memory/store.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
 from dataclasses import dataclass, field
-from typing import Protocol
+from typing import TYPE_CHECKING, Protocol
 
 from apexdevkit.formatter import Formatter, PickleFormatter
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class KeyValueStore[ItemT](Protocol):  # pragma: no cover
     def count(self) -> int:

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/__init__.py

@@ -3,9 +3,9 @@ from .mssql import MsSqlRepository
 from .sqlite import SqliteRepository
 
 __all__ = [
+    "MsSqlRepository",
     "NotNone",
     "SqlFieldBuilder",
     "SqlFieldManager",
-    "MsSqlRepository",
     "SqliteRepository",
 ]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/connector.py

@@ -1,16 +1,19 @@
 from __future__ import annotations
 
 import sqlite3
-from contextlib import AbstractContextManager
 from dataclasses import dataclass
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import pymssql
 from pypebbles.runtime import Environment
 
-from apexdevkit.repository import Connection
 from apexdevkit.repository.core.database import ConnectionContextManager
 
+if TYPE_CHECKING:
+    from contextlib import AbstractContextManager
+
+    from apexdevkit.repository import Connection
+
 
 @dataclass(frozen=True)
 class SqliteFileConnector:

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/field.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
-from collections.abc import Iterator, Mapping
 from dataclasses import dataclass, field
-from typing import Any
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator, Mapping
 
 
 @dataclass(frozen=True)
@@ -26,7 +28,7 @@ class _SqlField:
     parent_value: Any | None = None
 
     is_filter: bool = False
-    filter_values: list[Any | None | NotNone] = field(default_factory=list)
+    filter_values: list[Any | NotNone | None] = field(default_factory=list)
 
     is_fixed: bool = False
     fixed_value: Any | None = None
@@ -48,7 +50,7 @@ class SqlFieldBuilder:
     _parent_value: Any | None = None
 
     _is_filter: bool = False
-    _filter_values: list[Any | None | NotNone] = field(default_factory=list)
+    _filter_values: list[Any | NotNone | None] = field(default_factory=list)
 
     _is_fixed: bool = False
     _fixed_value: Any | None = None
@@ -73,7 +75,7 @@ class SqlFieldBuilder:
 
         return self
 
-    def in_ordering(self, descending: bool = False) -> SqlFieldBuilder:
+    def in_ordering(self, *, descending: bool = False) -> SqlFieldBuilder:
         self._is_ordered = True
         self._is_descending = descending
 
@@ -95,7 +97,7 @@ class SqlFieldBuilder:
 
         return self
 
-    def as_filter(self, values: list[Any | None | NotNone]) -> SqlFieldBuilder:
+    def as_filter(self, values: list[Any | NotNone | None]) -> SqlFieldBuilder:
         self._is_filter = True
         self._filter_values = values
 
@@ -159,12 +161,17 @@ class SqlFieldManager:
     def __iter__(self) -> Iterator[_SqlField]:
         yield from self.fields
 
-    def where_statement(self, include_id: bool = False, read_id: bool = False) -> str:
+    def where_statement(
+        self,
+        *,
+        include_id: bool = False,
+        read_id: bool = False,
+    ) -> str:
         statements = [
             statement
             for statement in [
                 self._parent_filter(),
-                self._id_filter(include_id, read_id),
+                self._id_filter(include_id=include_id, read_id=read_id),
                 self._general_filters(),
             ]
             if statement != ""
@@ -201,7 +208,7 @@ class SqlFieldManager:
 
         return ""
 
-    def _id_filter(self, include_id: bool, read_id: bool) -> str:
+    def _id_filter(self, *, include_id: bool, read_id: bool) -> str:
         if not include_id:
             return ""
 
@@ -237,7 +244,7 @@ class SqlFieldManager:
         return "(" + " OR ".join(clauses) + ")"
 
     def _general_filters(self) -> str:
-        statements: list[str] = [] + self.custom_filters
+        statements: list[str] = [*self.custom_filters]
         for key in self.fields:
             if key.is_filter:
                 inner_statements: list[str] = []

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/mssql/repository.py

@@ -50,7 +50,7 @@ class MsSqlRepository(ContainsMixin, Repository[ItemT]):
         except OperationalError as e:
             if "Conversion failed" in str(e):
                 raise DoesNotExistError(item_id) from e
-            raise e
+            raise
 
         if not raw:
             raise DoesNotExistError(item_id)
@@ -66,7 +66,7 @@ class MssqlException:
     code: int
     message: str
 
-    def __init__(self, e: DatabaseError):
+    def __init__(self, e: DatabaseError) -> None:
         self.code = e.args[0]
         self.message = e.args[1].decode()
 

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/mssql/table.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from apexdevkit.error import ExistsError
-from apexdevkit.formatter import Formatter
 from apexdevkit.repository.core import DatabaseCommand
 from apexdevkit.repository.sql.field import NotNone, SqlFieldManager, _SqlField
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
+
+    from apexdevkit.formatter import Formatter
+
 
 class SqlTable[T]:  # pragma: no cover
     def count_all(self) -> DatabaseCommand:

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/sqlite/__init__.py

@@ -2,7 +2,7 @@ from .repository import SqliteRepository
 from .table import SqliteTableBuilder, SqlTable
 
 __all__ = [
+    "SqlTable",
     "SqliteRepository",
     "SqliteTableBuilder",
-    "SqlTable",
 ]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/sqlite/repository.py

@@ -1,15 +1,18 @@
 from __future__ import annotations
 
-from collections.abc import Iterator, Mapping
 from dataclasses import dataclass, field
 from sqlite3 import IntegrityError
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from apexdevkit.error import DoesNotExistError
 from apexdevkit.repository import Database, Repository
 from apexdevkit.repository.core import ContainsMixin, ItemT
 from apexdevkit.repository.sql.connector import SqliteFileConnector
-from apexdevkit.repository.sql.sqlite.table import SqlTable
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator, Mapping
+
+    from apexdevkit.repository.sql.sqlite.table import SqlTable
 
 
 @dataclass(frozen=True, kw_only=True)

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/sqlite/table.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from apexdevkit.error import ExistsError
-from apexdevkit.formatter import Formatter
 from apexdevkit.repository.core import DatabaseCommand
 from apexdevkit.repository.sql.field import NotNone, SqlFieldManager, _SqlField
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
+
+    from apexdevkit.formatter import Formatter
+
 
 class SqlTable[T]:  # pragma: no cover
     def count_all(self) -> DatabaseCommand:

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/server.py

@@ -1,16 +1,19 @@
 from __future__ import annotations
 
 import logging.config
-from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import sentry_sdk
 import uvicorn
 from dotenv import load_dotenv
-from fastapi import FastAPI
 from pypebbles.runtime import Environment
-from sentry_sdk.types import Event, Hint
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from fastapi import FastAPI
+    from sentry_sdk.types import Event, Hint
 
 
 @dataclass

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/sync/__init__.py

@@ -4,15 +4,15 @@ from .sync import Sync, SyncProbe
 from .target import NoTarget, Target, TargetDecorator, TargetFailing
 
 __all__ = [
-    "Sync",
-    "SyncObserver",
-    "SyncProbe",
     "EmptySource",
+    "NoTarget",
     "Source",
     "SourceDecorator",
     "SourceFailing",
     "SourcePreSet",
-    "NoTarget",
+    "Sync",
+    "SyncObserver",
+    "SyncProbe",
     "Target",
     "TargetDecorator",
     "TargetFailing",

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/sync/observer.py

@@ -1,15 +1,17 @@
 from __future__ import annotations
 
-from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Protocol, Self
+from typing import TYPE_CHECKING, Protocol, Self
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
 
 @dataclass(frozen=True)
 class ObservableSync:
     observers: list[SyncObserver] = field(default_factory=list)
 
-    def attach(self, observer: SyncObserver, when: bool = True) -> Self:
+    def attach(self, observer: SyncObserver, *, when: bool = True) -> Self:
         if when:
             self.observers.append(observer)
 

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/sync/source.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
 from dataclasses import dataclass, field
-from typing import Any, Protocol, TypeVar
+from typing import TYPE_CHECKING, Any, Protocol
 
 from apexdevkit.key_fn import AttributeKey, KeyFn
 
-T = TypeVar("T", covariant=True)
+if TYPE_CHECKING:
+    from collections.abc import Iterable
 
 
-class Source(Protocol[T]):  # pragma: no cover
+class Source[T](Protocol):  # pragma: no cover
     def absent(self) -> Iterable[T]:
         pass
 
@@ -87,19 +87,19 @@ class SourceFailing[T]:  # pragma: no cover
 
 
 @dataclass(frozen=True, kw_only=True)
-class _FailOnAbsent(SourceDecorator[T]):
+class _FailOnAbsent[T](SourceDecorator[T]):
     def absent(self) -> Iterable[T]:  # pragma: no cover
         raise RuntimeError("Should not request absent!")
 
 
 @dataclass(frozen=True, kw_only=True)
-class _FailOnNew(SourceDecorator[T]):
+class _FailOnNew[T](SourceDecorator[T]):
     def new(self) -> Iterable[T]:  # pragma: no cover
         raise RuntimeError("Should not request new!")
 
 
 @dataclass(frozen=True, kw_only=True)
-class _FailOnUpdate(SourceDecorator[T]):
+class _FailOnUpdate[T](SourceDecorator[T]):
     def updates(self) -> Iterable[T]:  # pragma: no cover
         raise RuntimeError("Should not request updates!")
 

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/sync/sync.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import Callable, Collection, Iterable
 from dataclasses import dataclass, field, replace
-from typing import Any, Self, TypeVar
+from typing import TYPE_CHECKING, Any, Self, TypeVar
 
 from apexdevkit.key_fn import AttributeKey, KeyFn
 
@@ -10,6 +9,9 @@ from .observer import DefaultLog, ObservableSync
 from .source import EmptySource, Source, SourceDiscriminator, SourcePreSet
 from .target import IterableTarget, NoTarget, Target
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Collection, Iterable
+
 T = TypeVar("T")
 
 
@@ -44,7 +46,13 @@ class Sync[T](ObservableSync):
     def dry(self, *, when: bool = True) -> Sync[T]:
         return replace(self, dry_run=when)
 
-    def run(self, prune: bool = True, load: bool = True, update: bool = True) -> None:
+    def run(
+        self,
+        *,
+        prune: bool = True,
+        load: bool = True,
+        update: bool = True,
+    ) -> None:
         if prune:
             self.prune()
 
@@ -140,7 +148,7 @@ class SyncProbe:
 
     is_enabled: bool = True
 
-    def disable(self, when: bool) -> SyncProbe:
+    def disable(self, *, when: bool) -> SyncProbe:
         return SyncProbe(source=self.source, is_enabled=not when)
 
     def notify(self, using: Callable[[int], None]) -> SyncProbe:

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/testing.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import Collection
 from dataclasses import dataclass, field, replace
-from typing import Any, Self
+from typing import TYPE_CHECKING, Any, Self
 
 from pypebbles import JsonDict
 from pypebbles.http import (
@@ -13,12 +12,15 @@ from pypebbles.http import (
     HttpTransport,
 )
 
-from apexdevkit.fastapi.name import RestfulName
+if TYPE_CHECKING:
+    from collections.abc import Collection
+
+    from apexdevkit.fastapi.name import RestfulName
 
 
 @dataclass(frozen=True)
 class RestRequest:
-    request: HttpRequest = HttpRequest()
+    request: HttpRequest = field(default_factory=HttpRequest)
 
     def with_params(self, **params: Any) -> RestRequest:
         return replace(self, request=self.request.with_params(params))

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/pyproject.toml

@@ -1,42 +1,41 @@
 [project]
 name = "apexdevkit"
-version = "2.1.2"
+version = "2.1.4"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [
-    { name = "Apex Dev", email = "dev@apex.ge" }
+    { name = "Apex Dev", email = "dev@apex.ge" },
 ]
-dynamic = ["dependencies"]
 requires-python = ">=3.12,<4"
+dynamic = [
+    "dependencies",
+]
 
 [tool.poetry.dependencies]
 fastapi = "*"
-python-dotenv = "*"
-pymssql = "2.*"
 pydantic = "*"
-sentry-sdk = { extras = ["fastapi"], version = "*" }
+pymssql = "2.*"
+pypebbles = "0.4.*"
+python-dotenv = "*"
+sentry-sdk = { extras = [ "fastapi" ], version = "*" }
 uvicorn = "*"
-pypebbles = "0.3.*"
 
 [tool.poetry.group.dev.dependencies]
-apexcodexpy = "0.7.1"
+apexcodexpy = "0.8.*"
+coverage = "*"
+faker = "*"
 pytest = "*"
 pytest-approvaltests = "*"
 pytest-cov = "*"
 pytest-env = "*"
 pytest-recording = "*"
-coverage = "*"
-faker = "*"
 
-[tool.mypy]
-ignore_missing_imports = true
-strict = true
-exclude = [
-    "apexdevkit/fastapi/schema.py",
-    "apexdevkit/fastapi/dependable.py",
-]
-show_error_codes = true
-pretty = true
+[tool.ruff.lint.per-file-ignores]
+"apexdevkit/fastapi/resource.py" = [ "N803" ]
+"apexdevkit/fastapi/dependable.py" = [ "N806" ]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10
 
 [tool.ruff.lint]
 select = [
@@ -44,40 +43,63 @@ select = [
     "ARG",
     "B",
     "C4",
-    "PT",
-    "RSE",
-    "RET",
-    "SIM",
-    "T20",
+    "DTZ",
     "E",
-    "W",
     "F",
+    "FBT",
+    "FLY",
+    "FURB",
     "I",
+    "LOG",
     "N",
+    "PERF",
+    "PGH",
+    "PIE",
+    "PL",
+    "PT",
+    "PTH",
+    "PYI",
+    "RET",
+    "RSE",
+    "RUF",
+    "SIM",
+    "SLF",
+    "T20",
+    "TCH",
+    "TRY",
     "UP",
+    "W",
+]
+ignore = [
+    "PGH",
+    "PLR2004",
+    "PYI",
+    "TRY003",
 ]
 
-[tool.ruff.lint.per-file-ignores]
-"apexdevkit/fastapi/resource.py" = ["N803"]
-"apexdevkit/fastapi/dependable.py" = ["N806"]
-
+[tool.mypy]
+exclude = [
+    "apexdevkit/fastapi/dependable.py",
+    "apexdevkit/fastapi/schema.py",
+]
+ignore_missing_imports = true
+strict = true
+pretty = true
+show_error_codes = true
 
-[tool.ruff.lint.mccabe]
-max-complexity = 10
+[tool.pytest]
+env = [
+    "ECHO_SERVER=http://localhost:8080",
+]
 
 [tool.coverage.run]
-branch = true
 source = [
     "apexdevkit",
     "tests",
 ]
+branch = true
 
 [tool.coverage.report]
-skip_empty = true
 skip_covered = true
+skip_empty = true
 show_missing = true
-
-[tool.pytest]
-env = [
-    "ECHO_SERVER=http://localhost:8080",
-]

apexdevkit-2.1.2/apexdevkit/__init__.py

@@ -1,7 +0,0 @@
-from dotenv import load_dotenv
-from fastapi import FastAPI
-
-__all__ = [
-    "FastAPI",
-    "load_dotenv",
-]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/query/__init__.py

@@ -18,20 +18,20 @@ from apexdevkit.query.query import (
 )
 
 __all__ = [
-    "FooterOptions",
-    "QueryOptions",
+    "Aggregation",
     "AggregationOption",
-    "Sort",
-    "Page",
-    "Summary",
-    "NumericValue",
-    "StringValue",
     "DateValue",
+    "Filter",
+    "FooterOptions",
+    "Leaf",
     "ListValue",
     "NullValue",
-    "Leaf",
-    "Operator",
-    "Filter",
+    "NumericValue",
     "Operation",
-    "Aggregation",
+    "Operator",
+    "Page",
+    "QueryOptions",
+    "Sort",
+    "StringValue",
+    "Summary",
 ]

{apexdevkit-2.1.2 → apexdevkit-2.1.4}/apexdevkit/repository/sql/mssql/__init__.py

@@ -2,8 +2,8 @@ from .repository import MsSqlRepository, UnknownError
 from .table import MsSqlTableBuilder, SqlTable
 
 __all__ = [
-    "MsSqlTableBuilder",
     "MsSqlRepository",
+    "MsSqlTableBuilder",
     "SqlTable",
     "UnknownError",
 ]