jarvis-ai-assistant 0.1.131__py3-none-any.whl → 0.1.132__py3-none-any.whl

jarvis/jarvis_tools/registry.py

@@ -13,20 +13,21 @@ from jarvis.jarvis_tools.base import Tool
 from jarvis.jarvis_utils.config import get_max_token_count
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import ct, ot, init_env
 
 
 
-tool_call_help = """
+tool_call_help = f"""
 # 🛠️ 工具使用系统
 您正在使用一个需要精确格式和严格规则的工具执行系统。
 
 # 📋 工具调用格式
-<TOOL_CALL>
+{ot("TOOL_CALL")}
 name: 工具名称
 arguments:
     param1: 值1
     param2: 值2
-</TOOL_CALL>
+{ct("TOOL_CALL")}
 
 # ❗ 关键规则
 1. 每次只使用一个工具
@@ -53,12 +54,12 @@ arguments:
 # 📝 字符串参数格式
 始终使用 | 语法表示字符串参数：
 
-<TOOL_CALL>
+{ot("TOOL_CALL")}
 name: execute_shell
 arguments:
     command: |
         git status --porcelain
-</TOOL_CALL>
+{ct("TOOL_CALL")}
 
 # 💡 最佳实践
 - 准备好后立即开始执行
@@ -233,7 +234,7 @@ class ToolRegistry(OutputHandler):
             Exception: 如果工具调用缺少必要字段
         """
         # 将内容拆分为行
-        data = re.findall(r'<TOOL_CALL>(.*?)</TOOL_CALL>', content, re.DOTALL)
+        data = re.findall(ot("TOOL_CALL")+r'(.*?)'+ct("TOOL_CALL"), content, re.DOTALL)
         ret = []
         for item in data:
             try:
@@ -270,18 +271,18 @@ class ToolRegistry(OutputHandler):
             name = tool_call["name"]
             args = tool_call["arguments"]
 
-            tool_call_help = """
+            tool_call_help = f"""
 # 🛠️ 工具使用系统
 您正在使用一个需要精确格式和严格规则的工具执行系统。
 
 # 📋 工具调用格式
 
-<TOOL_CALL>
+{ot("TOOL_CALL")}
 name: 工具名称
 arguments:
     param1: 值1
     param2: 值2
-</TOOL_CALL>
+{ct("TOOL_CALL")}
 
 # ❗ 关键规则
 1. 每次只使用一个工具
@@ -308,12 +309,12 @@ arguments:
 # 📝 字符串参数格式
 始终使用 | 语法表示字符串参数：
 
-<TOOL_CALL>
+{ot("TOOL_CALL")}
 name: execute_shell
 arguments:
     command: |
         git status --porcelain
-</TOOL_CALL>
+{ct("TOOL_CALL")}
 
 # 💡 最佳实践
 - 准备好后立即开始执行
@@ -394,3 +395,123 @@ arguments:
         except Exception as e:
             PrettyOutput.print(f"工具执行失败：{str(e)}", OutputType.ERROR)
             return f"工具调用失败: {str(e)}"
+
+
+def main():
+    """命令行工具入口，提供工具列表查看和工具调用功能"""
+    import argparse
+    import json
+
+    init_env()
+
+    parser = argparse.ArgumentParser(description='Jarvis 工具系统命令行界面')
+    subparsers = parser.add_subparsers(dest='command', help='命令')
+
+    # 列出工具子命令
+    list_parser = subparsers.add_parser('list', help='列出所有可用工具')
+    list_parser.add_argument('--json', action='store_true', help='以JSON格式输出')
+    list_parser.add_argument('--detailed', action='store_true', help='显示详细信息')
+
+    # 调用工具子命令
+    call_parser = subparsers.add_parser('call', help='调用指定工具')
+    call_parser.add_argument('tool_name', help='要调用的工具名称')
+    call_parser.add_argument('--args', type=str, help='工具参数 (JSON格式)')
+    call_parser.add_argument('--args-file', type=str, help='从文件加载工具参数 (JSON格式)')
+
+    args = parser.parse_args()
+    
+    # 初始化工具注册表
+    registry = ToolRegistry()
+    
+    if args.command == 'list':
+        tools = registry.get_all_tools()
+        
+        if args.json:
+            if args.detailed:
+                print(json.dumps(tools, indent=2, ensure_ascii=False))
+            else:
+                simple_tools = [{"name": t["name"], "description": t["description"]} for t in tools]
+                print(json.dumps(simple_tools, indent=2, ensure_ascii=False))
+        else:
+            PrettyOutput.section("可用工具列表", OutputType.SYSTEM)
+            for tool in tools:
+                print(f"\n✅ {tool['name']}")
+                print(f"   描述: {tool['description']}")
+                if args.detailed:
+                    print(f"   参数:")
+                    params = tool['parameters'].get('properties', {})
+                    required = tool['parameters'].get('required', [])
+                    for param_name, param_info in params.items():
+                        req_mark = "*" if param_name in required else ""
+                        desc = param_info.get('description', '无描述')
+                        print(f"     - {param_name}{req_mark}: {desc}")
+    
+    elif args.command == 'call':
+        tool_name = args.tool_name
+        tool = registry.get_tool(tool_name)
+        
+        if not tool:
+            PrettyOutput.print(f"错误: 工具 '{tool_name}' 不存在", OutputType.ERROR)
+            available_tools = ", ".join([t["name"] for t in registry.get_all_tools()])
+            print(f"可用工具: {available_tools}")
+            return 1
+        
+        # 获取参数
+        tool_args = {}
+        if args.args:
+            try:
+                tool_args = json.loads(args.args)
+            except json.JSONDecodeError:
+                PrettyOutput.print("错误: 参数必须是有效的JSON格式", OutputType.ERROR)
+                return 1
+        
+        elif args.args_file:
+            try:
+                with open(args.args_file, 'r', encoding='utf-8') as f:
+                    tool_args = json.load(f)
+            except (json.JSONDecodeError, FileNotFoundError) as e:
+                PrettyOutput.print(f"错误: 无法从文件加载参数: {str(e)}", OutputType.ERROR)
+                return 1
+        
+        # 检查必需参数
+        required_params = tool.parameters.get('required', [])
+        missing_params = [p for p in required_params if p not in tool_args]
+        
+        if missing_params:
+            PrettyOutput.print(f"错误: 缺少必需参数: {', '.join(missing_params)}", OutputType.ERROR)
+            print("\n参数说明:")
+            params = tool.parameters.get('properties', {})
+            for param_name in required_params:
+                param_info = params.get(param_name, {})
+                desc = param_info.get('description', '无描述')
+                print(f"  - {param_name}: {desc}")
+            return 1
+        
+        # 执行工具
+        with yaspin(text=f"正在执行工具 {tool_name}...").dots12:
+            result = registry.execute_tool(tool_name, tool_args)
+        
+        # 显示结果
+        if result["success"]:
+            PrettyOutput.section(f"工具 {tool_name} 执行成功", OutputType.SUCCESS)
+        else:
+            PrettyOutput.section(f"工具 {tool_name} 执行失败", OutputType.ERROR)
+            
+        if result.get("stdout"):
+            print("\n输出:")
+            print(result["stdout"])
+            
+        if result.get("stderr"):
+            PrettyOutput.print("\n错误:", OutputType.ERROR)
+            print(result["stderr"])
+            
+        return 0 if result["success"] else 1
+    
+    else:
+        parser.print_help()
+    
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

jarvis/jarvis_tools/search_web.py

@@ -1,5 +1,5 @@
 from typing import Dict, Any, List
-
+import concurrent.futures
 from regex import W
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -7,7 +7,7 @@ from jarvis.jarvis_tools.read_webpage import WebpageTool
 from playwright.sync_api import sync_playwright
 from urllib.parse import quote
 
-from jarvis.jarvis_utils.config import get_max_token_count
+from jarvis.jarvis_utils.config import get_max_token_count, get_thread_count
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -104,7 +104,7 @@ class SearchTool:
             "max_results": {
                 "type": "integer",
                 "description": "最大搜索结果数量",
-                "default": 3
+                "default": 10
             }
         },
         "required": ["query", "question"]
@@ -236,18 +236,60 @@ class SearchTool:
                     "stderr": "No search results found"
                 }
             
+            # Read webpages in parallel using ThreadPoolExecutor
             contents = []
-            for i, result in enumerate(results, 1):
+            
+            # Print starting message
+            PrettyOutput.print(f"开始并行读取 {len(results)} 个网页结果...", OutputType.INFO)
+            
+            def fetch_webpage(result_info):
+                """Function to fetch a single webpage in a separate thread"""
+                idx, result = result_info
                 try:
-                    PrettyOutput.print(f"正在读取结果 {i}/{len(results)}... {result['title']} - {result['href']}", OutputType.PROGRESS)
+                    # Removed progress print here to avoid mixed output
                     webpage_result = self.webpage_tool.execute({"url": result["href"]})
                     if webpage_result["success"]:
-                        contents.append(f"\nSource {i}: {result['href']}\n")
-                        contents.append(webpage_result["stdout"])
+                        return idx, result, webpage_result["stdout"], True
+                    return idx, result, None, False
                 except Exception as e:
-                    PrettyOutput.print(f"读取结果失败 {i}: {str(e)}", OutputType.WARNING)
-                    continue
+                    return idx, result, str(e), False
+            
+            # Use ThreadPoolExecutor for parallel processing
+            processed_results = []
+            with yaspin(text="正在并行读取网页内容...", color="cyan") as spinner:
+                with concurrent.futures.ThreadPoolExecutor(max_workers=get_thread_count()) as executor:
+                    # Submit all webpage fetch tasks
+                    future_to_result = {
+                        executor.submit(fetch_webpage, (i, result)): i 
+                        for i, result in enumerate(results)
+                    }
+                    
+                    # Collect results as they complete
+                    for future in concurrent.futures.as_completed(future_to_result):
+                        processed_results.append(future.result())
+                        # Update spinner with current progress
+                        spinner.text = f"正在并行读取网页内容... ({len(processed_results)}/{len(results)})"
+                
+                spinner.text = "网页内容读取完成"
+                spinner.ok("✅")
             
+            # Sort results by original index to maintain ordering
+            processed_results.sort(key=lambda x: x[0])
+            
+            # Print results in order and add to contents
+            PrettyOutput.section("搜索结果概览", OutputType.INFO)
+            
+            output = []
+            for idx, result, content, success in processed_results:
+                if success:
+                    output.append(f"✅ 读取结果 {idx+1}/{len(results)} 完成: {result['title']} - {result['href']}")
+                    contents.append(f"\nSource {idx+1}: {result['href']}\n")
+                    contents.append(content)
+                else:
+                    output.append(f"❌ 读取结果 {idx+1}/{len(results)} 失败: {result['title']} - {result['href']}")
+            
+            PrettyOutput.print("\n".join(output), OutputType.INFO)
+
             if not contents:
                 return {
                     "success": False,
@@ -260,10 +302,13 @@ class SearchTool:
                 analysis = self._extract_info(contents, question)
                 spinner.text = "信息提取完成"
                 spinner.ok("✅")
+
+            output = f"分析结果:\n\n{analysis}"
+            PrettyOutput.print(output, OutputType.SUCCESS)
             
             return {
                 "success": True,
-                "stdout": f"Search analysis results:\n\n{analysis}",
+                "stdout": output,
                 "stderr": ""
             }
 

jarvis/jarvis_tools/tool_generator.py

@@ -7,6 +7,7 @@ from typing import Dict, Any
 
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.utils import ct, ot
 
 class ToolGenerator:
     """工具生成器类，用于自动创建与Jarvis系统集成的新工具"""
@@ -112,8 +113,7 @@ class ToolGenerator:
         Returns:
             格式化后的提示字符串
         """
-        example_code = '''
-<TOOL>
+        example_code = ot("TOOL")+'''
 from typing import Dict, Any
 from jarvis.utils import OutputType, PrettyOutput
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -163,8 +163,7 @@ class CustomTool:
                 "stdout": "",
                 "stderr": str(e)
             }
-</TOOL>
-'''
+''' + ct("TOOL")
 
         return f'''创建一个与Jarvis系统集成的Python工具类。请遵循以下要求：
 1. 类名: {tool_name.capitalize()}Tool
@@ -183,9 +182,9 @@ class CustomTool:
 8. 仅返回Python实现代码
 9. 代码应该是完整且可直接使用的
 10. 按照以下格式输出代码：
-<TOOL>
+{ot("TOOL")}
 {example_code}
-</TOOL>
+{ct("TOOL")}
 
 示例：
 {example_code}
@@ -199,8 +198,7 @@ class CustomTool:
         Returns:
             提取到的Python代码字符串
         """
-        # 查找第一个<TOOL>和</TOOL>标签之间的内容
-        sm = re.search(r'<TOOL>(.*?)</TOOL>', response, re.DOTALL)
+        sm = re.search(ot("TOOL")+r'(.*?)'+ct("TOOL"), response, re.DOTALL)
         if sm:
             return sm.group(1)
         return ""

jarvis/jarvis_utils/__init__.py

@@ -22,3 +22,4 @@ colorama.init()
 os.environ["TOKENIZERS_PARALLELISM"] = "false"
 # 安装rich traceback处理器以获得更好的错误信息
 install_rich_traceback()
+

jarvis/jarvis_utils/config.py

@@ -11,10 +11,10 @@ import os
 """
 def get_max_token_count() -> int:
     """
-    获取API请求的最大token数量。
+    获取模型允许的最大token数量。
     
-    返回：
-        int: 最大token数量，默认为131072（128k）
+    返回:
+        int: 模型能处理的最大token数量。
     """
     return int(os.getenv('JARVIS_MAX_TOKEN_COUNT', '131072'))  # 默认128k
     
@@ -172,3 +172,67 @@ def is_confirm_before_apply_patch() -> bool:
         bool: 如果需要确认则返回True，默认为False
     """
     return os.getenv('JARVIS_CONFIRM_BEFORE_APPLY_PATCH', 'false') == 'true'
+
+def get_rag_ignored_paths() -> list:
+    """
+    获取RAG索引时需要忽略的路径列表。
+    
+    首先尝试从.jarvis/rag_ignore.txt文件中读取，
+    如果该文件不存在，则返回默认忽略列表。
+    
+    返回：
+        list: 忽略路径的列表，默认包含常见忽略路径
+    """
+    # 默认忽略路径
+    default_ignored = [
+        '.git', 
+        '__pycache__', 
+        'node_modules', 
+        '.jarvis',
+        '.jarvis-*',
+        'target',
+        'venv',
+        'env',
+        '.env',
+        '.venv',
+        '.idea',
+        '.vscode',
+        'dist',
+        'build',
+        '*.pyc',
+        '*.pyo',
+        '*.so',
+        '*.o',
+        '*.a',
+        '*.pyd',
+        '*.dll',
+        '*.exe',
+        '*.bin',
+        '*.obj',
+        '*.out',
+        '*.jpg',
+        '*.jpeg',
+        '*.png',
+        '*.gif',
+        '*.tiff',
+        '*.pdf',
+        '*.zip',
+        '*.tar',
+        '*.tar.gz',
+        '*.gz',
+        '*.bz2',
+        '*.xz',
+        '*.rar'
+    ]
+    
+    # 尝试从配置文件中读取
+    try:
+        config_path = os.path.join('.jarvis', 'rag_ignore.txt')
+        if os.path.exists(config_path):
+            with open(config_path, 'r') as f:
+                custom_ignored = [line.strip() for line in f if line.strip() and not line.startswith('#')]
+                return custom_ignored
+    except Exception:
+        pass
+        
+    return default_ignored