jarvis-ai-assistant 0.1.19__py3-none-any.whl → 0.1.23__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.19" 
+__version__ = "0.1.23" 

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"):
+    def __init__(self, model: BaseModel, tool_registry: ToolRegistry, name: str = "Jarvis", is_sub_agent: bool = False):
         """Initialize Agent with a model, optional tool registry and name
         
         Args:
@@ -23,6 +23,7 @@ class Agent:
         self.model = model
         self.tool_registry = tool_registry or ToolRegistry(model)
         self.name = name
+        self.is_sub_agent = is_sub_agent
         self.prompt = ""
 
 
@@ -77,7 +78,7 @@ class Agent:
         except Exception as e:
             raise Exception(f"{self.name}: 模型调用失败: {str(e)}")
 
-    def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False):
+    def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False) -> str:
         """处理用户输入并返回响应，返回任务总结报告
         
         Args:
@@ -110,17 +111,20 @@ class Agent:
 核心能力：
 1. 使用现有工具完成任务
 2. 通过 generate_tool 创建新工具扩展功能
-3. 遵循 ReAct (思考-行动-观察) 框架
+3. 通过 create_sub_agent 创建子代理处理独立任务
+4. 遵循 ReAct (思考-行动-观察) 框架
 
 工作流程：
 1. 思考
    - 分析需求和可用工具
    - 评估是否需要新工具
+   - 考虑是否需要拆分子任务
    - 规划解决方案
 
 2. 行动 (如果需要)
    - 使用现有工具
    - 创建新工具
+   - 创建子代理
    - 询问更多信息
    
 3. 观察
@@ -128,14 +132,25 @@ 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>
 
 创建新工具示例：
@@ -154,6 +169,16 @@ arguments:
         required: [param1]
 <END_TOOL_CALL>
 
+工具使用格式：
+<START_TOOL_CALL>
+name: tool_name
+arguments:
+    param1: value1
+    param2: |
+        multiline
+        value
+<END_TOOL_CALL>
+
 严格规则：
 1. 每次只能执行一个工具
 2. 等待用户提供执行结果
@@ -203,7 +228,23 @@ arguments:
                     
                     if not user_input:
                         PrettyOutput.section("任务完成", OutputType.SUCCESS)
-                        return 
+                        if self.is_sub_agent:
+                            # 生成任务总结
+                            summary_prompt = f"""请对以上任务执行情况生成一个简洁的总结报告，包括：
+
+1. 任务目标: xxxx
+2. 执行结果: 成功/失败
+3. 关键信息: 提取执行过程中的重要信息
+4. 重要发现: 任何值得注意的发现
+5. 后续建议: 如果有的话
+
+请用简洁的要点形式描述，突出重要信息。
+"""
+                            self.prompt = summary_prompt
+                            summary = self.model.chat(self.prompt)
+                            return summary
+                        else:
+                            return "Task completed"
 
                 except Exception as e:
                     PrettyOutput.print(str(e), OutputType.ERROR)

jarvis/tools/base.py

@@ -115,7 +115,7 @@ class ToolRegistry:
                         parameters=tool_instance.parameters,
                         func=tool_instance.execute
                     )
-                    self.output_handler.print(f"已加载工具: {tool_instance.name}", OutputType.INFO)
+                    self.output_handler.print(f"已加载工具: {tool_instance.name}: {tool_instance.description}", OutputType.INFO)
                     tool_found = True
                     
             if not tool_found:

jarvis/tools/generator.py

@@ -15,7 +15,7 @@ class ModelHandler(Protocol):
 
 class ToolGeneratorTool:
     name = "generate_tool"
-    description = "生成新的工具代码并自动注册到ToolRegistry"
+    description = "生成新的工具代码并自动注册到Jarvis，自动扩充Jarvis的能力"
     parameters = {
         "type": "object",
         "properties": {

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.19.dist-info → jarvis_ai_assistant-0.1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.19
+Version: 0.1.23
 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.19.dist-info → jarvis_ai_assistant-0.1.23.dist-info}/RECORD

@@ -1,9 +1,9 @@
-jarvis/__init__.py,sha256=ZS0T4CRb_B0dOsiPYPRNrunjMPVvZzmD9IIaUB29ig8,50
-jarvis/agent.py,sha256=r00CssF8HzSj4r2GXR9KNJ3XJk46HIjw4BEfzx-fKMQ,8114
+jarvis/__init__.py,sha256=WSKGFVi_j1dkarXDlgPoryqQHFsuvbJuPKwZDbqctjA,50
+jarvis/agent.py,sha256=ojs1f3Gjy049zKh7foAKkablPjsPhJI9DGB12b4l9rY,9592
 jarvis/main.py,sha256=tptQp6rjhHOSsPphmrtoxf7l78btnP_hJmr3hVMO4zg,8103
 jarvis/utils.py,sha256=YipQpEuIRwFE3y3YrgGlSVLEPDrlbBNY1gRiOJix9DU,6602
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=TnbFSQwCFYqlSRaAgJgfajYnPQVIUrqM9Pyj4QRQjDQ,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=ItAH6Mb964vpqvziIsw-62avHUVu54mNgTa02VWK3lM,10855
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=rT2SAKbzBYAMp9vZpjydqHwIBuZLRzzOXq6n3F-H5pE,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=LYq1CMB8lQpBLrk54MBWsFpEsNf6-FvNvN-GYTxM8vA,12532
 jarvis/__pycache__/main.cpython-313.pyc,sha256=uQ1QHMHR6EukOb7z-YOz8CicXRPEfiHyS7KRq15xxVw,10943
 jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
 jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
@@ -16,29 +16,30 @@ jarvis/models/__pycache__/__init__.cpython-313.pyc,sha256=jAwySX4diR7EWM_alK75ti
 jarvis/models/__pycache__/base.cpython-313.pyc,sha256=4I9KZlXHvTB7vENA9YWK4Fx0sns_KvIOtWqzE9y_-Co,1094
 jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=-hOwhZrfvqfd5K_c34Tm-uR3gaZ9r6EV1NtwV0-FDmg,13647
 jarvis/tools/__init__.py,sha256=AjmFYLXt-_ulZXdYiXya2fD7QCJ-RaK91PEZCNj-UbA,262
-jarvis/tools/base.py,sha256=ZHmRczYks7CuaYHU9uB5QnsD40G_jeqE6ubuhlaSFR8,7318
+jarvis/tools/base.py,sha256=4LvbpUXDnLNu2r6S2G-luAPKRk_-6I6lfQQbxxiyIUw,7347
 jarvis/tools/file_ops.py,sha256=KbQLVCCXw-MtJg-12iyMeVGu8BTtLq7Mk7fpVKau40U,4296
-jarvis/tools/generator.py,sha256=VJXfZg0Xt3OZr1LtX8m-RJh9807VxZRah5xV7UtX6is,7406
+jarvis/tools/generator.py,sha256=qURQ2ct61tRaN-CNhnbpjoj7recGGjFWnQUteKvej_g,7430
 jarvis/tools/shell.py,sha256=MWe9-BAGApbGJfR60XG4nElGYHNBnbdF9vsOQTnEZ4g,2989
+jarvis/tools/sub_agent.py,sha256=jU0j__Y5ufBktxIF5qdT3NyLHnybE23c39QRj3oz5CI,3381
 jarvis/tools/__pycache__/__init__.cpython-313.pyc,sha256=KC48FS57427navbkxZ0eDKLePMCH2BKc5vAIu0b8lFc,404
-jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=r-jPPg5L_Rok2c_VsMEAXkhuiiUjHv6bLCwVjnONDRo,9861
+jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=Pw89qn1ZMSNdU03CoM4ezkAHEiP_iTZEWceGg1TE_mk,9913
 jarvis/tools/__pycache__/bing_search.cpython-313.pyc,sha256=1G_wPbk5wcQYh7H0drLIS2Aw0XOG2ZM8ztgfQaqu3P8,2031
 jarvis/tools/__pycache__/calculator.cpython-313.pyc,sha256=C_qwTDGm6gc7QNxtPzPZXyStdKEintJVQIt5NMHQ8oY,4205
 jarvis/tools/__pycache__/calculator_tool.cpython-313.pyc,sha256=PI4LZNDTPdSe3ffWDRovLZ-r-vF8Kl-n6xdGdFWiBpY,4296
 jarvis/tools/__pycache__/file_ops.cpython-313.pyc,sha256=OBR2EDQ2Ana7CTtLOoM5AYJzyVwP683LS7QrOR8_I3g,5208
-jarvis/tools/__pycache__/generator.cpython-313.pyc,sha256=3XTMBphRw7gqRqJXPuQrA4_6FirinFZ3khd7LiCy7uU,8746
+jarvis/tools/__pycache__/generator.cpython-313.pyc,sha256=EXK5lveBUQqOnpHRsAvYHZFCso350-OchiHJc62wEVQ,8770
 jarvis/tools/__pycache__/python_script.cpython-313.pyc,sha256=8JpryqTovEiTvBlWAK1KjZmPvHUuPc9GT9rTXBEQoJc,6693
 jarvis/tools/__pycache__/rag.cpython-313.pyc,sha256=JH6-PSZRMKAvTZqCwlRXJGClxYXNMs-vetU0q7hBLz0,6064
 jarvis/tools/__pycache__/search.cpython-313.pyc,sha256=wLMIkFwT-h4NGHgssytT4xme7sGO6ZhEnex7kjcy0-k,5990
 jarvis/tools/__pycache__/shell.cpython-313.pyc,sha256=6HWtxO-OWIxSraGkLs4K8hJrJ-UBVdi5KVuQUhyEUMA,4784
-jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=9spmVX8KSQ4qIH7FbXo5tmmZfNx8KfIGtjy2lxTSp4Y,3144
+jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=RqIUPCSentRuZAARTX3wLTSy3HjzwEe1MFJ-fRx_U0Y,4645
 jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRvoYmi7A0GzxYkzU-C4Wfhs5qW_HBqs,2271
 jarvis/tools/__pycache__/user_input.cpython-313.pyc,sha256=JjTFOhObKsKF4Pn8KBRuKfV1_Ssj083fjU7Mfc_5z7c,2531
 jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
 jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=BjzSfnNzsKCrLETCcWjt32lNDLzwnjqcVGg4JfWd9OM,3008
-jarvis_ai_assistant-0.1.19.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.19.dist-info/METADATA,sha256=SPaJ0q7U024HA6W3sagtO6SlmDizohRfXhCBEuFMdrM,10193
-jarvis_ai_assistant-0.1.19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.19.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.19.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.19.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.23.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.23.dist-info/METADATA,sha256=n_8hfZ0nFZc44KvlVnmlX46zsqJOY9QxpsZ6zXkvl1Y,10193
+jarvis_ai_assistant-0.1.23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.23.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.23.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.23.dist-info/RECORD,,