Fix CI

Author: moritzsommer

compliance_tool/aas_compliance_tool/compliance_check_aasx.py

@@ -252,8 +252,11 @@ def check_aas_example(file_path: str, state_manager: ComplianceToolStateManager,
         state_manager.set_step_status(Status.FAILED)
         return
 
-    checker2.check(sha_file == files.get_sha256(obj2.value), "File of {} must be {}.".format(identifiable.value, obj2.value),
-                   value=obj2.value)
+    checker2.check(
+        sha_file == files.get_sha256(obj2.value),
+        "File of {} must be {}.".format(identifiable.value, obj2.value),
+        value=obj2.value
+    )
     state_manager.add_log_records_from_data_checker(checker2)
     if state_manager.status in (Status.FAILED, Status.NOT_EXECUTED):
         state_manager.set_step_status(Status.FAILED)

compliance_tool/pyproject.toml

@@ -38,7 +38,7 @@ requires-python = ">=3.10"
 dependencies = [
     "pyecma376-2>=0.2.4",
     "jsonschema>=4.21.1",
-    "basyx-python-sdk>=1.0.0",
+    "basyx-python-sdk @ file:../sdk",
 ]
 
 [project.optional-dependencies]

sdk/basyx/aas/adapter/aasx.py

@@ -507,9 +507,10 @@ def write_aas_objects(self,
         A thin wrapper around :meth:`write_all_aas_objects` to ensure downwards compatibility
 
         This method takes the AAS's :class:`~basyx.aas.model.base.Identifier` (as ``aas_id``) to retrieve it
-        from the given object_store. If the list of written identifiables includes :class:`~basyx.aas.model.submodel.Submodel`
-        identifiables, Supplementary files which are referenced by :class:`~basyx.aas.model.submodel.File` identifiables within
-        those Submodels, are also added to the AASX package.
+        from the given object_store. If the list of written identifiables includes
+        :class:`~basyx.aas.model.submodel.Submodel` identifiables, Supplementary files which are referenced by
+        :class:`~basyx.aas.model.submodel.File` identifiables within those Submodels, are also added to the AASX
+        package.
 
         .. attention::
 
@@ -519,10 +520,11 @@ def write_aas_objects(self,
         :param part_name: Name of the Part within the AASX package to write the files to. Must be a valid ECMA376-2
             part name and unique within the package. The extension of the part should match the data format (i.e.
             '.json' if ``write_json`` else '.xml').
-        :param object_ids: A list of :class:`Identifiers <basyx.aas.model.base.Identifier>` of the identifiables to be written
-            to the AASX package. Only these :class:`~basyx.aas.model.base.Identifiable` identifiables (and included
-            :class:`~basyx.aas.model.base.Referable` identifiables) are written to the package.
-        :param object_store: The identifiables store to retrieve the :class:`~basyx.aas.model.base.Identifiable` identifiables from
+        :param object_ids: A list of :class:`Identifiers <basyx.aas.model.base.Identifier>` of the identifiables to be
+            written to the AASX package. Only these :class:`~basyx.aas.model.base.Identifiable` identifiables
+            (and included :class:`~basyx.aas.model.base.Referable` identifiables) are written to the package.
+        :param object_store: The identifiables store to retrieve the :class:`~basyx.aas.model.base.Identifiable`
+            identifiables from
         :param file_store: The
             :class:`SupplementaryFileContainer <basyx.aas.adapter.aasx.AbstractSupplementaryFileContainer>`
             to retrieve supplementary files from (if there are any :class:`~basyx.aas.model.submodel.File`
@@ -550,7 +552,9 @@ def write_aas_objects(self,
                     raise KeyError(f"Could not find identifiable {identifier!r} in IdentifiableStore")
             identifiables.add(the_identifiable)
 
-        self.write_all_aas_objects(part_name, identifiables, file_store, write_json, split_part, additional_relationships)
+        self.write_all_aas_objects(
+            part_name, identifiables, file_store, write_json, split_part, additional_relationships
+        )
 
     # TODO remove `split_part` parameter in future version.
     #   Not required anymore since changes from DotAAS version 2.0.1 to 3.0RC01

sdk/basyx/aas/adapter/xml/xml_deserialization.py

@@ -1421,10 +1421,16 @@ def read_aas_xml_element(file: PathOrIO, construct: XMLConstructables, failsafe:
     return _failsafe_construct(element, constructor, decoder_.failsafe, **constructor_kwargs)
 
 
-def read_aas_xml_file_into(object_store: model.AbstractObjectStore[model.Identifier, model.Identifiable], file: PathOrIO,
-                           replace_existing: bool = False, ignore_existing: bool = False, failsafe: bool = True,
-                           stripped: bool = False, decoder: Optional[Type[AASFromXmlDecoder]] = None,
-                           **parser_kwargs: Any) -> Set[model.Identifier]:
+def read_aas_xml_file_into(
+        object_store: model.AbstractObjectStore[model.Identifier, model.Identifiable],
+        file: PathOrIO,
+        replace_existing: bool = False,
+        ignore_existing: bool = False,
+        failsafe: bool = True,
+        stripped: bool = False,
+        decoder: Optional[Type[AASFromXmlDecoder]] = None,
+        **parser_kwargs: Any
+) -> Set[model.Identifier]:
     """
     Read an Asset Administration Shell XML file according to 'Details of the Asset Administration Shell', chapter 5.4
     into a given :class:`ObjectStore <basyx.aas.model.provider.AbstractObjectStore>`.

sdk/basyx/aas/model/base.py

@@ -1049,7 +1049,7 @@ def __init__(self, key: Tuple[Key, ...], type_: Type[_RT], referred_semantic_id:
         self.type: Type[_RT]
         object.__setattr__(self, 'type', type_)
 
-    def resolve(self, provider_: "provider.AbstractObjectProvider[model.Identifier, model.Identifiable]") -> _RT:
+    def resolve(self, provider_: "provider.AbstractObjectProvider") -> _RT:
         """
         Follow the :class:`~.Reference` and retrieve the :class:`~.Referable` object it points to
 

sdk/basyx/aas/model/provider.py

@@ -158,6 +158,7 @@ class DictObjectStore(DictIdentifiableStore):
     `DictObjectStore` has been renamed to :class:`~.DictIdentifiableStore` and will be removed in a future release.
     Please migrate to :class:`~.DictIdentifiableStore`.
     """
+
     def __init__(self, iterables: Iterable[_IT] = ()) -> None:
         warnings.warn(
             "`DictObjectStore` is deprecated and will be removed in a future release. Use "
@@ -232,6 +233,7 @@ class SetObjectStore(SetIdentifiableStore):
     `SetObjectStore` has been renamed to :class:`~.SetIdentifiableStore` and will be removed in a future release.
     Please migrate to :class:`~.SetIdentifiableStore`.
     """
+
     def __init__(self, objects: Iterable[_IT] = ()) -> None:
         warnings.warn(
             "`SetObjectStore` is deprecated and will be removed in a future release. Use `SetIdentifiableStore`"
@@ -254,7 +256,7 @@ class ObjectProviderMultiplexer(AbstractObjectProvider[_K, _V]):
                       object
     """
 
-    def __init__(self, registries: Optional[List[AbstractObjectProvider[ _K, _V]]] = None) -> None:
+    def __init__(self, registries: Optional[List[AbstractObjectProvider[_K, _V]]] = None) -> None:
         self.providers: List[AbstractObjectProvider[_K, _V]] = registries if registries is not None else []
 
     def get_item(self, key: _K) -> _V:

sdk/docs/source/model/provider.rst

@@ -3,4 +3,6 @@ provider - Providers for storing and retrieving AAS-objects
 
 .. automodule:: basyx.aas.model.provider
 
+.. autoclass:: _K
+.. autoclass:: _V
 .. autoclass:: _IT

sdk/test/examples/test__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 the Eclipse BaSyx Authors
+# Copyright (c) 2025 the Eclipse BaSyx Authors
 #
 # This program and the accompanying materials are made available under the terms of the MIT License, available in
 # the LICENSE file of this project.