Add adapter to write/read AASX packages#9

Open

somsonson wants to merge 474 commits intoeclipse-basyx:mainfrom

rwth-iat:copy_aasx

This pull request is big! We're only showing the most recent 250 commits

Commits on Dec 9, 2024

adapter.http: fixing post submodelelement route

Frosty2500
authored and
somsonson
committed
adapter.http: implement the recommended changes

Frosty2500
authored and
somsonson
committed
adapter.http: implement the new recommended changes

Frosty2500
authored and
somsonson
committed
adapter.http: hardcode `utf-8` for XML serialization

jkhsjdhjs
authored and
somsonson
committed
adapter.http: change `base64url_encode()` function to return `str`

jkhsjdhjs
authored and
somsonson
committed
adapter.http: update AAS submodel refs path

jkhsjdhjs
authored and
somsonson
committed
adapter.http: update AAS submodel refs `DELETE` route

jkhsjdhjs
authored and
somsonson
committed
adapter.http: suffix submodel refs deletion route with a slash

jkhsjdhjs
authored and
somsonson
committed
adapter.http: refactor submodel ref access as separate function

jkhsjdhjs
authored and
somsonson
committed
adapter.http: suffix slashes to all routes

jkhsjdhjs
authored and
somsonson
committed
adapter.http: implement AAS API submodel routes via redirects

jkhsjdhjs
authored and
somsonson
committed
adapter.http: move `asset-information` routes to a submount

jkhsjdhjs
authored and
somsonson
committed
adapter.http: rename `/constraints` routes to `/qualifiers`

jkhsjdhjs
authored and
somsonson
committed
adapter.http: fix `Qualifier` JSON deserialization

jkhsjdhjs
authored and
somsonson
committed
adapter.http: refactor qualifier retrieval/removal

jkhsjdhjs
authored and
somsonson
committed
adapter.http: improve an error mesage

jkhsjdhjs
authored and
somsonson
committed
adapter.http: rename `IdentifierConverter` to `Base64URLConverter`

jkhsjdhjs
authored and
somsonson
committed
adapter.http: add `SpecificAssetId` filtering to `get_aas_all()`

hadijannat
authored and
somsonson
committed
adapter.http: improve `SpecificAssetId` filtering

jkhsjdhjs
authored and
somsonson
committed
adapter.http: refactor AAS retrieval

jkhsjdhjs
authored and
somsonson
committed
adapter.http: remove outdated TODOs

jkhsjdhjs
authored and
somsonson
committed
adapter.http: implement the AAS reference routes

Frosty2500
authored and
somsonson
committed
adapter.http: implement the attachment routes (#33)

Frosty2500
authored and
somsonson
committed
adapter.http: implement the pagination

Frosty2500
authored and
somsonson
committed
adapter.http: fix codestyle errors

Frosty2500
authored and
somsonson
committed
adapter.http: implement recommended changes

Frosty2500
authored and
somsonson
committed
adapter.http: implement new recommended changes

Frosty2500
authored and
somsonson
committed
adapter.http: implement new recommended changes

Frosty2500
authored and
somsonson
committed
adapter.http: change the limit and cursor check

Frosty2500
authored and
somsonson
committed
adapter.http: implement warning for not implemented routes

Frosty2500
authored and
somsonson
committed
adapter.http: remove unnecessary lines

Frosty2500
authored and
somsonson
committed
adapter.http: remove excess blank line

jkhsjdhjs
authored and
somsonson
committed
Extract compliance tool to be its own package

s-heppner
authored and
somsonson
committed
Update Copyright Notices (#224)

s-heppner
authored and
somsonson
committed
adapter.aasx: allow deleting files from `SupplementaryFileContainer`

jkhsjdhjs
authored and
somsonson
committed
adapter.http: allow changing the API base path

jkhsjdhjs
authored and
somsonson
committed
adapter.http: fix a `DeprecationWarning`

jkhsjdhjs
authored and
somsonson
committed
adapter.http: allow retrieving and modifying `File` attachments via API

jkhsjdhjs
authored and
somsonson
committed
adapter.http: remove nonfunctional 'Not Implemented' check

jkhsjdhjs
authored and
somsonson
committed
adapter.xml, test.adapter.xml: add lxml typechecking

jkhsjdhjs
authored and
somsonson
committed
adapter.http: fix `lxml` typing

jkhsjdhjs
authored and
somsonson
committed
adapter.http: improve type hints

jkhsjdhjs
authored and
somsonson
committed
adapter.http: remove unnecessary generator expression

jkhsjdhjs
authored and
somsonson
committed
adapter.http: remove trailing slashes from routes

jkhsjdhjs
authored and
somsonson
committed
adapter.http: add documentation of not implemented features (#52)

Frosty2500
authored and
somsonson
committed
adapter.http: add CD-Repo routes

zrgt
authored and
somsonson
committed
adapter.http: code style fixes

zrgt
authored and
somsonson
committed
adapter.http: Refactor and improve codestyle (#292)

zrgt
authored and
somsonson
committed
sdk/basyx/adapter/: move copied files to desired location
somsonson
committed
sdk/basyx/adapter/: copied and modified the adapter from the basyx-python-sdk. The serialisation is based on the serialisation of aas-core3.0
somsonson
committed
model.adapter: first version of json serialization

TorbenD
authored and
somsonson
committed
adapter: restructuring

TorbenD
authored and
somsonson
committed
test.adapter.json: first test for validation

TorbenD
authored and
somsonson
committed
adapter.json: Clean up test

mhthies
authored and
somsonson
committed
adapter.json: Add first version of json deserialization functionality

mhthies
authored and
somsonson
committed
adapter.json: Add read_json_aas_file()

mhthies
authored and
somsonson
committed
aas.examples: add example for a nearly complete asset administration shell with all its elements

TorbenD
authored and
somsonson
committed
adapter.json: Fix usage of Reference and new AASReference

mhthies
authored and
somsonson
committed
Add license headers to new files

mhthies
authored and
somsonson
committed
test: Add json deserialization to the full example test

mhthies
authored and
somsonson
committed
json.serialization: add write_aas_to_json_file function

TorbenD
authored and
somsonson
committed
adapter.json.json_serialization: add modul docstring

TorbenD
authored and
somsonson
committed
example: add example for creation of a submodel template including test

TorbenD
authored and
somsonson
committed
json: add function to create an example asset administration shell with only mandatory attributes, make semanticId optional

TorbenD
authored and
somsonson
committed
example: add example for testing missing object-attribute-combinations

TorbenD
authored and
somsonson
committed
adapter.json: Rename json_serialization.write_aas_to_json_file, improve docs

mhthies
authored and
somsonson
committed
test: Add more tests for JSON deserialization

mhthies
authored and
somsonson
committed
test: Fix codestyle

mhthies
authored and
somsonson
committed
examples: update docstrings and move example for test to test modul

TorbenD
authored and
somsonson
committed
test.adapter.json: delete not used example

TorbenD
authored and
somsonson
committed
test: Add more expected failure tests for json deserialization

mhthies
authored and
somsonson
committed
model.base: make key of Reference immutable (convert to Tuple) for creating a hash to use __eq__

TorbenD
authored and
somsonson
committed
test: Make JSON schema validating tests optional

mhthies
authored and
somsonson
committed
model: Fix incompliant inheritance of OperationVariable from SubmodelElement

mhthies
authored and
somsonson
committed
test: add tests for examples

TorbenD
authored and
somsonson
committed
adapter.json: Fix missing attributes of AAS and Asset in JSON deserialization

mhthies
authored and
somsonson
committed
adapter.json: Add parameter to deserialization's constructor methods

mhthies
authored and
somsonson
committed
aas.examples, test: restructuring and renaming of packages, modules and functions

TorbenD
authored and
somsonson
committed
test: Prevent aasJSONSchema from being added to git repository

mhthies
authored and
somsonson
committed
Remove unused imports, make imports within the packages relative

mhthies
authored and
somsonson
committed
add test function for example_aas_mandatory_attributes

TorbenD
authored and
somsonson
committed
fixed build error

TorbenD
authored and
somsonson
committed
adapter.couchdb: Add first draft of CouchDB database store

mhthies
authored and
somsonson
committed
adapter.couchdb: Add major parts of functionality and tests

mhthies
authored and
somsonson
committed
test: Add CI test for adapter.couchdb using GitLab CI services

mhthies
authored and
somsonson
committed
adapter.couchdb: Improve documentation and exception handling

mhthies
authored and
somsonson
committed
adapter.couchdb: Add more docstrings, remove TODOs

mhthies
authored and
somsonson
committed
test._helper, adapter.json: add test for example_aas_missing_attributes and fix view deserialisation in json

TorbenD
authored and
somsonson
committed
test, aas: some replacement and renaming of files

TorbenD
authored and
somsonson
committed
test: add test function for example_submodel_template

TorbenD
authored and
somsonson
committed
aas, test: add test function for example concept description

TorbenD
authored and
somsonson
committed
aas, test: restructure of test functions

TorbenD
authored and
somsonson
committed
test.xml: add initial files

s-heppner
authored and
somsonson
committed
test.adapter.xml: add .gitignore file to ignore AAS.xsd

s-heppner
authored and
somsonson
committed
test.adapter.xml: add the other two schemas to the .gitignore

s-heppner
authored and
somsonson
committed
test.adapter.xml: add test_xml_serialization.py

s-heppner
authored and
somsonson
committed
test.adapter.xml: change name of class XMLSerializationSchemaTest

s-heppner
authored and
somsonson
committed
test.adapter.xml: remove json specific comments from serialization test

s-heppner
authored and
somsonson
committed
AASDataChecker: create AASDataChecker for easier testing of examples

TorbenD
authored and
somsonson
committed
fix build error in test of couchDB

TorbenD
authored and
somsonson
committed
AASDataChecker: add check of Value List Elements

TorbenD
authored and
somsonson
committed
DataChecker: fixed check of annotation attribute of AnnotatedRelationshipElements

TorbenD
authored and
somsonson
committed
model: make description to empy dict instead of None

TorbenD
authored and
somsonson
committed
fixed build error

TorbenD
authored and
somsonson
committed
Update example data and tests for native value types

mhthies
authored and
somsonson
committed
examples: integrate check functions into example files

TorbenD
authored and
somsonson
committed
add tests and fixed code errors

TorbenD
authored and
somsonson
committed
add tests and fix code errors

TorbenD
authored and
somsonson
committed
fix commits to #234547

TorbenD
authored and
somsonson
committed
make imports relative if possible #41'

TorbenD
authored and
somsonson
committed
test: add exception tests for test_couchdb.py

TorbenD
authored and
somsonson
committed
examples: add logger for failsafe mode and fixing failsafe mode

TorbenD
authored and
somsonson
committed
update xml_serialization and test with changes that appeared through merge with master

s-heppner
authored and
somsonson
committed
test.adapter.xml: remove resolved todo

s-heppner
authored and
somsonson
committed
test.adapter.xml: update test_functions after parameter change in xml_serialization

s-heppner
authored and
somsonson
committed
test: Add IEC61360ConceptDescription to json/xml serialization tests

mhthies
authored and
somsonson
committed
compliance_tool: add unittests for compliance_tool script

TorbenD
authored and
somsonson
committed
adapter.aasx: Add first draft of AASX reading/writing

mhthies
authored and
somsonson
committed
Add aas.util.traversal

mhthies
authored and
somsonson
committed
test: Add test for AASXReader and AASXWriter, improve coverage report

mhthies
authored and
somsonson
committed
adapter.aasx: Add type annotation to fix mypy type check

mhthies
authored and
somsonson
committed
adapter.aasx: Rework SupplementaryFileContainer to detect equal files, add test

mhthies
authored and
somsonson
committed
json: update to schema 2.0.1

Torben Deppe
authored and
somsonson
committed
adapter: re-publish reader/writer functions

jkhsjdhjs
authored and
somsonson
committed
test: add serialize and deserialize test for xml

jkhsjdhjs
authored and
somsonson
committed
adapter.xml: rename read_xml_aas_file to read_aas_xml_file

jkhsjdhjs
authored and
somsonson
committed
test: add xml_deserialization tests

jkhsjdhjs
authored and
somsonson
committed
adapter: explicitly define INSTANCE as ModelingKind default value

jkhsjdhjs
authored and
somsonson
committed
test.xml: don't access protected property _kind

jkhsjdhjs
authored and
somsonson
committed
set correct copyright year for all files

jkhsjdhjs
authored and
somsonson
committed
adapter: specify type of objects in DictObjectStore

jkhsjdhjs
authored and
somsonson
committed
test: Fix occasional test failures due to rounding error in test_aasx

mhthies
authored and
somsonson
committed
adapter.xml: change for current schema

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: support schema v2.0.1

jkhsjdhjs
authored and
somsonson
committed
compliance_tool: Add xml extension including tests

TorbenD
authored and
somsonson
committed
test.adapter.xml: delete aasXMLSchema*.xsd from gitignore

TorbenD
authored and
somsonson
committed
adapter, cli: add json schema and change path

TorbenD
authored and
somsonson
committed
adapter: Improve path handling of Schema files

mhthies
authored and
somsonson
committed
test: Remove .gitignore files for Schema files

mhthies
authored and
somsonson
committed
test.adapter.test_couchdb: Make tests be skipped

s-heppner
authored and
somsonson
committed
adapter: Remove couchdb and according tests.

s-heppner
authored and
somsonson
committed
adapter.aasx: Allow chosing between XML and JSON serialization when writing AASX packages

mhthies
authored and
somsonson
committed
adapter.xml.xml_deserialization: add read_aas_xml_file_into() function

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: add read_aas_xml_element()

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: make failsafe and stripped class variables

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: change type_ to Referable

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: add read_aas_xml_file_into() function

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: add read_aas_xml_element()

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: make failsafe and stripped class variables

jkhsjdhjs
authored and
somsonson
committed
adapter.xml.xml_deserialization: change type_ to Referable

jkhsjdhjs
authored and
somsonson
committed
adapter.aasx: Add write_aas_objects() method

mhthies
authored and
somsonson
committed
test: Catch zipfile warnings during writing AASX file

mhthies
authored and
somsonson
committed
Fix typo in tests

mhthies
authored and
somsonson
committed
test.adapter.xml: improve xml deserialization tests

jkhsjdhjs
authored and
somsonson
committed
test.adapter.xml.xml_deserialization: make object_class default to EnhancedSubmodel

jkhsjdhjs
authored and
somsonson
committed
test.adapter.json: remove unused imports

jkhsjdhjs
authored and
somsonson
committed
adapter.json.json_deserialization: support deserializing stripped objects

jkhsjdhjs
authored and
somsonson
committed
adapter.json.json_serialization: support serializing stripped objects

jkhsjdhjs
authored and
somsonson
committed
model.aas: remove underscore suffix from parameters submodel_ and security_ of AssetAdministrationShell.__init__

jkhsjdhjs
authored and
somsonson
committed
Update license headers for EPL-2.0 dual-licensing

mhthies
authored and
somsonson
committed
Rebrand project code PyI40AAS → Eclipse BaSyx Python SDK

mhthies
authored and
somsonson
committed
Move Python package aas → basyx.aas

mhthies
authored and
somsonson
committed
tests: Suppress MyPy warnings about TestCase.assertLogs

mhthies
authored and
somsonson
committed
minor codestyle improvements

jkhsjdhjs
authored and
somsonson
committed
Update license headers for MIT license

jkhsjdhjs
authored and
somsonson
committed
add whitespace after assert keyword

jkhsjdhjs
authored and
somsonson
committed
model: prevent creating References without keys

jkhsjdhjs
authored and
somsonson
committed
test.adapter.xml.xml_deserialization: remove unneeded 'type: ignore' comments

jkhsjdhjs
authored and
somsonson
committed
test.adapter.xml.xml_deserialization: make `OperationVariable` tests more explicit

jkhsjdhjs
authored and
somsonson
committed
model, adapter, example: add constraint string not empty, adapt Asset to V30RC01, delete ConceptDictionary, delete key.local, adapt entity.asset

TorbenD
authored and
somsonson
committed
pycodestyle: fixed warnings

TorbenD
authored and
somsonson
committed
test.adapter.xml: fix xml_deserialization tests

jkhsjdhjs
authored and
somsonson
committed
submodel.entity: add typ for self.entity_type, add types for return values of getter and setter of entity_type, add constraint AASd-014

TorbenD
authored and
somsonson
committed
test.adapter.xml.test_xml_deserialization: Add "<aas:kind>Template</aas:kind>" to OperationVariable value (Constraint AASd-008)

s-heppner
authored and
somsonson
committed
test.adapter.json.test_json_serialization: Add categories to DataElements

s-heppner
authored and
somsonson
committed
test.adapter.json.test_json_deserialization: Add category to DataElements

s-heppner
authored and
somsonson
committed
testfiles: add new test files for v3.0RC01 and fix minor error handling entity.specific_asset_id

TorbenD
authored and
somsonson
committed
bugfixes: fixes findings in merge request

TorbenD
authored and
somsonson
committed
model.namespace: create namespaces for unique id_short, semantic_id and type of qualifier including an generic namespaceSet

TorbenD
authored and
somsonson
committed
model.submodelelementcollection: add new types to support attribute allowDuplicates

TorbenD
authored and
somsonson
committed
adapter.aasx: Update AASXWriter.write_aas() to DotAAS v3.0 spec

mhthies
authored and
somsonson
committed
test: Remove outdated AASX test

mhthies
authored and
somsonson
committed
test: fix dysfunctional xml deserialization test

jkhsjdhjs
authored and
somsonson
committed
remove Asset

jkhsjdhjs
authored and
somsonson
committed
remove View

jkhsjdhjs
authored and
somsonson
committed
remove Constraint

jkhsjdhjs
authored and
somsonson
committed
rename Blob/mimeType File/mimeType to /contentType

jkhsjdhjs
authored and
somsonson
committed
rename Identifiable/identification to Identifiable/id

jkhsjdhjs
authored and
somsonson
committed
change type of Identifiable/id to str

jkhsjdhjs
authored and
somsonson
committed
test.adapter.aasx: add whitespace after assert

jkhsjdhjs
authored and
somsonson
committed
model: update SubmodelElementCollection

jkhsjdhjs
authored and
somsonson
committed
add SubmodelElementList

jkhsjdhjs
authored and
somsonson
committed
begin integration of new XML and JSON schemata

jkhsjdhjs
authored and
somsonson
committed
fix some mypy errors

jkhsjdhjs
authored and
somsonson
committed
update implementation and adapters for new DataSpecification classes and schema

jkhsjdhjs
authored and
somsonson
committed
Change type of all occurrences of `AssetInformation.global_asset_id` from `base.ModelReference` to `base.Identifier`

David Niebert
authored and
somsonson
committed
update XML/JSON schemata, adapter and test files for updated `AssetInformation` attribute

jkhsjdhjs
authored and
somsonson
committed
remove wrapping `Identifier()` around strings

jkhsjdhjs
authored and
somsonson
committed
change type of `Entity.global_asset_id` to `Identifier`

jkhsjdhjs
authored and
somsonson
committed
model.base: Rename GlobalReference to ExternalReference

s-heppner
authored and
somsonson
committed
Fix PyCodeStyle

s-heppner
authored and
somsonson
committed
model.base: Rename ModelingKind to ModellingKind (#104)

s-heppner
authored and
somsonson
committed
replace all usages of `LangStringSet` with a `ConstrainedLangStringSet`

jkhsjdhjs
authored and
somsonson
committed
Update compliance tool test files

zrgt
authored and
somsonson
committed
Update test files

zrgt
authored and
somsonson
committed
test.adapter.xml: Reintroduce "# type: ignore" tags that got lost in merge

s-heppner
authored and
somsonson
committed
test.adapter.xml: remove 'type: ignore' comments

jkhsjdhjs
authored and
somsonson
committed
test.adapter.xml: test deserialization without namespace prefixes

jkhsjdhjs
authored and
somsonson
committed
test.adater.xml.test_xml_deserialization: simplify

jkhsjdhjs
authored and
somsonson
committed
test.adapter.json: add `BytesIO` test

jkhsjdhjs
authored and
somsonson
committed
adapter.xml: add function for serializing single objects

jkhsjdhjs
authored and
somsonson
committed
Reintroduce schema files for testing XML and JSON serialization

s-heppner
authored and
somsonson
committed
test: Remove schema files and adapt CI to fetch them

s-heppner
authored and
somsonson
committed
Update Copyright Notices (#224)

s-heppner
authored and
somsonson
committed
adapter.aasx: allow deleting files from `SupplementaryFileContainer`

jkhsjdhjs
authored and
somsonson
committed
adapter.xml, test.adapter.xml: add lxml typechecking

jkhsjdhjs
authored and
somsonson
committed
test_xml_deserialization: Add tests for `_tag_replace_namespace` (#284)

JAB1305
authored and
somsonson
committed
http-api-oas: move to test/adapter/ directory

jkhsjdhjs
authored and
somsonson
committed
http-api-oas: split into aas and submodel interface

jkhsjdhjs
authored and
somsonson
committed
adapter.http: make trailing slashes the default

jkhsjdhjs
authored and
somsonson
committed
http-api-oas: remove PATCH route

jkhsjdhjs
authored and
somsonson
committed
http-api-oas: make result types more accurate

jkhsjdhjs
authored and
somsonson
committed
http-api-oas: add missing 400 responses and fix descriptions

jkhsjdhjs
authored and
somsonson
committed
http-api-oas: add links

jkhsjdhjs
authored and
somsonson
committed
test: add http api tests

jkhsjdhjs
authored and
somsonson
committed
test.adapter.http: update w.r.t. the changes of the last 2 years

jkhsjdhjs
authored and
somsonson
committed
test.adapter.http: ignore the type of an import to make `mypy` happy

jkhsjdhjs
authored and
somsonson
committed
adapter.http: update Werkzeug to 3.x

jkhsjdhjs
authored and
somsonson
committed
test: disable http api tests for now

jkhsjdhjs
authored and
somsonson
committed
adapter.http: improve codestyle

jkhsjdhjs
authored and
somsonson
committed
test.adapter.http: update license header

jkhsjdhjs
authored and
somsonson
committed
adapter.http: allow retrieving and modifying `File` attachments via API

jkhsjdhjs
authored and
somsonson
committed
move copied files from basyx-python-sdk to desired folders
somsonson
committed
sdk/basyx/adapter: modified the adapter from the basy-python-sdk repository to be compatible with aas-core3.0
somsonson
committed
sdk/: Add unittests for aasx.py including various testfiles. Fix codestyle/mypy errors
somsonson
committed
.github/workflows/ci.yml: import lxml-stubs for CI tests sdk/: fix various typing/codestyle errors
somsonson
committed
sdk/basyx/adapter/: redesigned adapter structure to match its use
somsonson
committed
sdk/basyx/adapter/_generic.py: remove unused file
somsonson
committed
move sdk/basyx/aasx.py and fixed various imports
somsonson
committed
sdk/basyx/tutorial/tutorial_create_simple_aas.py: Add verification step

JAB1305
authored and
somsonson
committed
sdk/basyx/tutorial/tutorial_create_simple_aas.py: Add further explanation of return type

JAB1305
authored and
somsonson
committed
sdk/test: added unittest to improve coverage. Modified test folder to match project structure. Simplify some functions of aasx.py
somsonson
committed
Update tutorial_create_simple_aas.py
somsonson
committed
sdk/: Remove unused functions and simplify the code. Resolve PR threads.
somsonson
committed
aasx.py: Rename a few functions and check the docstrings. tutorial_create_simple_aas.py: Implement tutorial comparable to the tutorial in the basyx python sdk
somsonson
committed
sdk/basyx/__init__.py: Import aas-core3 in init file to shortcut its import. sdk/basyx/aasx.py: Include sample codeblock for adapter usage. Update imports in tutorial files
somsonson
committed

Commits on Dec 12, 2024

Commits on Dec 13, 2024

Update sdk/basyx/__init__.py
s-heppner
authored