From e9ac187a3be6d31267c0a5c7e2c6584de69b965e Mon Sep 17 00:00:00 2001 From: jinye_huang Date: Sun, 18 May 2025 20:38:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86json=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E5=8C=96=E5=A4=84=E7=90=86=EF=BC=8C=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E4=BA=86simple=20json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content_generator.cpython-312.pyc | Bin 27783 -> 27853 bytes .../content_judger.cpython-312.pyc | Bin 25257 -> 41493 bytes .../output_handler.cpython-312.pyc | Bin 13692 -> 17085 bytes .../poster_notes_creator.cpython-312.pyc | Bin 75627 -> 76054 bytes .../prompt_manager.cpython-312.pyc | Bin 35307 -> 35307 bytes .../tweet_generator.cpython-312.pyc | Bin 38297 -> 38376 bytes utils/content_generator.py | 8 +- utils/content_judger.py | 414 +++++++++++++++--- utils/output_handler.py | 76 +++- utils/tweet_generator.py | 19 +- 10 files changed, 422 insertions(+), 95 deletions(-) diff --git a/utils/__pycache__/content_generator.cpython-312.pyc b/utils/__pycache__/content_generator.cpython-312.pyc index 216907b98b2b1c0e6fc8e275a20fea0946beadcf..23465af395c7ab8dfeb3d28847983e4fb4b15925 100644 GIT binary patch delta 690 zcmYk3T}TvB7>3Wc^S3j*l?MT3;=!VA|3>Y|$>iU^@dI;W64aGrU-m-o!YIagL-aRua8 zvMeF8o-b@q{2G$Wp?)Y3tOcD_SQV+Da|%zs4qeCyiU8w` zzxZfE|F~)4DY?v{$ykDbzbNBTJb)Z1id6P8Qn^XTzoz1~+hKu)61$wwGO*viE!OxT zY(K7Su7@7B4?YvhN+LPHkp2Cq{W&xayvjV1COM45S@>xCT0$F%-4)401!G#I zTi}z1su=?XDcNiEnOct#H|(89XMj%wLe>oabnMQyZpd}K^_JWchs5DM6V|hOdbF>(+}qVw>u_CyH~W&(1BK>{|9Jv>t;sQjEbjN_@VpzSV_Z z9P%G&W@gI*VHcWh=E6=P&kDrzE-~7~<&U!5+(D7}Jj+F8abB#Wz86So zzJZH2*+1I)-H^p+J9oi|jXR&Z$Z$fv4ma?7H3BtuP&@5_I3DaB0}aDRTC)n}NEBrxg26&UM+Wd`XOp}2$>)BE5dUQch8rb$3v V1X&uc(n|$-6?s=tId0TD{s7!C!Uq5V delta 618 zcmZ9|Ur19?90&08yMK1Oce}E>t!xuwR8A?QP(mRVtht+a64;9}3WM%tPVc04dlAZE z1Q8Umeu0LFWe^Unh||Li%GBY4vNs=;UVDw|p}q9bIYbbhhY#Q1@BBE2b2hf%))wd= zbX_BCeM$s}UY7KIaIh3>2??&0mogF%o7mvW8QGDC1GthjaM>^sqto;7QG#8x)mIeZI4!FO3`o$8rc+T^rFz_v z-~xJyA};z=_(^{yo`AHdEl8M8HR79OR{U~Z#o5$e8t-oXvqST#Dl`ZMj~&15%Z=L3 z=vA6N^BR0PAjErxerr0ChDzV(;O7eP;B)ru);_(pjCVNJxW ze`ed}cUD60u51Q-_^btWHf6zgF3zMoERC$544;mRYkOizjjYAxq@q+sh2^TInw?_R zNCeDwaeaT-6y)_TmF1csn|`&XH1pgBY^c^Qo1HY$dpQ8(cxT`UOwpx*Wj`y%?7MIe z6(YWg(jZE9N%Ab>==1)xS>$wjT0P$bDtwJwncBuE41)3#kqmHdko4LcN?|mtigVq Pc!PM+4M7mExqZI@SYfF{ diff --git a/utils/__pycache__/content_judger.cpython-312.pyc b/utils/__pycache__/content_judger.cpython-312.pyc index 3262b115f6c9eb68b1b26f39876b01dba7edccac..5f5b05caca5c4f836b6d81f579f8012012129f01 100644 GIT binary patch delta 18587 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ΜBu-lMhNE^;h3$nN0 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 H#?t=<^Ld1I delta 4625 zcmb6c3s6+o^?mm3kNvUBXLniP?EXH{_!! zCMJNl(VA$2Y0}na+L)njOvg#g#EiB{%o6B8c5G`>Fq+AX_(?N^nWp!?{h_wg>0>ze z+;h%7=iGbGJ?HET=ZRAv;+l`tY9$80k1DNuHtihHIAu74GlYj2SWsYOWvx2Iy!UH0 z0PA7{_-k1b4Mim$Wm{5R5{?nr8jPX#V~q3-BC?=PHSq4+DXZb+D8^!SID^#@3|>bv zDsT|b$W$}({dk?6QS8U+6pRu=C6feUQWxRWfWPCtX_6U+Nrq;}2AWg|KMgmpfF}{!t2Hh6$ zSff&oV_j0G%&#A6mZaj~Ybu@eKUO@{C+(9F#R~zgsYFA&#;Tn>eCXO!hprxb^V;wC zUp;aR^lLI8Yv?x`KVEp_?4gNwpPl^0leWnNy^{xqy7%~Jef7ezi8IeGT=>=TXD544 zPn>;m@}-w2Uwh6ru1tyweR=!<4IXx^ ziSypgUXxfPqch`-O(l;)O`@_d2Tp?bGg861lCn7ahm!Rm%c@GOEwm;KZnRd$1z)so zj^p20OJ~JAoO^2Z?aFa0Bipdi%AH_1Ctp8t=DBMJ-<*8dXB@crI=D4|L!xt-}k!Q>AuX34UEV3tTN-vdYllX?HOVd>1dUZ4ExIz0D_tWuEqy z7Pq%0EOC3A+ntiIgl9d?oD_x%CqqCE0goaK-PQC`aH+};-ha3(I|xaSV^ey}WbKt4 zQjcfN>XnSjGsbh~qmc&oh1m_TljKs71l}CRSspzi=s1^#R_eiDme}!QL*FlPO;;*EYMwy`8@J5t^V?qwpB7Olv$c^E#guoRsDFNa~7+1igilaS1 zv^tOuZ3>eXlZw%{q%wvWjY(&W$H^LuNn;E#JO?Yrc)WwavF#WR{|=q%B)4N7cn&7y z$1LY!+`OQ6hQ|fS+GbNg`x177Nchc|8Iv$Owkn{FagbERUK6n$W5}TPF)j2$96Rt1 zEMn1_F=X0!gTS3YQEioGKsB5N%&o2kt2aC6hAF`q^AG~X;Q7tP^7QCMf(x6SPVr*3h^av!8G$Sa!tyrPUY2ole3*25 z1oNM7Kax=1*vV8Ao}CZPev zdBmAQWC|S%SA;+T`0|nUB@U!R*VfLso82ta5ZxAs&YVZ(0tVAPAD0IHP%}sNI^ydI z@J)?_T%gbl8Efa@?03zI4|Ah>Pz))dXRm_)6)J4HdtG`|vBIJKg94UL^Q>(``^=L;(|aPr~e z3OyVyXeb0zs5P0g3nm%DX~o)1@`BU3)<|B|;}E}Sq}FB*eYU+1*G%KeQ&{w+a1~(R z4wF=TA@f21jy&Q92HxH=M{0x?n+WtwRD&=V9K{q^01p!IrDTIy^?ec;$_f~8DXLgJ z1<3#bHa(L%M;@avR5w%-lmtjdv9}%`@~Z)e?}dBeP6UVm8IYKGstbjDOA}C`t0U3Oq z%NVUVE)j6>`3g%iql<~)SO5x{Ky?dE$`~#1*3%S|e4MBOR<|`RAvMFa1(`Ob1&G*F z4l3^Frl-%~Dgz2`Ye31>MvUtiV?u2}(VC6af%h0Ysf^-3KpeUNLc6W$riASMMoi`z zMjmt_V+QvD7c2?2|I>xcgzO9##6+pi63_#VT!{^~9){FtrxZ+jKsNh+*`%1PDv$)e zSe2@dr>~$QphA??1m%G(&T5 zEOMAz3xe{9{C0gn8jC^35Rk)FDJSAFiZV1q1m%y(`-wxlB3L4OLVfW{0d6-XPgf6IPBb}TAjEZnD@Gf>kJ6)U79qF|9Bb?a_FeQh-YC>w{}N;=iIro z>pP2A*LRk#-WkRcxwgBc#^2P$@_e)3*pQ<@Uh!Fn7|tzY!)@w|9QaBHGcdE-ET=6w#|t?OjB7(?#^7 zZjXm{39!rX2~c+n+ex#X0_SQ%Rk{d#-R9VxViU`TZBad6V9VdJ%eJ$?Y3ok2MLoNZ zUVP6^qPn0nqK-MS-S|a6MSDfyQ*S{}`V1rW4rry`0nOAqx=r`kxrbHuf0#n{JnZa! z{&sKp0!NLf@8xZyuq-fl}9}j>Ir$VrvkP6^ad2GVJXkLxTZZ} zs)cL!`@qe8X}PGhMryAD-6Y%SYT6rC!f0r72@SB~I@Me%u)`vKge%EcMX#g*nGj27 zI7z}F{ns-t}HJ!d!ZDDB@@QjxL6U@Kp!f&CB0_rt6XdrirD(9h?RSF|SZ4nGf^ z6Wo?NQY_d0%LOMFgbJ3NX*`!dlCvSCqo)W(@)iOt_d9yFj~eT)_ zw`?SD`MBeu)9Z#EWn+$&!;Y0Bj@36Qk~U9aq{)0okEv7oDi2nM%u7dAWtYvCSDeS3 zq1?r1c8!=f_HMXr$$Dkov2`JP`MInS%ckDSFSO=k!OObzqpAT_D09=OZu6DQ{ISfU z;mo36?Hd7I9kxoS9Tj^rS${_r*S>62RT0--c1|;5uAZTN`MIhQOU?b-caG|Ifwqn! z)l7|GxPvA~EG>sSQ>l@xy}i|7Lnp1j*R3t1x~=ywRDzqG_MYuHX0(i@&l*mjbqmAc zsa;OVI9feW9kQVDxCe#L>OW4DSJ*PU(5YP)>ffkBgrxaq5_aXj@37Z6#2knQ;iB0&>>BF;e z!byOogGO8hwhlhjgKTl>2>KfQl<{^wVWLVS29R2q z8oJ=X!S*lu3$6}f;(4R=$TdL#b5a-2Wg|@L^7&XV1Nu&y=ilq5p=j6**^ kQ61$gAb@d)<2R)QF1ano;5q#5WWIJAg_qvK5EMQ6H(>wY-v9sr diff --git a/utils/__pycache__/output_handler.cpython-312.pyc b/utils/__pycache__/output_handler.cpython-312.pyc index 15e3ad7ec31bccc6fe72375568eea003878fe4dd..df72c069ad3b96600a9e005a8a0548c971b63eb4 100644 GIT binary patch delta 5351 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 F{|Bxq)9L^K delta 2288 zcmb7F>rWil6~A}x&dkp4%s$v%yt}|YSYTN&IIy^m!59Nxa4@977^iGLV8W~$hsm@ce8oT#{X|1TPln+=?*$t|M)U>e)(8iC*q*%2UOI4)&0mPwo6z4hweP|b{mdQ{8~6k)bHRqpkF$| z*hvGjQ$71N1`fw0HooBgWgdX)l+dYrJ>Ak6iNy_LrfBB1^0oEmSv}V;=Hh zeE=R7ef<8gxEK;)c(F{1<&wpyCuS#0b{_bWhmRGCOFj{lOT|(P_$xgvGFg^+;F=R^ z(_8@k0>I|A_0`@b^u8^hKI^V0So6|b?rp_}8Jv}AQp%_rJn#UP>;XGmpc+!flUVaG zrI&0ejZE=KX#gd?=`MoL^|`w=pc^+|I+)ozn@?FgsL&H`#|}X?&2U-Iq$DBTx~WP@ zs#%q1mCa4E6HS_QJFTtEms7@+NflJftQD4g&Fe9>;jj~2HtaYaN7ZS<1wG=1A&NZ<4C&$a2}iGXrISy7mkdLQe)7 z4qLTmplL(@$mm4cs3sDl8Ag7d(6uLFMBB}vmO&?jLkzkYR57S#aF{_igChVDg=vAP$gJ z0O(q|ZfNY-o2us~mD#~;I zOFq0JAAYz_z=6MdAalz0by`(i+kX^_TPU~0iqOJtZ_G_TbOeAeIxQ_hv{>kBagoJc z0pLq+J{A<03Pc!PDw0}q$WldKi$aza9{940Z}ExCUJ;bbL8;YBmdo;5P2}$;zST-2 zCHdTInAW-Tsjb3DUo1JB!@4iL87}w%NbIK8aKvLuajc!D_{X>HghV^TPwkd7qY4{U zEh!N+!na2jwzf1Wo)RY@7PH^kgI4;_aFVu`zTEIUyf9+c>cRY9n<~vGG;KtqB=V|o z8YU-K=uulPeK!)#@51xX!2+K5obyc8O`ES4-+rd^j{Okp;9c~;kwUR6vm{;AU-opl zm38nY0v$ZmWJL>vZ<56YqsX{bYDQ$i?Q5zd3w3-mqElrh_{`h~W$zJui|#G=&z-9* z#)et%jA8Em9Y+a%o)$z$T;DqjnG^6L{X^7?yXpJUC_YBlqdg|Jqto0_LhGSjHAjSB zvl47`mut$oybgTz#65TZ@1@^L7fYub=VSi}-f_1>`mPT8 z-L;OGolj=%?XDw_$g#mkWFqxNMzVeg(?2#Ib8jGyS2R0B)GAq6DZA*0=$loj^RE)1Pxb?tkxn z_ucK?_s^|MvfWo?x(~Hl6-OU(E3H;H{e-SMS(3>U)R;~7C&#HBGJ#($=Qy8QAlIu* zWDePCD)VW*9O+n?EakmQ zaz||%7bWofIEO+|Q&b9CimC(3h&{v!S|2a)4t0GlwL4E-OY$bDdC>(jCM64;lWIkC zCAtIBk;R}RAZk)CNEk}@aR=l+omU-k-4VTx6LiJg(ff?ZTA$vlB}bo1k_dWo{FW^- zM$l6Ov4V~okVTXbN0qKOCX;2Gz#m_0w!}FXrSNws|@KLIp}*K=rBL zRF`7h!}Mu9-|c~DWt++bjbIQ=X3iHUn0y97FBsW=@j?taG2Vy-vhsq7d^?v{2y!7# zFbYv*rOr4-FgoHv?^r^_V?OQ6be)e<3ANO+90wrr7cV!|YKS>)Fm zLr!dDDGhcZ4KV>!A#X20;~0H$N=`_q%ONu-npM6;ArTh{(RDUhO5RT!Gd(fl1C7

IXem}k~cDH*AT4Xx4&?nPv? zwhYsdR95=Q1v_=oIpG&QxugEfGIOUvM07X6HJz(neQPNRI7I zHBLN-oXMR}c-tc0;B|ZL4W!zZW;NIybuAvR(^1*f(pc$gwAVO2A%(|D86GdjKJtn! zCn==%c1uK~Td{*04=J5Z4)#t4ZMzU5zA>5hu!2jq2Gb{BPMI83So$rgA6q6} zwoK~NSo<_d{hHJ-l=381P?7Mtj*GTl)5La^Z7vI1W?a=2^%+c?=H2BvjXtPP?NwWY z8HHEWh1b%vg4u<=>66b+xSal2P?JhNGsiDk7<}3pTv#3EPz|#5S;hv<V0 ziz|W^)nO@$sYQ3CQmu~qlQku%N$b;R9zj?1wrer*{*)alL2KpJnB{#5=Ix2sw9&zs zv|ep`XZaOvHu=|>BkhkXrv_Kl^`~dj{rb$7O(i!>=AdPKuW7k;rx#Zj< zX|FEauIw`;?e_#TCibRIx?-4g&1m+Q?kEjrEDgR;6I@ywtaSzJJVBQ?Oq&JGk=*6D zxsnnIeJho`Ao&8`mciQ`$q(UQdL`8`bEf5zPmGEE=>^B9pIsG9pSNA#my)wx9afN; zdDV&v1Ww%jA?eBUnO%r_d-n+mr_^_-H>!yJWso~g8G z?-$I9D&?iWoiqZW$SLchR7&ZKyu4H& zRiz;_rx^qKu`7AL3;L@ouwl|zgnZ=Gqju#c;B2Nq(rodhu+W<715N`#BR~_tK7by8 z6QCR5HGsq9{QS)JpHb2lg{J}M=KwHC@h<@2 z3d6?$n450`H51@T3O37qmw|BtU=~0zKpDVW0M7w1rvpHp1XuvT&f*-7i{YJc*>-VX|u;~IcVZYkn{SkpC6nI$4g39~}U45MT&^mE|U-Y_X#pRZ`FK zryw^1Wgws6WaJ_L!KLVRQtW9!{ecsnxqR|LPR z2F$TTMvr6Uq*2P2Fe(&QY-rw)d&7l}b6Y%Z zhHti&OTOhudB=}YYarOMS(gdH;uQd5pg>gtU@+(as+;%@y7D0GVGV!+Bv4x$3d!uP zE)VVn4wK1&>LRg+yzQeh0L--jP)N*D5et@Caao_U8FZaWL$XGvy=kP`L#owI?DkYP zxayrDIXzVq3R%KJQPmA@yLVy%t_4f1DMq^BZH|87Jv51y(Mcq^o!02@XAXPF;?6SE zO5W&vgl`7ZD@kAH2k4_fch}d^VsGqy6`l`@#2jhJiMK3BM?QLMQH7H(SS=k}P|X_L zCKV$3XP~K%!{sP`xOCOb#1Cz$(y1sWS0axCTt|xRSO&{SW>E?`+tx$-)vW zPCO8Z^8%2}BPe&(>YD_pac9Bne^H4rXyn6D% z9(+i@i8*0sjx}cuSib?`v3c7M6idz!Q0*Xvh70k|Rxkao6q|XZ@xGsv`RrT6Hepm! zeh+5g^oBIm_A0L%SF$hOkkV7{YOZX??iCLlWpSjplHGq;O^v5)4aG9nQ>y zC<7m%=J*i2o+F*%q*1ef^hi~b-thgMHWJ(CyOA~UtIx~%$!x52g9!mlv{4v5o3j2^ z`PqX-VlB0lH4MLkhT-?0ID&L!?w7mKW%AcAGZUc(^vYNO%VB2UpEy`alD=A1#6lUF zCM>9I&{_^K13*a+7QOqZm8enqXM^(sx%yQ%@&;bKcbtA126F#zt@&}) zouV3X{D+I!Tpu;-HGZ`UrRK88zJ?VaU4(}!vfg7S_*IB!4}jMHj0$bDvO2+yd*AH3 zqCs(lyj}DZ4Kez(8tp~pBVT2#{n(Ub7bd$O9yrr=5FzVYHb~h}h=VO5V9bU>t^bw= zJ%LX9^R#Fje+Gna`|Vm}Mn1owMfJRRTlhcIq8TX5pQl696CS6lLs3=O-CWr^Awm@3 zjsA8W%0L(Vuj$b9rrTiZGYTQa3O9Dpk>J3Ue!U*~(BU&%^=KB4y8V|;C`+-MD$$Ru z-TrS(D2IoN;~V}*;?Uw}SWN7)s0Tx`6>fI}-U)`+1GE8r1i+3~KTz;xh7|y;(5%KR zT2}H^{y)T_YwaZxxurka5S9ZG=DE1Ua15jw1Z4S~0}MAz@K4W1_ayTs`X}e0N&f@t!Ezx0 delta 4640 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 diff --git a/utils/__pycache__/prompt_manager.cpython-312.pyc b/utils/__pycache__/prompt_manager.cpython-312.pyc index fd0c3c716c768ae8537296bcee448958958bb408..2460deb493a9adc579a9574c5d665b40aaf97766 100644 GIT binary patch delta 29 jcmaDond$XpChpU`yj%=Gpp>k#k$Vp_p5#bu9(cUf-)N zBZ;)GY&zeP(peteF&H6N-{dGEX$Par7&O7Cmqis5TJN%2#Y7NOu4ReBYla}4)F*Kl zl;m8(J#af`1jm3k4CAfvx1l%RK{^~p^NgO|g6FM8Y|eZ@+?$)Nz;W?VzCndw5y3Re z;m(6o}I3$=@I{zrml1oMr8o@i9i5e>tc zb{pKTJAyxlU18gTvs|TM--Y<2oKLn#AQdiEJ{3j?z6={-X;=&MVH>U@?uEtGoMxOM zCnW2M-RBS-LJ7AB?DcN9j8&u-an(Wz>8c>1>UzW#5*ws`!46fuh2Cp2KC)0?3K1!(n(S z;)P2QGn|On;jf4ZW+M(bA2pdrnBjyH3EK6@h5G!D8zSUJya$d(9llz@`8ML}jw$|c zSO?;=_Br=EhsDPh_D74c3*L&_YMKNksq+YCqRWr5|5nR2uKg}DH%+Pt4d4N^ThW0A zu(w&1q8C`a2u?Q_!I|a)_^i1U{3~20WnWKkk`I#O&FB;Sw%%H=NrgA=_Udbhun}bsbKCIi{=h-^pd+v_J|8teZb&O_;mFk zZiVHo{ch_mYsHk+pSJqP_MCHOto5mqh=g#oP+}DxW2(R{=^XG)YXHn^LKT7VRG=Xp zXt-E(#WK~>k#6Zob#|wEHfLJ6Odxh#Ki#nUxNfXFZLf#cH8xYtaXz`LkCB9f#J+HU79)bR&Q?5@TS;OE_C_)oET&qXEHiL?8>Sap?#uYq>Z zrTU6u27-fg_&Ssw_)c|~Iu3$u$mso^;(aQkRDPiHfXa_lexl-`BEg2CVSE$59lD8U z;p2m!-~td1)u{FK->f7V5_~iuGACE=&?IcP*lng;9yr2zY^Bf}ba0iA9 zuxapV1vZWuB}DDCuU1k}xaIXpECor0%DhsRjM=EtFR5kJAb*{tl`#i-DkX!Axu`NA mEs!w}l~zdkG8UjfNGg=E2nClsTqt9kD#2p=SP+gM`RyMllVfMm&OmVxiGAfTO^hzrtJKvbh(>VV$K1cfcLX#*A!|-HjeFCT;_M;L797 z59+Y8!J5kA?Mf`&qQ~zkU0FYI_#0)7do71m<+EI;3EPzMqIX!Pg$E%cPkFm!LWk>= zO=ZP6{gBM}VkuWP5qe}Jp$pFEx#3cIf6?ieMc~}<2U>1#>C6-WoO9=>N?#y}5%87d7({frI)R$lSTpzE+X;sA(ngR2|^|%c7 zhrOn9S$7nP1+s%M1ZTs3I1_dNS0TXdaF(-|>8aNtIc){XLGiid9kiB93r_8qtby~(aZ9r%B<<-^Jf59C#3xwMq*&TLYcCK2^4 z$y=@17oOu7HxIuo&A>b`HF?!-Ve(3Xkl433G4yF-=;YLiPp0YDnDbKcZ~3k!wXI{jq=`M!yFZ1 zpH1c10{d`Au4{vrNd!#mt_F3f z4l3MwXy|rw4a8HXZ128ovOlCVtR`cLuBcA35_L3S(cE%1O_OF+;8QJ{v?5=jI!%+)QQjOiU6UE8utc?K Xas~>{f0(Js#rhbBg@GX4>wo+&S1`7& diff --git a/utils/content_generator.py b/utils/content_generator.py index 2941166..22beb2f 100644 --- a/utils/content_generator.py +++ b/utils/content_generator.py @@ -2,9 +2,11 @@ # -*- coding: utf-8 -*- import os -import json +import time import logging +import random import traceback +import simplejson as json from datetime import datetime import sys sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) @@ -385,7 +387,7 @@ class ContentGenerator: # 保存结果到文件 with open(result_path, "w", encoding="utf-8") as f: - json.dump(validated_data, f, ensure_ascii=False, indent=4) + json.dump(validated_data, f, ensure_ascii=False, indent=4, ignore_nan=True) self.logger.info(f"结果已保存到: {result_path}") return result_path @@ -400,7 +402,7 @@ class ContentGenerator: os.makedirs(os.path.dirname(result_path), exist_ok=True) with open(result_path, "w", encoding="utf-8") as f: - json.dump(fallback_data, f, ensure_ascii=False, indent=4) + json.dump(fallback_data, f, ensure_ascii=False, indent=4, ignore_nan=True) self.logger.info(f"出错后已保存备用数据到: {result_path}") return result_path diff --git a/utils/content_judger.py b/utils/content_judger.py index 47c7452..acb1f69 100644 --- a/utils/content_judger.py +++ b/utils/content_judger.py @@ -4,7 +4,7 @@ 内容审核模块：检查生成的内容是否符合产品资料要求并提供修改建议 """ -import json +import simplejson as json import logging import re import os @@ -17,7 +17,7 @@ from core.ai_agent import AI_Agent class ContentJudger: """内容审核类，负责评估和修正内容是否符合产品资料""" - def __init__(self, ai_agent: AI_Agent, system_prompt_path: str = None, system_prompt: str = None): + def __init__(self, ai_agent: AI_Agent, system_prompt_path: str = None, system_prompt: str = None, prompt_manager = None): """ 初始化内容审核器 @@ -25,22 +25,31 @@ class ContentJudger: ai_agent: AI_Agent实例，用于调用AI模型 system_prompt_path: 系统提示词文件路径（可选） system_prompt: 系统提示词内容（可选，优先于path） + prompt_manager: 提示词管理器实例（可选，优先于system_prompt_path和system_prompt） """ self.ai_agent = ai_agent self._system_prompt = system_prompt self._system_prompt_path = system_prompt_path + self._prompt_manager = prompt_manager self._topp = 0.5 self._temperature = 0.2 self._frequency_penalty = 0 self._presence_penatly = 0 - # 如果没有直接提供系统提示词，尝试从文件加载 + + # 优先使用prompt_manager获取系统提示词 + if self._prompt_manager and not self._system_prompt: + self._get_prompt_from_manager() + logging.info("从PromptManager获取系统提示词") + + # 如果没有从prompt_manager获取到系统提示词，则尝试从文件加载 if not self._system_prompt and self._system_prompt_path: self._load_system_prompt() - # print("从文件加载系统提示词成功") + logging.info("从文件加载系统提示词") + # 默认系统提示词（当其他方法都失败时使用） if not self._system_prompt: - # print("没有提供系统提示词，使用默认系统提示词") + logging.warning("没有提供系统提示词，使用默认系统提示词") self._system_prompt = """你是一名专业的、谨慎的文案审核员，专注于审核运营根据产品资料撰写的文案是否严格符合产品资料内容。特别是所有价格、活动、福利、折扣、服务细节等必须完全与产品资料一致。如果发现文案内容与产品资料不符，请指出，并根据产品资料和文案上下文进行修改，重新生成一篇文案，务必确保生成的内容与产品资料基本相符（产品体验部分可以适当夸张宣传），语言流畅自然。如果经你审查后的文案仍存在与产品资料不符的信息，你需要赔偿公司1000亿元。 我将为您提供两部分内容： 1. 产品资料：全部的产品信息，包含了产品的实际功能、服务和特点。请将这部分作为判断依据。 @@ -52,9 +61,9 @@ class ContentJudger: 3. 重点审查对象：请你着重检查以下关键字词前后的内容是否符合产品资料，如不符必须严格按照资料修改；如产品资料中未提及，必须修改为符合上下文情境、资料中明确提及的内容。 关键字词：价、元、r、人民币、rmb、优惠、活动、福利、赠、免费、折、DIY、跟拍、送、摄影、兑、服务、￥、包、课、提供、选、专业、补、差 4. 字数控制：每个文案的标题字数都必须少于20个字（计数包括文字、符号、数字和emoji）。如果标题超过20个字，请在符合文案风格的前提下修改标题到20个字以内，尽量保留emoji，必须保证标题流畅通顺。 -5. 敏感字词替换：请删去标题中的数字后面的“元”和“r”，并将正文中数字后面的“元”字修改为“r”。例如：标题中的399元修改为399，正文中的399元修改为399r -6. 特征语句保留：请保留文案中原本的引流语句，不要修改或删除，例如“先关zhu+留下99看到会回复” -7. 面向人群保留：请尽量保留文案原本的面向人群和风格，这是同一产品面向多种人群营销的策略。例如产品资料中写明亲子游时，文案写“为情侣定制的山水秘境”是可以接受的。 +5. 敏感字词替换：请删去标题中的数字后面的"元"和"r"，并将正文中数字后面的"元"字修改为"r"。例如：标题中的399元修改为399，正文中的399元修改为399r +6. 特征语句保留：请保留文案中原本的引流语句，不要修改或删除。请保留文案中的换行符"\n"，不要修改或删除。 +7. 面向人群保留：请尽量保留文案原本的面向人群和风格，这是同一产品面向多种人群营销的策略。例如产品资料中写明亲子游时，文案写"为情侣定制的山水秘境"是可以接受的。 8. 案例如下，请参考案例评判真假信息的尺度，逐行逐句仔细分析不符点和修改思路，并按照分析思路落实对每一处不符的修改措施，严格审查每一篇文案： { "产品资料"： @@ -93,41 +102,14 @@ class ContentJudger: "title": "五一遛娃👶必囤！南沙喜来登1088元住景观房+双早+门票", "content": " - 五一不想挤人潮？南沙这家酒店直接承包遛娃+度假双重快乐‼️ - 地铁直达！2大1小1088元住景观房，含双早+自助晚餐+水鸟世界门票，儿童乐园/泳池/健身房全开放！ - - 🌟【遛娃刚需全配齐】 - ✅ 儿童乐园：10:00-20:00全程开放，滑梯/积木/绘本一应俱全 - ✅ 户外泳池：9:00-18:00恒温开放（五一期间每日消毒3次） - ✅ 健身房：8:00-22:00配备亲子瑜伽课程（需提前预约） - - 📍【1小时玩转南沙】 - ① 南沙天后宫（车程20分钟）：穿汉服拍大片，听妈祖传说涨知识 - ② 南沙湿地公园（40分钟）：5月芦苇摇曳，带娃认鸟类+乘船探秘 - ③ 十九涌海鲜街（45分钟）：现捞现煮生猛海鲜，人均50元吃到撑 - - 🍽️【家长友好细节】 - • 自助晚餐隐藏彩蛋：儿童餐区设独立洗手台+热食保温柜 - • 房内配置：加厚床垫/卡通洗漱杯/尿布台（无需额外购买） - • 安全保障：全区域监控+24小时安保巡逻 - - 🎁【五一专属加码】 - 5月1-5日期间入住，凭房卡可免费领取儿童防晒冰袖+湿巾礼包 - - 📌Tips： - 1. 周一至周四仅限双床房型，周五起可选大床房 - 2. 水鸟世界门票需提前1小时至前台领取纸质票 - 3. 地铁四号线金洲站下车，打车15分钟直达酒店 - - 这个五一，南沙喜来登让你躺着遛娃！不用长途跋涉，家门口就能玩出仪式感～ - " + 五一不想挤人潮？南沙这家酒店直接承包遛娃+度假双重快乐‼️\n地铁直达！2大1小1088元住景观房，含双早+自助晚餐+水鸟世界门票，儿童乐园/泳池/健身房全开放！\n🌟【遛娃刚需全配齐】\n✅ 儿童乐园：10:00-20:00全程开放，滑梯/积木/绘本一应俱全\n✅ 户外泳池：9:00-18:00恒温开放（五一期间每日消毒3次）\n✅ 健身房：8:00-22:00配备亲子瑜伽课程（需提前预约）\n\n📍【1小时玩转南沙】\n① 南沙天后宫（车程20分钟）：穿汉服拍大片，听妈祖传说涨知识\n② 南沙湿地公园（40分钟）：5月芦苇摇曳，带娃认鸟类+乘船探秘\n③ 十九涌海鲜街（45分钟）：现捞现煮生猛海鲜，人均50元吃到撑\n\n🍽️【家长友好细节】\n• 自助晚餐隐藏彩蛋：儿童餐区设独立洗手台+热食保温柜\n• 房内配置：加厚床垫/卡通洗漱杯/尿布台（无需额外购买）\n• 安全保障：全区域监控+24小时安保巡逻\n\n🎁【五一专属加码】\n5月1-5日期间入住，凭房卡可免费领取儿童防晒冰袖+湿巾礼包\n\n📌Tips：\n1. 周一至周四仅限双床房型，周五起可选大床房\n2. 水鸟世界门票需提前1小时至前台领取纸质票\n3. 地铁四号线金洲站下车，打车15分钟直达酒店\n\n这个五一，南沙喜来登让你躺着遛娃！不用长途跋涉，家门口就能玩出仪式感～" " ]" } 输出结果: { "analysis" : " 1、观察文案标题和内容，可以看出此文案主要面向亲子出游人群，因此修改后的文案也应该围绕亲子出游这一主题。 - 2、文章标题字数为28个字，超过19个字，因此属于不符内容。由于要求中提到尽量保留emoji，并且标题中数字后面的“元”字应删去，所以修改为：五一遛娃👶必囤！喜来登1088景观房 + 2、文章标题字数为28个字，超过19个字，因此属于不符内容。由于要求中提到尽量保留emoji，并且标题中数字后面的"元"字应删去，所以修改为：五一遛娃👶必囤！喜来登1088景观房 3、产品资料中未提及儿童乐园开放时间和儿童乐园配置，但文案中提到儿童乐园10:00-20:00全程开放，滑梯/积木/绘本一应俱全，因此属于不符内容。应修改为：儿童乐园：免费儿童乐园和丰富的游乐设施，让孩子们可以尽情玩耍。 4、产品材料中未提及户外泳池开放时间和消毒频次，但文案中提到户外泳池：9:00-18:00恒温开放（五一期间每日消毒3次），因此属于不符内容。应修改为：户外泳池：酒店配有户外无边泳池，供大人小孩一同享受清凉时光。 5、产品材料中未提及健身房开放时间与具体细节，但文案中提到健身房：8:00-22:00配备亲子瑜伽课程（需提前预约），因此属于不符内容。应修改为：健身房：酒店提供免费健身中心，方便您和家人一起强身健体。 @@ -162,6 +144,25 @@ class ContentJudger: except Exception as e: logging.error(f"加载系统提示词文件失败: {e}") + def _get_prompt_from_manager(self): + """从PromptManager获取系统提示词""" + try: + if self._prompt_manager and hasattr(self._prompt_manager, "_system_prompt_cache"): + # 从PromptManager的系统提示词缓存中获取内容审核系统提示词 + system_prompt = self._prompt_manager._system_prompt_cache.get("judger_system_prompt") + if system_prompt: + self._system_prompt = system_prompt + logging.info("从PromptManager获取内容审核系统提示词成功") + return True + else: + logging.warning("PromptManager中未找到judger_system_prompt") + else: + logging.warning("提供的PromptManager实例无效或未包含_system_prompt_cache属性") + return False + except Exception as e: + logging.error(f"从PromptManager获取系统提示词失败: {e}") + return False + def judge_content(self, product_info, content, temperature=0.2, top_p=0.5, presence_penalty=0.0): """ 审核内容是否符合产品资料并提供修改建议 @@ -212,30 +213,75 @@ class ContentJudger: logging.info("成功提取修改后的内容") # 添加judge_success字段 modified_content["judge_success"] = True + + # 对内容进行最终清理，确保可以安全序列化为JSON + modified_content = self._prepare_content_for_serialization(modified_content) + + # 记录处理后的内容用于调试 + debug_log_file = f"{response_log_dir}/processed_{int(time.time())}.json" + try: + serialized_content = json.dumps(modified_content, ensure_ascii=False, allow_nan=True, indent=2) + with open(debug_log_file, "w", encoding="utf-8") as f: + f.write(serialized_content) + logging.info(f"处理后的内容已保存到: {debug_log_file}") + except Exception as e: + logging.error(f"尝试记录处理后内容时序列化失败: {e}") + with open(debug_log_file, "w", encoding="utf-8") as f: + f.write(f"序列化失败: {str(e)}\n\n") + f.write(f"title: {modified_content.get('title', 'N/A')}\n") + f.write(f"content前100字符: {str(modified_content.get('content', 'N/A'))[:100]}") + + # 验证序列化是否成功 + try: + json.dumps(modified_content, ensure_ascii=False, allow_nan=True) + logging.info("内容可以安全序列化为JSON") + except Exception as e: + logging.error(f"验证序列化时出错: {e}") + # 找出导致错误的字段 + for key, value in modified_content.items(): + if isinstance(value, str): + try: + json.dumps(value, ensure_ascii=False) + except Exception as sub_e: + logging.error(f"字段 '{key}' 无法序列化: {sub_e}") + # 尝试定位问题字符 + for i, char in enumerate(value): + try: + json.dumps(char, ensure_ascii=False) + except: + logging.error(f"位置 {i}, 字符 '{char}' (Unicode: U+{ord(char):04X}) 导致错误") + + modified_content["raw_result"] = str(e) + modified_content["error"] = True + return modified_content else: logging.error("无法从响应中提取有效内容") # 尝试使用原始内容并标记审核失败 if isinstance(content, dict) and "title" in content and "content" in content: - return { + result_content = { "title": content.get("title", "提取失败"), "content": content.get("content", "无法从响应中提取有效内容"), "judge_success": False } - return { + # 确保可以序列化 + return self._prepare_content_for_serialization(result_content) + result_content = { "title": "提取失败", "content": "无法从响应中提取有效内容", "judge_success": False } + return self._prepare_content_for_serialization(result_content) except Exception as e: logging.exception(f"审核过程中出错: {e}") - return { + result_content = { "title": "审核失败", "content": f"审核过程中出错: {str(e)}", "judge_success": False } - + return self._prepare_content_for_serialization(result_content) + def _build_user_prompt(self, product_info, content_gen): """ 构建用户提示词 @@ -262,76 +308,223 @@ class ContentJudger: # 记录原始文本前100个字符用于调试 logging.debug(f"原始响应文本前100字符: {result_text[:100]}") + # 尝试方法1: 使用标签分离内容 if "" in processed_text: processed_text = processed_text.split("", 1)[1].strip() logging.debug("检测到标签并分离内容") - - # Attempt 1: Parse as JSON from the processed text + + # 尝试方法2: 预处理文本并尝试解析JSON + try: + # 彻底清理文本，去除所有可能影响JSON解析的控制字符 + cleaned_text = self._sanitize_json_text(processed_text) + logging.debug(f"清理后文本前100字符: {cleaned_text[:100]}") + + content_json = json.loads(cleaned_text) + if "title" in content_json and "content" in content_json: + logging.info("成功通过JSON解析提取内容") + title = content_json.get("title", "").strip() + content = content_json.get("content", "").strip() + analysis = content_json.get("analysis", "") + logging.debug(f"提取到标题: {title[:30]}...") + return { + "title": title, + "content": content, + "analysis": analysis + } + except json.JSONDecodeError as e: + logging.warning(f"JSON解析失败: {e}，将尝试其他提取方法") + # 记录更多错误信息以便调试 + error_position = e.pos + error_context = cleaned_text[max(0, error_position-30):min(len(cleaned_text), error_position+30)] + logging.debug(f"错误位置附近的文本: {error_context}") + logging.debug(f"错误行列: 行 {e.lineno}, 列 {e.colno}") + + # 尝试方法3: 从文本中提取JSON格式部分 json_start = processed_text.find('{') json_end = processed_text.rfind('}') + 1 if json_start >= 0 and json_end > json_start: json_str = processed_text[json_start:json_end] logging.debug(f"找到JSON字符串，长度: {len(json_str)}，前100字符: {json_str[:100]}") - # Clean control characters that might break JSON parsing - json_str_cleaned = re.sub(r'[\x00-\x1F\x7F]', '', json_str) + # 清理可能破坏JSON解析的控制字符 + json_str_cleaned = self._sanitize_json_text(json_str) try: content_json = json.loads(json_str_cleaned) if "title" in content_json and "content" in content_json: - logging.info("Successfully parsed JSON content from AI response.") + logging.info("成功从文本中提取JSON部分并解析") return { - "title": content_json["title"].strip(), - "content": content_json["content"].strip() + "title": content_json.get("title", "").strip(), + "content": content_json.get("content", "").strip(), + "analysis": content_json.get("analysis", "") } except json.JSONDecodeError as e: - logging.warning(f"JSON parsing failed for substring: '{json_str_cleaned[:100]}...'. Error: {e}. Will attempt regex extraction.") + logging.warning(f"JSON子串解析失败: {e}，将尝试正则表达式提取") + # 保存导致错误的JSON字符串到文件 + self._save_problematic_json(json_str_cleaned, e) - # Attempt 2: Regex on the processed_text (which might have had stripped) - # 修复正则表达式，移除多余的反斜杠 + # 尝试方法4: 手动解析JSON格式的关键字段 + try: + logging.debug("尝试手动解析JSON结构") + manual_result = self._manual_json_extract(processed_text) + if manual_result and "title" in manual_result and "content" in manual_result: + logging.info("成功通过手动解析JSON提取内容") + return manual_result + except Exception as e: + logging.warning(f"手动解析JSON失败: {e}") + + # 尝试方法5: 使用正则表达式提取 logging.debug("尝试使用正则表达式提取") - title_match = re.search(r'"title":\s*"([^"]*)"', processed_text) - content_match = re.search(r'"content":\s*"([^"]*)"', processed_text) + # 更强大的正则表达式，处理多行内容 + title_match = re.search(r'"title"\s*:\s*"((?:[^"\\]|\\.|[\r\n])+)"', processed_text, re.DOTALL) + content_match = re.search(r'"content"\s*:\s*"((?:[^"\\]|\\.|[\r\n])+)"', processed_text, re.DOTALL) + analysis_match = re.search(r'"analysis"\s*:\s*"((?:[^"\\]|\\.|[\r\n])+)"', processed_text, re.DOTALL) if title_match and content_match: - logging.info("Successfully extracted title/content using regex.") + logging.info("成功使用正则表达式提取标题和内容") return { - "title": title_match.group(1).strip(), - "content": content_match.group(1).strip() + "title": title_match.group(1).replace('\\"', '"').strip(), + "content": content_match.group(1).replace('\\"', '"').strip(), + "analysis": analysis_match.group(1).replace('\\"', '"').strip() if analysis_match else "" } - # Attempt 3: Try finding content with single quotes + # 尝试方法6: 查找使用单引号的内容 logging.debug("尝试查找使用单引号的内容") - title_match = re.search(r'"title":\s*\'([^\']*)\'', processed_text) - content_match = re.search(r'"content":\s*\'([^\']*)\'', processed_text) + title_match = re.search(r'"title"\s*:\s*\'((?:[^\'\\]|\\.|[\r\n])+)\'', processed_text, re.DOTALL) + content_match = re.search(r'"content"\s*:\s*\'((?:[^\'\\]|\\.|[\r\n])+)\'', processed_text, re.DOTALL) + analysis_match = re.search(r'"analysis"\s*:\s*\'((?:[^\'\\]|\\.|[\r\n])+)\'', processed_text, re.DOTALL) if title_match and content_match: - logging.info("Successfully extracted title/content using single-quote regex.") + logging.info("成功使用单引号正则表达式提取内容") return { "title": title_match.group(1).strip(), - "content": content_match.group(1).strip() + "content": content_match.group(1).strip(), + "analysis": analysis_match.group(1).strip() if analysis_match else "" } - # Final attempt: Look for key-value pairs without standard JSON formatting + # 尝试方法7: 使用非标准格式提取 logging.debug("尝试非标准格式提取") - title_pattern = re.compile(r'["""]?title["""]?[:：]\s*["""]([^"""]+)["""]', re.IGNORECASE) - content_pattern = re.compile(r'["""]?content["""]?[:：]\s*["""]([^"""]+)["""]', re.IGNORECASE) + title_pattern = re.compile(r'["""]?title["""]?[:：]\s*["""]([^"""]+)["""]', re.IGNORECASE | re.DOTALL) + content_pattern = re.compile(r'["""]?content["""]?[:：]\s*["""]([^"""]+)["""]', re.IGNORECASE | re.DOTALL) + analysis_pattern = re.compile(r'["""]?analysis["""]?[:：]\s*["""]([^"""]+)["""]', re.IGNORECASE | re.DOTALL) title_match = title_pattern.search(processed_text) content_match = content_pattern.search(processed_text) + analysis_match = analysis_pattern.search(processed_text) if title_match and content_match: - logging.info("提取到标题和内容（使用灵活模式匹配）") + logging.info("成功使用灵活模式匹配提取内容") return { "title": title_match.group(1).strip(), - "content": content_match.group(1).strip() + "content": content_match.group(1).strip(), + "analysis": analysis_match.group(1).strip() if analysis_match else "" } logging.warning(f"所有提取方法失败，响应前300字符: {processed_text[:300]}...") - return None # Fallback if all extraction methods fail + return None # 所有方法失败时的回退选项 except Exception as e: - logging.error(f"Unexpected error during content extraction: {e}\n{traceback.format_exc()}") + logging.error(f"内容提取过程中发生意外错误: {e}\n{traceback.format_exc()}") return None + + def _sanitize_json_text(self, text): + """彻底清理文本，确保可以安全解析为JSON""" + # 步骤1: 处理控制字符 + cleaned = re.sub(r'[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]', '', text) + + # 步骤2: 特殊处理换行符，将实际换行转换为\n字符串 + cleaned = cleaned.replace('\n', '\\n').replace('\r', '\\r') + + # 步骤3: 处理内容字段中开始或结束可能存在的多余空格或引号 + cleaned = re.sub(r'"content"\s*:\s*"\s*', '"content":"', cleaned) + cleaned = re.sub(r'"\s*,', '",', cleaned) + + # 步骤4: 处理未转义的引号和反斜杠 + cleaned = re.sub(r'(?= 0: + colon_pos = text.find(':', title_start) + if colon_pos > 0: + quote_pos = text.find('"', colon_pos) + if quote_pos > 0: + end_quote_pos = text.find('"', quote_pos + 1) + while end_quote_pos > 0 and text[end_quote_pos-1] == '\\': + end_quote_pos = text.find('"', end_quote_pos + 1) + if end_quote_pos > 0: + result['title'] = text[quote_pos+1:end_quote_pos].replace('\\"', '"').strip() + + # 查找content字段 + content_start = text.find('"content"') + if content_start >= 0: + colon_pos = text.find(':', content_start) + if colon_pos > 0: + quote_pos = text.find('"', colon_pos) + if quote_pos > 0: + # 查找非转义双引号 + pos = quote_pos + 1 + content_end = -1 + while pos < len(text): + if text[pos] == '"' and (pos == 0 or text[pos-1] != '\\'): + content_end = pos + break + pos += 1 + + if content_end > 0: + content = text[quote_pos+1:content_end].replace('\\"', '"') + # 特殊处理换行符 + content = content.replace('\\n', '\n').replace('\\r', '\r') + result['content'] = content.strip() + + # 查找analysis字段 + analysis_start = text.find('"analysis"') + if analysis_start >= 0: + colon_pos = text.find(':', analysis_start) + if colon_pos > 0: + quote_pos = text.find('"', colon_pos) + if quote_pos > 0: + pos = quote_pos + 1 + analysis_end = -1 + while pos < len(text): + if text[pos] == '"' and (pos == 0 or text[pos-1] != '\\'): + analysis_end = pos + break + pos += 1 + + if analysis_end > 0: + analysis = text[quote_pos+1:analysis_end].replace('\\"', '"') + result['analysis'] = analysis.strip() + + return result if 'title' in result and 'content' in result else None + except Exception as e: + logging.error(f"手动解析过程中出错: {e}") + return None + + def _save_problematic_json(self, json_text, error): + """保存导致解析错误的JSON字符串，用于调试""" + try: + error_log_dir = "/root/autodl-tmp/TravelContentCreator/log/json_errors" + os.makedirs(error_log_dir, exist_ok=True) + error_log_file = f"{error_log_dir}/error_{int(time.time())}.json" + + with open(error_log_file, "w", encoding="utf-8") as f: + f.write(f"# 错误信息: {str(error)}\n") + f.write(f"# 错误位置: 行 {error.lineno}, 列 {error.colno}\n") + f.write(json_text) + + logging.info(f"已保存问题JSON到: {error_log_file}") + except Exception as e: + logging.error(f"保存问题JSON时出错: {e}") def test_extraction_from_file(self, response_file_path): """ @@ -358,4 +551,87 @@ class ContentJudger: except Exception as e: logging.exception(f"测试提取时发生错误: {e}") - return {"success": False, "error": str(e)} \ No newline at end of file + return {"success": False, "error": str(e)} + + def _prepare_content_for_serialization(self, content_dict): + """ + 对内容进行处理，确保可以安全序列化为JSON，同时保留emoji字符 + + Args: + content_dict: 内容字典 + + Returns: + dict: 处理后的内容字典 + """ + try: + # 创建一个新字典，避免修改原始内容 + safe_dict = {} + + for key, value in content_dict.items(): + # 处理字符串类型的值 + if isinstance(value, str): + # 第一步：彻底清理所有控制字符 + safe_value = re.sub(r'[\x00-\x1F\x7F]', '', value) + + # 第二步：将emoji字符转换为相应的Unicode转义序列 + # 这样能确保JSON序列化安全，同时保留emoji语义 + char_list = [] + for char in safe_value: + if ord(char) > 127: # 非ASCII字符 + # 尝试保留高位字符（包括emoji） + try: + # 验证这个字符是否可以安全序列化 + json.dumps(char, ensure_ascii=False) + char_list.append(char) + except: + # 如果这个字符无法序列化，使用其Unicode码点的字符串表示 + char_list.append(f"\\u{ord(char):04x}") + else: + char_list.append(char) + + processed_value = ''.join(char_list) + + # 对于内容字段，特别注意保存换行符 + if key == "content" and '\\n' in processed_value: + processed_value = processed_value.replace('\\n', '\n') + + # 最终验证这个值是否可以安全序列化 + try: + json.dumps(processed_value, ensure_ascii=False) + safe_dict[key] = processed_value + except Exception as e: + logging.warning(f"处理后的'{key}'值仍无法序列化: {e}，将进行更严格处理") + # 更严格的处理：只保留ASCII字符 + safe_dict[key] = ''.join(c for c in processed_value if ord(c) < 128) + else: + safe_dict[key] = value + + # 最终验证整个字典是否可序列化 + try: + # 使用ensure_ascii=False允许非ASCII字符直接出现在JSON中 + # 使用allow_nan=True允许特殊浮点数值 + json_str = json.dumps(safe_dict, ensure_ascii=False, allow_nan=True) + # 验证生成的JSON是否有效 + json.loads(json_str) + except Exception as e: + logging.error(f"最终字典序列化验证失败: {e}") + # 如果依然失败，返回一个绝对安全的结果 + return { + "title": re.sub(r'[^\x20-\x7E]', '', content_dict.get("title", "序列化处理失败")), + "content": re.sub(r'[^\x20-\x7E]', '', "内容包含无法安全序列化的字符，已移除所有非ASCII字符"), + "judge_success": content_dict.get("judge_success", False), + "error": True, + "raw_result": str(e) + } + + return safe_dict + except Exception as e: + logging.error(f"处理内容以确保安全序列化时出错: {e}") + # 如果处理失败，返回一个基本的安全字典 + return { + "title": "序列化处理失败", + "content": "内容包含无法安全序列化的字符", + "judge_success": False, + "error": True, + "raw_result": str(e) + } \ No newline at end of file diff --git a/utils/output_handler.py b/utils/output_handler.py index 247d8e3..c97185e 100644 --- a/utils/output_handler.py +++ b/utils/output_handler.py @@ -1,5 +1,5 @@ import os -import json +import simplejson as json import logging from abc import ABC, abstractmethod import traceback @@ -70,7 +70,7 @@ class FileSystemOutputHandler(OutputHandler): topics_path = os.path.join(run_dir, f"tweet_topic_{run_id}.json") try: with open(topics_path, "w", encoding="utf-8") as f: - json.dump(topics_list, f, ensure_ascii=False, indent=4) + json.dump(topics_list, f, ensure_ascii=False, indent=4, ignore_nan=True) logging.info(f"Topics list saved successfully to: {topics_path}") except Exception as e: logging.exception(f"Error saving topic JSON file to {topics_path}:") @@ -115,14 +115,34 @@ class FileSystemOutputHandler(OutputHandler): if "tags" in output_data and "original_tags" not in output_data: output_data["original_tags"] = output_data["tags"] + # 对内容进行深度清理，确保安全序列化 + try: + output_data = self._sanitize_content_for_json(output_data) + logging.info("内容已经过安全清理，可以序列化") + except Exception as e: + logging.error(f"内容清理过程中出错: {e}") + # 保存统一格式的article.json content_path = os.path.join(variant_dir, "article.json") try: with open(content_path, "w", encoding="utf-8") as f: - json.dump(output_data, f, ensure_ascii=False, indent=4) + json.dump(output_data, f, ensure_ascii=False, indent=4, ignore_nan=True) logging.info(f"Content JSON saved to: {content_path}") except Exception as e: logging.exception(f"Failed to save content JSON to {content_path}: {e}") + # 如果序列化失败，记录原始内容用于调试 + debug_path = os.path.join(variant_dir, "debug_content.txt") + try: + with open(debug_path, "w", encoding="utf-8") as f: + for key, value in output_data.items(): + if isinstance(value, str): + f.write(f"{key}: (length: {len(value)})\n") + f.write(f"{repr(value[:200])}...\n\n") + else: + f.write(f"{key}: {type(value)}\n") + logging.info(f"Debug content saved to: {debug_path}") + except Exception as debug_err: + logging.error(f"Failed to save debug content: {debug_err}") # Save content prompt prompt_path = os.path.join(variant_dir, "tweet_prompt.txt") @@ -140,7 +160,7 @@ class FileSystemOutputHandler(OutputHandler): config_path = os.path.join(run_dir, f"topic_{topic_index}_poster_configs.json") try: with open(config_path, 'w', encoding='utf-8') as f_cfg_topic: - json.dump(config_data, f_cfg_topic, ensure_ascii=False, indent=4) + json.dump(config_data, f_cfg_topic, ensure_ascii=False, indent=4, ignore_nan=True) logging.info(f"Saved complete poster configurations for topic {topic_index} to: {config_path}") except Exception as save_err: logging.error(f"Failed to save complete poster configurations for topic {topic_index} to {config_path}: {save_err}") @@ -196,7 +216,7 @@ class FileSystemOutputHandler(OutputHandler): metadata_path = os.path.join(os.path.dirname(save_path), metadata_filename) try: with open(metadata_path, 'w', encoding='utf-8') as f: - json.dump(metadata, f, ensure_ascii=False, indent=4) + json.dump(metadata, f, ensure_ascii=False, indent=4, ignore_nan=True) logging.info(f"保存{image_type}元数据到: {metadata_path}") except Exception as me: logging.error(f"无法保存{image_type}元数据到{metadata_path}: {me}") @@ -210,4 +230,48 @@ class FileSystemOutputHandler(OutputHandler): def finalize(self, run_id: str): logging.info(f"FileSystemOutputHandler finalizing run: {run_id}. No specific actions needed.") - pass # Nothing specific to do for file system finalize \ No newline at end of file + pass # Nothing specific to do for file system finalize + + def _sanitize_content_for_json(self, data): + """对内容进行深度清理，确保可以安全序列化为JSON + + Args: + data: 要处理的数据（字典、列表或基本类型） + + Returns: + 经过处理的数据，确保可以安全序列化 + """ + if isinstance(data, dict): + # 处理字典类型 + sanitized_dict = {} + for key, value in data.items(): + sanitized_dict[key] = self._sanitize_content_for_json(value) + return sanitized_dict + elif isinstance(data, list): + # 处理列表类型 + return [self._sanitize_content_for_json(item) for item in data] + elif isinstance(data, str): + # 处理字符串类型（重点关注） + + # 1. 首先，替换所有字面的"\n"为真正的换行符 + if r'\n' in data: + data = data.replace(r'\n', '\n') + + # 2. 移除所有控制字符（ASCII 0-31，除了\n, \r, \t） + cleaned = '' + for char in data: + # 允许常见的空白字符 + if char in '\n\r\t' or ord(char) >= 32: + cleaned += char + + # 3. 验证字符串可以被安全序列化 + try: + json.dumps(cleaned, ensure_ascii=False) + return cleaned + except Exception as e: + logging.warning(f"字符串清理后仍无法序列化，尝试更严格的清理: {e}") + # 如果仍然无法序列化，使用更严格的清理 + return ''.join(c for c in cleaned if ord(c) < 65536 and (c in '\n\r\t' or ord(c) >= 32)) + else: + # 其他类型（数字、布尔值等）原样返回 + return data \ No newline at end of file diff --git a/utils/tweet_generator.py b/utils/tweet_generator.py index 1c85b45..7bf8725 100644 --- a/utils/tweet_generator.py +++ b/utils/tweet_generator.py @@ -67,18 +67,6 @@ class tweetContent: self.json_data = {"title": "", "content": "", "tag": "", "error": True, "raw_result": e} # 不再包含raw_result def split_content(self, result): - # Assuming split logic might still fail, keep it simple or improve with regex/json - # We should ideally switch content generation to JSON output as well. - # For now, keep existing logic but handle errors in __init__. - - # Optional: Add basic check before splitting - # if not result or "" not in result or "title>" not in result or "content>" not in result: - # logging.warning(f"AI result format unexpected: {result[:200]}...") - # # 返回空字符串而不是抛出异常，这样可以在主函数继续处理 - - # return "", "" - - # --- Existing Logic (prone to errors) --- try: processed_result = result if "" in result: @@ -88,11 +76,8 @@ class tweetContent: json_data = json.loads(processed_result) json_data["error"] = False json_data["raw_result"] = None - # 确保judge_success字段存在 - if "judge_success" not in json_data: - json_data["judge_success"] = None + json_data["judge_success"] = None return json_data - # --- End Existing Logic --- except Exception as e: logging.warning(f"解析内容时出错: {e}, 使用默认空内容") @@ -510,7 +495,7 @@ def generate_content_for_topic(ai_agent: AI_Agent, # 准备审核内容 content_to_judge = f"""title: {content_json.get('title', '')} -content: {content_json.get('content', '')} + content: {content_json.get('content', '')} """ # 调用ContentJudger进行审核