jarvis-ai-assistant 0.1.22__tar.gz → 0.1.24__tar.gz

{jarvis_ai_assistant-0.1.22/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.22
+Version: 0.1.24
 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.1.22 → jarvis_ai_assistant-0.1.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.22"
+version = "0.1.24"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.22",
+    version="0.1.24",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.22" 
+__version__ = "0.1.24" 

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24}/src/jarvis/agent.py

@@ -11,7 +11,7 @@ import os
 from datetime import datetime
 
 class Agent:
-    def __init__(self, model: BaseModel, tool_registry: ToolRegistry, name: str = "Jarvis", is_sub_agent: bool = False):
+    def __init__(self, model: BaseModel, tool_registry: ToolRegistry, name: str = "Jarvis", is_sub_agent: bool = False, verbose: bool = False):
         """Initialize Agent with a model, optional tool registry and name
         
         Args:
@@ -21,7 +21,7 @@ class Agent:
             is_sub_agent: 是否为子Agent，默认为False
         """
         self.model = model
-        self.tool_registry = tool_registry or ToolRegistry(model)
+        self.tool_registry = tool_registry or ToolRegistry(model, verbose=verbose)
         self.name = name
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
@@ -111,17 +111,23 @@ class Agent:
 核心能力：
 1. 使用现有工具完成任务
 2. 通过 generate_tool 创建新工具扩展功能
-3. 遵循 ReAct (思考-行动-观察) 框架
+3. 通过 create_sub_agent 创建子代理处理独立任务
+4. 访问和理解网页内容（无需使用工具）
+5. 遵循 ReAct (思考-行动-观察) 框架
 
 工作流程：
 1. 思考
    - 分析需求和可用工具
    - 评估是否需要新工具
+   - 考虑是否需要拆分子任务
    - 规划解决方案
+   - 确定是否需要访问网页
 
 2. 行动 (如果需要)
    - 使用现有工具
    - 创建新工具
+   - 创建子代理
+   - 访问网页获取信息
    - 询问更多信息
    
 3. 观察
@@ -129,14 +135,32 @@ class Agent:
    - 分析反馈
    - 规划下一步
 
-工具使用格式：
+网页访问能力：
+- 可以直接访问和阅读网页内容
+- 无需使用额外工具
+- 可以提取和分析网页信息
+- 支持多种网页格式
+- 注意：仅支持公开访问的网页
+
+任务拆分建议：
+- 当任务包含多个独立步骤时
+- 当子任务需要独立的上下文时
+- 当子任务有明确的完成目标时
+- 当需要并行处理多个任务时
+
+创建子代理时，必须提供尽可能多的上下文信息，以确保其正确工作。
+
+创建子代理示例：
 <START_TOOL_CALL>
-name: tool_name
+name: create_sub_agent
 arguments:
-    param1: value1
-    param2: |
-        multiline
-        value
+    agent_name: CodeAnalyzer
+    task: 分析项目代码质量
+    context: |
+        这是一个Python项目
+        使用了Flask框架
+        需要关注性能和安全性
+    goal: 生成代码质量分析报告
 <END_TOOL_CALL>
 
 创建新工具示例：
@@ -155,6 +179,16 @@ arguments:
         required: [param1]
 <END_TOOL_CALL>
 
+工具使用格式：
+<START_TOOL_CALL>
+name: tool_name
+arguments:
+    param1: value1
+    param2: |
+        multiline
+        value
+<END_TOOL_CALL>
+
 严格规则：
 1. 每次只能执行一个工具
 2. 等待用户提供执行结果

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24}/src/jarvis/main.py

@@ -58,19 +58,6 @@ def load_tasks() -> dict:
     
     return tasks
 
-class NumberValidator(Validator):
-    def validate(self, document):
-        text = document.text.strip()
-        if not text:  # Allow empty input
-            return
-            
-        try:
-            number = int(text)
-            if number < 0:
-                raise ValidationError(message='Please enter a non-negative number')
-        except ValueError:
-            raise ValidationError(message='Please enter a valid number')
-
 def select_task(tasks: dict) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:
@@ -93,7 +80,6 @@ def select_task(tasks: dict) -> str:
             choice = prompt(
                 "\nSelect a task number (0 to skip): ",
                 completer=number_completer,
-                validator=NumberValidator(),
                 validate_while_typing=False,
                 enable_history_search=True,
             ).strip()
@@ -121,6 +107,7 @@ def main():
     parser = argparse.ArgumentParser(description='Jarvis AI Assistant')
     parser.add_argument('-f', '--files', nargs='*', help='List of files to process')
     parser.add_argument('--keep-history', action='store_true', help='Keep chat history (do not delete chat session)')
+    parser.add_argument('-v', '--verbose', action='store_true', help='Show detailed search and reference information')
     args = parser.parse_args()
 
     load_env_from_file()
@@ -149,10 +136,10 @@ def main():
             PrettyOutput.print("\n设置完成后重新运行 Jarvis。", OutputType.INFO, timestamp=False)
             return 1
         
-        model = KimiModel(kimi_api_key)
+        model = KimiModel(kimi_api_key, verbose=args.verbose)
 
-        tool_registry = ToolRegistry()
-        agent = Agent(model, tool_registry)
+        tool_registry = ToolRegistry(verbose=args.verbose)
+        agent = Agent(model, tool_registry, verbose=args.verbose)
 
         # 欢迎信息
         PrettyOutput.print(f"Jarvis 已初始化 - With Kimi", OutputType.SYSTEM)

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24}/src/jarvis/models/kimi.py

@@ -10,7 +10,7 @@ import time
 class KimiModel(BaseModel):
     """Kimi模型实现"""
     
-    def __init__(self, api_key: str = None):
+    def __init__(self, api_key: str, verbose: bool = False):
         """
         初始化Kimi模型
         Args:
@@ -23,6 +23,7 @@ class KimiModel(BaseModel):
         self.chat_id = ""
         self.uploaded_files = []  # 存储已上传文件的信息
         self.first_chat = True  # 添加标记，用于判断是否是第一次对话
+        self.verbose = verbose  # 添加verbose属性
 
     def _create_chat(self) -> bool:
         """创建新的对话会话"""
@@ -221,6 +222,10 @@ class KimiModel(BaseModel):
             response = requests.post(url, headers=headers, json=payload, stream=True)
             full_response = ""
             
+            # 收集搜索和引用结果
+            search_results = []
+            ref_sources = []
+            
             PrettyOutput.print("接收响应...", OutputType.PROGRESS)
             for line in response.iter_lines():
                 if not line:
@@ -232,15 +237,90 @@ class KimiModel(BaseModel):
                     
                 try:
                     data = json.loads(line[6:])
-                    if data.get("event") == "cmpl":
+                    event = data.get("event")
+                    
+                    if event == "cmpl":
+                        # 处理补全文本
                         text = data.get("text", "")
                         if text:
                             PrettyOutput.print_stream(text, OutputType.SYSTEM)
                             full_response += text
+                            
+                    elif event == "search_plus":
+                        # 收集搜索结果
+                        msg = data.get("msg", {})
+                        if msg.get("type") == "get_res":
+                            search_results.append({
+                                "date": msg.get("date", ""),
+                                "site_name": msg.get("site_name", ""),
+                                "snippet": msg.get("snippet", ""),
+                                "title": msg.get("title", ""),
+                                "type": msg.get("type", ""),
+                                "url": msg.get("url", "")
+                            })
+                                
+                    elif event == "ref_docs":
+                        # 收集引用来源
+                        ref_cards = data.get("ref_cards", [])
+                        for card in ref_cards:
+                            ref_sources.append({
+                                "idx_s": card.get("idx_s", ""),
+                                "idx_z": card.get("idx_z", ""),
+                                "ref_id": card.get("ref_id", ""),
+                                "url": card.get("url", ""),
+                                "title": card.get("title", ""),
+                                "abstract": card.get("abstract", ""),
+                                "source": card.get("source_label", ""),
+                                "rag_segments": card.get("rag_segments", []),
+                                "origin": card.get("origin", {})
+                            })
+                                    
                 except json.JSONDecodeError:
                     continue
                     
             PrettyOutput.print_stream_end()
+            
+            # 只在verbose模式下显示搜索和引用信息
+            if self.verbose:
+                # 显示搜索结果摘要
+                if search_results:
+                    PrettyOutput.print("\n搜索结果:", OutputType.INFO)
+                    for result in search_results:
+                        PrettyOutput.print(f"- {result['title']}", OutputType.INFO)
+                        if result['date']:
+                            PrettyOutput.print(f"  日期: {result['date']}", OutputType.INFO)
+                        PrettyOutput.print(f"  来源: {result['site_name']}", OutputType.INFO)
+                        if result['snippet']:
+                            PrettyOutput.print(f"  摘要: {result['snippet']}", OutputType.INFO)
+                        PrettyOutput.print(f"  链接: {result['url']}", OutputType.INFO)
+                        PrettyOutput.print("", OutputType.INFO)
+                        
+                # 显示引用来源
+                if ref_sources:
+                    PrettyOutput.print("\n引用来源:", OutputType.INFO)
+                    for source in ref_sources:
+                        PrettyOutput.print(f"- [{source['ref_id']}] {source['title']} ({source['source']})", OutputType.INFO)
+                        PrettyOutput.print(f"  链接: {source['url']}", OutputType.INFO)
+                        if source['abstract']:
+                            PrettyOutput.print(f"  摘要: {source['abstract']}", OutputType.INFO)
+                        
+                        # 显示相关段落
+                        if source['rag_segments']:
+                            PrettyOutput.print("  相关段落:", OutputType.INFO)
+                            for segment in source['rag_segments']:
+                                text = segment.get('text', '').replace('\n', ' ').strip()
+                                if text:
+                                    PrettyOutput.print(f"    - {text}", OutputType.INFO)
+                        
+                        # 显示原文引用
+                        origin = source['origin']
+                        if origin:
+                            text = origin.get('text', '')
+                            if text:
+                                PrettyOutput.print(f"  原文: {text}", OutputType.INFO)
+                        
+                        PrettyOutput.print("", OutputType.INFO)
+            
             return full_response
 
         except Exception as e:

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24}/src/jarvis/tools/base.py

@@ -30,7 +30,7 @@ class Tool:
         return self.func(arguments)
 
 class ToolRegistry:
-    def __init__(self, output_handler=None):
+    def __init__(self, output_handler=None, verbose=False):
         """初始化工具注册器
         
         Args:
@@ -38,7 +38,7 @@ class ToolRegistry:
         """
         self.tools: Dict[str, Tool] = {}
         self.output_handler = output_handler or PrettyOutput
-        
+        self.verbose = verbose
         # 加载内置工具和外部工具
         self._load_builtin_tools()
         self._load_external_tools()
@@ -106,7 +106,7 @@ class ToolRegistry:
                     hasattr(item, 'parameters')):
                     
                     # 实例化工具类，传入模型和输出处理器
-                    tool_instance = item(model=KimiModel(), register=self, output_handler=self.output_handler)
+                    tool_instance = item(model=KimiModel(self.verbose), register=self, output_handler=self.output_handler)
                     
                     # 注册工具
                     self.register_tool(

jarvis_ai_assistant-0.1.24/src/jarvis/tools/sub_agent.py

@@ -0,0 +1,108 @@
+from typing import Dict, Any, Protocol, Optional
+from enum import Enum
+import os
+import sys
+from pathlib import Path
+
+# 添加项目根目录到 Python 路径
+project_root = Path(__file__).parent.parent.parent
+if str(project_root) not in sys.path:
+    sys.path.append(str(project_root))
+
+from jarvis.agent import Agent
+from jarvis.utils import OutputType
+
+class OutputHandler(Protocol):
+    def print(self, text: str, output_type: OutputType) -> None: ...
+
+class ModelHandler(Protocol):
+    def chat(self, message: str) -> str: ...
+
+class SubAgentTool:
+    name = "create_sub_agent"
+    description = "创建一个子代理来处理特定任务，子代理会生成任务总结报告"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "agent_name": {
+                "type": "string",
+                "description": "子代理的名称"
+            },
+            "task": {
+                "type": "string",
+                "description": "需要完成的具体任务"
+            },
+            "context": {
+                "type": "string",
+                "description": "任务相关的上下文信息",
+                "default": ""
+            },
+            "goal": {
+                "type": "string",
+                "description": "任务的完成目标",
+                "default": ""
+            }
+        },
+        "required": ["agent_name", "task", "context", "goal"]
+    }
+
+    def __init__(self, **kwargs):
+        """初始化子代理工具
+        
+        Args:
+            model: 模型处理器
+            output_handler: 输出处理器
+            register: 工具注册器
+        """
+        self.model = kwargs.get('model')
+        if not self.model:
+            raise Exception("Model is required for SubAgentTool")
+        self.output = kwargs.get('output_handler')
+        self.register = kwargs.get('register')
+
+    def _print(self, text: str, output_type: OutputType = OutputType.INFO):
+        """输出信息"""
+        if self.output:
+            self.output.print(text, output_type)
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """创建并运行子代理"""
+        try:
+            agent_name = args["agent_name"]
+            task = args["task"]
+            context = args.get("context", "")
+            goal = args.get("goal", "")
+
+            self._print(f"创建子代理: {agent_name}")
+
+            # 构建任务描述
+            task_description = task
+            if context:
+                task_description = f"上下文信息:\n{context}\n\n任务:\n{task}"
+            if goal:
+                task_description += f"\n\n完成目标:\n{goal}"
+
+            # 创建子代理
+            sub_agent = Agent(
+                name=agent_name,
+                model=self.model,
+                tool_registry=self.register,
+                is_sub_agent=True
+            )
+
+            # 运行子代理
+            self._print(f"子代理开始执行任务...")
+            result = sub_agent.run(task_description)
+
+            return {
+                "success": True,
+                "stdout": f"子代理任务完成\n\n{result}",
+                "stderr": ""
+            }
+
+        except Exception as e:
+            self._print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "error": f"子代理执行失败: {str(e)}"
+            } 

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24}/src/jarvis/utils.py

@@ -95,7 +95,7 @@ class PrettyOutput:
         return formatted_text
 
     @staticmethod
-    def print(text: str, output_type: OutputType, timestamp: bool = True):
+    def print(text: str, output_type: OutputType, timestamp: bool = False):
         """打印格式化的输出"""
         print(PrettyOutput.format(text, output_type, timestamp))
 

{jarvis_ai_assistant-0.1.22 → jarvis_ai_assistant-0.1.24/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.22
+Version: 0.1.24
 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.1.22 → jarvis_ai_assistant-0.1.24}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ src/jarvis/tools/base.py
 src/jarvis/tools/file_ops.py
 src/jarvis/tools/generator.py
 src/jarvis/tools/shell.py
+src/jarvis/tools/sub_agent.py
 src/jarvis/tools/__pycache__/__init__.cpython-313.pyc
 src/jarvis/tools/__pycache__/base.cpython-313.pyc
 src/jarvis/tools/__pycache__/bing_search.cpython-313.pyc