From e62b35a721af67aa42997e8e24a2bbe96672c3a9 Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Wed, 25 Sep 2024 11:13:25 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=20=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= =?UTF-8?q?=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/api_design.py | 18 +++++++----------- .../items/pipeline/segmentation.py | 8 ++++---- .../design/items/pipelines/segmentation.py | 8 ++++---- .../design_test/pipeline/segmentation.py | 8 ++++---- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app/api/api_design.py b/app/api/api_design.py index ba8f04d..68f2a44 100644 --- a/app/api/api_design.py +++ b/app/api/api_design.py @@ -7,7 +7,6 @@ from fastapi import APIRouter, HTTPException, UploadFile, File, Form from app.schemas.design import DesignModel, DesignProgressModel, ModelProgressModel, DBGConfigModel from app.schemas.response_template import ResponseModel from app.service.design.model_process_service import model_transpose -from app.service.design.service import generate from app.service.design.service_design_batch_generate import start_design_batch_generate from app.service.design.utils.redis_utils import Redis from app.service.design_test.batch_design import design_generate @@ -185,17 +184,14 @@ def design(request_data: DesignModel): # data = generate(request_data=request_data) # logger.info(f"design response @@@@@@:{json.dumps(data)}") # - logger.info(f"design request item is : @@@@@@:{json.dumps(request_data.dict())}") - data = design_generate(request_data=request_data) - logger.info(f"design response @@@@@@:{json.dumps(data)}") - # try: - # logger.info(f"design request item is : @@@@@@:{json.dumps(request_data.dict())}") - # data = generate(request_data=request_data) - # logger.info(f"design response @@@@@@:{json.dumps(data)}") - # except Exception as e: - # logger.warning(f"design Run Exception @@@@@@:{e}") - # raise HTTPException(status_code=404, detail=str(e)) + try: + logger.info(f"design request item is : @@@@@@:{json.dumps(request_data.dict())}") + data = design_generate(request_data=request_data) + logger.info(f"design response @@@@@@:{json.dumps(data)}") + except Exception as e: + logger.warning(f"design Run Exception @@@@@@:{e}") + raise HTTPException(status_code=404, detail=str(e)) return ResponseModel(data=data) diff --git a/app/service/design/design_batch/items/pipeline/segmentation.py b/app/service/design/design_batch/items/pipeline/segmentation.py index d8aa6d2..2a6d760 100644 --- a/app/service/design/design_batch/items/pipeline/segmentation.py +++ b/app/service/design/design_batch/items/pipeline/segmentation.py @@ -48,9 +48,9 @@ class Segmentation: file_path = f"{SEG_CACHE_PATH}{image_id}.npy" try: np.save(file_path, seg_result) - print("保存成功", os.path.abspath(file_path)) + logging.info("保存成功", os.path.abspath(file_path)) except Exception as e: - print(f"保存失败: {e}") + logger.error(f"保存失败: {e}") @staticmethod def load_seg_result(image_id): @@ -60,8 +60,8 @@ class Segmentation: seg_result = np.load(file_path) return True, seg_result except FileNotFoundError: - print("文件不存在") + logger.warning("文件不存在") return False, None except Exception as e: - print(f"加载失败: {e}") + logger.error(f"加载失败: {e}") return False, None diff --git a/app/service/design/items/pipelines/segmentation.py b/app/service/design/items/pipelines/segmentation.py index c6c7b15..0fe028e 100644 --- a/app/service/design/items/pipelines/segmentation.py +++ b/app/service/design/items/pipelines/segmentation.py @@ -53,9 +53,9 @@ class Segmentation(object): file_path = f"{SEG_CACHE_PATH}{image_id}.npy" try: np.save(file_path, seg_result) - print("保存成功", os.path.abspath(file_path)) + logger.info("保存成功", os.path.abspath(file_path)) except Exception as e: - print(f"保存失败: {e}") + logger.error(f"保存失败: {e}") @staticmethod def load_seg_result(image_id): @@ -64,8 +64,8 @@ class Segmentation(object): seg_result = np.load(file_path) return True, seg_result except FileNotFoundError: - print("文件不存在") + logger.warning("文件不存在") return False, None except Exception as e: - print(f"加载失败: {e}") + logger.error(f"加载失败: {e}") return False, None diff --git a/app/service/design_test/pipeline/segmentation.py b/app/service/design_test/pipeline/segmentation.py index 5c248b2..3897129 100644 --- a/app/service/design_test/pipeline/segmentation.py +++ b/app/service/design_test/pipeline/segmentation.py @@ -51,9 +51,9 @@ class Segmentation: file_path = f"{SEG_CACHE_PATH}{image_id}.npy" try: np.save(file_path, seg_result) - print("保存成功", os.path.abspath(file_path)) + logger.info("保存成功", os.path.abspath(file_path)) except Exception as e: - print(f"保存失败: {e}") + logger.error(f"保存失败: {e}") @staticmethod def load_seg_result(image_id): @@ -63,8 +63,8 @@ class Segmentation: seg_result = np.load(file_path) return True, seg_result except FileNotFoundError: - print("文件不存在") + logger.warning("文件不存在") return False, None except Exception as e: - print(f"加载失败: {e}") + logger.error(f"加载失败: {e}") return False, None