Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/api/v1/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""API v1 module."""
from .router import router
from web.api.v1.router import router

__all__ = ["router"]
4 changes: 2 additions & 2 deletions web/api/v1/admin.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from fastapi import APIRouter, HTTPException, Depends, status
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials

from schemas import RefreshRemotesResponse
from services.admin import get_admin_service, AdminService
from web.schemas import RefreshRemotesResponse
from web.services.admin import get_admin_service, AdminService


router = APIRouter(prefix="/admin", tags=["admin"])
Expand Down
6 changes: 3 additions & 3 deletions web/api/v1/builds.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
)
from fastapi.responses import FileResponse, PlainTextResponse

from schemas import (
from web.schemas import (
BuildRequest,
BuildSubmitResponse,
BuildOut,
)
from services.builds import get_builds_service, BuildsService
from core.limiter import limiter
from web.services.builds import get_builds_service, BuildsService
from web.core.limiter import limiter

router = APIRouter(prefix="/builds", tags=["builds"])

Expand Down
2 changes: 1 addition & 1 deletion web/api/v1/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from fastapi import APIRouter

from . import vehicles, builds, admin
from web.api.v1 import vehicles, builds, admin

# Create the main v1 router
router = APIRouter(prefix="/v1")
Expand Down
4 changes: 2 additions & 2 deletions web/api/v1/vehicles.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from typing import List, Optional
from fastapi import APIRouter, Depends, HTTPException, Query, Path

from schemas import (
from web.schemas import (
VehicleBase,
VersionOut,
BoardOut,
FeatureOut,
)
from services.vehicles import get_vehicles_service, VehiclesService
from web.services.vehicles import get_vehicles_service, VehiclesService

router = APIRouter(prefix="/vehicles", tags=["vehicles"])

Expand Down
4 changes: 2 additions & 2 deletions web/core/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""
Core application components.
"""
from .config import get_settings
from .startup import initialize_application
from web.core.config import get_settings
from web.core.startup import initialize_application

__all__ = [
"get_settings",
Expand Down
2 changes: 1 addition & 1 deletion web/core/limiter.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from slowapi.errors import RateLimitExceeded
from slowapi import Limiter
from slowapi.util import get_remote_address
from core.config import get_settings
from web.core.config import get_settings

logger = logging.getLogger(__name__)

Expand Down
12 changes: 6 additions & 6 deletions web/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
from slowapi.errors import RateLimitExceeded
from slowapi.middleware import SlowAPIMiddleware

from api.v1 import router as v1_router
from ui import router as ui_router
from web.api.v1 import router as v1_router
from web.ui import router as ui_router

from core.config import get_settings
from core.startup import initialize_application
from core.logging_config import setup_logging
from core.limiter import limiter, rate_limit_exceeded_handler
from web.core.config import get_settings
from web.core.startup import initialize_application
from web.core.logging_config import setup_logging
from web.core.limiter import limiter, rate_limit_exceeded_handler

import ap_git
import metadata_manager
Expand Down
6 changes: 3 additions & 3 deletions web/schemas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"""

# Admin schemas
from .admin import (
from web.schemas.admin import (
RefreshRemotesResponse,
)

# Build schemas
from .builds import (
from web.schemas.builds import (
BuildVersionInfo,
RemoteInfo,
BuildProgress,
Expand All @@ -21,7 +21,7 @@
)

# Vehicle schemas
from .vehicles import (
from web.schemas.vehicles import (
VehicleBase,
VersionBase,
VersionOut,
Expand Down
2 changes: 1 addition & 1 deletion web/schemas/builds.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import List, Literal

from pydantic import BaseModel, Field
from schemas.vehicles import VehicleBase, BoardBase, RemoteInfo
from web.schemas.vehicles import VehicleBase, BoardBase, RemoteInfo


# --- Build Progress ---
Expand Down
6 changes: 3 additions & 3 deletions web/services/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""
Business logic services for the application.
"""
from .vehicles import get_vehicles_service, VehiclesService
from .builds import get_builds_service, BuildsService
from .admin import get_admin_service, AdminService
from web.services.vehicles import get_vehicles_service, VehiclesService
from web.services.builds import get_builds_service, BuildsService
from web.services.admin import get_admin_service, AdminService

__all__ = [
"get_vehicles_service",
Expand Down
4 changes: 2 additions & 2 deletions web/services/builds.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
from fastapi import Request
from typing import List, Optional

from schemas import (
from web.schemas import (
BuildRequest,
BuildSubmitResponse,
BuildOut,
BuildProgress,
RemoteInfo,
BuildVersionInfo,
)
from schemas.vehicles import VehicleBase, BoardBase
from web.schemas.vehicles import VehicleBase, BoardBase

# Import external modules
# pylint: disable=wrong-import-position
Expand Down
2 changes: 1 addition & 1 deletion web/services/vehicles.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import List, Optional
from fastapi import Request

from schemas import (
from web.schemas import (
VehicleBase,
RemoteInfo,
VersionOut,
Expand Down
2 changes: 1 addition & 1 deletion web/ui/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""
UI module for web interface routes.
"""
from .router import router
from web.ui.router import router

__all__ = ["router"]
Loading