From fd199978349b328d7f55a8f64fd1050d576fa0aa Mon Sep 17 00:00:00 2001
From: jinye_huang <jinye_huang@foxmail.com>
Date: Sat, 10 May 2025 21:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=BB=93=E6=9E=9CJs?=
 =?UTF-8?q?on=E6=96=87=E4=BB=B6=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../output_handler.cpython-312.pyc            | Bin 14652 -> 13579 bytes
 utils/output_handler.py                       |  51 +++++++-----------
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/utils/__pycache__/output_handler.cpython-312.pyc b/utils/__pycache__/output_handler.cpython-312.pyc
index 547b7a76d00654b1089d00a15a8db1b5e6c897e6..1d58ef432c90d10afcc4a3a9cffd82fe65849c8c 100644
GIT binary patch
delta 1325
zcma)6Urbw77(eIU-uB+!d)t-L4qDm*Wxxc4>gI?n;Ih!oF=upf4qu?*RIuSsy}j5m
zZ&#D)f{IgeOlUMFJa)1;3@@1YfRi>czSz;krkc!WpPHa=Ci<P0P8T(LPVVpfo%{Xr
zJKuNjx%W%$-I(oLRkb1*?>!TkdA;j%o3%-{z><e+{{~M(9W8XE$)*rYxLKUC7?zko
zzw$b1yxA&?gg3<3u;wvDI^byRCZ-L{yb#hPLnNkVU=aC}5a)fwR24VZ#D2m*5Q|K7
zAT}{^P0~RGV&33j4I=>@WCBa;V)Yh4%t~LiIk5^Qx%w=1ZAy}mZm(+$iHJnHZQWo!
z!8ndmR^37Uy)6TVXjqAv$hVaZQ!R-R;n=KOVWhii8Q9ECpKEgZR73h0eZtkN2gN^@
z(|@S$ky0KiNBMg>hBfA6Pqj}Vj;pZUpWgpf&C?Br@^CdvTo8p&0w+0)#u0|Oa^ng=
zj*>Wt^rm_*9Y{NplK;}1hxHb;vEGQ?kiql8%Va);OUc*dm5&HVe`pCDnfSksk2_g?
z|L(X1&zd<WaT3)$k2cc#z7wZ3_TDd)c|9^+HUT8c=GY>cj*{?IC8FuCOwC3gjU^W5
zwJ_+kGYrl$ILBZNfGU9xy>{(1(6VW2A-+@=Ni-U-GJZO$)1AN|9Gp*iKRw*49@8e7
zP+nNn<BR$PiRh8CGPN+TN9Xm4ctoGkE<;`$XYdk0LIt2Rt>@D_aOB@WKe;{MyL$@m
zo@{t?Y{$3fes)>jHzTRB<o2x1t<J5V-*bnS<%$_8j*MK8gIW2G{g!>(T<jhxwe@B%
z721w1k7a~=ioc{fGeZTnGdpx=<krac@nX-ZQhQ%ET4-kqb3qA!%OUUk>9^CFE7@UJ
z(cWL`I0`ATptSvBMopfz<Z5!wST)wiHvM~tpITNboFKh`e{{G$m|Z`;*;RBrSwUDm
zi?<_m*4;)gx6fFc*}8g{%E86-B(!(8#Ww0fcOUVLO8nQRR^YpWE!=>1ovyH%-|cP%
zo|A;p220Lnfo#qtg?T>b_l^$pxnTi#-YkUemb`2MWxhc=gZRAH8y@2GLjrJ(oyMty
z4-Y6p5?s|k&sKlOH4abE&pJ<7%0g7r7Bu>E=UX_v74Nz!LE`s;>v)D<4_&}h^j_!-
z{La?OW6zuLH(U3g=*6L+@FLD$tRNP*6Ser=#Y+d|<=6pPGWM&I$~k&+a1Aff;$Rnk
Wlm0f?@0jGUnwk3*v8XwqtUmy~H8t}9

delta 2160
zcmbVNeM}Q)7=PckM|<tHy^caZuF%S-tdtK$5e7oy29(w>9AD1BI<6uWfgNQG*N&OR
zg+yW?w}d+9VA+;6K}`+&qb5rvaVp@lv@52p@eh_kvOo4moh~NxpS{;|3fY{??sCub
zywAt){XNgy>z#9b%P8*3<x+sI-|CGg2F%wKQmssamO}JA3}S4J!ob#O6(WzwC1f9H
zQ&S-=m=$mZ08Bte#rrWKZ)rp{#%J)Fk6|gir4c_rODTC4<MRvfXZzC9Peooajdpwo
zGSxJ~M7n~O(L}GnD`7{q>FkYMX^L0u5xa1Xv<lJ$PXz+rtCVl{x~1%SlR@B8vWNAl
z#VNFcFYw|xaI2CX1K`1FB~4yd&2j@m*Dm0dx>MQjQw=2^u}4Y^=$9_1&We&j2xx-4
zc_;|nnq&k3mo_m@wFkclE(vBKU$KP;l|pOyVlROMT9W8h$4})IEnmo>2(8s26r?3p
zNN?gyJfE}Ze{j}$h=1W+nnD|%a+YtIo&4`SJW`htO+3w<aT;;vyLs{8Y?&VURuUsb
zHYf#ya999AJAmk(faCIah3#M%W&^iAIbZ;C0F&pHZ8``8cM#$<?jY!N_6(JJknqah
zm!aw`I$;gNVZh^T-C_I|@85!-`w#efZfG>c;qOnNj{o#R^w0h?x{;ek5?z--A3;Am
zu8U{f3ry@4s(dt-;u@m6opfDH(a-dB_w+e>JKa6*US|wTDi9-|2D<wD+|E9COw1cX
zx1&3TIT@y(DG)IoXr_#V6K`>%ixb>`!-1G0u}P-`p^psq44#%Vj^R$);dZb;Z&S0B
zLE1jVy$S2*r`NwexBk)D^{dy{Zd_Ww;#(gJRGNm;QEX$qDFek!LpTbV*1x>=>o;Fj
znobiA#@*A^>nw5&_V>j^h}|HYYxvkiGW$?oOxW#o$3$KI10yjB?Q{+#Ea5=^0DCse
zLNLuJhiO5gK*7p0%&*2|9L<ehnG+nsQ{tTi4)+PBjjL$q0>nmI(ti}W1{Fw{*xn5L
z=p8hL55Q`=KALV0r<?tC0o!~=B>mu+ES>@gZB#~uWt6XB#(7Uxh&=kdsIDNaD+s+@
z8MH^M?BOc=LTjj{EmGAU(H&i(@}rbFOqoN4d*_L0?V)h(q0r%@p<^A9+Rg~|=87ge
zs>u&)^8J{fiD-7L=tgssc>esru86MU0gh3MF<YDjq-n+zR_+Y#X$&=Wg!gp(LQ*T4
zS<|O3obuZvnH3YVRg#)gPAX?4{+wm9cqO?CnMwj^S-xh-oUXr6KW)EY_fvuXh@oz5
ze_Vjc+u;2)ozLP=4Gb@*)x-fDRoUTu>3y|!$~tNFo%ELmcP*&yscnyi5JlEV%@i?7
zgp9ib-avmSqi&h3e<TH3{nYT}@RVoLGh+*6Ml`i!L|lO5&2Uwz_SwVA?fzp?OLf>%
z9X!5ld2J<cM__k2uX2L$HHXRUHC5U~@65hH{<5kv4l<zJ3WJXOq<RXU#C?T+7{uls
z_s9lBKyGEnGa1`Xj>!YS$tRCefI8!M0J%m;O_bagCbxxhDudO*;sssk$m^k|=1^8k
zlx+QxY<&_(5N+_!$7*g5)GNZ17>7nD(AnQCQ8bi*n|t*Q*~0I%CS>2znXN_Own%Ty
z65h@<A^VO|(P##DENP8K;ex<~?1gNs!6IJRE<yPVCAby&D=4d8xTwdFy_khr&Emy;
zF{)iG!W#|3#d4}qBV5v8$X+sHjoZabIbt;eS~BA{op7m)vZ;l4)tF5;w`%-E0FSfp
zWtC%zmy^Aobrw#{)nuQ?k^6_j4`CPEWH|s&vY%V7!;5oo6g7!pZ0_ogLReacwL<@q
zIN)?}FsVaFS~iU1t_@?v^DvPT?`36WQ}7J?MOi)^XYZC3tKJqsx$o2;fYS{30sRYL
C%S!(M

diff --git a/utils/output_handler.py b/utils/output_handler.py
index e0cc9e4..c902004 100644
--- a/utils/output_handler.py
+++ b/utils/output_handler.py
@@ -91,42 +91,29 @@ class FileSystemOutputHandler(OutputHandler):
         """Saves content JSON and prompt for a specific variant."""
         variant_dir = self._get_variant_dir(run_id, topic_index, variant_index)
         
-        # 检查内容是否经过审核
-        if content_data.get("judged", False):
-            # 保存原始内容到raw_data.json
-            raw_content = {
-                "title": content_data.get("original_title", content_data.get("title", "")),
-                "content": content_data.get("original_content", content_data.get("content", "")),
-                "tag": content_data.get("tag", ""),  # 确保保留tag字段
-                "error": content_data.get("error", False)
-            }
-            
-            # 如果内容里没有original_字段，则认为当前内容就是原始内容
-            if "original_title" not in content_data and "original_content" not in content_data:
-                # 先深拷贝当前内容数据以避免修改原数据
-                import copy
-                raw_content = copy.deepcopy(content_data)
-                # 移除审核相关字段
-                raw_content.pop("judged", None)
-                raw_content.pop("judge_analysis", None)
-            
-            raw_data_path = os.path.join(variant_dir, "raw_data.json")
-            try:
-                with open(raw_data_path, "w", encoding="utf-8") as f:
-                    json.dump(raw_content, f, ensure_ascii=False, indent=4)
-                logging.info(f"原始内容保存到: {raw_data_path}")
-            except Exception as e:
-                logging.exception(f"保存原始内容到 {raw_data_path} 失败: {e}")
+        # 创建输出数据的副本，避免修改原始数据
+        import copy
+        output_data = copy.deepcopy(content_data)
         
-        # Save content JSON
+        # 确保tag和tags字段保持一致
+        if "tag" not in output_data and output_data.get("tags"):
+            output_data["tag"] = output_data["tags"]
+        elif "tags" not in output_data and output_data.get("tag"):
+            output_data["tags"] = output_data["tag"]
+        
+        # 确保即使在未启用审核的情况下，字段也保持一致
+        if not output_data.get("judged", False):
+            output_data["judged"] = False
+            # 添加original_title、original_content和judge_analysis字段，值为null
+            output_data["original_title"] = None
+            output_data["original_content"] = None
+            output_data["judge_analysis"] = None
+        
+        # 保存统一格式的article.json
         content_path = os.path.join(variant_dir, "article.json")
         try:
-            # 确保tag字段存在
-            if "tag" not in content_data and content_data.get("tags"):
-                content_data["tag"] = content_data["tags"]
-                
             with open(content_path, "w", encoding="utf-8") as f:
-                json.dump(content_data, f, ensure_ascii=False, indent=4)
+                json.dump(output_data, f, ensure_ascii=False, indent=4)
             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}")