From 5c20b9ccb54d739ab7836278cf12392facd469b8 Mon Sep 17 00:00:00 2001 From: jwkim Date: Thu, 7 Aug 2025 13:38:39 +0900 Subject: [PATCH] =?UTF-8?q?edit=20:=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 6 +++++- main_rest/app/models.py | 22 +++++++++++++++++++++- main_rest/app/routes/services.py | 10 +++++----- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/config.py b/config.py index d7b564a..5042173 100644 --- a/config.py +++ b/config.py @@ -1,3 +1,5 @@ +import os + class Config: def __init__(self): self.set_ict() @@ -25,13 +27,15 @@ class Config: self.sftp_id = "fermat" self.sftp_pw = "fermat3514" - import os if not os.path.exists(self.remote_folder): os.makedirs(self.remote_folder) def set_ict(self): self.config = 'release' self.local_folder = "./result" # 결과물 저장 폴더 + + if not os.path.exists(self.local_folder): + os.makedirs(self.local_folder) rest_config = Config() # rest_config.set_dev() \ No newline at end of file diff --git a/main_rest/app/models.py b/main_rest/app/models.py index ce1e4d0..3a99cdb 100644 --- a/main_rest/app/models.py +++ b/main_rest/app/models.py @@ -598,7 +598,7 @@ class BingCookieSetReq(BaseModel): cookie : str = Field('',description='쿠키 데이터', example='') -class VactorImageSearchReq(BaseModel): +class VectorImageSearchReq(BaseModel): """ ### [Request] vector image search request """ @@ -660,7 +660,27 @@ class ImageGenerateRes(ResponseBase): ImageGenerateRes.error = None ImageGenerateRes.imageLen = img_len return ImageGenerateRes + +class ImageGenerateDataRes(ResponseBase): + """ + ### image generate Data response + """ + imageData : int = Field(0, description='실제 이미지 생성 갯수', example=1) + @staticmethod + def set_error(error,img_data=''): + ImageGenerateRes.result = False + ImageGenerateRes.error = str(error) + ImageGenerateRes.imageData = img_data + + return ImageGenerateRes + + @staticmethod + def set_message(img_data): + ImageGenerateRes.result = True + ImageGenerateRes.error = None + ImageGenerateRes.imageData = img_data + return ImageGenerateRes class BingCookieSetRes(ResponseBase): """ diff --git a/main_rest/app/routes/services.py b/main_rest/app/routes/services.py index 7de101d..50525fb 100644 --- a/main_rest/app/routes/services.py +++ b/main_rest/app/routes/services.py @@ -175,8 +175,8 @@ async def imagen(request: Request, request_body_info: M.ImageGenerateReq): return response.set_error(error=e) -# @router.post("/vactorImageSearch/imagenet/imageGenerate/imagen", summary="벡터 이미지 검색(imagenet) - imagen", response_model=M.ResponseBase) -# async def vactor_imagenet(request: Request, request_body_info: M.VactorImageSearchReq): +# @router.post("/vectorImageSearch/imagenet/imageGenerate/imagen", summary="벡터 이미지 검색(imagenet) - imagen", response_model=M.ResponseBase) +# async def vactor_imagenet(request: Request, request_body_info: M.vectorImageSearchReq): # """ # ## 벡터 이미지 검색 - imagen # > imagen AI를 이용하여 이미지 생성 후 vector 검색 @@ -225,7 +225,7 @@ async def imagen(request: Request, request_body_info: M.ImageGenerateReq): # LOG.error(traceback.format_exc()) # return response.set_error(error=e) -@router.post("/vactorImageSearch/vit/imageGenerate/imagen", summary="벡터 이미지 검색(clip-vit) - imagen", response_model=M.ResponseBase) +@router.post("/vectorImageSearch/vit/imageGenerate/imagen", summary="벡터 이미지 검색(clip-vit) - imagen", response_model=M.ResponseBase) async def vactor_vit(request: Request, request_body_info: M.VectorImageSearchVitReq): """ ## 벡터 이미지 검색(clip-vit) - imagen @@ -310,7 +310,7 @@ async def vactor_vit(request: Request, request_body_info: M.VectorImageSearchVit return response.set_error(error=e) -@router.post("/vactorImageSearch/vit/imageGenerate/imagen/data", summary="벡터 이미지 검색(clip-vit) - imagen(data)", response_model=M.VectorImageSerachDataRes) +@router.post("/vectorImageSearch/vit/imageGenerate/imagen/data", summary="벡터 이미지 검색(clip-vit) - imagen(data)", response_model=M.VectorImageSerachDataRes) async def vactor_vit_report_data(request: Request, request_body_info: M.VectorImageSearchVitDataReq): """ ## 벡터 이미지 검색(clip-vit) - imagen @@ -390,7 +390,7 @@ async def vactor_vit_report_data(request: Request, request_body_info: M.VectorIm return response.set_error(error=e) -@router.post("/vactorImageSearch/vit/imageGenerate/imagen/report", summary="벡터 이미지 검색(clip-vit) - imagen, report 생성", response_model=M.ResponseBase) +@router.post("/vectorImageSearch/vit/imageGenerate/imagen/report", summary="벡터 이미지 검색(clip-vit) - imagen, report 생성", response_model=M.ResponseBase) async def vactor_vit_report(request: Request, request_body_info: M.VectorImageSearchVitReportReq): """ ## 벡터 이미지 검색(clip-vit) - imagen, report 생성