From dbe993187fbc2031df17692a629e81edde305db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=91=E6=9E=97=5FCyril=20Pilgrim?=
 <onepigge1999@gmail.com>
Date: Fri, 7 Feb 2025 23:27:31 +0800
Subject: [PATCH] push

---
 __pycache__/__init__.cpython-312.pyc          | Bin 958 -> 974 bytes
 __pycache__/image_generation.cpython-312.pyc  | Bin 6180 -> 6212 bytes
 .../image_understanding.cpython-312.pyc       | Bin 4365 -> 4414 bytes
 __pycache__/llm_loader.cpython-312.pyc        | Bin 2511 -> 2527 bytes
 __pycache__/model_loader.cpython-312.pyc      | Bin 5152 -> 5165 bytes
 .../openai_compatible_loader.cpython-312.pyc  | Bin 9530 -> 10610 bytes
 model_loader.py                               |   2 +-
 openai_compatible_loader.py                   |  25 +++++++++++++++---
 8 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/__pycache__/__init__.cpython-312.pyc b/__pycache__/__init__.cpython-312.pyc
index fa7708f3993ca725fde860d5907eb378b2f35845..016911e2f3f141f1e3c7d3b51779a04783cef7a4 100644
GIT binary patch
delta 105
zcmdnTevX~@G%qg~0}!wXEJ|nF$h)7(&qqJBIJKx)Kch4;FTJufIioZ~-#I@wtuoY8
zKe@EHBtJJkFFz%<7$&IelA2l&oSK>)ACjM+lbu<jA0MBYmst`YuUAm{Ycdz}761^`
BB>(^b

delta 89
zcmX@dzK@;vG%qg~0}wpXSduQck#|3nosFwijB|c&T4ktbOmb;)Nq%m8UVchyF-%a`
lB{j7mI5jm}HzYqlCp)twCO$qhFS8^*Uaz3?)?_K>EdVy1AIbm#

diff --git a/__pycache__/image_generation.cpython-312.pyc b/__pycache__/image_generation.cpython-312.pyc
index 8a6856f072a803a8e2bbec5214b0a099921c5da2..e8fc508bac2d02ac615b2b490309691cfbebc05a 100644
GIT binary patch
delta 222
zcmZ2taKwQ3G%qg~0}!wXEK1kk$eYFD6rvwmoLW?@pHZ5amtI+#oKc#g@0_2TRvGH4
zpIlm8lAjx&m!Fba3=`CKNlh&XPEE~@56REZ$<8d%-@KAVpO^98<eP$vxn}!)XJwY*
zdnh6?xkE@v{sS|R)8X@x0Z4t|lH?V8A}TdKc4F-0_>T-+f?|`83WYI)XgT2%ia`1U
oNbvU;F$NK(PYgU5s{adz@B$Tl2dM(<-y9|4z|8n-@@(-=0HYB`^Z)<=

delta 190
zcmX?Nu*87(G%qg~0}wpXSd#vFBX1Uqk&CNUjB|c&T4ktbOmb;)Nq%m8UVchyF-%a`
zB{j7mI5jm}HzYqlCp)twX7f%KeO|_MlV1uh=9%O7g_T)`@1cy=M3>3agp{Oj$Y_0F
zW#E<k$N&`nz$M8m_C!=_dhEp5sqvGq3xzQ=h^bCC5I!LZq$kAx{vyU8qV$P@2U(S*
ZNC-Pnc6$88_{~)!4$O?VChr#S1OQW(Kv@6)

diff --git a/__pycache__/image_understanding.cpython-312.pyc b/__pycache__/image_understanding.cpython-312.pyc
index e19ecadc29514bbed45a2944bbdf40bf5ba8c160..9d4aaeca46f9a6e7579590909280faa8c6b1ce25 100644
GIT binary patch
delta 237
zcmeBG+NZ>OnwOW00SH(G7NzrT<ekmr6s{jyoLW?@pHZ5amtI+#oKc#g@0_2TRvGH4
zpIlm8lAjx&m!Fba3=`CKNlh&XPEE~@56REZ$<8d%-+YTHgp<*HvOdpu_Q~-d8CV6y
zCTsAjGK1&<UR5<9{Q)HS`wI_)h|(tp5nibeOu~XvPbB5$%g&UYE&q{$Q&em6WL^Uu
zApIT0`2r$-eE^X^zKAeLsC{B!N72A4DmD2buPQH){>}g-fVPTCZRX{xVq*L?xkI28
E05;%9Z2$lO

delta 188
zcmdm|)T_jMnwOW00SKOGEJ<(Q$UB?K$lcW{#yLMXtuoXzCb_h@BtJJkFFz%<7$&Ie
zlA2l&oSK@g8<L-&lbu--v-uTM2q&Z1WP6_POjF}0+w!V1Gl;29PUTgV1JV=Xe}Ca&
z5K;QXAi^v4fk{|U>WQS>eA$_@bLA&*;5CqAkkXtlKS%!84EY~lL>MI0J~6N(E8*c&
VWd|#nDZkl{uZoHB*5sW6tpKaRJY)a>

diff --git a/__pycache__/llm_loader.cpython-312.pyc b/__pycache__/llm_loader.cpython-312.pyc
index 4e3fc96adf3bac2264108cf7630c67f602047d41..d50427ca4d4e5f80786c5eeac648fd5cef5847ce 100644
GIT binary patch
delta 100
zcmX>vd|#ONG%qg~0}vSVEKB#;$g9fi<fk86oLW?@pHZ5amtI+#oKc#g@0_2TRvGH4
wpIlm8lAjx&m!Fba3=`CKNlh&XPEE~@56REZ$<8d%-<-nyhn4Zy<V4Oq0A}bS^Z)<=

delta 84
zcmcaFd|sIMG%qg~0}x!9vm|}iMqX8BBRf~C80Y-lw8~J=nB>yplKkBGy!@2ZVwj+=
hOKNICaB6C{Zb*K9PIhKV%;pm2Kdg+mCKqz%0RY4R9z6g6

diff --git a/__pycache__/model_loader.cpython-312.pyc b/__pycache__/model_loader.cpython-312.pyc
index b4519b8fa75faed17e459c8db870a6b14bf1b824..b9b3bb11cb39ff332da2a33485dcf417a222faba 100644
GIT binary patch
delta 135
zcmZ3Wu~vikG%qg~0}!wXEJ`=u$oq%UDL_B8IJKx)Kch4;FTJufIioZ~-#I@wtuoY8
zKe@EHBtJJkFFz%<7$&IelA2l&oSK>)ACjM+lbu<jzuB7UGc)7)$@*-m+?Qo-zA-b4
fbKMY?oV<`tmHh*V)4{#@9NT*y#$S{72`2#n`$;Zi

delta 122
zcmZ3hu|R|OG%qg~0}wpXSdzYJBkvzZBL`Qj80Y-lw8~J=nB>yplKkBGy!@2ZVwj+=
zOKNICaB6C{Zb*K9PIhKV%w}(<&&-UMCfl>6@?Md(`OM5L&UI7PW<tp1^=zsf7i4Wd
UFf(w9Y`)F*o`><)<kP}Q06WJkYXATM

diff --git a/__pycache__/openai_compatible_loader.cpython-312.pyc b/__pycache__/openai_compatible_loader.cpython-312.pyc
index 96089016804444a4f5d3792488c6eb8d855fb552..944088a8b2240f5bed008a3765e0463c7f7d9e9a 100644
GIT binary patch
delta 2785
zcmbtWTTC0-89v8jk8NyoGuQ^(VGI+3iNTNym&9CR14^<4N(f6}6H#Ih#>CiYX1oMC
zPH2=>l4>7TdsewLs|~wbb*a*>((;n7wrv9JL)FXLA#JD?RrF=sN9Q7iMy=Fy#&{u8
z`_v=NcfS96{_~$>&wO$8+40=p84Ni9kAv)wgZC<ao?E8$o^lTe951-XW22GaOw2zX
z8+ZGnlVdXjN8J9HAVw!gBGCXRWR*1?95>a^ac4(PM5E!eA<?}!qEx~C6tBaH`I0O+
zsgzRW&WR~~C^8ijN5tq^E+V81(U`a;B3{)8=NDI0JE2mdg9>C&mmsCOPWx#ic=tSh
zPA;~nn-p*_dRtpX*OJ_B^ds#%_Gt*fKfuNuNGpo9El<oWy6_Sd8cNdyP-{*@-gBU4
zOfP|<xG7BlozFSlcb83+HNLcBam(;hg(KwHXC!tbt;FVybRl5&Z={VfCmtIwiCzwS
zO7gwRWMy@`&DnT4i44!>Du#9S7jogH+>T1{KJ+%wh{Eg|>?ojaID96>FQK<d^96<3
zuUH>YJ#awp0nLN*dd!!MdaPb5gI<qjiBS^H>T&Q=9rU)+OZ7^^_ruOyxYPg%Z-T_<
z03@*<nYR-C@&!Qq3bo5L^l5XK)oQ|X)!22pn3S<>()v8A<uZ$}QMKHtBHTj}eVYyk
zujIfEgK|ZuB0Qfgwo*WMRH#?Xu%lGJVo?)bM)tH)E?X;PUa9TWQ7dk9Cry1t8&p{M
zN=M<~9=-tC?Um?Dy-EMM7J$o+>mUez;8^^t{;~o(&{*CZ7=MvBNICc>w4P_CELR<i
zmHA&owPOqhsxN8K=LIJ8!-6(qKqm_CdjqwXK)hHygs+7>B<c>n7G%UtlA6zzOxtYg
ztZmjH+cn>}NgBi$i|S4(u)-X-NM^}0s{$b4o+X+R$t0CzoV7sg%p?Y2q6?K9E3|C9
zQ~{*YiKA#PzqCDWm4)uC)7C6mv+F{j1(J25cgvP#5<uyqBJ`!ve8Gl2`m_42S+Zrb
z$i>>@JER>G&0F>?3)F?c9b7ya|J7a}ptAOOnPd+_aUkOjfMmJ@k7tC})MeSFgD^;m
zE#JCZ1ADTm__F^|wsm5V^ar&U=_u>O5aD$Y^n(f@4rddwfVamPar5MG`}c~@tW9F>
z!1s+sT^B(B#F_KVG@J(Ks39;7afbi9lzk9vOSios8!qUrY!QKd+Y3SmH6?kkmEzow
z-Yfq5u4CArCzU%DJUL{Ur)XhD5V=XGBBkV`VUBND{K)iY1>Hv+zJq2<82Ad^D)HIK
z|EBzh_K@}8H_rDjm_B~%?%_Y}^dwn7`gcjFS&ks*!#7~);aQAMihq-62D55`!i-_&
z_)4NViD7mR`kTEB{kqg**p0=F%o>H0=$q0q1)kK_@NWONy~iF({21}`oTRu8ww(*S
z1SC{YXgt=Bx7hPq5RHBJlA!NmcmqHjD1p;BLmX};5J_?JkYM&sO{g~Sho<Wqybd9F
zw@L|Sz|W{@=!8A^9YTe<2!9YqrBuRHI3(ick}ao{A>37gTy=)ow%fy-yUn@akH#X|
zw@$4m9QBWeh1Ob6kc)8Vruf#M;7EbNkZFj?dzbw{_;BwH@mBNgwwrCMR@Y;5P15B3
zr$8EV(N&A<Nl`*<(h21Q5J=B5E2s3^*P7kmJH<r~p>OP^xa&FH+ieRtMj*|d15b=5
zoc-ReM<(y8(VNhF`6{drF+F6bF<~^wr3(Df$*C|WhN6+pw<i*;M>MrO`Qh`uXvOM+
z9q6gm4-cXNTXiitfRri_o179-RFD(-6GWjN9~DMLkxx;hks1CpQ7MJcEQda^b?osH
zv5=2NMsTx2;gQW1xfB(Oh<rd!=nqHn2f_i&o#ng-8SVADaV+p11SU|g-Aunt=r9V~
zD@WXf$}j3s!m2T(RMVk=IG&=%xlnMNd=O0H?QL#}zeqfk;b?RUe=m#*XZdy#*G9lk
z;1B_F<%Mz#=z-mc5_V<w$zhoG%<;R>6T1`MTBLXMDwN5?XC9#;#-&Ui4?jXznR9*5
zXsGqU7aCx(-e^GIyQ2S#&a$SreCV4utlDam`r0eqYr6b|&bDrI+&+5q=+$FaI^Szp
zvpMFwZuTt1lGc6LL2tRyozz!d=}s$)kkYXS>QSSkV!&DR*x8<Rw%;#Wb#^85D--$5
zJiE?TeRlZc!wZ9V&#bb|kJ*+a+mdMQOZ1;uWd{=Zj<phJ!czUy{=2r-n%0D?ZKWd7
zHMr_MnK(3*Fb}`TLBDbAMjtrh-AC}Y|6ubRcY{Bc9IEf5K_cfM7Lv5K&qXEkEPcDE
z<SrHAE~*df-7Uvm)I%4AeIB~C{YBKnCUbutwVJ2uFG8ov&zF;56EB~<YAhTb75U3V
zfnR+19M0fxI^Ko;Ro+3n=DOF69@JG)H`J+6HO?E;fXoX*X1?dk%xe~Fnj(g^YIlaL
z+nKbAXx8hS@kge8Q|Ng!F*y9&$xTU^et~_^*A<s(a&P&I=oGuNc#hC90$Kte5x9-6
kvDNxl8qZ`j5DRmy{AcL*>^?(W0UMtJf@v>}3_EN719}#;pa1{>

delta 1831
zcmbtVYe-vH96#qilH9y%HBVnjG^xg_HIi1XwY5ns+K10R*45(FT%DR2Ik{FlVk2ck
zHU=x6GCRgfHyHE*TTAw#D-5iruxHhlZ6$2bZyRikbaW`|KJ1*E2HaqucHsWb@BjNh
z&i|bI`n~(kLH$=cof?qw?EZ(t?T%Y|8&`X{Wp}SX5*|8xtgUx&GAc#FedCd!7|n`R
z0a2Xj5yi2pqmf8xY((l!L^vMmA<~dSZkXaEaazLH_%3)k@r-vtW*B0pvQ7A)4!k)-
zt`mtf%6bNR@W(>AqLSpGD*U7Hn(;UU;AgNg3(|~HX!^nIT!>$c<G6a4dL1b3rl%Be
zQhmB@)#h0*Acicbsl3huOW8tvKE9FWh`Eu@1@@gA={%WJ-^M!C<%B0R;ZHdYBh7Y=
zoVgHRAWPv-G@iH)zN!znz&!NrRA82{w_zZMz2xv4nNOjwPIZSR>@%ltAAi>YeGRI+
zB{hUE<!Xt%R1AHMswEpod8w8pFYSQ7CdE<>N4Xca=-|>$NO>KkF%6LBHp;w7*5msW
z{;k3?5B)0rvO-C@PDw(S4YZAAqu_7kmy0d_UHtMcp7KVP>U%Y$Xi|UyEtgdDly9Mn
zC36&k5@pf^16FO)tfah{?kVYzy(Kbt2`y?iS#56N*?YXe6XTwmZPDRhwawbwDgfrJ
z3t$+$VNKNQ<``(ji(3xKXvB^jA8$qVu^gfqS<CCz#B9zAB+ky<(*!@tUDOId+E1S_
zI`GXr16CNe3MDf}2E>e`2j=w!`%N-!&4g^mnCS+2B<O%Z05Q|(p^UW|V_@_MZYE_f
z7>qq;64SBSo8d8YwvN=4^~OxW>KjbPLbm_NGmUo5>+|siqlPt&_7GYFK@TVe($Q=g
zCqP9r7U_AL00ehP?yN6nxdHKFj^V(05Ck)pbCxMM1*X}PU<#5F|Fe@`2sRbl+)p9t
z=UBFfV9h`K$>{Hb_n7RFoQMBz&h5dEO+S^<!$x#7ZU!C6@{}TaHY$l>H<RK}BqSnl
z;y3emjDnszYR6yZ+hGd-lJB<_5<z~MSDk}vtpkgBS9-3R-amD-^;_2-V&j7aBMov=
zC(ZN{Xh%+hZWhtaAi4utj<ST=?XzebRgM#Qr54{Ta$|deV0?#|(P{!4nYD7mYuzDS
zQ)pwz)KwV5pBJ~Owxc?ldIVc-mC%O|*al$(zHX~1^$<D52PeZ5(G)u@N~oI(%9s12
z{gQ-IZ2$OK%-91}%~Z}sljD7p<I+f|Z!i*`2#J!2PRa!aLy@S6>Irw}quqGg?kPV_
z4CJHGM?+KtlS4xy5`!t_NO-s}Dj_sRoiE@u`!;tKrSf<13=QT&k;nx3i1tUv&_3#-
zhZD^wfcqULjoof<&YVRBjyv2?nYiZYV7LdZ0}t_ErIp-+?$ASA>6~WM+*bUDvla@t
z+*PVG7kqE7UNcu;l^&YC__FKzA^O67ZQs-B1>Y3ac4)x;Escb)XoL<AyJE0(RI)3T
zJmns?gXrF-P7k~4VM)xYSLm{`t4-!E1G{G6yR7))wsR#7wAW?=DSjvv>6cRM$hd@f
zDsThjPk}11w=AHr%^rS~SBTG*)tr<dUw0)h4d{F|nwf9=GxH-$L7JtGM-@9V<Z+Qb
z%~R#Er{Q+#t)k~f`|;HiFMbhzZbhe_k{GNkpHtAgi_YMS<u0Q{=_v{Vg|{eN!1v25
hv?<k|a3nYx68EA@m~(q|AqLhx0Tk0O@wmlZ^*0(O#a93T

diff --git a/model_loader.py b/model_loader.py
index 19bcf67..348176c 100644
--- a/model_loader.py
+++ b/model_loader.py
@@ -29,7 +29,7 @@ class DeepSeekModelLoader:
         ]
 
         if not model_names:
-            print(f"在 {deepseek_janus_path} 中未找到模型，使用默认列表")
+            # print(f"在 {deepseek_janus_path} 中未找到模型，使用默认列表")
             return DeepSeekModelLoader.DEFAULT_MODELS
 
         return model_names
diff --git a/openai_compatible_loader.py b/openai_compatible_loader.py
index dd0245a..7e8f19e 100644
--- a/openai_compatible_loader.py
+++ b/openai_compatible_loader.py
@@ -36,8 +36,8 @@ class OpenAICompatibleLoader:
             }
         }
 
-    RETURN_TYPES = ("STRING",)
-    RETURN_NAMES = ("text",)
+    RETURN_TYPES = ("STRING", "INT", "INT")
+    RETURN_NAMES = ("text", "input_tokens", "output_tokens")
     FUNCTION = "generate"
     CATEGORY = "DeepSeek_Toolkit"
 
@@ -58,7 +58,7 @@ class OpenAICompatibleLoader:
                         print(f"[DEBUG] API Response: {data}")  # 调试日志
                         response_content = data['choices'][0]['message']['content']
                         print(f"[DEBUG] Extracted Response Content: {response_content}")  # 调试日志
-                        return [response_content]  # 返回值改为列表形式
+                        return [response_content, data]  # 返回值包括 response_content 和 data
                 except Exception as e:
                     print(f"[ERROR] 请求失败: {str(e)}")  # 打印错误信息
                     raise
@@ -164,6 +164,20 @@ class OpenAICompatibleLoader:
         print(f"[DEBUG] Full Payload with Image: {json.dumps(payload, indent=2)}")  # 添加调试日志
         print(f"[DEBUG] Full Payload Sent to API: {json.dumps(payload, indent=2)}")
 
+        # Token 计算逻辑
+        def count_tokens(content):
+            return sum(len(str(item).split()) for item in content)
+
+        # 按字符分割
+        input_tokens = len(prompt)
+        if system_prompt:
+            input_tokens += len(system_prompt)
+        if image is not None:
+            # 假设每 100x100 像素消耗 50 个 token
+            width, height = image.size
+            image_tokens = (width * height) // 20000
+            input_tokens += image_tokens
+
         try:
             time.sleep(1)
             import asyncio
@@ -172,7 +186,10 @@ class OpenAICompatibleLoader:
             asyncio.set_event_loop(loop)
             try:
                 task = loop.create_task(self.async_generate(payload, actual_base_url, api_key))
-                return loop.run_until_complete(task)
+                response_content, data = loop.run_until_complete(task)
+                # Extract completion_tokens from API response
+                completion_tokens = data.get("usage", {}).get("completion_tokens", 0)
+                return [[response_content], int(input_tokens), int(completion_tokens)]
             except Exception as e:
                 print(f"[ERROR] 异步任务失败: {str(e)}")
                 raise