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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.19"
+version = "0.1.22"
 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.19 → jarvis_ai_assistant-0.1.22}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.19",
+    version="0.1.22",
     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.19 → jarvis_ai_assistant-0.1.22}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.19 → jarvis_ai_assistant-0.1.22}/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"):
+    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:
@@ -203,7 +204,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_ai_assistant-0.1.19 → jarvis_ai_assistant-0.1.22}/src/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_ai_assistant-0.1.19 → jarvis_ai_assistant-0.1.22}/src/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_ai_assistant-0.1.19 → jarvis_ai_assistant-0.1.22/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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