From a202d122d677ea690139238259e756f40608349e Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Fri, 24 Apr 2026 15:57:45 +0000 Subject: [PATCH] save current progress --- .devcontainer/backend/docker-compose.yml | 1 + backend/app/config.py | 1 + backend/app/local/router.py | 4 ++-- backend/app/main.py | 4 ++-- backend/run_local.sh | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.devcontainer/backend/docker-compose.yml b/.devcontainer/backend/docker-compose.yml index 757cfbe0..a9e3b04e 100644 --- a/.devcontainer/backend/docker-compose.yml +++ b/.devcontainer/backend/docker-compose.yml @@ -41,6 +41,7 @@ networks: driver: bridge shared-dev: external: true + name: shared-dev volumes: postgres-data-two: \ No newline at end of file diff --git a/backend/app/config.py b/backend/app/config.py index 70a6b50c..b7b6b878 100644 --- a/backend/app/config.py +++ b/backend/app/config.py @@ -90,6 +90,7 @@ class Settings(BaseSettings): model_config = SettingsConfigDict( env_file=resolve_env_file(), env_file_encoding="utf-8", + extra="ignore", ) diff --git a/backend/app/local/router.py b/backend/app/local/router.py index 0977be04..07f0a778 100644 --- a/backend/app/local/router.py +++ b/backend/app/local/router.py @@ -2,8 +2,8 @@ from fastapi import APIRouter, HTTPException, status from jose import jwt, jwe import json import datetime -from app.config import get_settings -from app.dependencies import get_derived_encryption_key +from backend.app.config import get_settings +from backend.app.dependencies import get_derived_encryption_key router = APIRouter( prefix="/local", diff --git a/backend/app/main.py b/backend/app/main.py index c9733c18..e74fddfb 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -63,7 +63,7 @@ app.include_router(tasks_router.router, prefix="/v1") app.include_router(bulk_uploads_router.router, prefix="/v1") if get_settings().ENVIRONMENT == "local": - from app.local import router as local_router + from backend.app.local import router as local_router app.include_router(local_router.router) handler = Mangum(app) @@ -130,7 +130,7 @@ app.include_router(whlg_router.router, prefix="/v1") app.include_router(bulk_uploads_router.router, prefix="/v1") if get_settings().ENVIRONMENT == "local": - from app.local import router as local_router + from backend.app.local import router as local_router app.include_router(local_router.router) handler = Mangum(app) diff --git a/backend/run_local.sh b/backend/run_local.sh index 0201e508..6c962930 100644 --- a/backend/run_local.sh +++ b/backend/run_local.sh @@ -1,5 +1,5 @@ set -a -source ./.env +source .env set +a cd ..