jarvis-ai-assistant 0.3.17__tar.gz → 0.3.18__tar.gz

{jarvis_ai_assistant-0.3.17/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.17
+Version: 0.3.18
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.17"
+version = "0.3.18"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.17",
+    version="0.3.18",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.17"
+__version__ = "0.3.18"

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/jarvis_agent/__init__.py

@@ -791,6 +791,8 @@ class Agent:
         set_interrupt(False)
         user_input = self.multiline_inputer(f"模型交互期间被中断，请输入用户干预信息：")
 
+        self.run_input_handlers_next_turn = True
+
         if not user_input:
             # 用户输入为空，完成任务
             return self._complete_task(auto_completed=False)

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/jarvis_agent/jarvis.py

@@ -240,6 +240,7 @@ def handle_builtin_config_selector(
                         # 解析YAML以获取可读名称/描述（失败时静默降级为文件名）
                         name = fpath.stem
                         desc = ""
+                        roles_count = 0
                         try:
                             with open(
                                 fpath, "r", encoding="utf-8", errors="ignore"
@@ -251,8 +252,9 @@ def handle_builtin_config_selector(
                                 if cat == "roles" and isinstance(
                                     data.get("roles"), list
                                 ):
+                                    roles_count = len(data["roles"])
                                     if not desc:
-                                        desc = f"{len(data['roles'])} 个角色"
+                                        desc = f"{roles_count} 个角色"
                         except Exception:
                             # 忽略解析错误，使用默认显示
                             pass
@@ -285,6 +287,7 @@ def handle_builtin_config_selector(
                                 "name": str(name),
                                 "desc": str(desc),
                                 "details": str(details),
+                                "roles_count": int(roles_count),
                             }
                         )
 
@@ -302,9 +305,16 @@ def handle_builtin_config_selector(
                     category = opt.get("category", "")
                     name = opt.get("name", "")
                     file_path = opt.get("file", "")
-                    # 描述列显示配置描述；若为 roles 则显示角色列表
+                    # 描述列显示配置描述；若为 roles 同时显示角色数量与列表
                     if category == "roles":
-                        desc_display = opt.get("details", "")
+                        count = opt.get("roles_count")
+                        details = opt.get("details", "")
+                        parts = []
+                        if isinstance(count, int) and count > 0:
+                            parts.append(f"{count} 个角色")
+                        if details:
+                            parts.append(details)
+                        desc_display = "\n".join(parts) if parts else ""
                     else:
                         desc_display = opt.get("desc", "")
                     table.add_row(str(idx), category, name, file_path, desc_display)

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/jarvis_agent/methodology_share_manager.py

@@ -151,12 +151,12 @@ class MethodologyShareManager(ShareManager):
                     "没有找到新的方法论文件（所有方法论可能已存在于中心仓库）",
                     OutputType.WARNING,
                 )
-                raise typer.Exit(code=0)
+                return
 
             # 选择要分享的资源
             selected_resources = self.select_resources(local_resources)
             if not selected_resources:
-                raise typer.Exit(code=0)
+                return
 
             # 分享资源
             copied_list = self.share_resources(selected_resources)

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/jarvis_agent/tool_share_manager.py

@@ -112,12 +112,12 @@ class ToolShareManager(ShareManager):
                     "没有找到新的工具文件（所有工具可能已存在于中心仓库）",
                     OutputType.WARNING,
                 )
-                raise typer.Exit(code=0)
+                return
 
             # 选择要分享的资源
             selected_resources = self.select_resources(local_resources)
             if not selected_resources:
-                raise typer.Exit(code=0)
+                return
 
             # 分享资源
             moved_list = self.share_resources(selected_resources)

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/jarvis_data/config_schema.json

@@ -294,6 +294,11 @@
       "description": "在进入默认通用代理前，列出可用配置（agent/multi_agent/roles）供选择",
       "default": false
     },
+    "JARVIS_IMMEDIATE_ABORT": {
+      "type": "boolean",
+      "description": "是否启用立即中断：在对话迭代中检测到中断信号时立即返回",
+      "default": false
+    },
     "JARVIS_TOOL_GROUP": {
       "type": "string",
       "description": "选择一个预定义的工具配置组",

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/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
 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
@@ -137,6 +138,8 @@ 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]"
                             live.update(panel)
@@ -150,10 +153,14 @@ class BasePlatform(ABC):
                     for s in self.chat(message):
                         print(s, end="", flush=True)
                         response += s
+                        if is_immediate_abort() and get_interrupt():
+                            return response
                     print()
             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_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/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)

jarvis_ai_assistant-0.3.18/src/jarvis/jarvis_tools/read_webpage.py

@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+from typing import Any, Dict
+
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.config import (
+    get_web_search_platform_name,
+    get_web_search_model_name,
+)
+from jarvis.jarvis_utils.http import get as http_get
+from markdownify import markdownify as md  # type: ignore
+import requests
+
+
+class WebpageTool:
+    name = "read_webpage"
+    description = "读取网页内容，提取标题、文本和超链接"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "url": {"type": "string", "description": "要读取的网页URL"},
+            "want": {
+                "type": "string",
+                "description": "具体想要从网页获取的信息或回答的问题",
+                "default": "请总结这个网页的主要内容",
+            },
+        },
+        "required": ["url"],
+    }
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        读取网页内容。
+        优先使用配置的 web_search_platform 与模型的原生web能力；若不支持，则使用requests抓取页面并调用模型进行分析。
+        """
+        try:
+            url = str(args.get("url", "")).strip()
+            want = str(args.get("want", "请总结这个网页的主要内容"))
+
+            if not url:
+                return {"success": False, "stdout": "", "stderr": "缺少必需参数：url"}
+
+            # 1) 优先使用配置的 Web 搜索平台与模型（若支持web）
+            web_search_platform = get_web_search_platform_name()
+            web_search_model = get_web_search_model_name()
+            if web_search_platform and web_search_model:
+                model = PlatformRegistry().create_platform(web_search_platform)
+                if model:
+                    model.set_model_name(web_search_model)
+                    if model.support_web():
+                        PrettyOutput.print("▶️ 使用配置的 Web 搜索平台读取网页...", OutputType.INFO)
+                        model.set_web(True)
+                        model.set_suppress_output(False)  # type: ignore
+                        prompt = f"""请帮我处理这个网页：{url}
+用户的具体需求是：{want}
+请按照以下要求输出结果：
+1. 使用Markdown格式
+2. 包含网页标题
+3. 根据用户需求提供准确、完整的信息"""
+                        response = model.chat_until_success(prompt)  # type: ignore
+                        return {"success": True, "stdout": response, "stderr": ""}
+
+            # 2) 然后尝试使用默认平台（normal）的 web 能力
+            model = PlatformRegistry().get_normal_platform()
+            if model.support_web():
+                PrettyOutput.print("▶️ 使用默认平台的 Web 能力读取网页...", OutputType.INFO)
+                model.set_web(True)
+                model.set_suppress_output(False)  # type: ignore
+                prompt = f"""请帮我处理这个网页：{url}
+用户的具体需求是：{want}
+请按照以下要求输出结果：
+1. 使用Markdown格式
+2. 包含网页标题
+3. 根据用户需求提供准确、完整的信息"""
+                response = model.chat_until_success(prompt)  # type: ignore
+                return {"success": True, "stdout": response, "stderr": ""}
+
+            # 3) 回退：使用 requests 抓取网页，再用模型分析
+            PrettyOutput.print("ℹ️ 当前模型不支持Web，使用requests抓取网页并进行分析。", OutputType.INFO)
+            try:
+                resp = http_get(url, timeout=10.0, allow_redirects=True)
+                content_md = md(resp.text, strip=["script", "style"])
+            except requests.exceptions.HTTPError as e:
+                PrettyOutput.print(f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}", OutputType.WARNING)
+                return {"success": False, "stdout": "", "stderr": f"HTTP错误：{e.response.status_code}"}
+            except requests.exceptions.RequestException as e:
+                PrettyOutput.print(f"⚠️ 请求错误: {e}", OutputType.WARNING)
+                return {"success": False, "stdout": "", "stderr": f"请求错误：{e}"}
+
+            if not content_md or not content_md.strip():
+                return {"success": False, "stdout": "", "stderr": "无法从网页抓取有效内容。"}
+
+            PrettyOutput.print("🧠 正在分析抓取到的网页内容...", OutputType.INFO)
+            summary_prompt = f"""以下是网页 {url} 的内容（已转换为Markdown）：
+----------------
+{content_md}
+----------------
+请根据用户的具体需求“{want}”进行总结与回答：
+- 使用Markdown格式
+- 包含网页标题（若可推断）
+- 提供准确、完整的信息"""
+
+            model = PlatformRegistry().get_normal_platform()
+            model.set_suppress_output(False)  # type: ignore
+            summary = model.chat_until_success(summary_prompt)  # type: ignore
+
+            return {"success": True, "stdout": summary, "stderr": ""}
+
+        except Exception as e:
+            PrettyOutput.print(f"读取网页失败: {str(e)}", OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"Failed to parse webpage: {str(e)}",
+            }
+
+    @staticmethod
+    def check() -> bool:
+        """工具可用性检查：始终可用；若模型不支持web将回退到requests抓取。"""
+        return True

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/jarvis_utils/config.py

@@ -624,3 +624,11 @@ def is_enable_builtin_config_selector() -> bool:
     return (
         GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR", False) is True
     )
+
+
+def is_immediate_abort() -> bool:
+    """
+    是否启用立即中断：当在对话过程中检测到用户中断信号时，立即停止输出并返回。
+    默认关闭
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_IMMEDIATE_ABORT", False) is True

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18}/src/jarvis/jarvis_utils/utils.py

@@ -947,6 +947,15 @@ def _load_and_process_config(jarvis_dir: str, config_file: str) -> None:
             )
             or changed
         )
+        changed = (
+            _ask_and_set(
+                "JARVIS_IMMEDIATE_ABORT",
+                "是否启用立即中断？\n- 选择 是/true：在对话输出流的每次迭代中检测到用户中断（例如 Ctrl+C）时，立即返回当前已生成的内容并停止继续输出。\n- 选择 否/false：不会在输出过程中立刻返回，而是按既有流程处理（不中途打断输出）。",
+                False,
+                "bool",
+            )
+            or changed
+        )
         changed = (
             _ask_and_set(
                 "JARVIS_ENABLE_STATIC_ANALYSIS",

{jarvis_ai_assistant-0.3.17 → jarvis_ai_assistant-0.3.18/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.17
+Version: 0.3.18
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

jarvis_ai_assistant-0.3.17/src/jarvis/jarvis_tools/read_webpage.py

@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-from typing import Any, Dict
-
-from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-
-
-class WebpageTool:
-    name = "read_webpage"
-    description = "读取网页内容，提取标题、文本和超链接"
-    parameters = {
-        "type": "object",
-        "properties": {
-            "url": {"type": "string", "description": "要读取的网页URL"},
-            "want": {
-                "type": "string",
-                "description": "具体想要从网页获取的信息或回答的问题",
-                "default": "请总结这个网页的主要内容",
-            },
-        },
-        "required": ["url"],
-    }
-
-    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        """Read webpage content using Yuanbao model"""
-        try:
-            url = args["url"].strip()
-            want = args.get("want", "请总结这个网页的主要内容")
-
-            # Create Yuanbao model instance
-            model = PlatformRegistry().get_normal_platform()
-            model.set_web(True)
-            model.set_suppress_output(False)  # type: ignore
-
-            # Construct prompt based on want parameter
-            prompt = f"""请帮我处理这个网页：{url}
-用户的具体需求是：{want}
-请按照以下要求输出结果：
-1. 使用Markdown格式
-2. 包含网页标题
-3. 根据用户需求提供准确、完整的信息"""
-
-            # Get response from Yuanbao model
-            response = model.chat_until_success(prompt)  # type: ignore
-
-            return {"success": True, "stdout": response, "stderr": ""}
-
-        except Exception as e:
-            PrettyOutput.print(f"读取网页失败: {str(e)}", OutputType.ERROR)
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": f"Failed to parse webpage: {str(e)}",
-            }
-
-    @staticmethod
-    def check() -> bool:
-        """检查当前平台是否支持web功能"""
-        return PlatformRegistry().get_normal_platform().support_web()