From 35a6bd5dfcf136216902065e6ec7e2703ce80de2 Mon Sep 17 00:00:00 2001
From: jinye_huang <jinye_huang@foxmail.com>
Date: Tue, 29 Apr 2025 11:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86Poster=20content=20g?=
 =?UTF-8?q?enerator=E7=9A=84=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content_generator.cpython-312.pyc         | Bin 27738 -> 27783 bytes
 utils/content_generator.py                    |   9 ++++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/utils/__pycache__/content_generator.cpython-312.pyc b/utils/__pycache__/content_generator.cpython-312.pyc
index 255275bc4bf2c875775297f68832720344fbbb54..216907b98b2b1c0e6fc8e275a20fea0946beadcf 100644
GIT binary patch
delta 925
zcmY+DO-vI(6vyXvS<1G%Za)Q-MrxPViUQ&X!H6G(XpIIV2*LrE;u1?~K(+<c?4p<$
zV<a*09W)_L)RRd$NY+FT#@G`?qv2po!IMWW8X@uG#TfyElk9Ky{oi}D@6F6E72xh7
zNFOB0LFo9@>`KheO5*?%cn2D-*N_TE1m;;EC3NQKvl=TR<PkBrv`qt((`=@IXF^fQ
zk%5g+!-10_Kj%o=F&_5fOi1LN2D84M_0?;(oNX=86b(V+4d*n`iVcy{p5<>ygqXrq
z%YTcx+q_<w>M#Vup_SaA$!k#<RiYqZyK*oj&}^pxlw#IyN<)Gs8JjiUln}zz_(kb0
zwHqaxYsQ@`Uaw*cZ9x_Y^Yb2qBz-ud_*_|AZoMBM#+GC`&Q^Ij&X6!yb)J_^m+7Vn
zd$+qa-*l1YH(b*sTeK-dPVb@qQtS;M=Vh87#St~&m)l8*WR#74Qi$GYdj7_J4{rqz
z@{!u0+)cDH(=*|jI=42D!#KIdb(3)ju}auV72<{zEg$`XW@HCm>Ik4SE?OTWRetc|
z>XH54C42npfI6zDbQk@i?xDbNQvwGo0{FbCv80`z!!7djfVJGDg8c5noSIh`S~?a2
zou9>v*mi6=Qg_Nh<{Uyy<mSA!F*`SJ<6|<JxARn)7diGWdtyPW@Ay}M9_wiH8y?d5
z`&1ls?1|+eg*#3^g#jyndQse_vm)vkY8cpk(rXz;te2fr?B1Q|+5?ZRp|1PR(h=&2
zdh}}MFJoYvrVpb_3(&wCtp+mKqczm)38w$+Pw!!7iekyB_oqiw8C8pC;`#$7?`9ao
z_u3H%qP@QtWGm7C3qVEn$}_l(w!~Ywg89UE7{nI?kBW+0TU#-fR9(X?v5(;%!vwxc
zHozqQNFMepg;1nWsT3-A7L=-0cejlXtc>Bo!RF{q7J7)m%kYqa{Xa`w`g&U5#mtio
TxADnfPVN(6-wI*WE2#Ph!c*sD

delta 851
zcmZ9KTSyd97{|}IbJ^RByXtOgWoEnEx+a=LnXz6l$rUW!BvA>xG}`8h*zC%hoDmbk
zLMiMcdJrG#btAHQtxymYBq->?%UcgY1VIM%6m*W8P<;=-GxI;+|9{SzIWt?Zy$R}u
zsyYa(=QZwF?UI@T7{@zMZLY##F~~SCdvd}eA&&_a5*7^%L9-Y#MtvclH3{6vi&~Sc
zCsS!lX4EUG6<2&-7jx`uhHXzPzG$biCQ;i0(PV08v@S{$Dj|kE*Z5DW?f=vS%w3@}
zwQ9BrHkI*Ug+Ii$+T}m(lUbIN0;95MH5?;$O{ITplHtH5|EyP}lIDJvot88ChLfF2
z!DygdOnL~xwib_tI`M_-5vf2O_&N}k6hk$#nE6CuF3r+B3!>(w>H=95(|<k#5UM1~
zSVtb}$Ll49I)_5o<~^9tC)$aRB>nrR@e{q;aPiiM!2{sJykJGK(nYj<!!_xeYt4))
zNRe@&i=@Cu_Or5p?2Dm-v7h)LScKV40dpf*=><3b3ZKIBH8Ii67Q&Y`t+q?-XH1cA
z<)*#12OO*2%PsE;qaT#Zn5z36ENv3WnrM&6!kStU0bwmHMeJl9B&Mv(0)MvWL=KrV
z^*aFF=Cy`b66km|(g!zjI<f+BY;1l4gXX8^Erm(T9r-Y7ZgtE77&zEj29HeaoOQw|
z7HQt15w<1$EJv85j-!dAi^ITntsD|KtySU4nu5YO6StlEKw@k-*`xI(`}F&~t(0R7
zzi44Nf+YjJkY(N*_yKSgr>;MRUi8J@fQBDqUm=F?Z#)J8hlhIHdrS9o>s<~5cZRCi
zEzgagQ;u!=1K*t;7O8M|6#L^1p-J9xh9j3_o<m^R7817-dI^8Mz;PSj#?!7IJ5=rx
JPW>=be*=BT)r0^5

diff --git a/utils/content_generator.py b/utils/content_generator.py
index 9a2d0ed..2941166 100644
--- a/utils/content_generator.py
+++ b/utils/content_generator.py
@@ -195,11 +195,14 @@ class ContentGenerator:
                         poster_num, 
                         content_data_list, 
                         system_prompt=None,
+                        api_url=None,
+                        model_name=None,
+                        api_key=None,
                         timeout=60,
                         max_retries=3):
         """
         生成海报内容
-        
+
         参数:
             poster_num: 海报数量
             content_data_list: 内容数据列表（字典或字符串）
@@ -319,7 +322,7 @@ class ContentGenerator:
         full_response = ""
         try:
             # 使用AI_Agent的non-streaming方法
-            self.logger.info(f"调用AI生成海报配置，模型: {model_name}")
+            self.logger.info(f"调用AI生成海报配置，模型: {self.model_name}")
             full_response, tokens, time_cost = ai_agent.work(
                 system_prompt,
                 user_content,
@@ -570,7 +573,7 @@ class ContentGenerator:
                 model_name,
                 api_key,
                 timeout=timeout,
-            )
+             )
             
             # 检查生成是否失败
             if not isinstance(full_response, str) or not full_response.strip():