From 3db00f623752294960083aa22f1d759e1e0f2278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 28 Jun 2024 11:04:14 +0800
Subject: [PATCH] 'commit'

---
 BaiHu/doTask.py                               | 44 +++++++------------
 ...PG创建自增长序列的手动方法.txt |  4 +-
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/BaiHu/doTask.py b/BaiHu/doTask.py
index 827ffc1f..5e332d9e 100644
--- a/BaiHu/doTask.py
+++ b/BaiHu/doTask.py
@@ -11,7 +11,7 @@ from Util.PngUtil import *
 
 
 # 文生图服务调用
-def webui_txt_2_img(model_id, json_data, input_image):
+def webui_txt_2_img(model_id, json_data, input_image, target_folder):
     # 提示词
     prompt = json_data['prompt']
     # 图片
@@ -34,19 +34,13 @@ def webui_txt_2_img(model_id, json_data, input_image):
 
     # 开始生成图片
     printf("开始生成图片...")
-    # 设置目标文件夹
-    target_folder = "Out"
 
-    # 创建以当前模型命名的目录
-    folder = os.path.join(target_folder, 'Images/User/' + str(model_id) + '/')
-    if not os.path.exists(folder):
-        os.makedirs(folder)
     # 调用生图服务
     response = submit_post(txt2img_url, json_data)
     # 创建文件名
     png_file = str(uuid.uuid4()) + '.png'
     # 创建文件的完整路径
-    file_path = os.path.join(folder, png_file)
+    file_path = os.path.join(target_folder, png_file)
     save_encoded_image(response.json()['images'][0], file_path)
     # 清除Exif信息
     clearExif(file_path, file_path)  # 清除Exif信息
@@ -63,7 +57,7 @@ def webui_txt_2_img(model_id, json_data, input_image):
 
 
 # 图生图服务调用
-def webui_img_2_img(model_id, prompt_id, json_data, input_image):
+def webui_img_2_img(model_id, prompt_id, json_data, input_image, target_folder):
     # 提示词
     prompt = json_data['prompt']
     # 图片
@@ -93,19 +87,13 @@ def webui_img_2_img(model_id, prompt_id, json_data, input_image):
 
     # 开始生成图片
     printf("开始生成图片...")
-    # 设置目标文件夹
-    target_folder = "Out"
 
-    # 创建以当前模型命名的目录
-    folder = os.path.join(target_folder, 'Images/User/' + str(model_id) + '/')
-    if not os.path.exists(folder):
-        os.makedirs(folder)
     # 调用生图服务
     response = submit_post(img2img_url, json_data)
     # 创建文件名
     png_file = str(uuid.uuid4()) + '.png'
     # 创建文件的完整路径
-    file_path = os.path.join(folder, png_file)
+    file_path = os.path.join(target_folder, png_file)
     save_encoded_image(response.json()['images'][0], file_path)
     # 清除Exif信息
     clearExif(file_path, file_path)  # 清除Exif信息
@@ -182,12 +170,7 @@ def fill_input(prompt_data, file_array):
     return prompt_data
 
 
-def runComfyUI(model_id, json_data, input_image):
-    # 创建目标目录
-    output_path = "Out/Images/User/" + str(model_id) + "/"
-    if not os.path.exists(output_path):
-        os.makedirs(output_path)
-
+def runComfyUI(model_id, json_data, input_image, target_folder):
     # 生成一个唯一的客户端ID
     client_id = str(uuid.uuid4())
 
@@ -203,7 +186,7 @@ def runComfyUI(model_id, json_data, input_image):
     # 过滤器,哪些返回节点中获取到的图片是有用的
     myfilter = getMyFilter(json_data)
     # 生成
-    files = generate_clip(server_address, json_data, client_id, output_path, myfilter)
+    files = generate_clip(server_address, json_data, client_id, target_folder, myfilter)
 
     # 上传到云存储，回写数据接口
     for file in files:
@@ -270,20 +253,27 @@ def get_task():
                 vjson_data = json.load(file)
 
             # 利用三元表达式输出
-            printf("发现需要处理的" + ("WebUI" if model_type_id in [1, 3] else "ComfyUI") + "任务,model_id=" + str(
+            printf("发现需要处理的" + ("WebUI" if model_type_id in [1, 2] else "ComfyUI") + "任务,model_id=" + str(
                 model_id) + ",prompt_id=" + str(prompt_id) + ",task_id=" + str(task_id))
 
+            # 创建目标目录
+            output_path = "Out/Images/User/" + str(model_id) + "/"
+            if not os.path.exists(output_path):
+                os.makedirs(output_path)
+
             # SD_TXT2IMG
             if model_type_id == 1:
-                webui_txt_2_img(model_id=model_id, json_data=vjson_data, input_image=input_image)
+                webui_txt_2_img(model_id=model_id, json_data=vjson_data, input_image=input_image,
+                                target_folder=output_path)
 
             # SD_IMG2IMG
             if model_type_id == 2:
                 webui_img_2_img(model_id=model_id, prompt_id=prompt_id, json_data=vjson_data,
-                                input_image=input_image)
+                                input_image=input_image, target_folder=output_path)
             # COMFY_UI
             if model_type_id == 3:
-                runComfyUI(model_id=model_id, json_data=vjson_data, input_image=input_image)
+                runComfyUI(model_id=model_id, json_data=vjson_data, input_image=input_image,
+                           target_folder=output_path)
 
             return task_id
         elif success == 0:
diff --git a/QingLong/PG创建自增长序列的手动方法.txt b/QingLong/PG创建自增长序列的手动方法.txt
index 6bc17ce7..0502a58d 100644
--- a/QingLong/PG创建自增长序列的手动方法.txt
+++ b/QingLong/PG创建自增长序列的手动方法.txt
@@ -21,4 +21,6 @@ COMMENT ON COLUMN "public"."t_hy_user"."login_count" IS '登录次数';
 COMMENT ON COLUMN "public"."t_hy_user"."img_count" IS '生成的图片数量';
 COMMENT ON COLUMN "public"."t_hy_user"."gold_count" IS '金豆数量';
 COMMENT ON COLUMN "public"."t_hy_user"."nick_name" IS '微信昵称';
-COMMENT ON COLUMN "public"."t_hy_user"."last_login_time" IS '最后一次登录时间';
\ No newline at end of file
+COMMENT ON COLUMN "public"."t_hy_user"."last_login_time" IS '最后一次登录时间';
+
+TRUNCATE TABLE t_hy_task RESTART IDENTITY;
\ No newline at end of file