服务迁移测试

app/api/api_design.py

@@ -4,6 +4,7 @@ import logging
 import requests
 from fastapi import APIRouter, HTTPException, BackgroundTasks
 
+from app.core.config import settings
 from app.schemas.design import DesignModel, ModelProgressModel, DesignStreamModel, SAMRequestModel
 from app.schemas.response_template import ResponseModel
 from app.service.design_fast.design_generate import design_generate, design_generate_v2
@@ -425,7 +426,7 @@ async def seg_anything(request_data: SAMRequestModel):
     """
     try:
         logger.info(f"seg_anything request item is : @@@@@@:{json.dumps(request_data.dict(), indent=4)}")
-        data = requests.post("http://10.1.1.240:10075/predict", json=request_data.dict())
+        data = requests.post(f"http://{settings.A6000_SERVICE_HOST}:10075/predict", json=request_data.dict())
         logger.info(f"seg_anything response @@@@@@:{json.dumps(json.loads(data.content), indent=4)}")
         return ResponseModel(data=json.loads(data.content))
     except Exception as e:

app/core/config.py

@@ -64,6 +64,10 @@ class Settings(BaseSettings):
     # --- Design Callback Java 接口 ---
     JAVA_STREAM_API_URL: str = Field(default='', description="")
 
+    # --- 服务器IP ---
+    A6000_SERVICE_HOST: str = Field(default='', description="")
+    B_4_X_4090_SERVICE_HOST: str = Field(default='', description="")
+
     # --- 其他配置信息 以下均为Docker容器内配置---
     LOGS_PATH: str = Field(default="/logs/", description="")
     CATEGORY_PATH: str = Field(default="/app/service/attribute/config/descriptor/category/category_dis.csv", description="")
@@ -117,39 +121,39 @@ KEYPOINT_RESULT_TABLE_FIELD_SET = ('neckline_left', 'neckline_right', 'shoulder_
 MILVUS_TABLE_KEYPOINT = "keypoint_cache_2"
 
 # ollama 地址
-OLLAMA_URL = "http://10.1.1.240:11434/api/embeddings"
+OLLAMA_URL = f"http://{settings.A6000_SERVICE_HOST}:11434/api/embeddings"
 
 """Triton Server Config"""
 # Design
-DESIGN_MODEL_URL = '10.1.1.240:10000'
+DESIGN_MODEL_URL = f'{settings.A6000_SERVICE_HOST}:10000'
 DESIGN_MODEL_NAME = 'seg_knet'
 # Generate Image
-GI_MODEL_URL = '10.1.1.240:10061'
+GI_MODEL_URL = f'{settings.A6000_SERVICE_HOST}:10061'
 GI_MODEL_NAME = 'flux'
 # Generate Single Logo
-GSL_MODEL_URL = '10.1.1.243:10041'
+GSL_MODEL_URL = f'{settings.B_4_X_4090_SERVICE_HOST}:10041'
 GSL_MODEL_NAME = 'stable_diffusion_xl_transparent'
 # Generate Product （整套和单品）
-GPI_MODEL_URL = '10.1.1.243:10051'
+GPI_MODEL_URL = f'{settings.B_4_X_4090_SERVICE_HOST}:10051'
 GPI_MODEL_NAME_OVERALL = 'diffusion_ensemble_all'
 GPI_MODEL_NAME_SINGLE = 'stable_diffusion_1_5_cnet'
 
 # 以下停用中...*************
 # 多视角生成
-GMV_MODEL_URL = '10.1.1.243:10081'
+GMV_MODEL_URL = f'{settings.B_4_X_4090_SERVICE_HOST}:10081'
 GMV_MODEL_NAME = 'multi_view'
 # 超分
 SR_MODEL_NAME = "super_resolution"
-SR_TRITON_URL = "10.1.1.240:10031"
+SR_TRITON_URL = f"{settings.A6000_SERVICE_HOST}:10031"
 # 打光
-GRI_MODEL_URL = '10.1.1.240:10051'
+GRI_MODEL_URL = f'{settings.A6000_SERVICE_HOST}:10051'
 GRI_MODEL_NAME_OVERALL = 'diffusion_relight_ensemble'
 GRI_MODEL_NAME_SINGLE = 'stable_diffusion_1_5_relight'
 # agent 图片生成
-FAST_GI_MODEL_URL = '10.1.1.243:10011'
+FAST_GI_MODEL_URL = f'{settings.B_4_X_4090_SERVICE_HOST}:10011'
 FAST_GI_MODEL_NAME = 'stable_diffusion_xl'
 # 图转视频 triton版
-PT_MODEL_URL = '10.1.1.243:10061'
+PT_MODEL_URL = f'{settings.B_4_X_4090_SERVICE_HOST}:10061'
 
 # *************
 

app/service/design_fast/item.py

@@ -82,8 +82,8 @@ class OthersMergeItem(BaseItem):
             Segmentation(minio_client),
             # BackPerspective(minio_client),
             Color(minio_client),
-            NoSegPrintPainting(minio_client),
+            # NoSegPrintPainting(minio_client),
-            PrintPainting(minio_client),
+            # PrintPainting(minio_client),
             Scaling(),
             Split(minio_client)
         ]

app/service/prompt_generation/chatgpt_for_translation.py

@@ -90,7 +90,7 @@ def get_response(messages):
 
 def get_translation_from_llama3(text):
     start_time = time.time()
-    url = "http://10.1.1.240:11434/api/generate"
+    url = f"http://{settings.A6000_SERVICE_HOST}:11434/api/generate"
     # url = "http://10.1.1.240:1143/api/generate"
 
     # prompt = f"System: {prefix_for_llama}\nUser:[{text}]"