remove import errors

Author: Ornella33

server/app/adapter/jsonization.py

@@ -1,14 +1,16 @@
-from typing import Dict, Set, Optional, Type
+from typing import Dict, Set, Optional, Type, Callable
+import logging
 
-import server.app.model as server_model
 from basyx.aas import model
 from basyx.aas.adapter._generic import ASSET_KIND_INVERSE, PathOrIO, ASSET_KIND, JSON_AAS_TOP_LEVEL_KEYS_TO_TYPES
 from basyx.aas.adapter.json import AASToJsonEncoder
-from basyx.aas.adapter.json.json_deserialization import _get_ts, AASFromJsonDecoder,  \
-    read_aas_json_file_into
+from basyx.aas.adapter.json.json_deserialization import (
+        _get_ts,
+        AASFromJsonDecoder,
+        read_aas_json_file_into,
+    )
 
-import logging
-from typing import Callable
+import app.model as server_model
 
 logger = logging.getLogger(__name__)
 

server/app/interfaces/discovery.py

@@ -12,10 +12,10 @@
 from werkzeug.wrappers import Request, Response
 
 from basyx.aas import model
-from server.app.util.converters import IdentifierToBase64URLConverter
-from server.app.interfaces.base import BaseWSGIApp, HTTPApiDecoder
-from server.app import model as server_model
-from server.app.adapter.jsonization import ServerAASToJsonEncoder
+from app.util.converters import IdentifierToBase64URLConverter
+from app.interfaces.base import BaseWSGIApp, HTTPApiDecoder
+from app import model as server_model
+from app.adapter.jsonization import ServerAASToJsonEncoder
 
 encoder=ServerAASToJsonEncoder()
 

server/app/interfaces/registry.py

@@ -2,7 +2,7 @@
 This module implements the Registry interface defined in the 'Specification of the Asset Administration Shell Part 2 – Application Programming Interface'.
 """
 
-from typing import Dict, Iterator, List, Type, Tuple
+from typing import Dict, Iterator, Type, Tuple
 
 import werkzeug.exceptions
 import werkzeug.routing
@@ -12,10 +12,10 @@
 from werkzeug.routing import MapAdapter, Rule, Submount
 from werkzeug.wrappers import Request, Response
 
-import server.app.model as server_model
 from basyx.aas import model
-from server.app.util.converters import IdentifierToBase64URLConverter, base64url_decode
-from server.app.interfaces.base import ObjectStoreWSGIApp, APIResponse, is_stripped_request, HTTPApiDecoder
+import app.model as server_model
+from app.util.converters import IdentifierToBase64URLConverter, base64url_decode
+from app.interfaces.base import ObjectStoreWSGIApp, APIResponse, is_stripped_request, HTTPApiDecoder
 
 
 class RegistryAPI(ObjectStoreWSGIApp):

server/app/model/__init__.py

@@ -1,3 +1,3 @@
 from .descriptor import *
 from .endpoint import *
-from .service import *
+from .service_specification import *

server/app/model/descriptor.py

@@ -4,7 +4,7 @@
 from typing import Optional, Iterable, List
 
 from basyx.aas import model
-from server.app.model.endpoint import Endpoint
+from app.model.endpoint import Endpoint
 
 
 class Descriptor(model.HasExtension, metaclass=abc.ABCMeta):

server/app/model/service.py server/app/model/service_specification.pyserver/app/model/service.py renamed to server/app/model/service_specification.py

@@ -38,6 +38,7 @@ requires-python = ">=3.10"
 dependencies = [
     "urllib3>=1.26,<3",
     "Werkzeug>=3.0.3,<4",
+    "pymongo>=4.16.0",
 ]
 
 [project.optional-dependencies]