diff --git a/BaiHu/Tools/TestComfyUIApi.py b/BaiHu/Tools/TestComfyUIApi.py index 994d1216..41ffb1be 100644 --- a/BaiHu/Tools/TestComfyUIApi.py +++ b/BaiHu/Tools/TestComfyUIApi.py @@ -3,19 +3,19 @@ from Util.ComfyUIUtil import * # 打开配置文件 config = ConfigUtil.getConfig() -server_address = config.get('comfyui', 'server_address') - +comfyui_address = config.get('comfyui', 'server_address') +webui_address = config.get('webui', 'webui_address') # 清理GPU缓存 -info = get_comfyui_used(server_address) +info = get_comfyui_used(comfyui_address) print(info) -clear_comfyui_cache(server_address) -info = get_comfyui_used(server_address) +clear_comfyui_cache(comfyui_address) +info = get_comfyui_used(comfyui_address) print(info) # 获取使显存数量 -get_webui_used(config) +get_webui_used(webui_address) # 清理缓存 -clear_webui_cache(config) +clear_webui_cache(webui_address) # 获取使显存数量 -get_webui_used(config) +get_webui_used(webui_address) diff --git a/BaiHu/Util/ComfyUIUtil.py b/BaiHu/Util/ComfyUIUtil.py index 47183a22..e3df3b0d 100644 --- a/BaiHu/Util/ComfyUIUtil.py +++ b/BaiHu/Util/ComfyUIUtil.py @@ -169,7 +169,7 @@ def upload_file(server_address, file, subfolder="", overwrite=False): # 获取webui使用情况 def get_webui_used(webui_server): # webui 服务器地址 - vram_url = webui_server + '/sdapi/v1/get_vram' + vram_url = "http://{}/sdapi/v1/get_vram".format(webui_server) res = submit_post(vram_url, None) if res.status_code == 200: jo = json.loads(res.text) @@ -185,7 +185,7 @@ def get_webui_used(webui_server): # 清理webui的缓存 def clear_webui_cache(webui_server): # webui 服务器地址 - empty_cache_url = webui_server + '/sdapi/v1/empty_cache' + empty_cache_url = "http://{}/sdapi/v1/empty_cache".format(webui_server) res = submit_post(empty_cache_url, None) if res.status_code == 200: jo = json.loads(res.text) diff --git a/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc b/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc index 2476fb77..8c60091f 100644 Binary files a/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc and b/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc differ diff --git a/BaiHu/doTask.py b/BaiHu/doTask.py index aeae6b27..943f8f90 100644 --- a/BaiHu/doTask.py +++ b/BaiHu/doTask.py @@ -287,7 +287,7 @@ if __name__ == '__main__': machine_id = config['system']['machine_id'] # webui 服务器地址 - webui_address = "http://{}".format(config['webui']['webui_address']) + webui_address = config['webui']['webui_address'] # 文生图服务地址 txt2img_url = webui_address + config['webui']['txt2img_url'] # 图生图服务地址