Changeset fd1913f in flexoentity

Timestamp:

11/20/25 12:01:11 (8 weeks ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

master

Children:

9592936

Parents:

32fdc4a

Message:

version logic simplified - parsed renamed to to_dict

Files:

• flexoentity/domain.py (modified) (2 diffs)
• flexoentity/flexo_entity.py (modified) (3 diffs)
• flexoentity/id_factory.py (modified) (1 diff)
• tests/conftest.py (modified) (1 diff)
• tests/test_flexoid.py (modified) (1 diff)

flexoentity/domain.py

@@ -22 +22 @@
                                   fullname="Generic Domain", classification="UNCLASSIFIED")
 
-    def __post_init__(self):
-        super().__post_init__()
-        # Create a FlexOID only if none was restored
-        if not getattr(self, "flexo_id", None):
-            self.flexo_id = FlexOID.safe_generate(
-                domain_id=self.domain_id,
-                entity_type=self.ENTITY_TYPE.value,   # "D"
-                state=EntityState.DRAFT.value,       # "D"
-                text=self.domain_id,                       # seed must be stable
-                version=1,
-            )
-
     @property
     def text_seed(self) -> str:
@@ -56 +44 @@
         flexo_id = FlexOID(data["flexo_id"])
 
-        print("Data:", data)
         obj = cls(
             fullname=data.get("fullname", ""),

flexoentity/flexo_entity.py

@@ -320 +320 @@
 
     @classmethod
-    def from_json(cls, data_str: str) -> "FlexoEntity":
+    def from_json(cls, data_str: str):
         """I create a new instance from a JSON string."""
         data = json.loads(data_str)
         return cls.from_dict(data)
 
-    @staticmethod
-    def should_version(state) -> bool:
-        """
-        FIXME: This is now superfluous, because lifecycle changes should not increment
-        version at all.
-        I determine if a given lifecycle state should trigger a version increment.
-
-        Entities typically version when they move into more stable or
-        externally visible states, such as APPROVED, SIGNED, or PUBLISHED.
-        """
-
-        return state in (
-            EntityState.APPROVED,
-            EntityState.APPROVED_AND_SIGNED,
-            EntityState.PUBLISHED,
-        )
-
     def _compute_fingerprint(self) -> str:
-        """I always recompute the entity's content fingerprint."""
+        """I recompute the entity's content fingerprint."""
         seed = self.canonical_seed()
         return hashlib.blake2s(seed.encode("utf-8"), digest_size=8).hexdigest().upper()
@@ -349 +332 @@
     def _update_fingerprint(self) -> bool:
         """
-        FIXME: I am not sure if this is correct behaviour.
-        I Update FlexOID if the content fingerprint changed.
+        I update FlexOID if the content fingerprint changed.
         """
         new_fp = self._compute_fingerprint()
@@ -379 +361 @@
             self.flexo_id = self.flexo_id.with_state(EntityState.OBSOLETE.value)
             return
-
-        # version bump only for stable/external states
-        if self.should_version(target_state):
-            self._update_fingerprint()
-            self.flexo_id = FlexOID.next_version(self.flexo_id)
 
         self.state = target_state

flexoentity/id_factory.py

@@ -354 +354 @@
         return FlexOID.safe_generate(domain, entity_type, state, text, version=1)
 
-    def parsed(self) -> dict:
+    def to_dict(self) -> dict:
         """
         I answer a dictionary that describes all my components —

tests/conftest.py

@@ -82 +82 @@
         # restore FlexoEntity core fields
         if "flexo_id" in data:
-            obj.flexo_id = FlexOID.parsed(data["flexo_id"])
+            obj.flexo_id = FlexOID.to_dict(data["flexo_id"])
         return obj
 

tests/test_flexoid.py

@@ -134 +134 @@
 def test_parsed_returns_expected_dict():
     fid = FlexOID("GEN-I251101-ABCDEF123456@007S")
-    data = fid.parsed()
+    data = fid.to_dict()
     assert data["domain_id"] == "GEN"
     assert data["entity_type"] == "I"