jarvis-ai-assistant 0.3.19__py3-none-any.whl → 0.3.21__py3-none-any.whl

jarvis/jarvis_memory_organizer/memory_organizer.py

@@ -163,7 +163,7 @@ class MemoryOrganizer:
             )
             all_tags.update(memory.get("tags", []))
 
-        memory_contents_str = (("="*50) + "\n").join(memory_contents)
+        memory_contents_str = (("=" * 50) + "\n").join(memory_contents)
 
         prompt = f"""请将以下{len(memories)}个相关记忆合并成一个综合性的记忆。
 

jarvis/jarvis_methodology/main.py

@@ -67,9 +67,7 @@ def import_methodology(
 
 
 @app.command("export")
-def export_methodology(
-    output_file: str = typer.Argument(..., help="导出文件路径")
-):
+def export_methodology(output_file: str = typer.Argument(..., help="导出文件路径")):
     """导出当前方法论到单个文件"""
     try:
         methodologies = _load_all_methodologies()
@@ -211,7 +209,9 @@ def extract_methodology(
 
 
 @app.command("extract-url")
-def extract_methodology_from_url(url: str = typer.Argument(..., help="要提取方法论的URL")):
+def extract_methodology_from_url(
+    url: str = typer.Argument(..., help="要提取方法论的URL")
+):
     """从URL提取方法论"""
     try:
         # 获取平台实例

jarvis/jarvis_multi_agent/__init__.py

@@ -115,9 +115,9 @@ content: |2
 
         if name != self.main_agent_name and self.original_question:
             system_prompt = config.get("system_prompt", "")
-            config[
-                "system_prompt"
-            ] = f"{system_prompt}\n\n# 原始问题\n{self.original_question}"
+            config["system_prompt"] = (
+                f"{system_prompt}\n\n# 原始问题\n{self.original_question}"
+            )
 
         output_handler = config.get("output_handler", [])
         if len(output_handler) == 0:

jarvis/jarvis_platform/ai8.py

@@ -50,10 +50,6 @@ class AI8Model(BasePlatform):
         }
 
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
-        if self.model_name not in self.get_available_models():
-            PrettyOutput.print(
-                f"警告: 选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING
-            )
 
     def set_model_name(self, model_name: str):
         """Set model name"""

jarvis/jarvis_platform/base.py

@@ -84,7 +84,9 @@ class BasePlatform(ABC):
             )  # 留出一些余量
             min_chunk_size = get_max_input_token_count(self.model_group) - 2048
             inputs = split_text_into_chunks(message, max_chunk_size, min_chunk_size)
-            PrettyOutput.print(f"长上下文，分批提交，共{len(inputs)}部分...", OutputType.INFO)
+            PrettyOutput.print(
+                f"长上下文，分批提交，共{len(inputs)}部分...", OutputType.INFO
+            )
             prefix_prompt = f"""
             我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
             """
@@ -96,7 +98,6 @@ class BasePlatform(ABC):
                 submit_count += 1
                 length += len(input)
 
-
                 response += "\n"
                 for trunk in while_true(
                     lambda: while_success(
@@ -109,7 +110,6 @@ class BasePlatform(ABC):
                 ):
                     response += trunk
 
-
             PrettyOutput.print("提交完成", OutputType.SUCCESS)
             response += "\n" + while_true(
                 lambda: while_success(
@@ -134,11 +134,13 @@ class BasePlatform(ABC):
                     with Live(panel, refresh_per_second=10, transient=False) as live:
                         for s in self.chat(message):
                             response += s
-                            if is_immediate_abort() and get_interrupt():
-                                return response
                             text_content.append(s, style="bright_white")
-                            panel.subtitle = "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
+                            panel.subtitle = (
+                                "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
+                            )
                             live.update(panel)
+                            if is_immediate_abort() and get_interrupt():
+                                return response
                         end_time = time.time()
                         duration = end_time - start_time
                         panel.subtitle = (
@@ -147,7 +149,10 @@ class BasePlatform(ABC):
                         live.update(panel)
                 else:
                     # Print a clear prefix line before streaming model output (non-pretty mode)
-                    console.print(f"🤖 模型输出 - {self.name()}  (按 Ctrl+C 中断)", soft_wrap=False)
+                    console.print(
+                        f"🤖 模型输出 - {self.name()}  (按 Ctrl+C 中断)",
+                        soft_wrap=False,
+                    )
                     for s in self.chat(message):
                         console.print(s, end="")
                         response += s

jarvis/jarvis_platform/kimi.py

@@ -194,7 +194,9 @@ class KimiModel(BasePlatform):
         uploaded_files = []
         for index, file_path in enumerate(file_list, 1):
             file_name = os.path.basename(file_path)
-            PrettyOutput.print(f"处理文件 [{index}/{len(file_list)}]: {file_name}", OutputType.INFO)
+            PrettyOutput.print(
+                f"处理文件 [{index}/{len(file_list)}]: {file_name}", OutputType.INFO
+            )
             try:
                 mime_type, _ = mimetypes.guess_type(file_path)
                 action = (
@@ -214,22 +216,32 @@ class KimiModel(BasePlatform):
 
                     # 只有文件需要解析
                     if action == "file":
-                        PrettyOutput.print(f"等待文件解析: {file_name}", OutputType.INFO)
+                        PrettyOutput.print(
+                            f"等待文件解析: {file_name}", OutputType.INFO
+                        )
                         if self._wait_for_parse(file_info["id"]):
                             uploaded_files.append(file_info)
-                            PrettyOutput.print(f"文件处理完成: {file_name}", OutputType.SUCCESS)
+                            PrettyOutput.print(
+                                f"文件处理完成: {file_name}", OutputType.SUCCESS
+                            )
                         else:
-                            PrettyOutput.print(f"文件解析失败: {file_name}", OutputType.ERROR)
+                            PrettyOutput.print(
+                                f"文件解析失败: {file_name}", OutputType.ERROR
+                            )
                             return False
                     else:
                         uploaded_files.append(file_info)
-                        PrettyOutput.print(f"图片处理完成: {file_name}", OutputType.SUCCESS)
+                        PrettyOutput.print(
+                            f"图片处理完成: {file_name}", OutputType.SUCCESS
+                        )
                 else:
                     PrettyOutput.print(f"文件上传失败: {file_name}", OutputType.ERROR)
                     return False
 
             except Exception as e:
-                PrettyOutput.print(f"处理文件出错 {file_path}: {str(e)}", OutputType.ERROR)
+                PrettyOutput.print(
+                    f"处理文件出错 {file_path}: {str(e)}", OutputType.ERROR
+                )
                 return False
 
         self.uploaded_files = uploaded_files

jarvis/jarvis_platform/tongyi.py

@@ -308,7 +308,10 @@ class TongyiPlatform(BasePlatform):
                     )
 
                     if response.status_code != 200:
-                        PrettyOutput.print(f"上传失败 {file_name}: HTTP {response.status_code}", OutputType.ERROR)
+                        PrettyOutput.print(
+                            f"上传失败 {file_name}: HTTP {response.status_code}",
+                            OutputType.ERROR,
+                        )
                         return False
 
                     # Determine file type based on extension
@@ -340,18 +343,26 @@ class TongyiPlatform(BasePlatform):
 
                     response = http.post(url, headers=headers, json=payload)
                     if response.status_code != 200:
-                        PrettyOutput.print(f"获取下载链接失败: HTTP {response.status_code}", OutputType.ERROR)
+                        PrettyOutput.print(
+                            f"获取下载链接失败: HTTP {response.status_code}",
+                            OutputType.ERROR,
+                        )
                         return False
 
                     result = response.json()
                     if not result.get("success"):
-                        PrettyOutput.print(f"获取下载链接失败: {result.get('errorMsg')}", OutputType.ERROR)
+                        PrettyOutput.print(
+                            f"获取下载链接失败: {result.get('errorMsg')}",
+                            OutputType.ERROR,
+                        )
                         return False
 
                     # Add files to chat
                     self.uploaded_file_info = result.get("data", {}).get("results", [])
                     for file_info in self.uploaded_file_info:
-                        PrettyOutput.print(f"添加文件到对话: {file_name}", OutputType.INFO)
+                        PrettyOutput.print(
+                            f"添加文件到对话: {file_name}", OutputType.INFO
+                        )
                         add_url = "https://api.tongyi.com/assistant/api/chat/file/add"
                         add_payload = {
                             "workSource": "chat",
@@ -394,7 +405,9 @@ class TongyiPlatform(BasePlatform):
                     time.sleep(1)  # 短暂暂停以便用户看到成功状态
 
                 except Exception as e:
-                    PrettyOutput.print(f"上传文件 {file_name} 时出错: {str(e)}", OutputType.ERROR)
+                    PrettyOutput.print(
+                        f"上传文件 {file_name} 时出错: {str(e)}", OutputType.ERROR
+                    )
                     return False
             return True
 

jarvis/jarvis_platform/yuanbao.py

@@ -195,7 +195,9 @@ class YuanbaoPlatform(BasePlatform):
                 PrettyOutput.print(f"获取上传信息: {file_name}", OutputType.INFO)
                 upload_info = self._generate_upload_info(file_name)
                 if not upload_info:
-                    PrettyOutput.print(f"无法获取文件 {file_name} 的上传信息", OutputType.ERROR)
+                    PrettyOutput.print(
+                        f"无法获取文件 {file_name} 的上传信息", OutputType.ERROR
+                    )
                     return False
 
                 # 3. Upload the file to COS
@@ -224,14 +226,19 @@ class YuanbaoPlatform(BasePlatform):
                             file_metadata["width"] = img.width
                             file_metadata["height"] = img.height
                     except Exception as e:
-                        PrettyOutput.print(f"无法获取图片 {file_name} 的尺寸: {str(e)}", OutputType.WARNING)
+                        PrettyOutput.print(
+                            f"无法获取图片 {file_name} 的尺寸: {str(e)}",
+                            OutputType.WARNING,
+                        )
 
                 uploaded_files.append(file_metadata)
                 PrettyOutput.print(f"文件 {file_name} 上传成功", OutputType.SUCCESS)
                 time.sleep(3)  # 上传成功后等待3秒
 
             except Exception as e:
-                PrettyOutput.print(f"上传文件 {file_path} 时出错: {str(e)}", OutputType.ERROR)
+                PrettyOutput.print(
+                    f"上传文件 {file_path} 时出错: {str(e)}", OutputType.ERROR
+                )
                 return False
 
         self.multimedia = uploaded_files

jarvis/jarvis_platform_manager/main.py

@@ -26,7 +26,9 @@ app = typer.Typer(help="Jarvis AI 平台")
 
 @app.command("info")
 def list_platforms(
-    platform: Optional[str] = typer.Option(None, "--platform", "-p", help="指定要查看的平台")
+    platform: Optional[str] = typer.Option(
+        None, "--platform", "-p", help="指定要查看的平台"
+    )
 ) -> None:
     """列出所有支持的平台和模型，或指定平台的详细信息。"""
     registry = PlatformRegistry.get_global_platform_registry()
@@ -217,9 +219,13 @@ def chat_with_model(
                         for entry in conversation_history:
                             file_obj.write(f"{entry['role']}: {entry['content']}\n\n")
 
-                    PrettyOutput.print(f"所有对话已保存到 {file_path}", OutputType.SUCCESS)
+                    PrettyOutput.print(
+                        f"所有对话已保存到 {file_path}", OutputType.SUCCESS
+                    )
                 except Exception as exc:
-                    PrettyOutput.print(f"保存所有对话失败: {str(exc)}", OutputType.ERROR)
+                    PrettyOutput.print(
+                        f"保存所有对话失败: {str(exc)}", OutputType.ERROR
+                    )
                 continue
 
             # Check if it is a save_session command
@@ -240,7 +246,9 @@ def chat_with_model(
                         file_path = file_path[1:-1]
 
                     if platform.save(file_path):
-                        PrettyOutput.print(f"会话已保存到 {file_path}", OutputType.SUCCESS)
+                        PrettyOutput.print(
+                            f"会话已保存到 {file_path}", OutputType.SUCCESS
+                        )
                     else:
                         PrettyOutput.print("保存会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -266,7 +274,9 @@ def chat_with_model(
 
                     if platform.restore(file_path):
                         conversation_history = []  # Clear local history after loading
-                        PrettyOutput.print(f"会话已从 {file_path} 加载", OutputType.SUCCESS)
+                        PrettyOutput.print(
+                            f"会话已从 {file_path} 加载", OutputType.SUCCESS
+                        )
                     else:
                         PrettyOutput.print("加载会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -346,7 +356,9 @@ def validate_platform_model(platform: Optional[str], model: Optional[str]) -> bo
 
 @app.command("chat")
 def chat_command(
-    platform: Optional[str] = typer.Option(None, "--platform", "-p", help="指定要使用的平台"),
+    platform: Optional[str] = typer.Option(
+        None, "--platform", "-p", help="指定要使用的平台"
+    ),
     model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型"),
     llm_type: str = typer.Option(
         "normal",
@@ -429,7 +441,9 @@ def role_command(
     platform: Optional[str] = typer.Option(
         None, "--platform", "-p", help="指定要使用的平台，覆盖角色配置"
     ),
-    model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型，覆盖角色配置"),
+    model: Optional[str] = typer.Option(
+        None, "--model", "-m", help="指定要使用的模型，覆盖角色配置"
+    ),
     llm_type: Optional[str] = typer.Option(
         None,
         "-t",

jarvis/jarvis_platform_manager/service.py

@@ -108,8 +108,6 @@ def start_service(
             OutputType.INFO,
         )
 
-    PrettyOutput.print("Available platforms:", OutputType.INFO)
-
     # Platform and model cache
     platform_instances: Dict[str, Any] = {}
 
@@ -178,7 +176,10 @@ def start_service(
                                 }
                             )
             except Exception as exc:
-                print(f"Error getting models for {default_platform}: {str(exc)}")
+                PrettyOutput.print(
+                    f"Error getting models for {default_platform}: {str(exc)}",
+                    OutputType.ERROR,
+                )
 
         # Return model list
         return {"object": "list", "data": model_list}

jarvis/jarvis_rag/cli.py

@@ -88,7 +88,9 @@ def _create_custom_llm(platform_name: str, model_name: str) -> Optional[LLMInter
         registry = PlatformRegistry.get_global_platform_registry()
         platform_instance = registry.create_platform(platform_name)
         if not platform_instance:
-            PrettyOutput.print(f"错误: 平台 '{platform_name}' 未找到。", OutputType.ERROR)
+            PrettyOutput.print(
+                f"错误: 平台 '{platform_name}' 未找到。", OutputType.ERROR
+            )
             return None
         platform_instance.set_model_name(model_name)
         platform_instance.set_suppress_output(True)
@@ -118,10 +120,14 @@ def _load_ragignore_spec() -> Tuple[Optional[pathspec.PathSpec], Optional[Path]]
             with open(ignore_file_to_use, "r", encoding="utf-8") as f:
                 patterns = f.read().splitlines()
             spec = pathspec.PathSpec.from_lines("gitwildmatch", patterns)
-            PrettyOutput.print(f"加载忽略规则: {ignore_file_to_use}", OutputType.SUCCESS)
+            PrettyOutput.print(
+                f"加载忽略规则: {ignore_file_to_use}", OutputType.SUCCESS
+            )
             return spec, project_root_path
         except Exception as e:
-            PrettyOutput.print(f"加载 {ignore_file_to_use.name} 文件失败: {e}", OutputType.WARNING)
+            PrettyOutput.print(
+                f"加载 {ignore_file_to_use.name} 文件失败: {e}", OutputType.WARNING
+            )
 
     return None, None
 
@@ -147,7 +153,9 @@ def add_documents(
         "-e",
         help="嵌入模型的名称。覆盖全局配置。",
     ),
-    db_path: Optional[Path] = typer.Option(None, "--db-path", help="向量数据库的路径。覆盖全局配置。"),
+    db_path: Optional[Path] = typer.Option(
+        None, "--db-path", help="向量数据库的路径。覆盖全局配置。"
+    ),
     batch_size: int = typer.Option(
         500,
         "--batch-size",
@@ -178,7 +186,9 @@ def add_documents(
                 if is_likely_text_file(path):
                     files_to_process.add(path)
                 else:
-                    PrettyOutput.print(f"跳过可能的二进制文件: {path}", OutputType.WARNING)
+                    PrettyOutput.print(
+                        f"跳过可能的二进制文件: {path}", OutputType.WARNING
+                    )
 
     if not files_to_process:
         PrettyOutput.print("在指定路径中未找到任何文本文件。", OutputType.WARNING)
@@ -202,14 +212,20 @@ def add_documents(
 
         ignored_count = initial_count - len(retained_files)
         if ignored_count > 0:
-            PrettyOutput.print(f"根据 .ragignore 规则过滤掉 {ignored_count} 个文件。", OutputType.INFO)
+            PrettyOutput.print(
+                f"根据 .ragignore 规则过滤掉 {ignored_count} 个文件。", OutputType.INFO
+            )
         files_to_process = retained_files
 
     if not files_to_process:
-        PrettyOutput.print("所有找到的文本文件都被忽略规则过滤掉了。", OutputType.WARNING)
+        PrettyOutput.print(
+            "所有找到的文本文件都被忽略规则过滤掉了。", OutputType.WARNING
+        )
         return
 
-    PrettyOutput.print(f"发现 {len(files_to_process)} 个独立文件待处理。", OutputType.INFO)
+    PrettyOutput.print(
+        f"发现 {len(files_to_process)} 个独立文件待处理。", OutputType.INFO
+    )
 
     try:
         pipeline = JarvisRAGPipeline(
@@ -233,23 +249,32 @@ def add_documents(
                     loader = TextLoader(str(file_path), encoding="utf-8")
 
                 docs_batch.extend(loader.load())
-                PrettyOutput.print(f"已加载: {file_path} (文件 {i + 1}/{total_files})", OutputType.INFO)
+                PrettyOutput.print(
+                    f"已加载: {file_path} (文件 {i + 1}/{total_files})", OutputType.INFO
+                )
             except Exception as e:
                 PrettyOutput.print(f"加载失败 {file_path}: {e}", OutputType.WARNING)
 
             # 当批处理已满或是最后一个文件时处理批处理
             if docs_batch and (len(docs_batch) >= batch_size or (i + 1) == total_files):
-                PrettyOutput.print(f"正在处理批次，包含 {len(docs_batch)} 个文档...", OutputType.INFO)
+                PrettyOutput.print(
+                    f"正在处理批次，包含 {len(docs_batch)} 个文档...", OutputType.INFO
+                )
                 pipeline.add_documents(docs_batch)
                 total_docs_added += len(docs_batch)
-                PrettyOutput.print(f"成功添加 {len(docs_batch)} 个文档。", OutputType.SUCCESS)
+                PrettyOutput.print(
+                    f"成功添加 {len(docs_batch)} 个文档。", OutputType.SUCCESS
+                )
                 docs_batch = []  # 清空批处理
 
         if total_docs_added == 0:
             PrettyOutput.print("未能成功加载任何文档。", OutputType.ERROR)
             raise typer.Exit(code=1)
 
-        PrettyOutput.print(f"成功将 {total_docs_added} 个文档的内容添加至集合 '{collection_name}'。", OutputType.SUCCESS)
+        PrettyOutput.print(
+            f"成功将 {total_docs_added} 个文档的内容添加至集合 '{collection_name}'。",
+            OutputType.SUCCESS,
+        )
 
     except Exception as e:
         PrettyOutput.print(f"发生严重错误: {e}", OutputType.ERROR)
@@ -264,7 +289,9 @@ def list_documents(
         "-c",
         help="向量数据库中集合的名称。",
     ),
-    db_path: Optional[Path] = typer.Option(None, "--db-path", help="向量数据库的路径。覆盖全局配置。"),
+    db_path: Optional[Path] = typer.Option(
+        None, "--db-path", help="向量数据库的路径。覆盖全局配置。"
+    ),
 ):
     """列出指定集合中的所有唯一文档。"""
     try:
@@ -289,10 +316,15 @@ def list_documents(
                     sources.add(source)
 
         if not sources:
-            PrettyOutput.print("知识库中没有找到任何带有源信息的文档。", OutputType.INFO)
+            PrettyOutput.print(
+                "知识库中没有找到任何带有源信息的文档。", OutputType.INFO
+            )
             return
 
-        PrettyOutput.print(f"知识库 '{collection_name}' 中共有 {len(sources)} 个独立文档:", OutputType.INFO)
+        PrettyOutput.print(
+            f"知识库 '{collection_name}' 中共有 {len(sources)} 个独立文档:",
+            OutputType.INFO,
+        )
         for i, source in enumerate(sorted(list(sources)), 1):
             PrettyOutput.print(f"  {i}. {source}", OutputType.INFO)
 
@@ -316,7 +348,9 @@ def retrieve(
         "-e",
         help="嵌入模型的名称。覆盖全局配置。",
     ),
-    db_path: Optional[Path] = typer.Option(None, "--db-path", help="向量数据库的路径。覆盖全局配置。"),
+    db_path: Optional[Path] = typer.Option(
+        None, "--db-path", help="向量数据库的路径。覆盖全局配置。"
+    ),
     n_results: int = typer.Option(5, "--top-n", help="要检索的文档数量。"),
 ):
     """仅从RAG知识库检索文档并打印结果。"""
@@ -341,16 +375,16 @@ def retrieve(
             PrettyOutput.print("未找到相关文档。", OutputType.INFO)
             return
 
-        PrettyOutput.print(f"成功检索到 {len(retrieved_docs)} 个文档:", OutputType.SUCCESS)
+        PrettyOutput.print(
+            f"成功检索到 {len(retrieved_docs)} 个文档:", OutputType.SUCCESS
+        )
         from jarvis.jarvis_utils.globals import console
 
         for i, doc in enumerate(retrieved_docs, 1):
             source = doc.metadata.get("source", "未知来源")
             content = doc.page_content
             panel_title = f"文档 {i} | 来源: {source}"
-            console.print(
-                f"\n[bold magenta]{panel_title}[/bold magenta]"
-            )
+            console.print(f"\n[bold magenta]{panel_title}[/bold magenta]")
             console.print(Markdown(f"```\n{content}\n```"))
 
     except Exception as e:
@@ -373,7 +407,9 @@ def query(
         "-e",
         help="嵌入模型的名称。覆盖全局配置。",
     ),
-    db_path: Optional[Path] = typer.Option(None, "--db-path", help="向量数据库的路径。覆盖全局配置。"),
+    db_path: Optional[Path] = typer.Option(
+        None, "--db-path", help="向量数据库的路径。覆盖全局配置。"
+    ),
     platform: Optional[str] = typer.Option(
         None,
         "--platform",
@@ -436,7 +472,10 @@ except ImportError:
 
 def _check_rag_dependencies():
     if not _RAG_INSTALLED:
-        PrettyOutput.print("RAG依赖项未安装。请运行 'pip install \"jarvis-ai-assistant[rag]\"' 来使用此命令。", OutputType.ERROR)
+        PrettyOutput.print(
+            "RAG依赖项未安装。请运行 'pip install \"jarvis-ai-assistant[rag]\"' 来使用此命令。",
+            OutputType.ERROR,
+        )
         raise typer.Exit(code=1)
 
 

jarvis/jarvis_rag/embedding_manager.py

@@ -24,7 +24,9 @@ class EmbeddingManager:
         """
         self.model_name = model_name
 
-        PrettyOutput.print(f"初始化嵌入管理器, 模型: '{self.model_name}'...", OutputType.INFO)
+        PrettyOutput.print(
+            f"初始化嵌入管理器, 模型: '{self.model_name}'...", OutputType.INFO
+        )
 
         # 缓存的salt是模型名称，以防止冲突
         self.cache = EmbeddingCache(cache_dir=cache_dir, salt=self.model_name)
@@ -43,8 +45,13 @@ class EmbeddingManager:
                 show_progress=True,
             )
         except Exception as e:
-            PrettyOutput.print(f"加载嵌入模型 '{self.model_name}' 时出错: {e}", OutputType.ERROR)
-            PrettyOutput.print("请确保您已安装 'sentence_transformers' 和 'torch'。", OutputType.WARNING)
+            PrettyOutput.print(
+                f"加载嵌入模型 '{self.model_name}' 时出错: {e}", OutputType.ERROR
+            )
+            PrettyOutput.print(
+                "请确保您已安装 'sentence_transformers' 和 'torch'。",
+                OutputType.WARNING,
+            )
             raise
 
     def embed_documents(self, texts: List[str]) -> List[List[float]]:

jarvis/jarvis_rag/llm_interface.py

@@ -103,7 +103,10 @@ class JarvisPlatform_LLM(LLMInterface):
             self.registry = PlatformRegistry.get_global_platform_registry()
             self.platform: BasePlatform = self.registry.get_normal_platform()
             self.platform.set_suppress_output(False)  # 确保模型没有控制台输出
-            PrettyOutput.print(f"已初始化 Jarvis 平台 LLM，模型: {self.platform.name()}", OutputType.INFO)
+            PrettyOutput.print(
+                f"已初始化 Jarvis 平台 LLM，模型: {self.platform.name()}",
+                OutputType.INFO,
+            )
         except Exception as e:
             PrettyOutput.print(f"初始化 Jarvis 平台 LLM 失败: {e}", OutputType.ERROR)
             raise

jarvis/jarvis_rag/query_rewriter.py

@@ -58,7 +58,9 @@ English version of the query
         """
         prompt = self.rewrite_prompt_template.format(query=query)
         PrettyOutput.print(
-            "正在将原始查询重写为多个搜索查询...", output_type=OutputType.INFO, timestamp=False
+            "正在将原始查询重写为多个搜索查询...",
+            output_type=OutputType.INFO,
+            timestamp=False,
         )
 
         import re

jarvis/jarvis_rag/rag_pipeline.py

@@ -75,7 +75,9 @@ class JarvisRAGPipeline:
         self._reranker: Optional[Reranker] = None
         self._query_rewriter: Optional[QueryRewriter] = None
 
-        PrettyOutput.print("JarvisRAGPipeline 初始化成功 (模型按需加载).", OutputType.SUCCESS)
+        PrettyOutput.print(
+            "JarvisRAGPipeline 初始化成功 (模型按需加载).", OutputType.SUCCESS
+        )
 
     def _get_embedding_manager(self) -> EmbeddingManager:
         if self._embedding_manager is None:
@@ -209,7 +211,10 @@ class JarvisRAGPipeline:
 
         # 3. 根据*原始*查询对统一的候选池进行重排
         if self.use_rerank:
-            PrettyOutput.print(f"正在对 {len(unique_candidate_docs)} 个候选文档进行重排（基于原始问题）...", OutputType.INFO)
+            PrettyOutput.print(
+                f"正在对 {len(unique_candidate_docs)} 个候选文档进行重排（基于原始问题）...",
+                OutputType.INFO,
+            )
             retrieved_docs = self._get_reranker().rerank(
                 query_text, unique_candidate_docs, top_n=n_results
             )
@@ -274,7 +279,10 @@ class JarvisRAGPipeline:
 
         # 3. 重排
         if self.use_rerank:
-            PrettyOutput.print(f"正在对 {len(unique_candidate_docs)} 个候选文档进行重排...", OutputType.INFO)
+            PrettyOutput.print(
+                f"正在对 {len(unique_candidate_docs)} 个候选文档进行重排...",
+                OutputType.INFO,
+            )
             retrieved_docs = self._get_reranker().rerank(
                 query_text, unique_candidate_docs, top_n=n_results
             )