Changeset 4af65b0 in flexoentity

Timestamp:

11/04/25 20:20:01 (2 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

master

Children:

73d392f

Parents:

bf30018

Message:

initial logging support

Files:

• flexoentity/__init__.py (modified) (2 diffs)
• flexoentity/flexo_entity.py (modified) (8 diffs)
• flexoentity/flexo_logging.conf (added)
• flexoentity/id_factory.py (modified) (1 diff)
• tests/test_id_lifecycle.py (modified) (1 diff)
• tests/test_persistance_integrity.py (modified) (1 diff)

flexoentity/__init__.py

@@ -10 +10 @@
 from .flexo_entity import FlexoEntity, EntityType, EntityState
 from .domain import Domain
+import logging
+import logging.config
+import os
+from pathlib import Path
 
 __all__ = [
@@ -20 +24 @@
 ]
 
+# FIXME: change the default log path to /var/log/ammos/ammos.log when system
+# configuration created this dir with the appropriate rights
+
+log_dir = Path(os.environ.get('FLEXO_LOG_DIR', '/tmp/'))
+
+log_path = log_dir / 'flexo.log'
+
+if not log_path.exists():
+    try:
+        log_path.touch()
+    except PermissionError:
+        conf_file = Path(__file__).parent / 'flexo_logging.conf'
+        print("Conf file", conf_file)
+        logging.config.fileConfig(conf_file)
+else:
+    logging.basicConfig(filename=str(log_path), encoding='utf-8', level=logging.DEBUG)
+
+logger = logging.getLogger(__name__)
+
+logger.setLevel(os.environ.get('FLEXO_LOG_LEVEL', logger.getEffectiveLevel()))
 # Optional: keep dynamic version retrieval synced with pyproject.toml
 try:

flexoentity/flexo_entity.py

@@ -75 +75 @@
     """
     I map a fixed number of entity types to a single unique letter,
-    that structures different types 
+    that structures different types
     """
-    GENERIC =  "G"
+    GENERIC = "G"
     DOMAIN = "D"
     MEDIA = "M"
@@ -288 +288 @@
             EntityState.PUBLISHED,
         )
+
     def _compute_fingerprint(self) -> str:
         """I always recompute the entity's content fingerprint."""
@@ -302 +303 @@
             self.fingerprint = new_fp
             self.flexo_id = FlexOID.safe_generate(self.domain_code(),
-                                             self.entity_type.value,
-                                             self.state.value,
-                                             self.text_seed,
-                                             self.flexo_id.version)
+                                                  self.entity_type.value,
+                                                  self.state.value,
+                                                  self.text_seed,
+                                                  self.flexo_id.version)
             return True
         return False
@@ -367 +368 @@
         if self.state == EntityState.DRAFT:
             new_fid = FlexOID.safe_generate(self.domain_code(),
-                self.entity_type.value,
-                EntityState.APPROVED.value,
-                self.text_seed,
-                version=self.version
-            )
+                                            self.entity_type.value,
+                                            EntityState.APPROVED.value,
+                                            self.text_seed,
+                                            version=self.version
+                                            )
             self.origin = self.flexo_id  # optional: keep audit trail
             self.flexo_id = new_fid
@@ -377 +378 @@
         raise ValueError("Only drafts can be approved")
 
-
     def sign(self):
         """
@@ -394 +394 @@
         """
         I move from APPROVED or APPROVED_AND_SIGNED to PUBLISHED.
-        
+
         Uses allowed_transitions() to verify legality,
         then performs a version bump and lineage update.
@@ -469 +469 @@
             info["stored_fingerprint"] = getattr(entity, "fingerprint", None)
 
-            # Expected ID hash from current seed (should match fid.hash_part if content didn't change)
+            # Expected ID hash from current seed (should match fid.hash_part
+            # if content didn't change)
             exp_hash = FlexOID._blake_hash(canonical_seed(f"{fid.domain}:{fid.entity_type}:{entity.text_seed}"))
             info["expected_id_hash_from_seed"] = exp_hash
@@ -507 +508 @@
             # --- Fingerprint validation ---
             if hasattr(entity, "fingerprint") and entity.fingerprint:
-                seed = canonical_seed(entity.text_seed)
                 expected_fp = entity._compute_fingerprint()
                 if expected_fp != entity.fingerprint:

flexoentity/id_factory.py

@@ -76 +76 @@
 import json
 from datetime import datetime, timezone
-from logging import Logger
-
-logger = Logger(__file__)
+from flexoentity import logger
 
 def canonical_seed(obj) -> str:

tests/test_id_lifecycle.py

@@ -79 +79 @@
     # simulate tampering
     q.text = "Tampered text"
-    print(FlexoEntity.debug_integrity(q))
     assert not FlexoEntity.verify_integrity(q)
 

tests/test_persistance_integrity.py

@@ -34 +34 @@
     """
     json_str = approved_question.to_json()
-    print("JSON", json_str)
     loaded = SingleChoiceQuestion.from_json(json_str)
 
-    print("Approved", approved_question.text_seed)
-    print("Loaded", loaded.text_seed)
     # Fingerprint and state should match — integrity must pass
     assert SingleChoiceQuestion.verify_integrity(loaded)