diff --git a/BaiHu/Test/TestSmall.py b/BaiHu/Test/TestSmall.py new file mode 100644 index 00000000..7c9ee5c8 --- /dev/null +++ b/BaiHu/Test/TestSmall.py @@ -0,0 +1,9 @@ +from Util import ConfigUtil +from Util.CommonUtil import * + +# 配置文件 +config = ConfigUtil.getConfig() +# webui 服务器地址 +webui_address = config['webui']['webui_address'] + +txt_2_img_blank(webui_address) \ No newline at end of file diff --git a/BaiHu/Test/tmp.png b/BaiHu/Test/tmp.png new file mode 100644 index 00000000..3fed4ee8 Binary files /dev/null and b/BaiHu/Test/tmp.png differ diff --git a/BaiHu/Tools/addJinDou.py b/BaiHu/Tools/addJinDou.py index b727f39f..ea92c27b 100644 --- a/BaiHu/Tools/addJinDou.py +++ b/BaiHu/Tools/addJinDou.py @@ -18,8 +18,8 @@ if __name__ == '__main__': url = web_url + '/QingLong/HuiYa/addJinDou' # 要发送的数据,可以是字典形式 - id = 1 - jd_count = 100 + id = 6 + jd_count = 100000 data = { "enData": en_data, "id": id, diff --git a/BaiHu/Util/CommonUtil.py b/BaiHu/Util/CommonUtil.py index 959e64f0..6288e0af 100644 --- a/BaiHu/Util/CommonUtil.py +++ b/BaiHu/Util/CommonUtil.py @@ -80,6 +80,12 @@ def get_image_base64_str(image_path): return base64_image_url +# 文生图,完成一个极小的图片创建,防止img_2_img暴显存 +def txt_2_img_blank(webui_address): + txt2img_url = 'http://' + webui_address + '/sdapi/v1/txt2img' + data = {'prompt': 'a dog', 'negative_prompt': '', 'seed': -1, 'steps': 1, 'width': 1, 'height': 1, 'cfg_scale': 1} + submit_post(txt2img_url, data) + # 将图片一切为四 def split_4_image(image_path, out_path): res = [] diff --git a/BaiHu/Util/SDUtil.py b/BaiHu/Util/SDUtil.py index d1bac1ea..97a3a33a 100644 --- a/BaiHu/Util/SDUtil.py +++ b/BaiHu/Util/SDUtil.py @@ -225,17 +225,7 @@ def restart_server(webui_address): def release_sd(webui_address, comfyui_address): # comfyui的显存先清理一下 clear_comfyui_cache(comfyui_address) - - # 获取使显存数量 - total, used = get_webui_used(webui_address) - # 显存占用超过20GB - if float(used) > 20: - print("显存占用高达" + used + "GB,准备重启SD...") - # 重新启动一下SD - restart_server(webui_address) - # 休息2分钟以保证SD重启完成 - time.sleep(2 * 60) - else: - # 清理一下缓存即可 - clear_webui_cache(webui_address) - print("显存占用正常,无需重新启动SD,清理一下缓存...") + # 文生图一下,据测试在img_2_img报错,暴显存的时候,需要先清一下显存 + txt_2_img_blank(webui_address) + # 清理一下缓存 + clear_webui_cache(webui_address) diff --git a/BaiHu/Util/__pycache__/CommonUtil.cpython-310.pyc b/BaiHu/Util/__pycache__/CommonUtil.cpython-310.pyc index 16759582..ace00b3a 100644 Binary files a/BaiHu/Util/__pycache__/CommonUtil.cpython-310.pyc and b/BaiHu/Util/__pycache__/CommonUtil.cpython-310.pyc differ diff --git a/BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc b/BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc index 7728046a..3174fb8c 100644 Binary files a/BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc and b/BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc differ diff --git a/BaiHu/doTask.py b/BaiHu/doTask.py index af103453..7e307f93 100644 --- a/BaiHu/doTask.py +++ b/BaiHu/doTask.py @@ -86,7 +86,6 @@ def webui_img_2_img(model_id, prompt_id, json_data, input_image, target_folder): # 开始生成图片 printf("开始生成图片...") - # 调用生图服务 response = submit_post(img2img_url, json_data) # 创建文件的完整路径 diff --git a/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java b/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java index d00bcde3..6cfb60c0 100644 --- a/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java +++ b/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java @@ -594,7 +594,11 @@ public class HuiYaModel { long s = (secondsToAdd + current_task_seconds) % 60; if (m == 0) { - res = "约" + s + "秒后到作品中查看。"; + if (s == 0) { + res = "约1分钟后到作品中查看。"; + } else { + res = "约" + s + "秒后到作品中查看。"; + } } else { if (s > 0) { res = "约" + m + "分" + s + "秒后到作品中查看。";