hexkit 3.0.0__tar.gz → 3.0.2__tar.gz

{hexkit-3.0.0/src/hexkit.egg-info → hexkit-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hexkit
-Version: 3.0.0
+Version: 3.0.2
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0

{hexkit-3.0.0 → hexkit-3.0.2}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Intended Audience :: Developers",
 ]
 name = "hexkit"
-version = "3.0.0"
+version = "3.0.2"
 description = "A Toolkit for Building Microservices using the Hexagonal Architecture"
 dependencies = [
     "pydantic >=2, <3",
@@ -113,6 +113,7 @@ ignore = [
     "D107",
     "D206",
     "D300",
+    "UP040",
 ]
 select = [
     "C90",
@@ -183,4 +184,22 @@ source = [
 ]
 
 [tool.tox]
-legacy_tox_ini = "    [tox]\n    env_list = py3{9,12}\n\n    [gh-actions]\n    python =\n        3.9: py39\n        3.10: py310\n        3.11: py311\n        3.12: py312\n\n    [testenv]\n    pass_env =\n        TC_HOST\n        DOCKER_HOST\n    deps =\n        --no-deps -r ./lock/requirements-dev.txt\n    commands = pytest {posargs}\n"
+legacy_tox_ini = """
+    [tox]
+    env_list = py3{9,12}
+
+    [gh-actions]
+    python =
+        3.9: py39
+        3.10: py310
+        3.11: py311
+        3.12: py312
+
+    [testenv]
+    pass_env =
+        TC_HOST
+        DOCKER_HOST
+    deps =
+        --no-deps -r ./lock/requirements-dev.txt
+    commands = pytest {posargs}
+"""

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/custom_types.py

@@ -22,7 +22,7 @@ from typing import Any, Literal, Union
 # This is intended to type objects that could be a potential output of `json.loads`.
 # (Scalar types as well as arrays are excluded from the above assumption.)
 JsonObject = Mapping[
-    str, Union[int, float, str, bool, Sequence[Any], Mapping[str, Any]]
+    str, Union[int, float, str, bool, Sequence[Any], Mapping[str, Any], None]
 ]
 
 

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/protocols/dao.py

@@ -132,7 +132,7 @@ class DaoCommons(typing.Protocol[Dto]):
         """
         ...
 
-    async def delete(self, *, id_: str) -> None:
+    async def delete(self, id_: str) -> None:
         """Delete a resource by providing its ID.
 
         Args:

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/providers/mongodb/provider.py

@@ -201,7 +201,7 @@ class MongoDbDaoBase(ABC, Generic[Dto]):
         # (trusting MongoDB that matching on the _id field can only yield one or
         # zero matches)
 
-    async def delete(self, *, id_: str) -> None:
+    async def delete(self, id_: str) -> None:
         """Delete a resource by providing its ID.
 
         Args:

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/providers/mongodb/testutils.py

@@ -31,6 +31,8 @@ from testcontainers.mongodb import MongoDbContainer
 from hexkit.custom_types import PytestScope
 from hexkit.providers.mongodb.provider import MongoDbConfig, MongoDbDaoFactory
 
+MONGODB_IMAGE = "mongo:6.0.3"
+
 
 @dataclass(frozen=True)
 class MongoDbFixture:
@@ -77,7 +79,7 @@ def mongodb_fixture_function() -> Generator[MongoDbFixture, None, None]:
 
     **Do not call directly** Instead, use get_mongodb_fixture()
     """
-    with MongoDbContainer(image="mongo:6.0.3") as mongodb:
+    with MongoDbContainer(image=MONGODB_IMAGE) as mongodb:
         config = config_from_mongodb_container(mongodb)
         dao_factory = MongoDbDaoFactory(config=config)
         client = mongodb.get_connection_client()

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/providers/mongokafka/__init__.py

@@ -16,4 +16,6 @@
 
 """An implementation of the DaoPublisherFactoryProtocol based on MongoDB and Apache Kafka."""
 
-from .provider import MongoKafkaConfig, MongoKafkaDaoPublisherFactory  # noqa: F401
+from .provider import MongoKafkaConfig, MongoKafkaDaoPublisherFactory
+
+__all__ = ["MongoKafkaConfig", "MongoKafkaDaoPublisherFactory"]

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/providers/mongokafka/provider.py

@@ -135,7 +135,7 @@ def get_delete_publish_func(
         )
 
         document = {"_id": id_, "__metadata__": {"deleted": True, "published": True}}
-        await collection.replace_one({"_id": document["_id"]}, document, upsert=True)
+        await collection.replace_one({"_id": document["_id"]}, document)
 
     return publish_deletion
 
@@ -233,13 +233,17 @@ class MongoKafkaDaoPublisher(Generic[Dto]):
             ResourceNotFoundError:
                 when resource with the id specified in the dto was not found
         """
-        with assert_not_deleted():
-            await self._dao.update(dto)
+        document = self._dao._dto_to_document(dto)
+        result = await self._collection.replace_one(
+            {"_id": document["_id"], "__metadata__.deleted": False}, document
+        )
+        if result.matched_count == 0:
+            raise ResourceNotFoundError(id_=document["_id"])
 
         if self._autopublish:
             await self._publish_change(dto)
 
-    async def delete(self, *, id_: str) -> None:
+    async def delete(self, id_: str) -> None:
         """Delete a resource by providing its ID.
 
         Args:
@@ -248,10 +252,15 @@ class MongoKafkaDaoPublisher(Generic[Dto]):
         Raises:
             ResourceNotFoundError: when resource with the specified id_ was not found
         """
-        document = {"_id": id_, "__metadata__": {"deleted": True, "published": False}}
-        await self._collection.replace_one(
-            {"_id": document["_id"]}, document, upsert=True
+        document = {
+            "_id": id_,
+            "__metadata__": {"deleted": True, "published": False},
+        }
+        result = await self._collection.replace_one(
+            {"_id": document["_id"], "__metadata__.deleted": False}, document
         )
+        if result.matched_count == 0:
+            raise ResourceNotFoundError(id_=id_)
 
         if self._autopublish:
             await self._publish_delete(id_)

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/providers/s3/testutils.py

@@ -38,6 +38,8 @@ from hexkit.custom_types import PytestScope
 from hexkit.protocols.objstorage import ObjectStorageProtocol, PresignedPostURL
 from hexkit.providers.s3.provider import S3Config, S3ObjectStorage
 
+LOCALSTACK_IMAGE = "localstack/localstack:0.14.5"
+
 TEST_FILE_DIR = Path(__file__).parent.resolve() / "test_files"
 
 TEST_FILE_PATHS = [
@@ -123,9 +125,7 @@ def s3_fixture_function() -> Generator[S3Fixture, None, None]:
 
     **Do not call directly** Instead, use get_s3_fixture()
     """
-    with LocalStackContainer(image="localstack/localstack:0.14.5").with_services(
-        "s3"
-    ) as localstack:
+    with LocalStackContainer(image=LOCALSTACK_IMAGE).with_services("s3") as localstack:
         config = config_from_localstack_container(localstack)
 
         storage = S3ObjectStorage(config=config)

{hexkit-3.0.0 → hexkit-3.0.2}/src/hexkit/providers/testing/eventpub.py

@@ -67,7 +67,7 @@ class InMemEventPublisher(EventPublisherProtocol):
     """
     An in-memory EventPublisher for testing purposes.
     Please note, this only works when publisher and consumers are running in the same
-    thread. Not suitable for inter-thread or inter-process comminication.
+    thread. Not suitable for inter-thread or inter-process communication.
     """
 
     def __init__(self, event_store: Optional[InMemEventStore] = None):

{hexkit-3.0.0 → hexkit-3.0.2/src/hexkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hexkit
-Version: 3.0.0
+Version: 3.0.2
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0