👽️ Add of the StopAreaStopAssociationFields pdeid and pdeversion fields

These fields have been added by IDFM in its relations resource.
For now, these fields are not used.

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/db/db.py

@@ -61,9 +61,6 @@ class Database:
             while not ret:
                 try:
                     async with self._async_engine.begin() as session:
-                        await session.execute(
-                            text("CREATE EXTENSION IF NOT EXISTS pg_trgm;")
-                        )
                         if clear_static_data:
                             await session.run_sync(Base.metadata.drop_all)
                             await session.run_sync(Base.metadata.create_all)

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:
@@ -31,6 +31,10 @@ class IdfmInterface:
     async def startup(self) -> None:
         ...
 
+    @staticmethod
+    def _format_line_id(line_id: str) -> int:
+        return int(line_id[1:] if line_id[0] == "C" else line_id)
+
     async def render_line_picto(self, line: Line) -> tuple[None | str, None | str]:
         line_picto_path = line_picto_format = None
         target = f"/tmp/{line.id}_repr"
@@ -81,7 +85,6 @@ class IdfmInterface:
 
         if (stop := await Stop.get_by_id(stop_id)) is not None:
             expected_stop_ids = {stop.id}
-
         elif (stop_area := await StopArea.get_by_id(stop_id)) is not None:
             expected_stop_ids = {stop.id for stop in stop_area.stops}
         else:
@@ -105,7 +108,8 @@ class IdfmInterface:
                         if (
                             dst_names := journey.DestinationName
                         ) and monitored_stop_id in expected_stop_ids:
-                            line_id = journey.LineRef.value.split(":")[-2]
+                            raw_line_id = journey.LineRef.value.split(":")[-2]
+                            line_id = IdfmInterface._format_line_id(raw_line_id)
                             destinations[line_id].add(dst_names[0].value)
 
         return destinations

backend/api/idfm_interface/idfm_types.py

@@ -141,6 +141,8 @@ class StopAreaStopAssociationFields(Struct, kw_only=True):
     artid: str | None = None
     arrversion: str
     zdcid: str
+    pdeid: str | None = None
+    pdeversion: int | None = None
     version: int
     zdaid: str
     zdaversion: str
@@ -205,7 +207,7 @@ class Line(Struct):
 
 Lines = dict[str, Line]
 
-Destinations = dict[str, set[str]]
+Destinations = dict[int, set[str]]
 
 
 # TODO: Set structs frozen

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/schemas/line.py

@@ -53,8 +53,8 @@ class Line(BaseModel):
     transportMode: TransportMode
     backColorHexa: str
     foreColorHexa: str
-    operatorId: str
+    operatorId: int
     accessibility: IdfmState
     visualSignsAvailable: IdfmState
     audibleSignsAvailable: IdfmState
-    stopIds: list[str]
+    stopIds: list[int]

backend/api/schemas/stop.py

@@ -9,7 +9,7 @@ class Stop(BaseModel):
     town: str
     epsg3857_x: float
     epsg3857_y: float
-    lines: list[str]
+    lines: list[int]
 
 
 class StopArea(BaseModel):
@@ -17,7 +17,7 @@ class StopArea(BaseModel):
     name: str
     town: str
     type: StopAreaType
-    lines: list[str]  # SNCF lines are linked to stop areas and not stops.
+    lines: list[int]  # SNCF lines are linked to stop areas and not stops.
     stops: list[Stop]
 
 

backend/api/settings.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+from typing import Annotated
+
+from pydantic import BaseModel, SecretStr
+from pydantic.functional_validators import model_validator
+from pydantic_settings import (
+    BaseSettings,
+    PydanticBaseSettingsSource,
+    SettingsConfigDict,
+)
+
+
+class HttpSettings(BaseModel):
+    host: str = "127.0.0.1"
+    port: int = 8080
+    cert: str | None = None
+
+
+class DatabaseSettings(BaseModel):
+    name: str
+    host: str
+    port: int
+    driver: str = "postgresql+psycopg"
+    user: str
+    password: Annotated[SecretStr, check_user_password]
+
+
+class CacheSettings(BaseModel):
+    enable: bool = False
+    host: str = "127.0.0.1"
+    port: int = 6379
+    user: str | None = None
+    password: Annotated[SecretStr | None, check_user_password] = None
+
+
+@model_validator(mode="after")
+def check_user_password(self) -> DatabaseSettings | CacheSettings:
+    if self.user is not None and self.password is None:
+        raise ValueError("user is set, password shall be set too.")
+
+    if self.password is not None and self.user is None:
+        raise ValueError("password is set, user shall be set too.")
+
+    return self
+
+
+class TracingSettings(BaseModel):
+    enable: bool = False
+
+
+class Settings(BaseSettings):
+    app_name: str
+
+    idfm_api_key: SecretStr
+    clear_static_data: bool
+
+    http: HttpSettings
+    db: DatabaseSettings
+    cache: CacheSettings
+    tracing: TracingSettings
+
+    model_config = SettingsConfigDict(env_prefix="CER__", env_nested_delimiter="__")
+
+    @classmethod
+    def settings_customise_sources(
+        cls,
+        settings_cls: type[BaseSettings],
+        init_settings: PydanticBaseSettingsSource,
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
+        file_secret_settings: PydanticBaseSettingsSource,
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
+        return env_settings, init_settings, file_secret_settings

backend/api_server.py

@@ -4,7 +4,6 @@ import uvicorn
 from contextlib import asynccontextmanager
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.staticfiles import StaticFiles
 from fastapi_cache import FastAPICache
 from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
@@ -13,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
@@ -35,14 +34,12 @@ app = FastAPI(lifespan=lifespan)
 
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["https://localhost:4443", "https://localhost:3000"],
+    allow_origins=["http://carrramba.adrien.run", "https://carrramba.adrien.run"],
     allow_credentials=True,
-    allow_methods=["*"],
+    allow_methods=["OPTIONS", "GET"],
     allow_headers=["*"],
 )
 
-app.mount("/widget", StaticFiles(directory="../frontend/", html=True), name="widget")
-
 # The cache-control header entry is not managed properly by fastapi-cache:
 # For now, a request with a cache-control set to no-cache
 # is interpreted as disabling the use of the server cache.
@@ -60,7 +57,6 @@ async def fastapi_cache_issue_144_workaround(request: Request, call_next):
     return await call_next(request)
 
 
-
 app.include_router(line.router)
 app.include_router(stop.router)
 

backend/backend/settings.py

@@ -1,59 +0,0 @@
-from typing import Any
-
-from pydantic import BaseModel, BaseSettings, Field, root_validator, SecretStr
-
-
-class HttpSettings(BaseModel):
-    host: str = "127.0.0.1"
-    port: int = 8080
-    cert: str | None = None
-
-
-def check_user_password(cls, values: dict[str, Any]) -> dict[str, Any]:
-    user = values.get("user")
-    password = values.get("password")
-
-    if user is not None and password is None:
-        raise ValueError("user is set, password shall be set too.")
-
-    if password is not None and user is None:
-        raise ValueError("password is set, user shall be set too.")
-
-    return values
-
-
-class DatabaseSettings(BaseModel):
-    name: str = "carrramba-encore-rate"
-    host: str = "127.0.0.1"
-    port: int = 5432
-    driver: str = "postgresql+psycopg"
-    user: str | None = None
-    password: SecretStr | None = None
-
-    _user_password_validation = root_validator(allow_reuse=True)(check_user_password)
-
-
-class CacheSettings(BaseModel):
-    enable: bool = False
-    host: str = "127.0.0.1"
-    port: int = 6379
-    user: str | None = None
-    password: SecretStr | None = None
-
-    _user_password_validation = root_validator(allow_reuse=True)(check_user_password)
-
-
-class TracingSettings(BaseModel):
-    enable: bool = False
-
-
-class Settings(BaseSettings):
-    app_name: str
-
-    idfm_api_key: SecretStr = Field(..., env="IDFM_API_KEY")
-    clear_static_data: bool = Field(False, env="CLEAR_STATIC_DATA")
-
-    http: HttpSettings = HttpSettings()
-    db: DatabaseSettings = DatabaseSettings()
-    cache: CacheSettings = CacheSettings()
-    tracing: TracingSettings = TracingSettings()

backend/config.local.yaml

@@ -2,7 +2,7 @@ app_name: carrramba-encore-rate
 clear_static_data: false
 
 http:
-  host: 0.0.0.0
+  host: 127.0.0.1
   port: 8080
   cert: ./config/cert.pem
 

backend/config.sample.yaml

@@ -10,9 +10,7 @@ db:
   name: carrramba-encore-rate
   host: postgres
   port: 5432
-  driver: postgresql+psycopg
   user: cer
-  password: cer_password
 
 cache:
   enable: true

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")

backend/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 python = "^3.11"
 aiohttp = "^3.8.3"
 aiofiles = "^22.1.0"
-fastapi = "^0.95.0"
+fastapi = "^0.103.0"
 uvicorn = "^0.20.0"
 msgspec = "^0.12.0"
 opentelemetry-instrumentation-fastapi = "^0.38b0"
@@ -23,11 +23,12 @@ sqlalchemy = "^2.0.12"
 psycopg = "^3.1.9"
 pyyaml = "^6.0"
 fastapi-cache2 = {extras = ["redis"], version = "^0.2.1"}
+pydantic-settings = "^2.0.3"
 
 [tool.poetry.group.db_updater.dependencies]
 aiofiles = "^22.1.0"
 aiohttp = "^3.8.3"
-fastapi = "^0.95.0"
+fastapi = "^0.103.0"
 msgspec = "^0.12.0"
 opentelemetry-instrumentation-fastapi = "^0.38b0"
 opentelemetry-instrumentation-sqlalchemy = "^0.38b0"
@@ -41,11 +42,14 @@ pyyaml = "^6.0"
 sqlalchemy = "^2.0.12"
 sqlalchemy-utils = "^0.41.1"
 tqdm = "^4.65.0"
+pydantic-settings = "^2.0.3"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
+
+
 [tool.poetry.group.dev.dependencies]
 pylsp-mypy = "^0.6.2"
 mccabe = "^0.7.0"

frontend/src/businessData.tsx

@@ -28,8 +28,7 @@ export interface BusinessDataStore {
 export const BusinessDataContext = createContext<BusinessDataStore>();
 
 export function BusinessDataProvider(props: { children: JSX.Element }) {
-
-	const [serverUrl] = createSignal<string>("https://localhost:4443");
+	const [serverUrl] = createSignal<string>("https://carrramba.adrien.run/api");
 
 	type Store = {
 		lines: Lines;

frontend/src/stopsSearchMenu/map.tsx

@@ -116,7 +116,9 @@ export const Map: ParentComponent<{}> = () => {
 		const foundStopIds = new Set();
 		for (const foundStop of stops) {
 			foundStopIds.add(foundStop.id);
-			foundStop.stops.forEach(s => foundStopIds.add(s.id));
+			if (foundStop.stops !== undefined) {
+				foundStop.stops.forEach(s => foundStopIds.add(s.id));
+			}
 		}
 
 		for (const [stopIdStr, feature] of Object.entries(displayedFeatures)) {

frontend/src/types.tsx

@@ -8,7 +8,7 @@ export enum TrafficStatus {
 
 export class Passage {
 	line: number;
-	operator: string;
+	operator: number;
 	destinations: string[];
 	atStop: boolean;
 	aimedArrivalTs: number;
@@ -19,7 +19,7 @@ export class Passage {
 	arrivalStatus: string;
 	departStatus: string;
 
-	constructor(line: number, operator: string, destinations: string[], atStop: boolean, aimedArrivalTs: number,
+	constructor(line: number, operator: number, destinations: string[], atStop: boolean, aimedArrivalTs: number,
 		expectedArrivalTs: number, arrivalPlatformName: string, aimedDepartTs: number, expectedDepartTs: number,
 		arrivalStatus: string, departStatus: string) {
 		this.line = line;
@@ -45,9 +45,9 @@ export class Stop {
 	epsg3857_x: number;
 	epsg3857_y: number;
 	stops: Stop[];
-	lines: string[];
+	lines: number[];
 
-	constructor(id: number, name: string, town: string, epsg3857_x: number, epsg3857_y: number, stops: Stop[], lines: string[]) {
+	constructor(id: number, name: string, town: string, epsg3857_x: number, epsg3857_y: number, stops: Stop[], lines: number[]) {
 		this.id = id;
 		this.name = name;
 		this.town = town;
@@ -82,7 +82,7 @@ export class StopShape {
 export type StopShapes = Record<number, StopShape>;
 
 export class Line {
-	id: string;
+	id: number;
 	shortName: string;
 	name: string;
 	status: string; // TODO: Use an enum
@@ -95,7 +95,7 @@ export class Line {
 	audibleSignsAvailable: string; // TODO: Use an enum
 	stopIds: number[];
 
-	constructor(id: string, shortName: string, name: string, status: string, transportMode: string, backColorHexa: string,
+	constructor(id: number, shortName: string, name: string, status: string, transportMode: string, backColorHexa: string,
 		foreColorHexa: string, operatorId: number, accessibility: boolean, visualSignsAvailable: string,
 		audibleSignsAvailable: string, stopIds: number[]) {
 		this.id = id;

frontend/src/utils.tsx

@@ -26,7 +26,7 @@ export const TransportModeWeights: Record<string, number> = {
 export function getTransportModeSrc(mode: string, color: boolean = true): string | undefined {
 	let ret = undefined;
 	if (validTransportModes.includes(mode)) {
-		return `/carrramba-encore-rate/public/symbole_${mode}_${color ? "" : "support_fonce_"}RVB.svg`;
+		return `/symbole_${mode}_${color ? "" : "support_fonce_"}RVB.svg`;
 	}
 	return ret;
 }