Update SDK to V3.1 of AAS Part 3a (IEC 61360)

moritzsommer · moritzsommer · commit d2a487d397b1 · 2026-04-21T02:44:59.000+02:00
diff --git a/compliance_tool/aas_compliance_tool/schemas/aasJSONSchema.json b/compliance_tool/aas_compliance_tool/schemas/aasJSONSchema.json
@@ -7,7 +7,7 @@
       "$ref": "#/definitions/Environment"
     }
   ],
-  "$id": "https://admin-shell.io/aas/3/0",
+  "$id": "https://admin-shell.io/aas/3/1",
   "definitions": {
     "AasSubmodelElements": {
       "type": "string",
diff --git a/compliance_tool/aas_compliance_tool/schemas/aasXMLSchema.xsd b/compliance_tool/aas_compliance_tool/schemas/aasXMLSchema.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="https://admin-shell.io/aas/3/0" elementFormDefault="qualified" targetNamespace="https://admin-shell.io/aas/3/0">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="https://admin-shell.io/aas/3/1" elementFormDefault="qualified" targetNamespace="https://admin-shell.io/aas/3/1">
   <xs:group name="abstractLangString">
     <xs:sequence>
       <xs:element name="language">
diff --git a/compliance_tool/test/files/test_demo_full_example.xml b/compliance_tool/test/files/test_demo_full_example.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<aas:environment xmlns:aas="https://admin-shell.io/aas/3/0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<aas:environment xmlns:aas="https://admin-shell.io/aas/3/1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <aas:assetAdministrationShells>
     <aas:assetAdministrationShell>
       <aas:idShort>TestAssetAdministrationShell</aas:idShort>
diff --git a/compliance_tool/test/files/test_demo_full_example_wrong_attribute.xml b/compliance_tool/test/files/test_demo_full_example_wrong_attribute.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<aas:environment xmlns:aas="https://admin-shell.io/aas/3/0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<aas:environment xmlns:aas="https://admin-shell.io/aas/3/1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <aas:assetAdministrationShells>
     <aas:assetAdministrationShell>
       <aas:idShort>TestAssetAdministrationShell123</aas:idShort>
diff --git a/compliance_tool/test/files/test_demo_full_example_xml_aasx/aasx/data.xml b/compliance_tool/test/files/test_demo_full_example_xml_aasx/aasx/data.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<aas:environment xmlns:aas="https://admin-shell.io/aas/3/0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<aas:environment xmlns:aas="https://admin-shell.io/aas/3/1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <aas:assetAdministrationShells>
     <aas:assetAdministrationShell>
       <aas:idShort>TestAssetAdministrationShell</aas:idShort>
diff --git a/compliance_tool/test/files/test_demo_full_example_xml_wrong_attribute_aasx/aasx/data.xml b/compliance_tool/test/files/test_demo_full_example_xml_wrong_attribute_aasx/aasx/data.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<aas:environment xmlns:aas="https://admin-shell.io/aas/3/0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<aas:environment xmlns:aas="https://admin-shell.io/aas/3/1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <aas:assetAdministrationShells>
     <aas:assetAdministrationShell>
       <aas:idShort>TestAssetAdministrationShell123</aas:idShort>
diff --git a/compliance_tool/test/files/test_deserializable_aas_warning.xml b/compliance_tool/test/files/test_deserializable_aas_warning.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<aas:environment xmlns:aas="https://admin-shell.io/aas/3/0">
+<aas:environment xmlns:aas="https://admin-shell.io/aas/3/1">
   <aas:assetAdministrationShells>
     <aas:assetAdministrationShell>
       <aas:idShort>TestAssetAdministrationShell</aas:idShort>
diff --git a/compliance_tool/test/files/test_empty.xml b/compliance_tool/test/files/test_empty.xml
@@ -1,3 +1,3 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<aas:environment xmlns:aas="https://admin-shell.io/aas/3/0">
+<aas:environment xmlns:aas="https://admin-shell.io/aas/3/1">
 </aas:environment>
diff --git a/compliance_tool/test/files/test_not_deserializable_aas.xml b/compliance_tool/test/files/test_not_deserializable_aas.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<aas:environment xmlns:aas="https://admin-shell.io/aas/3/0">
+<aas:environment xmlns:aas="https://admin-shell.io/aas/3/1">
     <aas:assetAdministrationShells>
         <aas:submodel>
             <aas:idShort/>
diff --git a/sdk/basyx/aas/adapter/_generic.py b/sdk/basyx/aas/adapter/_generic.py
@@ -27,7 +27,7 @@
 )
 
 # XML Namespace definition
-XML_NS_MAP = {"aas": "https://admin-shell.io/aas/3/0"}
+XML_NS_MAP = {"aas": "https://admin-shell.io/aas/3/1"}
 XML_NS_AAS = "{" + XML_NS_MAP["aas"] + "}"
 
 MODELLING_KIND: Dict[model.ModellingKind, str] = {
diff --git a/sdk/basyx/aas/adapter/xml/xml_deserialization.py b/sdk/basyx/aas/adapter/xml/xml_deserialization.py
@@ -98,7 +98,7 @@ def _element_pretty_identifier(element: etree._Element) -> str:
 
     If the prefix is known, the namespace in the element tag is replaced by the prefix.
     If additionally also the sourceline is known, it is added as a suffix to name.
-    For example, instead of "{https://admin-shell.io/aas/3/0}assetAdministrationShell" this function would return
+    For example, instead of "{https://admin-shell.io/aas/3/1}assetAdministrationShell" this function would return
     "aas:assetAdministrationShell on line $line", if both, prefix and sourceline, are known.
 
     :param element: The xml element.
diff --git a/sdk/basyx/aas/model/_string_constraints.py b/sdk/basyx/aas/model/_string_constraints.py
@@ -100,7 +100,7 @@ def check_short_name_type(value: str, type_name: str = "ShortNameType") -> None:
 
 
 def check_value_type_iec61360(value: str, type_name: str = "ValueTypeIEC61360") -> None:
-    return check(value, type_name, 1, 2000)
+    return check(value, type_name, 1, 2048)
 
 
 def check_version_type(value: str, type_name: str = "VersionType") -> None:
diff --git a/sdk/basyx/aas/model/base.py b/sdk/basyx/aas/model/base.py
@@ -1720,14 +1720,14 @@ class ValueReferencePair:
 
     def __init__(self,
                  value: ValueTypeIEC61360,
-                 value_id: Reference):
+                 value_id: Reference | None = None):
         """
 
 
         TODO: Add instruction what to do after construction
         """
-        self.value_id: Reference = value_id
         self.value: ValueTypeIEC61360 = value
+        self.value_id: Reference | None = value_id
 
     def __repr__(self) -> str:
         return "ValueReferencePair(value={}, value_id={})".format(self.value, self.value_id)
diff --git a/sdk/test/adapter/xml/test_xml_deserialization.py b/sdk/test/adapter/xml/test_xml_deserialization.py
@@ -456,22 +456,22 @@ def construct_submodel(cls, element: etree._Element, object_class=EnhancedSubmod
 
 class TestTagReplaceNamespace(unittest.TestCase):
     def test_known_namespace(self):
-        tag = '{https://admin-shell.io/aas/3/0}tag'
+        tag = '{https://admin-shell.io/aas/3/1}tag'
         expected = 'aas:tag'
         self.assertEqual(_tag_replace_namespace(tag, XML_NS_MAP), expected)
 
     def test_empty_prefix(self):
         # Empty prefix should not be replaced as otherwise it would apply everywhere
-        tag = '{https://admin-shell.io/aas/3/0}tag'
-        nsmap = {"": "https://admin-shell.io/aas/3/0"}
-        expected = '{https://admin-shell.io/aas/3/0}tag'
+        tag = '{https://admin-shell.io/aas/3/1}tag'
+        nsmap = {"": "https://admin-shell.io/aas/3/1"}
+        expected = '{https://admin-shell.io/aas/3/1}tag'
         self.assertEqual(_tag_replace_namespace(tag, nsmap), expected)
 
     def test_empty_namespace(self):
         # Empty namespaces should also have no effect
-        tag = '{https://admin-shell.io/aas/3/0}tag'
+        tag = '{https://admin-shell.io/aas/3/1}tag'
         nsmap = {"aas": ""}
-        expected = '{https://admin-shell.io/aas/3/0}tag'
+        expected = '{https://admin-shell.io/aas/3/1}tag'
         self.assertEqual(_tag_replace_namespace(tag, nsmap), expected)
 
     def test_unknown_namespace(self):

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"$ref": "#/definitions/Environment"`
`8`	`8`	`}`
`9`	`9`	`],`
`10`		`- "$id": "https://admin-shell.io/aas/3/0",`
	`10`	`+ "$id": "https://admin-shell.io/aas/3/1",`
`11`	`11`	`"definitions": {`
`12`	`12`	`"AasSubmodelElements": {`
`13`	`13`	`"type": "string",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`# XML Namespace definition`
`30`		`-XML_NS_MAP = {"aas": "https://admin-shell.io/aas/3/0"}`
	`30`	`+XML_NS_MAP = {"aas": "https://admin-shell.io/aas/3/1"}`
`31`	`31`	`XML_NS_AAS = "{" + XML_NS_MAP["aas"] + "}"`
`32`	`32`
`33`	`33`	`MODELLING_KIND: Dict[model.ModellingKind, str] = {`