♻️ Use of relative imports for api modules

backend/Dockerfile.api_server

@@ -9,7 +9,7 @@ ENV POETRY_NO_INTERACTION=1 \
 
 WORKDIR /app
 
-COPY ./pyproject.toml /app
+COPY pyproject.toml /app
 
 RUN poetry install --only=main --no-root && \
 	rm -rf ${POETRY_CACHE_DIR}
@@ -29,10 +29,8 @@ env VIRTUAL_ENV=/app/.venv \
 
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
-COPY backend /app/backend
-COPY dependencies.py /app
-COPY config.sample.yaml /app
-COPY routers/ /app/routers
-COPY main.py /app
+COPY api /app/api
+COPY config.sample.yaml .
+COPY api_server.py .
 
-CMD ["python", "./main.py"]
+CMD ["./api_server.py"]

backend/Dockerfile.db_updater

@@ -34,10 +34,8 @@ env VIRTUAL_ENV=/app/.venv \
 
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
-COPY backend /app/backend
-COPY dependencies.py /app
-COPY config.sample.yaml /app
-COPY config.local.yaml /app
-COPY db_updater /app/db_updater
+COPY api /app/api
+COPY config.sample.yaml .
+COPY db_updater.py .
 
-CMD ["python", "-m", "db_updater.fill_db"]
+CMD ["./db_updater.py"]

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 backend.db import db
-from backend.idfm_interface.idfm_interface import IdfmInterface
-from backend.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

@@ -7,9 +7,9 @@ from aiohttp import ClientSession
 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 .idfm_types import Destinations as IdfmDestinations, IdfmResponse, IdfmState
 
 
 class IdfmInterface:

backend/api/routers/line.py

@@ -1,8 +1,8 @@
 from fastapi import APIRouter, HTTPException
 from fastapi_cache.decorator import cache
 
-from backend.models import Line
-from backend.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 backend.idfm_interface import Destinations as IdfmDestinations, TrainStatus
-from backend.models import Stop, StopArea, StopShape
-from backend.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_server.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 backend.db import db
-from dependencies import idfm_interface, redis_backend, settings
-from routers import line, stop
+from api.db import db
+from api.dependencies import idfm_interface, redis_backend, settings
+from api.routers import line, stop
 
 
 @asynccontextmanager

backend/db_updater.py

@@ -16,9 +16,9 @@ from shapefile import Reader as ShapeFileReader, ShapeRecord  # type: ignore
 from tqdm import tqdm
 from yaml import safe_load
 
-from backend.db import Base, db, Database
-from backend.models import ConnectionArea, Line, LinePicto, Stop, StopArea, StopShape
-from backend.idfm_interface.idfm_types import (
+from api.db import Base, db, Database
+from api.models import ConnectionArea, Line, LinePicto, Stop, StopArea, StopShape
+from api.idfm_interface.idfm_types import (
     ConnectionArea as IdfmConnectionArea,
     IdfmLineState,
     Line as IdfmLine,
@@ -31,8 +31,8 @@ from backend.idfm_interface.idfm_types import (
     StopLineAsso as IdfmStopLineAsso,
     TransportMode,
 )
-from backend.idfm_interface.ratp_types import Picto as RatpPicto
-from backend.settings import Settings
+from api.idfm_interface.ratp_types import Picto as RatpPicto
+from api.settings import Settings
 
 
 CONFIG_PATH = environ.get("CONFIG_PATH", "./config.sample.yaml")