Skip to content

Commit 603ff70

Browse files
JAB1305JAB1305
committed
Run ruff format
1 parent 43b0c16 commit 603ff70

58 files changed

Lines changed: 10182 additions & 4862 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎sdk/basyx/aas/adapter/__init__.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
from typing import Union
1717

1818

19-
def load_directory(directory: Union[Path, str]) -> tuple[DictIdentifiableStore, DictSupplementaryFileContainer]:
19+
def load_directory(
20+
directory: Union[Path, str],
21+
) -> tuple[DictIdentifiableStore, DictSupplementaryFileContainer]:
2022
"""
2123
Create a new :class:`~basyx.aas.model.provider.DictIdentifiableStore` and use it to load Asset Administration Shell
2224
and Submodel files in ``AASX``, ``JSON`` and ``XML`` format from a given directory into memory. Additionally, load
@@ -46,6 +48,8 @@ def load_directory(directory: Union[Path, str]) -> tuple[DictIdentifiableStore,
4648
read_aas_xml_file_into(dict_identifiable_store, f)
4749
elif suffix == ".aasx":
4850
with AASXReader(file) as reader:
49-
reader.read_into(object_store=dict_identifiable_store, file_store=file_container)
51+
reader.read_into(
52+
object_store=dict_identifiable_store, file_store=file_container
53+
)
5054

5155
return dict_identifiable_store, file_container

‎sdk/basyx/aas/adapter/_generic.py‎

Lines changed: 98 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
The dicts defined in this module are used in the json and xml modules to translate enum members of our
99
implementation to the respective string and vice versa.
1010
"""
11+
1112
import os
1213
from typing import BinaryIO, Dict, IO, Type, Union
1314

@@ -21,110 +22,132 @@
2122

2223
# JSON top-level keys and their corresponding model classes
2324
JSON_AAS_TOP_LEVEL_KEYS_TO_TYPES = (
24-
('assetAdministrationShells', model.AssetAdministrationShell),
25-
('submodels', model.Submodel),
26-
('conceptDescriptions', model.ConceptDescription),
25+
("assetAdministrationShells", model.AssetAdministrationShell),
26+
("submodels", model.Submodel),
27+
("conceptDescriptions", model.ConceptDescription),
2728
)
2829

2930
# XML Namespace definition
3031
XML_NS_MAP = {"aas": "https://admin-shell.io/aas/3/1"}
3132
XML_NS_AAS = "{" + XML_NS_MAP["aas"] + "}"
3233

3334
MODELLING_KIND: Dict[model.ModellingKind, str] = {
34-
model.ModellingKind.TEMPLATE: 'Template',
35-
model.ModellingKind.INSTANCE: 'Instance'}
35+
model.ModellingKind.TEMPLATE: "Template",
36+
model.ModellingKind.INSTANCE: "Instance",
37+
}
3638

3739
ASSET_KIND: Dict[model.AssetKind, str] = {
38-
model.AssetKind.TYPE: 'Type',
39-
model.AssetKind.INSTANCE: 'Instance',
40-
model.AssetKind.NOT_APPLICABLE: 'NotApplicable',
41-
model.AssetKind.ROLE: 'Role'}
40+
model.AssetKind.TYPE: "Type",
41+
model.AssetKind.INSTANCE: "Instance",
42+
model.AssetKind.NOT_APPLICABLE: "NotApplicable",
43+
model.AssetKind.ROLE: "Role",
44+
}
4245

4346
QUALIFIER_KIND: Dict[model.QualifierKind, str] = {
44-
model.QualifierKind.CONCEPT_QUALIFIER: 'ConceptQualifier',
45-
model.QualifierKind.TEMPLATE_QUALIFIER: 'TemplateQualifier',
46-
model.QualifierKind.VALUE_QUALIFIER: 'ValueQualifier'}
47+
model.QualifierKind.CONCEPT_QUALIFIER: "ConceptQualifier",
48+
model.QualifierKind.TEMPLATE_QUALIFIER: "TemplateQualifier",
49+
model.QualifierKind.VALUE_QUALIFIER: "ValueQualifier",
50+
}
4751

4852
DIRECTION: Dict[model.Direction, str] = {
49-
model.Direction.INPUT: 'input',
50-
model.Direction.OUTPUT: 'output'}
53+
model.Direction.INPUT: "input",
54+
model.Direction.OUTPUT: "output",
55+
}
5156

5257
STATE_OF_EVENT: Dict[model.StateOfEvent, str] = {
53-
model.StateOfEvent.ON: 'on',
54-
model.StateOfEvent.OFF: 'off'}
58+
model.StateOfEvent.ON: "on",
59+
model.StateOfEvent.OFF: "off",
60+
}
5561

5662
REFERENCE_TYPES: Dict[Type[model.Reference], str] = {
57-
model.ExternalReference: 'ExternalReference',
58-
model.ModelReference: 'ModelReference'}
63+
model.ExternalReference: "ExternalReference",
64+
model.ModelReference: "ModelReference",
65+
}
5966

6067
KEY_TYPES: Dict[model.KeyTypes, str] = {
61-
model.KeyTypes.ASSET_ADMINISTRATION_SHELL: 'AssetAdministrationShell',
62-
model.KeyTypes.CONCEPT_DESCRIPTION: 'ConceptDescription',
63-
model.KeyTypes.SUBMODEL: 'Submodel',
64-
model.KeyTypes.ANNOTATED_RELATIONSHIP_ELEMENT: 'AnnotatedRelationshipElement',
65-
model.KeyTypes.BASIC_EVENT_ELEMENT: 'BasicEventElement',
66-
model.KeyTypes.BLOB: 'Blob',
67-
model.KeyTypes.CAPABILITY: 'Capability',
68-
model.KeyTypes.DATA_ELEMENT: 'DataElement',
69-
model.KeyTypes.ENTITY: 'Entity',
70-
model.KeyTypes.EVENT_ELEMENT: 'EventElement',
71-
model.KeyTypes.FILE: 'File',
72-
model.KeyTypes.MULTI_LANGUAGE_PROPERTY: 'MultiLanguageProperty',
73-
model.KeyTypes.OPERATION: 'Operation',
74-
model.KeyTypes.PROPERTY: 'Property',
75-
model.KeyTypes.RANGE: 'Range',
76-
model.KeyTypes.REFERENCE_ELEMENT: 'ReferenceElement',
77-
model.KeyTypes.RELATIONSHIP_ELEMENT: 'RelationshipElement',
78-
model.KeyTypes.SUBMODEL_ELEMENT: 'SubmodelElement',
79-
model.KeyTypes.SUBMODEL_ELEMENT_COLLECTION: 'SubmodelElementCollection',
80-
model.KeyTypes.SUBMODEL_ELEMENT_LIST: 'SubmodelElementList',
81-
model.KeyTypes.GLOBAL_REFERENCE: 'GlobalReference',
82-
model.KeyTypes.FRAGMENT_REFERENCE: 'FragmentReference'}
68+
model.KeyTypes.ASSET_ADMINISTRATION_SHELL: "AssetAdministrationShell",
69+
model.KeyTypes.CONCEPT_DESCRIPTION: "ConceptDescription",
70+
model.KeyTypes.SUBMODEL: "Submodel",
71+
model.KeyTypes.ANNOTATED_RELATIONSHIP_ELEMENT: "AnnotatedRelationshipElement",
72+
model.KeyTypes.BASIC_EVENT_ELEMENT: "BasicEventElement",
73+
model.KeyTypes.BLOB: "Blob",
74+
model.KeyTypes.CAPABILITY: "Capability",
75+
model.KeyTypes.DATA_ELEMENT: "DataElement",
76+
model.KeyTypes.ENTITY: "Entity",
77+
model.KeyTypes.EVENT_ELEMENT: "EventElement",
78+
model.KeyTypes.FILE: "File",
79+
model.KeyTypes.MULTI_LANGUAGE_PROPERTY: "MultiLanguageProperty",
80+
model.KeyTypes.OPERATION: "Operation",
81+
model.KeyTypes.PROPERTY: "Property",
82+
model.KeyTypes.RANGE: "Range",
83+
model.KeyTypes.REFERENCE_ELEMENT: "ReferenceElement",
84+
model.KeyTypes.RELATIONSHIP_ELEMENT: "RelationshipElement",
85+
model.KeyTypes.SUBMODEL_ELEMENT: "SubmodelElement",
86+
model.KeyTypes.SUBMODEL_ELEMENT_COLLECTION: "SubmodelElementCollection",
87+
model.KeyTypes.SUBMODEL_ELEMENT_LIST: "SubmodelElementList",
88+
model.KeyTypes.GLOBAL_REFERENCE: "GlobalReference",
89+
model.KeyTypes.FRAGMENT_REFERENCE: "FragmentReference",
90+
}
8391

8492
ENTITY_TYPES: Dict[model.EntityType, str] = {
85-
model.EntityType.CO_MANAGED_ENTITY: 'CoManagedEntity',
86-
model.EntityType.SELF_MANAGED_ENTITY: 'SelfManagedEntity'}
93+
model.EntityType.CO_MANAGED_ENTITY: "CoManagedEntity",
94+
model.EntityType.SELF_MANAGED_ENTITY: "SelfManagedEntity",
95+
}
8796

8897
IEC61360_DATA_TYPES: Dict[model.base.DataTypeIEC61360, str] = {
89-
model.base.DataTypeIEC61360.DATE: 'DATE',
90-
model.base.DataTypeIEC61360.STRING: 'STRING',
91-
model.base.DataTypeIEC61360.STRING_TRANSLATABLE: 'STRING_TRANSLATABLE',
92-
model.base.DataTypeIEC61360.INTEGER_MEASURE: 'INTEGER_MEASURE',
93-
model.base.DataTypeIEC61360.INTEGER_COUNT: 'INTEGER_COUNT',
94-
model.base.DataTypeIEC61360.INTEGER_CURRENCY: 'INTEGER_CURRENCY',
95-
model.base.DataTypeIEC61360.REAL_MEASURE: 'REAL_MEASURE',
96-
model.base.DataTypeIEC61360.REAL_COUNT: 'REAL_COUNT',
97-
model.base.DataTypeIEC61360.REAL_CURRENCY: 'REAL_CURRENCY',
98-
model.base.DataTypeIEC61360.BOOLEAN: 'BOOLEAN',
99-
model.base.DataTypeIEC61360.IRI: 'IRI',
100-
model.base.DataTypeIEC61360.IRDI: 'IRDI',
101-
model.base.DataTypeIEC61360.RATIONAL: 'RATIONAL',
102-
model.base.DataTypeIEC61360.RATIONAL_MEASURE: 'RATIONAL_MEASURE',
103-
model.base.DataTypeIEC61360.TIME: 'TIME',
104-
model.base.DataTypeIEC61360.TIMESTAMP: 'TIMESTAMP',
105-
model.base.DataTypeIEC61360.HTML: 'HTML',
106-
model.base.DataTypeIEC61360.BLOB: 'BLOB',
107-
model.base.DataTypeIEC61360.FILE: 'FILE',
98+
model.base.DataTypeIEC61360.DATE: "DATE",
99+
model.base.DataTypeIEC61360.STRING: "STRING",
100+
model.base.DataTypeIEC61360.STRING_TRANSLATABLE: "STRING_TRANSLATABLE",
101+
model.base.DataTypeIEC61360.INTEGER_MEASURE: "INTEGER_MEASURE",
102+
model.base.DataTypeIEC61360.INTEGER_COUNT: "INTEGER_COUNT",
103+
model.base.DataTypeIEC61360.INTEGER_CURRENCY: "INTEGER_CURRENCY",
104+
model.base.DataTypeIEC61360.REAL_MEASURE: "REAL_MEASURE",
105+
model.base.DataTypeIEC61360.REAL_COUNT: "REAL_COUNT",
106+
model.base.DataTypeIEC61360.REAL_CURRENCY: "REAL_CURRENCY",
107+
model.base.DataTypeIEC61360.BOOLEAN: "BOOLEAN",
108+
model.base.DataTypeIEC61360.IRI: "IRI",
109+
model.base.DataTypeIEC61360.IRDI: "IRDI",
110+
model.base.DataTypeIEC61360.RATIONAL: "RATIONAL",
111+
model.base.DataTypeIEC61360.RATIONAL_MEASURE: "RATIONAL_MEASURE",
112+
model.base.DataTypeIEC61360.TIME: "TIME",
113+
model.base.DataTypeIEC61360.TIMESTAMP: "TIMESTAMP",
114+
model.base.DataTypeIEC61360.HTML: "HTML",
115+
model.base.DataTypeIEC61360.BLOB: "BLOB",
116+
model.base.DataTypeIEC61360.FILE: "FILE",
108117
}
109118

110119
IEC61360_LEVEL_TYPES: Dict[model.base.IEC61360LevelType, str] = {
111-
model.base.IEC61360LevelType.MIN: 'min',
112-
model.base.IEC61360LevelType.NOM: 'nom',
113-
model.base.IEC61360LevelType.TYP: 'typ',
114-
model.base.IEC61360LevelType.MAX: 'max',
120+
model.base.IEC61360LevelType.MIN: "min",
121+
model.base.IEC61360LevelType.NOM: "nom",
122+
model.base.IEC61360LevelType.TYP: "typ",
123+
model.base.IEC61360LevelType.MAX: "max",
115124
}
116125

117-
MODELLING_KIND_INVERSE: Dict[str, model.ModellingKind] = {v: k for k, v in MODELLING_KIND.items()}
126+
MODELLING_KIND_INVERSE: Dict[str, model.ModellingKind] = {
127+
v: k for k, v in MODELLING_KIND.items()
128+
}
118129
ASSET_KIND_INVERSE: Dict[str, model.AssetKind] = {v: k for k, v in ASSET_KIND.items()}
119-
QUALIFIER_KIND_INVERSE: Dict[str, model.QualifierKind] = {v: k for k, v in QUALIFIER_KIND.items()}
130+
QUALIFIER_KIND_INVERSE: Dict[str, model.QualifierKind] = {
131+
v: k for k, v in QUALIFIER_KIND.items()
132+
}
120133
DIRECTION_INVERSE: Dict[str, model.Direction] = {v: k for k, v in DIRECTION.items()}
121-
STATE_OF_EVENT_INVERSE: Dict[str, model.StateOfEvent] = {v: k for k, v in STATE_OF_EVENT.items()}
122-
REFERENCE_TYPES_INVERSE: Dict[str, Type[model.Reference]] = {v: k for k, v in REFERENCE_TYPES.items()}
134+
STATE_OF_EVENT_INVERSE: Dict[str, model.StateOfEvent] = {
135+
v: k for k, v in STATE_OF_EVENT.items()
136+
}
137+
REFERENCE_TYPES_INVERSE: Dict[str, Type[model.Reference]] = {
138+
v: k for k, v in REFERENCE_TYPES.items()
139+
}
123140
KEY_TYPES_INVERSE: Dict[str, model.KeyTypes] = {v: k for k, v in KEY_TYPES.items()}
124-
ENTITY_TYPES_INVERSE: Dict[str, model.EntityType] = {v: k for k, v in ENTITY_TYPES.items()}
125-
IEC61360_DATA_TYPES_INVERSE: Dict[str, model.base.DataTypeIEC61360] = {v: k for k, v in IEC61360_DATA_TYPES.items()}
126-
IEC61360_LEVEL_TYPES_INVERSE: Dict[str, model.base.IEC61360LevelType] = \
127-
{v: k for k, v in IEC61360_LEVEL_TYPES.items()}
141+
ENTITY_TYPES_INVERSE: Dict[str, model.EntityType] = {
142+
v: k for k, v in ENTITY_TYPES.items()
143+
}
144+
IEC61360_DATA_TYPES_INVERSE: Dict[str, model.base.DataTypeIEC61360] = {
145+
v: k for k, v in IEC61360_DATA_TYPES.items()
146+
}
147+
IEC61360_LEVEL_TYPES_INVERSE: Dict[str, model.base.IEC61360LevelType] = {
148+
v: k for k, v in IEC61360_LEVEL_TYPES.items()
149+
}
128150

129-
KEY_TYPES_CLASSES_INVERSE: Dict[model.KeyTypes, Type[model.Referable]] = \
130-
{v: k for k, v in model.KEY_TYPES_CLASSES.items()}
151+
KEY_TYPES_CLASSES_INVERSE: Dict[model.KeyTypes, Type[model.Referable]] = {
152+
v: k for k, v in model.KEY_TYPES_CLASSES.items()
153+
}

0 commit comments

Comments
 (0)