Merge remote-tracking branch 'origin/develop' into develop

app/api/api_attribute_retrieve.py

@@ -35,13 +35,13 @@ def attribute_recognition(request_item: list[AttributeRecognitionModel]):
     """
     try:
         for item in request_item:
-            logger.info(f"attribute_recognition request item is : @@@@@@:{json.dumps(item.dict())}")
+            logger.debug(f"attribute_recognition request item is : @@@@@@:{json.dumps(item.dict())}")
         if DEBUG:
             service = AttributeRecognition(const=local_debug_const, request_data=request_item)
         else:
             service = AttributeRecognition(const=const, request_data=request_item)
         data = service.get_result()
-        logger.info(f"attribute_recognition response @@@@@@:{json.dumps(data)}")
+        logger.debug(f"attribute_recognition response @@@@@@:{json.dumps(data)}")
     except Exception as e:
         logger.warning(f"attribute_recognition Run Exception @@@@@@:{e}")
         raise HTTPException(status_code=404, detail=str(e))

app/api/api_generate_image.py

@@ -3,9 +3,10 @@ import logging
 
 from fastapi import APIRouter, BackgroundTasks, HTTPException
 
-from app.schemas.generate_image import GenerateImageModel, GenerateProductImageModel, GenerateSingleLogoImageModel, GenerateRelightImageModel
+from app.schemas.generate_image import GenerateImageModel, GenerateProductImageModel, GenerateSingleLogoImageModel, GenerateRelightImageModel, GenerateMultiViewModel
 from app.schemas.response_template import ResponseModel
 from app.service.generate_image.service_generate_image import GenerateImage, infer_cancel as generate_image_infer_cancel
+from app.service.generate_image.service_generate_multi_view import GenerateMultiView, infer_cancel as generate_multi_view_cancel
 from app.service.generate_image.service_generate_product_image import GenerateProductImage, infer_cancel as generate_product_image_cancel
 from app.service.generate_image.service_generate_relight_image import GenerateRelightImage, infer_cancel as generate_relight_image_cancel
 from app.service.generate_image.service_generate_single_logo import GenerateSingleLogoImage, infer_cancel as generate_single_logo_cancel
@@ -61,6 +62,44 @@ def generate_image(tasks_id: str):
     return ResponseModel(data=data['data'])
 
 
+'''multi view'''
+
+
+@router.post("/generate_multi_view")
+def generate_multi_view(request_item: GenerateMultiViewModel, background_tasks: BackgroundTasks):
+    """
+        创建一个具有以下参数的请求体:
+        - **tasks_id**: 任务id 用于取消生成任务和获取生成结果
+        - **image_url**: 前视角图的输入，minio或S3 url 地址
+
+        示例参数：
+        {
+          "tasks_id": "123-89",
+          "image_url": "aida-collection-element/87/Printboard/842c09cf-7297-42d9-9e6e-9c17d4a13cb5.jpg"
+        }
+    """
+    try:
+        logger.info(f"generate_multi_view request item is : @@@@@@:{json.dumps(request_item.dict())}")
+        service = GenerateMultiView(request_item)
+        background_tasks.add_task(service.get_result)
+    except Exception as e:
+        logger.warning(f"generate_multi_view Run Exception @@@@@@:{e}")
+        raise HTTPException(status_code=404, detail=str(e))
+    return ResponseModel()
+
+
+@router.get("/generate_multi_view_cancel/{tasks_id}")
+def generate_multi_view(tasks_id: str):
+    try:
+        logger.info(f"generate_cancel request item is : @@@@@@:{tasks_id}")
+        data = generate_multi_view_cancel(tasks_id)
+        logger.info(f"generate_cancel response @@@@@@:{data}")
+    except Exception as e:
+        logger.warning(f"generate_cancel Run Exception @@@@@@:{e}")
+        raise HTTPException(status_code=404, detail=str(e))
+    return ResponseModel(data=data['data'])
+
+
 '''single logo'''