shacl2code 0.0.23__tar.gz → 0.0.24__tar.gz

{shacl2code-0.0.23 → shacl2code-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shacl2code
-Version: 0.0.23
+Version: 0.0.24
 Summary: Convert SHACL model file to code bindings
 Project-URL: Homepage, https://github.com/JPEWdev/shacl2code
 Project-URL: Repository, https://github.com/JPEWdev/shacl2code.git

{shacl2code-0.0.23 → shacl2code-0.0.24}/src/shacl2code/lang/templates/python.j2

@@ -36,6 +36,7 @@ from typing import (
     TypeVar,
     Union,
     cast,
+    overload,
 )
 
 
@@ -616,7 +617,7 @@ def register(
 
 register_lock = threading.Lock()
 NAMED_INDIVIDUALS: Set[str] = set()
-ForeachT = TypeVar("ForeachT", bound="SHACLObject")
+T_SHACLObject = TypeVar("T_SHACLObject", bound="SHACLObject")
 
 
 @functools.total_ordering
@@ -1279,9 +1280,18 @@ class SHACLObjectSet(object):
             for child in o.iter_objects(recursive=True, visited=visited):
                 yield child
 
+    @overload
     def foreach_type(
-        self, typ: Union[str, type[ForeachT]], *, match_subclass: bool = True
-    ) -> Iterable[ForeachT]:
+        self, typ: str, *, match_subclass: bool = True
+    ) -> Iterator[SHACLObject]: ...
+    @overload
+    def foreach_type(
+        self, typ: Type[T_SHACLObject], *, match_subclass: bool = True
+    ) -> Iterator[T_SHACLObject]: ...
+
+    def foreach_type(
+        self, typ: Union[str, Type[T_SHACLObject]], *, match_subclass: bool = True
+    ) -> Iterable[SHACLObject]:
         """
         Iterate over each object of a specified type (or subclass there of)
 
@@ -1301,7 +1311,7 @@ class SHACLObjectSet(object):
 
         for exact, o in self.obj_by_type[typ]:
             if match_subclass or exact:
-                yield cast(ForeachT, o)
+                yield cast(T_SHACLObject, o)
 
     def merge(self, *objectsets) -> "SHACLObjectSet":
         """

{shacl2code-0.0.23 → shacl2code-0.0.24}/src/shacl2code/model.py

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: MIT
 
 import typing
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from rdflib import URIRef
 from rdflib.namespace import RDF, RDFS, OWL, SH, XSD, DefinedNamespace, Namespace
@@ -68,7 +68,7 @@ class Property:
     comment: str = ""
     max_count: int = None
     min_count: int = None
-    enum_values: list = None
+    enum_values: list = field(default_factory=list)
     class_id: str = ""
     datatype: str = ""
     pattern: str = ""
@@ -206,24 +206,40 @@ class Model(object):
                             c.is_abstract = True
                     continue
 
-                p = Property(
-                    varname=self.model.value(
-                        obj_prop,
-                        SH.name,
-                        default=self.get_compact_id(
-                            prop,
-                            fallback=remove_common_prefix(prop, cls_iri).lstrip("/"),
-                        ),
+                varname = self.model.value(
+                    obj_prop,
+                    SH.name,
+                    default=self.get_compact_id(
+                        prop,
+                        fallback=remove_common_prefix(prop, cls_iri).lstrip("/"),
                     ),
-                    path=str(prop),
-                    comment=str(self.model.value(prop, RDFS.comment, default="")),
-                    max_count=int_val(self.model.value(obj_prop, SH.maxCount)),
-                    min_count=int_val(self.model.value(obj_prop, SH.minCount)),
-                    deprecated=(prop, RDF.type, OWL.DeprecatedProperty) in self.model,
                 )
 
+                for p in c.properties:
+                    if p.path == str(prop):
+                        break
+                else:
+                    p = Property(
+                        varname=varname,
+                        path=str(prop),
+                        comment=str(self.model.value(prop, RDFS.comment, default="")),
+                        deprecated=(prop, RDF.type, OWL.DeprecatedProperty)
+                        in self.model,
+                    )
+                    c.properties.append(p)
+
+                if varname < p.varname:
+                    p.varname = varname
+
+                if (v := int_val(self.model.value(obj_prop, SH.maxCount))) is not None:
+                    p.max_count = v
+
+                if (v := int_val(self.model.value(obj_prop, SH.minCount))) is not None:
+                    p.min_count = v
+
                 if in_list := self.model.value(obj_prop, SH["in"]):
-                    p.enum_values = sorted(tuple(self.model.items(in_list)))
+                    enum_values = set(p.enum_values) | set(self.model.items(in_list))
+                    p.enum_values = sorted(list(enum_values))
 
                 if range_id := self.model.value(obj_prop, SH["class"]):
                     if not set_prop_range(p, range_id):
@@ -252,8 +268,6 @@ class Model(object):
                         )
                     p.pattern = str(pattern)
 
-                c.properties.append(p)
-
             c.properties.sort(key=lambda p: p.path)
 
             self.classes.append(c)

shacl2code-0.0.24/src/shacl2code/version.py

@@ -0,0 +1 @@
+VERSION = "0.0.24"