Update Registry after test

Author: Ornella33

server/app/adapter/__init__.py

@@ -0,0 +1 @@
+from .jsonization import *

server/app/interfaces/__init__.py

@@ -0,0 +1,4 @@
+from .base import *
+from .registry import *
+from .discovery import *
+from .repository import *

server/app/interfaces/base.py

@@ -20,16 +20,20 @@
 from werkzeug.exceptions import NotFound, BadRequest
 from werkzeug.routing import MapAdapter
 
+import app.model
 from basyx.aas import model
 from basyx.aas.adapter._generic import XML_NS_MAP
-from basyx.aas.adapter.json import StrictStrippedAASFromJsonDecoder, StrictAASFromJsonDecoder, AASToJsonEncoder
+from app.adapter import ServerStrictStrippedAASFromJsonDecoder, ServerStrictAASFromJsonDecoder, ServerAASToJsonEncoder
 from basyx.aas.adapter.xml import xml_serialization, XMLConstructables, read_aas_xml_element
 from basyx.aas.model import AbstractObjectStore
 from app.util.converters import base64url_decode
+from app.model import AssetLink, AssetAdministrationShellDescriptor, SubmodelDescriptor
+from app.model.provider import _DESCRIPTOR_TYPE
 
 
-T = TypeVar("T")
 
+T = TypeVar("T")
+_STORABLE = TypeVar("_STORABLE", model.provider._IDENTIFIABLE, _DESCRIPTOR_TYPE)
 
 @enum.unique
 class MessageType(enum.Enum):
@@ -159,7 +163,7 @@ def __init__(self, *args, content_type="text/xml", **kwargs):
         super().__init__(*args, **kwargs, content_type=content_type)
 
 
-class ResultToJsonEncoder(AASToJsonEncoder):
+class ResultToJsonEncoder(ServerAASToJsonEncoder):
     @classmethod
     def _result_to_json(cls, result: Result) -> Dict[str, object]:
         return {
@@ -264,13 +268,13 @@ def http_exception_to_response(exception: werkzeug.exceptions.HTTPException, res
 class ObjectStoreWSGIApp(BaseWSGIApp):
     object_store: AbstractObjectStore
 
-    def _get_all_obj_of_type(self, type_: Type[T]) -> Iterator[T]:
+    def _get_all_obj_of_type(self, type_: Type[_STORABLE]) -> Iterator[_STORABLE]:
         for obj in self.object_store:
             if isinstance(obj, type_):
                 yield obj
 
-    def _get_obj_ts(self, identifier: model.Identifier, type_: Type[T]) \
-            -> T:
+    def _get_obj_ts(self, identifier: model.Identifier, type_: Type[_STORABLE]) \
+            -> _STORABLE:
         identifiable = self.object_store.get(identifier)
         if not isinstance(identifiable, type_):
             raise NotFound(f"No {type_.__name__} with {identifier} found!")
@@ -292,7 +296,12 @@ class HTTPApiDecoder:
 
     @classmethod
     def check_type_support(cls, type_: type):
-        if type_ not in cls.type_constructables_map:
+        tolerated_types = (
+            AssetAdministrationShellDescriptor,
+            SubmodelDescriptor,
+            AssetLink,
+        )
+        if type_ not in cls.type_constructables_map and type_ not in tolerated_types:
             raise TypeError(f"Parsing {type_} is not supported!")
 
     @classmethod
@@ -304,8 +313,8 @@ def assert_type(cls, obj: object, type_: Type[T]) -> T:
     @classmethod
     def json_list(cls, data: Union[str, bytes], expect_type: Type[T], stripped: bool, expect_single: bool) -> List[T]:
         cls.check_type_support(expect_type)
-        decoder: Type[StrictAASFromJsonDecoder] = StrictStrippedAASFromJsonDecoder if stripped \
-            else StrictAASFromJsonDecoder
+        decoder: Type[ServerStrictAASFromJsonDecoder] = ServerStrictStrippedAASFromJsonDecoder if stripped \
+            else ServerStrictAASFromJsonDecoder
         try:
             parsed = json.loads(data, cls=decoder)
             if isinstance(parsed, list) and expect_single:
@@ -324,6 +333,9 @@ def json_list(cls, data: Union[str, bytes], expect_type: Type[T], stripped: bool
                 model.SpecificAssetId: decoder._construct_specific_asset_id,
                 model.Reference: decoder._construct_reference,
                 model.Qualifier: decoder._construct_qualifier,
+                app.model.AssetAdministrationShellDescriptor: decoder._construct_asset_administration_shell_descriptor,
+                app.model.SubmodelDescriptor: decoder._construct_submodel_descriptor,
+                app.model.AssetLink: decoder._construct_asset_link,
             }
 
             constructor: Optional[Callable[..., T]] = mapping.get(expect_type)  # type: ignore[assignment]

server/app/interfaces/registry.py

@@ -139,12 +139,21 @@ def get_aas_descriptor_by_id(self, request: Request, url_args: Dict, response_t:
         return response_t(descriptor)
 
     def put_aas_descriptor_by_id(self, request: Request, url_args: Dict, response_t: Type[APIResponse],
-                                 **_kwargs) -> Response:
-        descriptor = self._get_aas_descriptor(url_args)
-        descriptor.update_from(HTTPApiDecoder.request_body(request, server_model.AssetAdministrationShellDescriptor,
-                                                           is_stripped_request(request)))
-        descriptor.commit()
-        return response_t()
+                                 map_adapter: MapAdapter, **_kwargs) -> Response:
+        try:
+            descriptor = self._get_aas_descriptor(url_args)
+            descriptor.update_from(HTTPApiDecoder.request_body(request, server_model.AssetAdministrationShellDescriptor,
+                                                               is_stripped_request(request)))
+            descriptor.commit()
+            return response_t()
+        except NotFound:
+            descriptor = HTTPApiDecoder.request_body(request, server_model.AssetAdministrationShellDescriptor, False)
+            self.object_store.add(descriptor)
+            descriptor.commit()
+            created_resource_url = map_adapter.build(self.get_aas_descriptor_by_id, {
+                "aas_id": descriptor.id
+            }, force_external=True)
+            return response_t(descriptor, status=201, headers={"Location": created_resource_url})
 
     def delete_aas_descriptor_by_id(self, request: Request, url_args: Dict, response_t: Type[APIResponse],
                                     **_kwargs) -> Response:
@@ -211,21 +220,36 @@ def put_submodel_descriptor_by_id_through_superpath(self,
                                                         response_t:
                                                         Type[
                                                             APIResponse],
-                                                        **_kwargs) -> Response:
+                                                        map_adapter: MapAdapter, **_kwargs) -> Response:
         aas_descriptor = self._get_aas_descriptor(url_args)
-        submodel_id = url_args["submodel_id"]
-        submodel_descriptor = next(
-            (sd for sd in aas_descriptor.submodel_descriptors if
-             sd.id == submodel_id), None)
-        if submodel_descriptor is None:
-            raise NotFound(
-                f"Submodel Descriptor with Identifier {submodel_id} not found in AssetAdministrationShell!")
-        submodel_descriptor.update_from(
-            HTTPApiDecoder.request_body(request,
-                                        server_model.SubmodelDescriptor,
-                                        is_stripped_request(request)))
-        aas_descriptor.commit()
-        return response_t()
+        try:
+            submodel_id = url_args["submodel_id"]
+            submodel_descriptor = next(
+                (sd for sd in aas_descriptor.submodel_descriptors if
+                 sd.id == submodel_id), None)
+            if submodel_descriptor is None:
+                raise NotFound(
+                    f"Submodel Descriptor with Identifier {submodel_id} not found in AssetAdministrationShell!")
+            submodel_descriptor.update_from(
+                HTTPApiDecoder.request_body(request,
+                                            server_model.SubmodelDescriptor,
+                                            is_stripped_request(request)))
+            aas_descriptor.commit()
+            return response_t()
+        except NotFound:
+            submodel_descriptor = HTTPApiDecoder.request_body(request,
+                                                              server_model.SubmodelDescriptor,
+                                                              is_stripped_request(
+                                                                  request))
+            aas_descriptor.submodel_descriptors.append(submodel_descriptor)
+            aas_descriptor.commit()
+            created_resource_url = map_adapter.build(
+                self.get_submodel_descriptor_by_id_through_superpath, {
+                    "aas_id": aas_descriptor.id,
+                    "submodel_id": submodel_descriptor.id
+                }, force_external=True)
+            return response_t(submodel_descriptor, status=201,
+                              headers={"Location": created_resource_url})
 
     def delete_submodel_descriptor_by_id_through_superpath(self,
                                                            request: Request,
@@ -270,12 +294,22 @@ def post_submodel_descriptor(self, request: Request, url_args: Dict, response_t:
         return response_t(submodel_descriptor, status=201, headers={"Location": created_resource_url})
 
     def put_submodel_descriptor_by_id(self, request: Request, url_args: Dict, response_t: Type[APIResponse],
-                                      **_kwargs) -> Response:
-        submodel_descriptor = self._get_submodel_descriptor(url_args)
-        submodel_descriptor.update_from(
-            HTTPApiDecoder.request_body(request, server_model.SubmodelDescriptor, is_stripped_request(request)))
-        submodel_descriptor.commit()
-        return response_t()
+                                      map_adapter: MapAdapter, **_kwargs) -> Response:
+        try:
+            submodel_descriptor = self._get_submodel_descriptor(url_args)
+            submodel_descriptor.update_from(
+                HTTPApiDecoder.request_body(request, server_model.SubmodelDescriptor, is_stripped_request(request)))
+            submodel_descriptor.commit()
+            return response_t()
+        except NotFound:
+            submodel_descriptor = HTTPApiDecoder.request_body(request, server_model.SubmodelDescriptor,
+                                                              is_stripped_request(request))
+            self.object_store.add(submodel_descriptor)
+            submodel_descriptor.commit()
+            created_resource_url = map_adapter.build(self.get_submodel_descriptor_by_id, {
+                "submodel_id": submodel_descriptor.id
+            }, force_external=True)
+            return response_t(submodel_descriptor, status=201, headers={"Location": created_resource_url})
 
     def delete_submodel_descriptor_by_id(self, request: Request, url_args: Dict, response_t: Type[APIResponse],
                                          **_kwargs) -> Response:

server/app/model/provider.py

@@ -2,8 +2,13 @@
 
 from basyx.aas import model
 from basyx.aas.model import provider as sdk_provider
+from pathlib import Path
+from typing import Dict, IO,  Iterable
 
 from app.model import descriptor
+from app.adapter import read_server_aas_json_file_into
+
+PathOrIO = Union[Path, IO]
 
 
 _DESCRIPTOR_TYPE = Union[descriptor.AssetAdministrationShellDescriptor, descriptor.SubmodelDescriptor]
@@ -46,3 +51,30 @@ def __len__(self) -> int:
 
     def __iter__(self) -> Iterator[_DESCRIPTOR_TYPE]:
         return iter(self._backend.values())
+
+def load_directory(directory: Union[Path, str]) -> DictDescriptorStore:
+    """
+    Create a new :class:`~basyx.aas.model.provider.DictIdentifiableStore` and use it to load Asset Administration Shell
+    and Submodel files in ``AASX``, ``JSON`` and ``XML`` format from a given directory into memory. Additionally, load
+    all embedded supplementary files into a new :class:`~basyx.aas.adapter.aasx.DictSupplementaryFileContainer`.
+
+    :param directory: :class:`~pathlib.Path` or ``str`` pointing to the directory containing all Asset Administration
+        Shell and Submodel files to load
+    :return: Tuple consisting of a :class:`~basyx.aas.model.provider.DictIdentifiableStore` and a
+        :class:`~basyx.aas.adapter.aasx.DictSupplementaryFileContainer` containing all loaded data
+    """
+
+    dict_descriptor_store: DictDescriptorStore = DictDescriptorStore()
+
+    directory = Path(directory)
+
+    for file in directory.iterdir():
+        if not file.is_file():
+            continue
+
+        suffix = file.suffix.lower()
+        if suffix == ".json":
+            with open(file) as f:
+                read_server_aas_json_file_into(dict_descriptor_store, f)
+
+    return dict_descriptor_store

server/app/model/service_specification.py

@@ -2,10 +2,10 @@
 from enum import Enum
 
 class ServiceSpecificationProfileEnum(str, Enum):
-    AAS_REGISTRY_FULL = "https://adminshell.io/aas/API/3/0/AssetAdministrationShellRegistryServiceSpecification/SSP-001"
-    AAS_REGISTRY_READ = "https://adminshell.io/aas/API/3/0/AssetAdministrationShellRegistryServiceSpecification/SSP-002"
-    SUBMODEL_REGISTRY_FULL = "https://adminshell.io/aas/API/3/0/SubmodelRegistryServiceSpecification/SSP-001"
-    SUBMODEL_REGISTRY_READ = "https://adminshell.io/aas/API/3/0/SubmodelRegistryServiceSpecification/SSP-002"
+    AAS_REGISTRY_FULL = "https://adminshell.io/aas/API/3/1/AssetAdministrationShellRegistryServiceSpecification/SSP-001"
+    AAS_REGISTRY_READ = "https://adminshell.io/aas/API/3/1/AssetAdministrationShellRegistryServiceSpecification/SSP-002"
+    SUBMODEL_REGISTRY_FULL = "https://adminshell.io/aas/API/3/1/SubmodelRegistryServiceSpecification/SSP-001"
+    SUBMODEL_REGISTRY_READ = "https://adminshell.io/aas/API/3/1/SubmodelRegistryServiceSpecification/SSP-002"
     #TODO add other profiles