From f000e019f82989a56a72deeca2574d5234aaa3f7 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:47:07 +0800
Subject: [PATCH] 'commit'

---
 BaiHu/Tools/TestComfyUIApi.py                 |  16 ++++++++--------
 BaiHu/Util/ComfyUIUtil.py                     |   4 ++--
 .../__pycache__/ComfyUIUtil.cpython-310.pyc   | Bin 5497 -> 5529 bytes
 BaiHu/doTask.py                               |   2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

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 2476fb77efae3098cd8f2f2e1ddb4f49ba7779bf..8c60091f3ac8b8ec624aaf53274f9b50a6314197 100644
GIT binary patch
delta 1001
zcmaKr&rcIU6vy{%ce`a<%CcP`gtQ>Bf%2>VD2fn)h#^J^7lM)v$-1zG7FxHNPBGvj
zhyDrU#gmX2&ypUzdi0<Nt|Z17Pu{)A$@dyaOf>A_^WMDq&g{JRW_}O79*+C1t-6Gt
z^S-`erjFwy8rY2~?H<5*<7MO>z>rAmS2}N@#E$PUx9o7AyCtW}8M`f3^>vtSeAEqq
zNpTWQhKEtdX2q}Q4A>$Ub6}zIDmDhmaf%NiPL*1%=-DbU$3`eTFTS;QPdp+wj<BPC
zjaO>iskppgN6Nb!#S+gmHcEm)#Hosre3jjxKu%nXS7EvFHXZ}GDURE6y-O4~5I;YW
zT6yM{^JkFV3-yimWi(qTMn4RT0V8ERBxQ>5gm7Oh8_&TNUyS6zXAF37C<W3H>;s1Y
zJgF}4%YnQld-Ar-p7PM4f+H2@LqW(3bxVg~Pw~_v8EyF7YUegWc3(kVOH-#`s#E!a
z=0$lVQ0rhxXq7tjNM6j6ycRq}n74SXfzl;;@h&M)(YAF-To1x^K;P(+>Hv}_ElH?r
zzwk5W;$BaI^U7p4`(i&^_1sD^yK_Cendc7mm90<-0CB2vUwmy(v`^ANsa5kHo1n=%
z0?dAG3f(hEi|+|bOq=~3QPx4aXtlOhE@Ibwyc(;bVkXVI6jwJ&zROwjVho8lX3CnT
zu)O87HFQ{>Fe6UPVM~{F&>;qcFes;xF`1Qxkw_jqM$M(oNdMam*2}RS7ulnawLGs1
zw&%jnXp4KP|5PPkuJB!F-CZx_*@`$y?96G+G}$H{ca_ji=p+;flwd|-+i2{zzm_{S
zR$`PgD`AoeQLuV)7l}qN*_e!J`m|VPAvE(DtGV^5=2yq)39va@{6KuL2Gm7#ZSliO
aUu{09S(;fOEE8NpnLzt7z4^bHj>$hW=I*!v

delta 958
zcmaJ=&ubGw6rS1aX4B0k-E7l_Qj*rv(#EunVyv|-trdSDXb@D;(6XeNZId=>;_Pgt
zWn+b0ypI=eEr{SrB>#XnMeyKBSOoFty%#+>FEl6!-NX02ef!PZ_r16KGV|+fv>u6Q
zNL-KJv^I{D@1j#G_S*~URg7obPeZRU&hT;V%)lifDMWW^v1YM4D^@LsQ98$0wGv)w
zzt;?m7x<TOGB_o4bcG*>m$A=tx`p%Y7y1lN&O$yTz?WUOLVN`<N2eiulYfs4&fS49
z3W{*uWet~EjUp@iq1xU?rOIqdXFxCs0!3tOhhBihMSd>o;6nRVRL3~S-}UB(A41*`
z@be?6<(*>9{*ANyfsyHvwCZ!&7{yb3!blmnL74(r1-Q;17*Fsf|7;`=K8b{f2u`3T
zX2`<?wWOxxNn4mm+Y+^ybQlnK@)2$ZyZ{LdqC<tqL^+ZK2Txc%;Sg|B7P_8}PCHen
zuplXind&Jm97lrX79K)Gk0a6}nh3HGiFk4Xk!S*Wis0S^Vm)54C7LBh0<|zk1l>bI
z7wg7pGrw<U9a3ymvb*QAn>MpxnRJbRiw(yXgjul|$0qbL3}T+^<|tm|S##0Q{IKJ$
z*D7Kkb+Pny{>)68OK?EhsMd>&c2=I@Z_QME8Pd{LotB}>Hoz7B!_34(l7=;`<4HUz
zr3C5{b@)hM^5DMEoHFLI|Hn*IOboi~OT=PICw|4?yK!30@Av=pYu6fV&ngv5Wt*-+
zld9vEO18s4^ldK%X$?AE2Z#X-0PFyOx3o+j3o7*fQ^ay<m4aJJg}*-jJU*1`dJGAl
zx+EOBa9E-NK{wLzPHA7QJ2UWI(`#_}7XKQbQ0|J*=Yjt5vCdzz0#EV)1%OQe2LS3(
Kt@A#sfBp}_i09Y<

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']
     # 图生图服务地址