aas-standard-parser 0.1.8__py3-none-any.whl → 0.2.0__py3-none-any.whl

aas_standard_parser/aimc_parser.py

@@ -2,7 +2,7 @@
 
 import json
 import logging
-from dataclasses import dataclass, field
+from dataclasses import field
 
 import basyx.aas.adapter.json
 from basyx.aas import model
@@ -12,14 +12,25 @@ import aas_standard_parser.collection_helpers as ch
 logger = logging.getLogger(__name__)
 
 
+class ReferenceProperties:
+    """Class representing properties of a reference in the mapping configuration."""
+
+    submodel_id: str = field(metadata={"description": "Identifier of the submodel used by the reference."})
+    property_name: str = field(metadata={"description": "Name of the mapped property."})
+    parent_path: list[str] = field(metadata={"description": "List of idShorts representing the parent path of the reference."})
+
+
 class SourceSinkRelation:
     """Class representing a source-sink relation in the mapping configuration."""
 
-    aid_submodel_id: str = field(metadata={"description": "Identifier of the AID submodel used by the source reference."})
+    source_submodel_id: str = field(metadata={"description": "Identifier of the source (AID) submodel used by the source reference."})
+    sink_submodel_id: str = field(metadata={"description": "Identifier of the target submodel used by the sink reference."})
     source: model.ExternalReference = field(metadata={"description": "Reference to the source property in the AID submodel."})
     sink: model.ExternalReference = field(metadata={"description": "Reference to the sink property in the target submodel."})
-    property_name: str = field(metadata={"description": "Name of the mapped property."})
-    source_parent_path: list[str] = field(metadata={"description": "List of idShorts representing the parent path of the reference."})
+    source_property_name: str = field(metadata={"description": "Name of the mapped property in source."})
+    sink_property_name: str = field(metadata={"description": "Name of the mapped property in sink."})
+    source_parent_path: list[str] = field(metadata={"description": "List of idShorts representing the parent path of the source reference."})
+    sink_parent_path: list[str] = field(metadata={"description": "List of idShorts representing the parent path of the reference."})
 
     def source_as_dict(self) -> dict:
         """Convert the source reference to a dictionary.
@@ -37,13 +48,6 @@ class SourceSinkRelation:
         """
         return json.loads(json.dumps(self.sink, cls=basyx.aas.adapter.json.AASToJsonEncoder))
 
-    def get_source_parent_property_group_name(self) -> str:
-        """Get the name of the parent property group from the source. Ignore 'properties' entries from the path."""
-        if len(self.source_parent_path) == 0:
-            return ""
-
-        return next((n for n in reversed(self.source_parent_path) if n != "properties"), "")
-
 
 class MappingConfiguration:
     """Class representing a mapping configuration."""
@@ -164,7 +168,7 @@ def parse_mapping_configuration_element(
         return None
 
     # check if all relations have the same AID submodel
-    aid_submodel_ids = list({source_sink_relation.aid_submodel_id for source_sink_relation in source_sink_relations})
+    aid_submodel_ids = list({source_sink_relation.source_submodel_id for source_sink_relation in source_sink_relations})
 
     if len(aid_submodel_ids) != 1:
         logger.error(
@@ -233,35 +237,49 @@ def _generate_source_sink_relations(mapping_configuration_element: model.Submode
             logger.warning(f"'second' reference is missing in RelationshipElement '{source_sink_relation.id_short}'")
             continue
 
-        source_ref = source_sink_relation.first
-
-        global_ref = next((key for key in source_ref.key if key.type == model.KeyTypes.GLOBAL_REFERENCE), None)
-
-        if global_ref is None:
-            logger.warning(f"No GLOBAL_REFERENCE key found in 'first' reference of RelationshipElement '{source_sink_relation.id_short}'")
-            continue
-
-        last_fragment_ref = next(
-            (key for key in reversed(source_ref.key) if key.type == model.KeyTypes.FRAGMENT_REFERENCE),
-            None,
-        )
-
-        if last_fragment_ref is None:
-            logger.warning(f"No FRAGMENT_REFERENCE key found in 'first' reference of RelationshipElement '{source_sink_relation.id_short}'")
-            continue
+        source_ref_properties = _get_reference_properties(source_sink_relation.first)
+        sink_ref_properties = _get_reference_properties(source_sink_relation.second)
 
         relation = SourceSinkRelation()
+
         relation.source = source_sink_relation.first
+        relation.source_submodel_id = source_ref_properties.submodel_id
+        relation.source_property_name = source_ref_properties.property_name
+        relation.source_parent_path = source_ref_properties.parent_path
+
         relation.sink = source_sink_relation.second
-        relation.aid_submodel_id = global_ref.value
-        relation.property_name = last_fragment_ref.value
-        relation.source_parent_path = _get_reference_parent_path(source_ref)
+        relation.sink_submodel_id = sink_ref_properties.submodel_id
+        relation.sink_property_name = sink_ref_properties.property_name
+        relation.sink_parent_path = sink_ref_properties.parent_path
 
         source_sink_relations.append(relation)
 
     return source_sink_relations
 
 
+def _get_reference_properties(reference: model.ExternalReference) -> ReferenceProperties | None:
+    global_ref = next((key for key in reference.key if key.type == model.KeyTypes.GLOBAL_REFERENCE), None)
+
+    if global_ref is None:
+        logger.warning(f"No GLOBAL_REFERENCE key found in 'first' reference of RelationshipElement '{reference}'")
+        return None
+
+    last_fragment_ref = next((key for key in reversed(reference.key) if key.type == model.KeyTypes.FRAGMENT_REFERENCE), None)
+
+    if last_fragment_ref is None:
+        logger.warning(f"No FRAGMENT_REFERENCE key found in 'first' reference of RelationshipElement '{reference.id_short}'")
+        return None
+
+    parent_path = _get_reference_parent_path(reference)
+
+    ref_properties = ReferenceProperties()
+    ref_properties.submodel_id = global_ref.value
+    ref_properties.property_name = last_fragment_ref.value
+    ref_properties.parent_path = parent_path
+
+    return ref_properties
+
+
 def _get_reference_parent_path(reference: model.ExternalReference) -> list[str]:
     """Get the parent path of a reference as a list of idShorts.
 

aas_standard_parser/submodel_parser.py

@@ -3,9 +3,9 @@
 import logging
 
 from basyx.aas import model
-from basyx.aas.model import ExternalReference, Key, KeyTypes, NamespaceSet, Reference, SubmodelElement
+from basyx.aas.model import NamespaceSet, SubmodelElement
 
-import collection_helpers
+from aas_standard_parser import collection_helpers
 
 logger = logging.getLogger(__name__)
 

{aas_standard_parser-0.1.8.dist-info → aas_standard_parser-0.2.0.dist-info}/METADATA

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

{aas_standard_parser-0.1.8.dist-info → aas_standard_parser-0.2.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 aas_standard_parser/__init__.py,sha256=3iBTUUlJ97ImkAHdss_GP970BANEU1uNeg0HlRzzois,599
 aas_standard_parser/aid_parser.py,sha256=9vp8_kJRfExTmw8tjmO32n1eHFAE5ItmfPlZ2ORLZMs,14314
-aas_standard_parser/aimc_parser.py,sha256=yl94hOtqoOHYFP_8cladJho8u8QZ3MNUXR0OpXl5bLU,12298
+aas_standard_parser/aimc_parser.py,sha256=3hAKH3F1_r9ZDPLz82PYIehJnUsZodqX6ysVx2wM3fg,13440
 aas_standard_parser/collection_helpers.py,sha256=fTQGQiC-bGD41Qx0FDDBtWhvkeZtEe6Sh-aT93ePwro,4153
 aas_standard_parser/reference_helpers.py,sha256=UbqXaub5PTvt_W3VPntSSFcTS59PUwlTpoujny8rIRI,377
-aas_standard_parser/submodel_parser.py,sha256=4cPziJbFh3GjZ0ClSlCqIFJcYn-1tCg2Bmp7NrnMs_I,3189
+aas_standard_parser/submodel_parser.py,sha256=XH-XTBB3a0MB1NR5nAzG9C6f9hT_qG42f-ABruN3MzE,3169
 aas_standard_parser/utils.py,sha256=5iIPpM_ob2V9MwFL_vTbXd23doYKot30xenRmTPAquo,723
 aas_standard_parser/demo/demo_process.py,sha256=Xn9uD0xLoNx0ZvB3Lk0oYkGBRHaEfUbfqv5_SpPWYck,530
 aas_standard_parser/demo/logging_handler.py,sha256=x-eX4XDU3sZTJE22rzJSiaWQ8wRMbtaFpFBAeAcbIzI,5752
-aas_standard_parser-0.1.8.dist-info/licenses/LICENSE,sha256=simqYMD2P9Ikm0Kh9n7VGNpaVcm2TMVVQmECYZ_xVZ8,1065
-aas_standard_parser-0.1.8.dist-info/METADATA,sha256=5Sn4uRjsyj1k1yEIdfKXPCuLdHWkTlfglAi--InR3O0,1718
-aas_standard_parser-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_standard_parser-0.1.8.dist-info/top_level.txt,sha256=OQaK6cwYttR1-eKTz5u4M0jbwSfp4HqJ56chaf0nHnw,20
-aas_standard_parser-0.1.8.dist-info/RECORD,,
+aas_standard_parser-0.2.0.dist-info/licenses/LICENSE,sha256=simqYMD2P9Ikm0Kh9n7VGNpaVcm2TMVVQmECYZ_xVZ8,1065
+aas_standard_parser-0.2.0.dist-info/METADATA,sha256=FjntnuF2IPILHFc5n6A2EITPZQGPJKAdN9nXTR1uSL8,1718
+aas_standard_parser-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_standard_parser-0.2.0.dist-info/top_level.txt,sha256=OQaK6cwYttR1-eKTz5u4M0jbwSfp4HqJ56chaf0nHnw,20
+aas_standard_parser-0.2.0.dist-info/RECORD,,