pyMetaModel 0.4.0__tar.gz → 0.4.2__tar.gz

{pymetamodel-0.4.0 → pymetamodel-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyMetaModel
-Version: 0.4.0
+Version: 0.4.2
 Dynamic: Summary
 Project-URL: Home, https://github.com/WolfgangFahl/pyMetaModel
 Project-URL: Documentation, https://wiki.bitplan.com/index.php/PyMetaModel

{pymetamodel-0.4.0 → pymetamodel-0.4.2}/examples/infrastructure/infrastructure.sidif

@@ -215,7 +215,7 @@ Computer_os isA Property
 "os" is name of it
 "os" is label of it
 "Text" is type of it
-9 is index of it
+1 is index of it
 "The operating system of the computer" is documentation of it
 false is isLink of it
 "Computer" is topic of it
@@ -225,7 +225,7 @@ Computer_osversion isA Property
 "osversion" is name of it
 "osversion" is label of it
 "Text" is type of it
-10 is index of it
+2 is index of it
 false is primaryKey of it
 false is mandatory of it
 false is uploadable of it
@@ -239,7 +239,7 @@ Computer_vm isA Property
 "vm" is name of it
 "vm" is label of it
 "Text" is type of it
-12 is index of it
+3 is index of it
 false is primaryKey of it
 false is mandatory of it
 false is uploadable of it
@@ -270,7 +270,7 @@ Harddisk_size isA Property
 "size" is name of it
 "size" is label of it
 "Number" is type of it
-9 is index of it
+1 is index of it
 false is primaryKey of it
 false is mandatory of it
 false is uploadable of it
@@ -284,7 +284,7 @@ Harddisk_formfactor isA Property
 "formfactor" is name of it
 "formfactor" is label of it
 "Text" is type of it
-10 is index of it
+2 is index of it
 false is primaryKey of it
 false is mandatory of it
 false is uploadable of it
@@ -300,7 +300,7 @@ Harddisk_rpm isA Property
 "rpm" is name of it
 "rpm" is label of it
 "Text" is type of it
-11 is index of it
+3 is index of it
 false is primaryKey of it
 false is mandatory of it
 false is uploadable of it
@@ -329,7 +329,7 @@ Monitor_resolution isA Property
 "resolution" is name of it
 "resolution" is label of it
 "Text" is type of it
-16 is index of it
+1 is index of it
 true is mandatory of it
 "The display resolution of the monitor (e.g., 1920x1080)" is documentation of it
 true is showInGrid of it

pymetamodel-0.4.2/meta/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.2"

{pymetamodel-0.4.0 → pymetamodel-0.4.2}/meta/metamodel.py

@@ -372,7 +372,6 @@ class Topic(MetaModelElement):
         self.sourceTopicLinks = {}
         self.targetTopicLinks = {}
 
-
     def get_extends_topics(self, l: List['Topic'] = None) -> List['Topic']:
         """
         Get the topics this topic is extending.
@@ -397,13 +396,33 @@ class Topic(MetaModelElement):
 
         return l
 
+    def get_all_properties(self) -> List['Property']:
+        """
+        Get all properties of the topic, including those inherited from extended topics.
+
+        Returns:
+            List[Property]: A list of all properties, including inherited ones.
+        """
+        all_properties = list(self.properties.values())
+
+        # Get extended topics
+        extended_topics = self.get_extends_topics()
+
+        # Add properties from extended topics
+        for extended_topic in extended_topics:
+            for prop in extended_topic.properties.values():
+                if prop.name not in [p.name for p in all_properties]:
+                    all_properties.append(prop)
+
+        return all_properties
+
 
     def sanitize(self):
         """
         make sure my properties exist
         """
-        doc=self.documentation if hasattr("self", "documentation") else "?"
-        if not hasattr(self, "wikiDocumentation"):
+        doc=self.documentation if hasattr(self, "documentation") else "?"
+        if not hasattr(self, "wikiDocumentation") or not self.wikiDocumentation:
             self.wikiDocumentation=doc
         if not hasattr(self,"defaultstoremode"):
             self.defaultstoremode="property"
@@ -431,7 +450,8 @@ class Topic(MetaModelElement):
         set my concept property to any primary key or mandatory property
         """
         self.conceptProperty = None
-        for prop in self.properties.values():
+        all_properties=self.propertiesByIndex(to_root=True)
+        for prop in all_properties:
             mandatory = False
             primaryKey = False
             if hasattr(prop, "mandatory"):
@@ -488,7 +508,8 @@ class Topic(MetaModelElement):
             list: a list of properties in sort order
         """
         prop_list = []
-        for prop in self.properties.values():
+        all_properties=self.get_all_properties()
+        for prop in all_properties:
             if hasattr(prop, "sortPos"):
                 sortPos = prop.sortPos
                 if sortPos:
@@ -496,22 +517,48 @@ class Topic(MetaModelElement):
         prop_list = sorted(prop_list, key=lambda prop: prop.sortPos)
         return prop_list
 
-    def propertiesByIndex(self) -> list:
+    def propertiesDict(self) -> dict:
         """
-        return the properties by index
+        Return a dictionary mapping topic names to lists of properties,
+        considering the inheritance chain and sorting properties locally by index.
 
         Returns:
-            list: the list of properties sorted by index
+            dict: A dictionary with topic names as keys and sorted lists of properties as values.
         """
+        properties_dict = {}
+        inheritance_chain = self.get_extends_topics()
+        inheritance_chain.append(self)
+        for topic in inheritance_chain:
+            sorted_props=topic.propertiesByIndex(to_root=False)
+            properties_dict[topic.name] = sorted_props
 
-        def index(prop: "Property") -> int:
-            if hasattr(prop, "index"):
-                return int(prop.index)
-            else:
-                return sys.maxsize
+        return properties_dict
+
+
+    def propertiesByIndex(self,to_root:bool=False) -> list:
+        """
+        Return the properties by index, considering inheritance chain.
+
+        Args:
+            to_root(bool): if True follow the inheritance chain to the root
+
+        Returns:
+            list: The list of properties sorted by index,
+            with inheritance considered.
+        """
+        if to_root:
+            sorted_props = []
+            for _topic_name, props in self.propertiesDict().items():
+                sorted_props.extend(props)
+        else:
+            props = list(self.properties.values())
+            props_count = len(props)
+
+            # Sort properties locally by index
+            sorted_props = sorted(props, key=lambda p: getattr(p, 'index', props_count))
+
+        return sorted_props
 
-        prop_list = sorted(self.properties.values(), key=lambda prop: index(prop))
-        return prop_list
 
     def askSort(self) -> str:
         """
@@ -560,7 +607,8 @@ class Topic(MetaModelElement):
         markup = f"""{{{{#ask: [[Concept:{self.name}]]
 |mainlabel={mainlabel}
 """
-        for prop in self.properties.values():
+        all_properties=self.get_all_properties()
+        for prop in all_properties:
             if filterShowInGrid and hasattr(prop, "showInGrid"):
                 show = prop.showInGrid
             else:

{pymetamodel-0.4.0 → pymetamodel-0.4.2}/meta/version.py

@@ -16,7 +16,7 @@ class Version(object):
     description = "pyMetaModel: MetaModel for Knowledge Graphs"
     version = meta.__version__
     date = "2022-11-30"
-    updated = "2024-08-04"
+    updated = "2024-08-05"
     authors = "Wolfgang Fahl"
     doc_url = "https://wiki.bitplan.com/index.php/pyMetaModel"
     chat_url = "https://github.com/WolfgangFahl/pyMetaModel/discussions"

{pymetamodel-0.4.0 → pymetamodel-0.4.2}/tests/test_mw.py

@@ -58,7 +58,7 @@ class TestMediawiki(BaseMediawikiTest):
         """
         mw_contexts = self.check_contexts(wikiId)
         mw_context = mw_contexts[context_name]
-        context, error, errMsg = Context.fromWikiContext(mw_context, debug=debug)
+        context, error, _errMsg = Context.fromWikiContext(mw_context, debug=debug)
         self.assertIsNone(error)
         return context
 
@@ -98,12 +98,13 @@ class TestMediawiki(BaseMediawikiTest):
         test the properties by Index access
         """
         debug = self.debug
+        #debug=True
         context = self.getContext(debug=debug)
         topic = context.topics["Topic"]
         props = topic.propertiesByIndex()
         if debug:
             for prop in props:
-                print(f"{prop.index}:{prop.name}")
+                print(f"{getattr(prop,'index','?')}:{prop.name}")
         self.assertEqual(11, len(props))
         self.assertTrue("pluralName", props[1].name)
 
@@ -112,7 +113,7 @@ class TestMediawiki(BaseMediawikiTest):
         test creating the ask query for a topic
         """
         debug = self.debug
-        debug = True
+        #debug = True
         context = self.getContext(debug=debug)
         topic = context.topics["Property"]
         ask_query = topic.askQuery()

{pymetamodel-0.4.0 → pymetamodel-0.4.2}/tests/test_sidif.py

@@ -3,6 +3,7 @@ Created on 2023-02-25
 
 @author: wf
 """
+import json
 import os
 from meta.metamodel import Context
 from tests.basetest import Basetest
@@ -12,7 +13,7 @@ class TestSiDIF(Basetest):
     """
     test SiDIF handling
     """
-    def setUp(self, debug=True, profile=True):
+    def setUp(self, debug=False, profile=True):
         Basetest.setUp(self, debug=debug, profile=profile)
         self.examples_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)), "examples")
 
@@ -55,27 +56,48 @@ class TestSiDIF(Basetest):
                     with self.subTest(file=file):
                         self.check_sidif(sidif_path,file)
 
+
+    def test_properties_by_index(self):
+        """
+        test the properties by index handling
+        """
+        sidif_file="infrastructure/infrastructure.sidif"
+        sidif_path = os.path.join(self.examples_dir, sidif_file)
+        context = self.check_sidif(sidif_path, sidif_file)
+        debug=self.debug
+        debug=True
+        for topic_name,topic in context.topics.items():
+            props_dict=topic.propertiesDict()
+            if debug:
+                print(f"Properties Dict for {topic_name}:{topic.documentation}/{topic.wikiDocumentation}")
+                for topic_name,(topic_name,props) in enumerate(props_dict.items()):
+                    print(f"{topic_name}:")
+                    for j,prop in enumerate(props):
+                        print(f"  {j:3}:{prop.name} ({getattr(prop,'index','?')})")
+
+
     def testInheritance(self):
         """
         test inheritance
         """
         for sidif_file,topics in {
             "infrastructure/infrastructure.sidif": [
-                ("Computer",["Device"]),
-                ("Monitor",["Device"]),
-                ("Printer",["Device"])
+                ("Computer","name",["Device"]),
+                ("Monitor","name",["Device"]),
+                ("Printer","name",["Device"])
             ],
             "scientific-events/scientific-events.sidif":
-                [("Event",  ["WebWdItem","WikidataItem"]),
-                 ("Country",["WebWdItem","WikidataItem"]),
-                 ("Region" ,["WikidataItem"]),
-                 ("Scholar",["WebWdItem","WikidataItem"]),
+                [("Event",  "name",["WebWdItem","WikidataItem"]),
+                 ("Country","name",["WebWdItem","WikidataItem"]),
+                 ("Region" ,"name",["WikidataItem"]),
+                 ("Scholar","name",["WebWdItem","WikidataItem"]),
                 ],
         }.items():
             sidif_path = os.path.join(self.examples_dir, sidif_file)
             context = self.check_sidif(sidif_path, sidif_file)
             debug=self.debug
-            for topic_name,extends_list in topics:
+            #debug=True
+            for topic_name,concept_property_name,extends_list in topics:
                 self.assertIn(topic_name, context.topics, f"Topic {topic_name} not found in {sidif_file}")
                 topic = context.topics[topic_name]
                 self.assertTrue(hasattr(topic, 'extends'), f"Topic {topic_name} in {sidif_file} does not have 'extends' attribute")
@@ -88,7 +110,16 @@ class TestSiDIF(Basetest):
                     if debug:
                         print(f"{i+1}:{extends_topic.name}={expected}?")
                     self.assertEqual(extends_topic.name,expected)
+                props_by_index=topic.propertiesByIndex(to_root=True)
+                if debug:
+                    for i,prop in enumerate(props_by_index):
+                        print(f"{i:3}:{prop.name} ({getattr(prop,'index','?')})")
+                self.assertTrue(topic.conceptProperty is not None,topic.name)
+                if self.debug:
+                    print(f"{topic_name}.{topic.conceptProperty.name} is concept property")
+                self.assertEqual(concept_property_name,topic.conceptProperty.name,topic.name)
 
+                pass
             pass
 
 

pymetamodel-0.4.0/meta/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.0"