Changeset df459f7 in flexoentity

Timestamp:

11/29/25 14:55:33 (7 weeks ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

master

Children:

918474d

Parents:

4a79b76

Message:

use FlexoCollection for domain manager

Files:

• flexoentity/__init__.py (modified) (2 diffs)
• flexoentity/domain_manager.py (added)
• flexoentity/flexo_collection.py (modified) (9 diffs)
• tests/conftest.py (modified) (2 diffs)
• tests/test_domain.py (added)

flexoentity/__init__.py

@@ -15 +15 @@
 from .flexo_collection import FlexoCollection
 from .domain import Domain
+from .domain_manager import DomainManager, DuplicateDomainError
 from .flexo_signature import FlexoSignature, CertificateReference
 from .signing_backends import get_signing_backend
@@ -24 +25 @@
     "EntityType",
     "Domain",
+    "DomainManager",
+    "DuplicateDomainError",
     "EntityState",
     "FlexoCollection",

flexoentity/flexo_collection.py

@@ -5 +5 @@
 A minimal collection for FlexOEntities.
 
-- No domain rules
-- No uniqueness validation (last write wins)
-- No state or lifecycle logic
-- No typing constraints
-
-The goal is to provide a Smalltalk-like Collection object with a simple
-protocol for storing, retrieving, iterating, and serializing FlexOEntities.
+- Default key = entity.flexo_id
+- Optional override key=... for special cases (e.g., domains)
+- Smalltalk-like protocol preserved
+- Dict-based: fast lookup
+- Backwards compatible API
 """
-
 
 from .flexo_entity import FlexoEntity
@@ -21 +18 @@
 class FlexoCollection:
     """
-    A minimal collection of FlexOEntities, keyed by FlexOID.
+    A minimal collection of FlexOEntities, keyed by FlexOID by default.
 
     Examples:
         coll = FlexoCollection()
-        coll.add(entity)
-        entity = coll.get(some_id)
+        coll.add(entity)                      # uses entity.flexo_id as key
+        coll.add(domain, key=domain.domain_id) # override key if needed
+        ent = coll.get(some_id)
         for e in coll:
             ...
@@ -32 +30 @@
 
     def __init__(self, items=None):
+        # internal dict-based storage
         self._items = {}
 
@@ -38 +37 @@
                 self.add(it)
 
-    def add(self, entity: FlexoEntity):
-        """Add or replace an entity by its FlexOID. Overwrites on duplicate IDs."""
-        self._items[entity.flexo_id] = entity
+    # ------------------------------------------------------------------
+    # Core API (unchanged externally, enhanced internally)
+    # ------------------------------------------------------------------
+
+    def add(self, entity: FlexoEntity, key=None):
+        """
+        Add or replace an entity.
+
+        - If key is None → use entity.flexo_id
+        - If key is given → use caller-provided key
+        """
+        if key is None:
+            try:
+                key = entity.flexo_id
+            except AttributeError:
+                raise TypeError(
+                    "Items must have .flexo_id or explicitly use add(entity, key=...)."
+                )
+
+        self._items[key] = entity  # overwrite is intentional & preserved
 
     def remove(self, oid: FlexOID):
-        """Remove an entity by ID, ignoring if missing."""
+        """Remove an entity by ID, ignoring if missing (API preserved)."""
         self._items.pop(oid, None)
+
+    def clear(self):
+        self._items = {}
 
     def get(self, oid: FlexOID):
@@ -60 +79 @@
         return iter(self._items.values())
 
+    # ------------------------------------------------------------------
+    # Additional public helpers (unchanged)
+    # ------------------------------------------------------------------
+
     def entities(self):
-        """Return all entities."""
+        """Return all entities as a list."""
         return list(self._items.values())
 
     def ids(self):
-        """Return all IDs."""
+        """Return all stored keys."""
         return list(self._items.keys())
 
     # ------------------------------------------------------------------
-    # Smalltalk-inspired interface
+    # Smalltalk-inspired interface (unchanged)
     # ------------------------------------------------------------------
 
@@ -77 +100 @@
 
     def at_put(self, oid, entity):
-        """Smalltalk-style setter."""
+        """Smalltalk-style setter (kept)."""
         self._items[oid] = entity
 
@@ -90 +113 @@
 
     # ------------------------------------------------------------------
-    # Serialization helpers
+    # Serialization helpers (unchanged)
     # ------------------------------------------------------------------
 
     def to_dict_list(self):
-        """Serialize entities to a list of dicts."""
+        """Serialize all entities to list of dicts."""
         return [e.to_dict() for e in self._items.values()]
 
@@ -102 +125 @@
         Deserialize a list of dicts into a FlexoCollection.
 
-        Uses FlexoEntity.from_dict to dispatch to the correct subclass.
+        Uses FlexoEntity.from_dict() to dispatch to the correct subclass.
         """
         c = cls()
@@ -110 +133 @@
         return c
 
+    # ------------------------------------------------------------------
+
     def __repr__(self) -> str:
         return f"<FlexoCollection size={len(self._items)}>"

tests/conftest.py

@@ -3 +3 @@
 from pathlib import Path
 from datetime import datetime
-from flexoentity import Domain, FlexoSignature
+from flexoentity import Domain, FlexoSignature, DomainManager
 from flexoentity import get_signing_backend, CertificateReference
 
@@ -28 +28 @@
 
 
+@pytest.fixture
+def sample_domain_manager():
+    return DomainManager()
+
 # ─────────────────────────────────────────────────────────────
 # Basic test data directory + PEM test files
 # ─────────────────────────────────────────────────────────────
+
 
 @pytest.fixture(scope="session")