diff --git a/embedding_ollama.py b/embedding_ollama.py index b755ddd..8dd6dea 100644 --- a/embedding_ollama.py +++ b/embedding_ollama.py @@ -5,15 +5,18 @@ from typing import List class OllamaEmbeddings: """ Ollama 本地服务提供的 Embedding 接口, - 本需求里我们最终拼出形如: http://localhost:11434/api/embed + 最终拼出形如: http://localhost:11434/api/embed 即 base_url + "/embed" """ def __init__(self, model_name: str, base_url: str): self.model_name = model_name - self.base_url = base_url # 这里应形如 http://localhost:11434/api (不再含 /v1) + self.base_url = base_url # 这里一般形如 http://localhost:11434/api (而非 /v1) def embed(self, texts: List[str]) -> List[List[float]]: + """ + 批量将多段文本转换为embedding向量 + """ embeddings = [] for text in texts: embeddings.append(self.embed_single_document(text)) @@ -21,13 +24,9 @@ class OllamaEmbeddings: def embed_documents(self, texts: List[str]) -> List[List[float]]: """ - 将多段文本转换为向量列表 + 兼容langchain的接口写法 """ - embeddings = [] - for text in texts: - emb = self.embed_single_document(text) - embeddings.append(emb) - return embeddings + return self.embed(texts) def embed_query(self, query: str) -> List[float]: """ @@ -38,7 +37,6 @@ class OllamaEmbeddings: def embed_single_document(self, text: str) -> List[float]: """ 调用 Ollama 本地服务接口,获取文本的 embedding。 - 这里统一改为请求: [base_url]/embed """ url = f"{self.base_url}/embed" data = { @@ -49,6 +47,8 @@ class OllamaEmbeddings: response = requests.post(url, json=data) response.raise_for_status() result = response.json() + if "embedding" not in result: + raise ValueError("No 'embedding' field in Ollama response.") return result["embedding"] except requests.exceptions.RequestException as e: raise Exception(f"Ollama embeddings request error: {e}") diff --git a/novel_generator.py b/novel_generator.py index 71343a2..0b01ac6 100644 --- a/novel_generator.py +++ b/novel_generator.py @@ -29,12 +29,11 @@ from embedding_ollama import OllamaEmbeddings from chapter_directory_parser import get_chapter_info_from_directory # ============ 日志配置 ============ - logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s] %(message)s") def debug_log(prompt: str, response_content: str): - logging.info(f"\n[Prompt >>>] {prompt}\n") - logging.info(f"[Response >>>] {response_content}\n") + logging.info(f"\n[Prompt >>>] {prompt}\n") + logging.info(f"[Response >>>] {response_content}\n") # ============ 判断接口格式相关 ============ @@ -54,7 +53,6 @@ def is_using_ml_studio_api(interface_format: str, base_url: str) -> bool: return True return False - # ============ 创建 Embeddings 对象 ============ def create_embeddings_object( @@ -67,25 +65,23 @@ def create_embeddings_object( """ 根据用户在UI中配置的参数,返回对应的 embeddings 对象。 - 当 interface_format = "Ollama" => OllamaEmbeddings(...) - (此时把 embed_url 中的 /v1 替换成 /api,以便最后调用 /api/embed) - - 当 interface_format = "OpenAI" or "ML Studio" => OpenAIEmbeddings - - 其它情况视需求可扩展 + - 当 interface_format = "OpenAI"/"ML Studio" => OpenAIEmbeddings(...) + - 其它情况可扩展 """ if is_using_ollama_api(interface_format, embed_url): fixed_url = embed_url.rstrip("/") + # Ollama embedding接口通常是 /api/embed fixed_url = fixed_url.replace("/v1", "/api") return OllamaEmbeddings( model_name=embedding_model_name, base_url=fixed_url ) elif is_using_ml_studio_api(interface_format, base_url): - # ML Studio / OpenAI 兼容 return OpenAIEmbeddings(openai_api_key=api_key, openai_api_base=base_url) else: # 默认使用 OpenAIEmbeddings return OpenAIEmbeddings(openai_api_key=api_key, openai_api_base=base_url) - # ============ 向量库相关 ============ VECTOR_STORE_DIR = os.path.join(os.getcwd(), "vectorstore") @@ -225,9 +221,7 @@ def get_relevant_context_from_vector_store( logging.info("No vector store found. Returning empty context.") return "" - # 向量库存在,但没有足够的内容时也避免索引错误 docs = store.similarity_search(query, k=k) - if not docs: logging.info(f"No relevant documents found for query '{query}'. Returning empty context.") return "" @@ -235,7 +229,6 @@ def get_relevant_context_from_vector_store( combined = "\n".join([d.page_content for d in docs]) return combined - # ============ 多步生成:设置 & 目录 ============ class OverallState(TypedDict): @@ -308,7 +301,7 @@ def Novel_novel_directory_generate( debug_log(prompt, response.content) return {"dark_lines": response.content.strip()} - def finalize_novel_setting(state: OverallState) -> Dict[str, str]: + def finalize_novel_setting_func(state: OverallState) -> Dict[str, str]: prompt = finalize_setting_prompt.format( novel_setting_base=state["novel_setting_base"], character_setting=state["character_setting"], @@ -321,7 +314,7 @@ def Novel_novel_directory_generate( debug_log(prompt, response.content) return {"final_novel_setting": response.content.strip()} - def generate_novel_directory(state: OverallState) -> Dict[str, str]: + def generate_novel_directory_func(state: OverallState) -> Dict[str, str]: prompt = novel_directory_prompt.format( final_novel_setting=state["final_novel_setting"], number_of_chapters=state["number_of_chapters"] @@ -337,8 +330,8 @@ def Novel_novel_directory_generate( graph.add_node("generate_base_setting", generate_base_setting) graph.add_node("generate_character_setting", generate_character_setting) graph.add_node("generate_dark_lines", generate_dark_lines) - graph.add_node("finalize_novel_setting", finalize_novel_setting) - graph.add_node("generate_novel_directory", generate_novel_directory) + graph.add_node("finalize_novel_setting", finalize_novel_setting_func) + graph.add_node("generate_novel_directory", generate_novel_directory_func) graph.add_edge(START, "generate_base_setting") graph.add_edge("generate_base_setting", "generate_character_setting") @@ -377,10 +370,14 @@ def Novel_novel_directory_generate( final_novel_setting_cleaned = clean_text(final_novel_setting) final_novel_directory_cleaned = clean_text(final_novel_directory) - append_text_to_file(final_novel_setting_cleaned, filename_set) - append_text_to_file(final_novel_directory_cleaned, filename_novel_directory) - logging.info("Novel settings and directory generated successfully.") + # 改进:写文件时先清空再写入 + clear_file_content(filename_set) + save_string_to_txt(final_novel_setting_cleaned, filename_set) + clear_file_content(filename_novel_directory) + save_string_to_txt(final_novel_directory_cleaned, filename_novel_directory) + + logging.info("Novel settings and directory generated successfully.") # ============ 获取最近N章内容,生成短期摘要 ============ @@ -401,7 +398,6 @@ def get_last_n_chapters_text(chapters_dir: str, current_chapter_num: int, n: int texts = [''] * (n - len(texts)) + texts return texts - def summarize_recent_chapters( llm_model: str, api_key: str, @@ -414,8 +410,10 @@ def summarize_recent_chapters( """ if not chapters_text_list: return "" - if chapters_text_list==['', '', '']: + # 如果列表里全是空,则无法生成摘要 + if all(not txt.strip() for txt in chapters_text_list): return "暂无摘要。" + model = ChatOpenAI( model=llm_model, api_key=api_key, @@ -431,10 +429,10 @@ def summarize_recent_chapters( response = model.invoke(prompt) if not response or not response.content.strip(): + # 若模型无响应,就截取一段作为“备选” return combined_text[:800] + "..." if len(combined_text) > 800 else combined_text return response.content.strip() - # ============ 新增:剧情要点/未解决冲突 ============ PLOT_ARCS_PROMPT = """\ @@ -473,7 +471,6 @@ def update_plot_arcs( return old_plot_arcs return response.content.strip() - # ============ 生成章节草稿 & 定稿 ============ def generate_chapter_draft( @@ -502,13 +499,12 @@ def generate_chapter_draft( chapter_title = chapter_info["chapter_title"] chapter_brief = chapter_info["chapter_brief"] - # 从向量库检索多次上下文(示例:对本章简介、用户指导分别做查询,再合并) + # 从向量库检索上下文 queries = [] if user_guidance.strip(): queries.append(user_guidance) if chapter_brief.strip(): queries.append(chapter_brief) - # 也可加一句“回顾剧情”之类 queries.append("回顾剧情") relevant_context = "" @@ -524,7 +520,6 @@ def generate_chapter_draft( ) if partial_context.strip(): relevant_context += "\n" + partial_context - # 如果检索结果为空,使用默认值(如空字符串) if not relevant_context: relevant_context = "暂无相关内容。" @@ -716,7 +711,6 @@ def enrich_chapter_text( return chapter_text return response.content.strip() - # ============ 导入外部知识文本 ============ def import_knowledge_file( @@ -740,6 +734,8 @@ def import_knowledge_file( logging.warning("知识库文件内容为空。") return + nltk.download('punkt_tab', quiet=True) + paragraphs = advanced_split_content(content) store = load_vector_store(api_key, base_url, interface_format, embedding_model_name, embedding_base_url) @@ -765,10 +761,8 @@ def advanced_split_content(content: str, max_length: int = 500) -> List[str]: """ 将文本先按句子切分,然后根据语义相似度进行合并,最后按max_length二次切分。 + 可根据需要微调此逻辑。 """ - # 纠正下载punkt包:'punkt' 而非 'punkt_tab' - nltk.download('punkt', quiet=True) - sentences = nltk.sent_tokenize(content) if not sentences: return [] diff --git a/ui.py b/ui.py index dd787c5..43fe10c 100644 --- a/ui.py +++ b/ui.py @@ -8,7 +8,7 @@ import customtkinter as ctk from tkinter import filedialog, messagebox import traceback from config_manager import load_config, save_config -from utils import read_file, save_string_to_txt +from utils import read_file, save_string_to_txt, clear_file_content from novel_generator import ( Novel_novel_directory_generate, generate_chapter_draft, @@ -34,7 +34,14 @@ class NovelGeneratorGUI: def __init__(self, master): self.master = master self.master.title("Novel Generator GUI (CustomTkinter)") - self.master.iconbitmap("icon.ico") + + # 防止因 icon.ico 不存在导致程序崩溃 + try: + if os.path.exists("icon.ico"): + self.master.iconbitmap("icon.ico") + except Exception: + pass + # 窗口最大化 self.master.state("zoomed") # 配置窗口大小 @@ -90,9 +97,6 @@ class NovelGeneratorGUI: # ------------------ 主功能 Tab ------------------ def build_main_tab(self): - """ - 主Tab: 左侧显示章节草稿/日志, 右侧是功能区 & 配置区 - """ self.main_tab.rowconfigure(0, weight=1) self.main_tab.columnconfigure(0, weight=1) self.main_tab.columnconfigure(1, weight=0) @@ -100,6 +104,7 @@ class NovelGeneratorGUI: # 左侧Frame self.left_frame = ctk.CTkFrame(self.main_tab) self.left_frame.grid(row=0, column=0, sticky="nsew", padx=2, pady=2) + # 右侧Frame self.right_frame = ctk.CTkFrame(self.main_tab) self.right_frame.grid(row=0, column=1, sticky="nsew", padx=2, pady=2) @@ -110,11 +115,6 @@ class NovelGeneratorGUI: self.build_right_layout() def build_left_layout(self): - """ - 左侧包含两个区域: - 1. 本章草稿内容(可编辑) - 2. 输出日志(只读) - """ self.left_frame.grid_rowconfigure(0, weight=3) self.left_frame.grid_rowconfigure(1, weight=1) self.left_frame.grid_columnconfigure(0, weight=1) @@ -137,16 +137,11 @@ class NovelGeneratorGUI: self.log_text.configure(state="disabled") def build_right_layout(self): - """ - 右侧用于显示配置与功能按钮。 - 其中配置被拆分到一个子 TabView:AI接口配置 和 Embedding配置。 - 下面再放与小说相关的输入(主题/类型/章节数等)与功能按钮。 - """ self.right_frame.grid_rowconfigure(0, weight=0) self.right_frame.grid_rowconfigure(1, weight=0) self.right_frame.grid_rowconfigure(2, weight=1) - self.right_frame.grid_columnconfigure(0, weight=0) - self.right_frame.grid_columnconfigure(1, weight=1) + self.right_frame.columnconfigure(0, weight=0) + self.right_frame.columnconfigure(1, weight=1) # ========== 1. 配置项 TabView(AI接口配置 & Embedding配置) ========== self.config_tabview = ctk.CTkTabview(self.right_frame) @@ -166,19 +161,6 @@ class NovelGeneratorGUI: self.build_main_buttons_area(start_row=10) def build_ai_config_tab(self): - """ - 在 AI接口配置 子Tab 上放置: - - API Key - - Base URL - - 接口格式 - - 模型名称 - - Temperature - """ - for i in range(5): - self.ai_config_tab.grid_rowconfigure(i, weight=0) - self.ai_config_tab.grid_columnconfigure(0, weight=0) - self.ai_config_tab.grid_columnconfigure(1, weight=1) - def on_interface_format_changed(new_value): # 如果用户切换接口格式,可根据需要修改BaseURL为默认值 if new_value == "Ollama": @@ -188,6 +170,11 @@ class NovelGeneratorGUI: elif new_value == "OpenAI": self.base_url_var.set("https://api.agicto.cn/v1") + for i in range(5): + self.ai_config_tab.grid_rowconfigure(i, weight=0) + self.ai_config_tab.grid_columnconfigure(0, weight=0) + self.ai_config_tab.grid_columnconfigure(1, weight=1) + # 1. API Key api_key_label = ctk.CTkLabel(self.ai_config_tab, text="API Key:", font=("Microsoft YaHei", 12)) api_key_label.grid(row=0, column=0, padx=5, pady=5, sticky="e") @@ -239,11 +226,6 @@ class NovelGeneratorGUI: self.temp_value_label.grid(row=4, column=2, padx=1, pady=1, sticky="w") def build_embeddings_config_tab(self): - """ - 在 Embedding配置 子Tab 上放置: - - Embedding URL - - Embedding 模型名称 - """ for i in range(2): self.embeddings_config_tab.grid_rowconfigure(i, weight=0) self.embeddings_config_tab.grid_columnconfigure(0, weight=0) @@ -262,9 +244,6 @@ class NovelGeneratorGUI: emb_model_name_entry.grid(row=1, column=1, padx=5, pady=5, sticky="nsew") def build_novel_params_area(self, start_row=2): - """ - 放置与小说本身相关的一些配置:主题、类型、章节数、文件路径等 - """ # 主题(Topic) topic_label = ctk.CTkLabel(self.right_frame, text="主题(Topic):", font=("Microsoft YaHei", 12)) topic_label.grid(row=start_row, column=0, padx=5, pady=5, sticky="e") @@ -317,9 +296,6 @@ class NovelGeneratorGUI: self.user_guide_text.grid(row=start_row+6, column=1, padx=5, pady=5, sticky="nsew") def build_main_buttons_area(self, start_row=10): - """ - 主要功能按钮 + 配置保存/加载 按钮 - """ self.right_frame.grid_rowconfigure(start_row, weight=0) self.btn_frame_config = ctk.CTkFrame(self.right_frame) @@ -418,6 +394,7 @@ class NovelGeneratorGUI: content = self.setting_text.get("0.0", "end").strip() setting_file = os.path.join(filepath, "Novel_setting.txt") + clear_file_content(setting_file) save_string_to_txt(content, setting_file) self.log("已保存对 Novel_setting.txt 的修改。") @@ -456,6 +433,7 @@ class NovelGeneratorGUI: content = self.directory_text.get("0.0", "end").strip() directory_file = os.path.join(filepath, "Novel_directory.txt") + clear_file_content(directory_file) save_string_to_txt(content, directory_file) self.log("已保存对 Novel_directory.txt 的修改。") @@ -494,6 +472,7 @@ class NovelGeneratorGUI: content = self.character_text.get("0.0", "end").strip() char_file = os.path.join(filepath, "character_state.txt") + clear_file_content(char_file) save_string_to_txt(content, char_file) self.log("已保存对 character_state.txt 的修改。") @@ -532,6 +511,7 @@ class NovelGeneratorGUI: content = self.summary_text.get("0.0", "end").strip() summary_file = os.path.join(filepath, "global_summary.txt") + clear_file_content(summary_file) save_string_to_txt(content, summary_file) self.log("已保存对 global_summary.txt 的修改。") @@ -585,24 +565,35 @@ class NovelGeneratorGUI: if selected_dir: self.filepath_var.set(selected_dir) - # ------------------ 日志输出 ------------------ + # ------------------ 日志输出(主线程安全) ------------------ def log(self, message: str): + # 这里是主线程下安全的文本输出方法 self.log_text.configure(state="normal") self.log_text.insert("end", message + "\n") self.log_text.see("end") self.log_text.configure(state="disabled") - # ------------------ 功能区 -------------------- - def disable_button(self, btn): - btn.configure(state="disabled") + def safe_log(self, message: str): + # 子线程中调用:把真正的日志操作切换回主线程执行 + self.master.after(0, lambda: self.log(message)) - def enable_button(self, btn): - btn.configure(state="normal") + # 由于按钮更新也属于UI操作,也需要安全方式 + def disable_button_safe(self, btn): + self.master.after(0, lambda: btn.configure(state="disabled")) + def enable_button_safe(self, btn): + self.master.after(0, lambda: btn.configure(state="normal")) + + # ------------------ 功能区(带线程处理) -------------------- def generate_full_novel(self): """生成小说设定 & 目录""" + filepath = self.filepath_var.get().strip() + if not filepath: + messagebox.showwarning("警告", "请先选择保存文件路径") + return + def task(): - self.disable_button(self.btn_generate_full) + self.disable_button_safe(self.btn_generate_full) try: api_key = self.api_key_var.get().strip() base_url = self.base_url_var.get().strip() @@ -611,14 +602,9 @@ class NovelGeneratorGUI: genre = self.genre_var.get().strip() num_chapters = self.num_chapters_var.get() word_number = self.word_number_var.get() - filepath = self.filepath_var.get().strip() temperature = self.temperature_var.get() - if not filepath: - messagebox.showwarning("警告", "请先选择保存文件路径") - return - - self.log("开始生成小说设定和目录...") + self.safe_log("开始生成小说设定和目录...") Novel_novel_directory_generate( api_key=api_key, base_url=base_url, @@ -630,35 +616,33 @@ class NovelGeneratorGUI: filepath=filepath, temperature=temperature ) - self.log("✅ 小说设定和目录生成完成。查看 Novel_setting.txt 和 Novel_directory.txt。") + self.safe_log("✅ 小说设定和目录生成完成。查看 Novel_setting.txt 和 Novel_directory.txt。") except Exception as e: - logging.error(f"生成小说设定 & 目录时出错: {e}") - self.log(f"❌ 生成小说设定 & 目录时出错: {e}") + log_error(f"生成小说设定 & 目录时出错: {e}") + self.safe_log(f"❌ 生成小说设定 & 目录时出错: {e}") finally: - self.enable_button(self.btn_generate_full) + self.enable_button_safe(self.btn_generate_full) - thread = threading.Thread(target=task) - thread.start() + threading.Thread(target=task, daemon=True).start() def generate_chapter_draft_ui(self): """生成当前章节的草稿""" + filepath = self.filepath_var.get().strip() + if not filepath: + messagebox.showwarning("警告", "请先配置保存文件路径。") + return + def task(): - self.disable_button(self.btn_generate_chapter) + self.disable_button_safe(self.btn_generate_chapter) try: api_key = self.api_key_var.get().strip() base_url = self.base_url_var.get().strip() model_name = self.model_name_var.get().strip() temperature = self.temperature_var.get() - filepath = self.filepath_var.get().strip() - - if not filepath: - self.log("请先配置保存文件路径。") - return - novel_settings_file = os.path.join(filepath, "Novel_setting.txt") novel_settings = read_file(novel_settings_file) if not novel_settings.strip(): - self.log("⚠️ 未找到 Novel_setting.txt,请先生成设定。") + self.safe_log("⚠️ 未找到 Novel_setting.txt,请先生成设定。") return character_state_file = os.path.join(filepath, "character_state.txt") @@ -685,7 +669,7 @@ class NovelGeneratorGUI: chapters_text_list=recent_3_texts ) - self.log(f"开始生成第{chap_num}章草稿...") + self.safe_log(f"开始生成第{chap_num}章草稿...") draft_text = generate_chapter_draft( novel_settings=novel_settings, global_summary=global_summary, @@ -705,43 +689,46 @@ class NovelGeneratorGUI: embedding_base_url=self.embedding_url_var.get().strip() ) if draft_text: - self.log(f"✅ 第{chap_num}章草稿生成完成。请在左侧查看或编辑。") - self.chapter_result.delete("0.0", "end") - self.chapter_result.insert("0.0", draft_text) - self.chapter_result.see("end") + self.safe_log(f"✅ 第{chap_num}章草稿生成完成。请在左侧查看或编辑。") + # 更新UI中的章节草稿 + self.master.after(0, lambda: self.show_chapter_in_textbox(draft_text)) else: - self.log("⚠️ 本章草稿生成失败或无内容。") + self.safe_log("⚠️ 本章草稿生成失败或无内容。") except Exception as e: - logging.error(f"生成章节草稿时出错: {e}") - self.log(f"❌ 生成章节草稿时出错: {e}") + log_error(f"生成章节草稿时出错: {e}") + self.safe_log(f"❌ 生成章节草稿时出错: {e}") finally: - self.enable_button(self.btn_generate_chapter) + self.enable_button_safe(self.btn_generate_chapter) - thread = threading.Thread(target=task) - thread.start() + threading.Thread(target=task, daemon=True).start() + + def show_chapter_in_textbox(self, text: str): + self.chapter_result.delete("0.0", "end") + self.chapter_result.insert("0.0", text) + self.chapter_result.see("end") def finalize_chapter_ui(self): """定稿当前章节:更新全局摘要、角色状态、向量库等""" + filepath = self.filepath_var.get().strip() + if not filepath: + messagebox.showwarning("警告", "请先配置保存文件路径。") + return + def task(): - self.disable_button(self.btn_finalize_chapter) + self.disable_button_safe(self.btn_finalize_chapter) try: api_key = self.api_key_var.get().strip() base_url = self.base_url_var.get().strip() model_name = self.model_name_var.get().strip() temperature = self.temperature_var.get() - filepath = self.filepath_var.get().strip() interface_format = self.interface_format_var.get().strip() embedding_model_name = self.embedding_model_name_var.get().strip() - if not filepath: - self.log("请先配置保存文件路径。") - return - chap_num = self.chapter_num_var.get() word_number = self.word_number_var.get() - self.log(f"开始定稿第{chap_num}章...") + self.safe_log(f"开始定稿第{chap_num}章...") finalize_chapter( novel_number=chap_num, word_number=word_number, @@ -753,38 +740,35 @@ class NovelGeneratorGUI: temperature=temperature, filepath=filepath ) - self.log(f"✅ 第{chap_num}章定稿完成(已更新全局摘要、角色状态、剧情要点、向量库)。") + self.safe_log(f"✅ 第{chap_num}章定稿完成(已更新全局摘要、角色状态、剧情要点、向量库)。") # 读取定稿后的文本显示 chap_file = os.path.join(filepath, "chapters", f"chapter_{chap_num}.txt") final_text = read_file(chap_file) - self.chapter_result.delete("0.0", "end") - self.chapter_result.insert("0.0", final_text) - self.chapter_result.see("end") + self.master.after(0, lambda: self.show_chapter_in_textbox(final_text)) except Exception as e: - logging.error(f"定稿章节时出错: {e}") - self.log(f"❌ 定稿章节时出错: {e}") + log_error(f"定稿章节时出错: {e}") + self.safe_log(f"❌ 定稿章节时出错: {e}") finally: - self.enable_button(self.btn_finalize_chapter) + self.enable_button_safe(self.btn_finalize_chapter) - thread = threading.Thread(target=task) - thread.start() + threading.Thread(target=task, daemon=True).start() def do_consistency_check(self): """使用审校Agent对最新章节进行简单一致性或冲突检查""" + filepath = self.filepath_var.get().strip() + if not filepath: + messagebox.showwarning("警告", "请先配置保存文件路径。") + return + def task(): - self.disable_button(self.btn_check_consistency) + self.disable_button_safe(self.btn_check_consistency) try: api_key = self.api_key_var.get().strip() base_url = self.base_url_var.get().strip() model_name = self.model_name_var.get().strip() temperature = self.temperature_var.get() - filepath = self.filepath_var.get().strip() - - if not filepath: - self.log("请先配置保存文件路径。") - return novel_settings_file = os.path.join(filepath, "Novel_setting.txt") character_state_file = os.path.join(filepath, "character_state.txt") @@ -801,10 +785,10 @@ class NovelGeneratorGUI: chapter_text = read_file(chap_file) if not chapter_text.strip(): - self.log("⚠️ 当前章节文件为空或不存在,无法审校。") + self.safe_log("⚠️ 当前章节文件为空或不存在,无法审校。") return - self.log("开始一致性审校...") + self.safe_log("开始一致性审校...") result = check_consistency( novel_setting=novel_setting, character_state=character_state, @@ -816,17 +800,16 @@ class NovelGeneratorGUI: temperature=temperature, plot_arcs=plot_arcs ) - self.log("审校结果:") - self.log(result) + self.safe_log("审校结果:") + self.safe_log(result) except Exception as e: - logging.error(f"审校时出错: {e}") - self.log(f"❌ 审校时出错: {e}") + log_error(f"审校时出错: {e}") + self.safe_log(f"❌ 审校时出错: {e}") finally: - self.enable_button(self.btn_check_consistency) + self.enable_button_safe(self.btn_check_consistency) - thread = threading.Thread(target=task) - thread.start() + threading.Thread(target=task, daemon=True).start() def import_knowledge_handler(self): """处理导入知识库文件。""" @@ -836,9 +819,9 @@ class NovelGeneratorGUI: ) if selected_file: def task(): - self.disable_button(self.btn_import_knowledge) + self.disable_button_safe(self.btn_import_knowledge) try: - self.log(f"开始导入知识库文件: {selected_file}") + self.safe_log(f"开始导入知识库文件: {selected_file}") import_knowledge_file( api_key=self.api_key_var.get().strip(), base_url=self.base_url_var.get().strip(), @@ -847,15 +830,14 @@ class NovelGeneratorGUI: file_path=selected_file, embedding_base_url=self.embedding_url_var.get().strip() ) - self.log("✅ 知识库文件导入完成。") + self.safe_log("✅ 知识库文件导入完成。") except Exception as e: - logging.error(f"导入知识库时出错: {e}") - self.log(f"❌ 导入知识库时出错: {e}") + log_error(f"导入知识库时出错: {e}") + self.safe_log(f"❌ 导入知识库时出错: {e}") finally: - self.enable_button(self.btn_import_knowledge) + self.enable_button_safe(self.btn_import_knowledge) - thread = threading.Thread(target=task) - thread.start() + threading.Thread(target=task, daemon=True).start() def clear_vectorstore_handler(self): """清空向量库按钮:弹出二次确认。"""