From bec42422f1385dca331d3860a1ff31c396de642f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sat, 6 Jul 2024 16:20:19 +0800 Subject: [PATCH] 'commit' --- BaiHu/Test/TestSmall.py | 9 +++++++++ BaiHu/Test/tmp.png | Bin 0 -> 435 bytes BaiHu/Tools/addJinDou.py | 4 ++-- BaiHu/Util/CommonUtil.py | 6 ++++++ BaiHu/Util/SDUtil.py | 18 ++++-------------- .../__pycache__/CommonUtil.cpython-310.pyc | Bin 3012 -> 3311 bytes BaiHu/Util/__pycache__/SDUtil.cpython-310.pyc | Bin 6404 -> 6179 bytes BaiHu/doTask.py | 1 - .../QingLong/HuiYa/Model/HuiYaModel.java | 6 +++++- 9 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 BaiHu/Test/TestSmall.py create mode 100644 BaiHu/Test/tmp.png diff --git a/BaiHu/Test/TestSmall.py b/BaiHu/Test/TestSmall.py new file mode 100644 index 00000000..7c9ee5c8 --- /dev/null +++ b/BaiHu/Test/TestSmall.py @@ -0,0 +1,9 @@ +from Util import ConfigUtil +from Util.CommonUtil import * + +# 配置文件 +config = ConfigUtil.getConfig() +# webui 服务器地址 +webui_address = config['webui']['webui_address'] + +txt_2_img_blank(webui_address) \ No newline at end of file diff --git a/BaiHu/Test/tmp.png b/BaiHu/Test/tmp.png new file mode 100644 index 0000000000000000000000000000000000000000..3fed4ee815407e0bb0b7e41923cc975f82c29515 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYkaotYsKB?XB^iMgpIsYS&=5e9}t zg_QhsuHcf?f?_KLLmh?S#N2|M)FLYdmjGXFZG~VLR~-dsH+O~N?zql5pVZl+f0Wg)bm*-; z&m8|qcjFD-EdSX8K09o79sXlrvfQUU=&x36_5H==uHhn`vAUP0Z~rG7=MwnAS#WOy PD9Als{an^LB{Ts5Fnylz literal 0 HcmV?d00001 diff --git a/BaiHu/Tools/addJinDou.py b/BaiHu/Tools/addJinDou.py index b727f39f..ea92c27b 100644 --- a/BaiHu/Tools/addJinDou.py +++ b/BaiHu/Tools/addJinDou.py @@ -18,8 +18,8 @@ if __name__ == '__main__': url = web_url + '/QingLong/HuiYa/addJinDou' # 要发送的数据，可以是字典形式 - id = 1 - jd_count = 100 + id = 6 + jd_count = 100000 data = { "enData": en_data, "id": id, diff --git a/BaiHu/Util/CommonUtil.py b/BaiHu/Util/CommonUtil.py index 959e64f0..6288e0af 100644 --- a/BaiHu/Util/CommonUtil.py +++ b/BaiHu/Util/CommonUtil.py @@ -80,6 +80,12 @@ def get_image_base64_str(image_path): return base64_image_url +# 文生图，完成一个极小的图片创建，防止img_2_img暴显存 +def txt_2_img_blank(webui_address): + txt2img_url = 'http://' + webui_address + '/sdapi/v1/txt2img' + data = {'prompt': 'a dog', 'negative_prompt': '', 'seed': -1, 'steps': 1, 'width': 1, 'height': 1, 'cfg_scale': 1} + submit_post(txt2img_url, data) + # 将图片一切为四 def split_4_image(image_path, out_path): res = [] diff --git a/BaiHu/Util/SDUtil.py b/BaiHu/Util/SDUtil.py index d1bac1ea..97a3a33a 100644 --- a/BaiHu/Util/SDUtil.py +++ b/BaiHu/Util/SDUtil.py @@ -225,17 +225,7 @@ def restart_server(webui_address): def release_sd(webui_address, comfyui_address): # comfyui的显存先清理一下 clear_comfyui_cache(comfyui_address) - - # 获取使显存数量 - total, used = get_webui_used(webui_address) - # 显存占用超过20GB - if float(used) > 20: - print("显存占用高达" + used + "GB，准备重启SD...") - # 重新启动一下SD - restart_server(webui_address) - # 休息2分钟以保证SD重启完成 - time.sleep(2 * 60) - else: - # 清理一下缓存即可 - clear_webui_cache(webui_address) - print("显存占用正常，无需重新启动SD，清理一下缓存...") + # 文生图一下，据测试在img_2_img报错，暴显存的时候，需要先清一下显存 + txt_2_img_blank(webui_address) + # 清理一下缓存 + clear_webui_cache(webui_address) diff --git a/BaiHu/Util/__pycache__/CommonUtil.cpython-310.pyc b/BaiHu/Util/__pycache__/CommonUtil.cpython-310.pyc index 167595823958a803983d0f66d377b85103270452..ace00b3a1d686421e55e5720a9fbcc9483a74a61 100644 GIT binary patch delta 930 zcmZWnO=uHA7~RSKHoHk`NlhA)w6(;ttu(b(imeDrg%(6otOzT(Y%|+rG085oleUJI z9`xYBOPQ0RmwFWu1o0~L=FOAr#e%1vym%5szX?TBIt!1PH*ene*zY^Y{2WU9i9}q0 zwg2bY`hIFJnMa@YCf_Hrc<8BMWiYxcn7O^fgMwvLh`;rC$!Xz+ODtop?KQCN2W|^a z>@%7{I{SqxD8X*Uo}(1|8Y>MZ!Iz{s=>NfBhL}fbW{TfO2RVBdAc}iUr{>!09(ea^ zO=%nz*os7zEZ64P7wNLzE9jHQPzeMD_E1#Wio7^93_=q{n%k=S*lX2Hk#yezOpe@>+j#{TQm@k(*XUZXV05XH6nrW(O+0c zh(}Q)B_Mt?pjN8o)*R|>xHb^Gz(i8$x;TIPvXZ+e*4Bc<+owK}!>s_Qj7tU3+X zL?q3f#3-@p!W7sJ#>5RnOFyn`w@Kqv*WpE!0)ahaLpXb_;j|vD0vRd*22#=}iOAxI z`&tJL@OD8Muj58imG}WEvmbq?IR~_v?EXqi^V`%890({vZA%1Cas%$kO#n6@UoG|w z3AamxLBpf=EL4X{V&^r;q|COB^OROmkS^u*iWI>>2NFL<6`;yVmq^yWw8vJqjd=`EP-_MPMG#7v5Hz$z6txR+p%Ifti6kU2X*<*Qns#P#XX=B6 zap%TOb3TFb3y`>XVTg%46L)u`OLl$%6TN2^q{LbLa_+hRd!F-q=G3;rTrN8%zAtay zwd>Z-)K^@B#>^?b(7=79D*H;nv1oZuU&5DWg0I+=vW z(tDBzE|n@%A|A^ltaD5ViyQHv*{6vcg>fP2{=>}#{AFTxL{YK)4e)FrZ-ik_&CcCHGML%8k-tGbHPjAPMNgi9_N=%P^uC!Pfu?m=mqi^GTi><(2!=B*kOX`Wvw60G(-2{$|z4?)O zVT4>9^~72>-E{7I@ZGq5YZqhK4ClnKJe~>TYd9jdgRXlBTpzoHmva5#E|c+i6YiVk zXOn1F@J8`yD`7UC7Z9t6bwm|WLtw6vMW@xJKa75-A9{nHUn4>hFT+=}B$?)G>bkCiCI)Fk<&Q;EQc-XXLNi6(P_T7&=US69JKLE%y5gpy zBEI!-AA1RU=%I&*4f-R3{(yPvA&4Rcww`R+d>WM^}Bs;kxgDbn|b%Uy>}g;4=T=A18x66?ip#RS-^~sDMSC8XI(4$eSvK zYna!M(2I}|AO|6Z@pXhD-YPAU5nhlEyHMi)f)H|j2yUqlQal+PCu5bn!DSL06&s5% z%-@Etv{vN=u_A41Dm5*+76!$q!+(a_22euS1FgVdOvEsPgrpRUw4lmy$Gc@!T~!;y zj8Q&a^O?+425Wc8+PSwL+;f{b_vSW;24NCqec~@p08Cp**HmQ(Tpp+ew?(uP-2}zR zGLtEK)?xs&JRZ)IOl2!vPslt!iL^^;l*{m!k*-#^4L{Qi>I5vE(xU8lRUQ5%a*rsL zTTz*`yOw6K$o1g2ZB2CohyyUipTt^+-Kno(1~%!`nKmohEL&9A11Dr`uWLG^05>sV z0uus)5r(JvhggXimF4=2gbeX=!v(UzpElg+MTd?ARI$v0Q!`b{(<0N%!fDGLC^Up% zBCK$K;}$9La^qK0MT2FXu_N+#$(~`*|Z%$qa_CI zNG|aA@k>pMSmAwW!Zva{2unQJG$HMaFi-fi<`zzycExW$HkCTuL6tG-UtM^NT$=AB zx+GMDJ^mswP7e8}L@shxBzxh2XPVP{N2u);aQa}3FOJ`86Tm!Wa!81Wk+R2Kz13Cq zEO=xxEBinZSt~JCV%bzyGwx?|x>DGHL&4&2#Nx#Arm??+_e`3GVHPli kZj`_i=U$QOWpR&H203&L20{s89|8RWjswUsf73Ge2i5He5C8xG delta 1296 zcmZ8h(Qi{_6z_NM?QJ*OuG?D15(gr&dIJ`QW0FBK7!?Er)K!ryY;?VMc%kjB=ia+@ z*fC(hj7lW=j4r{48BAP42%0|F2eLoG7vJua59>ya35l=9#B;tOQ=9bHbARV|e&0D? zzwh4Lbz^tTjz(Jp_^B?=jkj<6F?LR7IxooAS&BcA|59JZ6uiX$PzG5a-yM9ocRLb( zu$%+O^jkbAn5DdJn6QI%y9m+*Ndzqfy%g^u=;z&PmJRTdI-4Sk{}+Ub+esiwW$5Ky zp+UC4b~<#1h4x`03$O8?!rQyo?2ypa3Cl2TM{9*XdgOnGpX(zFY!9rG3;QvK0V32~ zxonmUt<#q#owcsk1|!8je!Qj0j@9Y^Cc5{VM#|3zkcSiCoTbqo;89T*4iT0>NWS8alqp5Bh!&h9Z zX!=2?V47u35w1G_Ejq$RYDZ%l>k%y-qax9R;(3;#2MPP&5dWgBd#~8_bEKdl^$oV? zmOXd0oO3_a!^Np_tKgad84?U4_(5c_;iLT5whFsYI}?9_v3_1{-^@&Yw|!tIb?B>L z<{Z1^x4d4-n`PIsOaF|#g^c9+*)(5GjzympX%bZVdmA(A6_n&9ej>4HM#s<% zRM{+J0hd(+v+S%iElta=RF!9$!7eGV&6N#&>IxY66*`4gq8WF#)J9B?S<7Z7n}FzA1^I=8)uL|GW6up=Z(2rjqm1~bGI9J z9u8;H>2$L~b#x5=UAOY!UZY+|{mR!1&2O%ve&wqlu%z+n;&6uO`pwllx0dTym+POc zKH|6@T4`YzK_9qGK(-*xCGA2ld_d1<38oS7P*(9rZ_C@o@hQ(5%^3zBcxU}z;qk8L zXX2;{OA$FD#aUR2Nnts{;2PCSK)J(O(hu2AnvNx$MnWv(NAR6eu*Q(aHw=ikP3$QJ z=0~21$K*VU^|p6itB^iq7mId@LP(JX-5_!0AuVpdxF=a6#dH@a0s=87O#?I{T;soV Gz4bRkKU*jO diff --git a/BaiHu/doTask.py b/BaiHu/doTask.py index af103453..7e307f93 100644 --- a/BaiHu/doTask.py +++ b/BaiHu/doTask.py @@ -86,7 +86,6 @@ def webui_img_2_img(model_id, prompt_id, json_data, input_image, target_folder): # 开始生成图片 printf("开始生成图片...") - # 调用生图服务 response = submit_post(img2img_url, json_data) # 创建文件的完整路径 diff --git a/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java b/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java index d00bcde3..6cfb60c0 100644 --- a/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java +++ b/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java @@ -594,7 +594,11 @@ public class HuiYaModel { long s = (secondsToAdd + current_task_seconds) % 60; if (m == 0) { - res = "约" + s + "秒后到作品中查看。"; + if (s == 0) { + res = "约1分钟后到作品中查看。"; + } else { + res = "约" + s + "秒后到作品中查看。"; + } } else { if (s > 0) { res = "约" + m + "分" + s + "秒后到作品中查看。";