From 0ceabc5cc45b27b663e9111a6dc214ad72f131aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 3 Jul 2024 16:06:38 +0800
Subject: [PATCH] 'commit'

---
 BaiHu/Tools/TestComfyUIApi.py                 |   9 +--------
 BaiHu/Util/SDUtil.py                          |   4 +++-
 BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc | Bin 5519 -> 5950 bytes
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/BaiHu/Tools/TestComfyUIApi.py b/BaiHu/Tools/TestComfyUIApi.py
index 68daba75..ae4c199c 100644
--- a/BaiHu/Tools/TestComfyUIApi.py
+++ b/BaiHu/Tools/TestComfyUIApi.py
@@ -6,13 +6,6 @@ config = ConfigUtil.getConfig()
 comfyui_address = config.get('comfyui', 'server_address')
 webui_address = config.get('webui', 'webui_address')
 
-# 清理GPU缓存
-info = get_comfyui_used(comfyui_address)
-print(info)
-clear_comfyui_cache(comfyui_address)
-info = get_comfyui_used(comfyui_address)
-print(info)
-
 # 清理一下sd
-release_sd()
+release_sd(webui_address,comfyui_address)
 
diff --git a/BaiHu/Util/SDUtil.py b/BaiHu/Util/SDUtil.py
index a73d5695..aae960e8 100644
--- a/BaiHu/Util/SDUtil.py
+++ b/BaiHu/Util/SDUtil.py
@@ -205,9 +205,10 @@ def restart_server(webui_address):
 
 
 # 清理一下SD
-def release_sd(webui_address):
+def release_sd(webui_address,comfyui_address):
     # 获取使显存数量
     total, used = get_webui_used(webui_address)
+    clear_comfyui_cache(comfyui_address)
     # 显存占用超过20GB
     if float(used) > 20:
         print("显存占用高达" + used + "GB，准备重启SD...")
@@ -218,4 +219,5 @@ def release_sd(webui_address):
     else:
         # 清理一下缓存即可
         clear_webui_cache(webui_address)
+        clear_comfyui_cache(comfyui_address)
         print("显存占用正常，无需重新启动SD，清理一下缓存...")
diff --git a/BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc b/BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc
index 48655d9616619a2350e6c3e0f43ea758e30facac..936b15bf89802b8a8daa10bd440c0e8324abba69 100644
GIT binary patch
delta 1048
zcmZ9KUr1AN6vyxR?XPp2(`}iVT2Sdt+z_9NO8iq+l7vQq1#^1ua5mfg-8&VVC|C-W
zl>8!vf{c0)qcnUOB+_#a*-H-%dULZu&|{Bvj?+*t+|Tda^ZTCjJHK=8<LWh^GwN{I
zBz%6G?uTlQ&NvUl`<d!{P%*Py;w@DU-;+AsN|{oQt4DzjNj~!7i#ZSC;#=Mis9#yJ
z)dAFt&HR_px-w<I45jBWSIRWR!@8O>^+ckYDm!=yI{9Vs%drU8R%V?I0PW&?LBMs1
z{N;q}geGy(H3VJaldB9CMXmb?Tor#^Bc6mYVG6MhDNow5WQSNPtbiM0y|8Xf&f{JT
zPvvXz?*6bIh($G>-=u_vgafo^)YV}<W#MWp66{g=8S<Gzk!VntEuHouwL2aTXeu96
zd8c)d2m1qY9^q$6#rmQ=NO=^(IRZ5-hkUd|rpSB9gNBXSzy@}xf+|)HRulVc1>Psz
z?&nzOl6%yvQrzCcct|vOs?Br~4-4)&e(EEdnrl}&E2gwFJLCQ6>;c5i!_Y9`+k~%n
z5F6$l14)r^N~~?<Xs@ovPW%0LNBx=-jD`J!wf@`<Yq+ZEL9WYet8bjjLOX&>XHiZP
z*p_UyVefTQ&YiuS^fMi9MA*OyWBd+Udy1q2{}<VgAG(x~Cg2tug;AzMf=z$|w~f3)
zX9`QOVo5O+<332bfpoYU=S_<76<TyP-MsB(iivi&u4`_~(g5N`W5~?hTKe5wdU}5I
z=|cAH+|RYOIQ;@GjlWkPrKcv-Z>F+S)9EKm9nC(UFFQ<e4g10}?_Q^qNz`X%=d&-y
zQJ;CXj3Ma<3mwhmPTt>qGP#i)-$*{(Torg6rjjkZkIv`4glYmcgSQYa5@>+3VXM)*
zeyM%!wQ)6~1~oOHDPK{qIT18|7g(8-Sq*mJ1C)nx>gomAo3cbTUo5Ei@<s{gz+1$+
rrxLD+KOWz)dX(^1!Zkt{p^reN<jNZm_1+V3QiQyfW^0kPz;6Br$pR5_

delta 590
zcmdm|*RRc&&&$ij00fOpt!eCX6ZvEq=S|dZVU(V@L6Vg*m_bu!<2^P`#;=o~a^7Wh
z*nF7Fn32(8@^|j}j6R#E^LQ~zy8-pyVl6MqEJ?k^nw*ngoT|xNBncEO@}B&McNJsk
z=H+~jjEupPU-HKbc!9*_Ktwo*aG4w-P|lb*`GSBf<C)3t1QZw(Ci4qcnU!#+@Yb-1
zGo<i|Gt{sGX?}5r60RDyW=0@eK%AkOk&z*VA(#QEP7ub{6q-C&P@XYj@?JsX`cihF
z@y}-Ld%AXpRVgo!?e3)Wbo-_!d-p$|vcjs!8YuFMQMJ?nNWa+73>14gyX{%Wgy*wb
zUi58$+CL4XwRa)JfG4{bKVQ)JbjijSTb91x)2PW^Bns4ai@UfqDL1nuz97H2q$ma`
zQX~i>#6WT?EG4NGCAZj%QVVhtlT(XqL4vGlIr)htMcN=$T0mm5o{+SN9Y}^LE59fS
zB%BH&>?g+xsY?g}nOsa<j9iR7j2es@OmaYyhp8xM@;ss0Ku=l;*NUctRHNEllri~?
zur?dW)S~Rke}z>ob^@8j0!W5&01f0}0veSM6x3uYVg^!fn!>l(^NaNg5=%0QoPh#G
s9+L~i)EWII&k)m-asUbVfQV2Kkq9DkKt%rJS7K_6YLf-U)tPt%0F#=fZ2$lO