pyMetaModel 0.5.3__tar.gz → 0.6.0__tar.gz

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/.github/workflows/build.yml

@@ -18,8 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        #os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
+        #python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.12' ]
 
     steps:
     - uses: actions/checkout@v4

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyMetaModel
-Version: 0.5.3
+Version: 0.6.0
 Dynamic: Summary
 Project-URL: Home, https://github.com/WolfgangFahl/pyMetaModel
 Project-URL: Documentation, https://wiki.bitplan.com/index.php/PyMetaModel
@@ -216,20 +216,18 @@ Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development
-Requires-Python: >=3.9
-Requires-Dist: dacite>=1.8.1
+Requires-Python: >=3.10
 Requires-Dist: py-sidif>=0.2.0
+Requires-Dist: pybasemkit>=0.0.4
 Requires-Dist: urllib3
 Provides-Extra: linkml
 Requires-Dist: linkml-runtime>=1.8.3; extra == 'linkml'
 Requires-Dist: linkml>=1.8.5; extra == 'linkml'
-Provides-Extra: lodstorage
-Requires-Dist: pylodstorage>=0.13.3; extra == 'lodstorage'
 Provides-Extra: smw
 Requires-Dist: mwparserfromhell>=0.6.6; extra == 'smw'
 Requires-Dist: py-3rdparty-mediawiki>=0.14.0; extra == 'smw'

pymetamodel-0.6.0/meta/__init__.py

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

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/meta/metamodel.py

@@ -4,66 +4,40 @@ Created on 2022-11-23
 @author: wf
 """
 
+from dataclasses import field
+from datetime import datetime
 import sys
+from typing import List, Optional, Tuple, Dict
 import typing
-from datetime import datetime
-from typing import List, Optional, Tuple
-
-import urllib3
-from lodstorage.jsonable import JSONAble
-from sidif.sidif import SiDIFParser
 
+from basemkit.persistent_log import Log
+from basemkit.yamlable import lod_storable
 from meta.mw import MediaWikiContext
+from meta.smw_type import SMW_Type
+from sidif.sidif import SiDIFParser
+import urllib3
 
 
-class MetaModelElement(JSONAble):
-    """
-    a generic MetaModelElement
-
-    to handle the technicalities of being a MetaModelElement so that derived
-    MetaModelElements can focus on the MetaModel domain specific aspects
-    """
-
-    def __init__(self):
-        """
-        construct me
-        """
-        self.__metamodel_props = {}
-        cls = self.__class__
-        if hasattr(cls, "getSamples"):
-            for sample in cls.getSamples():
-                for key in sample.keys():
-                    if not key in self.__metamodel_props:
-                        self.__metamodel_props[key] = key  # Property(self,key)
-
-    def __str__(self):
-        """
-        get a string representation of me
-        """
-        text = self.__class__.__name__
-        for prop_name in self.__metamodel_props.keys():
-            if not isinstance(prop_name, str):
-                pass
-            elif hasattr(self, prop_name):
-                value = getattr(self, prop_name)
-                text += f"\n  {prop_name}={str(value)}"
-        return text
-
 
-class Context(MetaModelElement):
+@lod_storable
+class Context:
     """
     A Context groups some topics like a Namespace/Package.
     This class provides helper functions and constants to render a Context to corresponding wiki pages
     """
-
-    def __init__(self):
-        """
-        constructor
-        """
-        MetaModelElement.__init__(self)
-        self.topics = {}
-        self.types = {}
-        self.errors = []
+    name: Optional[str] = None
+    since: Optional[str] = None # isodate string
+    updated: Optional[str] = None # isodate string
+    copyright: Optional[str] = None
+    master: Optional[str] = None
+    demo: Optional[str] = None
+    topics: Dict[str, 'Topic'] = field(default_factory=dict)
+    types: Dict[str, 'Topic'] = field(default_factory=dict)
+    errors: List[str] = field(default_factory=list)
+
+    def __post_init__(self):
+        self.log=Log()
+        pass
 
     @classmethod
     def getSamples(cls):
@@ -72,7 +46,7 @@ class Context(MetaModelElement):
                 "name": "MetaModel",
                 "since": datetime.strptime("2015-01-23", "%Y-%m-%d"),
                 "updated": datetime.strptime("2024-08-07", "%Y-%m-%d"),
-                "copyright": "2015-2024 BITPlan GmbH",
+                "copyright": "2015-2025 BITPlan GmbH",
                 "master": "https://contexts.bitplan.com",
                 "demo": "https://wiki.bitplan.com/index.php/List_of_Contexts"
             }
@@ -226,51 +200,53 @@ class Context(MetaModelElement):
         """
         context = None
         for key, record in did.items():
-            isA = record.get("isA")
-            if isA == "Context":
-                context = Context()
-                context.fromDict(record)
-                context.sanitize(key)
-            elif isA == "TopicLink":
-                """
-                # Event n : 1 City
-                Event_in_City isA TopicLink
-                "eventInCity" is name of it
-                "city" is sourceRole of it
-                false is sourceMultiple of it
-                "City" is source of it
-                "event" is targetRole of it
-                true is targetMultiple of it
-                "Event" is target of it
-                """
-                tl = TopicLink()
-                tl.fromDict(record)
-                context.addLink(tl)
-            elif isA == "Property":
-                prop = Property()
-                prop.isLink = False
-                prop.fromDict(record)
-                prop.sanitize()
-                context.addProperty(prop)
-            else:  # isA == Topic or in declared topics
-                topic = Topic()
-                topic.fromDict(record)
-                topic.sanitize()
-                if context is None:
-                    context = Context()
-                    context.name = "GlobalContext"
-                    context.since = "2022-11-26"
-                    context.master = "http://contexts.bitplan.com"
-                    context.error(f"topic {topic.name} has no defined context")
-                if hasattr(topic, "name"):
-                    context.topics[topic.name] = topic
-                    topic.context_obj=context
-                elif hasattr(topic, "type"):
-                    context.types[topic.type]=topic
+            try:
+                isA = record.get("isA")
+                if isA == "Context":
+                    context = Context.from_dict2(record)
+                    context.sanitize(key)
+                elif isA == "TopicLink":
+                    """
+                    # Event n : 1 City
+                    Event_in_City isA TopicLink
+                    "eventInCity" is name of it
+                    "city" is sourceRole of it
+                    false is sourceMultiple of it
+                    "City" is source of it
+                    "event" is targetRole of it
+                    true is targetMultiple of it
+                    "Event" is target of it
+                    """
+                    tl = TopicLink.from_dict2(record)
+                    context.addLink(tl)
+                elif isA == "Property":
+                    prop = Property.from_dict2(record)
+                    prop.sanitize()
+                    context.addProperty(prop)
+                elif isA == "SMW_Type":
+                    smw_type=SMW_Type.from_dict2(record) # @UndefinedVariable
+                    context.types[smw_type.type]=smw_type
+                else:  # isA == Topic or in declared topics
+                    topic = Topic.from_dict2(record)
+                    topic.sanitize()
+                    if context is None:
+                        context = Context()
+                        context.name = "GlobalContext"
+                        context.since = "2022-11-26"
+                        context.master = "http://contexts.bitplan.com"
+                        context.error(f"topic {topic.name} has no defined context")
+                    if hasattr(topic, "name") and topic.name:
+                        context.topics[topic.name] = topic
+                        topic.context_obj=context
+                    else:
+                        # potential foreign or extends declaration
+                        context.error(f"missing name for topic {topic} {key} - foreign declaration?")
+            except Exception as ex:
+                if context:
+                    msg=f"invalid dict {record}: {str(ex)}"
+                    context.log.log("❌","dict",msg)
                 else:
-                    # potential foreign or extends declaration
-                    context.error(f"missing name for topic {topic} {key} - foreign declaration?")
-
+                    raise ex
         # link topic to concepts and add topicLinks
         for topic in context.topics.values():
             topic.setConceptProperty()
@@ -356,8 +332,9 @@ class Context(MetaModelElement):
         error = None
         errMsg = None
         sidif = None
+        msg=f"reading sidif for {mw_context.context} from {mw_context.wikiId}"
         if debug:
-            print(f"reading sidif for {mw_context.context} from {mw_context.wikiId}")
+            print(msg)
         try:
             sidif = mw_context.read_sidif()
         except BaseException as ex:
@@ -367,24 +344,29 @@ class Context(MetaModelElement):
             context, error, errMsg = cls.fromSiDIF(
                 sidif=sidif, title=mw_context.wikiId, depth=depth, debug=debug
             )
+        else:
+            errMsg=f"{msg} failed"
+            error=ValueError(msg)
         return context, error, errMsg
 
-
-class Topic(MetaModelElement):
+@lod_storable
+class Topic:
     """
     A Topic is a Concept/Class/Thing/Entity
     """
+    name: Optional[str] = None
+    _pluralName: Optional[str] = None
+    documentation: Optional[str] = None
+    wikiDocumentation: Optional[str] = None
+    defaultstoremode: str = "property"
+    extends: Optional[str] = None
+    context_obj: Optional[Context] = None
+    conceptProperty: Optional['Property'] = None
+    listLimit: int = 200
+    properties: Dict[str, 'Property'] = field(default_factory=dict)
+    sourceTopicLinks: Dict[str, 'TopicLink'] = field(default_factory=dict)
+    targetTopicLinks: Dict[str, 'TopicLink'] = field(default_factory=dict)
 
-    def __init__(self):
-        """
-        constructor
-        """
-        MetaModelElement.__init__(self)
-        self._pluralName = None # Initialize with underscore to indicate a protected attribute
-
-        self.properties = {}
-        self.sourceTopicLinks = {}
-        self.targetTopicLinks = {}
 
     def get_extends_topics(self, l: List['Topic'] = None) -> List['Topic']:
         """
@@ -570,7 +552,7 @@ class Topic(MetaModelElement):
             props_count = len(props)
 
             # Sort properties locally by index
-            sorted_props = sorted(props, key=lambda p: getattr(p, 'index', props_count))
+            sorted_props = sorted(props, key=lambda p: p.index or props_count)
 
         return sorted_props
 
@@ -638,16 +620,26 @@ class Topic(MetaModelElement):
         markup += f"""{self.askSort()}}}}}"""
         return markup
 
-class Property(MetaModelElement):
+@lod_storable
+class Property:
     """
     Provides helper functions and constants for properties
     """
+    name: Optional[str] = None
+    label: Optional[str] = None
+    type: Optional[str] = None
+    topic: Optional[str] = None
+    documentation: Optional[str] = None
+    namespace: str = "Property"
+    showInGrid: bool = True
+    isLink: bool = False
+    topicLink: Optional['TopicLink'] = None
+    index: Optional[int] = None
+    sortPos: Optional[int] = None
+    primaryKey: bool = False
+    mandatory: bool = False
+    sortAscending: bool = True
 
-    def __init__(self):
-        """
-        constructor
-        """
-        MetaModelElement.__init__(self)
 
     @classmethod
     def getSamples(cls):
@@ -702,11 +694,24 @@ class Property(MetaModelElement):
             self.showInGrid=True
         pass
 
-class TopicLink(MetaModelElement):
+@lod_storable
+class TopicLink:
     """
     A TopicLink links two Concepts/Topics
     """
 
+    name: Optional[str] = None
+    source: Optional[str] = None
+    target: Optional[str] = None
+    sourceRole: Optional[str] = None
+    targetRole: Optional[str] = None
+    sourceMultiple: bool = False
+    targetMultiple: bool = False
+    sourceDocumentation: Optional[str] = None
+    targetDocumentation: Optional[str] = None
+    sourceTopic: Optional[Topic] = None
+    targetTopic: Optional[Topic] = None
+
     @classmethod
     def getSamples(cls):
         samples = [

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/meta/metamodel_cmd.py

@@ -43,7 +43,7 @@ class MetaModelCmd:
         program_license = """%s
 
           Created by %s on %s.
-          Copyright 2022-2024 Wolfgang Fahl. All rights reserved.
+          Copyright 2022-2025 Wolfgang Fahl. All rights reserved.
 
           Licensed under the Apache License 2.0
           http://www.apache.org/licenses/LICENSE-2.0

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/meta/mw.py

@@ -1,5 +1,5 @@
 """
-Created on 23.11.2022
+Created on 2022-11-23
 
 @author: wf
 """
@@ -40,7 +40,9 @@ class MediaWikiContext:
         """
         sidif = None
         wikiusers = WikiUser.getWikiUsers(lenient=True)
-        if self.wikiId in wikiusers:
+        if not self.wikiId in wikiusers:
+            raise ValueError(f"unknown wiki {self.wikiId}")
+        else:
             wikiUser = wikiusers[self.wikiId]
             self.wikiClient = WikiClient.ofWikiId(wikiUser.wikiId)
             if self.wikiClient.needsLogin():

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/meta/sidif2linkml.py

@@ -50,6 +50,8 @@ class SiDIF2LinkML:
             master = "http://example.com"
         uri = f"{master}/{context.name}"
         for topic in self.context.topics.values():
+            if not topic.name:
+                continue
             cd = ClassDefinition(name=topic.name)
             cd.description = topic.documentation
             sv.add_class(cd)
@@ -59,7 +61,8 @@ class SiDIF2LinkML:
                     qname = prop.name
                     if prop.name in sd.slots:
                         slot = sd.slots[prop.name]
-                        slot.description += "," + prop.documentation
+                        if prop.documentation:
+                            slot.description += "," + prop.documentation
                 else:
                     qname = f"{topic.name}{delim}{prop.name}"
                 if slot is None:

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/meta/smw_type.py

@@ -1,10 +1,8 @@
-from dataclasses import dataclass
 from typing import Optional
 
-import dacite
+from basemkit.yamlable import lod_storable
 
-
-@dataclass
+@lod_storable
 class SMW_Type:
     """
     an SMW_Type is a data type which determines the possible values for that type e.g. a Boolean can hold true/false values while a Number can hold 3.1459 or 20. A Page can hold the name of a Wiki page see https://semantic-mediawiki.org/wiki/Help:List_of_datatypes
@@ -40,18 +38,4 @@ class SMW_Type:
 |?SMW_Type javaType = javaType
 | limit=200
 }}"""
-        return ask
-
-    @classmethod
-    def fromDict(cls, data: dict)->'SMW_Type':
-        """
-        create a SMW_Type from the given dict
-
-        Args:
-            data (dict): the dict to create the SMW_Type from
-
-        Returns:
-            SMW_Type: the freshly created SMW_Type
-        """
-        smw_type = dacite.from_dict(data_class=cls, data=data)
-        return smw_type
+        return ask

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/meta/uml.py

@@ -17,7 +17,7 @@ class PlantUml(object):
     # redundant to skinparams in pylodstorage.uml
     skinparams = """
 ' BITPlan Corporate identity skin params
-' Copyright (c) 2015-2024 BITPlan GmbH
+' Copyright (c) 2015-2025 BITPlan GmbH
 ' see http://wiki.bitplan.com/PlantUmlSkinParams#BITPlanCI
 ' skinparams generated by com.bitplan.restmodelmanager
 skinparam note {

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/pyproject.toml

@@ -17,23 +17,25 @@ readme = "README.md"
 # flit_core.config.ConfigError: license field should be <class 'dict'>, not <class 'str'>
 license = { file="LICENSE" }
 dependencies = [
-		# https://pypi.org/project/py-sidif/
-        'py-sidif>=0.2.0',
-        # https://github.com/urllib3/urllib3
-        'urllib3',
-  		# https://github.com/konradhalas/dacite
-		'dacite>=1.8.1',
-     ]
+	# https://pypi.org/project/pybasemkit/
+	# https://github.com/WolfgangFahl/pybasemkit
+	# Python base module kit: YAML/JSON I/O, structured logging, CLI tooling, shell execution, and remote pydevd debug support.
+	"pybasemkit>=0.0.4",
+	# https://pypi.org/project/py-sidif/
+	'py-sidif>=0.2.0',
+	# https://github.com/urllib3/urllib3
+	'urllib3',
+]
 
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers=[
     "Development Status :: 4 - Beta",
     "Environment :: Web Environment",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: OS Independent",
     "Topic :: Software Development",
     "Intended Audience :: Developers",
@@ -53,11 +55,6 @@ Source = "https://github.com/WolfgangFahl/pyMetaModel"
 test = [
 	"green",
 ]
-# python List of Dict (Table) Storage library
-lodstorage = [
-	# https://pypi.org/project/pylodstorage/
-	'pyLodStorage>=0.13.3',
-]
 # LinkML support
 # https://linkml.io/
 linkml = [

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/tests/test_linkml.py

@@ -29,7 +29,7 @@ class TestLinkML(BaseMediawikiTest):
         test conversion from SiDIF to LinkML
         """
         debug = self.debug
-        debug = True
+        #debug = True
         parser = MetaModelCmd.getArgParser()
         mm_cmd = MetaModelCmd(debug=debug)
         for wikiId, context_name in [("wiki", "MetaModel"), ("cr", "CrSchema")]:

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/tests/test_metamodel.py

@@ -25,12 +25,12 @@ class TestMetaModel(BaseMediawikiTest):
         """
         test SMW_Type handling
         """
-        debug = True
+        debug = self.debug
         smwAccess = self.smwAccessMap["wiki"]
         ask_query = SMW_Type.askQuery()
         did = smwAccess.smw.query(ask_query)
         for record in did.values():
-            smw_Type = SMW_Type.fromDict(record)
+            smw_type = SMW_Type.from_dict(record) # @UndefinedVariable
             if debug:
-                print(smw_Type)
-            pass
+                print(smw_type)
+            self.assertIsInstance(smw_type, SMW_Type)

{pymetamodel-0.5.3 → pymetamodel-0.6.0}/tests/test_mw.py

@@ -7,7 +7,7 @@ Created on 2022-11-23
 import json
 
 from wikibot3rd.wikiuser import WikiUser
-
+from tqdm import tqdm
 from meta.metamodel import Context
 from tests.basesmwtest import BaseSemanticMediawikiTest
 
@@ -137,13 +137,17 @@ class TestMediawiki(BaseSemanticMediawikiTest):
         """
         test reading meta models from wikis
         """
-        debug = True
+        debug = False
         lenient = True
-        for wikiId in WikiUser.getWikiUsers(lenient=True):
+        with_progress=False
+        wiki_users = WikiUser.getWikiUsers(lenient=True)
+        wiki_iter = tqdm(wiki_users, desc="Wikis") if with_progress else wiki_users
+        for wikiId in wiki_iter:
             _smwAccess, mw_contexts = self.check_contexts(wikiId)
             for context_name in mw_contexts:
+                context_info=f"{context_name}@{wikiId}"
                 if debug:
-                    print(f"reading context {context_name} from wiki {wikiId}")
+                    print(f"reading context {context_info}")
                 cc = self.getContextContext(wikiId=wikiId, context_name=context_name)
                 context = cc.context
                 if not lenient:
@@ -156,8 +160,8 @@ class TestMediawiki(BaseSemanticMediawikiTest):
                     print(context)
                     for _name, topic in context.topics.items():
                         print(topic)
-                        for _name, property in topic.properties.items():
-                            print(property)
+                        for _name, prop in topic.properties.items():
+                            print(prop)
                 if len(context.errors) > 0:
                     for error in context.errors:
                         print(error)

pymetamodel-0.5.3/meta/__init__.py

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