From e5adb08d0401ee8d7125ad93f5ccdde1bf1c196a Mon Sep 17 00:00:00 2001 From: zchen Date: Tue, 23 Apr 2024 15:53:24 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=96=B0=E5=A2=9E=20=E7=94=9F=E6=88=90s?= =?UTF-8?q?ketch=E6=97=B6=E5=AF=B9=E5=9B=BE=E7=89=87=E6=B8=85=E7=90=86?= =?UTF-8?q?=E8=83=8C=E6=99=AF=EF=BC=8C=E5=89=94=E9=99=A4=E5=B8=A6=E6=9C=89?= =?UTF-8?q?=E6=B1=A1=E7=82=B9=E7=9A=84=E7=BB=93=E6=9E=9C=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/generate_image/service.py | 31 +++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/app/service/generate_image/service.py b/app/service/generate_image/service.py index 039b570..701b1e8 100644 --- a/app/service/generate_image/service.py +++ b/app/service/generate_image/service.py @@ -75,26 +75,28 @@ class GenerateImage: self.generate_data['data'] = str(error) self.redis_client.set(self.tasks_id, json.dumps(self.generate_data)) else: + logger.info(1111111111111111111111111111) image_result = result.as_numpy("generated_image")[0] + is_smudge = True if self.category == "sketch": # 去背景 remove_bg_image = remove_background(np.asarray(image_result)) # 污点检测 is_smudge, not_smudge_image = stain_detection(remove_bg_image) - if is_smudge: # 无污点 - image_result = not_smudge_image - image_url = upload_png_sd(image_result, user_id=self.user_id, category=f"{self.category}", object_name=f"{self.tasks_id}.png") - logger.info(f"upload image SUCCESS ： {image_url}") - self.generate_data['status'] = "SUCCESS" - self.generate_data['message'] = "success" - self.generate_data['data'] = str(image_url) - self.redis_client.set(self.tasks_id, json.dumps(self.generate_data)) - else: # 有污点 - self.generate_data['status'] = "SUCCESS" - self.generate_data['message'] = "success" - self.generate_data['data'] = str(GI_SYS_IMAGE_URL) - self.redis_client.set(self.tasks_id, json.dumps(self.generate_data)) - logger.info(f"stain_detection result : {self.generate_data}") + image_result = not_smudge_image + if is_smudge: # 无污点 + image_url = upload_png_sd(image_result, user_id=self.user_id, category=f"{self.category}", object_name=f"{self.tasks_id}.png") + logger.info(f"upload image SUCCESS ： {image_url}") + self.generate_data['status'] = "SUCCESS" + self.generate_data['message'] = "success" + self.generate_data['data'] = str(image_url) + self.redis_client.set(self.tasks_id, json.dumps(self.generate_data)) + else: # 有污点 + self.generate_data['status'] = "SUCCESS" + self.generate_data['message'] = "success" + self.generate_data['data'] = str(GI_SYS_IMAGE_URL) + self.redis_client.set(self.tasks_id, json.dumps(self.generate_data)) + logger.info(f"stain_detection result : {self.generate_data}") def read_tasks_status(self): status_data = self.redis_client.get(self.tasks_id) @@ -131,6 +133,7 @@ class GenerateImage: generate_data = None while time_out > 0: generate_data, _ = self.read_tasks_status() + logger.info(generate_data) if generate_data['status'] in ["REVOKED", "FAILURE"]: ctx.cancel() break