hexkit 8.3.0__tar.gz → 8.4.0__tar.gz

{hexkit-8.3.0/src/hexkit.egg-info → hexkit-8.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hexkit
-Version: 8.3.0
+Version: 8.4.0
 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-8.3.0 → hexkit-8.4.0}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Intended Audience :: Developers",
 ]
 name = "hexkit"
-version = "8.3.0"
+version = "8.4.0"
 description = "A Toolkit for Building Microservices using the Hexagonal Architecture"
 dependencies = [
     "opentelemetry-api >=1.39, <2",

{hexkit-8.3.0 → hexkit-8.4.0}/src/hexkit/protocols/dao.py

@@ -170,6 +170,14 @@ class FindResult(AsyncIterator[Dto]):
             self._cached_total = await self._get_total_count()
         return self._cached_total
 
+    async def to_list(self) -> list[Dto]:
+        """Collect all results into a list.
+
+        Calling this function will consume the iterator. Subsequent cals will return
+        an empty list.
+        """
+        return [item async for item in self]
+
 
 class Dao(typing.Protocol[Dto]):
     """A duck type with methods common to all DAOs."""

{hexkit-8.3.0 → hexkit-8.4.0}/src/hexkit/providers/mongokafka/provider/daopub.py

@@ -420,8 +420,20 @@ class MongoKafkaDaoPublisher(Generic[Dto]):
         validate_find_mapping(mapping, dto_model=self._dto_model)
         mapping = replace_id_field_in_find_mapping(mapping, self._id_field)
 
-        # Ensure we don't retrieve deleted docs
-        mapping_without_deleted = {**mapping, "__metadata__.deleted": False}
+        # Ensure we don't retrieve deleted docs. Documents lacking outbox metadata are
+        # treated as valid (matching update/delete), and the $and wrapper avoids
+        # clobbering any caller-supplied $or in the mapping.
+        mapping_without_deleted = {
+            "$and": [
+                dict(mapping),
+                {
+                    "$or": [
+                        {"__metadata__": {"$exists": False}},
+                        {"__metadata__.deleted": False},
+                    ]
+                },
+            ]
+        }
 
         # Convert generic sort spec to MongoDB-specific sort spec
         mongodb_sort: list[tuple[str, int]] = []

{hexkit-8.3.0 → hexkit-8.4.0}/src/hexkit/providers/testing/dao.py

@@ -16,10 +16,11 @@
 """A mock (in-memory) DAO"""
 
 from collections.abc import AsyncIterator, Callable, Mapping
-from contextlib import suppress
+from contextlib import AbstractAsyncContextManager, suppress
 from copy import deepcopy
+from functools import partial
 from typing import Any, Generic, Protocol, TypeVar
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 from pydantic import BaseModel
 
@@ -87,6 +88,18 @@ def _get_nested_value(resource: Document, field_path: str) -> Any:
     return value
 
 
+def _sort_key(resource: Document, *, field_path: str) -> tuple[bool, Any]:
+    """Build a sort key for a (possibly nested) field path of a resource.
+
+    Missing values (None) are grouped together and sorted ahead of present values,
+    mirroring MongoDB's handling of missing/null fields. The leading boolean keeps
+    None values from being compared against present values (or one another), which
+    would otherwise raise a TypeError.
+    """
+    value = _get_nested_value(resource, field_path)
+    return (value is not None, value if value is not None else 0)
+
+
 class Predicate(Protocol):
     def evaluate(self, resource: dict[str, Any]) -> bool:
         """Determine if the supplied dict value satisfies the predicate."""
@@ -346,7 +359,10 @@ class BaseInMemDao(Generic[DTO]):
     _deserialize: Callable
     publish_pending = AsyncMock()
     republish = AsyncMock()
-    with_transaction = Mock()
+
+    @classmethod
+    def with_transaction(cls) -> AbstractAsyncContextManager["BaseInMemDao[DTO]"]:
+        raise NotImplementedError()
 
     def __init__(self) -> None:
         self.resources: dict[ID, Document] = {}
@@ -437,8 +453,12 @@ class BaseInMemDao(Generic[DTO]):
         for spec in reversed(sort or []):
             desc = spec.startswith("-")
             field = spec.removeprefix("-")
+            # Only the exact ID field is translated to the internal "_id" field, matching
+            # the MongoDB provider. Other fields (including nested sub-fields of the ID,
+            # which MongoDB cannot sort by) are looked up as-is and resolve to None when
+            # absent, sorting consistently rather than raising - again like MongoDB.
             doc_field = "_id" if field == self._id_field else field
-            matching.sort(key=lambda doc: doc[doc_field], reverse=desc)
+            matching.sort(key=partial(_sort_key, field_path=doc_field), reverse=desc)
 
         total = len(matching)
 

{hexkit-8.3.0 → hexkit-8.4.0/src/hexkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hexkit
-Version: 8.3.0
+Version: 8.4.0
 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