jarvis-ai-assistant 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

jarvis/__init__.py

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

jarvis/tools/base.py

@@ -117,6 +117,7 @@ class ToolRegistry:
     def tool_help_text(self) -> str:
         """返回所有工具的帮助文本"""
         return """Available Tools:
+
 1. search: Search for information using DuckDuckGo
 2. read_webpage: Extract content from webpages
 3. execute_python: Run Python code with dependency management
@@ -152,29 +153,59 @@ Output Guidelines:
    - Combine similar information
    - Skip redundant context
 
-Tool Usage Examples:
+Tool Call Format Requirements:
+1. MUST use exact format:
 <tool_call>
 {
-    "name": "search",
+    "name": "tool_name",
     "arguments": {
-        "query": "Python GIL",
-        "max_results": 2  # Limit results to save context
+        "param1": "value1"
     }
 }
 </tool_call>
 
-<tool_call>
-{
-    "name": "read_webpage",
-    "arguments": {
-        "url": "https://example.com",
-        "extract_type": "text"  # Only get main content
-    }
-}
-</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>
 
 Remember:
 1. Quality over quantity
 2. Relevance over completeness
 3. Conciseness over verbosity
-4. Context efficiency is crucial"""
+4. Context efficiency is crucial
+5. STRICT adherence to tool call format"""

jarvis/tools/shell.py

@@ -4,13 +4,27 @@ from ..utils import PrettyOutput, OutputType
 
 class ShellTool:
     name = "execute_shell"
-    description = "Execute shell commands and return the results"
+    description = """Execute shell commands and return the results.
+    Guidelines for output optimization:
+    1. Use grep/awk/sed to filter output when possible
+    2. Avoid listing all files/dirs unless specifically needed
+    3. Prefer -q/--quiet flags when status is all that's needed
+    4. Use head/tail to limit long outputs
+    5. Redirect stderr to /dev/null for noisy commands
+    
+    Examples of optimized commands:
+    - 'ls -l file.txt' instead of 'ls -l'
+    - 'grep -c pattern file' instead of 'grep pattern file'
+    - 'ps aux | grep process | head -n 5' instead of 'ps aux'
+    - 'command 2>/dev/null' to suppress error messages
+    - 'df -h . ' instead of 'df -h'
+    """
     parameters = {
         "type": "object",
         "properties": {
             "command": {
                 "type": "string",
-                "description": "Shell command to execute"
+                "description": "Shell command to execute (use filters/limits for large outputs)"
             },
             "timeout": {
                 "type": "integer",

{jarvis_ai_assistant-0.1.2.dist-info → jarvis_ai_assistant-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.2
+Version: 0.1.3
 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.2.dist-info → jarvis_ai_assistant-0.1.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 jarvis/.jarvis,sha256=S4ZMmLqlVLHAPmnwHFQ3vYt0gnDFp-KQRH4okBh8Hpw,209
-jarvis/__init__.py,sha256=V3Qwm3k_WFeGUNccLbLJuCyWQyXYnRUkY5-KlBUm4UU,49
+jarvis/__init__.py,sha256=rLUKzHgrbk82WAMvg4u4GlFDRal1Yw3XpMg_741mQXw,49
 jarvis/agent.py,sha256=hEatrIothG6C_RuOsygZz4ez1aF1EycnUPwY2Krwiwk,4092
 jarvis/main.py,sha256=wAeeGoRq8fFiTWUCQ31MYVeU9o6SZ48ORUow0jlMJJE,5259
 jarvis/models.py,sha256=ZQAyc39e_UsNmHkME6ATp6053safQ7Gog-oWwETsrMM,4415
@@ -10,12 +10,12 @@ jarvis/__pycache__/models.cpython-313.pyc,sha256=fot2VOV0lgODg4b_WuD-kkq-g7uZGLu
 jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
 jarvis/__pycache__/utils.cpython-313.pyc,sha256=o8Fubq8Dcrvv3ATzQ9BnZoZjQmU3_FNPrfTt0ANdKdI,5804
 jarvis/tools/__init__.py,sha256=FNF5X32UzKvlT08-hPz7-7vcIyqqMngQYj36LXyNbV0,553
-jarvis/tools/base.py,sha256=xdZaoqxCOYVAwBmof_zqICg5ixb5-ksX-XbNXJw1O7k,5938
+jarvis/tools/base.py,sha256=Y1XInc2skUVZYZzLRPlCpH3JyY3pk1XNZgys6MSCudQ,6586
 jarvis/tools/file_ops.py,sha256=05Vc4u-NGMjLD15WI52eL_nt_RyYt-Z_cXJnnBepf-c,3781
 jarvis/tools/python_script.py,sha256=_eK8LqNs-Mz50zdcgwbjdd8-qAeOl6kJ_qRDvWawGMw,5006
 jarvis/tools/rag.py,sha256=eBrn1fdqy-nd2nR0b4oH1EQpthTYVen-sYDhC5Ypl38,5647
 jarvis/tools/search.py,sha256=dyJmeP_s2tWv5KQejOl-TuVF12B6SXViiXEyTemD1Wo,1412
-jarvis/tools/shell.py,sha256=uGqwUGmqFg1cJkyTg7zyPk3jRwEr-woKTmqcTKdbbg8,1979
+jarvis/tools/shell.py,sha256=VhEqEdoUGIRW6CT6F0YNMAlzJxpHcsKS9hSS0VC3ezw,2644
 jarvis/tools/user_confirmation.py,sha256=p0JverifHJfnALeIhtKtaVBBVEGkgSpUzT-PSycG4NY,1850
 jarvis/tools/user_interaction.py,sha256=xOaoYsCKTa9-K3mg5tsu1zegn1HKcO40k2aJ3VygZqM,3073
 jarvis/tools/webpage.py,sha256=UTEomu5j7jbOw8c5az2jsjv5E7LeokWKj1QahvZO7xc,3077
@@ -29,8 +29,8 @@ jarvis/tools/__pycache__/shell.cpython-313.pyc,sha256=Xtqt-LzMRfsCXeCE7QxFY8TR8X
 jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRvoYmi7A0GzxYkzU-C4Wfhs5qW_HBqs,2271
 jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
 jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=VcpkaV8IyOOtebedXjn8ybjr8AglU-3-Cs80yzE4FYo,3628
-jarvis_ai_assistant-0.1.2.dist-info/METADATA,sha256=0EX8k3LdrzeEWHqRTHlguT80fPxHLbVtpY65f1kMhOk,3675
-jarvis_ai_assistant-0.1.2.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-jarvis_ai_assistant-0.1.2.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.2.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.2.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.3.dist-info/METADATA,sha256=eVKO4jecgKkHOIRUXZGvfvi5KiR9CGaZuQLhDR9W3NY,3675
+jarvis_ai_assistant-0.1.3.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+jarvis_ai_assistant-0.1.3.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.3.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.3.dist-info/RECORD,,