From 91ff27fb724963bc8447e2022225b135c403a285 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:12:36 +0800
Subject: [PATCH] 'commit'

---
 BaiHu/Tools/TestComfyUIApi.py                 |  30 ++--------------
 BaiHu/Util/ComfyUIUtil.py                     |  34 ++++++++++++++++++
 .../__pycache__/ComfyUIUtil.cpython-310.pyc   | Bin 4499 -> 5567 bytes
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/BaiHu/Tools/TestComfyUIApi.py b/BaiHu/Tools/TestComfyUIApi.py
index 6fb11b94..994d1216 100644
--- a/BaiHu/Tools/TestComfyUIApi.py
+++ b/BaiHu/Tools/TestComfyUIApi.py
@@ -6,30 +6,6 @@ config = ConfigUtil.getConfig()
 server_address = config.get('comfyui', 'server_address')
 
 
-# 获取webui使用情况
-def get_webui_used():
-    # webui 服务器地址
-    webui_server = config['webui']['webui_server']
-    vram_url = webui_server + config['webui']['get_vram_url']
-    res = submit_post(vram_url, None)
-    if res.status_code == 200:
-        print(res.text)
-    else:
-        print("调用集成的获取显卡显存代码失败！")
-
-
-# 清理webui的缓存
-def clear_webui_cache():
-    # webui 服务器地址
-    webui_server = config['webui']['webui_server']
-    empty_cache_url = webui_server + config['webui']['empty_cache_url']
-    res = submit_post(empty_cache_url, None)
-    if res.status_code == 200:
-        print(res.text)
-    else:
-        print("调用集成的清理显卡显存代码失败！")
-
-
 # 清理GPU缓存
 info = get_comfyui_used(server_address)
 print(info)
@@ -38,8 +14,8 @@ info = get_comfyui_used(server_address)
 print(info)
 
 # 获取使显存数量
-get_webui_used()
+get_webui_used(config)
 # 清理缓存
-clear_webui_cache()
+clear_webui_cache(config)
 # 获取使显存数量
-get_webui_used()
+get_webui_used(config)
diff --git a/BaiHu/Util/ComfyUIUtil.py b/BaiHu/Util/ComfyUIUtil.py
index c1759e8a..aac27baa 100644
--- a/BaiHu/Util/ComfyUIUtil.py
+++ b/BaiHu/Util/ComfyUIUtil.py
@@ -1,3 +1,4 @@
+import json
 import os.path
 import time
 import urllib.parse
@@ -165,3 +166,36 @@ def upload_file(server_address, file, subfolder="", overwrite=False):
     except Exception as error:
         print(error)
     return path
+
+
+# 获取webui使用情况
+def get_webui_used(config):
+    # webui 服务器地址
+    webui_server = config['webui']['webui_server']
+    vram_url = webui_server + config['webui']['get_vram_url']
+    res = submit_post(vram_url, None)
+    if res.status_code == 200:
+        jo = json.loads(res.text)
+        total = jo[0].replace('total', '').replace(' ', '').replace(':', '').replace('GB', '')
+        # free = jo[1].replace('free', '').replace(' ', '').replace(':', '').replace('GB', '')
+        used = jo[2].replace('used', '').replace(' ', '').replace(':', '').replace('GB', '')
+        used_lv = round(1.0 * (float(used)) / float(total) * 100, 2)
+        print("显存:" + total + "GB,已使用:" + used + "GB,使用率：" + str(used_lv) + '%')
+    else:
+        print("调用集成的获取显卡显存代码失败！")
+
+
+# 清理webui的缓存
+def clear_webui_cache(config):
+    # webui 服务器地址
+    webui_server = config['webui']['webui_server']
+    empty_cache_url = webui_server + config['webui']['empty_cache_url']
+    res = submit_post(empty_cache_url, None)
+    if res.status_code == 200:
+        jo = json.loads(res.text)
+        if jo['success']:
+            print("显存清理成功！")
+        else:
+            print("显存清理失败！")
+    else:
+        print("调用集成的清理显卡显存代码失败！")
diff --git a/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc b/BaiHu/Util/__pycache__/ComfyUIUtil.cpython-310.pyc
index 0646df14404ba2a88c0a0afff71167fb9c6f445c..572579dfb92982741b90bf2cce8e61533591d50b 100644
GIT binary patch
delta 1526
zcmb7E-*4Mg6u!r?V<&MEC(D+lE!6~rHCrh^UVxx&WkW53st<G%U?HN^*KO0Kb98MF
z5RRgff)L`zkSD0v1Fe9mLLf0RX+yB>oj<_>B&4M&5`rgQCLTD~$%?wc1NX|`ch0%T
zH}{_J#Qr_k52dVRGEQ(zZM5bt41bUsYF<E(5(+h<_ZV~`^dovCWKowwj`sO>U)E(@
z7i!80LL*dMA$p8TG>ROjGF6ZhG)CjdDos!oIZ2Z=g`A>kdcTH7nr3JgS)+q=H{G)W
zdWPodUW{aEfes+=qA){>Ll>_d2GH7n!34li`*`FCz<&RA@i!Q4ThbQ-Jlq~o8US5?
zHTDqv>HiS>2m*gLUW6C?cjALE-rk67044w1#N9CN|Cm^Ys{fLD7fiK1^;y_Afwc&v
zms!;@1Iegaw#lY2R7|o05_`t~J?X(~{;AXhaI$?q^#s6-|5LiGJ<V5#IXuVVNq<Uv
z1kU*@+R<hO0|p@68VVXBKF9H~e@5`I_ysIrfi%E_z85KwJZT6H@lcGG(1>`EMWEs-
z0na9^aZg-_hUke@Dv&iSH<i}~WTnrsJ~vT=b)g|)Vj@gb|0A)N7j>dE>BwHR1v!E&
zwP29YRF2RD9zu2$n)akTp<14JQRGaXI5AId0ovI-X#rpl%@EAn)w7$ZT5cL^YR<aV
zKn<ykWj$juU7a_b@)=fHD!Z)4p2t!!UZ_BFET>Xq5wvf@zMD|eg~?;A#Fs?ZHYt0Q
zr#^<@$_SgQ*E(OVmfR%TlgCCom%q7j^?LW*Mu|O6NE5fX*L@I|w!Us*@YnNiZoYN4
z`|--wdzU-!f5_i`cfGg6jqg6~t}S;yySR1f^FO{{F2;j|?anS$opRl>9rhyb!7?27
zAOxagzTyNjGwZdAVY0(KCe78Xio*`^q=N`WC1^$s>-1c8o*C%t%JyxK@O)v>Vw5M(
zb2!R@|2cb*Kr2Y`67`D4Z~i65>>PqBXb{J#!U&8A!-%TDEL_;pY7)OcFJsti3uye$
zUK_i!*Vu@I-L@^XL{a>{=-7R?>|$)1&EoH|Cck%(Hkazot7W5NESTG32eR!NhH2aG
zZp`UvuzBT;?pdx-=j~5WgF9BX)%iC``!Da1w7FB$D68^Q?bMPj@)%dGD6u7O^Fy;b
z2d)!4&EYm>GDgj;u)a3o#jawOokjRZ90d-ls0?buFkTeGo}MV?!afRQ%O0y&oCU_^
zVNdzLXa`{0k7dRN#(98$dDuw~{2LOg%a}izxo>m?eT68{p8~RgQ&d!ikEn7$(Ufew
JpzKvMe*=dXma6~&

delta 471
zcmZ9HPiqrV6vgMf`IE_HX7U;`)zCDC7L}n;sSBlxs70(TZY1qOMyQClS|Jj7sT4{@
zq=oJZ<qCqj?5ZneK7f9OZd_#P+GSmey%SvZEza-Ua}QkJ_Zgm!`%x5F^8BOS=QkRM
zar51QOk@#yR)!H(rbe_gXGHfu&(B`w$zJtJs}|Yh>{*#lE_uQ-mB<$cRHi^!p$dh<
zkRpnO5miYGV;ZBRCZ<XkD53E^WSX#Ir5C^b>;Togt`>ob{IPutnC4H;Z_MQT?y<sL
ze%*fyyx_0pIlSRt<&VgCJ4h!V$!`WVks8LKRTCOM+Tz<Vo%~0jfq6cuOrgW4mG_r6
zih5l{D@TQJq#mOAFSG-@4zrwp2)k(CmHp7&GA}pRhwigpf3R+rB}yaH5SS(Q;vH=B
zZhQ^hJdYQEhy17dMBgvAtwL4{SzyvP!Td$vZmmg>Dq{;4)3ITxKbU>}baTVpDT?>_
iZ~ZDB@a1GycZ#66X1ax}@vG#DHzn4$_;b=yapMe2+-7<J