Changeset 7d9089b in flexograder

Timestamp:

01/19/26 16:55:02 (2 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

fake-data, main, master

Children:

5739768

Parents:

e92c42d

Message:

fixes for media items, they now serialize as full FlexoEntities

Files:

• examples/demo/new_export2.json (added)
• examples/demo/new_export3.json (added)
• flexograder/core_entities/media_items.py (modified) (4 diffs)

flexograder/core_entities/media_items.py

@@ -1 +1 @@
 import mimetypes
-import hashlib
-from pathlib import Path
 
-from datetime import datetime
-from dataclasses import dataclass, field
-from flexoentity import FlexOID, EntityType, EntityState, FlexoEntity, logger
+from dataclasses import dataclass
+from abc import ABC, abstractmethod
+from flexoentity import EntityType, FlexoEntity, logger
 
 @dataclass
-class MediaItem(FlexoEntity):
+class MediaItem(FlexoEntity, ABC):
 
     ENTITY_TYPE = EntityType.MEDIA
@@ -21 +19 @@
     # Derived property
     # ──────────────────────────────────────────────────────────────
+
     @property
+    @abstractmethod
     def mtype(self) -> str:
+        """Semantic media type (image, audio, video, download)."""
+        raise NotImplementedError
+    
+    @property
+    def mime_category(self) -> str:
         """Infer type from src path using MIME detection."""
         mime, _ = mimetypes.guess_type(self.src)
@@ -46 +51 @@
         return f"{self.src}|{self.title}|{self.caption}|{self.mtype}"
 
-    def to_dict(self):
-        base = super().to_dict()  # includes OID, state, version, etc.
-        base.update({
+    def _serialize_content(self) -> dict:
+        content = super()._serialize_content() or {}
+        content.update({
+            "type": self.mtype,
             "src": self.src,
             "title": self.title,
             "caption": self.caption,
-            "type": self.mtype,
+            "author": self.author
         })
-        return base
+        return content
 
-    @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", ""),
-            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,
-        )
-
-        return obj
+    def _deserialize_content(self, content: dict):
+        super()._deserialize_content(content)
+        self.src = content.get("src", "")
+        self.title = content.get("title", "")
+        self.caption = content.get("caption", "")
+        self.author = content.get("author", "")
 
     def to_html(self):
@@ -113 +108 @@
 
     @property
-    def type(self):
+    def mtype(self):
         return "download"