(Hopefully) Resolve imports conflicts by using primarily absolute imp…

…orts
rwth-iat · Feb 7, 2025 · 55bc7d2 · 55bc7d2
1 parent 7c4adeb
commit 55bc7d2
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/api/server/__init__.py b/api/server/__init__.py
@@ -1 +1 @@
-from .server import app
+from .server_main import app
diff --git a/api/server/routes/aas_registry_server.py b/api/server/routes/aas_registry_server.py
@@ -3,8 +3,8 @@
 from aas_core3.types import Identifiable
 from fastapi import APIRouter, Request
 
-from api.server.services.aas_registry_server_service import AasRegistryServerService
-from sdk.basyx import ObjectStore
+from server.services.aas_registry_server_service import AasRegistryServerService
+from basyx import ObjectStore
 
 
 class AasRegistryRouter:

diff --git a/api/server/routes/aasx_file_server.py b/api/server/routes/aasx_file_server.py
@@ -3,8 +3,8 @@
 from aas_core3.types import Identifiable
 from fastapi import APIRouter, Request
 
-from api.server.services.aasx_flie_server_service import AasxFileServerService
-from sdk.basyx import ObjectStore
+from server.services.aasx_flie_server_service import AasxFileServerService
+from basyx import ObjectStore
 
 
 class AasxFileServerRouter:

diff --git a/api/server/routes/submodel.py b/api/server/routes/submodel.py
@@ -3,8 +3,8 @@
 from aas_core3.types import Identifiable
 from fastapi import APIRouter, Request, HTTPException
 
-from api.server.services.submodel_service import SubmodelService
-from sdk.basyx import ObjectStore
+from server.services.submodel_service import SubmodelService
+from basyx import ObjectStore
 
 
 class SubmodelRouter:

diff --git a/api/server/routes/submodel_registry_server.py b/api/server/routes/submodel_registry_server.py
@@ -3,8 +3,8 @@
 from aas_core3.types import Identifiable
 from fastapi import APIRouter, Request
 
-from api.server.services.submodel_registry_server_service import SubmodelRegistryServerService
-from sdk.basyx import ObjectStore
+from server.services.submodel_registry_server_service import SubmodelRegistryServerService
+from basyx import ObjectStore
 
 
 class SubmodelRegistryRouter:

diff --git a/api/server/server.py → api/server/server_main.py b/api/server/server.py → api/server/server_main.py
@@ -1,8 +1,8 @@
 import uvicorn
 from fastapi import FastAPI
 
-from api.server.routes import submodel, aasx_file_server, aas_registry_server, submodel_registry_server
-from sdk.basyx import object_store
+from server.routes import submodel, aasx_file_server, aas_registry_server, submodel_registry_server
+from basyx import object_store
 
 app = FastAPI()
 prefix = "/api/v3.0"

diff --git a/api/server/services/aas_registry_server_service.py b/api/server/services/aas_registry_server_service.py
@@ -4,7 +4,7 @@
 from aas_core3.types import AssetAdministrationShell, ConceptDescription
 from fastapi import HTTPException
 
-from sdk.basyx import ObjectStore
+from basyx import ObjectStore
 
 
 class AasRegistryServerService:

diff --git a/api/server/services/aasservice.py b/api/server/services/aasservice.py
@@ -1,4 +1,4 @@
-from sdk.basyx import ObjectStore
+from basyx import ObjectStore
 
 
 class AasService:

diff --git a/api/server/services/aasx_flie_server_service.py b/api/server/services/aasx_flie_server_service.py
@@ -4,7 +4,7 @@
 from aas_core3 import jsonization
 from fastapi import HTTPException
 
-from sdk.basyx import ObjectStore
+from basyx import ObjectStore
 
 
 class AasxFileServerService:

diff --git a/api/server/services/submodel_registry_server_service.py b/api/server/services/submodel_registry_server_service.py
@@ -4,7 +4,7 @@
 from aas_core3.types import Submodel, ConceptDescription
 from fastapi import HTTPException
 
-from sdk.basyx import ObjectStore
+from basyx import ObjectStore
 
 
 class SubmodelRegistryServerService:

diff --git a/api/server/services/submodel_service.py b/api/server/services/submodel_service.py
@@ -4,7 +4,7 @@
 from aas_core3.types import Submodel, SubmodelElement
 from fastapi import HTTPException
 
-from sdk.basyx import ObjectStore
+from basyx import ObjectStore
 
 
 class SubmodelService:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from .server import app
		from .server_main import app