Changeset b24d72e in flexoentity

Timestamp:

11/21/25 11:01:43 (8 weeks ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

master

Children:

a475496

Parents:

9592936

Message:

move DomainManager to FlexoGrader

Files:

• flexoentity/__init__.py (modified) (2 diffs)
• flexoentity/domain_manager.py (deleted)
• flexoentity/flexo_entity.py (modified) (6 diffs)
• tests/conftest.py (modified) (2 diffs)
• tests/test_domain.py (deleted)

flexoentity/__init__.py

@@ -14 +14 @@
 from .flexo_entity import FlexoEntity, EntityType, EntityState
 from .domain import Domain
-from .domain_manager import DomainManager
 
 __all__ = [
@@ -22 +21 @@
     "EntityType",
     "Domain",
-    "DomainManager"
     "EntityState",
     "logger"

flexoentity/flexo_entity.py

@@ -205 +205 @@
     @classmethod
     def with_domain_id(cls, domain_id: str, **kwargs):
-        from .domain_manager import DomainManager
+        # from .domain_manager import DomainManager
         entity_type = getattr(cls, "ENTITY_TYPE", None)
         if not entity_type:
             raise ValueError(f"{cls.__name__} must define ENTITY_TYPE")
 
-        if entity_type == EntityType.DOMAIN:
-            DomainManager.create(domain_id=domain_id,
-                                 fullname=kwargs.get("fullname", ""),
-                                 description=kwargs.get("description", ""))
-        else:
+        #if entity_type == EntityType.DOMAIN:
+        #    DomainManager.create(domain_id=domain_id,
+        #                         fullname=kwargs.get("fullname", ""),
+        #                         description=kwargs.get("description", ""))
+        #else:
             # require that this domain already exists
-            if domain_id not in DomainManager.all_domain_ids():
-                raise ValueError(
-                    f"Domain '{domain_id}' does not exist. "
-                    f"Create it first via Domain.with_domain_id(...)."
-                )
+        #    if domain_id not in DomainManager.all_domain_ids():
+        #        raise ValueError(
+        #            f"Domain '{domain_id}' does not exist. "
+        #            f"Create it first via Domain.with_domain_id(...)."
+        #        )
 
         flexo_id = FlexOID.safe_generate(
@@ -235 +235 @@
 
     def __post_init__(self):
-        """
-        FINAL LOGIC:
-            - If flexo_id exists → restore domain_id via DomainManager.
-            - If flexo_id missing → create via safe_generate.
-            - Domain must always match flexo_id.domain.
-        """
         if not self._in_factory:
             raise RuntimeError(
-                f"{self.__class__.__name__} must be created via with_domain_id() "
-                f"or from_dict(), not via direct construction."
+                f"{self.__class__.__name__} must be created via "
+                f"with_domain_id() or from_dict()."
             )
-        # Step 1: If flexo_id exists, restore canonical domain
-        if self.flexo_id:
-            return
-        # Step 2: flexo_id missing → generate one
-        entity_type = getattr(self.__class__, "ENTITY_TYPE", None)
-        if not entity_type:
-            raise ValueError(f"{self.__class__.__name__} must define ENTITY_TYPE")
-
-        if not self.domain_id:
-            raise ValueError(
-                f"{self.__class__.__name__} created without domain; "
-                f"use {self.__class__.__name__}.with_domain_id(domain=...) or pass domain explicitly."
+
+        if not self.flexo_id:
+            raise RuntimeError(
+                f"{self.__class__.__name__} created without flexo_id. "
+                f"Factory must assign it before __post_init__."
             )
 
-        # Create identity
-        self.flexo_id = FlexOID.safe_generate(
-            domain_id=self.domain_id,
-            entity_type=entity_type.value,
-            state=EntityState.DRAFT.value,
-            text=self.text_seed,
-            version=1,
-        )
-
-        # Compute fingerprint
-        self.fingerprint = self._compute_fingerprint()
+        if not self.fingerprint:
+            self.fingerprint = self._compute_fingerprint()
 
     def __str__(self):
@@ -282 +260 @@
         return {
             "flexo_id": str(self.flexo_id),
-            "domain_id": self.domain_id,
+            "domain_id": self.flexo_id.domain_id,
             "fingerprint": self.fingerprint,
             "origin": self.origin,
@@ -359 +337 @@
             raise ValueError(
                 f"Illegal state transition: {self.state.name} → {target_state.name}. "
-                f"Allowed: {', '.join([each.name for each in self.allowed_transitions()]) or 'none'}"
             )
 
@@ -434 +411 @@
             raise ValueError(
                 f"Illegal state transition: {self.state.name} → PUBLISHED. "
-                f"Allowed: {', '.join([each.name for each in self.allowed_transitions()]) or 'none'}"
             )
 
@@ -451 +427 @@
     def obsolete(self):
         """I mark myself as obsolete"""
-        allowed = self.allowed_transitions()
         if EntityState.OBSOLETE not in self.allowed_transitions():
             raise ValueError(
                 f"Illegal state transition: {self.state.name} -> OBSOLETE. "
-                f"Allowed: {', '.join([each.name for each in self.allowed_transitions()]) or 'none'}"
             )
         if self.state != EntityState.OBSOLETE:

tests/conftest.py

@@ -4 +4 @@
 from dataclasses import dataclass, field
 from typing import List
-from flexoentity import FlexOID, FlexoEntity, EntityType, EntityState, Domain, DomainManager
+from flexoentity import FlexOID, FlexoEntity, EntityType, EntityState, Domain
 
 @pytest.fixture
@@ -14 +14 @@
     monkeypatch.setattr("flexoentity.id_factory.datetime", FixedDate)
     return FixedDate
-
-@pytest.fixture(autouse=True)
-def reset_domain_manager():
-    DomainManager.clear()   # You need to implement this
-    yield
-    DomainManager.clear()
-
-@pytest.fixture(autouse=True)
-def auto_domains():
-    Domain.with_domain_id("GENERAL", fullname="General Domain")
-    Domain.with_domain_id("TEST", fullname="Test Domain")
 
 @dataclass