Merge branch 'FixSmtNameplate' into main

otto-ifak · otto-ifak · commit 6fcb36b13d2b · 2025-01-25T23:00:04.000+01:00
diff --git a/aas_test_engines/test_cases/v3_0/parse_submodel.py b/aas_test_engines/test_cases/v3_0/parse_submodel.py
@@ -2,15 +2,20 @@
 from .adapter import AdapterPath
 
 from aas_test_engines.result import AasTestResult, Level
-from typing import List, Dict, Optional, Tuple, Union
+from typing import List, Dict, Tuple, Union
 from collections import defaultdict
 from dataclasses import is_dataclass, fields
 from enum import Enum
+import datetime
 
 INVALID = object()
 LangString = Dict[str, str]
 
 
+def to_camel_case(s: str) -> str:
+    return "".join(s.title().split('_'))
+
+
 def _unwrap(cls) -> Tuple[int, int, type]:
     try:
         origin = cls.__origin__
@@ -45,21 +50,34 @@ def _parse_string(root_result: AasTestResult, element: SubmodelElement, path: Ad
     if not isinstance(element, Property):
         root_result.append(AasTestResult(f"Cannot convert to string: must be a Property @ {path}", level=Level.ERROR))
         return
-    if element.value_type != DataTypeDefXsd.string:
-        root_result.append(AasTestResult(f"Cannot convert to string: valueType must be xs:string @ {path}", level=Level.ERROR))
-        return
     if not element.value:
         root_result.append(AasTestResult(f"Cannot convert to string: no value @ {path}", level=Level.ERROR))
         return
+    if element.value_type != DataTypeDefXsd.string:
+        root_result.append(AasTestResult(f"Cannot convert '{element.value}' to string: valueType must be xs:string @ {path}", level=Level.ERROR))
+        return
     return element.value.raw_value
 
 
+def _parse_date(root_result: AasTestResult, element: SubmodelElement, path: AdapterPath) -> str:
+    if not isinstance(element, Property):
+        root_result.append(AasTestResult(f"Cannot convert to date: must be a Property @ {path}", level=Level.ERROR))
+        return
+    if not element.value:
+        root_result.append(AasTestResult(f"Cannot convert to date: no value @ {path}", level=Level.ERROR))
+        return
+    if element.value_type != DataTypeDefXsd.date:
+        root_result.append(AasTestResult(f"Cannot convert '{element.value}' to date: valueType must be xs:date @ {path}", level=Level.ERROR))
+        return
+    return datetime.date.fromisoformat(element.value.raw_value)
+
+
 def _parse_lang_string(root_result: AasTestResult, element: SubmodelElement, path: AdapterPath) -> LangString:
     if not isinstance(element, MultiLanguageProperty):
-        root_result.append(AasTestResult(f"Cannot convert to lang string: not a MultiLanguageProperty @ {path}"))
+        root_result.append(AasTestResult(f"Cannot convert to lang string: not a MultiLanguageProperty @ {path}", Level.ERROR))
         return
     if not element.value:
-        root_result.append(AasTestResult(f"Cannot convert to lang string: no value @ {path}"))
+        root_result.append(AasTestResult(f"Cannot convert to lang string: no value @ {path}", Level.ERROR))
         return
     result: LangString = {}
     for i in element.value:
@@ -86,26 +104,28 @@ def _parse_elements(root_result: AasTestResult, cls, elements: List[SubmodelElem
         try:
             semantic_id = field.metadata['semantic_id']
         except KeyError:
-            raise Exception(f"Field {field.name} is missing metadata 'semantic_id'")
+            raise Exception(f"Internal error: field {field.name} is missing metadata 'semantic_id'")
         if semantic_id in all_semantic_ids:
-            raise Exception(f"Duplicate metadata semantic_id {semantic_id}")
+            raise Exception(f"Internal error: duplicate metadata semantic_id {semantic_id}")
+
         all_semantic_ids.add(semantic_id)
 
         min_card, max_card, field_type = _unwrap(field.type)
         sub_elements = elements_by_semantic_id[semantic_id]
+        name = to_camel_case(field.name)
         if len(sub_elements) > max_card:
-            root_result.append(AasTestResult(f"Field {field.name}: found {len(sub_elements)} elements with semanticId {semantic_id}, but at most {max_card} allowed", level=Level.ERROR))
+            root_result.append(AasTestResult(f"Field {name}: found {len(sub_elements)} elements with semanticId {semantic_id}, but at most {max_card} allowed", level=Level.ERROR))
             field_val = INVALID
         elif len(sub_elements) < min_card:
-            root_result.append(AasTestResult(f"Field {field.name}: found {len(sub_elements)} elements with semanticId {semantic_id}, but at least {min_card} required", level=Level.ERROR))
+            root_result.append(AasTestResult(f"Field {name}: found {len(sub_elements)} elements with semanticId {semantic_id}, but at least {min_card} required", level=Level.ERROR))
             field_val = INVALID
         else:
             if len(sub_elements) == 0:
                 field_val = None
             elif max_card == 1:
-                field_val = _parse(field_type, sub_elements[0], root_result, path + field.name)
-            else: # i.e. list
-                field_val = [_parse(field_type, el, root_result, path + field.name + idx) for idx, el in enumerate(sub_elements)]
+                field_val = _parse(field_type, sub_elements[0], root_result, path + name)
+            else:  # i.e. list
+                field_val = [_parse(field_type, el, root_result, path + name + idx) for idx, el in enumerate(sub_elements)]
         args[field.name] = field_val
     return cls(**args)
 
@@ -131,6 +151,8 @@ def _parse(cls, element: SubmodelElement, root_result, path: AdapterPath):
             return _parse_element_collection(root_result, cls, element, path)
         elif cls is str:
             return _parse_string(root_result, element, path)
+        elif cls is datetime.date:
+            return _parse_date(root_result, element, path)
         elif isinstance(cls, Enum.__class__):
             return _parse_enum(root_result, cls, element, path)
     raise NotImplementedError(
diff --git a/aas_test_engines/test_cases/v3_0/submodel_templates.py b/aas_test_engines/test_cases/v3_0/submodel_templates.py
@@ -2,8 +2,9 @@
 from dataclasses import dataclass, field
 from aas_test_engines.result import AasTestResult, Level
 from enum import Enum
+import datetime
 
-from .model import Submodel, Environment
+from .model import Environment
 from .parse_submodel import parse_submodel, LangString
 from .parse import check_constraints, CheckConstraintException
 from .adapter import AdapterPath
@@ -95,7 +96,7 @@ class IPCommunication:
         "semantic_id": "0173-1#02-AAQ326#002",
     })
     type_of_communication: Optional[str] = field(metadata={
-        "semantic_id": " https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/IPCommunication/TypeOfCommunication",
+        "semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/IPCommunication/TypeOfCommunication",
     })
     available_time: Optional[str] = field(metadata={
         "semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/AvailableTime/",
@@ -114,7 +115,7 @@ class ContactInformation:
         "semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/Language",
     })
     time_zone: Optional[str] = field(metadata={
-        "semantic_id": " https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/TimeZone",
+        "semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/TimeZone",
     })
     # TODO: Add hint: "mandatory property according to EU MachineDirective 2006/42/EC."
     city_town: Optional[LangString] = field(metadata={
@@ -200,10 +201,10 @@ class DigitalNameplate:
         "semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation",
     })
     manufacturer_product_root: Optional[LangString] = field(metadata={
-        "semantic_id": " 0173-1#02-AAU732#001",
+        "semantic_id": "0173-1#02-AAU732#001",
     })
     manufacturer_product_family: Optional[LangString] = field(metadata={
-        "semantic_id": "0173-1#02-AAU732#001",
+        "semantic_id": "0173-1#02-AAU731#001",
     })
     manufacturer_product_type: Optional[LangString] = field(metadata={
         "semantic_id": "0173-1#02-AAO057#002",
@@ -220,16 +221,16 @@ class DigitalNameplate:
     year_of_construction: str = field(metadata={
         "semantic_id": "0173-1#02-AAP906#001",
     })
-    date_of_manufacture: Optional[str] = field(metadata={
+    date_of_manufacture: Optional[datetime.date] = field(metadata={
         "semantic_id": "0173-1#02-AAR972#002",
     })
-    hardware_version: Optional[str] = field(metadata={
+    hardware_version: Optional[LangString] = field(metadata={
         "semantic_id": "0173-1#02-AAN270#002",
     })
-    firmware_version: Optional[str] = field(metadata={
+    firmware_version: Optional[LangString] = field(metadata={
         "semantic_id": "0173-1#02-AAM985#002",
     })
-    software_version: Optional[str] = field(metadata={
+    software_version: Optional[LangString] = field(metadata={
         "semantic_id": "0173-1#02-AAM737#002",
     })
     country_of_origin: Optional[str] = field(metadata={
