refactor: reorganize the whole project layout

Co-authored-by: gabdevele <[email protected]>

app/api/proxy/router.py

@@ -1,4 +1,3 @@
-from core.security import require_authenticated_user
 from db.proxy import (
     create_proxy,
     delete_proxy,
@@ -9,8 +8,10 @@ from db.proxy import (
     list_proxies as list_proxy_documents,
 )
 from fastapi import APIRouter, Depends, HTTPException, status
+
+from core.security import require_authenticated_user
 from models.proxy import ProxyCreateInput, ProxyUpdateInput
-from utils.proxy.validator import ProxyCodeValidationError, validate_proxy_code
+from services.proxy.validator import ProxyCodeValidationError, validate_proxy_code
 
 router = APIRouter(
     prefix="/proxy",

app/integrations/docker/__init__.py

@@ -1,11 +1,11 @@
-from utils.docker.compose import (
+from integrations.docker.compose import (
 	find_docker_compose,
 	get_all_services,
 	get_services,
 	get_visible_folders,
 )
-from utils.docker.editor import change_port
+from integrations.docker.editor import change_port
-from utils.docker.models import DockerService
+from integrations.docker.models import DockerService
 
 __all__ = [
 	"DockerService",

app/integrations/docker/compose.py

@@ -2,8 +2,8 @@ from pathlib import Path
 
 import yaml
 
-from utils.docker.models import DockerService
+from integrations.docker.models import DockerService
-from utils.docker.ports import _get_service_port
+from integrations.docker.ports import _get_service_port
 
 COMPOSE_NAMES = (
     "compose.yml",

app/integrations/docker/editor.py

@@ -2,8 +2,8 @@ from pathlib import Path
 
 import yaml
 
-from utils.docker.compose import find_docker_compose
+from integrations.docker.compose import find_docker_compose
-from utils.docker.ports import _get_port_index, _replace_port_in_mapping
+from integrations.docker.ports import _get_port_index, _replace_port_in_mapping
 
 
 def _backup_path_for(compose_path: Path) -> Path:

app/repositories/auth.py

@@ -2,9 +2,10 @@ from collections.abc import Mapping
 from datetime import UTC, datetime
 from typing import Any
 
+from motor.motor_asyncio import AsyncIOMotorCollection
+
 from core.mongodb import get_database
 from models.auth import AuthUserDocument
-from motor.motor_asyncio import AsyncIOMotorCollection
 
 USERS_COLLECTION_NAME = "auth_users"
 REVOKED_COLLECTION_NAME = "revoked_tokens"

app/repositories/proxy.py

@@ -2,12 +2,13 @@ from collections.abc import Mapping
 from datetime import UTC, datetime
 from typing import Any
 
+from motor.motor_asyncio import AsyncIOMotorCollection
+from pymongo import ReturnDocument
+
 from core.mongodb import get_database
 from models.proxy import ProxyDocument, ProxyUpdateInput
 from models.service import ServiceEndpointDocument
-from motor.motor_asyncio import AsyncIOMotorCollection
+from services.proxy.types import ServiceConfig
-from pymongo import ReturnDocument
-from utils.proxy.types import ServiceConfig
 
 COLLECTION_NAME = "proxies"
 

app/services/proxy/manager.py

@@ -1,4 +1,4 @@
-from utils.proxy.types import ServiceConfig
+from services.proxy.types import ServiceConfig
 
 
 async def create_proxy(

tests/api/test_proxy.py

@@ -3,7 +3,7 @@ import importlib
 from core.security import get_auth_context, require_authenticated_user
 from models.proxy import ProxyDocument
 from models.service import ServiceEndpointDocument
-from utils.proxy.validator import ProxyCodeValidationError
+from services.proxy.validator import ProxyCodeValidationError
 
 proxy_router_module = importlib.import_module("api.proxy.router")