diff --git a/BaiHu/Config.ini b/BaiHu/Config.ini index 4489061d..a28e87eb 100644 --- a/BaiHu/Config.ini +++ b/BaiHu/Config.ini @@ -14,8 +14,6 @@ server_address = 192.168.1.21:8188 webui_server = http://192.168.1.21:7860 txt2img_url = /sdapi/v1/txt2img img2img_url = /sdapi/v1/img2img -get_vram_url = /sdapi/v1/get_vram -empty_cache_url = /sdapi/v1/empty_cache ; WEB服务器地址 [webServer] ; web_url = https://www.hzkjai.com diff --git a/BaiHu/Util/ComfyUIUtil.py b/BaiHu/Util/ComfyUIUtil.py index aac27baa..47183a22 100644 --- a/BaiHu/Util/ComfyUIUtil.py +++ b/BaiHu/Util/ComfyUIUtil.py @@ -140,8 +140,6 @@ def generate_clip(server_address, prompt_data, client_id, output_path, myfilter) # 写入二进制文件 binary_file.write(image_data) ws.close() - # 清理GPU缓存 - clear_comfyui_cache(server_address) return files @@ -169,10 +167,9 @@ def upload_file(server_address, file, subfolder="", overwrite=False): # 获取webui使用情况 -def get_webui_used(config): +def get_webui_used(webui_server): # webui 服务器地址 - webui_server = config['webui']['webui_server'] - vram_url = webui_server + config['webui']['get_vram_url'] + vram_url = webui_server + '/sdapi/v1/get_vram' res = submit_post(vram_url, None) if res.status_code == 200: jo = json.loads(res.text) @@ -186,10 +183,9 @@ def get_webui_used(config): # 清理webui的缓存 -def clear_webui_cache(config): +def clear_webui_cache(webui_server): # webui 服务器地址 - webui_server = config['webui']['webui_server'] - empty_cache_url = webui_server + config['webui']['empty_cache_url'] + empty_cache_url = webui_server + '/sdapi/v1/empty_cache' res = submit_post(empty_cache_url, None) if res.status_code == 200: jo = json.loads(res.text) diff --git a/BaiHu/doTask.py b/BaiHu/doTask.py index de84d42f..c90c2ae3 100644 --- a/BaiHu/doTask.py +++ b/BaiHu/doTask.py @@ -312,6 +312,14 @@ if __name__ == '__main__': v_target_img_urls = v_target_img_urls[0:len(v_target_img_urls) - 1] # 生成完毕 finish_task(v_task_id, v_target_img_urls) + + # 清理SD缓存 + clear_webui_cache(server_address) + get_webui_used(server_address) + # 清理GPU缓存 + clear_comfyui_cache(server_address) + get_comfyui_used(server_address) + elif v_task_id == 0: # 本轮没有任务 time.sleep(3)