jarvis-ai-assistant 0.1.3__tar.gz → 0.1.5__tar.gz

{jarvis_ai_assistant-0.1.3/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.3
+Version: 0.1.5
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -21,13 +21,15 @@ Requires-Dist: beautifulsoup4>=4.9.3
 Requires-Dist: duckduckgo-search>=3.0.0
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: ollama>=0.1.6
-Requires-Dist: sentence-transformers>=2.5.1
-Requires-Dist: chromadb>=0.4.24
+Requires-Dist: colorama>=0.4.6
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Dynamic: author
+Dynamic: home-page
+Dynamic: requires-python
 
 <div align="center">
 

{jarvis_ai_assistant-0.1.3 → jarvis_ai_assistant-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.3"
+version = "0.1.5"
 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" }]
@@ -25,18 +25,12 @@ dependencies = [
     "duckduckgo-search>=3.0.0",
     "pyyaml>=5.1",
     "ollama>=0.1.6",
-    "sentence-transformers>=2.5.1",
-    "chromadb>=0.4.24",
+    "colorama>=0.4.6",
 ]
 requires-python = ">=3.8"
 
 [project.optional-dependencies]
-dev = [
-    "pytest",
-    "black",
-    "isort",
-    "mypy",
-]
+dev = ["pytest", "black", "isort", "mypy"]
 
 [project.urls]
 Homepage = "https://github.com/skyfireitdiy/Jarvis"

{jarvis_ai_assistant-0.1.3 → jarvis_ai_assistant-0.1.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.3",
+    version="0.1.5",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -18,8 +18,7 @@ setup(
         "duckduckgo-search>=3.0.0",
         "pyyaml>=5.1",
         "ollama>=0.1.6",
-        "sentence-transformers>=2.5.1",
-        "chromadb>=0.4.24",
+        "colorama>=0.4.6",
     ],
     entry_points={
         "console_scripts": [

{jarvis_ai_assistant-0.1.3 → jarvis_ai_assistant-0.1.5}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.3" 
+__version__ = "0.1.5" 

jarvis_ai_assistant-0.1.5/src/jarvis/agent.py

@@ -0,0 +1,133 @@
+import json
+import subprocess
+from typing import Dict, Any, List, Optional
+from .tools import ToolRegistry
+from .utils import Spinner, PrettyOutput, OutputType, get_multiline_input
+from .models import BaseModel
+import re
+import os
+from datetime import datetime
+
+class Agent:
+    def __init__(self, model: BaseModel, tool_registry: ToolRegistry, name: str = "Jarvis"):
+        """Initialize Agent with a model, optional tool registry and name"""
+        self.model = model
+        self.tool_registry = tool_registry or ToolRegistry(model)
+        self.name = name
+        # 编译正则表达式
+        self.tool_call_pattern = re.compile(r'<tool_call>\s*({[^}]+})\s*</tool_call>')
+        self.messages = [
+            {
+                "role": "system",
+                "content": f"""You are {name}, a rigorous AI assistant that executes tasks step by step.
+
+Key Principles:
+1. Execute ONE step at a time
+2. Wait for each step's result before planning the next
+3. Use tools to obtain all data, no fabrication
+4. Create sub-agents for independent subtasks
+5. Think carefully before each action
+
+""" + self.tool_registry.tool_help_text()
+            }
+        ]
+        self.spinner = Spinner()
+
+    def _call_model(self, messages: List[Dict], use_tools: bool = True) -> Dict:
+        """调用模型获取响应"""
+        self.spinner.start()
+        try:
+            return self.model.chat(
+                messages=messages,
+                tools=self.tool_registry.get_all_tools() if use_tools else []
+            )
+        except Exception as e:
+            raise Exception(f"{self.name}: 模型调用失败: {str(e)}")
+        finally:
+            self.spinner.stop()
+
+    def run(self, user_input: str) -> str:
+        """处理用户输入并返回响应，返回任务总结报告"""
+        self.clear_history()
+        self.messages.append({
+            "role": "user",
+            "content": user_input
+        })
+        
+        while True:
+            try:
+                response = self._call_model(self.messages)
+                current_response = response
+
+                self.messages.append({
+                    "role": "assistant",
+                    "content": response["message"].get("content", ""),
+                    "tool_calls": current_response["message"]["tool_calls"]
+                })
+                
+                if len(current_response["message"]["tool_calls"]) > 0:
+                    if current_response["message"].get("content"):
+                        PrettyOutput.print(f"{self.name}: {current_response['message']['content']}", OutputType.SYSTEM)
+                        
+                    tool_result = self.tool_registry.handle_tool_calls(current_response["message"]["tool_calls"])
+                    PrettyOutput.print(f"{self.name} Tool Result: {tool_result}", OutputType.RESULT)
+
+                    self.messages.append({
+                        "role": "tool",
+                        "content": tool_result
+                    })
+                    continue
+                
+                final_content = current_response["message"].get("content", "")
+                if final_content:
+                    PrettyOutput.print(f"{self.name}: {final_content}", OutputType.SYSTEM)
+                
+                user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行结束当前任务")
+                if not user_input:
+                    PrettyOutput.print(f"{self.name}: 正在生成任务总结...", OutputType.INFO)
+                    
+                    # 优化后的任务总结提示语
+                    summary_prompt = {
+                        "role": "user",
+                        "content": """The task has been completed. Based on the previous analysis and execution results, provide a task summary including:
+
+1. Key Information:
+   - Essential findings from analysis
+   - Important results from tool executions
+   - Critical data discovered
+
+2. Task Results:
+   - Final outcome
+   - Actual achievements
+   - Concrete results
+
+Focus only on facts and actual results. Be direct and concise."""
+                    }
+                    while True:
+                        try:
+                            summary_response = self._call_model(self.messages + [summary_prompt], use_tools=False)
+                            summary = summary_response["message"].get("content", "")
+                            
+                            PrettyOutput.print(f"==============={self.name} 任务总结===============", OutputType.INFO)
+                            PrettyOutput.print(summary, OutputType.SYSTEM)
+                            PrettyOutput.print("=" * (len(self.name) + 16), OutputType.INFO)
+                            
+                            return summary
+                            
+                        except Exception as e:
+                            error_msg = f"{self.name}: 生成任务总结时出错: {str(e)}"
+                            PrettyOutput.print(error_msg, OutputType.ERROR)
+                        
+                
+                self.messages.append({
+                    "role": "user",
+                    "content": user_input
+                })
+                
+            except Exception as e:
+                error_msg = f"{self.name}: 处理响应时出错: {str(e)}"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+
+    def clear_history(self):
+        """清除对话历史，只保留系统提示"""
+        self.messages = [self.messages[0]] 

{jarvis_ai_assistant-0.1.3 → jarvis_ai_assistant-0.1.5}/src/jarvis/main.py

@@ -13,7 +13,8 @@ sys.path.insert(0, str(Path(__file__).parent.parent))
 from jarvis.agent import Agent
 from jarvis.tools import ToolRegistry
 from jarvis.models import DDGSModel, OllamaModel
-from jarvis.utils import PrettyOutput, OutputType, get_multiline_input
+from jarvis.utils import PrettyOutput, OutputType, get_multiline_input, load_env_from_file
+from jarvis.zte_llm import create_zte_llm
 
 # 定义支持的平台和模型
 SUPPORTED_PLATFORMS = {
@@ -24,35 +25,48 @@ SUPPORTED_PLATFORMS = {
     "ddgs": {
         "models": ["gpt-4o-mini", "claude-3-haiku", "llama-3.1-70b", "mixtral-8x7b"],
         "default": "gpt-4o-mini"
+    },
+    "zte": {
+        "models": ["NebulaBiz", "nebulacoder", "NTele-72B"],
+        "default": "NebulaBiz"
     }
 }
 
-def load_tasks() -> list:
+def load_tasks() -> dict:
     """Load tasks from .jarvis file if it exists."""
     if not os.path.exists(".jarvis"):
-        return []
+        return {}
     
     try:
         with open(".jarvis", "r", encoding="utf-8") as f:
             tasks = yaml.safe_load(f)
             
-        if not isinstance(tasks, list):
-            PrettyOutput.print("Warning: .jarvis file should contain a list of tasks", OutputType.ERROR)
-            return []
+        if not isinstance(tasks, dict):
+            PrettyOutput.print("Warning: .jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
+            return {}
             
-        return [str(task) for task in tasks if task]  # Convert all tasks to strings and filter out empty ones
+        # Validate format and convert all values to strings
+        validated_tasks = {}
+        for name, desc in tasks.items():
+            if desc:  # Ensure description is not empty
+                validated_tasks[str(name)] = str(desc)
+                
+        return validated_tasks
     except Exception as e:
         PrettyOutput.print(f"Error loading .jarvis file: {str(e)}", OutputType.ERROR)
-        return []
+        return {}
 
-def select_task(tasks: list) -> str:
-    """Let user select a task from the list or skip."""
+def select_task(tasks: dict) -> str:
+    """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:
         return ""
     
-    PrettyOutput.print("\nFound predefined tasks:", OutputType.INFO)
-    for i, task in enumerate(tasks, 1):
-        PrettyOutput.print(f"[{i}] {task}", OutputType.INFO)
+    # Convert tasks to list for ordered display
+    task_names = list(tasks.keys())
+    
+    PrettyOutput.print("\nAvailable tasks:", OutputType.INFO)
+    for i, name in enumerate(task_names, 1):
+        PrettyOutput.print(f"[{i}] {name}", OutputType.INFO)
     PrettyOutput.print("[0] Skip predefined tasks", OutputType.INFO)
     
     while True:
@@ -64,8 +78,9 @@ def select_task(tasks: list) -> str:
             choice = int(choice)
             if choice == 0:
                 return ""
-            elif 1 <= choice <= len(tasks):
-                return tasks[choice - 1]
+            elif 1 <= choice <= len(task_names):
+                selected_name = task_names[choice - 1]
+                return tasks[selected_name]  # Return the task description
             else:
                 PrettyOutput.print("Invalid choice. Please try again.", OutputType.ERROR)
         except ValueError:
@@ -79,7 +94,7 @@ def main():
     parser.add_argument(
         "--platform",
         choices=list(SUPPORTED_PLATFORMS.keys()),
-        default="ollama",
+        default="ddgs",
         help="选择运行平台 (默认: ollama)"
     )
     
@@ -97,6 +112,8 @@ def main():
     )
     
     args = parser.parse_args()
+
+    load_env_from_file()
     
     # 验证并设置默认模型
     if args.model:
@@ -119,11 +136,14 @@ def main():
                 api_base=args.api_base
             )
             platform_name = f"Ollama ({args.model})"
-        else:  # ddgs
+        elif args.platform == "ddgs":  # ddgs
             model = DDGSModel(model_name=args.model)
             platform_name = f"DuckDuckGo Search ({args.model})"
+        elif args.platform == "zte":  # zte
+            model = create_zte_llm(model_name=args.model)
+            platform_name = f"ZTE ({args.model})"
 
-        tool_registry = ToolRegistry()
+        tool_registry = ToolRegistry(model)
         agent = Agent(model, tool_registry)
 
         # 欢迎信息

{jarvis_ai_assistant-0.1.3 → jarvis_ai_assistant-0.1.5}/src/jarvis/models.py

@@ -20,31 +20,29 @@ class BaseModel(ABC):
     def extract_tool_calls(content: str) -> List[Dict]:
         """从内容中提取工具调用"""
         tool_calls = []
-        # 修改正则表达式以更好地处理多行内容
-        pattern = re.compile(
-            r'<tool_call>\s*({(?:[^{}]|(?:{[^{}]*})|(?:{(?:[^{}]|{[^{}]*})*}))*})\s*</tool_call>',
-            re.DOTALL  # 添加DOTALL标志以匹配跨行内容
-        )
+        # 使用非贪婪匹配来获取标签之间的所有内容
+        pattern = re.compile(r'<tool_call>(.*?)</tool_call>', re.DOTALL)
         
         matches = pattern.finditer(content)
         for match in matches:
             try:
-                tool_call_str = match.group(1).strip()
-                tool_call = json.loads(tool_call_str)
-                if isinstance(tool_call, dict) and "name" in tool_call and "arguments" in tool_call:
+                # 提取并解析 JSON
+                tool_call_text = match.group(1).strip()
+                tool_call_data = json.loads(tool_call_text)
+                
+                # 验证必要的字段
+                if "name" in tool_call_data and "arguments" in tool_call_data:
                     tool_calls.append({
                         "function": {
-                            "name": tool_call["name"],
-                            "arguments": tool_call["arguments"]
+                            "name": tool_call_data["name"],
+                            "arguments": tool_call_data["arguments"]
                         }
                     })
-                else:
-                    PrettyOutput.print(f"无效的工具调用格式: {tool_call_str}", OutputType.ERROR)
-            except json.JSONDecodeError as e:
-                PrettyOutput.print(f"JSON解析错误: {str(e)}", OutputType.ERROR)
-                PrettyOutput.print(f"解析内容: {tool_call_str}", OutputType.ERROR)
-                continue
-        
+            except json.JSONDecodeError:
+                continue  # 跳过无效的 JSON
+            except Exception:
+                continue  # 跳过其他错误
+                
         return tool_calls
 
 

{jarvis_ai_assistant-0.1.3 → jarvis_ai_assistant-0.1.5}/src/jarvis/tools/__init__.py

@@ -3,9 +3,6 @@ from .python_script import PythonScript
 from .file_ops import FileOperationTool
 from .search import SearchTool
 from .shell import ShellTool
-from .user_interaction import UserInteractionTool
-from .user_confirmation import UserConfirmationTool
-from .rag import RAGTool
 from .webpage import WebpageTool
 
 __all__ = [
@@ -15,8 +12,5 @@ __all__ = [
     'FileOperationTool',
     'SearchTool',
     'ShellTool',
-    'UserInteractionTool',
-    'UserConfirmationTool',
-    'RAGTool',
     'WebpageTool',
 ] 

{jarvis_ai_assistant-0.1.3 → jarvis_ai_assistant-0.1.5}/src/jarvis/tools/base.py

@@ -1,6 +1,7 @@
 from typing import Dict, Any, List, Optional, Callable
 import json
 from ..utils import PrettyOutput, OutputType
+from ..models import BaseModel
 
 class Tool:
     def __init__(self, name: str, description: str, parameters: Dict, func: Callable):
@@ -25,29 +26,25 @@ class Tool:
         return self.func(arguments)
 
 class ToolRegistry:
-    def __init__(self):
+    def __init__(self, model: BaseModel):
         self.tools: Dict[str, Tool] = {}
+        self.model = model
         self._register_default_tools()
 
     def _register_default_tools(self):
         """注册所有默认工具"""
         from .search import SearchTool
         from .shell import ShellTool
-        from .user_interaction import UserInteractionTool
-        from .user_confirmation import UserConfirmationTool
         from .python_script import PythonScriptTool
         from .file_ops import FileOperationTool
-        from .rag import RAGTool
         from .webpage import WebpageTool
+        from .sub_agent import SubAgentTool
 
         tools = [
             SearchTool(),
             ShellTool(),
-            UserInteractionTool(),
-            UserConfirmationTool(),
             PythonScriptTool(),
             FileOperationTool(),
-            RAGTool(),
             WebpageTool(),
         ]
 
@@ -59,6 +56,14 @@ class ToolRegistry:
                 func=tool.execute
             )
 
+        sub_agent_tool = SubAgentTool(self.model)
+        self.register_tool(
+            name=sub_agent_tool.name,
+            description=sub_agent_tool.description,
+            parameters=sub_agent_tool.parameters,
+            func=sub_agent_tool.execute
+        )
+
     def register_tool(self, name: str, description: str, parameters: Dict, func: Callable):
         """注册新工具"""
         self.tools[name] = Tool(name, description, parameters, func)
@@ -122,39 +127,36 @@ class ToolRegistry:
 2. read_webpage: Extract content from webpages
 3. execute_python: Run Python code with dependency management
 4. execute_shell: Execute shell commands
-5. ask_user: Get input from user with options support
-6. ask_user_confirmation: Get yes/no confirmation from user
-7. file_operation: Read/write files in workspace directory
-8. rag_query: Query documents using RAG
-
-Output Guidelines:
-1. Focus on Essential Information
-   - Filter out irrelevant or redundant information
-   - Only output the most relevant search results
-   - Summarize long content when possible
-
-2. Context Management
-   - Avoid repeating information that's already known
-   - Don't echo back the entire content of files
-   - Use snippets instead of full documents
-
-3. Error Handling
-   - Only show relevant parts of error messages
-   - Include troubleshooting steps when appropriate
-   - Omit stack traces unless specifically requested
-
-4. Search Results
-   - Focus on the most relevant 2-3 results
-   - Extract key information instead of full articles
-   - Skip duplicate or similar content
-
-5. RAG Queries
-   - Return only the most relevant passages
-   - Combine similar information
-   - Skip redundant context
-
-Tool Call Format Requirements:
-1. MUST use exact format:
+5. file_operation: Read/write files in workspace directory
+6. create_sub_agent: Create a sub-agent to handle subtasks (ONLY for independent subtasks)
+
+Core Rules:
+1. ONE Step at a Time
+   - Execute only one action per response
+   - Explain what you're going to do before doing it
+   - Wait for the result before planning next step
+   - No multiple actions or parallel execution
+
+2. Sub-Agent Usage (ONLY for Subtasks)
+   - Create sub-agents ONLY to handle independent subtasks
+   - Main task should be broken down into clear subtasks first
+   - Examples of good subtask delegation:
+     * Analyzing each Python file in a directory
+     * Processing each data file in a batch
+     * Researching different aspects of a topic
+     * Reviewing multiple code components
+   - Do NOT use for:
+     * Main task execution
+     * Single file operations
+     * Simple sequential steps
+     * Tasks requiring continuous context
+
+3. Output Guidelines
+   - Focus on essential information
+   - Clear step-by-step explanations
+   - Summarize results concisely
+
+Tool Call Format:
 <tool_call>
 {
     "name": "tool_name",
@@ -164,48 +166,33 @@ Tool Call Format Requirements:
 }
 </tool_call>
 
-2. Format Rules:
-   - NO comments or explanations inside tool_call blocks
-   - NO additional text or formatting within JSON
-   - NO markdown or other markup inside tool_call
-   - ONLY valid JSON allowed in arguments
-   - ALL arguments must match tool parameters exactly
-
-3. Invalid Examples (DO NOT USE):
-   ❌ <tool_call>
-   {
-       "name": "search",  # Search tool
-       "arguments": {
-           "query": "Python GIL"  // Search query
-       }
-   }
-   </tool_call>
-
-   ❌ <tool_call>
-   ```json
-   {
-       "name": "search",
-       "arguments": {
-           "query": "Python GIL"
-       }
-   }
-   ```
-   </tool_call>
-
-4. Valid Example:
-   ✅ <tool_call>
-   {
-       "name": "search",
-       "arguments": {
-           "query": "Python GIL",
-           "max_results": 2
-       }
-   }
-   </tool_call>
+Example (Correct - Subtask Delegation):
+Assistant: I'll create a sub-agent to handle the code analysis subtask.
+<tool_call>
+{
+    "name": "create_sub_agent",
+    "arguments": {
+        "name": "CodeAnalyzer",
+        "task": "Analyze the utils.py file structure and generate documentation",
+        "context": "This is part of the larger documentation task"
+    }
+}
+</tool_call>
+
+Example (Incorrect - Main Task):
+❌ Assistant: I'll create a sub-agent to handle the entire project analysis.
+<tool_call>
+{
+    "name": "create_sub_agent",
+    "arguments": {
+        "name": "ProjectAnalyzer",
+        "task": "Analyze and document the entire project"
+    }
+}
+</tool_call>
 
 Remember:
-1. Quality over quantity
-2. Relevance over completeness
-3. Conciseness over verbosity
-4. Context efficiency is crucial
-5. STRICT adherence to tool call format"""
+1. ONE step at a time
+2. Create sub-agents ONLY for subtasks
+3. Explain before acting
+4. Wait for results"""