jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.7.6__py3-none-any.whl

jarvis/jarvis_tools/execute_script.py

@@ -4,7 +4,6 @@ import tempfile
 from pathlib import Path
 from typing import Any, Dict, List
 
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class ScriptTool:
@@ -14,18 +13,13 @@ class ScriptTool:
     """
 
     name = "execute_script"
-    description = (
-        "执行脚本并返回结果，支持任意解释器。"
-        + "注意：由于模型上下文长度限制，请避免在脚本中输出大量信息，应该使用rg过滤输出。"
-        + "与virtual_tty不同，此工具会创建一个临时的脚本文件，并使用脚本命令执行脚本，不具备交互式操作的能力，"
-        + "适用于需要执行脚本并获取结果的场景。不适合需要交互式操作的场景（如：ssh连接、sftp传输、gdb/dlv调试等）。"
-    )
+    description = "执行脚本并返回结果，支持任意解释器。建议使用rg过滤大量输出。"
     parameters = {
         "type": "object",
         "properties": {
             "interpreter": {
                 "type": "string",
-                "description": "脚本解释器: 如bash, python3, expect, perl, ruby等任意解释器。如需直接执行shell命令, 可使用bash作为解释器",
+                "description": "脚本解释器（如bash、python3、perl等）。执行shell命令可使用bash。",
             },
             "script_content": {"type": "string", "description": "要执行的脚本内容"},
         },
@@ -115,8 +109,72 @@ class ScriptTool:
                     f"script -q -c '{interpreter} {script_path}' {output_file}"
                 )
 
-                # Execute command and capture return code
-                os.system(tee_command)
+                # Execute command with optional timeout in non-interactive mode
+                from jarvis.jarvis_utils.config import get_script_execution_timeout, is_non_interactive
+                import subprocess
+
+                timed_out = False
+                if is_non_interactive():
+                    proc = None
+                    try:
+                        proc = subprocess.Popen(tee_command, shell=True)
+                        try:
+                            proc.wait(timeout=get_script_execution_timeout())
+                        except subprocess.TimeoutExpired:
+                            timed_out = True
+                            try:
+                                proc.terminate()
+                                proc.wait(timeout=2)
+                            except subprocess.TimeoutExpired:
+                                try:
+                                    proc.kill()
+                                    proc.wait()
+                                except Exception:
+                                    pass
+                            except Exception:
+                                try:
+                                    proc.kill()
+                                    proc.wait()
+                                except Exception:
+                                    pass
+                    except Exception as e:
+                        # 确保进程被关闭
+                        if proc is not None:
+                            try:
+                                proc.terminate()
+                                proc.wait(timeout=1)
+                            except Exception:
+                                try:
+                                    proc.kill()
+                                    proc.wait()
+                                except Exception:
+                                    pass
+                        print(f"❌ {str(e)}")
+                        # Attempt to read any partial output if available
+                        try:
+                            output = self.get_display_output(output_file)
+                        except Exception as ee:
+                            output = f"读取输出文件失败: {str(ee)}"
+                        return {
+                            "success": False,
+                            "stdout": output,
+                            "stderr": f"执行脚本失败: {str(e)}",
+                        }
+                    finally:
+                        # 确保进程和文件描述符被关闭
+                        if proc is not None:
+                            try:
+                                if proc.stdin:
+                                    proc.stdin.close()
+                                if proc.stdout:
+                                    proc.stdout.close()
+                                if proc.stderr:
+                                    proc.stderr.close()
+                            except Exception:
+                                pass
+                else:
+                    # Execute command and capture return code
+                    os.system(tee_command)
 
                 # Read and process output file
                 try:
@@ -125,12 +183,19 @@ class ScriptTool:
                 except Exception as e:
                     output = f"读取输出文件失败: {str(e)}"
 
-                # Return successful result
-                return {
-                    "success": True,
-                    "stdout": output,
-                    "stderr": "",
-                }
+                # Return result (handle timeout in non-interactive mode)
+                if is_non_interactive() and timed_out:
+                    return {
+                        "success": False,
+                        "stdout": output,
+                        "stderr": f"执行超时（超过{get_script_execution_timeout()}秒），进程已被终止（非交互模式）。",
+                    }
+                else:
+                    return {
+                        "success": True,
+                        "stdout": output,
+                        "stderr": "",
+                    }
 
             finally:
                 # Clean up temporary files
@@ -138,7 +203,7 @@ class ScriptTool:
                 Path(output_file).unlink(missing_ok=True)
 
         except Exception as e:
-            PrettyOutput.print(str(e), OutputType.ERROR)
+            print(f"❌ {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
     def execute(self, args: Dict) -> Dict[str, Any]:
@@ -166,14 +231,7 @@ class ScriptTool:
             return self._execute_script_with_interpreter(interpreter, script_content)
 
         except Exception as e:
-            PrettyOutput.print(str(e), OutputType.ERROR)
+            print(f"❌ {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
 
-if __name__ == "__main__":
-    script_tool = ScriptTool()
-    PrettyOutput.print(
-        script_tool.get_display_output("/home/wangmaobin/code/Jarvis/a.txt"),
-        OutputType.CODE,
-        lang="text",
-    )

jarvis/jarvis_tools/file_analyzer.py

@@ -4,14 +4,11 @@ from typing import Any, Dict
 
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class FileAnalyzerTool:
     name = "file_analyzer"
-    description = (
-        """分析文件内容并提取关键信息。支持的文件：文本文件、word文档、pdf文件、图片"""
-    )
+    description = "分析文件内容并提取关键信息。支持文本、word、pdf、图片等格式。"
     parameters = {
         "type": "object",
         "properties": {
@@ -54,9 +51,9 @@ class FileAnalyzerTool:
                 else:
                     missing_files.append(file_path)
             if missing_files:
-                PrettyOutput.print(
-                    "以下文件不存在:\n" + "\n".join(f"  - {p}" for p in missing_files),
-                    OutputType.WARNING,
+                missing_list = '\n'.join(f'  - {p}' for p in missing_files)
+                print(
+                    f"⚠️ 以下文件不存在:\n{missing_list}"
                 )
 
             if not valid_files:
@@ -83,7 +80,7 @@ class FileAnalyzerTool:
             try:
                 upload_result = platform.upload_files(valid_files)
                 if not upload_result:
-                    PrettyOutput.print("文件上传失败", OutputType.ERROR)
+                    print("❌ 文件上传失败")
                     return {
                         "success": False,
                         "stdout": "",
@@ -91,7 +88,7 @@ class FileAnalyzerTool:
                     }
 
             except Exception as e:
-                PrettyOutput.print(f"文件上传失败: {str(e)}", OutputType.ERROR)
+                print(f"❌ 文件上传失败: {str(e)}")
                 return {
                     "success": False,
                     "stdout": "",

jarvis/jarvis_tools/generate_new_tool.py

@@ -3,19 +3,11 @@ from pathlib import Path
 from typing import Any, Dict
 
 from jarvis.jarvis_utils.config import get_data_dir
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class generate_new_tool:
     name = "generate_new_tool"
-    description = """
-    生成并注册新的Jarvis工具。该工具会在用户数据目录下创建新的工具文件，
-    并自动注册到当前的工具注册表中。适用场景：1. 需要创建新的自定义工具；
-    2. 扩展Jarvis功能；3. 自动化重复性操作；4. 封装特定领域的功能。
-    重要提示：
-    1. `tool_name` 参数必须与 `tool_code` 中定义的 `name` 属性完全一致。
-    2. 在编写工具代码时，应尽量将工具执行的过程和结果打印出来，方便追踪工具的执行状态。
-    """
+    description = "生成并注册新的Jarvis工具。在用户数据目录下创建工具文件并自动注册。注意：tool_name必须与tool_code中的name属性完全一致。"
 
     parameters = {
         "type": "object",
@@ -45,8 +37,8 @@ class generate_new_tool:
                 tools_dir.mkdir(parents=True, exist_ok=True)
                 return True
             except Exception as e:
-                PrettyOutput.print(
-                    f"无法创建工具目录 {tools_dir}: {e}", OutputType.ERROR
+                print(
+                    f"❌ 无法创建工具目录 {tools_dir}: {e}"
                 )
                 return False
 
@@ -129,9 +121,8 @@ class generate_new_tool:
                         success_message += "\n已成功注册到当前会话的工具注册表中"
                     else:
                         # 注册失败，删除已创建的文件
-                        PrettyOutput.print(
-                            f"注册工具 '{tool_name}' 失败，正在删除文件...",
-                            OutputType.WARNING,
+                        print(
+                            f"⚠️ 注册工具 '{tool_name}' 失败，正在删除文件..."
                         )
                         if tool_file_path.exists():
                             tool_file_path.unlink()
@@ -141,8 +132,8 @@ class generate_new_tool:
                             "stderr": "工具文件已生成，但注册失败。文件已被删除。",
                         }
                 else:
-                    PrettyOutput.print(
-                        "未找到工具注册表，无法自动注册工具", OutputType.WARNING
+                    print(
+                        "⚠️ 未找到工具注册表，无法自动注册工具"
                     )
                     success_message += "\n注册到当前会话失败，可能需要重新启动Jarvis"
 
@@ -173,7 +164,9 @@ class generate_new_tool:
                         __import__(pkg)
                     except ImportError:
 
-                        import subprocess, sys, os
+                        import subprocess
+                        import sys
+                        import os
                         from shutil import which as _which
                         # 优先使用 uv 安装（先查 venv 内 uv，再查 PATH 中 uv），否则回退到 python -m pip
                         if sys.platform == "win32":
@@ -189,14 +182,14 @@ class generate_new_tool:
 
 
             except Exception as e:
-                PrettyOutput.print(f"依赖检查/安装失败: {str(e)}", OutputType.WARNING)
+                print(f"⚠️ 依赖检查/安装失败: {str(e)}")
 
             return {"success": True, "stdout": success_message, "stderr": ""}
 
         except Exception as e:
             # 如果发生异常，删除已创建的文件并返回失败响应
             error_msg = f"生成工具失败: {str(e)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
+            print(f"❌ {error_msg}")
 
             # 删除已创建的文件
             if tool_file_path and tool_file_path.exists():
@@ -205,8 +198,8 @@ class generate_new_tool:
                     tool_file_path.unlink()
 
                 except Exception as delete_error:
-                    PrettyOutput.print(
-                        f"删除文件失败: {str(delete_error)}", OutputType.ERROR
+                    print(
+                        f"❌ 删除文件失败: {str(delete_error)}"
                     )
 
             return {"success": False, "stdout": "", "stderr": error_msg}