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

aas_standard_parser/aimc_parser.py

@@ -15,6 +15,7 @@ logger = logging.getLogger(__name__)
 class ReferenceProperties:
     """Class representing properties of a reference in the mapping configuration."""
 
+    reference: model.ExternalReference = field(metadata={"description": "Reference to the property in the submodel."})
     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."})
@@ -23,21 +24,15 @@ class ReferenceProperties:
 class SourceSinkRelation:
     """Class representing a source-sink relation in the mapping configuration."""
 
-    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."})
-    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."})
+    source_properties: ReferenceProperties = field(metadata={"description": "Properties of the source reference."})
+    sink_properties: ReferenceProperties = field(metadata={"description": "Properties of the sink reference."})
 
     def source_as_dict(self) -> dict:
         """Convert the source reference to a dictionary.
 
         :return: The source reference as a dictionary.
         """
-        dict_string = json.dumps(self.source, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+        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.loads(dict_string)
 
@@ -46,7 +41,7 @@ class SourceSinkRelation:
 
         :return: The sink reference as a dictionary.
         """
-        return json.loads(json.dumps(self.sink, cls=basyx.aas.adapter.json.AASToJsonEncoder))
+        return json.dumps(self.sink_properties.reference, cls=basyx.aas.adapter.json.AASToJsonEncoder)
 
 
 class MappingConfiguration:
@@ -168,7 +163,7 @@ def parse_mapping_configuration_element(
         return None
 
     # check if all relations have the same AID submodel
-    aid_submodel_ids = list({source_sink_relation.source_submodel_id for source_sink_relation in source_sink_relations})
+    aid_submodel_ids = list({source_sink_relation.source_properties.submodel_id for source_sink_relation in source_sink_relations})
 
     if len(aid_submodel_ids) != 1:
         logger.error(
@@ -237,20 +232,9 @@ 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_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.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
+        relation.source_properties = _get_reference_properties(source_sink_relation.first)
+        relation.sink_properties = _get_reference_properties(source_sink_relation.second)
 
         source_sink_relations.append(relation)
 
@@ -276,6 +260,7 @@ def _get_reference_properties(reference: model.ExternalReference) -> ReferencePr
     ref_properties.submodel_id = global_ref.value
     ref_properties.property_name = last_fragment_ref.value
     ref_properties.parent_path = parent_path
+    ref_properties.reference = reference
 
     return ref_properties
 

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

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

{aas_standard_parser-0.2.0.dist-info → aas_standard_parser-0.2.1.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=3hAKH3F1_r9ZDPLz82PYIehJnUsZodqX6ysVx2wM3fg,13440
+aas_standard_parser/aimc_parser.py,sha256=EdZmXL8wDTscSPCKI1ILKUIeNkZPMLHV2leTCXsqckQ,12347
 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=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.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,,
+aas_standard_parser-0.2.1.dist-info/licenses/LICENSE,sha256=simqYMD2P9Ikm0Kh9n7VGNpaVcm2TMVVQmECYZ_xVZ8,1065
+aas_standard_parser-0.2.1.dist-info/METADATA,sha256=ymMIlWi-tUVCsZya-shT7XkYyrSgCGM_KA4EoN8sITI,1718
+aas_standard_parser-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_standard_parser-0.2.1.dist-info/top_level.txt,sha256=OQaK6cwYttR1-eKTz5u4M0jbwSfp4HqJ56chaf0nHnw,20
+aas_standard_parser-0.2.1.dist-info/RECORD,,