adapt server repository structure

Author: Frosty2500

sdk/README.md

@@ -42,8 +42,7 @@ The BaSyx Python SDK requires the following Python packages to be installed for
 * `lxml` (BSD 3-clause License, using `libxml2` under MIT License)
 * `python-dateutil` (BSD 3-clause License)
 * `pyecma376-2` (Apache License v2.0)
-* `urllib3` (MIT License)
-* `Werkzeug` (BSD 3-clause License)
+
 
 Development/testing/documentation/example dependencies:
 * `mypy` (MIT License)

server/Dockerfile

@@ -44,5 +44,6 @@ COPY ./sdk /sdk
 COPY ./server/app /app
 WORKDIR /app
 RUN pip install ../sdk
+RUN pip install .
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.ini"]

server/app/interfaces/__init__.py

@@ -25,7 +25,12 @@
 from basyx.aas.adapter.json import StrictStrippedAASFromJsonDecoder, StrictAASFromJsonDecoder, AASToJsonEncoder
 from basyx.aas.adapter.xml import xml_serialization, XMLConstructables, read_aas_xml_element
 from basyx.aas.model import AbstractObjectStore
-from server.app.util.converters import base64url_decode
+# Test if we are in the docker file. If so server and app do not exist.
+try:
+    from app.util.converters import base64url_decode
+except ImportError:
+    from util.converters import base64url_decode
+
 
 
 T = TypeVar("T")

server/app/interfaces/base.py

@@ -48,7 +48,11 @@
 
 from basyx.aas import model
 from basyx.aas.adapter import aasx
-from server.app.util.converters import Base64URLConverter, IdShortPathConverter, base64url_decode
+# Test if we are in the docker file. If so app is our working directory.
+try:
+    from app.util.converters import Base64URLConverter, IdShortPathConverter, base64url_decode
+except ImportError:
+    from util.converters import Base64URLConverter, IdShortPathConverter, base64url_decode
 from .base import ObjectStoreWSGIApp, APIResponse, is_stripped_request, HTTPApiDecoder, T
 
 

server/app/interfaces/repository.py

@@ -6,7 +6,7 @@
 from basyx.aas.adapter import aasx
 
 from basyx.aas.backend.local_file import LocalFileObjectStore
-from server.app.interfaces.repository import WSGIApp
+from interfaces.repository import WSGIApp
 
 storage_path = os.getenv("STORAGE_PATH", "/storage")
 storage_type = os.getenv("STORAGE_TYPE", "LOCAL_FILE_READ_ONLY")
@@ -44,3 +44,6 @@
 else:
     print(f"STORAGE_TYPE must be either LOCAL_FILE or LOCAL_FILE_READ_ONLY! Current value: {storage_type}",
           file=sys.stderr)
+
+
+

server/app/main.py

@@ -17,7 +17,7 @@ build-backend = "setuptools.build_meta"
 # print(f"Project version: {version}")
 # ```
 root = ".."  # Defines the path to the root of the repository
-version_file = "app/version.py"
+version_file = "version.py"
 
 [project]
 name = "basyx-python-server"
@@ -36,7 +36,8 @@ classifiers = [
 ]
 requires-python = ">=3.9"
 dependencies = [
-    "basyx-python-sdk", #TODO: Think about the version
+    # While we install the sdk locally, this dependency needs to be commented out
+    # "basyx-python-sdk>=1.2.0,<2", #TODO: Think about the version
     "urllib3>=1.26,<3",
     "Werkzeug>=3.0.3,<4",
 ]
@@ -57,7 +58,7 @@ dev = [
 "Homepage" = "https://github.com/eclipse-basyx/basyx-python-sdk"
 
 [tool.setuptools]
-packages = { find = { include = ["basyx*"], exclude = ["test*"] } }
+packages = { find = { exclude = ["test*"] } }
 
 [tool.setuptools.package-data]
 app = ["py.typed"]