Update app.py

app.py

@@ -176,22 +176,30 @@ def export_history_to_markdown(history):
 def extract_gdl_and_narrative(content):
     """提取 GDL 和自然语言部分"""
     # 查找 GDL 和自然语言部分的起始位置
-    gdl_start = content.find("GDL描述") + len("GDL描述")
-    narrative_start = content.find("自然语言规则说明") + len("自然语言规则说明")
-
-    # 获取 GDL 部分
-    gdl_content = content[gdl_start:narrative_start].strip()
-
-    # 获取自然语言部分
-    narrative_content = content[narrative_start:].strip()
-
-    return gdl_content, narrative_content
+    gdl_start = content.find("GDL描述")
+    narrative_start = content.find("自然语言规则说明")
+    
+    if gdl_start != -1 and narrative_start != -1:
+        # 获取 GDL 部分
+        gdl_end = narrative_start
+        gdl_content = content[gdl_start:gdl_end].strip()
+        
+        # 获取自然语言部分
+        narrative_content = content[narrative_start:].strip()
+        
+        return gdl_content, narrative_content
+    else:
+        # 如果找不到标记，返回空字符串
+        return "", ""
 
 def save_gdl_and_narrative(gdl_content, narrative_content):
     """保存 GDL 和自然语言内容到文件"""
     # 定义文件存储路径
-    gdl_file_path = os.path.join("exports", "gdl_output.txt")
-    narrative_file_path = os.path.join("exports", "narrative_output.txt")
+    export_dir = os.path.join("exports")
+    os.makedirs(export_dir, exist_ok=True)
+    
+    gdl_file_path = os.path.join(export_dir, "gdl_output.txt")
+    narrative_file_path = os.path.join(export_dir, "narrative_output.txt")
 
     # 保存 GDL
     with open(gdl_file_path, "w", encoding="utf-8") as f:
@@ -279,8 +287,8 @@ with gr.Blocks(
                 )
                 # 用 State 保存 messages 历史
                 chat_state = gr.State([])  # list[dict]: [{"role":"user","content":...}, {"role":"assistant","content":...}]
-                gdl_file_path = gr.State(None)  # 定义gdl_file_path作为State
-                narrative_file_path = gr.State(None)  # 定义narrative_file_path作为State
+                gdl_file_path = gr.State("")
+                narrative_file_path = gr.State("")
 
                 user_input = gr.Textbox(
                     placeholder="例如：设计一个适合3-5人的派对风格扑克游戏（请写清目标人群/时长/创新点）…",
@@ -300,17 +308,17 @@ with gr.Blocks(
                     user_text = (user_text or "").strip()
                     if not user_text:
                         # 不提交空消息：输出不变
-                        yield gr.update(), gr.update(), history_msgs
+                        yield history_msgs, "", history_msgs, "", ""  # 🟩【修改】输出数量改为5个
                         return
 
                     # 立即显示“用户消息”
                     history = list(history_msgs or [])
                     history.append({"role": "user", "content": user_text})
-                    yield history, "", history
+                    yield history, "", history, "", ""
 
                     # 添加空的助手气泡，用于逐步填充
                     history.append({"role": "assistant", "content": ""})
-                    yield history, "", history
+                    yield history, "", history, "", ""
 
                     # 流式生成内容
                     tuples_hist = _messages_to_tuples(history)
@@ -321,10 +329,10 @@ with gr.Blocks(
                                 if not piece:
                                     continue
                                 history[-1]["content"] += str(piece)
-                                yield history, "", history
+                                yield history, "", history, "", ""
                         except Exception as e:
                             history[-1]["content"] += f"\n（流式出错）{type(e).__name__}: {e}"
-                            yield history, "", history
+                            yield history, "", history, "", ""
                     else:
                         try:
                             full = design_poker_game(user_text, tuples_hist, files, custom_prompt, mode)
@@ -332,30 +340,34 @@ with gr.Blocks(
                             full = f"（出错）{type(e).__name__}: {e}"
                         for piece in _chunk_fake_stream(str(full), step=40):
                             history[-1]["content"] += piece
-                            yield history, "", history
+                            yield history, "", history, "", ""
 
                     # 提取 GDL 和自然语言描述并保存
-                    gdl_content, narrative_content = extract_gdl_and_narrative(history[-1]["content"])
-
-                    # 保存 GDL 和自然语言文件
-                    gdl_file_path, narrative_file_path = save_gdl_and_narrative(gdl_content, narrative_content)
-
-                    # 返回文件路径，以便下载
-                    yield history, gdl_file_path, narrative_file_path
+                    try:
+                        gdl_content, narrative_content = extract_gdl_and_narrative(history[-1]["content"])
+                        
+                        # 保存 GDL 和自然语言文件
+                        gdl_path, narrative_path = save_gdl_and_narrative(gdl_content, narrative_content)
+                        
+                        # 返回文件路径，以便下载
+                        yield history, "", history, gdl_path, narrative_path  # 🟩【修改】返回文件路径
+                    except Exception as e:
+                        print(f"保存GDL和自然语言文件时出错: {e}")
+                        yield history, "", history, "", ""  # 🟩【修改】返回空路径
 
                 # 绑定：回车提交（Enter=提交；Shift+Enter=换行由浏览器处理）
                 user_input.submit(
                     fn=on_submit,
                     inputs=[user_input, chat_state, file_uploader, custom_prompt_box, prompt_mode],
-                    outputs=[chatbot, user_input, chat_state],
+                    outputs=[chatbot, user_input, chat_state, gdl_file_path, narrative_file_path],  # 🟩【修改】输出改为5个
                     preprocess=True,
                 )
 
-                # 绑定：点击“发送”
+                # 绑定：点击"发送"
                 send_btn.click(
                     fn=on_submit,
                     inputs=[user_input, chat_state, file_uploader, custom_prompt_box, prompt_mode],
-                    outputs=[chatbot, user_input, chat_state],
+                    outputs=[chatbot, user_input, chat_state, gdl_file_path, narrative_file_path],  # 🟩【修改】输出改为5个
                     preprocess=True,
                 )
 
@@ -369,12 +381,12 @@ with gr.Blocks(
                     clear_dialog_btn = gr.Button("清空对话", variant="secondary")
 
                 def _clear_chat():
-                    return [], "", []
+                    return [], "", [], "", "" 
 
                 clear_dialog_btn.click(
                     fn=_clear_chat,
                     inputs=None,
-                    outputs=[chatbot, user_input, chat_state],
+                    outputs=[chatbot, user_input, chat_state, gdl_file_path, narrative_file_path],  # 🟩【修改】输出改为5个
                 )
 
                 # ==================== 下载按钮部分 ====================
@@ -386,16 +398,27 @@ with gr.Blocks(
                     download_gdl_file = gr.File(label="GDL 文件", interactive=False)  # 文件下载区域
                     download_narrative_file = gr.File(label="自然语言文件", interactive=False)  # 文件下载区域
 
+                # 🟩【修改】绑定下载按钮与文件路径 - 修复版本
+                def get_gdl_file(gdl_path):
+                    if gdl_path and os.path.exists(gdl_path):
+                        return gdl_path
+                    return None
+
+                def get_narrative_file(narrative_path):
+                    if narrative_path and os.path.exists(narrative_path):
+                        return narrative_path
+                    return None
+
                 # 绑定下载按钮与文件路径
                 download_gdl_btn.click(
-                    fn=lambda: "exports/gdl_output.txt",  # 直接返回文件路径
-                    inputs=[],
+                    fn=get_gdl_file,
+                    inputs=[gdl_file_path],  # 🟩【修改】接收State中的路径
                     outputs=[download_gdl_file]
                 )
 
                 download_narrative_btn.click(
-                    fn=lambda: "exports/narrative_output.txt",  # 直接返回文件路径
-                    inputs=[],
+                    fn=get_narrative_file,
+                    inputs=[narrative_file_path],  # 🟩【修改】接收State中的路径
                     outputs=[download_narrative_file]
                 )