apexdevkit 1.32.7__tar.gz → 1.33.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apexdevkit
-Version: 1.32.7
+Version: 1.33.1
 Summary: Apex Development Tools for python.
 License-File: LICENSE
 Author: Apex Dev

{apexdevkit-1.32.7 → apexdevkit-1.33.1}/apexdevkit/repository/sql/connector.py

@@ -8,13 +8,14 @@ from typing import Any
 
 import pymssql
 
+from apexdevkit.environment import environment_variable
 from apexdevkit.repository import Connection
 from apexdevkit.repository.core.database import ConnectionContextManager
 
 
 @dataclass(frozen=True)
 class SqliteFileConnector:
-    dsn: str
+    dsn: str = environment_variable("DSN")
 
     def connect(self) -> AbstractContextManager[Connection]:
         connection = sqlite3.connect(self.dsn)
@@ -40,12 +41,12 @@ class SqliteInMemoryConnector:
 
 @dataclass(frozen=True)
 class MsSqlConnector:
-    db_host: str
-    db_user: str
-    db_password: str
-    db_name: str
+    db_host: str = environment_variable("DB_HOST")
+    db_user: str = environment_variable("DB_USER")
+    db_password: str = environment_variable("DB_PASSWORD")
+    db_name: str = environment_variable("DB_NAME")
+    db_port: str = environment_variable("DB_PORT", default="1433")
     db_tds_version = "7.0"
-    db_port: str = "1433"
 
     def connect(self) -> AbstractContextManager[Connection]:
         return ConnectionContextManager(self._connection())

{apexdevkit-1.32.7 → apexdevkit-1.33.1}/apexdevkit/repository/sql/mssql.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable, Iterator, Mapping
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any, Generic
 
 from pymssql.exceptions import DatabaseError, OperationalError
@@ -16,14 +16,16 @@ from apexdevkit.repository.core import (
     Repository,
 )
 
+from .connector import MsSqlConnector
 from .field import NotNone, SqlFieldManager, _SqlField
 
 
-@dataclass
+@dataclass(frozen=True, kw_only=True)
 class MsSqlRepository(ContainsMixin[ItemT], Repository[ItemT]):
-    db: Database
     table: SqlTable[ItemT]
 
+    db: Database = field(default_factory=lambda: Database(connector=MsSqlConnector()))
+
     def __iter__(self) -> Iterator[ItemT]:
         for raw in self.db.execute(self.table.select_all()).fetch_all():
             yield self.table.load(raw)

{apexdevkit-1.32.7 → apexdevkit-1.33.1}/apexdevkit/repository/sql/sqlite.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable, Iterator, Mapping
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from sqlite3 import IntegrityError
 from typing import Any, Generic
 
@@ -15,14 +15,16 @@ from apexdevkit.repository.core import (
     Repository,
 )
 
+from .connector import SqliteFileConnector
 from .field import NotNone, SqlFieldManager, _SqlField
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class SqliteRepository(ContainsMixin[ItemT], Repository[ItemT]):
-    db: Database
     table: SqlTable[ItemT]
 
+    db: Database = field(default_factory=lambda: Database(SqliteFileConnector()))
+
     def __iter__(self) -> Iterator[ItemT]:
         for raw in self.db.execute(self.table.select_all()).fetch_all():
             yield self.table.load(raw)

{apexdevkit-1.32.7 → apexdevkit-1.33.1}/apexdevkit/sync/observer.py

@@ -68,22 +68,23 @@ class SyncObserver(Protocol):  # pragma: no cover
 
 @dataclass(frozen=True)
 class DefaultLog:
+    name: str = "items"
     echo: Callable[[str], None] = print
 
     def before_prune(self, n_items: int) -> None:
-        self.echo(f"Total # of absent items: {n_items}")
+        self.echo(f"Total # of absent {self.name}: {n_items}")
 
     def after_prune(self) -> None:
         self.echo("Pruning completed")
 
     def before_load(self, n_items: int) -> None:
-        self.echo(f"Total # of new items: {n_items}")
+        self.echo(f"Total # of new {self.name}: {n_items}")
 
     def after_load(self) -> None:
         self.echo("Loading completed")
 
     def before_update(self, n_items: int) -> None:
-        self.echo(f"Total # of updates: {n_items}")
+        self.echo(f"Total # of changed {self.name}: {n_items}")
 
     def after_update(self) -> None:
         self.echo("Updating completed")

{apexdevkit-1.32.7 → apexdevkit-1.33.1}/apexdevkit/sync/source.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Iterable
 from dataclasses import dataclass, field
-from typing import Generic, Protocol, TypeVar
+from typing import Any, Generic, Protocol, TypeVar
 
 from apexdevkit.key_fn import AttributeKey, KeyFn
 
@@ -109,17 +109,28 @@ class SourceDiscriminator(Generic[T]):
     current: Iterable[T]
     latest: Iterable[T]
 
-    key_fn: KeyFn = AttributeKey("id")
+    key_fn: KeyFn | None = None
 
     def absent(self) -> Iterable[T]:
-        index = {self.key_fn(item) for item in self.latest}
+        index = {self.key_of(item) for item in self.latest}
 
-        return [item for item in self.current if self.key_fn(item) not in index]
+        return [item for item in self.current if self.key_of(item) not in index]
 
     def new(self) -> Iterable[T]:
-        index = {self.key_fn(item) for item in self.current}
+        index = {self.key_of(item) for item in self.current}
 
-        return [item for item in self.latest if self.key_fn(item) not in index]
+        return [item for item in self.latest if self.key_of(item) not in index]
 
     def updates(self) -> Iterable[T]:
-        return set(self.latest).difference(self.current)
+        index = {self.key_of(item) for item in self.current}
+
+        return [
+            item
+            for item in set(self.latest).difference(self.current)
+            if self.key_of(item) in index
+        ]
+
+    def key_of(self, item: Any) -> str:
+        key_fn = self.key_fn or AttributeKey("id")
+
+        return key_fn(item)

{apexdevkit-1.32.7 → apexdevkit-1.33.1}/apexdevkit/sync/sync.py

@@ -4,8 +4,10 @@ from collections.abc import Callable, Collection, Iterable
 from dataclasses import dataclass, field, replace
 from typing import Any, Generic, Self, TypeVar
 
+from apexdevkit.key_fn import AttributeKey, KeyFn
+
 from .observer import DefaultLog, ObservableSync
-from .source import EmptySource, Source, SourcePreSet
+from .source import EmptySource, Source, SourceDiscriminator, SourcePreSet
 from .target import IterableTarget, NoTarget, Target
 
 T = TypeVar("T")
@@ -18,6 +20,12 @@ class Sync(ObservableSync, Generic[T]):
 
     dry_run: bool = False
 
+    def purge(self) -> _Purge[T]:
+        return _Purge[T](sync=self)
+
+    def discriminate(self, latest: Iterable[T]) -> _Discriminate[T]:
+        return _Discriminate[T](sync=self, latest=latest)
+
     def and_target(self, value: Target[T]) -> Sync[T]:
         return self.with_target(value)
 
@@ -30,19 +38,12 @@ class Sync(ObservableSync, Generic[T]):
     def with_source(self, value: Source[T]) -> Sync[T]:
         return replace(self, source=value)
 
-    def with_log(self, using: Callable[[str], None]) -> Self:
-        return self.attach(DefaultLog(echo=using))
+    def with_log(self, using: Callable[[str], None], named: str = "items") -> Self:
+        return self.attach(DefaultLog(name=named, echo=using))
 
     def dry(self, *, when: bool = True) -> Sync[T]:
         return replace(self, dry_run=when)
 
-    def purge(self, target: IterableTarget[T]) -> None:
-        (
-            self.with_target(target)
-            .and_source(SourcePreSet[T](removals=target))
-            .run(load=False, update=False)
-        )
-
     def run(self, prune: bool = True, load: bool = True, update: bool = True) -> None:
         if prune:
             self.prune()
@@ -81,6 +82,58 @@ class Sync(ObservableSync, Generic[T]):
         )
 
 
+@dataclass(frozen=True, kw_only=True)
+class _Purge(Generic[T]):
+    sync: Sync[T]
+
+    def target(self, value: IterableTarget[T]) -> _Purge[T]:
+        return _Purge[T](
+            sync=replace(
+                self.sync,
+                target=value,
+                source=SourcePreSet[T](removals=list(value)),
+            )
+        )
+
+    def __call__(self) -> None:
+        self.run()
+
+    def run(self) -> None:
+        self.sync.prune()
+
+
+@dataclass
+class _Discriminate(Generic[T]):
+    sync: Sync[T]
+    latest: Iterable[T]
+
+    current: Iterable[T] = field(default_factory=list)
+
+    def against(self, target: IterableTarget[T]) -> _Discriminate[T]:
+        return self.target(target).and_current(list(target))
+
+    def target(self, value: Target[T]) -> _Discriminate[T]:
+        return replace(self, sync=self.sync.with_target(value))
+
+    def and_current(self, value: Iterable[T]) -> _Discriminate[T]:
+        return replace(self, current=value)
+
+    def default(self) -> Sync[T]:
+        return self.using_attribute(name="id")
+
+    def using_attribute(self, name: str) -> Sync[T]:
+        return self.using(key_fn=AttributeKey(name))
+
+    def using(self, key_fn: KeyFn) -> Sync[T]:
+        return self.sync.with_source(
+            SourceDiscriminator(
+                current=self.current,
+                latest=self.latest,
+                key_fn=key_fn,
+            )
+        )
+
+
 @dataclass(frozen=True, kw_only=True)
 class SyncProbe:
     source: Collection[Any]

{apexdevkit-1.32.7 → apexdevkit-1.33.1}/pyproject.toml

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