Merge branch 'k8s-integration' into develop

backend/Dockerfile.api

@@ -30,7 +30,5 @@ env VIRTUAL_ENV=/app/.venv \
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
 COPY api /app/api
-COPY config.sample.yaml .
-COPY api_server.py .
 
-CMD ["./api_server.py"]
+CMD ["python", "./api/main.py"]

backend/Dockerfile.db_updater

@@ -35,7 +35,6 @@ env VIRTUAL_ENV=/app/.venv \
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
 COPY api /app/api
-COPY config.sample.yaml .
-COPY db_updater.py .
+COPY db_updater /app/db_updater
 
-CMD ["./db_updater.py"]
+CMD ["python", "-m", "db_updater.fill_db"]

backend/api/db/db.py

@@ -14,7 +14,7 @@ from sqlalchemy.ext.asyncio import (
 )
 
 from .base_class import Base
-from ..settings import DatabaseSettings
+from settings import DatabaseSettings
 
 logger = getLogger(__name__)
 

backend/api/dependencies.py

@@ -4,9 +4,9 @@ from fastapi_cache.backends.redis import RedisBackend
 from redis import asyncio as aioredis
 from yaml import safe_load
 
-from .db import db
-from .idfm_interface.idfm_interface import IdfmInterface
-from .settings import CacheSettings, Settings
+from db import db
+from idfm_interface.idfm_interface import IdfmInterface
+from settings import CacheSettings, Settings
 
 
 CONFIG_PATH = environ.get("CONFIG_PATH", "./config.sample.yaml")

backend/api/idfm_interface/idfm_interface.py

@@ -8,8 +8,8 @@ from msgspec import ValidationError
 from msgspec.json import Decoder
 
 from .idfm_types import Destinations as IdfmDestinations, IdfmResponse, IdfmState
-from ..db import Database
-from ..models import Line, Stop, StopArea
+from db import Database
+from models import Line, Stop, StopArea
 
 
 class IdfmInterface:

backend/api/main.py

@@ -12,9 +12,9 @@ from opentelemetry.sdk.resources import Resource, SERVICE_NAME
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
-from api.db import db
-from api.dependencies import idfm_interface, redis_backend, settings
-from api.routers import line, stop
+from db import db
+from dependencies import idfm_interface, redis_backend, settings
+from routers import line, stop
 
 
 @asynccontextmanager

backend/api/models/line.py

@@ -14,8 +14,8 @@ from sqlalchemy import (
 from sqlalchemy.orm import Mapped, mapped_column, relationship, selectinload
 from sqlalchemy.sql.expression import tuple_
 
-from ..db import Base, db
-from ..idfm_interface.idfm_types import (
+from db import Base, db
+from idfm_interface.idfm_types import (
     IdfmState,
     IdfmLineState,
     TransportMode,

backend/api/models/stop.py

@@ -26,8 +26,8 @@ from sqlalchemy.orm import (
 from sqlalchemy.schema import Index
 from sqlalchemy_utils.types.ts_vector import TSVectorType
 
-from ..db import Base, db
-from ..idfm_interface.idfm_types import TransportMode, IdfmState, StopAreaType
+from db import Base, db
+from idfm_interface.idfm_types import TransportMode, IdfmState, StopAreaType
 
 if TYPE_CHECKING:
     from .line import Line

backend/api/models/user.py

@@ -1,7 +1,7 @@
 from sqlalchemy import BigInteger, ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from ..db import Base, db
+from db import Base, db
 from .stop import _Stop
 
 

backend/api/routers/line.py

@@ -1,8 +1,8 @@
 from fastapi import APIRouter, HTTPException
 from fastapi_cache.decorator import cache
 
-from ..models import Line
-from ..schemas import Line as LineSchema, TransportMode
+from models import Line
+from schemas import Line as LineSchema, TransportMode
 
 
 router = APIRouter(prefix="/line", tags=["line"])

backend/api/routers/stop.py

@@ -5,16 +5,16 @@ from typing import Sequence
 from fastapi import APIRouter, HTTPException
 from fastapi_cache.decorator import cache
 
-from ..idfm_interface import Destinations as IdfmDestinations, TrainStatus
-from ..models import Stop, StopArea, StopShape
-from ..schemas import (
+from idfm_interface import Destinations as IdfmDestinations, TrainStatus
+from models import Stop, StopArea, StopShape
+from schemas import (
     NextPassage as NextPassageSchema,
     NextPassages as NextPassagesSchema,
     Stop as StopSchema,
     StopArea as StopAreaSchema,
     StopShape as StopShapeSchema,
 )
-from ..dependencies import idfm_interface
+from dependencies import idfm_interface
 
 
 router = APIRouter(prefix="/stop", tags=["stop"])

backend/api/schemas/line.py

@@ -2,7 +2,7 @@ from enum import StrEnum
 
 from pydantic import BaseModel
 
-from ..idfm_interface import (
+from idfm_interface import (
     IdfmLineState,
     IdfmState,
     TransportMode as IdfmTransportMode,

backend/api/schemas/next_passage.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 
-from ..idfm_interface.idfm_types import TrainStatus
+from idfm_interface.idfm_types import TrainStatus
 
 
 class NextPassage(BaseModel):

backend/api/schemas/stop.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 
-from ..idfm_interface import StopAreaType
+from idfm_interface import StopAreaType
 
 
 class Stop(BaseModel):