diff --git a/app/api/api_test.py b/app/api/api_test.py index a7b965c..c7bdb62 100644 --- a/app/api/api_test.py +++ b/app/api/api_test.py @@ -4,7 +4,8 @@ import logging from fastapi import APIRouter from fastapi import HTTPException -from app.core.config import SR_RABBITMQ_QUEUES, GI_RABBITMQ_QUEUES, GPI_RABBITMQ_QUEUES, GRI_RABBITMQ_QUEUES, OSS, JAVA_STREAM_API_URL, GMV_RABBITMQ_QUEUES, SLOGAN_RABBITMQ_QUEUES, GEN_SINGLE_LOGO_RABBITMQ_QUEUES, PS_RABBITMQ_QUEUES, BATCH_GPI_RABBITMQ_QUEUES, BATCH_GRI_RABBITMQ_QUEUES, BATCH_PS_RABBITMQ_QUEUES +from app.core.config import SR_RABBITMQ_QUEUES, GI_RABBITMQ_QUEUES, GPI_RABBITMQ_QUEUES, GRI_RABBITMQ_QUEUES, OSS, JAVA_STREAM_API_URL, GMV_RABBITMQ_QUEUES, SLOGAN_RABBITMQ_QUEUES, GEN_SINGLE_LOGO_RABBITMQ_QUEUES, PS_RABBITMQ_QUEUES, BATCH_GPI_RABBITMQ_QUEUES, BATCH_GRI_RABBITMQ_QUEUES, \ + BATCH_PS_RABBITMQ_QUEUES, RABBITMQ_ENV from app.schemas.response_template import ResponseModel logger = logging.getLogger() @@ -14,6 +15,7 @@ router = APIRouter() @router.get("{id}") def test(id: int): data = { + "RABBITMQ_ENV":RABBITMQ_ENV, "超分 SR_RABBITMQ_QUEUES": SR_RABBITMQ_QUEUES, "多视角 GMV_RABBITMQ_QUEUES": GMV_RABBITMQ_QUEUES, "pose transform PS_RABBITMQ_QUEUES": PS_RABBITMQ_QUEUES, diff --git a/app/core/config.py b/app/core/config.py index 2abe29c..f0a2c35 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -9,11 +9,11 @@ load_dotenv(os.path.join(BASE_DIR, '.env')) class Settings(BaseSettings): - PROJECT_NAME: str = os.getenv('PROJECT_NAME', 'FASTAPI BASE') - SECRET_KEY: str = os.getenv('SECRET_KEY', '') + PROJECT_NAME: str = 'FASTAPI BASE' + SECRET_KEY: str = '' API_PREFIX: str = '' BACKEND_CORS_ORIGINS: list[str] = ['*'] - DATABASE_URL: str = os.getenv('SQL_DATABASE_URL', '') + DATABASE_URL: str = '' ACCESS_TOKEN_EXPIRE_SECONDS: int = 60 * 60 * 24 * 7 # Token expired after 7 days SECURITY_ALGORITHM: str = 'HS256' LOGGING_CONFIG_FILE: str = os.path.join(BASE_DIR, 'logging_env.py') @@ -36,12 +36,14 @@ else: RECOMMEND_PATH_PREFIX = "app/service/recommend/" CHROMADB_PATH = "/chromadb/" - -RABBITMQ_ENV = "-prod" # 生产环境# -# RABBITMQ_ENV = "-dev" # 开发环境 +# RABBITMQ_ENV = "" # 生产环境 +RABBITMQ_ENV = os.getenv("RABBITMQ_ENV", "-dev") # RABBITMQ_ENV = "-local" # 本地测试环境 -JAVA_STREAM_API_URL = os.getenv("JAVA_STREAM_API_URL", "https://api.aida.com.hk/api/third/party/receiveDesignResults") +if RABBITMQ_ENV == "-dev": + JAVA_STREAM_API_URL = f"https://develop.api.aida.com.hk/api/third/party/receiveDesignResults" +elif RABBITMQ_ENV == "-prod": + JAVA_STREAM_API_URL = f"https://api.aida.com.hk/api/third/party/receiveDesignResults" settings = Settings() @@ -106,7 +108,7 @@ OPENAI_MODEL_LIST = {"gpt-3.5-turbo-0613", SR_MODEL_NAME = "super_resolution" SR_TRITON_URL = "10.1.1.240:10031" SR_MINIO_BUCKET = "aida-users" -SR_RABBITMQ_QUEUES = os.getenv("SR_RABBITMQ_QUEUES", f"SuperResolution{RABBITMQ_ENV}") +SR_RABBITMQ_QUEUES = f"SuperResolution{RABBITMQ_ENV}" # GenerateImage service config FAST_GI_MODEL_URL = '10.1.1.243:10011'