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

jarvis/jarvis_platform/base.py

@@ -18,7 +18,7 @@ from jarvis.jarvis_utils.config import (
     is_immediate_abort,
 )
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
-from jarvis.jarvis_utils.globals import set_in_chat, get_interrupt
+from jarvis.jarvis_utils.globals import set_in_chat, get_interrupt, console
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
@@ -84,7 +84,7 @@ 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)
-            print("📤 正在提交长上下文...")
+            PrettyOutput.print(f"长上下文，分批提交，共{len(inputs)}部分...", OutputType.INFO)
             prefix_prompt = f"""
             我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
             """
@@ -95,9 +95,7 @@ class BasePlatform(ABC):
             for input in inputs:
                 submit_count += 1
                 length += len(input)
-                print(
-                    f"📤 正在提交第{submit_count}部分（共{len(inputs)}部分({length}/{len(message)})）"
-                )
+
 
                 response += "\n"
                 for trunk in while_true(
@@ -111,10 +109,8 @@ class BasePlatform(ABC):
                 ):
                     response += trunk
 
-                print(
-                    f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
-                )
-            print("✅ 提交完成")
+
+            PrettyOutput.print("提交完成", OutputType.SUCCESS)
             response += "\n" + while_true(
                 lambda: while_success(
                     lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5
@@ -128,7 +124,7 @@ class BasePlatform(ABC):
             panel = Panel(
                 text_content,
                 title=f"[bold cyan]{self.name()}[/bold cyan]",
-                subtitle="[dim]思考中...[/dim]",
+                subtitle="[dim]思考中... (按 Ctrl+C 中断)[/dim]",
                 border_style="bright_blue",
                 box=box.ROUNDED,
             )
@@ -141,7 +137,7 @@ class BasePlatform(ABC):
                             if is_immediate_abort() and get_interrupt():
                                 return response
                             text_content.append(s, style="bright_white")
-                            panel.subtitle = "[yellow]正在回答...[/yellow]"
+                            panel.subtitle = "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
                             live.update(panel)
                         end_time = time.time()
                         duration = end_time - start_time
@@ -150,12 +146,17 @@ 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)
                     for s in self.chat(message):
-                        print(s, end="", flush=True)
+                        console.print(s, end="")
                         response += s
                         if is_immediate_abort() and get_interrupt():
                             return response
-                    print()
+                    console.print()
+                    end_time = time.time()
+                    duration = end_time - start_time
+                    console.print(f"✓ 对话完成耗时: {duration:.2f}秒")
             else:
                 for s in self.chat(message):
                     response += s

jarvis/jarvis_platform/kimi.py

@@ -185,16 +185,16 @@ class KimiModel(BasePlatform):
             return True
 
         if not self.chat_id:
-            print("🚀 正在创建聊天会话...")
+            PrettyOutput.print("正在创建聊天会话...", OutputType.INFO)
             if not self._create_chat():
-                print("❌ 创建聊天会话失败")
+                PrettyOutput.print("创建聊天会话失败", OutputType.ERROR)
                 return False
-            print("✅ 创建聊天会话成功")
+            PrettyOutput.print("创建聊天会话成功", OutputType.SUCCESS)
 
         uploaded_files = []
         for index, file_path in enumerate(file_list, 1):
             file_name = os.path.basename(file_path)
-            print(f"🔍 处理文件 [{index}/{len(file_list)}]: {file_name}")
+            PrettyOutput.print(f"处理文件 [{index}/{len(file_list)}]: {file_name}", OutputType.INFO)
             try:
                 mime_type, _ = mimetypes.guess_type(file_path)
                 action = (
@@ -202,34 +202,34 @@ class KimiModel(BasePlatform):
                 )
 
                 # 获取预签名URL
-                print(f"🔍 获取上传URL: {file_name}")
+                PrettyOutput.print(f"获取上传URL: {file_name}", OutputType.INFO)
                 presigned_data = self._get_presigned_url(file_path, action)
 
                 # 上传文件
-                print(f"🔍 上传文件: {file_name}")
+                PrettyOutput.print(f"上传文件: {file_name}", OutputType.INFO)
                 if self._upload_file(file_path, presigned_data["url"]):
                     # 获取文件信息
-                    print(f"🔍 获取文件信息: {file_name}")
+                    PrettyOutput.print(f"获取文件信息: {file_name}", OutputType.INFO)
                     file_info = self._get_file_info(presigned_data, file_name, action)
 
                     # 只有文件需要解析
                     if action == "file":
-                        print(f"🔍 等待文件解析: {file_name}")
+                        PrettyOutput.print(f"等待文件解析: {file_name}", OutputType.INFO)
                         if self._wait_for_parse(file_info["id"]):
                             uploaded_files.append(file_info)
-                            print(f"✅ 文件处理完成: {file_name}")
+                            PrettyOutput.print(f"文件处理完成: {file_name}", OutputType.SUCCESS)
                         else:
-                            print(f"❌ 文件解析失败: {file_name}")
+                            PrettyOutput.print(f"文件解析失败: {file_name}", OutputType.ERROR)
                             return False
                     else:
                         uploaded_files.append(file_info)
-                        print(f"✅ 图片处理完成: {file_name}")
+                        PrettyOutput.print(f"图片处理完成: {file_name}", OutputType.SUCCESS)
                 else:
-                    print(f"❌ 文件上传失败: {file_name}")
+                    PrettyOutput.print(f"文件上传失败: {file_name}", OutputType.ERROR)
                     return False
 
             except Exception as e:
-                print(f"❌ 处理文件出错 {file_path}: {str(e)}")
+                PrettyOutput.print(f"处理文件出错 {file_path}: {str(e)}", OutputType.ERROR)
                 return False
 
         self.uploaded_files = uploaded_files

jarvis/jarvis_platform/tongyi.py

@@ -276,16 +276,16 @@ class TongyiPlatform(BasePlatform):
 
             for file_path in file_list:
                 file_name = os.path.basename(file_path)
-                print(f"🔍 上传文件 {file_name}")
+                PrettyOutput.print(f"上传文件 {file_name}", OutputType.INFO)
                 try:
                     if not os.path.exists(file_path):
-                        print(f"❌ 文件不存在: {file_path}")
+                        PrettyOutput.print(f"文件不存在: {file_path}", OutputType.ERROR)
                         return False
 
                     # Get file name and content type
                     content_type = self._get_content_type(file_path)
 
-                    print(f"🔍 准备上传文件: {file_name}")
+                    PrettyOutput.print(f"准备上传文件: {file_name}", OutputType.INFO)
 
                     # Prepare form data
                     form_data = {
@@ -300,7 +300,7 @@ class TongyiPlatform(BasePlatform):
                     # Prepare files
                     files = {"file": (file_name, open(file_path, "rb"), content_type)}
 
-                    print(f"📤 正在上传文件: {file_name}")
+                    PrettyOutput.print(f"正在上传文件: {file_name}", OutputType.INFO)
 
                     # Upload file
                     response = http.post(
@@ -308,7 +308,7 @@ class TongyiPlatform(BasePlatform):
                     )
 
                     if response.status_code != 200:
-                        print(f"❌ 上传失败 {file_name}: HTTP {response.status_code}")
+                        PrettyOutput.print(f"上传失败 {file_name}: HTTP {response.status_code}", OutputType.ERROR)
                         return False
 
                     # Determine file type based on extension
@@ -323,7 +323,7 @@ class TongyiPlatform(BasePlatform):
                         }
                     )
 
-                    print(f"🔍 获取下载链接: {file_name}")
+                    PrettyOutput.print(f"获取下载链接: {file_name}", OutputType.INFO)
 
                     # Get download links for uploaded files
                     url = "https://api.tongyi.com/dialog/downloadLink/batch"
@@ -340,18 +340,18 @@ class TongyiPlatform(BasePlatform):
 
                     response = http.post(url, headers=headers, json=payload)
                     if response.status_code != 200:
-                        print(f"❌ 获取下载链接失败: HTTP {response.status_code}")
+                        PrettyOutput.print(f"获取下载链接失败: HTTP {response.status_code}", OutputType.ERROR)
                         return False
 
                     result = response.json()
                     if not result.get("success"):
-                        print(f"❌ 获取下载链接失败: {result.get('errorMsg')}")
+                        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:
-                        print(f"🔍 添加文件到对话: {file_name}")
+                        PrettyOutput.print(f"添加文件到对话: {file_name}", OutputType.INFO)
                         add_url = "https://api.tongyi.com/assistant/api/chat/file/add"
                         add_payload = {
                             "workSource": "chat",
@@ -374,25 +374,27 @@ class TongyiPlatform(BasePlatform):
                             add_url, headers=headers, json=add_payload
                         )
                         if add_response.status_code != 200:
-                            print(
-                                f"❌ 添加文件到对话失败: HTTP {add_response.status_code}"
+                            PrettyOutput.print(
+                                f"添加文件到对话失败: HTTP {add_response.status_code}",
+                                OutputType.ERROR,
                             )
                             continue
 
                         add_result = add_response.json()
                         if not add_result.get("success"):
-                            print(
-                                f"❌ 添加文件到对话失败: {add_result.get('errorMsg')}"
+                            PrettyOutput.print(
+                                f"添加文件到对话失败: {add_result.get('errorMsg')}",
+                                OutputType.ERROR,
                             )
                             continue
 
                         file_info.update(add_result.get("data", {}))
 
-                    print(f"✅ 文件 {file_name} 上传成功")
+                    PrettyOutput.print(f"文件 {file_name} 上传成功", OutputType.SUCCESS)
                     time.sleep(1)  # 短暂暂停以便用户看到成功状态
 
                 except Exception as e:
-                    print(f"❌ 上传文件 {file_name} 时出错: {str(e)}")
+                    PrettyOutput.print(f"上传文件 {file_name} 时出错: {str(e)}", OutputType.ERROR)
                     return False
             return True
 

jarvis/jarvis_platform/yuanbao.py

@@ -134,10 +134,10 @@ class YuanbaoPlatform(BasePlatform):
 
         for file_path in file_list:
             file_name = os.path.basename(file_path)
-            print(f"🔍 上传文件 {file_name}")
+            PrettyOutput.print(f"上传文件 {file_name}", OutputType.INFO)
             try:
                 # 1. Prepare the file information
-                print(f"🔍 准备文件信息: {file_name}")
+                PrettyOutput.print(f"准备文件信息: {file_name}", OutputType.INFO)
                 file_size = os.path.getsize(file_path)
                 file_extension = os.path.splitext(file_path)[1].lower().lstrip(".")
 
@@ -192,21 +192,21 @@ class YuanbaoPlatform(BasePlatform):
                     file_type = "code"
 
                 # 2. Generate upload information
-                print(f"🔍 获取上传信息: {file_name}")
+                PrettyOutput.print(f"获取上传信息: {file_name}", OutputType.INFO)
                 upload_info = self._generate_upload_info(file_name)
                 if not upload_info:
-                    print(f"❌ 无法获取文件 {file_name} 的上传信息")
+                    PrettyOutput.print(f"无法获取文件 {file_name} 的上传信息", OutputType.ERROR)
                     return False
 
                 # 3. Upload the file to COS
-                print(f"🔍 上传文件到云存储: {file_name}")
+                PrettyOutput.print(f"上传文件到云存储: {file_name}", OutputType.INFO)
                 upload_success = self._upload_file_to_cos(file_path, upload_info)
                 if not upload_success:
-                    print(f"❌ 上传文件 {file_name} 失败")
+                    PrettyOutput.print(f"上传文件 {file_name} 失败", OutputType.ERROR)
                     return False
 
                 # 4. Create file metadata for chat
-                print(f"🔍 生成文件元数据: {file_name}")
+                PrettyOutput.print(f"生成文件元数据: {file_name}", OutputType.INFO)
                 file_metadata = {
                     "type": file_type,
                     "docType": file_extension if file_extension else file_type,
@@ -224,14 +224,14 @@ class YuanbaoPlatform(BasePlatform):
                             file_metadata["width"] = img.width
                             file_metadata["height"] = img.height
                     except Exception as e:
-                        print(f"⚠️ 无法获取图片 {file_name} 的尺寸: {str(e)}")
+                        PrettyOutput.print(f"无法获取图片 {file_name} 的尺寸: {str(e)}", OutputType.WARNING)
 
                 uploaded_files.append(file_metadata)
-                print(f"✅ 文件 {file_name} 上传成功")
+                PrettyOutput.print(f"文件 {file_name} 上传成功", OutputType.SUCCESS)
                 time.sleep(3)  # 上传成功后等待3秒
 
             except Exception as e:
-                print(f"❌ 上传文件 {file_path} 时出错: {str(e)}")
+                PrettyOutput.print(f"上传文件 {file_path} 时出错: {str(e)}", OutputType.ERROR)
                 return False
 
         self.multimedia = uploaded_files
@@ -302,7 +302,7 @@ class YuanbaoPlatform(BasePlatform):
             with open(file_path, "rb") as file:
                 file_content = file.read()
 
-            print(f"ℹ️  上传文件大小: {len(file_content)}")
+            PrettyOutput.print(f"上传文件大小: {len(file_content)}", OutputType.INFO)
 
             # Prepare headers for PUT request
             host = f"{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"

jarvis/jarvis_rag/cli.py

@@ -20,6 +20,7 @@ from jarvis.jarvis_utils.config import (
     get_rag_use_bm25,
     get_rag_use_rerank,
 )
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 def is_likely_text_file(file_path: Path) -> bool:
@@ -70,7 +71,10 @@ class _CustomPlatformLLM(LLMInterface):
 
     def __init__(self, platform: BasePlatform):
         self.platform = platform
-        print(f"✅ 使用自定义LLM: 平台='{platform.platform_name()}', 模型='{platform.name()}'")
+        PrettyOutput.print(
+            f"使用自定义LLM: 平台='{platform.platform_name()}', 模型='{platform.name()}'",
+            OutputType.INFO,
+        )
 
     def generate(self, prompt: str, **kwargs) -> str:
         return self.platform.chat_until_success(prompt)
@@ -84,13 +88,13 @@ 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:
-            print(f"❌ 错误: 平台 '{platform_name}' 未找到。")
+            PrettyOutput.print(f"错误: 平台 '{platform_name}' 未找到。", OutputType.ERROR)
             return None
         platform_instance.set_model_name(model_name)
         platform_instance.set_suppress_output(True)
         return _CustomPlatformLLM(platform_instance)
     except Exception as e:
-        print(f"❌ 创建自定义LLM时出错: {e}")
+        PrettyOutput.print(f"创建自定义LLM时出错: {e}", OutputType.ERROR)
         return None
 
 
@@ -114,10 +118,10 @@ 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)
-            print(f"✅ 加载忽略规则: {ignore_file_to_use}")
+            PrettyOutput.print(f"加载忽略规则: {ignore_file_to_use}", OutputType.SUCCESS)
             return spec, project_root_path
         except Exception as e:
-            print(f"⚠️ 加载 {ignore_file_to_use.name} 文件失败: {e}")
+            PrettyOutput.print(f"加载 {ignore_file_to_use.name} 文件失败: {e}", OutputType.WARNING)
 
     return None, None
 
@@ -166,7 +170,7 @@ def add_documents(
                 continue
 
             if path.is_dir():
-                print(f"🔍 正在扫描目录: {path}")
+                PrettyOutput.print(f"正在扫描目录: {path}", OutputType.INFO)
                 for item in path.rglob("*"):
                     if item.is_file() and is_likely_text_file(item):
                         files_to_process.add(item)
@@ -174,10 +178,10 @@ def add_documents(
                 if is_likely_text_file(path):
                     files_to_process.add(path)
                 else:
-                    print(f"⚠️ 跳过可能的二进制文件: {path}")
+                    PrettyOutput.print(f"跳过可能的二进制文件: {path}", OutputType.WARNING)
 
     if not files_to_process:
-        print("⚠️ 在指定路径中未找到任何文本文件。")
+        PrettyOutput.print("在指定路径中未找到任何文本文件。", OutputType.WARNING)
         return
 
     # 使用 .ragignore 过滤文件
@@ -198,14 +202,14 @@ def add_documents(
 
         ignored_count = initial_count - len(retained_files)
         if ignored_count > 0:
-            print(f"ℹ️ 根据 .ragignore 规则过滤掉 {ignored_count} 个文件。")
+            PrettyOutput.print(f"根据 .ragignore 规则过滤掉 {ignored_count} 个文件。", OutputType.INFO)
         files_to_process = retained_files
 
     if not files_to_process:
-        print("⚠️ 所有找到的文本文件都被忽略规则过滤掉了。")
+        PrettyOutput.print("所有找到的文本文件都被忽略规则过滤掉了。", OutputType.WARNING)
         return
 
-    print(f"✅ 发现 {len(files_to_process)} 个独立文件待处理。")
+    PrettyOutput.print(f"发现 {len(files_to_process)} 个独立文件待处理。", OutputType.INFO)
 
     try:
         pipeline = JarvisRAGPipeline(
@@ -229,26 +233,26 @@ def add_documents(
                     loader = TextLoader(str(file_path), encoding="utf-8")
 
                 docs_batch.extend(loader.load())
-                print(f"✅ 已加载: {file_path} (文件 {i + 1}/{total_files})")
+                PrettyOutput.print(f"已加载: {file_path} (文件 {i + 1}/{total_files})", OutputType.INFO)
             except Exception as e:
-                print(f"⚠️ 加载失败 {file_path}: {e}")
+                PrettyOutput.print(f"加载失败 {file_path}: {e}", OutputType.WARNING)
 
             # 当批处理已满或是最后一个文件时处理批处理
             if docs_batch and (len(docs_batch) >= batch_size or (i + 1) == total_files):
-                print(f"⚙️ 正在处理批次，包含 {len(docs_batch)} 个文档...")
+                PrettyOutput.print(f"正在处理批次，包含 {len(docs_batch)} 个文档...", OutputType.INFO)
                 pipeline.add_documents(docs_batch)
                 total_docs_added += len(docs_batch)
-                print(f"✅ 成功添加 {len(docs_batch)} 个文档。")
+                PrettyOutput.print(f"成功添加 {len(docs_batch)} 个文档。", OutputType.SUCCESS)
                 docs_batch = []  # 清空批处理
 
         if total_docs_added == 0:
-            print("❌ 未能成功加载任何文档。")
+            PrettyOutput.print("未能成功加载任何文档。", OutputType.ERROR)
             raise typer.Exit(code=1)
 
-        print(f"✅ 成功将 {total_docs_added} 个文档的内容添加至集合 '{collection_name}'。")
+        PrettyOutput.print(f"成功将 {total_docs_added} 个文档的内容添加至集合 '{collection_name}'。", OutputType.SUCCESS)
 
     except Exception as e:
-        print(f"❌ 发生严重错误: {e}")
+        PrettyOutput.print(f"发生严重错误: {e}", OutputType.ERROR)
         raise typer.Exit(code=1)
 
 
@@ -273,7 +277,7 @@ def list_documents(
         results = collection.get()  # 获取集合中的所有项目
 
         if not results or not results["metadatas"]:
-            print("ℹ️ 知识库中没有找到任何文档。")
+            PrettyOutput.print("知识库中没有找到任何文档。", OutputType.INFO)
             return
 
         # 从元数据中提取唯一的源文件路径
@@ -285,15 +289,15 @@ def list_documents(
                     sources.add(source)
 
         if not sources:
-            print("ℹ️ 知识库中没有找到任何带有源信息的文档。")
+            PrettyOutput.print("知识库中没有找到任何带有源信息的文档。", OutputType.INFO)
             return
 
-        print(f"📚 知识库 '{collection_name}' 中共有 {len(sources)} 个独立文档:")
+        PrettyOutput.print(f"知识库 '{collection_name}' 中共有 {len(sources)} 个独立文档:", OutputType.INFO)
         for i, source in enumerate(sorted(list(sources)), 1):
-            print(f"  {i}. {source}")
+            PrettyOutput.print(f"  {i}. {source}", OutputType.INFO)
 
     except Exception as e:
-        print(f"❌ 发生错误: {e}")
+        PrettyOutput.print(f"发生错误: {e}", OutputType.ERROR)
         raise typer.Exit(code=1)
 
 
@@ -330,14 +334,14 @@ def retrieve(
             use_rerank=use_rerank,
         )
 
-        print(f"🤔 正在为问题检索文档: '{question}'")
+        PrettyOutput.print(f"正在为问题检索文档: '{question}'", OutputType.INFO)
         retrieved_docs = pipeline.retrieve_only(question, n_results=n_results)
 
         if not retrieved_docs:
-            print("ℹ️ 未找到相关文档。")
+            PrettyOutput.print("未找到相关文档。", OutputType.INFO)
             return
 
-        print(f"✅ 成功检索到 {len(retrieved_docs)} 个文档:")
+        PrettyOutput.print(f"成功检索到 {len(retrieved_docs)} 个文档:", OutputType.SUCCESS)
         from jarvis.jarvis_utils.globals import console
 
         for i, doc in enumerate(retrieved_docs, 1):
@@ -350,7 +354,7 @@ def retrieve(
             console.print(Markdown(f"```\n{content}\n```"))
 
     except Exception as e:
-        print(f"❌ 发生错误: {e}")
+        PrettyOutput.print(f"发生错误: {e}", OutputType.ERROR)
         raise typer.Exit(code=1)
 
 
@@ -385,7 +389,7 @@ def query(
 ):
     """查询RAG知识库并打印答案。"""
     if model and not platform:
-        print("❌ 错误: --model 需要指定 --platform。")
+        PrettyOutput.print("错误: --model 需要指定 --platform。", OutputType.ERROR)
         raise typer.Exit(code=1)
 
     try:
@@ -407,17 +411,17 @@ def query(
             use_rerank=use_rerank,
         )
 
-        print(f"🤔 正在查询: '{question}'")
+        PrettyOutput.print(f"正在查询: '{question}'", OutputType.INFO)
         answer = pipeline.query(question)
 
-        print("💬 答案:")
+        PrettyOutput.print("答案:", OutputType.INFO)
         # 我们仍然可以使用 rich.markdown.Markdown，因为 PrettyOutput 底层使用了 rich
         from jarvis.jarvis_utils.globals import console
 
         console.print(Markdown(answer))
 
     except Exception as e:
-        print(f"❌ 发生错误: {e}")
+        PrettyOutput.print(f"发生错误: {e}", OutputType.ERROR)
         raise typer.Exit(code=1)
 
 
@@ -432,7 +436,7 @@ except ImportError:
 
 def _check_rag_dependencies():
     if not _RAG_INSTALLED:
-        print("❌ RAG依赖项未安装。" "请运行 'pip install \"jarvis-ai-assistant[rag]\"' 来使用此命令。")
+        PrettyOutput.print("RAG依赖项未安装。请运行 'pip install \"jarvis-ai-assistant[rag]\"' 来使用此命令。", OutputType.ERROR)
         raise typer.Exit(code=1)
 
 

jarvis/jarvis_rag/embedding_manager.py

@@ -3,6 +3,7 @@ from typing import List, cast
 from langchain_huggingface import HuggingFaceEmbeddings
 
 from .cache import EmbeddingCache
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class EmbeddingManager:
@@ -23,7 +24,7 @@ class EmbeddingManager:
         """
         self.model_name = model_name
 
-        print(f"🚀 初始化嵌入管理器, 模型: '{self.model_name}'...")
+        PrettyOutput.print(f"初始化嵌入管理器, 模型: '{self.model_name}'...", OutputType.INFO)
 
         # 缓存的salt是模型名称，以防止冲突
         self.cache = EmbeddingCache(cache_dir=cache_dir, salt=self.model_name)
@@ -42,8 +43,8 @@ class EmbeddingManager:
                 show_progress=True,
             )
         except Exception as e:
-            print(f"❌ 加载嵌入模型 '{self.model_name}' 时出错: {e}")
-            print("请确保您已安装 'sentence_transformers' 和 'torch'。")
+            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]]:
@@ -71,8 +72,9 @@ class EmbeddingManager:
 
         # 为不在缓存中的文本计算嵌入
         if texts_to_embed:
-            print(
-                f"🔎 缓存未命中。正在为 {len(texts_to_embed)}/{len(texts)} 个文档计算嵌入。"
+            PrettyOutput.print(
+                f"缓存未命中。正在为 {len(texts_to_embed)}/{len(texts)} 个文档计算嵌入。",
+                OutputType.INFO,
             )
             new_embeddings = self.model.embed_documents(texts_to_embed)
 
@@ -83,7 +85,10 @@ class EmbeddingManager:
             for i, embedding in zip(indices_to_embed, new_embeddings):
                 cached_embeddings[i] = embedding
         else:
-            print(f"✅ 缓存命中。所有 {len(texts)} 个文档的嵌入均从缓存中检索。")
+            PrettyOutput.print(
+                f"缓存命中。所有 {len(texts)} 个文档的嵌入均从缓存中检索。",
+                OutputType.SUCCESS,
+            )
 
         return cast(List[List[float]], cached_embeddings)
 

jarvis/jarvis_rag/llm_interface.py

@@ -6,6 +6,7 @@ from abc import ABC, abstractmethod
 from jarvis.jarvis_agent import Agent as JarvisAgent
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class LLMInterface(ABC):
@@ -41,7 +42,7 @@ class ToolAgent_LLM(LLMInterface):
         """
         初始化工具-代理 LLM 包装器。
         """
-        print("🤖 已初始化工具 Agent 作为最终应答者。")
+        PrettyOutput.print("已初始化工具 Agent 作为最终应答者。", OutputType.INFO)
         self.allowed_tools = ["read_code", "execute_script"]
         # 为代理提供一个通用的系统提示
         self.system_prompt = "You are a helpful assistant. Please answer the user's question based on the provided context. You can use tools to find more information if needed."
@@ -83,7 +84,7 @@ class ToolAgent_LLM(LLMInterface):
             return str(final_answer)
 
         except Exception as e:
-            print(f"❌ Agent 在执行过程中发生错误: {e}")
+            PrettyOutput.print(f"Agent 在执行过程中发生错误: {e}", OutputType.ERROR)
             return "错误: Agent 未能成功生成回答。"
 
 
@@ -102,9 +103,9 @@ 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)  # 确保模型没有控制台输出
-            print(f"🚀 已初始化 Jarvis 平台 LLM，模型: {self.platform.name()}")
+            PrettyOutput.print(f"已初始化 Jarvis 平台 LLM，模型: {self.platform.name()}", OutputType.INFO)
         except Exception as e:
-            print(f"❌ 初始化 Jarvis 平台 LLM 失败: {e}")
+            PrettyOutput.print(f"初始化 Jarvis 平台 LLM 失败: {e}", OutputType.ERROR)
             raise
 
     def generate(self, prompt: str, **kwargs) -> str:
@@ -122,5 +123,5 @@ class JarvisPlatform_LLM(LLMInterface):
             # 使用健壮的chat_until_success方法
             return self.platform.chat_until_success(prompt)
         except Exception as e:
-            print(f"❌ 调用 Jarvis 平台模型时发生错误: {e}")
+            PrettyOutput.print(f"调用 Jarvis 平台模型时发生错误: {e}", OutputType.ERROR)
             return "错误: 无法从本地LLM获取响应。"