fix: create meta properties for all loaded entities

OpenSemanticLab · Nov 1, 2023 · 37ceb8f · 37ceb8f
1 parent d35e031
commit 37ceb8f
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/osw/core.py b/src/osw/core.py
@@ -638,12 +638,19 @@ def load_entity(
                     bases.append(eval("model." + schema["title"]))
                 cls = create_model("Test", __base__=tuple(bases))
                 entity = cls(**jsondata)
-                entity.meta = model.Meta(
-                    wiki_page=model.WikiPage(
-                        namespace=namespace_from_full_title(entity_title),
-                        title=title_from_full_title(entity_title),
-                    )
-                )
+
+            if entity is not None:
+                # make sure we do not override existing meta data
+                if not hasattr(entity, "meta") or entity.meta is None:
+                    entity.meta = model.Meta()
+                if (
+                    not hasattr(entity.meta, "wiki_page")
+                    or entity.meta.wiki_page is None
+                ):
+                    entity.meta.wiki_page = model.WikiPage()
+                entity.meta.wiki_page.namespace = namespace_from_full_title(page.title)
+                entity.meta.wiki_page.title = title_from_full_title(page.title)
+
             entities.append(entity)
         # restore original cache state
         if not cache_state: