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

jarvis/jarvis_methodology/main.py

@@ -146,11 +146,11 @@ def extract_methodology(
 """
 
         # 调用大模型平台提取方法论
-        print("📥 正在提取方法论...")
+        PrettyOutput.print("正在提取方法论...", OutputType.INFO)
         try:
             response = platform.chat_until_success(prompt)
         except Exception as e:
-            print("❌ 提取失败")
+            PrettyOutput.print("提取失败", OutputType.ERROR)
             PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
             raise typer.Exit(code=1)
 
@@ -158,7 +158,7 @@ def extract_methodology(
         methodologies_start = response.find("<methodologies>") + len("<methodologies>")
         methodologies_end = response.find("</methodologies>")
         if methodologies_start == -1 or methodologies_end == -1:
-            print("❌ 响应格式无效")
+            PrettyOutput.print("响应格式无效", OutputType.ERROR)
             PrettyOutput.print(
                 "大模型未返回有效的<methodologies>格式", OutputType.ERROR
             )
@@ -172,14 +172,14 @@ def extract_methodology(
                 item["problem_type"]: item["content"] for item in data
             }
         except (yaml.YAMLError, KeyError, TypeError) as e:
-            print("❌ YAML解析失败")
+            PrettyOutput.print("YAML解析失败", OutputType.ERROR)
             PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
             raise typer.Exit(code=1)
 
         if not extracted_methodologies:
-            print("❌ 未提取到有效方法论")
+            PrettyOutput.print("未提取到有效方法论", OutputType.WARNING)
             return
-        print("✅ 提取到有效方法论")
+        PrettyOutput.print("提取到有效方法论", OutputType.SUCCESS)
 
         # 加载现有方法论
         existing_methodologies = _load_all_methodologies()
@@ -247,11 +247,11 @@ def extract_methodology_from_url(url: str = typer.Argument(..., help="要提取
 6. 内容字段使用|保留多行格式
 """
         # 调用大模型平台提取方法论
-        print("📥 正在从URL提取方法论...")
+        PrettyOutput.print("正在从URL提取方法论...", OutputType.INFO)
         try:
             response = platform.chat_until_success(prompt)
         except Exception as e:
-            print("❌ 提取失败")
+            PrettyOutput.print("提取失败", OutputType.ERROR)
             PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
             raise typer.Exit(code=1)
 
@@ -259,7 +259,7 @@ def extract_methodology_from_url(url: str = typer.Argument(..., help="要提取
         methodologies_start = response.find("<methodologies>") + len("<methodologies>")
         methodologies_end = response.find("</methodologies>")
         if methodologies_start == -1 or methodologies_end == -1:
-            print("❌ 响应格式无效")
+            PrettyOutput.print("响应格式无效", OutputType.ERROR)
             PrettyOutput.print(
                 "大模型未返回有效的<methodologies>格式", OutputType.ERROR
             )
@@ -273,14 +273,14 @@ def extract_methodology_from_url(url: str = typer.Argument(..., help="要提取
                 item["problem_type"]: item["content"] for item in data
             }
         except (yaml.YAMLError, KeyError, TypeError) as e:
-            print("❌ YAML解析失败")
+            PrettyOutput.print("YAML解析失败", OutputType.ERROR)
             PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
             raise typer.Exit(code=1)
 
         if not extracted_methodologies:
-            print("❌ 未提取到有效方法论")
+            PrettyOutput.print("未提取到有效方法论", OutputType.WARNING)
             return
-        print("✅ 提取到有效方法论")
+        PrettyOutput.print("提取到有效方法论", OutputType.SUCCESS)
 
         # 加载现有方法论
         existing_methodologies = _load_all_methodologies()

jarvis/jarvis_platform/base.py

@@ -15,9 +15,10 @@ from jarvis.jarvis_utils.config import (
     get_max_input_token_count,
     get_pretty_output,
     is_print_prompt,
+    is_immediate_abort,
 )
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
-from jarvis.jarvis_utils.globals import set_in_chat
+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
@@ -83,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"""
             我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
             """
@@ -94,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(
@@ -110,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
@@ -127,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,
             )
@@ -137,8 +134,10 @@ 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]正在回答...[/yellow]"
+                            panel.subtitle = "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
                             live.update(panel)
                         end_time = time.time()
                         duration = end_time - start_time
@@ -147,13 +146,22 @@ 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
-                    print()
+                        if is_immediate_abort() and get_interrupt():
+                            return response
+                    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
+                    if is_immediate_abort() and get_interrupt():
+                        return response
         # Keep original think tag handling
         response = re.sub(
             ot("think") + r".*?" + ct("think"), "", response, flags=re.DOTALL

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_platform_manager/main.py

@@ -26,9 +26,7 @@ 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()
@@ -219,13 +217,9 @@ 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
@@ -246,9 +240,7 @@ 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:
@@ -274,9 +266,7 @@ 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:
@@ -356,9 +346,7 @@ 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",
@@ -441,9 +429,7 @@ 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",
@@ -472,8 +458,12 @@ def role_command(
     PrettyOutput.print(output_str, OutputType.INFO)
 
     # 让用户选择角色
+    raw_choice = get_single_line_input("请选择角色(输入编号，直接回车退出): ")
+    if not raw_choice.strip():
+        PrettyOutput.print("已取消，退出程序", OutputType.INFO)
+        raise typer.Exit(code=0)
     try:
-        choice = int(get_single_line_input("请选择角色(输入编号): "))
+        choice = int(raw_choice)
         selected_role = config["roles"][choice - 1]
     except (ValueError, IndexError):
         PrettyOutput.print("无效的选择", OutputType.ERROR)