resolved import issues

Author: itsskofficial

src/server/main/agents/routes.py

@@ -4,16 +4,16 @@
 import re
 from typing import List, Optional
 from fastapi import APIRouter, Depends, HTTPException, status, Request
-from .models import AddTaskRequest, UpdateTaskRequest, TaskIdRequest, GeneratePlanRequest
-from ..config import INTEGRATIONS_CONFIG
-from ..db import MongoManager
-from ..dependencies import mongo_manager
-from ..auth.utils import PermissionChecker
-from ...workers.celery_app import celery_app
-from ...workers.executor.tasks import execute_task_plan
-from ...workers.planner.llm import get_planner_agent
-from ...workers.planner.db import get_all_mcp_descriptions
-from ...workers.tasks import calculate_next_run
+from main.agents.models import AddTaskRequest, UpdateTaskRequest, TaskIdRequest, GeneratePlanRequest
+from main.config import INTEGRATIONS_CONFIG
+from main.db import MongoManager
+from main.dependencies import mongo_manager
+from main.auth.utils import PermissionChecker
+from workers.celery_app import celery_app
+from workers.executor.tasks import execute_task_plan
+from workers.planner.llm import get_planner_agent
+from workers.planner.db import get_all_mcp_descriptions
+from workers.tasks import calculate_next_run
 
 router = APIRouter(
     prefix="/agents",

src/server/main/app.py

@@ -10,16 +10,16 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
-from .config import APP_SERVER_PORT
-from .dependencies import mongo_manager
-from .auth.routes import router as auth_router
-from .chat.routes import router as chat_router
-from .notifications.routes import router as notifications_router
-from .integrations.routes import router as integrations_router
-from .misc.routes import router as misc_router
-from .agents.routes import router as agents_router
-from .journal.routes import router as journal_router
-from .settings.routes import router as settings_router # Import the new router
+from main.config import APP_SERVER_PORT
+from main.dependencies import mongo_manager
+from main.auth.routes import router as auth_router
+from main.chat.routes import router as chat_router
+from main.notifications.routes import router as notifications_router
+from main.integrations.routes import router as integrations_router
+from main.misc.routes import router as misc_router
+from main.agents.routes import router as agents_router
+from main.journal.routes import router as journal_router
+from main.settings.routes import router as settings_router # Import the new router
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__) 
@@ -77,4 +77,4 @@ async def health():
     log_config = uvicorn.config.LOGGING_CONFIG.copy()
     log_config["formatters"]["access"]["fmt"] = '%(asctime)s %(levelname)s %(client_addr)s - "[MAIN_SERVER_ACCESS] %(request_line)s" %(status_code)s'
     log_config["formatters"]["default"]["fmt"] = '%(asctime)s %(levelname)s [%(name)s] [MAIN_SERVER_DEFAULT] %(message)s'
-    uvicorn.run("server.main.app:app", host="0.0.0.0", port=APP_SERVER_PORT, lifespan="on", reload=False, workers=1, log_config=log_config)
+    uvicorn.run("main.app:app", host="0.0.0.0", port=APP_SERVER_PORT, lifespan="on", reload=False, workers=1, log_config=log_config)

src/server/main/auth/routes.py

@@ -4,10 +4,10 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.responses import JSONResponse
 
-from .utils import aes_encrypt, aes_decrypt, PermissionChecker, AuthHelper
-from .models import AuthTokenStoreRequest, GoogleTokenStoreRequest, EncryptionRequest, DecryptionRequest
-from ..dependencies import mongo_manager
-from ..config import INTEGRATIONS_CONFIG # For validating service_name
+from main.auth.utils import aes_encrypt, aes_decrypt, PermissionChecker, AuthHelper
+from main.auth.models import AuthTokenStoreRequest, GoogleTokenStoreRequest, EncryptionRequest, DecryptionRequest
+from main.dependencies import mongo_manager
+from main.config import INTEGRATIONS_CONFIG # For validating service_name
 auth_helper = AuthHelper() 
 
 router = APIRouter(

src/server/main/auth/utils.py

@@ -15,7 +15,7 @@
 from fastapi import HTTPException, status, Depends, WebSocket, WebSocketDisconnect
 from fastapi.security import OAuth2PasswordBearer
 
-from ..config import (
+from main.config import (
     AES_SECRET_KEY, AES_IV,
     AUTH0_DOMAIN, AUTH0_AUDIENCE, ALGORITHMS,
     AUTH0_MANAGEMENT_CLIENT_ID, AUTH0_MANAGEMENT_CLIENT_SECRET
@@ -160,7 +160,7 @@ def __init__(self, required_permissions: List[str]):
         self.required_permissions = set(required_permissions)
 
     async def __call__(self, token: str = Depends(oauth2_scheme), auth_helper: AuthHelper = Depends()):
-        from ..dependencies import auth_helper as global_auth_helper
+        from main.dependencies import auth_helper as global_auth_helper
 
         user_id, token_permissions_list = await global_auth_helper.get_current_user_id_and_permissions(token=token)
         token_permissions_set = set(token_permissions_list)

src/server/main/chat/routes.py

@@ -7,10 +7,10 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.responses import JSONResponse, StreamingResponse
 
-from .models import ChatMessageInput
-from .utils import generate_chat_llm_stream
-from ..auth.utils import PermissionChecker
-from ..dependencies import mongo_manager
+from main.chat.models import ChatMessageInput
+from main.chat.utils import generate_chat_llm_stream
+from main.auth.utils import PermissionChecker
+from main.dependencies import mongo_manager
 
 router = APIRouter(
     prefix="/chat",

src/server/main/chat/utils.py

@@ -8,9 +8,9 @@
 import logging
 from typing import List, Dict, Any, Tuple, AsyncGenerator, Optional
 
-from ..db import MongoManager
-from ..llm import get_qwen_assistant
-from ..config import INTEGRATIONS_CONFIG, SUPERMEMORY_MCP_BASE_URL, SUPERMEMORY_MCP_ENDPOINT_SUFFIX
+from main.db import MongoManager
+from main.llm import get_qwen_assistant
+from main.config import INTEGRATIONS_CONFIG, SUPERMEMORY_MCP_BASE_URL, SUPERMEMORY_MCP_ENDPOINT_SUFFIX
 
 logger = logging.getLogger(__name__)
 

src/server/main/db.py

@@ -8,10 +8,10 @@
 from typing import Dict, List, Optional, Any, Tuple
 
 # Import config from the current 'main' directory
-from .config import MONGO_URI, MONGO_DB_NAME
+from main.config import MONGO_URI, MONGO_DB_NAME
 
 USER_PROFILES_COLLECTION = "user_profiles" 
-CHAT_HISTORY_COLLECTION = "chat_history" 
+CHAT_HISTORY_COLLECTION = "chat_history"
 NOTIFICATIONS_COLLECTION = "notifications" 
 POLLING_STATE_COLLECTION = "polling_state_store" 
 PROCESSED_ITEMS_COLLECTION = "processed_items_log" 

src/server/main/dependencies.py

@@ -1,7 +1,7 @@
 # src/server/main/dependencies.py
-from .db import MongoManager
-from .auth.utils import AuthHelper
-from .websocket import MainWebSocketManager
+from main.db import MongoManager
+from main.auth.utils import AuthHelper
+from main.websocket import MainWebSocketManager
 
 # --- Global Instances ---
 # These instances are created once here and imported by other modules

src/server/main/integrations/routes.py

@@ -4,10 +4,10 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.responses import JSONResponse
 
-from .models import ManualConnectRequest, OAuthConnectRequest, DisconnectRequest
-from ..dependencies import mongo_manager, auth_helper
-from ..auth.utils import aes_encrypt
-from ..config import (
+from main.integrations.models import ManualConnectRequest, OAuthConnectRequest, DisconnectRequest
+from main.dependencies import mongo_manager, auth_helper
+from main.auth.utils import aes_encrypt
+from main.config import (
     INTEGRATIONS_CONFIG, 
     GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET,
     GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET

src/server/main/integrations/utils.py

@@ -2,8 +2,8 @@
 import json
 from typing import Dict, Any, Optional
 
-from ..db import MongoManager
-from ..auth.utils import aes_encrypt, aes_decrypt
+from main.db import MongoManager
+from main.auth.utils import aes_encrypt, aes_decrypt
 
 async def store_encrypted_integration_token(user_id: str, service_name: str, token_data: Dict[str, Any], db_manager: MongoManager) -> bool:
     """Encrypts and stores the entire token object for a service."""