PyI40AAS merge requestshttps://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests2020-05-18T14:34:41+02:00https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/37Rework tutorials to be more comprehensible and better structured2020-05-18T14:34:41+02:00Michael ThiesRework tutorials to be more comprehensible and better structuredThis MR is based on !35, as it uses the improved tests for tutorials, which were introduced in that MR.This MR is based on !35, as it uses the improved tests for tutorials, which were introduced in that MR.https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/36Fix/improve ignored files2020-05-15T17:15:23+02:00Michael ThiesFix/improve ignored filesSome minor improvements to `.gitignore` and `test/test_config.default.ini`.Some minor improvements to `.gitignore` and `test/test_config.default.ini`.https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/35Feature/tutorial dynamic model2020-05-18T14:30:32+02:00Michael ThiesFeature/tutorial dynamic modelThis MR creates a new tutorial in the `aas/examples` directory, which shows how to create custom subclasses of AAS model classes to create DataElements which dynamically update their values from a custom data source.
Fixes #55This MR creates a new tutorial in the `aas/examples` directory, which shows how to create custom subclasses of AAS model classes to create DataElements which dynamically update their values from a custom data source.
Fixes #55https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/34Fix/adapter.xml schema version 2.0.12020-05-28T11:58:08+02:00Sebastian Heppners.heppner@iat.rwth-aachen.deFix/adapter.xml schema version 2.0.1Fixes for the xml-adapter for the new version of the schema (v2.0.1)Fixes for the xml-adapter for the new version of the schema (v2.0.1)https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/33compliance_tool: update readme2020-05-19T12:33:45+02:00Torben Minycompliance_tool: update readmeUpdate readme to fix #70Update readme to fix #70https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/32Feature/compliance tool xml extension2020-04-30T11:03:33+02:00Torben MinyFeature/compliance tool xml extensionAdding xml functionalities to compliance tool
Fixes #67
Fixes #71Adding xml functionalities to compliance tool
Fixes #67
Fixes #71https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/31fix/xml adapter for current external schema2020-04-29T18:20:34+02:00Sebastian Heppners.heppner@iat.rwth-aachen.defix/xml adapter for current external schemaFixes for compliance to the current external schemaFixes for compliance to the current external schemahttps://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/30adapter.xml: change for current schema2020-04-24T15:00:48+02:00Leon Mauritz Mölleradapter.xml: change for current schemaThis MR changes the XML serialization and deserialization to write and read XML documents not based on our local schema.
Once our suggestions get accepted, we can revert this MR.
See #56 #57This MR changes the XML serialization and deserialization to write and read XML documents not based on our local schema.
Once our suggestions get accepted, we can revert this MR.
See #56 #57https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/29Feature/updatable classes2020-05-05T16:08:25+02:00Sebastian Heppners.heppner@iat.rwth-aachen.deFeature/updatable classesAlpha Release 0.1.0https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/28update/improve module docstrings + add copyright notices2020-04-21T19:26:15+02:00Leon Mauritz Möllerupdate/improve module docstrings + add copyright noticesThis MR improves the docstring of `aas.adapter._generic` and updates the docstring of `aas.model.aas`.
The docstring of `aas.adapter._generic` is still quite short, but I think it contains all information that is necessary to understand...This MR improves the docstring of `aas.adapter._generic` and updates the docstring of `aas.model.aas`.
The docstring of `aas.adapter._generic` is still quite short, but I think it contains all information that is necessary to understand what the module does / what its use is.
So this closes issues #61 and #62.
Additionally this MR adds missing copyright notices to:
- `aas.adapter._generic`
- `aas.model.concept`
- `test._helper.setup_testdb`https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/27aas.examples: create formulas2020-04-20T09:17:53+02:00Leon Mauritz Mölleraas.examples: create formulascheck formulas for equality in data checker
close #66check formulas for equality in data checker
close #66https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/26adapter: specify type of objects in DictObjectStore for xml/json deserialize ...2020-04-20T09:09:57+02:00Leon Mauritz Mölleradapter: specify type of objects in DictObjectStore for xml/json deserialize functionsPreviously mypy would not know the type of the objects in the
`DictObjectStore`, which would result in mypy infering `Any` and not
checking whether attributes exist for objects in the object store.Previously mypy would not know the type of the objects in the
`DictObjectStore`, which would result in mypy infering `Any` and not
checking whether attributes exist for objects in the object store.https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/25test: Fix occasional test failures due to rounding error in test_aasx2020-04-20T09:18:37+02:00Michael Thiestest: Fix occasional test failures due to rounding error in test_aasxFixes #64Fixes #64https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/24adapter: add xml deserialization2020-04-17T17:14:10+02:00Leon Mauritz Mölleradapter: add xml deserializationThis MR merges `feature/xml_deserilization` into `master`. It comes with deserialization tests and serialize + deserialize tests, just like the json module.
There's just one thing left to discuss, the problem I also mentioned in yeste...This MR merges `feature/xml_deserilization` into `master`. It comes with deserialization tests and serialize + deserialize tests, just like the json module.
There's just one thing left to discuss, the problem I also mentioned in yesterday's meeting:
I'm using a `TypedDict` to pass the modeling kind of submodels and submodel elements to the respective constructor only when it's specified in the xml document, see [_get_modeling_kind_kwarg()](https://git.rwth-aachen.de/acplt/pyaas/-/blob/f8286e1f95b3b0635aac73597265c95474308d8e/aas/adapter/xml/xml_deserialization.py#L431).
I'm doing it this way because in my opinion defining the default modeling kind should be a task of the respective model constructors, not of the deserialization, since the default value is also only defined in the model part of `Details of the Asset Administration Shell Part 1` (see chapter 4.7.2.3), not in the serialization/deserialization part.
The problem is, that I'm importing `TypedDict` from `mypy_extensions`, because it's only available from `typing` in python 3.8+. `mypy` is not a runtime dependency, thus I can't use `mypy_extensions` in code that is not for testing only.
An alternative would be to also just define the default modeling kind in the `xml_deserialization`, just like the `json_deserialization` does.
I'd like to hear your opinion on this, maybe you can come up with other alternatives.
The rest of this merge request is ready for code review btw.https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/23adapter: re-publish reader/writer functions2020-04-14T15:03:51+02:00Leon Mauritz Mölleradapter: re-publish reader/writer functionsRe-publish reader/writer functions and relevant classes from adapter.json and adapter.xml modules.
Rename read_json_aas_file to read_aas_json_file.
Change json and xml module imports accordingly.
Close #65Re-publish reader/writer functions and relevant classes from adapter.json and adapter.xml modules.
Rename read_json_aas_file to read_aas_json_file.
Change json and xml module imports accordingly.
Close #65https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/22json: update to schema 2.0.12020-04-09T15:58:23+02:00Torben Minyjson: update to schema 2.0.1https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/21adapter.xml: fix xml_serialization2020-04-09T14:42:59+02:00Leon Mauritz Mölleradapter.xml: fix xml_serializationThe change to range_to_xml() was made because it would previously not
serialize values for min/max that were 0.
According to chapter 4.8.2 of "Details of the Asset Administration Shell"
the DataSpecificationIEC61360 template should be r...The change to range_to_xml() was made because it would previously not
serialize values for min/max that were 0.
According to chapter 4.8.2 of "Details of the Asset Administration Shell"
the DataSpecificationIEC61360 template should be referenced in
embedded data specifications. Thus concept_description_to_xml() was
changed accordingly.https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/20set correct copyright year for all files2020-04-17T17:16:06+02:00Leon Mauritz Möllerset correct copyright year for all filesThis MR sets the correct copyright year (i.e. the year each file was last changed in) for all files.This MR sets the correct copyright year (i.e. the year each file was last changed in) for all files.https://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/19Improve/fix JSON deserialization2020-03-25T16:40:16+01:00Leon Mauritz MöllerImprove/fix JSON deserializationThis merge request moves the inverse dicts from the JSON deserialization to `_generic.py`, since they are used in the XML deserializaton as well.
It also makes `_construct_reference()` return its `object_class` parameter, as mentioned o...This merge request moves the inverse dicts from the JSON deserialization to `_generic.py`, since they are used in the XML deserializaton as well.
It also makes `_construct_reference()` return its `object_class` parameter, as mentioned on zulip nearly two months ago. :'Dhttps://git.rwth-aachen.de/acplt/pyi40aas/-/merge_requests/18readme: Fill with content2020-03-25T15:27:12+01:00Michael Thiesreadme: Fill with contentFixes #44.Fixes #44.