spdx-python-model 0.0.3__tar.gz → 0.0.4__tar.gz

{spdx_python_model-0.0.3 → spdx_python_model-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spdx_python_model
-Version: 0.0.3
+Version: 0.0.4
 Summary: SPDX Model Python Bindings
 Project-URL: Homepage, https://github.com/spdx/spdx-python-model
 Project-URL: Repository, https://github.com/spdx/spdx-python-model.git

{spdx_python_model-0.0.3 → spdx_python_model-0.0.4}/pyproject.toml

@@ -34,7 +34,7 @@ Issues = "https://github.com/spdx/spdx-python-model/issues"
 requires = [
     "hatchling",
     "hatch-build-scripts",
-    "shacl2code == 0.0.22",
+    "shacl2code == 0.0.24",
 ]
 build-backend = "hatchling.build"
 

{spdx_python_model-0.0.3 → spdx_python_model-0.0.4}/src/spdx_python_model/bindings/v3_0_1.py

@@ -33,8 +33,10 @@ from typing import (
     Set,
     Tuple,
     Type,
+    TypeVar,
     Union,
     cast,
+    overload,
 )
 
 
@@ -540,10 +542,9 @@ class EnumProp(IRIProp):
     def validate(self, value) -> None:
         super().validate(value)
 
-        valid_values = self.iri_values()
-        if value not in valid_values:
+        if value not in self.iri_values():
             raise ValueError(
-                f"'{value}' is not a valid value. Choose one of {' '.join(valid_values)}"
+                f"'{value}' is not a valid value. Choose one of {' '.join(self.iri_values())}"
             )
 
     def encode(self, encoder, value, state) -> None:
@@ -616,6 +617,7 @@ def register(
 
 register_lock = threading.Lock()
 NAMED_INDIVIDUALS: Set[str] = set()
+T_SHACLObject = TypeVar("T_SHACLObject", bound="SHACLObject")
 
 
 @functools.total_ordering
@@ -861,7 +863,7 @@ class SHACLObject(object):
         ) as obj_s:
             self._encode_properties(obj_s, state)
 
-    def _encode_properties(self, encoder, state):
+    def _encode_properties(self, encoder, state) -> None:
         for iri, prop, min_count, max_count, pyname, compact in self.__iter_props():
             value = self.__dict__["_obj_data"][iri]
             if prop.elide(value):
@@ -921,7 +923,9 @@ class SHACLObject(object):
 
         return obj
 
-    def _decode_properties(self, decoder, objectset: Optional[SHACLObjectSet] = None):
+    def _decode_properties(
+        self, decoder, objectset: Optional[SHACLObjectSet] = None
+    ) -> None:
         for key in decoder.object_keys():
             if not self._decode_prop(decoder, key, objectset=objectset):
                 raise KeyError(f"Unknown property '{key}'")
@@ -1019,7 +1023,9 @@ class SHACLExtensibleObject(SHACLObject):
         obj = cls(typ)
         return obj
 
-    def _decode_properties(self, decoder, objectset: Optional[SHACLObjectSet] = None):
+    def _decode_properties(
+        self, decoder, objectset: Optional[SHACLObjectSet] = None
+    ) -> None:
         def decode_value(d):
             if not d.is_list():
                 return d.read_value()
@@ -1042,7 +1048,7 @@ class SHACLExtensibleObject(SHACLObject):
             with decoder.read_property(key) as prop_d:
                 self.__dict__["_obj_data"][key] = decode_value(prop_d)
 
-    def _encode_properties(self, encoder, state):
+    def _encode_properties(self, encoder, state) -> None:
         super()._encode_properties(encoder, state)
         if self.CLOSED:
             return
@@ -1274,8 +1280,17 @@ class SHACLObjectSet(object):
             for child in o.iter_objects(recursive=True, visited=visited):
                 yield child
 
+    @overload
+    def foreach_type(
+        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, SHACLObject], *, match_subclass: bool = True
+        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)
@@ -1287,15 +1302,16 @@ class SHACLObjectSet(object):
         if not isinstance(typ, str):
             if not isinstance(typ, type) or not issubclass(typ, SHACLObject):
                 raise TypeError(f"Type must be derived from SHACLObject, got {typ}")
-            typ = cast(SHACLObject, typ)
-            typ = typ._OBJ_TYPE
+            # This intermediate step is necessary for pyrefly...
+            typ_class: Type[SHACLObject] = typ
+            typ = typ_class._OBJ_TYPE
 
         if typ not in self.obj_by_type:
             return
 
         for exact, o in self.obj_by_type[typ]:
             if match_subclass or exact:
-                yield o
+                yield cast(T_SHACLObject, o)
 
     def merge(self, *objectsets) -> "SHACLObjectSet":
         """

{spdx_python_model-0.0.3 → spdx_python_model-0.0.4}/src/spdx_python_model/version.py

@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-VERSION = "0.0.3"
+VERSION = "0.0.4"