From 521503e9b5effd15c01ffba4bbdfbedea0fb3309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 2 Jul 2024 15:26:54 +0800 Subject: [PATCH] 'commit' --- BaiHu/Config.ini | 2 +- .../__pycache__/ComfyUIUtil.cpython-310.pyc | Bin 5567 -> 5497 bytes BaiHu/doTask.py | 23 +++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/BaiHu/Config.ini b/BaiHu/Config.ini index a28e87eb..43794255 100644 --- a/BaiHu/Config.ini +++ b/BaiHu/Config.ini @@ -11,7 +11,7 @@ server_address = 192.168.1.21:8188 [webui] ; 生图服务地址 -webui_server = http://192.168.1.21:7860 +webui_address = 192.168.1.21:7860 txt2img_url = /sdapi/v1/txt2img img2img_url = /sdapi/v1/img2img ; WEB服务器地址 diff --git a/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc b/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc index 572579dfb92982741b90bf2cce8e61533591d50b..2476fb77efae3098cd8f2f2e1ddb4f49ba7779bf 100644 GIT binary patch delta 1149 zcmaJ=&uwDwRojD7l{*rY8V4?po^&`NnDyBaeTO>=x*}`hmlPy_oc!5Mb zt!}1ku+ra6y8uh-x6F8Qj(oVH_A<*5sd?L*TqB`o5)4+B2!HV+UBPSh!hWT~Y#D6z zL$=smAQ5K?A|njzA~G50@g&QuESvYRF8#=?HClmR%Hk2uTxD=LooR)#9ZIiVl^ap2 z`Cz@?kUru^Y?xt#Ns1rfDHc8?SRxeAhe#oqj&T>AoNWgJ*huQ(4FxVb`qV0NF33gn8Fa| zQ=MY+AX*18#c{_V-%#vJ(|z~dMpGt5Mp_-S2YHR6(SxI!u=AQ2qD>@aN@P1mK@(0v z>zEXW3z{72Bzv@3;TE(WfF`uBH1Zu9@KSDVJ68@wwOuc7eO$in%SDd|2*06oB3B_Y z<5|K4@qL)uhqD!Z^#U$&$_N8r;2E}_Ri|>t;hegb`@DOLg+mNuu}k{*Wn`h>Zd7YN zo@dQmZ?vis<4NREqVCxD{99q&3w+%2v670%IK&1nvtPf{!VMz0$?z!y&*#68Ar?8b zcQ1a0njA65pOF^i2vT|)(qO|3%;*z@wvK_?P3OCOptz-96M0Wdr{8WVPDpC%poYY$ zBL}smCJ%VYTH7A|ueN@(EgyKbYHh>k>Z(6Sw$3%_)A;{#;a%3aFeL-OrBE4u<4JE& z5k&P}zIgN{83La8!7)>GR9mM*hU)kHvE(I6;T83F{)G7@(MXj>i<9vWyuum&@v*|d SQ;z{dsG6f!%|hz1?fwHshzXkj delta 1194 zcmb7DO>7%Q6rQ)hqI4LmmCO>Za8lNtQ>vjJ_K0Q_5AbaUL{Fbx`(Y^q!QKYMgxU- zO>gDfuy*uQ-Uqm@j|=DRCDP%V{-e-@P%nGY+-*v6#@p{RlnBB? zGF1Jciux_J8@j#w+nuh85ihe~fnZ`$CLZ9+oLJ^398N?XsoyBA!i)OTQr&h96L9nB ztC9!siheY`Jh#DepWyeO2`1)#s~10kmp;i|xO}1Egxd7yVM$-~XZ`nBIm_??!`ph( zzXo6E&;8~>ixO=hI2$ezlV;}1FGNxyp(dnJ6C+6Bbd{@#su&qcq=pn@W0XsCdmzob z2DxE8;FWm@BQrInRTB>^X-ntOpy-~)snd9nXEL%#SjdFle+W->wz6eWIjKE{Kv1;C z@SKpPK*$392}ikdI<=}o`c;wI6w6hirc!4N#4A;5EeI(#1nFi@_~M3W1nbnr_|C91 z@v;z6Bk#o+dONX-vV%6nE`F$w%X8)HWC$IFK`ik#qWHRo%Di)f=o6^xUuOcnTDb~a zx?eee^G()T+ufw4FguNWjvDU7ZYTTOogHk`GIXC7SY^4fm!KqqI}A;IT$w-khUg$5 z@C+aF^z&c=7K~X!&%lH>{?R}_;yIdG19yr1&jw!kR|DUr4&s8M9zM0tl4R+rmDJNS z-k4g)J5(_HvdMJZ>#O@wyVc%}qZ0=YXFgu(uwaX!%y5ojkAW>}SlDCE)?lB3UBP|w zVMgx;mF5q$98?JY_QEAUJcFD-N;eGTZ@<+Dve!?XWN?MA9kLtvj{YvVXsr_s^>0D_ hh3s~(@eW^H++^Sjk(rvk5A#{+<})i+&3)D@{{=!T1b6@d diff --git a/BaiHu/doTask.py b/BaiHu/doTask.py index c90c2ae3..ac0b327e 100644 --- a/BaiHu/doTask.py +++ b/BaiHu/doTask.py @@ -101,7 +101,7 @@ def runComfyUI(model_id, json_data, input_image, target_folder): img = [] for x in input_image: with open(x, "rb") as f: - y = upload_file(server_address, f, "", True) + y = upload_file(comfyui_address, f, "", True) img.append(y) # 如果存在多个姿势图和风格图，那么在配置文件中写死，比如pose=post_1.jpg style=style_1.jpg # 同时，由于ComfyUI需要把这个文件上传到服务器，所以，需要在json文件中指定哪个文件需要上传 @@ -116,7 +116,7 @@ def runComfyUI(model_id, json_data, input_image, target_folder): if value['inputs']['filename_prefix'] == 'ComfyUI': myfilter.append(key) # 生成 - files = generate_clip(server_address, json_data, client_id, target_folder, myfilter) + files = generate_clip(comfyui_address, json_data, client_id, target_folder, myfilter) # 上传到云存储，回写数据接口 for file in files: @@ -156,7 +156,7 @@ def fill_input(prompt_data, file_array): key = x['key'] value = x['value'] with open(value, "rb") as f: - y = upload_file(server_address, f, "", True) + y = upload_file(comfyui_address, f, "", True) # 需要 array = key.split(",") prompt_data[array[0]][array[1]][array[2]] = y @@ -287,17 +287,17 @@ if __name__ == '__main__': machine_id = config['system']['machine_id'] # webui 服务器地址 - webui_server = config['webui']['webui_server'] + webui_address = 'http://' + config['webui']['webui_address'] # 文生图服务地址 - txt2img_url = webui_server + config['webui']['txt2img_url'] + txt2img_url = webui_address + config['webui']['txt2img_url'] # 图生图服务地址 - img2img_url = webui_server + config['webui']['img2img_url'] + img2img_url = webui_address + config['webui']['img2img_url'] # WEB服务器地址 web_url = config['webServer']['web_url'] # COMFYUI服务器地址 - server_address = config.get('comfyui', 'server_address') + comfyui_address = config.get('comfyui', 'server_address') while True: try: @@ -314,11 +314,12 @@ if __name__ == '__main__': finish_task(v_task_id, v_target_img_urls) # 清理SD缓存 - clear_webui_cache(server_address) - get_webui_used(server_address) + clear_webui_cache(webui_address) + get_webui_used(webui_address) + # 清理GPU缓存 - clear_comfyui_cache(server_address) - get_comfyui_used(server_address) + clear_comfyui_cache(comfyui_address) + get_comfyui_used(comfyui_address) elif v_task_id == 0: # 本轮没有任务