Changeset e75910d in flexograder for builder/media_items.py

Timestamp:

11/22/25 17:46:21 (4 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

fake-data, main, master

Children:

858a4dc

Parents:

0792ddd

Message:

all tests green, new json format and domain handling added

File:

• builder/media_items.py (modified) (9 diffs)

builder/media_items.py

@@ -5 +5 @@
 from datetime import datetime
 from dataclasses import dataclass, field
-from flexoentity import FlexOID, EntityType, EntityState, FlexoEntity
+from flexoentity import FlexOID, EntityType, EntityState, FlexoEntity, logger
 
 @dataclass
@@ -16 +16 @@
     caption: str = ""
     author: str = ""
-    created_at: datetime = field(default_factory=datetime.utcnow)
     ExportPrefix = "media/"
 
@@ -36 +35 @@
         return "file"
 
+    @property
+    def type(self) -> str:
+        # logical type used for JSON, defaults to mtype
+        return self.mtype
+
     @classmethod
     def default(cls):
@@ -43 +47 @@
         super().__post_init__()
 
+    @property
     def text_seed(self) -> str:
-        try:
-            content_hash = hashlib.blake2s(Path(self.src).read_bytes()).hexdigest()[:12]
-        except FileNotFoundError:
-            content_hash = "MISSING"
-
-        return f"{self.src}|{content_hash}|{self.title}|{self.caption}|{self.mtype}"
+        return f"{self.src}|{self.title}|{self.caption}|{self.mtype}"
 
     def to_dict(self):
@@ -57 +57 @@
             "title": self.title,
             "caption": self.caption,
-            "type": self.mtype,
+            "type": self.type,
         })
         return base
@@ -63 +63 @@
     @classmethod
     def from_dict(cls, data):
+        flexo_id = FlexOID(data["flexo_id"]) if "flexo_id" in data else None
+
         obj = cls(
+            flexo_id=flexo_id,
             src=data.get("src", ""),
             title=data.get("title", ""),
-            caption=data.get("caption", "")
+            caption=data.get("caption", ""),
+            author=data.get("author", ""),
+            fingerprint=data.get("fingerprint"),
+            state=EntityState(data["state"]) if "state" in data else EntityState(flexo_id.state_code),
+            version=data.get("version"),
+            _in_factory=True,
         )
-        obj.flexo_id = FlexOID.from_string(data["flexo_id"]) if "flexo_id" in data else None
-        obj.state = data.get("state", "DRAFT")
-        obj.version = data.get("version", 1)
+
         return obj
-   
+    
     def to_html(self):
         raise NotImplementedError
@@ -122 +128 @@
         return f'<a href="{prefix + self.src}" download>{self.label}</a>'
 
-
 @dataclass
 class NullMediaItem(MediaItem):
 
+    def __post_init__(self):
+        # Null objects bypass FlexOEntity lifecycle: no identity
+        self.flexo_id = None
+        self.fingerprint = None
+
     @classmethod
     def default(cls):
-        """Return a canonical default NullMediaItem instance."""
-        return cls.with_domain_id(domain_id="NULL_MEDIA")
+        return cls(_in_factory=True)
 
-    def __post_init__(self):
-        super().__post_init__()
+    def to_dict(self):
+        return {}
 
     @property
@@ -141 +150 @@
         return prefix
 
-    def to_dict(self):
-        return {}
+def media_factory(m: dict) -> MediaItem:
 
-# FIXME: We should really check if all attributes are initialized correctly
-
-def media_factory(m: dict) -> MediaItem:
     mtype = m.get("type", "").lower()
-    src = m.get("src", "")
-    domain = m.get("domain", "GEN")
-    label = m.get("label", None)
 
     cls = {
@@ -156 +158 @@
         "audio": AudioItem,
         "video": VideoItem,
-        "download": DownloadItem
+        "download": DownloadItem,
     }.get(mtype, NullMediaItem)
 
-    m = cls.with_domain_id(domain, src=src) if cls is not NullMediaItem else NullMediaItem.default()
-    return m
+    if cls is NullMediaItem:
+        return NullMediaItem.default()
+
+    # Prefer from_dict if a FlexOID is provided
+    if "flexo_id" in m:
+        return cls.from_dict(m)
+
+    # Otherwise, generate a new entity
+    domain_id = m.get("domain_id", "GEN")
+    return cls.with_domain_id(domain_id, src=m.get("src", ""))