From cca622d34f2cfa2dfc1adb92dd78b452a4b3cc86 Mon Sep 17 00:00:00 2001 From: jinye_huang Date: Thu, 24 Apr 2025 19:30:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=BA=86=E7=9B=B8=E5=86=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E5=88=A0=E9=99=A4=E4=BA=86=E6=97=A0?= =?UTF-8?q?=E6=95=88=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/__pycache__/posterGen.cpython-312.pyc | Bin 37641 -> 37761 bytes main.py | 4 ---- poster_gen_config.json | 3 --- .../tweet_generator.cpython-312.pyc | Bin 29451 -> 29602 bytes utils/poster_generator.py | 0 utils/tweet_generator.py | 8 +++----- 6 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 utils/poster_generator.py diff --git a/core/__pycache__/posterGen.cpython-312.pyc b/core/__pycache__/posterGen.cpython-312.pyc index 458ef97692139d803ef560a3909bf5e59b051196..3c2255e23a4c63be2d4c6f2d44384fce967fe6ff 100644 GIT binary patch delta 4251 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 delta 4220 zcmZ{n2~dv)#PZr?G>3_<8qKwpEXHVb)*M?aAW3cFkyu-5ZMI(zSF%Z0&G*0Ve% zb-&mDzy4)$^FdMnH@)6pU}aH+|MHWs>a%sjHn7?r!73~wlCVgW4DhtBCetW|Y$S^e z4a5@W4Vvq4x~#OoYPZq~mxGp6s&IzBg0h1B?j2*?BglkC!P&qlPqO|V873=ap*)~p zRaQb;kd0_yZ_u4o?GgXOqOXStQUKEn?bnlZtQOW^YY;4YFa)>5JHZ)#6o*($o`B)w zNr**7gIJYjAqp70Mrhq)jP!=MtgBt+ORLIj9Zsihsjb@PYH*^VW-}}gNg*Y$E99hh za7zt9Yk zWW&)>;iL$jFj+_;G?@}emFJ*ofe2GfL7E&+aD9|`LMjqu;}08$2RiYT~l)|0{Zu;@TvO`L{j$ecBS}~AZgv| zwd%6IXFaJGRx6$o>WRg_4)@^J_BXm(clWlpc0YHj>*$`Fr{O^|eAGHxxy)gA!Ty+q z@Lg~OJdAM=9n{7~lNqoxHkIwk+1QnaW;WiL$o#WTxUCG==8~^Nb3Hk6v1E!V*I(#J z%vCARDbkpDE@P(19`8;FV!WVIA^o*^2E~PtiFrYai(10ui$SV9gXci}6;*(PO-y}& zrsQ}s9bQWAA_qM!DKnL%20j^6p1BNFst{&GG-3u~CPIlwK-40f2p6IbQ4cG|rjs?$ zKGsP-^#o?T=BKW~_9l35$}=h3nfO4NVs6N!txT*_Go+Zij-Ae=ZG-jR!+SI74$tbT zTL`HK#k4U^+@gG@!7cLoS?zzYQHR~DsIt1~E3jj~Bf zhqnr1Qx$r7Cx*eeQ&xjZghq-)K2P>h~U#2fUXk zC&(k^MASuZxZ|0(wP>xBjyi6OG}4^}2XakXwnEt=$4gn@m~9Hl8{)rwIf{9)fP1$P zf(ng6MRGK2nZl-z$sC9%P9}4qpco=c>+r_tYVPQI`&9St zO)R-|y}E(+1={`McOyGkH$A~%QSxB#eZb`2N!aRuE01^Po-6!qFZ6zoG;Q&q1v+yhX_Set9<>} zv#OTy@?92P$C`Wb#L)B5GB=#;goAUdLie$TIvqo*`R3_uJ*SUNHLuR3yCAM~ZE!s* z-lN^EiwEDwUCr@JoHfL@yJ7wof9iNt?tW~wVj598=m_Mt|-Q*3LnIYPcV)yoXj4V z%sE-?amB1drfL_6iYpVd$&;CitCI+;T+LLmd;F*0g=&6a=CL;#0bYID05gVZVCv#L zc9*YPoFTe&aBf>9^lUT2w@zIYVON@;TU;y3gk5S}8gi*=;MU@3%>_1_h0s+Hykz1c zI^6c2mfZG_T! z*j=%ns61gy@2i>yV!3K@>-irO7k{5c-$SJq1h*8E0S_hmK1#Tyz7=sx@n&Z4q}-0d z-MorQpJP{$&loQ@@a@ACKp!DaF~GLvz&hQ1xvDKV%|L0$$}ZTXnV1ZkAkqo-474UKOpdS6M0kxn^fQZFKaf^BW7&OG+XGj3I zpxkD!t#i?9I06HLZE1zG|1IqRwqD0p_;S-S@`Wd_`AyP<`DJLq`aN{g9)W!yignYN z*!AMZp0;OtI*xUn-gWcMqdn~#yEm`ver|JD$C;kZo4Ve5{pOpex{tSZz4L;vrRUiL z-OX*?C*SDa@=^&M!Di^oYhEokuw1fHZlqJu#5&no;pfB~TuU95R;LsDt(EL!w4pKj z7oVqT|EH49Eapd!XG5)?f9F{gC4IMJcNV{5DP|yx$a70Rd-8a)JgrNykD z79wULW+Qm!=G(;gWpGPA!CnEkK`Ogq0)PHZCxdj-Qd^S9`_nf5{TeIeHJC26VIW5#JC2fYe%$y8(%`INhzT5U wXJ-t14>dqeQbPdI-w}{^SBJ)sDYpxWpwu-teyT8CS8D#4e_J6a!?~~j2U8?kh5!Hn diff --git a/main.py b/main.py index 7428c80..3997178 100644 --- a/main.py +++ b/main.py @@ -148,7 +148,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle poster_variants = config.get("variants", 1) # 通常与 content variants 相同 poster_assets_dir = config.get("poster_assets_base_dir") img_base_dir = config.get("image_base_dir") - mod_img_subdir = config.get("modify_image_subdir", "modify") res_dir_config = config.get("resource_dir", []) poster_size = tuple(config.get("poster_target_size", [900, 1200])) txt_possibility = config.get("text_possibility", 0.3) @@ -157,7 +156,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle collage_subdir = config.get("output_collage_subdir", "collage_img") poster_subdir = config.get("output_poster_subdir", "poster") poster_filename = config.get("output_poster_filename", "poster.jpg") - cam_img_subdir = config.get("camera_image_subdir", "相机") poster_content_system_prompt = config.get("poster_content_system_prompt", None) # 检查关键路径是否存在 @@ -179,7 +177,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle variants=poster_variants, poster_assets_base_dir=poster_assets_dir, image_base_dir=img_base_dir, - modify_image_subdir=mod_img_subdir, resource_dir_config=res_dir_config, poster_target_size=poster_size, text_possibility=txt_possibility, @@ -188,7 +185,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle output_collage_subdir=collage_subdir, output_poster_subdir=poster_subdir, output_poster_filename=poster_filename, - camera_image_subdir=cam_img_subdir, system_prompt=poster_content_system_prompt ) if posters_attempted: diff --git a/poster_gen_config.json b/poster_gen_config.json index b091931..6718ed1 100644 --- a/poster_gen_config.json +++ b/poster_gen_config.json @@ -42,9 +42,6 @@ "output_dir": "./result", "image_base_dir": "/root/autodl-tmp/TravelContentCreator/hotel_img", "poster_assets_base_dir": "/root/autodl-tmp/poster_baseboard_0403", - "camera_image_subdir": "", - "modify_image_subdir": "", - "request_timeout": 210, "max_retries": 3, "description_filename": "description.txt", diff --git a/utils/__pycache__/tweet_generator.cpython-312.pyc b/utils/__pycache__/tweet_generator.cpython-312.pyc index 79d3e879aae3e4db8e002fa81617d28cbc5a3f65..d54f51ea7860dc70b57a7e8f0f1824eb91c7859b 100644 GIT binary patch delta 2624 zcmai0du$s?9iH)K>)qHrC$`s**zqH_<81s&>^M$KOXAc?-N)r|h4#{iQ|H#{<@&`u*NE`^k>EHxCt`!kIRV8f?-GLCOKJ|peNjzrO zS>tk*Sb1i@`R&X%-|sQ&{mKXMn}34g-|XJq49IoV*Zh3`3jq9)4zw${10H?r^Ls~Cs$&zO_ zD5ch#PKH;ZIIy_|zc_@KhJWZXYdexVPZ~qoqwN*|UIiG&ytr^+A2h4z#|Qci7G#n5 z7s(XGid*w39M3hItX~J$nRU93+68Ji36f!5w_~yKfY`kFJ2|UpTZc8Pe5KM_LjWL~ zWR!MqJf(4@fnvw+=e+nQIlfPERP6PMj*3IW8oiv9Ovv#9kmFK|dhbSNoE;IM1CK`q zyf|Xh+lWBjI>i5+5E(PF;UA0~&=b*;jo^Qe*co%V4gYM^iw8!Bh^wokS=feOADw8~ z@M&rl7jn&~@P|2ziPLNl5L=qsAdja4z7~m*Iy6;^8@X}zU@zmI&*0vm1z$PX0{5tB zE)v9@;6SkIM(v85ge`4w*Eu~}7!4k6rtGCQxL=jw z!Efdx(1SnB3wEz$ReX|L@uTJ(II}?#(}6nXSye&LAuFTdlZVVqfM}&GgOtS*(70a! zWq37&0*X)Dx3wM+*@JxNpyH*4A@m|&EyA_jKp-U*KaL#^Kp&nwESUU+X9I#I*aVQj z?4)a)eX7stMxS|r+UB$PwY=4gSY$@6>rFL6C5VC~n11}x;TCv+ip0M0CMLMf;K^t> zok79Jw{IwzU?um7f(fCZ5>hMrYe$SQgui`c9F9^}Q&4kV=|r9LhiH<V3EX9}1I%?{9RTq^hf;udfbkt8?I*?o1y^pNPcz$$N0r zzd#FkQ03vSv)XJm^j#$N-K0f$@PD)?k@zIV3*_X=K@>uwlL%6xRC8cR+h096Q4;Z{ z|L(dJz1%rJNn>abHEV4hlSLwa__P3{wA7hlG7`s9F3@Kjgy?y=uY8}ja%7x zee~kEu{D7batS4Be6kD0v46tFkTD*du;Ux!&EbURkHjyKT9PwlHcxk#la;Bu>SyuG zdKYh0Be%l>6L|l`9!vajPsuyu6xG_=jpABmC=nEqW2!GVCK`OvTcyvU2r}V+OeCB% z-@(R;xu(0CAqT1pXD0>t20k(QbeO#8BzxnWDR51Hm8)ofCLjppPQ{56&v->AqO)zt z`FJL$0I3}3=bdC-Zw=wMpK&r?bydPZo~*hX?3C@DyjK*}}(ic`f~ zn-7jzba;7Kz<)dLaL=7Do-6rg<>L8LyxF&NRZ5pC(=+GrgX2LH#lD&1a|`F>yEQrs!Wp|Yz{j`J8aV{%jNRi z%-rH!Wfc!S_deGnzeY>wA|4xb;1S8X>lHfu1)i4LH(!!;5dIdgmA=30U1BZw;2yUX zPt1Dp%4|ooo%~1qh_rHH^Bc3bVds|T%uUYqF6X+^r!{ z<*P=#_WYOF?=Ae!IlO6}dyl=G(7j>F_MYxw-)sthM%nv)v0|8g5N3-}{N3f0#X+2x>9@t0Y$CnbC2!-0%Z?WM`6Sb?kULCywJiS~ z+gDBrf2Kx`c7LHA{lJkw#$R3;8u@_0JM8S@afSE{M;H`N$;(;t}@V9HG|YZ)uKWxNM)*m3T+^nsoGWO u06podQ-y6HJy3P2&<*-B)piwnK>wbqSA{;1>aY4$*a2ca9|b5>_525#Cv;N) delta 2591 zcmai0Yj7J^6~0%iwY9QUOOaO(ub$S+dRej+*)b(JcH~FuCbn@(;}XYKSlL)jU1y~> z816PRo$x4l7`GRGl`@p!M`!HmkD3_Uci}>PtL;VgV7HoSMn`K z<-O;OkHj``d}#L~{_+8v{jta8)#Z)F)yIk}rNznmue){6UfwoT4DGOhO6;-6`1wTDp=yYRZAl&mvHWTrA^a8id6xj}kzQf{>+qMn2 zXPtDdkf$FOgn;t3s;xeW5OK=wvSsH!T{(|b7kv{P>>m>bRCm?c*yyghbgbJ{`sEJd zeiA9YvQ@h#h`lV)*;YGt)AbpV&W$;+la|N&Kz?WJpdWb34&nsqe1YG_b$b|X;Z4zq zh@IXVD?-dm<0HI8S}Km`#{KmCc-l$?V%`bp6jcvh3_0kr2@CHfUf4D1r_W4SvG=)& zPWtkM4d>};lid=PyLF!BL3%0KWmJ8{M{iApoL(T%0|{#o*zgda>ebWM(Mn9j+i>TH z`5gAsoyj;J(t`8T4YxtR6CB+H>alYC^OIz(L+#UBvu|{ z1)5Q#P5l+I9@uWFJB0PLb~2P{k;~l1-<`JDvLvgNNVaZOkw}KVIxXQWy*wR?Wp(Sa z@Mr-NHwgO#=3VKpKGX>0DC;LPv1qxyW8mb>kS%j}^u$B6(_%-GWc1!qQzS(%&SbDg zy{%6DA(A3i>YL4Aksg_KI^%OFg!G-9_oq>6-uWxwn>@!4F z`tONAJg%Mb1T!uto16AtN?fjPoTlg6+a`3PA z@hc|IGx0hTZ!mFT_r6jK#&1z^`4!<0FjMIRK`$+5=&j|j*#VD-AHk?RxSLve2iqa~yZl+J;Whh6-*JvVZ;Twb8eUH( z7qaLLrwinTt`W-#3H`dq0P?p3$wdo#t9!HyE^p^Yg{5}G?}kU(;POs;p&u?+IsUjs zxN0(inXA^+LYluiYyx?$Ra)rbul4W@XN40k?%I%e!p>c{^Cw&b+;vG|D%a7TIkez&hCUz751`lMCkw-?@?~h zXV+cUKf@n|y;@x1DjOB$AN0rTpB3L{lO`rUWP-i6DF34I(+7O-0ldO5pL)DlRer{% z|E^6`pIARtQXKTFr@iJ7c!D3Q{B!r^)93J)asxHn28RQ+Jt+T)nq7mPD7UXBYS4jl zgEglHU8sMs=GI^r%I0g520bXhujbXD5A7YS`860o14Ff-2D=fs2x%~k(%FwA3@Tor F@E<@AVYdJP diff --git a/utils/poster_generator.py b/utils/poster_generator.py deleted file mode 100644 index e69de29..0000000 diff --git a/utils/tweet_generator.py b/utils/tweet_generator.py index 2a6eecc..4ac2537 100644 --- a/utils/tweet_generator.py +++ b/utils/tweet_generator.py @@ -444,7 +444,6 @@ def generate_posters_for_topic(topic_item: dict, variants: int, poster_assets_base_dir: str, image_base_dir: str, - modify_image_subdir: str, img_frame_possibility: float, text_bg_possibility: float, resource_dir_config: list, @@ -453,7 +452,6 @@ def generate_posters_for_topic(topic_item: dict, output_collage_subdir: str, output_poster_subdir: str, output_poster_filename: str, - camera_image_subdir: str, system_prompt: str ): """Generates all posters for a single topic item, handling image data via OutputHandler. @@ -466,14 +464,14 @@ def generate_posters_for_topic(topic_item: dict, variants: Number of variants. poster_assets_base_dir: Path to poster assets (fonts, frames etc.). image_base_dir: Base path for source images. - modify_image_subdir: Subdirectory for modified images. + img_frame_possibility: Probability of adding image frame. + text_bg_possibility: Probability of adding text background. resource_dir_config: Configuration for resource directories (used for Description). poster_target_size: Target size tuple (width, height) for the poster. text_possibility: Probability of adding secondary text. output_collage_subdir: Subdirectory name for saving collages. output_poster_subdir: Subdirectory name for saving posters. output_poster_filename: Filename for the final poster. - camera_image_subdir: Subdirectory for camera images (currently unused in logic?). system_prompt: System prompt for content generation. output_handler: An instance of OutputHandler to process results. @@ -543,7 +541,7 @@ def generate_posters_for_topic(topic_item: dict, return False # Construct and check INPUT image paths - input_img_dir_path = os.path.join(image_base_dir, modify_image_subdir, object_name) + input_img_dir_path = os.path.join(image_base_dir, object_name) if not os.path.exists(input_img_dir_path) or not os.path.isdir(input_img_dir_path): logging.warning(f"Warning: Modify Image directory not found or not a directory: '{input_img_dir_path}'. Skipping posters for this topic.") return False