jarvis-ai-assistant 0.1.93__py3-none-any.whl → 0.1.97__py3-none-any.whl

jarvis/tools/registry.py

@@ -39,7 +39,7 @@ class ToolRegistry:
             if file_path.name in ["base.py", "__init__.py", "registry.py"]:
                 continue
                 
-            self.register_tool_by_file(file_path)
+            self.register_tool_by_file(str(file_path))
 
     def _load_external_tools(self):
         """从~/.jarvis_tools加载外部工具"""
@@ -53,7 +53,7 @@ class ToolRegistry:
             if file_path.name == "__init__.py":
                 continue
                 
-            self.register_tool_by_file(file_path)
+            self.register_tool_by_file(str(file_path))
 
     def register_tool_by_file(self, file_path: str):
         """从指定文件加载并注册工具
@@ -65,19 +65,19 @@ class ToolRegistry:
             bool: 是否成功加载工具
         """
         try:
-            file_path = Path(file_path).resolve()  # 获取绝对路径
-            if not file_path.exists() or not file_path.is_file():
-                PrettyOutput.print(f"文件不存在: {file_path}", OutputType.ERROR)
+            p_file_path = Path(file_path).resolve()  # 获取绝对路径
+            if not p_file_path.exists() or not p_file_path.is_file():
+                PrettyOutput.print(f"File does not exist: {p_file_path}", OutputType.ERROR)
                 return False
                 
             # 动态导入模块
-            module_name = file_path.stem
-            spec = importlib.util.spec_from_file_location(module_name, file_path)
+            module_name = p_file_path.stem
+            spec = importlib.util.spec_from_file_location(module_name, p_file_path) # type: ignore
             if not spec or not spec.loader:
-                PrettyOutput.print(f"无法加载模块: {file_path}", OutputType.ERROR)
+                PrettyOutput.print(f"Failed to load module: {p_file_path}", OutputType.ERROR)
                 return False
                 
-            module = importlib.util.module_from_spec(spec)
+            module = importlib.util.module_from_spec(spec) # type: ignore
             sys.modules[module_name] = module  # 添加到 sys.modules 以支持相对导入
             spec.loader.exec_module(module)
             
@@ -101,18 +101,18 @@ class ToolRegistry:
                         parameters=tool_instance.parameters,
                         func=tool_instance.execute
                     )
-                    PrettyOutput.print(f"从 {file_path} 加载工具: {tool_instance.name}: {tool_instance.description}", OutputType.SUCCESS)
+                    PrettyOutput.print(f"Loaded tool from {p_file_path}: {tool_instance.name}: {tool_instance.description}", OutputType.SUCCESS)
                     tool_found = True
                     break
                     
             if not tool_found:
-                PrettyOutput.print(f"文件中未找到有效的工具类: {file_path}", OutputType.WARNING)
+                PrettyOutput.print(f"No valid tool class found in the file: {p_file_path}", OutputType.WARNING)
                 return False
                 
             return True
             
         except Exception as e:
-            PrettyOutput.print(f"加载工具失败 {file_path.name}: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"Failed to load tool from {p_file_path.name}: {str(e)}", OutputType.ERROR)
             return False
 
     def register_tool(self, name: str, description: str, parameters: Dict, func: Callable):
@@ -149,16 +149,16 @@ class ToolRegistry:
                 try:
                     args = json.loads(args)
                 except json.JSONDecodeError:
-                    PrettyOutput.print(f"工具参数格式无效: {name}", OutputType.ERROR)
+                    PrettyOutput.print(f"Invalid tool parameters format: {name}", OutputType.ERROR)
                     return ""
 
             # 显示工具调用信息
-            PrettyOutput.section(f"执行工具: {name}", OutputType.TOOL)
+            PrettyOutput.section(f"Executing tool: {name}", OutputType.TOOL)
             if isinstance(args, dict):
                 for key, value in args.items():
-                    PrettyOutput.print(f"参数: {key} = {value}", OutputType.DEBUG)
+                    PrettyOutput.print(f"Parameter: {key} = {value}", OutputType.DEBUG)
             else:
-                PrettyOutput.print(f"参数: {args}", OutputType.DEBUG)
+                PrettyOutput.print(f"Parameter: {args}", OutputType.DEBUG)
             
             # 执行工具调用
             result = self.execute_tool(name, args)
@@ -169,58 +169,58 @@ class ToolRegistry:
                 stderr = result.get("stderr", "")
                 output_parts = []
                 if stdout:
-                    output_parts.append(f"输出:\n{stdout}")
+                    output_parts.append(f"Output:\n{stdout}")
                 if stderr:
-                    output_parts.append(f"错误:\n{stderr}")
+                    output_parts.append(f"Error:\n{stderr}")
                 output = "\n\n".join(output_parts)
-                output = "没有输出和错误" if not output else output
-                PrettyOutput.section("执行成功", OutputType.SUCCESS)
+                output = "No output and error" if not output else output
+                PrettyOutput.section("Execution successful", OutputType.SUCCESS)
                 
                 # 如果输出超过4k字符，使用大模型总结
                 if len(output) > self.max_context_length:
                     try:
-                        PrettyOutput.print("输出较长，正在总结...", OutputType.PROGRESS)
+                        PrettyOutput.print("Output is too long, summarizing...", OutputType.PROGRESS)
                         model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
                         
                         # 如果输出超过最大上下文长度，只取最后部分
                         max_len = self.max_context_length
                         if len(output) > max_len:
                             output_to_summarize = output[-max_len:]
-                            truncation_notice = f"\n(注意: 由于输出过长，仅总结最后{max_len}字符)"
+                            truncation_notice = f"\n(Note: Due to the length of the output, only the last {max_len} characters are summarized)"
                         else:
                             output_to_summarize = output
                             truncation_notice = ""
 
-                        prompt = f"""请总结以下工具执行结果，提取关键信息和重要结果。注意：
-1. 保留所有重要的数值、路径、错误信息等关键数据
-2. 保持结果的准确性
-3. 用简洁的语言描述主要内容
-4. 如果有错误信息，确保包含在总结中
+                        prompt = f"""Please summarize the execution result of the following tool, extracting key information and important results. Note:
+1. Keep all important numerical values, paths, error information, etc.
+2. Maintain the accuracy of the results
+3. Describe the main content in concise language
+4. If there is error information, ensure it is included in the summary
 
-工具名称: {name}
-执行结果:
+Tool name: {name}
+Execution result:
 {output_to_summarize}
 
-请提供总结："""
+Please provide a summary:"""
 
-                        summary = model.chat(prompt)
-                        output = f"""--- 原始输出较长，以下是总结 ---{truncation_notice}
+                        summary = model.chat_until_success(prompt)
+                        output = f"""--- Original output is too long, here is the summary ---{truncation_notice}
 
 {summary}
 
---- 总结结束 ---"""
+--- Summary ends ---"""
                         
                     except Exception as e:
-                        PrettyOutput.print(f"总结失败: {str(e)}", OutputType.ERROR)
-                        output = f"输出较长 ({len(output)} 字符)，建议查看原始输出。\n前300字符预览:\n{output[:300]}..."
+                        PrettyOutput.print(f"Summary failed: {str(e)}", OutputType.ERROR)
+                        output = f"Output is too long ({len(output)} characters), it is recommended to view the original output.\nPreview of the first 300 characters:\n{output[:300]}..."
             
             else:
                 error_msg = result["error"]
-                output = f"执行失败: {error_msg}"
-                PrettyOutput.section("执行失败", OutputType.ERROR)
+                output = f"Execution failed: {error_msg}"
+                PrettyOutput.section("Execution failed", OutputType.ERROR)
                 
             return output
             
         except Exception as e:
-            PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"Tool execution failed: {str(e)}", OutputType.ERROR)
             return f"Tool call failed: {str(e)}"

jarvis/tools/search.py

@@ -58,26 +58,26 @@ def bing_search(query):
             return summaries
             
     except Exception as error:
-        PrettyOutput.print(f"搜索出错: {str(error)}", OutputType.ERROR)
+        PrettyOutput.print(f"Search error: {str(error)}", OutputType.ERROR)
         return None
 
 class SearchTool:
     name = "search"
-    description = "使用Bing搜索引擎搜索信息，并根据问题提取关键信息"
+    description = "Use Bing search engine to search for information, and extract key information based on the question"
     parameters = {
         "type": "object",
         "properties": {
             "query": {
                 "type": "string",
-                "description": "搜索关键词"
+                "description": "Search keywords"
             },
             "question": {
                 "type": "string",
-                "description": "需要回答的具体问题，用于从搜索结果中提取相关信息"
+                "description": "Specific question to answer, used to extract relevant information from search results"
             },
             "max_results": {
                 "type": "integer",
-                "description": "最大搜索结果数量",
+                "description": "Maximum number of search results",
                 "default": 3
             }
         },
@@ -85,12 +85,12 @@ class SearchTool:
     }
 
     def __init__(self):
-        """初始化搜索工具，需要传入语言模型用于信息提取"""
+        """Initialize the search tool, need to pass in the language model for information extraction"""
         self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         self.webpage_tool = WebpageTool()
 
     def _search(self, query: str, max_results: int) -> List[Dict]:
-        """执行搜索请求"""
+        """Execute search request"""
         try:
             results = bing_search(query)
             if not results:
@@ -106,76 +106,76 @@ class SearchTool:
                 })
             return formatted_results
         except Exception as e:
-            PrettyOutput.print(f"搜索请求失败: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"Search request failed: {str(e)}", OutputType.ERROR)
             return []
 
     def _extract_info(self, contents: List[str], question: str) -> str:
-        """使用语言模型从网页内容中提取关键信息"""
-        prompt = f"""请根据以下搜索结果内容，回答问题：{question}
+        """Use language model to extract key information from web content"""
+        prompt = f"""Please answer the question based on the following search results: {question}
 
-搜索结果内容：
+Search results content:
 {'-' * 40}
 {''.join(contents)}
 {'-' * 40}
 
-请提供一个简洁、准确的答案，重点关注与问题直接相关的信息。如果搜索结果中没有相关信息，请明确说明。
-回答时注意：
-1. 保持客观性，只基于搜索结果提供信息
-2. 如果不同来源有冲突，请指出差异
-3. 适当引用信息来源
-4. 如果信息不完整或不确定，请说明"""
+Please provide a concise and accurate answer, focusing on information directly related to the question. If there is no relevant information in the search results, please clearly state that.
+When answering, pay attention to:
+1. Maintain objectivity, providing information based solely on search results
+2. If there are conflicts between different sources, point out the differences
+3. Appropriately cite information sources
+4. If the information is incomplete or uncertain, please explain"""
 
         try:
-            response = self.model.chat(prompt)
+            response = self.model.chat_until_success(prompt)
             return response
         except Exception as e:
-            return f"信息提取失败: {str(e)}"
+            return f"Information extraction failed: {str(e)}"
 
     def execute(self, args: Dict) -> Dict[str, Any]:
-        """执行搜索并提取信息"""
+        """Execute search and extract information"""
         try:
             query = args["query"]
             question = args["question"]
             max_results = args.get("max_results", 3)
             
-            # 打印搜索信息
-            PrettyOutput.print(f"搜索查询: {query}", OutputType.INFO)
-            PrettyOutput.print(f"相关问题: {question}", OutputType.INFO)
+            # Print search information
+            PrettyOutput.print(f"Search query: {query}", OutputType.INFO)
+            PrettyOutput.print(f"Related question: {question}", OutputType.INFO)
             
             # 获取搜索结果
             results = self._search(query, max_results)
             if not results:
                 return {
                     "success": False,
-                    "error": "未能获取任何搜索结果"
+                    "error": "No search results found"
                 }
             
             # 收集网页内容
             contents = []
             for i, result in enumerate(results, 1):
                 try:
-                    PrettyOutput.print(f"正在读取第 {i}/{len(results)} 个结果... {result['title']} - {result['href']}", OutputType.PROGRESS)
+                    PrettyOutput.print(f"Reading result {i}/{len(results)}... {result['title']} - {result['href']}", OutputType.PROGRESS)
                     webpage_result = self.webpage_tool.execute({"url": result["href"]})
                     if webpage_result["success"]:
-                        contents.append(f"\n来源 {i}：{result['href']}\n")
+                        contents.append(f"\nSource {i}: {result['href']}\n")
                         contents.append(webpage_result["stdout"])
                 except Exception as e:
-                    PrettyOutput.print(f"读取结果 {i} 失败: {str(e)}", OutputType.WARNING)
+                    PrettyOutput.print(f"Failed to read result {i}: {str(e)}", OutputType.WARNING)
                     continue
             
             if not contents:
                 return {
                     "success": False,
-                    "error": "未能获取任何有效的搜索结果"
+                    "error": "No valid search results found"
                 }
             
-            # 提取信息
-            PrettyOutput.print("正在分析搜索结果...", OutputType.PROGRESS)
+            # Extract information
+            PrettyOutput.print("Analyzing search results...", OutputType.PROGRESS)
             analysis = self._extract_info(contents, question)
             
             return {
                 "success": True,
-                "stdout": f"搜索分析结果：\n\n{analysis}",
+                "stdout": f"Search analysis results:\n\n{analysis}",
                 "stderr": ""
             }
 
@@ -190,22 +190,22 @@ def main():
     import argparse
     import sys
     
-    parser = argparse.ArgumentParser(description='Bing搜索工具')
-    parser.add_argument('query', help='搜索关键词')
-    parser.add_argument('--max', type=int, default=5, help='最大结果数量(默认5)')
-    parser.add_argument('--url-only', action='store_true', help='只显示URL')
+    parser = argparse.ArgumentParser(description='Bing search tool')
+    parser.add_argument('query', help='Search keywords')
+    parser.add_argument('--max', type=int, default=5, help='Maximum number of results (default 5)')
+    parser.add_argument('--url-only', action='store_true', help='Only display URL')
     args = parser.parse_args()
     
     try:
-        PrettyOutput.print(f"正在搜索: {args.query}", OutputType.INFO)
+        PrettyOutput.print(f"Searching: {args.query}", OutputType.INFO)
         
         results = bing_search(args.query)
         
         if not results:
-            PrettyOutput.print("未找到搜索结果", OutputType.WARNING)
+            PrettyOutput.print("No search results found", OutputType.WARNING)
             sys.exit(1)
             
-        PrettyOutput.print(f"\n找到 {len(results)} 条结果:", OutputType.INFO)
+        PrettyOutput.print(f"\nFound {len(results)} results:", OutputType.INFO)
         
         for i, result in enumerate(results[:args.max], 1):
             PrettyOutput.print(f"\n{'-'*50}", OutputType.INFO)
@@ -213,15 +213,15 @@ def main():
                 PrettyOutput.print(f"{i}. {result['href']}", OutputType.INFO)
             else:
                 PrettyOutput.print(f"{i}. {result['title']}", OutputType.INFO)
-                PrettyOutput.print(f"链接: {result['href']}", OutputType.INFO)
+                PrettyOutput.print(f"Link: {result['href']}", OutputType.INFO)
                 if result['abstract']:
-                    PrettyOutput.print(f"摘要: {result['abstract']}", OutputType.INFO)
+                    PrettyOutput.print(f"Abstract: {result['abstract']}", OutputType.INFO)
                     
     except KeyboardInterrupt:
-        PrettyOutput.print("\n搜索已取消", OutputType.WARNING)
+        PrettyOutput.print("\nSearch cancelled", OutputType.WARNING)
         sys.exit(1)
     except Exception as e:
-        PrettyOutput.print(f"执行出错: {str(e)}", OutputType.ERROR)
+        PrettyOutput.print(f"Execution error: {str(e)}", OutputType.ERROR)
         sys.exit(1)
 
 if __name__ == "__main__":

jarvis/tools/shell.py

@@ -8,7 +8,7 @@ from jarvis.utils import OutputType, PrettyOutput
 
 class ShellTool:
     name = "execute_shell"
-    description = """执行shell命令并返回结果"""
+    description = """Execute shell command and return result"""
 
     parameters = {
         "type": "object",
@@ -23,41 +23,41 @@ class ShellTool:
 
 
     def _escape_command(self, cmd: str) -> str:
-        """转义命令中的特殊字符"""
+        """Escape special characters in command"""
         return cmd.replace("'", "'\"'\"'")
 
     def execute(self, args: Dict) -> Dict[str, Any]:
-        """执行shell命令"""
+        """Execute shell command"""
         try:
             command = args["command"]
             
-            # 生成临时文件名
+            # Generate temporary file name
             output_file = os.path.join(tempfile.gettempdir(), f"jarvis_shell_{os.getpid()}.log")
             
-            # 转义命令中的特殊字符
+            # Escape special characters in command
             escaped_command = self._escape_command(command)
             
-            # 修改命令以使用script
+            # Modify command to use script
             tee_command = f"script -q -c '{escaped_command}' {output_file}"
             
-            PrettyOutput.print(f"执行命令: {command}", OutputType.INFO)
+            PrettyOutput.print(f"Execute command: {command}", OutputType.INFO)
             
-            # 执行命令
+            # Execute command
             return_code = os.system(tee_command)
             
-            # 读取输出文件
+            # Read output file
             try:
                 with open(output_file, 'r', encoding='utf-8', errors='replace') as f:
                     output = f.read()
-                    # 移除script命令添加的头尾
+                    # Remove header and footer added by script
                     if output:
                         lines = output.splitlines()
                         if len(lines) > 2:
                             output = "\n".join(lines[1:-1])
             except Exception as e:
-                output = f"读取输出文件失败: {str(e)}"
+                output = f"Failed to read output file: {str(e)}"
             finally:
-                # 清理临时文件
+                # Clean up temporary file
                 Path(output_file).unlink(missing_ok=True)
             
             return {
@@ -68,7 +68,7 @@ class ShellTool:
             }
                 
         except Exception as e:
-            # 确保清理临时文件
+            # Ensure temporary file is cleaned up
             if 'output_file' in locals():
                 Path(output_file).unlink(missing_ok=True)
             PrettyOutput.print(str(e), OutputType.ERROR)

jarvis/tools/sub_agent.py

@@ -7,32 +7,32 @@ from jarvis.utils import OutputType, PrettyOutput
 
 class SubAgentTool:
     name = "create_sub_agent"
-    description = "创建一个子代理来处理特定任务，子代理会生成任务总结报告"
+    description = "Create a sub-agent to handle specific tasks, the sub-agent will generate a task summary report"
     parameters = {
         "type": "object",
         "properties": {
             "agent_name": {
                 "type": "string",
-                "description": "子代理的名称"
+                "description": "Sub-agent name"
             },
             "task": {
                 "type": "string",
-                "description": "需要完成的具体任务"
+                "description": "Specific task to complete"
             },
             "context": {
                 "type": "string",
-                "description": "任务相关的上下文信息",
+                "description": "Context information related to the task",
                 "default": ""
             },
             "goal": {
                 "type": "string",
-                "description": "任务的完成目标",
+                "description": "Completion goal of the task",
                 "default": ""
             },
             "files": {
                 "type": "array",
                 "items": {"type": "string"},
-                "description": "相关文件路径列表，用于文件问答和处理",
+                "description": "Related file path list, used for file question answering and processing",
                 "default": []
             }
         },
@@ -41,7 +41,7 @@ class SubAgentTool:
 
 
     def execute(self, args: Dict) -> Dict[str, Any]:
-        """创建并运行子代理"""
+        """Create and run sub-agent"""
         try:
             agent_name = args["agent_name"]
             task = args["task"]
@@ -49,28 +49,28 @@ class SubAgentTool:
             goal = args.get("goal", "")
             files = args.get("files", [])
 
-            PrettyOutput.print(f"创建子代理: {agent_name}", OutputType.INFO)
+            PrettyOutput.print(f"Create sub-agent: {agent_name}", OutputType.INFO)
 
-            # 构建任务描述
+            # Build task description
             task_description = task
             if context:
-                task_description = f"上下文信息:\n{context}\n\n任务:\n{task}"
+                task_description = f"Context information:\n{context}\n\nTask:\n{task}"
             if goal:
-                task_description += f"\n\n完成目标:\n{goal}"
+                task_description += f"\n\nCompletion goal:\n{goal}"
 
-            # 创建子代理
+            # Create sub-agent
             sub_agent = Agent(
                 name=agent_name,
                 is_sub_agent=True
             )
 
-            # 运行子代理，传入文件列表
-            PrettyOutput.print("子代理开始执行任务...", OutputType.INFO)
+            # Run sub-agent, pass file list
+            PrettyOutput.print("Sub-agent starts executing task...", OutputType.INFO)
             result = sub_agent.run(task_description, file_list=files)
 
             return {
                 "success": True,
-                "stdout": f"子代理任务完成\n\n{result}",
+                "stdout": f"Sub-agent task completed\n\n{result}",
                 "stderr": ""
             }
 
@@ -78,5 +78,5 @@ class SubAgentTool:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {
                 "success": False,
-                "error": f"子代理执行失败: {str(e)}"
+                "error": f"Sub-agent execution failed: {str(e)}"
             }