pyMetaModel 0.2.5__tar.gz → 0.2.7__tar.gz

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyMetaModel
-Version: 0.2.5
+Version: 0.2.7
 Project-URL: Home, https://github.com/WolfgangFahl/pyMetaModel
 Project-URL: Documentation, https://wiki.bitplan.com/index.php/PyMetaModel
 Project-URL: Source, https://github.com/WolfgangFahl/pyMetaModel
@@ -236,7 +236,7 @@ Description-Content-Type: text/markdown
 # pyMetaModel
 migrates https://wiki.bitplan.com/index.php/MetaModel#tab=Model to python
 
-[![Join the discussion at https://github.com/WolfgangFahl/pyMetaModel/discussions](https://img.shields.io/github/discussions/WolfgangFahl/pyMetaModel)](https://github.com/WolfgangFahl/pySemanticSlides/discussions)
+[![Join the discussion at https://github.com/WolfgangFahl/pyMetaModel/discussions](https://img.shields.io/github/discussions/WolfgangFahl/pyMetaModel)](https://github.com/WolfgangFahl/pyMetaModel/discussions)
 [![pypi](https://img.shields.io/pypi/pyversions/pyMetaModel)](https://pypi.org/project/pyMetaModel/)
 [![Github Actions Build](https://github.com/WolfgangFahl/pyMetaModel/workflows/Build/badge.svg?branch=main)](https://github.com/WolfgangFahl/pyMetaModel/actions?query=workflow%3ABuild+branch%3Amain)
 [![PyPI Status](https://img.shields.io/pypi/v/pyMetaModel.svg)](https://pypi.python.org/pypi/pyMetaModel/)

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/README.md

@@ -1,7 +1,7 @@
 # pyMetaModel
 migrates https://wiki.bitplan.com/index.php/MetaModel#tab=Model to python
 
-[![Join the discussion at https://github.com/WolfgangFahl/pyMetaModel/discussions](https://img.shields.io/github/discussions/WolfgangFahl/pyMetaModel)](https://github.com/WolfgangFahl/pySemanticSlides/discussions)
+[![Join the discussion at https://github.com/WolfgangFahl/pyMetaModel/discussions](https://img.shields.io/github/discussions/WolfgangFahl/pyMetaModel)](https://github.com/WolfgangFahl/pyMetaModel/discussions)
 [![pypi](https://img.shields.io/pypi/pyversions/pyMetaModel)](https://pypi.org/project/pyMetaModel/)
 [![Github Actions Build](https://github.com/WolfgangFahl/pyMetaModel/workflows/Build/badge.svg?branch=main)](https://github.com/WolfgangFahl/pyMetaModel/actions?query=workflow%3ABuild+branch%3Amain)
 [![PyPI Status](https://img.shields.io/pypi/v/pyMetaModel.svg)](https://pypi.python.org/pypi/pyMetaModel/)

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/ceur-ws/ceur-ws.mermaid

@@ -14,7 +14,9 @@ Paper {
     uri pdfUrl  
 }
 
-
+Session ||--|o Volume : "volume"
+Paper ||--|o Volume : "volume"
+Paper ||--|o Session : "session"
 
 ```
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/ceur-ws/ceur-ws.py

@@ -1,5 +1,5 @@
 # Auto generated from ceur-ws.yaml by pythongen.py version: 0.9.0
-# Generation date: 2023-03-05T18:06:09
+# Generation date: 2023-03-08T09:55:09
 # Schema: CeurwsSchema
 #
 # id: CeurwsSchema
@@ -210,11 +210,15 @@ class Session(YAMLRoot):
     class_model_uri: ClassVar[URIRef] = CEURWSSCHEMA.Session
 
     title: Optional[str] = None
+    volume: Optional[Union[dict, Volume]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.title is not None and not isinstance(self.title, str):
             self.title = str(self.title)
 
+        if self.volume is not None and not isinstance(self.volume, Volume):
+            self.volume = Volume(**as_dict(self.volume))
+
         super().__post_init__(**kwargs)
 
 
@@ -234,6 +238,8 @@ class Paper(YAMLRoot):
     title: Optional[str] = None
     authors: Optional[str] = None
     pdfUrl: Optional[Union[str, URI]] = None
+    volume: Optional[Union[dict, Volume]] = None
+    session: Optional[Union[dict, Session]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.id is not None and not isinstance(self.id, str):
@@ -248,6 +254,12 @@ class Paper(YAMLRoot):
         if self.pdfUrl is not None and not isinstance(self.pdfUrl, URI):
             self.pdfUrl = URI(self.pdfUrl)
 
+        if self.volume is not None and not isinstance(self.volume, Volume):
+            self.volume = Volume(**as_dict(self.volume))
+
+        if self.session is not None and not isinstance(self.session, Session):
+            self.session = Session(**as_dict(self.session))
+
         super().__post_init__(**kwargs)
 
 
@@ -264,6 +276,9 @@ slots.number = Slot(uri=CEURWSSCHEMA.number, name="number", curie=CEURWSSCHEMA.c
 slots.title = Slot(uri=CEURWSSCHEMA.title, name="title", curie=CEURWSSCHEMA.curie('title'),
                    model_uri=CEURWSSCHEMA.title, domain=None, range=Optional[str])
 
+slots.volume = Slot(uri=CEURWSSCHEMA.volume, name="volume", curie=CEURWSSCHEMA.curie('volume'),
+                   model_uri=CEURWSSCHEMA.volume, domain=None, range=Optional[Union[dict, Volume]])
+
 slots.id = Slot(uri=CEURWSSCHEMA.id, name="id", curie=CEURWSSCHEMA.curie('id'),
                    model_uri=CEURWSSCHEMA.id, domain=None, range=Optional[str])
 
@@ -273,6 +288,9 @@ slots.authors = Slot(uri=CEURWSSCHEMA.authors, name="authors", curie=CEURWSSCHEM
 slots.pdfUrl = Slot(uri=CEURWSSCHEMA.pdfUrl, name="pdfUrl", curie=CEURWSSCHEMA.curie('pdfUrl'),
                    model_uri=CEURWSSCHEMA.pdfUrl, domain=None, range=Optional[Union[str, URI]])
 
+slots.session = Slot(uri=CEURWSSCHEMA.session, name="session", curie=CEURWSSCHEMA.curie('session'),
+                   model_uri=CEURWSSCHEMA.session, domain=None, range=Optional[Union[dict, Session]])
+
 slots.volume__number = Slot(uri=CEURWSSCHEMA.number, name="volume__number", curie=CEURWSSCHEMA.curie('number'),
                    model_uri=CEURWSSCHEMA.volume__number, domain=None, range=Optional[float])
 
@@ -282,6 +300,9 @@ slots.volume__title = Slot(uri=CEURWSSCHEMA.title, name="volume__title", curie=C
 slots.session__title = Slot(uri=CEURWSSCHEMA.title, name="session__title", curie=CEURWSSCHEMA.curie('title'),
                    model_uri=CEURWSSCHEMA.session__title, domain=None, range=Optional[str])
 
+slots.session__volume = Slot(uri=CEURWSSCHEMA.volume, name="session__volume", curie=CEURWSSCHEMA.curie('volume'),
+                   model_uri=CEURWSSCHEMA.session__volume, domain=None, range=Optional[Union[dict, Volume]])
+
 slots.paper__id = Slot(uri=CEURWSSCHEMA.id, name="paper__id", curie=CEURWSSCHEMA.curie('id'),
                    model_uri=CEURWSSCHEMA.paper__id, domain=None, range=Optional[str])
 
@@ -293,3 +314,9 @@ slots.paper__authors = Slot(uri=CEURWSSCHEMA.authors, name="paper__authors", cur
 
 slots.paper__pdfUrl = Slot(uri=CEURWSSCHEMA.pdfUrl, name="paper__pdfUrl", curie=CEURWSSCHEMA.curie('pdfUrl'),
                    model_uri=CEURWSSCHEMA.paper__pdfUrl, domain=None, range=Optional[Union[str, URI]])
+
+slots.paper__volume = Slot(uri=CEURWSSCHEMA.volume, name="paper__volume", curie=CEURWSSCHEMA.curie('volume'),
+                   model_uri=CEURWSSCHEMA.paper__volume, domain=None, range=Optional[Union[dict, Volume]])
+
+slots.paper__session = Slot(uri=CEURWSSCHEMA.session, name="paper__session", curie=CEURWSSCHEMA.curie('session'),
+                   model_uri=CEURWSSCHEMA.paper__session, domain=None, range=Optional[Union[dict, Session]])

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/ceur-ws/ceur-ws.yaml

@@ -175,6 +175,11 @@ slots:
       Paper
     from_schema: CeurwsSchema
     range: string
+  volume:
+    name: volume
+    description: volume,volume
+    from_schema: CeurwsSchema
+    range: Volume
   id:
     name: id
     description: The id (filename) of the Paper
@@ -190,6 +195,11 @@ slots:
     description: the url for the pdf of this paper
     from_schema: CeurwsSchema
     range: uri
+  session:
+    name: session
+    description: session
+    from_schema: CeurwsSchema
+    range: Session
 classes:
   Volume:
     name: Volume
@@ -219,6 +229,11 @@ classes:
           the Paper
         from_schema: CeurwsSchema
         range: string
+      volume:
+        name: volume
+        description: volume,volume
+        from_schema: CeurwsSchema
+        range: Volume
   Paper:
     name: Paper
     description: A paper is e.g. a scholarly article
@@ -245,4 +260,14 @@ classes:
         description: the url for the pdf of this paper
         from_schema: CeurwsSchema
         range: uri
+      volume:
+        name: volume
+        description: volume,volume
+        from_schema: CeurwsSchema
+        range: Volume
+      session:
+        name: session
+        description: session
+        from_schema: CeurwsSchema
+        range: Session
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/city/city.py

@@ -1,5 +1,5 @@
 # Auto generated from city.yaml by pythongen.py version: 0.9.0
-# Generation date: 2023-03-05T18:05:39
+# Generation date: 2023-03-08T09:54:31
 # Schema: GeneralContext
 #
 # id: GeneralContext

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/family/FamilyContext.mermaid

@@ -29,7 +29,9 @@ Person {
     uri wikiPedia  
 }
 
-
+Person ||--|o Family : "childOf"
+Person ||--|o Family : "parentOf"
+Person ||--|o Person : "spouse"
 
 ```
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/family/FamilyContext.py

@@ -1,5 +1,5 @@
 # Auto generated from FamilyContext.yaml by pythongen.py version: 0.9.0
-# Generation date: 2023-03-05T18:05:46
+# Generation date: 2023-03-08T09:54:40
 # Schema: FamilyContext
 #
 # id: FamilyContext
@@ -249,6 +249,9 @@ class Person(YAMLRoot):
     monthDied: Optional[float] = None
     noInLine: Optional[float] = None
     wikiPedia: Optional[Union[str, URI]] = None
+    childOf: Optional[Union[dict, Family]] = None
+    parentOf: Optional[Union[dict, Family]] = None
+    spouse: Optional[Union[dict, "Person"]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.qid is not None and not isinstance(self.qid, str):
@@ -299,6 +302,15 @@ class Person(YAMLRoot):
         if self.wikiPedia is not None and not isinstance(self.wikiPedia, URI):
             self.wikiPedia = URI(self.wikiPedia)
 
+        if self.childOf is not None and not isinstance(self.childOf, Family):
+            self.childOf = Family(**as_dict(self.childOf))
+
+        if self.parentOf is not None and not isinstance(self.parentOf, Family):
+            self.parentOf = Family(**as_dict(self.parentOf))
+
+        if self.spouse is not None and not isinstance(self.spouse, Person):
+            self.spouse = Person(**as_dict(self.spouse))
+
         super().__post_init__(**kwargs)
 
 
@@ -378,6 +390,15 @@ slots.noInLine = Slot(uri=FAMILYCONTEXT.noInLine, name="noInLine", curie=FAMILYC
 slots.wikiPedia = Slot(uri=FAMILYCONTEXT.wikiPedia, name="wikiPedia", curie=FAMILYCONTEXT.curie('wikiPedia'),
                    model_uri=FAMILYCONTEXT.wikiPedia, domain=None, range=Optional[Union[str, URI]])
 
+slots.childOf = Slot(uri=FAMILYCONTEXT.childOf, name="childOf", curie=FAMILYCONTEXT.curie('childOf'),
+                   model_uri=FAMILYCONTEXT.childOf, domain=None, range=Optional[Union[dict, Family]])
+
+slots.parentOf = Slot(uri=FAMILYCONTEXT.parentOf, name="parentOf", curie=FAMILYCONTEXT.curie('parentOf'),
+                   model_uri=FAMILYCONTEXT.parentOf, domain=None, range=Optional[Union[dict, Family]])
+
+slots.spouse = Slot(uri=FAMILYCONTEXT.spouse, name="spouse", curie=FAMILYCONTEXT.curie('spouse'),
+                   model_uri=FAMILYCONTEXT.spouse, domain=None, range=Optional[Union[dict, Person]])
+
 slots.family__name = Slot(uri=FAMILYCONTEXT.name, name="family__name", curie=FAMILYCONTEXT.curie('name'),
                    model_uri=FAMILYCONTEXT.family__name, domain=None, range=Optional[str])
 
@@ -449,3 +470,12 @@ slots.person__noInLine = Slot(uri=FAMILYCONTEXT.noInLine, name="person__noInLine
 
 slots.person__wikiPedia = Slot(uri=FAMILYCONTEXT.wikiPedia, name="person__wikiPedia", curie=FAMILYCONTEXT.curie('wikiPedia'),
                    model_uri=FAMILYCONTEXT.person__wikiPedia, domain=None, range=Optional[Union[str, URI]])
+
+slots.person__childOf = Slot(uri=FAMILYCONTEXT.childOf, name="person__childOf", curie=FAMILYCONTEXT.curie('childOf'),
+                   model_uri=FAMILYCONTEXT.person__childOf, domain=None, range=Optional[Union[dict, Family]])
+
+slots.person__parentOf = Slot(uri=FAMILYCONTEXT.parentOf, name="person__parentOf", curie=FAMILYCONTEXT.curie('parentOf'),
+                   model_uri=FAMILYCONTEXT.person__parentOf, domain=None, range=Optional[Union[dict, Family]])
+
+slots.person__spouse = Slot(uri=FAMILYCONTEXT.spouse, name="person__spouse", curie=FAMILYCONTEXT.curie('spouse'),
+                   model_uri=FAMILYCONTEXT.person__spouse, domain=None, range=Optional[Union[dict, Person]])

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/family/FamilyContext.yaml

@@ -275,6 +275,21 @@ slots:
     description: the wikiPedia link of the Person
     from_schema: FamilyContext
     range: uri
+  childOf:
+    name: childOf
+    description: childOf
+    from_schema: FamilyContext
+    range: Family
+  parentOf:
+    name: parentOf
+    description: parentOf
+    from_schema: FamilyContext
+    range: Family
+  spouse:
+    name: spouse
+    description: spouse
+    from_schema: FamilyContext
+    range: Person
 classes:
   Family:
     name: Family
@@ -403,4 +418,19 @@ classes:
         description: the wikiPedia link of the Person
         from_schema: FamilyContext
         range: uri
+      childOf:
+        name: childOf
+        description: childOf
+        from_schema: FamilyContext
+        range: Family
+      parentOf:
+        name: parentOf
+        description: parentOf
+        from_schema: FamilyContext
+        range: Family
+      spouse:
+        name: spouse
+        description: spouse
+        from_schema: FamilyContext
+        range: Person
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/metamodel/metamodel.mermaid

@@ -74,7 +74,9 @@ TopicLink {
     boolean masterDetail  
 }
 
-
+Property ||--|o Topic : "topic"
+SMWType ||--|o Property : "usedByProperties"
+Topic ||--|o Context : "context"
 
 ```
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/metamodel/metamodel.py

@@ -1,5 +1,5 @@
 # Auto generated from metamodel.yaml by pythongen.py version: 0.9.0
-# Generation date: 2023-03-05T18:06:02
+# Generation date: 2023-03-08T09:55:01
 # Schema: MetaModel
 #
 # id: MetaModel
@@ -240,6 +240,7 @@ class Property(YAMLRoot):
     showInGrid: Optional[Union[bool, Bool]] = None
     isLink: Optional[Union[bool, Bool]] = None
     nullable: Optional[Union[bool, Bool]] = None
+    topic: Optional[Union[dict, "Topic"]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.name is not None and not isinstance(self.name, str):
@@ -299,6 +300,9 @@ class Property(YAMLRoot):
         if self.nullable is not None and not isinstance(self.nullable, Bool):
             self.nullable = Bool(self.nullable)
 
+        if self.topic is not None and not isinstance(self.topic, Topic):
+            self.topic = Topic(**as_dict(self.topic))
+
         super().__post_init__(**kwargs)
 
 
@@ -322,6 +326,7 @@ class SMWType(YAMLRoot):
     helppage: Optional[Union[str, URI]] = None
     typepage: Optional[str] = None
     javaType: Optional[str] = None
+    usedByProperties: Optional[Union[dict, Property]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.type is not None and not isinstance(self.type, str):
@@ -342,6 +347,9 @@ class SMWType(YAMLRoot):
         if self.javaType is not None and not isinstance(self.javaType, str):
             self.javaType = str(self.javaType)
 
+        if self.usedByProperties is not None and not isinstance(self.usedByProperties, Property):
+            self.usedByProperties = Property(**as_dict(self.usedByProperties))
+
         super().__post_init__(**kwargs)
 
 
@@ -367,6 +375,7 @@ class Topic(YAMLRoot):
     listLimit: Optional[float] = None
     cargo: Optional[Union[bool, Bool]] = None
     headerTabs: Optional[Union[bool, Bool]] = None
+    context: Optional[Union[dict, Context]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.name is not None and not isinstance(self.name, str):
@@ -399,6 +408,9 @@ class Topic(YAMLRoot):
         if self.headerTabs is not None and not isinstance(self.headerTabs, Bool):
             self.headerTabs = Bool(self.headerTabs)
 
+        if self.context is not None and not isinstance(self.context, Context):
+            self.context = Context(**as_dict(self.context))
+
         super().__post_init__(**kwargs)
 
 
@@ -596,6 +608,9 @@ slots.isLink = Slot(uri=METAMODEL.isLink, name="isLink", curie=METAMODEL.curie('
 slots.nullable = Slot(uri=METAMODEL.nullable, name="nullable", curie=METAMODEL.curie('nullable'),
                    model_uri=METAMODEL.nullable, domain=None, range=Optional[Union[bool, Bool]])
 
+slots.topic = Slot(uri=METAMODEL.topic, name="topic", curie=METAMODEL.curie('topic'),
+                   model_uri=METAMODEL.topic, domain=None, range=Optional[Union[dict, Topic]])
+
 slots.id = Slot(uri=METAMODEL.id, name="id", curie=METAMODEL.curie('id'),
                    model_uri=METAMODEL.id, domain=None, range=Optional[str])
 
@@ -608,6 +623,9 @@ slots.typepage = Slot(uri=METAMODEL.typepage, name="typepage", curie=METAMODEL.c
 slots.javaType = Slot(uri=METAMODEL.javaType, name="javaType", curie=METAMODEL.curie('javaType'),
                    model_uri=METAMODEL.javaType, domain=None, range=Optional[str])
 
+slots.usedByProperties = Slot(uri=METAMODEL.usedByProperties, name="usedByProperties", curie=METAMODEL.curie('usedByProperties'),
+                   model_uri=METAMODEL.usedByProperties, domain=None, range=Optional[Union[dict, Property]])
+
 slots.pluralName = Slot(uri=METAMODEL.pluralName, name="pluralName", curie=METAMODEL.curie('pluralName'),
                    model_uri=METAMODEL.pluralName, domain=None, range=Optional[str])
 
@@ -632,6 +650,9 @@ slots.cargo = Slot(uri=METAMODEL.cargo, name="cargo", curie=METAMODEL.curie('car
 slots.headerTabs = Slot(uri=METAMODEL.headerTabs, name="headerTabs", curie=METAMODEL.curie('headerTabs'),
                    model_uri=METAMODEL.headerTabs, domain=None, range=Optional[Union[bool, Bool]])
 
+slots.context = Slot(uri=METAMODEL.context, name="context", curie=METAMODEL.curie('context'),
+                   model_uri=METAMODEL.context, domain=None, range=Optional[Union[dict, Context]])
+
 slots.servicetype = Slot(uri=METAMODEL.servicetype, name="servicetype", curie=METAMODEL.curie('servicetype'),
                    model_uri=METAMODEL.servicetype, domain=None, range=Optional[str])
 
@@ -758,6 +779,9 @@ slots.property__isLink = Slot(uri=METAMODEL.isLink, name="property__isLink", cur
 slots.property__nullable = Slot(uri=METAMODEL.nullable, name="property__nullable", curie=METAMODEL.curie('nullable'),
                    model_uri=METAMODEL.property__nullable, domain=None, range=Optional[Union[bool, Bool]])
 
+slots.property__topic = Slot(uri=METAMODEL.topic, name="property__topic", curie=METAMODEL.curie('topic'),
+                   model_uri=METAMODEL.property__topic, domain=None, range=Optional[Union[dict, Topic]])
+
 slots.sMWType__type = Slot(uri=METAMODEL.type, name="sMWType__type", curie=METAMODEL.curie('type'),
                    model_uri=METAMODEL.sMWType__type, domain=None, range=Optional[str])
 
@@ -776,6 +800,9 @@ slots.sMWType__typepage = Slot(uri=METAMODEL.typepage, name="sMWType__typepage",
 slots.sMWType__javaType = Slot(uri=METAMODEL.javaType, name="sMWType__javaType", curie=METAMODEL.curie('javaType'),
                    model_uri=METAMODEL.sMWType__javaType, domain=None, range=Optional[str])
 
+slots.sMWType__usedByProperties = Slot(uri=METAMODEL.usedByProperties, name="sMWType__usedByProperties", curie=METAMODEL.curie('usedByProperties'),
+                   model_uri=METAMODEL.sMWType__usedByProperties, domain=None, range=Optional[Union[dict, Property]])
+
 slots.topic__name = Slot(uri=METAMODEL.name, name="topic__name", curie=METAMODEL.curie('name'),
                    model_uri=METAMODEL.topic__name, domain=None, range=Optional[str])
 
@@ -806,6 +833,9 @@ slots.topic__cargo = Slot(uri=METAMODEL.cargo, name="topic__cargo", curie=METAMO
 slots.topic__headerTabs = Slot(uri=METAMODEL.headerTabs, name="topic__headerTabs", curie=METAMODEL.curie('headerTabs'),
                    model_uri=METAMODEL.topic__headerTabs, domain=None, range=Optional[Union[bool, Bool]])
 
+slots.topic__context = Slot(uri=METAMODEL.context, name="topic__context", curie=METAMODEL.curie('context'),
+                   model_uri=METAMODEL.topic__context, domain=None, range=Optional[Union[dict, Context]])
+
 slots.action__name = Slot(uri=METAMODEL.name, name="action__name", curie=METAMODEL.curie('name'),
                    model_uri=METAMODEL.action__name, domain=None, range=Optional[str])
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/metamodel/metamodel.yaml

@@ -373,6 +373,11 @@ slots:
     description: should nullvalues be allowed and value set to NULL when empty?
     from_schema: MetaModel
     range: boolean
+  topic:
+    name: topic
+    description: topic
+    from_schema: MetaModel
+    range: Topic
   id:
     name: id
     description: SMW internal id of the type
@@ -395,6 +400,11 @@ slots:
     description: Java mapping of this type
     from_schema: MetaModel
     range: string
+  usedByProperties:
+    name: usedByProperties
+    description: the properties having this type
+    from_schema: MetaModel
+    range: Property
   pluralName:
     name: pluralName
     description: The plural of a topic name. E.g. for the topic 'City' the pluralName
@@ -438,6 +448,11 @@ slots:
     description: shall the forms be generated with header tabs?
     from_schema: MetaModel
     range: boolean
+  context:
+    name: context
+    description: context
+    from_schema: MetaModel
+    range: Context
   servicetype:
     name: servicetype
     description: The type of the service
@@ -759,6 +774,11 @@ classes:
         description: should nullvalues be allowed and value set to NULL when empty?
         from_schema: MetaModel
         range: boolean
+      topic:
+        name: topic
+        description: topic
+        from_schema: MetaModel
+        range: Topic
   SMW_Type:
     name: SMW_Type
     description: an SMW_Type is a data type which determines the possible values for
@@ -801,6 +821,11 @@ classes:
         description: Java mapping of this type
         from_schema: MetaModel
         range: string
+      usedByProperties:
+        name: usedByProperties
+        description: the properties having this type
+        from_schema: MetaModel
+        range: Property
   Topic:
     name: Topic
     description: A Topic is a Concept/Class/Thing/Entity
@@ -863,6 +888,11 @@ classes:
         description: shall the forms be generated with header tabs?
         from_schema: MetaModel
         range: boolean
+      context:
+        name: context
+        description: context
+        from_schema: MetaModel
+        range: Context
   Action:
     name: Action
     description: An action/function/operation to be performed

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/scientific-events/scientific-events.mermaid

@@ -59,7 +59,11 @@ Paper {
     uri pdfUrl  
 }
 
-
+Event ||--|o EventSeries : "series"
+Event ||--|o City : "city"
+Event ||--|o Country : "country"
+Event ||--|o Region : "region"
+Institution ||--|o Scholar : "scholar"
 
 ```
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/scientific-events/scientific-events.py

@@ -1,5 +1,5 @@
 # Auto generated from scientific-events.yaml by pythongen.py version: 0.9.0
-# Generation date: 2023-03-05T18:05:32
+# Generation date: 2023-03-08T09:54:23
 # Schema: CrSchema
 #
 # id: CrSchema
@@ -226,6 +226,10 @@ class Event(YAMLRoot):
     title: Optional[str] = None
     homepage: Optional[str] = None
     wikidataid: Optional[str] = None
+    series: Optional[Union[dict, EventSeries]] = None
+    city: Optional[Union[dict, "City"]] = None
+    country: Optional[Union[dict, "Country"]] = None
+    region: Optional[Union[dict, "Region"]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.acronym is not None and not isinstance(self.acronym, str):
@@ -243,6 +247,18 @@ class Event(YAMLRoot):
         if self.wikidataid is not None and not isinstance(self.wikidataid, str):
             self.wikidataid = str(self.wikidataid)
 
+        if self.series is not None and not isinstance(self.series, EventSeries):
+            self.series = EventSeries(**as_dict(self.series))
+
+        if self.city is not None and not isinstance(self.city, City):
+            self.city = City(**as_dict(self.city))
+
+        if self.country is not None and not isinstance(self.country, Country):
+            self.country = Country(**as_dict(self.country))
+
+        if self.region is not None and not isinstance(self.region, Region):
+            self.region = Region(**as_dict(self.region))
+
         super().__post_init__(**kwargs)
 
 
@@ -429,6 +445,7 @@ class Institution(YAMLRoot):
     wikidataid: Optional[str] = None
     homepage: Optional[str] = None
     smartCRMId: Optional[str] = None
+    scholar: Optional[Union[dict, Scholar]] = None
 
     def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]):
         if self.title is not None and not isinstance(self.title, str):
@@ -443,6 +460,9 @@ class Institution(YAMLRoot):
         if self.smartCRMId is not None and not isinstance(self.smartCRMId, str):
             self.smartCRMId = str(self.smartCRMId)
 
+        if self.scholar is not None and not isinstance(self.scholar, Scholar):
+            self.scholar = Scholar(**as_dict(self.scholar))
+
         super().__post_init__(**kwargs)
 
 
@@ -509,6 +529,18 @@ slots.wikidataid = Slot(uri=CRSCHEMA.wikidataid, name="wikidataid", curie=CRSCHE
 slots.homepage = Slot(uri=CRSCHEMA.homepage, name="homepage", curie=CRSCHEMA.curie('homepage'),
                    model_uri=CRSCHEMA.homepage, domain=None, range=Optional[str])
 
+slots.series = Slot(uri=CRSCHEMA.series, name="series", curie=CRSCHEMA.curie('series'),
+                   model_uri=CRSCHEMA.series, domain=None, range=Optional[Union[dict, EventSeries]])
+
+slots.city = Slot(uri=CRSCHEMA.city, name="city", curie=CRSCHEMA.curie('city'),
+                   model_uri=CRSCHEMA.city, domain=None, range=Optional[Union[dict, City]])
+
+slots.country = Slot(uri=CRSCHEMA.country, name="country", curie=CRSCHEMA.curie('country'),
+                   model_uri=CRSCHEMA.country, domain=None, range=Optional[Union[dict, Country]])
+
+slots.region = Slot(uri=CRSCHEMA.region, name="region", curie=CRSCHEMA.curie('region'),
+                   model_uri=CRSCHEMA.region, domain=None, range=Optional[Union[dict, Region]])
+
 slots.name = Slot(uri=CRSCHEMA.name, name="name", curie=CRSCHEMA.curie('name'),
                    model_uri=CRSCHEMA.name, domain=None, range=Optional[str])
 
@@ -539,6 +571,9 @@ slots.gndId = Slot(uri=CRSCHEMA.gndId, name="gndId", curie=CRSCHEMA.curie('gndId
 slots.smartCRMId = Slot(uri=CRSCHEMA.smartCRMId, name="smartCRMId", curie=CRSCHEMA.curie('smartCRMId'),
                    model_uri=CRSCHEMA.smartCRMId, domain=None, range=Optional[str])
 
+slots.scholar = Slot(uri=CRSCHEMA.scholar, name="scholar", curie=CRSCHEMA.curie('scholar'),
+                   model_uri=CRSCHEMA.scholar, domain=None, range=Optional[Union[dict, Scholar]])
+
 slots.id = Slot(uri=CRSCHEMA.id, name="id", curie=CRSCHEMA.curie('id'),
                    model_uri=CRSCHEMA.id, domain=None, range=Optional[str])
 
@@ -578,6 +613,18 @@ slots.event__homepage = Slot(uri=CRSCHEMA.homepage, name="event__homepage", curi
 slots.event__wikidataid = Slot(uri=CRSCHEMA.wikidataid, name="event__wikidataid", curie=CRSCHEMA.curie('wikidataid'),
                    model_uri=CRSCHEMA.event__wikidataid, domain=None, range=Optional[str])
 
+slots.event__series = Slot(uri=CRSCHEMA.series, name="event__series", curie=CRSCHEMA.curie('series'),
+                   model_uri=CRSCHEMA.event__series, domain=None, range=Optional[Union[dict, EventSeries]])
+
+slots.event__city = Slot(uri=CRSCHEMA.city, name="event__city", curie=CRSCHEMA.curie('city'),
+                   model_uri=CRSCHEMA.event__city, domain=None, range=Optional[Union[dict, City]])
+
+slots.event__country = Slot(uri=CRSCHEMA.country, name="event__country", curie=CRSCHEMA.curie('country'),
+                   model_uri=CRSCHEMA.event__country, domain=None, range=Optional[Union[dict, Country]])
+
+slots.event__region = Slot(uri=CRSCHEMA.region, name="event__region", curie=CRSCHEMA.curie('region'),
+                   model_uri=CRSCHEMA.event__region, domain=None, range=Optional[Union[dict, Region]])
+
 slots.city__name = Slot(uri=CRSCHEMA.name, name="city__name", curie=CRSCHEMA.curie('name'),
                    model_uri=CRSCHEMA.city__name, domain=None, range=Optional[str])
 
@@ -650,6 +697,9 @@ slots.institution__homepage = Slot(uri=CRSCHEMA.homepage, name="institution__hom
 slots.institution__smartCRMId = Slot(uri=CRSCHEMA.smartCRMId, name="institution__smartCRMId", curie=CRSCHEMA.curie('smartCRMId'),
                    model_uri=CRSCHEMA.institution__smartCRMId, domain=None, range=Optional[str])
 
+slots.institution__scholar = Slot(uri=CRSCHEMA.scholar, name="institution__scholar", curie=CRSCHEMA.curie('scholar'),
+                   model_uri=CRSCHEMA.institution__scholar, domain=None, range=Optional[Union[dict, Scholar]])
+
 slots.paper__description = Slot(uri=CRSCHEMA.description, name="paper__description", curie=CRSCHEMA.curie('description'),
                    model_uri=CRSCHEMA.paper__description, domain=None, range=Optional[str])
 

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/scientific-events/scientific-events.yaml

@@ -198,6 +198,26 @@ slots:
       of the scholar,The homepage of the Institution
     from_schema: CrSchema
     range: string
+  series:
+    name: series
+    description: series
+    from_schema: CrSchema
+    range: EventSeries
+  city:
+    name: city
+    description: city
+    from_schema: CrSchema
+    range: City
+  country:
+    name: country
+    description: country
+    from_schema: CrSchema
+    range: Country
+  region:
+    name: region
+    description: region
+    from_schema: CrSchema
+    range: Region
   name:
     name: name
     description: The name of the city,The name of the Country,The name of the Region,The
@@ -250,6 +270,11 @@ slots:
     description: smartCRM id of the scholar,smartCRM id of the scholar
     from_schema: CrSchema
     range: string
+  scholar:
+    name: scholar
+    description: scholar
+    from_schema: CrSchema
+    range: Scholar
   id:
     name: id
     description: The id (filename) of the Paper
@@ -344,6 +369,26 @@ classes:
           the Institution,The wikidataid of the paper
         from_schema: CrSchema
         range: string
+      series:
+        name: series
+        description: series
+        from_schema: CrSchema
+        range: EventSeries
+      city:
+        name: city
+        description: city
+        from_schema: CrSchema
+        range: City
+      country:
+        name: country
+        description: country
+        from_schema: CrSchema
+        range: Country
+      region:
+        name: region
+        description: region
+        from_schema: CrSchema
+        range: Region
   City:
     name: City
     description: large permanent human settlement
@@ -526,6 +571,11 @@ classes:
         description: smartCRM id of the scholar,smartCRM id of the scholar
         from_schema: CrSchema
         range: string
+      scholar:
+        name: scholar
+        description: scholar
+        from_schema: CrSchema
+        range: Scholar
   Paper:
     name: Paper
     description: A paper is e.g. a scholarly article

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/examples/teaching/TeachingSchema.py

@@ -1,5 +1,5 @@
 # Auto generated from TeachingSchema.yaml by pythongen.py version: 0.9.0
-# Generation date: 2023-03-05T18:05:54
+# Generation date: 2023-03-08T09:54:50
 # Schema: TeachingSchema
 #
 # id: TeachingSchema

pymetamodel-0.2.7/meta/__init__.py

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

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/meta/metamodel.py

@@ -136,7 +136,50 @@ class Context(MetaModelElement):
         tl.sourceTopic=self.lookupTopic(tl.source,f"topicLink {tl.name}")
         tl.targetTopic=self.lookupTopic(tl.target,f"topicLink {tl.name}")
         if tl.targetTopic is not None and tl.sourceTopic is not None:
-            self.link_source_with_target(tl, tl.sourceTopic, tl.targetTopic)      
+            self.link_source_with_target(tl, tl.sourceTopic, tl.targetTopic)   
+            
+    def addProperty(self,prop:'Property')->bool:
+        """
+        add the given property to this context
+        
+        Args:
+            prop(Property): the property to add
+        
+        Returns:
+            bool: True if the property adding was successful
+        """
+        if not hasattr(prop, "topic"):
+            self.error(f"prop  {prop} has no topic")
+            return False
+        topic_name = prop.topic
+        if not hasattr(prop, "name"):
+            self.error(f"prop {prop} has no name")
+            return False
+        topic=self.lookupTopic(topic_name,f"property {prop.name}")
+        if topic:
+            topic.properties[prop.name] = prop  
+            return True 
+        
+    def createProperty4TopicLink(self,tl:'TopicLink')->'Propertx':
+        """
+        create a property for the given topic link
+        
+        Args:
+            tl: TopicLink - the topiclink to create a property for
+        """
+        # see https://wiki.bitplan.com/index.php/SiDIFTemplates#properties
+        prop=Property()
+        prop.name=tl.sourceRole
+        prop.label=prop.name
+        if hasattr(tl, "sourceDocumentation"):
+            prop.documentation=tl.sourceDocumentation
+        else:
+            prop.documentation=f"{prop.name}"
+        prop.topic=tl.target
+        prop.type="Page"
+        prop.topicLink=tl
+        prop.isLink=True
+        return prop
         
     @classmethod
     def fromDictOfDicts(cls, did:dict) -> 'Context':
@@ -185,19 +228,17 @@ true is targetMultiple of it
                 context.addLink(tl)
             elif isA == "Property":
                 prop = Property()
+                prop.isLink=False
                 prop.fromDict(record)
-                if not hasattr(prop, "topic"):
-                    context.error(f"prop  {prop} has no topic")
-                    continue
-                topic_name = prop.topic
-                if not hasattr(prop, "name"):
-                    context.error(f"prop {prop} has no name")
-                    continue
-                topic=context.lookupTopic(topic_name,f"property {prop.name}")
-                if topic:
-                    topic.properties[prop.name] = prop
+                context.addProperty(prop)
+                    
+        # link topic to concepts and add topicLinks
         for topic in context.topics.values():
             topic.setConceptProperty()
+            for _tl_name,tl in topic.targetTopicLinks.items():
+                prop=context.createProperty4TopicLink(tl)
+                context.addProperty(prop)
+                pass
         return context
     
     @classmethod
@@ -399,12 +440,13 @@ class Topic(MetaModelElement):
         markup=f"{sortClause}{orderClause}"
         return markup
     
-    def askQuery(self,mainlabel:str=None,listLimit:int=None)->str:
+    def askQuery(self,mainlabel:str=None,filterShowInGrid:bool=True,listLimit:int=None)->str:
         """
         get the askQuery for the me topic
         
         Args:
             mainlabel(str): the mainlabel to use - topic.name as default
+            filterShowInGrid(bool): if True include only properties with showInGrid not being false
             listLimit(int): the list limit to use
         Returns:
             str: the markup for the query
@@ -417,8 +459,13 @@ class Topic(MetaModelElement):
 |mainlabel={mainlabel}
 """
         for prop in self.properties.values():
-            markup+=f"|?{self.name} {prop.name} = {prop.name}\n"
-        markup+=f"| limit={listLimit}\n"
+            if filterShowInGrid and hasattr(prop, "showInGrid"):
+                show=prop.showInGrid
+            else:
+                show=True
+            if show:
+                markup+=f"|?{self.name} {prop.name} = {prop.name}\n"
+        markup+=f"|limit={listLimit}\n"
         markup+=f"""{self.askSort()}}}}}"""
         return markup
 
@@ -427,6 +474,12 @@ class Property(MetaModelElement):
     """
     Provides helper functions and constants for properties
     """
+    
+    def __init__(self):
+        """
+        constructor
+        """
+        MetaModelElement.__init__(self)
 
     @classmethod
     def getSamples(cls):

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/meta/sidif2linkml.py

@@ -71,10 +71,14 @@ class SiDIF2LinkML:
                         "Page": "string", # @TODO will need own type
                         "Number": "double", # @TODO will need special type handling
                     }
-                    if prop.type in typesMap:
-                        slot.range=typesMap[prop.type]
+                    if prop.isLink:
+                        # 1:1 and 1:n handling
+                        slot.range=prop.topicLink.source
                     else:
-                        slot.range="string"       
+                        if prop.type in typesMap:
+                            slot.range=typesMap[prop.type]
+                        else:
+                            slot.range="string"       
                     sv.add_slot(slot)
                 cd.attributes[qname]=slot
                 pass

{pymetamodel-0.2.5 → pymetamodel-0.2.7}/tests/test_mw.py

@@ -96,12 +96,12 @@ class TestMediawiki(BaseMediawikiTest):
         if debug:
             for prop in props:
                 print(f"{prop.index}:{prop.name}")      
-        self.assertEqual(10,len(props))
+        self.assertEqual(11,len(props))
         self.assertTrue("pluralName",props[1].name)  
         
     def testAskQuery4Topic(self):
         """
-        test creating the askquery for a topic
+        test creating the ask query for a topic
         """
         debug=self.debug
         debug=True
@@ -161,6 +161,12 @@ class TestMediawiki(BaseMediawikiTest):
             self.assertIsNone(errMsg)
             self.assertTrue("OsProject" in context.topics)
             pass
+        
+    def test_Issue23(self):
+        """
+        https://github.com/WolfgangFahl/pyMetaModel/issues/23
+        handle "showInGrid"
+        """
                 
     def test_metamodel_from_wikis(self):
         """

pymetamodel-0.2.5/meta/__init__.py

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