aas-standard-parser 0.2.3__tar.gz → 0.2.5__tar.gz

{aas_standard_parser-0.2.3 → aas_standard_parser-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-standard-parser
-Version: 0.2.3
+Version: 0.2.5
 Summary: Some auxiliary functions for parsing standard submodels
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License

{aas_standard_parser-0.2.3 → aas_standard_parser-0.2.5}/aas_standard_parser/__init__.py

@@ -13,7 +13,7 @@ except importlib.metadata.PackageNotFoundError:
 __project__ = "aas-standard-parser"
 __package__ = "aas-standard-parser"
 
-from aas_standard_parser import aimc_parser
+from aas_standard_parser import aas_parser, aid_parser, aimc_parser, submodel_parser
 from aas_standard_parser.aid_parser import AIDParser
 
-__all__ = ["AIDParser", "aimc_parser"]
+__all__ = ["AIDParser", "aimc_parser", "aas_parser", "aid_parser", "submodel_parser"]

aas_standard_parser-0.2.5/aas_standard_parser/aas_parser.py

@@ -0,0 +1,24 @@
+"""Module for parsing AAS."""
+
+import logging
+
+from basyx.aas import model
+
+logger = logging.getLogger(__name__)
+
+
+def get_submodel_ids(shell: model.AssetAdministrationShell) -> list[str]:
+    """Get all submodel IDs from the given AAS.
+
+    :param shell: parent AAS to search within
+    :return: list of submodel IDs
+    """
+    submodel_ids = []
+    for submodel in shell.submodel:
+        if len(submodel.key) < 1 or submodel.key[0].type != model.KeyTypes.SUBMODEL:
+            logger.warning(f"Submodel reference {submodel} does not start with SUBMODEL key type.")
+            continue
+
+        submodel_ids.append(submodel.key[0].value)
+
+    return submodel_ids

{aas_standard_parser-0.2.3 → aas_standard_parser-0.2.5}/aas_standard_parser/classes/aimc_parser_classes.py

@@ -27,14 +27,14 @@ class SourceSinkRelation:
         """
         dict_string = json.dumps(self.source_properties.reference, cls=basyx.aas.adapter.json.AASToJsonEncoder)
         dict_string = dict_string.replace("GlobalReference", "Submodel").replace("FragmentReference", "SubmodelElementCollection")
-        return json.dumps(dict_string)
+        return json.loads(dict_string)
 
     def sink_reference_as_dict(self) -> dict:
         """Convert the sink reference to a dictionary.
 
         :return: The sink reference as a dictionary.
         """
-        return json.dumps(self.sink_properties.reference, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+        return json.loads(json.dumps(self.sink_properties.reference, cls=basyx.aas.adapter.json.AASToJsonEncoder))
 
 
 class MappingConfiguration:

aas_standard_parser-0.2.5/aas_standard_parser/reference_helpers.py

@@ -0,0 +1,31 @@
+from basyx.aas.model import ModelReference
+
+
+def construct_idshort_path_from_reference(reference: ModelReference) -> str:
+    idshort_path: str = ""
+
+    # start from the second Key and omit the Identifiable at the beginning of the list
+    for key in reference.key[1:]:
+        idshort_path += key.value + "."
+
+    # get rid of the trailing dot
+    return idshort_path[:-1]
+
+
+def get_values_from_keys(reference: ModelReference) -> list[str]:
+    """Returns the values from all keys in reference as list.
+
+    :param reference: reference to extract values from
+    :return: list of values from all keys in the reference
+    """
+    return [key.value for key in reference.key]
+
+
+def get_value_from_key_at_index(reference: ModelReference, index: int) -> str:
+    """Returns the value from the key at the given index in reference.
+
+    :param reference: reference to extract value from
+    :param index: index of the key to get the value from
+    :return: value from the key at the given index
+    """
+    return reference.key[index].value

{aas_standard_parser-0.2.3 → aas_standard_parser-0.2.5}/aas_standard_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-standard-parser
-Version: 0.2.3
+Version: 0.2.5
 Summary: Some auxiliary functions for parsing standard submodels
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License

{aas_standard_parser-0.2.3 → aas_standard_parser-0.2.5}/aas_standard_parser.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 aas_standard_parser/__init__.py
+aas_standard_parser/aas_parser.py
 aas_standard_parser/aid_parser.py
 aas_standard_parser/aimc_parser.py
 aas_standard_parser/collection_helpers.py

{aas_standard_parser-0.2.3 → aas_standard_parser-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aas-standard-parser"
-version = "0.2.3"
+version = "0.2.5"
 description = "Some auxiliary functions for parsing standard submodels"
 readme = "README.md"
 license = { file = "LICENSE" }

{aas_standard_parser-0.2.3 → aas_standard_parser-0.2.5}/tests/test_aimc_parser.py

@@ -121,9 +121,11 @@ def _check_relations_sink(reference_properties: ReferenceProperties):
 def _check_relation_methods(relation: SourceSinkRelation):
     # test to_json methods
     source_json = relation.source_reference_as_dict()
+    assert isinstance(source_json, dict)
     assert source_json is not None
     assert "type" in source_json
 
     sink_json = relation.sink_reference_as_dict()
+    assert isinstance(sink_json, dict)
     assert sink_json is not None
     assert "type" in sink_json

aas_standard_parser-0.2.3/aas_standard_parser/reference_helpers.py

@@ -1,12 +0,0 @@
-from basyx.aas.model import ModelReference
-
-
-def construct_idshort_path_from_reference(reference: ModelReference) -> str:
-    idshort_path: str = ""
-
-    # start from the second Key and omit the Identifiable at the beginning of the list
-    for key in reference.key[1:]:
-        idshort_path += (key.value + ".")
-
-    # get rid of the trailing dot
-    return idshort_path[:-1]