Skip to content
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

adapter.xml: Update XSD to v3.0 #161

Merged
merged 7 commits into from
Nov 16, 2023
Merged

adapter.xml: Update XSD to v3.0 #161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc48262
adapter.xml: Update XSD Schema
s-heppner Nov 14, 2023
d3cdbfe
adapter.xml: Update XSD of `valueDataType` and `Extension`
s-heppner Nov 14, 2023
0c276f7
adapter.xml: Update `levelType` XSD
s-heppner Nov 14, 2023
9027a8e
adapter.xml: Change order of `SubmodelElementList` objects
s-heppner Nov 14, 2023
3d80e0c
adapter.xml: Remove `<aas:kind>` from `SubmodelElement`s in XSD
s-heppner Nov 14, 2023
6071934
adapter.xml: Fix deserialization for `Extension`
s-heppner Nov 15, 2023
daa770f
model.Extension: Change refers_to to be of type `Set[Reference]`
s-heppner Nov 15, 2023
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
31 changes: 20 additions & 11 deletions basyx/aas/adapter/xml/AAS.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,14 @@
</xs:simpleType>
</xs:element>
<xs:element name="valueType" type="dataTypeDefXsd_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="value" type="valueDataType_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="refersTo" type="reference_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="value" type="valueDataType" minOccurs="0" maxOccurs="1"/>
<xs:element name="refersTo" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element name="reference" type="reference_t" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:group>
<xs:group name="file">
Expand Down Expand Up @@ -637,7 +643,7 @@
<xs:sequence>
<xs:group ref="dataElement"/>
<xs:element name="valueType" type="dataTypeDefXsd_t"/>
<xs:element name="value" type="valueDataType_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="value" type="valueDataType" minOccurs="0" maxOccurs="1"/>
<xs:element name="valueId" type="reference_t" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:group>
Expand Down Expand Up @@ -684,16 +690,16 @@
</xs:simpleType>
</xs:element>
<xs:element name="valueType" type="dataTypeDefXsd_t"/>
<xs:element name="value" type="valueDataType_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="value" type="valueDataType" minOccurs="0" maxOccurs="1"/>
<xs:element name="valueId" type="reference_t" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:group>
<xs:group name="range">
<xs:sequence>
<xs:group ref="dataElement"/>
<xs:element name="valueType" type="dataTypeDefXsd_t"/>
<xs:element name="min" type="valueDataType_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="max" type="valueDataType_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="min" type="valueDataType" minOccurs="0" maxOccurs="1"/>
<xs:element name="max" type="valueDataType" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:group>
<xs:group name="referable">
Expand Down Expand Up @@ -1087,11 +1093,14 @@
<xs:enumeration value="off"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="valueDataType_t">
<xs:simpleContent>
<xs:extension base="xs:anySimpleType"/>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="valueDataType">
<xs:restriction base="xs:string"/>
</xs:simpleType>
<xs:complexType name="abstractLangString_t">
<xs:sequence>
<xs:group ref="abstractLangString"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="administrativeInformation_t">
<xs:sequence>
<xs:group ref="administrativeInformation"/>
Expand Down
8 changes: 5 additions & 3 deletions basyx/aas/adapter/xml/xml_serialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,11 @@ def extension_to_xml(obj: model.Extension, tag: str = NS_AAS+"extension") -> etr
text=model.datatypes.XSD_TYPE_NAMES[obj.value_type]))
if obj.value:
et_extension.append(_value_to_xml(obj.value, obj.value_type)) # type: ignore # (value_type could be None)
for refers_to in obj.refers_to:
et_extension.append(reference_to_xml(refers_to, NS_AAS+"refersTo"))

if obj.refers_to:
refers_to = _generate_element(NS_AAS+"refersTo")
for reference in obj.refers_to:
refers_to.append(reference_to_xml(reference, NS_AAS+"reference"))
et_extension.append(refers_to)
return et_extension


Expand Down
16 changes: 9 additions & 7 deletions test/compliance_tool/files/test_demo_full_example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,15 @@
<aas:valueType>xs:string</aas:valueType>
<aas:value>ExampleExtensionValue</aas:value>
<aas:refersTo>
<aas:type>ModelReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>AssetAdministrationShell</aas:type>
<aas:value>http://acplt.org/RefersTo/ExampleRefersTo</aas:value>
</aas:key>
</aas:keys>
<aas:reference>
<aas:type>ModelReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>AssetAdministrationShell</aas:type>
<aas:value>http://acplt.org/RefersTo/ExampleRefersTo</aas:value>
</aas:key>
</aas:keys>
</aas:reference>
</aas:refersTo>
</aas:extension>
</aas:extensions>
Expand Down
16 changes: 9 additions & 7 deletions test/compliance_tool/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
Expand Up @@ -355,13 +355,15 @@
<aas:valueType>xs:string</aas:valueType>
<aas:value>ExampleExtensionValue</aas:value>
<aas:refersTo>
<aas:type>ModelReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>AssetAdministrationShell</aas:type>
<aas:value>http://acplt.org/RefersTo/ExampleRefersTo</aas:value>
</aas:key>
</aas:keys>
<aas:reference>
<aas:type>ModelReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>AssetAdministrationShell</aas:type>
<aas:value>http://acplt.org/RefersTo/ExampleRefersTo</aas:value>
</aas:key>
</aas:keys>
</aas:reference>
</aas:refersTo>
</aas:extension>
</aas:extensions>
Expand Down
14 changes: 8 additions & 6 deletions test/compliance_tool/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
Expand Up @@ -355,13 +355,15 @@
<aas:valueType>xs:string</aas:valueType>
<aas:value>ExampleExtensionValue</aas:value>
<aas:refersTo>
<aas:reference>
<aas:type>ModelReference</aas:type>
<aas:keys>
<aas:key>
<aas:type>AssetAdministrationShell</aas:type>
<aas:value>http://acplt.org/RefersTo/ExampleRefersTo</aas:value>
</aas:key>
</aas:keys>
<aas:keys>
<aas:key>
<aas:type>AssetAdministrationShell</aas:type>
<aas:value>http://acplt.org/RefersTo/ExampleRefersTo</aas:value>
</aas:key>
</aas:keys>
</aas:reference>
</aas:refersTo>
</aas:extension>
</aas:extensions>
Expand Down