Skip to content

Update IEC 61360 Data Specification to v3.1.1 #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-heppner merged 5 commits into from
May 6, 2026
Merged

Update IEC 61360 Data Specification to v3.1.1 #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
007ba9d
Update SDK to V3.0.1 of AAS Part 3a (IEC 61360)
moritzsommer Apr 20, 2026
08f1231
Update SDK to V3.0.2 of AAS Part 3a (IEC 61360)
moritzsommer Apr 20, 2026
d2a487d
Update SDK to V3.1 of AAS Part 3a (IEC 61360)
moritzsommer Apr 21, 2026
8bcec6f
Adapt copyright years, fix mypy errors
moritzsommer Apr 21, 2026
4470d62
Improve type hints
s-heppner May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compliance_tool/aas_compliance_tool/schemas/aasJSONSchema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion compliance_tool/aas_compliance_tool/schemas/aasXMLSchema.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
8 changes: 4 additions & 4 deletions compliance_tool/test/files/test_demo_full_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -618,7 +618,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -1492,7 +1492,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -3073,7 +3073,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions compliance_tool/test/files/test_demo_full_example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -35,7 +35,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -1229,7 +1229,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -2851,7 +2851,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down
8 changes: 4 additions & 4 deletions compliance_tool/test/files/test_demo_full_example_json_aasx/aasx/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -626,7 +626,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -1500,7 +1500,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -3081,7 +3081,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions compliance_tool/test/files/test_demo_full_example_wrong_attribute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -618,7 +618,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -1492,7 +1492,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down Expand Up @@ -3073,7 +3073,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions compliance_tool/test/files/test_demo_full_example_wrong_attribute.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -35,7 +35,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -1229,7 +1229,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -2851,7 +2851,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down
8 changes: 4 additions & 4 deletions compliance_tool/test/files/test_demo_full_example_xml_aasx/aasx/data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -35,7 +35,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -1237,7 +1237,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -2859,7 +2859,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down
8 changes: 4 additions & 4 deletions compliance_tool/test/files/test_demo_full_example_xml_wrong_attribute_aasx/aasx/data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -35,7 +35,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -1237,7 +1237,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down Expand Up @@ -2859,7 +2859,7 @@
<aas:keys>
<aas:key>
<aas:type>GlobalReference</aas:type>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
</aas:key>
</aas:keys>
</aas:dataSpecification>
Expand Down
2 changes: 1 addition & 1 deletion compliance_tool/test/files/test_deserializable_aas_warning.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion compliance_tool/test/files/test_empty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion compliance_tool/test/files/test_not_deserializable_aas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/>
Expand Down
4 changes: 2 additions & 2 deletions sdk/basyx/aas/adapter/_generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2025 the Eclipse BaSyx Authors
# Copyright (c) 2026 the Eclipse BaSyx Authors
#
# This program and the accompanying materials are made available under the terms of the MIT License, available in
# the LICENSE file of this project.
Expand Down Expand Up @@ -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] = {
Expand Down
2 changes: 1 addition & 1 deletion sdk/basyx/aas/adapter/xml/xml_deserialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion sdk/basyx/aas/adapter/xml/xml_serialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,8 @@ def value_reference_pair_to_xml(obj: model.ValueReferencePair,
et_vrp = _generate_element(tag)
# TODO: value_type isn't used at all by _value_to_xml(), thus we can ignore the type here for now
et_vrp.append(_generate_element(NS_AAS+"value", text=obj.value)) # type: ignore
et_vrp.append(reference_to_xml(obj.value_id, NS_AAS+"valueId"))
if obj.value_id is not None:
et_vrp.append(reference_to_xml(obj.value_id, NS_AAS+"valueId"))
return et_vrp


Expand Down
2 changes: 1 addition & 1 deletion sdk/basyx/aas/examples/data/example_aas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
_embedded_data_specification_iec61360 = model.EmbeddedDataSpecification(
data_specification=model.ExternalReference((model.Key(type_=model.KeyTypes.GLOBAL_REFERENCE,
value='https://admin-shell.io/DataSpecificationTemplates/'
'DataSpecificationIEC61360/3/0'),)),
'DataSpecificationIEC61360/3'),)),
data_specification_content=model.DataSpecificationIEC61360(preferred_name=model.PreferredNameTypeIEC61360({
'de': 'Test Specification',
'en-US': 'TestSpecification'
Expand Down
4 changes: 2 additions & 2 deletions sdk/basyx/aas/model/_string_constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2025 the Eclipse BaSyx Authors
# Copyright (c) 2026 the Eclipse BaSyx Authors
#
# This program and the accompanying materials are made available under the terms of the MIT License, available in
# the LICENSE file of this project.
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions sdk/basyx/aas/model/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ class DataSpecificationContent:
**Constraint AASc-3a-050:** If the ``Data_specification_IEC_61360`` is used
for an element, the value of ``HasDataSpecification.embedded_data_specifications``
shall contain the external reference to the IRI of the corresponding data specification
template ``https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0``
template ``https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3``
"""
@abc.abstractmethod
def __init__(self):
Expand Down Expand Up @@ -1720,14 +1720,14 @@ class ValueReferencePair:

def __init__(self,
value: ValueTypeIEC61360,
value_id: Reference):
value_id: Optional[Reference] = None):
"""


TODO: Add instruction what to do after construction
"""
self.value_id: Reference = value_id
self.value: ValueTypeIEC61360 = value
self.value_id: Optional[Reference] = value_id

def __repr__(self) -> str:
return "ValueReferencePair(value={}, value_id={})".format(self.value, self.value_id)
Expand Down
Loading
Loading