Merge pull request #317 from ynput/fix-api-circular-imports

Removed exports from ayon_server.api to prevent circular imports
ynput · Sep 10, 2024 · d8e04c3 · d8e04c3
2 parents 8a81d57 + 32071f4
commit d8e04c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 40 deletions.
diff --git a/api/addons/router.py b/api/addons/router.py
@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter
 
-from ayon_server.api import ResponseFactory
+from ayon_server.api.responses import ResponseFactory
 
 route_meta: dict[str, Any] = {
     "tags": ["Addon settings"],

diff --git a/api/users/router.py b/api/users/router.py
@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from ayon_server.api import ResponseFactory
+from ayon_server.api.responses import ResponseFactory
 
 router = APIRouter(
     prefix="/users",

diff --git a/ayon_server/api/__init__.py b/ayon_server/api/__init__.py
@@ -1,35 +0,0 @@
-__all__ = [
-    "JSONResponse",
-    "ResponseFactory",
-    "dep_access_token",
-    "dep_attribute_name",
-    "dep_current_user",
-    "dep_current_user_optional",
-    "dep_project_name",
-    "dep_new_project_name",
-    "dep_folder_id",
-    "dep_product_id",
-    "dep_version_id",
-    "dep_representation_id",
-    "dep_task_id",
-    "dep_thumbnail_id",
-    "dep_workfile_id",
-    "app",
-]
-
-from ayon_server.api.dependencies import (
-    dep_access_token,
-    dep_attribute_name,
-    dep_current_user,
-    dep_current_user_optional,
-    dep_folder_id,
-    dep_new_project_name,
-    dep_product_id,
-    dep_project_name,
-    dep_representation_id,
-    dep_task_id,
-    dep_thumbnail_id,
-    dep_version_id,
-    dep_workfile_id,
-)
-from ayon_server.api.responses import JSONResponse, ResponseFactory

diff --git a/ayon_server/api/server.py b/ayon_server/api/server.py
@@ -13,7 +13,6 @@
 from fastapi.websockets import WebSocket, WebSocketDisconnect
 from nxtools import log_to_file, log_traceback, logging, slugify
 
-from ayon_server.access.access_groups import AccessGroups
 from ayon_server.addons import AddonLibrary
 from ayon_server.api.frontend import init_frontend
 from ayon_server.api.messaging import Messaging
@@ -358,6 +357,13 @@ def init_addon_static(target_app: fastapi.FastAPI) -> None:
 #
 
 
+async def load_access_groups() -> None:
+    """Load access groups from the database."""
+    from ayon_server.access.access_groups import AccessGroups
+
+    await AccessGroups.load()
+
+
 @app.on_event("startup")
 async def startup_event() -> None:
     """Startup event.
@@ -376,8 +382,7 @@ async def startup_event() -> None:
     # Connect to the database and load stuff
 
     await ayon_init()
-
-    await AccessGroups.load()
+    await load_access_groups()
 
     # Start background tasks