jarvis-ai-assistant 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

jarvis/tools/webpage.py

@@ -5,19 +5,13 @@ from ..utils import PrettyOutput, OutputType
 
 class WebpageTool:
     name = "read_webpage"
-    description = "Read webpage content, supporting extraction of main text, title, and other information"
+    description = "读取网页内容，提取标题和正文文本"
     parameters = {
         "type": "object",
         "properties": {
             "url": {
                 "type": "string",
-                "description": "URL of the webpage to read"
-            },
-            "extract_type": {
-                "type": "string",
-                "description": "Type of content to extract: 'text', 'title', or 'all'",
-                "enum": ["text", "title", "all"],
-                "default": "all"
+                "description": "需要读取的网页URL"
             }
         },
         "required": ["url"]
@@ -27,7 +21,6 @@ class WebpageTool:
         """读取网页内容"""
         try:
             url = args["url"]
-            extract_type = args.get("extract_type", "all")
             
             # 设置请求头
             headers = {
@@ -49,28 +42,21 @@ class WebpageTool:
             for script in soup(["script", "style"]):
                 script.decompose()
             
-            result = {}
-            
             # 提取标题
-            if extract_type in ["title", "all"]:
-                title = soup.title.string if soup.title else ""
-                result["title"] = title.strip() if title else "无标题"
+            title = soup.title.string if soup.title else ""
+            title = title.strip() if title else "无标题"
             
             # 提取正文
-            if extract_type in ["text", "all"]:
-                text = soup.get_text(separator='\n', strip=True)
-                lines = [line.strip() for line in text.splitlines() if line.strip()]
-                result["text"] = "\n".join(lines)
+            text = soup.get_text(separator='\n', strip=True)
+            lines = [line.strip() for line in text.splitlines() if line.strip()]
             
             # 构建输出
-            output = []
-            if "title" in result:
-                output.append(f"标题: {result['title']}")
-                output.append("")
-            
-            if "text" in result:
-                output.append("正文内容:")
-                output.append(result["text"])
+            output = [
+                f"标题: {title}",
+                "",
+                "正文内容:",
+                "\n".join(lines)
+            ]
             
             return {
                 "success": True,

jarvis/utils.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 import sys
 import time
-import threading
 from typing import Dict, Optional
 from enum import Enum
 from datetime import datetime
@@ -12,77 +11,112 @@ import os
 # 初始化colorama
 colorama.init()
 
-class Spinner:
-    """加载动画类"""
-    def __init__(self, message: str = "思考中"):
-        self.spinner_chars = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"
-        self.message = message
-        self.running = False
-        self.spinner_thread = None
-
-    def _spin(self):
-        i = 0
-        while self.running:
-            sys.stdout.write(f"\r{Fore.BLUE}{self.spinner_chars[i]} {self.message}...{Style.RESET_ALL}")
-            sys.stdout.flush()
-            time.sleep(0.1)
-            i = (i + 1) % len(self.spinner_chars)
-        sys.stdout.write("\r" + " " * (len(self.message) + 10) + "\r")
-        sys.stdout.flush()
-
-    def start(self):
-        self.running = True
-        self.spinner_thread = threading.Thread(target=self._spin)
-        self.spinner_thread.start()
-
-    def stop(self):
-        self.running = False
-        if self.spinner_thread:
-            self.spinner_thread.join()
-
 class OutputType(Enum):
-    SYSTEM = "system"
-    CODE = "code"
-    RESULT = "result"
-    ERROR = "error"
-    INFO = "info"
+    SYSTEM = "system"      # AI助手消息
+    CODE = "code"         # 代码相关
+    RESULT = "result"     # 工具执行结果
+    ERROR = "error"       # 错误信息
+    INFO = "info"         # 系统提示
+    PLANNING = "planning" # 任务规划
+    PROGRESS = "progress" # 执行进度
+    SUCCESS = "success"   # 成功信息
+    WARNING = "warning"   # 警告信息
+    DEBUG = "debug"       # 调试信息
+    USER = "user"         # 用户输入
+    TOOL = "tool"         # 工具调用
 
 class PrettyOutput:
     """美化输出类"""
+    
+    # 颜色方案 - 只使用前景色
+    COLORS = {
+        OutputType.SYSTEM: Fore.CYAN,      # 青色 - AI助手
+        OutputType.CODE: Fore.GREEN,       # 绿色 - 代码
+        OutputType.RESULT: Fore.BLUE,      # 蓝色 - 结果
+        OutputType.ERROR: Fore.RED,        # 红色 - 错误
+        OutputType.INFO: Fore.YELLOW,      # 黄色 - 提示
+        OutputType.PLANNING: Fore.MAGENTA, # 紫色 - 规划
+        OutputType.PROGRESS: Fore.WHITE,   # 白色 - 进度
+        OutputType.SUCCESS: Fore.GREEN,    # 绿色 - 成功
+        OutputType.WARNING: Fore.YELLOW,   # 黄色 - 警告
+        OutputType.DEBUG: Fore.BLUE,       # 蓝色 - 调试
+        OutputType.USER: Fore.GREEN,       # 绿色 - 用户
+        OutputType.TOOL: Fore.YELLOW,      # 黄色 - 工具
+    }
+    
+    # 图标方案
+    ICONS = {
+        OutputType.SYSTEM: "🤖",    # 机器人 - AI助手
+        OutputType.CODE: "📝",      # 记事本 - 代码
+        OutputType.RESULT: "✨",    # 闪光 - 结果
+        OutputType.ERROR: "❌",     # 错误 - 错误
+        OutputType.INFO: "ℹ️",      # 信息 - 提示
+        OutputType.PLANNING: "📋",  # 剪贴板 - 规划
+        OutputType.PROGRESS: "⏳",  # 沙漏 - 进度
+        OutputType.SUCCESS: "✅",   # 勾选 - 成功
+        OutputType.WARNING: "⚠️",   # 警告 - 警告
+        OutputType.DEBUG: "🔍",     # 放大镜 - 调试
+        OutputType.USER: "👤",      # 用户 - 用户
+        OutputType.TOOL: "🔧",      # 扳手 - 工具
+    }
+    
+    # 前缀方案
+    PREFIXES = {
+        OutputType.SYSTEM: "Assistant",
+        OutputType.CODE: "Code",
+        OutputType.RESULT: "Result",
+        OutputType.ERROR: "Error",
+        OutputType.INFO: "Info",
+        OutputType.PLANNING: "Plan",
+        OutputType.PROGRESS: "Progress",
+        OutputType.SUCCESS: "Success",
+        OutputType.WARNING: "Warning",
+        OutputType.DEBUG: "Debug",
+        OutputType.USER: "User",
+        OutputType.TOOL: "Tool",
+    }
+
     @staticmethod
     def format(text: str, output_type: OutputType, timestamp: bool = True) -> str:
-        # 颜色映射
-        colors = {
-            OutputType.SYSTEM: Fore.CYAN,
-            OutputType.CODE: Fore.GREEN,
-            OutputType.RESULT: Fore.BLUE,
-            OutputType.ERROR: Fore.RED,
-            OutputType.INFO: Fore.YELLOW
-        }
-
-        # 图标映射
-        icons = {
-            OutputType.SYSTEM: "🤖",
-            OutputType.CODE: "📝",
-            OutputType.RESULT: "✨",
-            OutputType.ERROR: "❌",
-            OutputType.INFO: "ℹ️"
-        }
-
-        color = colors.get(output_type, "")
-        icon = icons.get(output_type, "")
+        """格式化输出文本"""
+        color = PrettyOutput.COLORS.get(output_type, "")
+        icon = PrettyOutput.ICONS.get(output_type, "")
+        prefix = PrettyOutput.PREFIXES.get(output_type, "")
         
-        # 添加时间戳
-        time_str = f"[{datetime.now().strftime('%H:%M:%S')}] " if timestamp else ""
+        # 添加时间戳 - 使用白色
+        time_str = f"{Fore.WHITE}[{datetime.now().strftime('%H:%M:%S')}]{Style.RESET_ALL} " if timestamp else ""
         
         # 格式化输出
-        formatted_text = f"{color}{time_str}{icon} {text}{Style.RESET_ALL}"
+        formatted_text = f"{time_str}{color}{icon} {prefix}: {text}{Style.RESET_ALL}"
         
         return formatted_text
 
     @staticmethod
     def print(text: str, output_type: OutputType, timestamp: bool = True):
-        print(PrettyOutput.format(text, output_type, timestamp)) 
+        """打印格式化的输出"""
+        print(PrettyOutput.format(text, output_type, timestamp))
+
+    @staticmethod
+    def section(title: str, output_type: OutputType = OutputType.INFO):
+        """打印带分隔线的段落标题"""
+        width = 60
+        color = PrettyOutput.COLORS.get(output_type, "")
+        print(f"\n{color}" + "=" * width + f"{Style.RESET_ALL}")
+        PrettyOutput.print(title.center(width - 10), output_type, timestamp=False)
+        print(f"{color}" + "=" * width + f"{Style.RESET_ALL}\n")
+
+    @staticmethod
+    def print_stream(text: str, output_type: OutputType):
+        """打印流式输出，不换行"""
+        color = PrettyOutput.COLORS.get(output_type, "")
+        sys.stdout.write(f"{color}{text}{Style.RESET_ALL}")
+        sys.stdout.flush()
+
+    @staticmethod
+    def print_stream_end():
+        """流式输出结束，打印换行"""
+        sys.stdout.write("\n")
+        sys.stdout.flush()
 
 def get_multiline_input(tip: str) -> str:
     """获取多行输入"""
@@ -91,10 +125,13 @@ def get_multiline_input(tip: str) -> str:
     
     while True:
         try:
-            line = input("... " if lines else ">>> ").strip()
-            # 检查是否结束输入
+            prompt = "... " if lines else ">>> "
+            sys.stdout.write(f"{Fore.GREEN}{prompt}{Style.RESET_ALL}")
+            sys.stdout.flush()
+            
+            line = input().strip()
             if not line:
-                if not lines:  # 如果是第一行就输入空行或finish
+                if not lines:  # 如果是第一行就输入空行
                     return ""
                 break
             
@@ -102,13 +139,12 @@ def get_multiline_input(tip: str) -> str:
             
         except KeyboardInterrupt:
             PrettyOutput.print("\n输入已取消", OutputType.ERROR)
-            return ""
+            return "__interrupt__"
     
     return "\n".join(lines).strip()
 
-
 def load_env_from_file():
-    """Load environment variables from ~/.jarvis_env file"""
+    """从~/.jarvis_env加载环境变量"""
     env_file = Path.home() / ".jarvis_env"
     
     if env_file.exists():
@@ -123,6 +159,6 @@ def load_env_from_file():
                         except ValueError:
                             continue
         except Exception as e:
-            print(f"Warning: Failed to read ~/.jarvis_env: {e}")
+            PrettyOutput.print(f"Warning: Failed to read ~/.jarvis_env: {e}", OutputType.WARNING)
     
     

jarvis/zte_llm.py

@@ -3,6 +3,8 @@ import json
 import os
 from pathlib import Path
 from typing import Dict, Any, List, Optional
+
+from jarvis.utils import OutputType, PrettyOutput
 from .models import BaseModel
 
 class ZteLLM(BaseModel):
@@ -35,18 +37,34 @@ class ZteLLM(BaseModel):
         response = requests.post(
             f"{self.base_url}/{endpoint}",
             headers=headers,
-            json=data
+            json=data,
+            stream=True  # 启用流式传输
         )
         
         response.raise_for_status()
-        result = response.json()
         
-        if result["code"]["code"] != "0000":
-            raise Exception(f"API Error: {result['code']['msg']}")
-            
-        return result["bo"]
+        full_content = []
+        for line in response.iter_lines():
+            if line:
+                # 解析 SSE 数据
+                line = line.decode('utf-8')
+                if line.startswith('data: '):
+                    try:
+                        data = json.loads(line[6:])  # 跳过 "data: " 前缀
+                        if "result" in data:
+                            result = data["result"]
+                            if result:  # 只处理非空结果
+                                full_content.append(result)
+                                PrettyOutput.print_stream(result, OutputType.SYSTEM)
+                            if data.get("finishReason") == "stop":
+                                break
+                    except json.JSONDecodeError:
+                        continue
+        PrettyOutput.print_stream_end()
+        
+        return "".join(full_content)
 
-    def chat(self, messages: List[Dict[str, Any]], tools: Optional[List[Dict]] = None) -> Dict[str, Any]:
+    def chat(self, messages: List[Dict[str, Any]]) -> str:
         """Chat with ZTE LLM"""
         # Convert messages to prompt
         prompt = self._convert_messages_to_prompt(messages)
@@ -55,30 +73,15 @@ class ZteLLM(BaseModel):
         data = {
             "chatUuid": "",
             "chatName": "",
-            "stream": False,
+            "stream": True,  # 启用流式响应
             "keep": False,
             "text": prompt,
             "model": self.model
         }
         
-        # If tools are provided, add them to the prompt
-        if tools:
-            tools_desc = "Available tools:\n\n" + json.dumps(tools, indent=2, ensure_ascii=False)
-            data["text"] = tools_desc + "\n\n" + data["text"]
-        
         try:
-            result = self._make_request("chat", data)
-            
-            # Parse the response to extract potential tool calls
-            response_text = result["result"]
-            tool_calls = BaseModel.extract_tool_calls(response_text)
-            
-            return {
-                "message": {
-                    "content": response_text,
-                    "tool_calls": tool_calls
-                }
-            }
+            return self._make_request("chat", data)
+
             
         except Exception as e:
             raise Exception(f"ZTE LLM chat failed: {str(e)}")

{jarvis_ai_assistant-0.1.5.dist-info → jarvis_ai_assistant-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.5
+Version: 0.1.7
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -22,6 +22,7 @@ Requires-Dist: duckduckgo-search>=3.0.0
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: ollama>=0.1.6
 Requires-Dist: colorama>=0.4.6
+Requires-Dist: openai>=1.2.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

jarvis_ai_assistant-0.1.7.dist-info/RECORD

@@ -0,0 +1,37 @@
+jarvis/__init__.py,sha256=fleVIl0YBOVXirR9uC8oSuNk3RTpt-l5ZVRcbWcxLBM,49
+jarvis/agent.py,sha256=ePgdOCWdkw35KITvZOqcrJOGl-F4wzvrltHTw7N4p88,11014
+jarvis/main.py,sha256=4IqebMKGoBGJMSNFE6E6GQ_Ay-uuOT-BLsQPnQVW47k,6705
+jarvis/models.py,sha256=G9QkUqoyOyUx6eSqwbn3hCSwHguN0bUm7Nbd6Ql0IQs,3771
+jarvis/utils.py,sha256=3hLtv-HcBL8Ngw69cowhARuIFrjcQ6yRP3Y1o9CvtsI,5992
+jarvis/zte_llm.py,sha256=Us5D6zMdZT6SoSnUgKWQbxthGadXkulLs_oSmW5MPDo,4666
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=jMAaM43iGZiD_4ucOm9YelgcuhOjzcVv3vPtym1ePIU,208
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=itbFLk6qJ9FTjbiyj6DsQhu5NbdxVaP4g-SygRguvSc,11625
+jarvis/__pycache__/main.cpython-313.pyc,sha256=6hWRW-RG_bZrqwhSQXyhKaJBXexgLqKa-_SZzAk6_eo,8479
+jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
+jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
+jarvis/__pycache__/utils.cpython-313.pyc,sha256=k4jyAlx4tlW0MKLMLzV7OOH9zsKrK0H955kY6M2SuFU,8772
+jarvis/__pycache__/zte_llm.cpython-313.pyc,sha256=R_HT_Gc6OQelxRLRQ-yB8Tf0sYHcb18dh9E4RF6ivbE,5662
+jarvis/tools/__init__.py,sha256=tH6YaApKpqs1YSjEllRzOZZUd-OTFKSZ5oA0zs7HdSE,297
+jarvis/tools/base.py,sha256=zK-JteBwj9d2BD_7BSAp-zD7wgJbVBppAWyfFxaPObI,4114
+jarvis/tools/file_ops.py,sha256=zTksx45NZm3iz9itN5iQGZ8DoxnSeTHdrnF08_ix7PU,3770
+jarvis/tools/search.py,sha256=XTFMGVKLkRLQhu668Gqn69jPdTEP0mEibbMR9lpbFyE,4092
+jarvis/tools/shell.py,sha256=7q52lA3slf0TdjBjP1bkwugoO5pB0eqh6cYjAzAXNtI,2547
+jarvis/tools/sub_agent.py,sha256=QJYWdil1goZfo95CQkuhkjZBl-Rx6UvyeFMiGnDyjOA,2832
+jarvis/tools/webpage.py,sha256=DBnh9gye6oL2nVjzU2SU4Jupsck8x9g9On-rbjV6d8Y,2386
+jarvis/tools/__pycache__/__init__.cpython-313.pyc,sha256=2NrOP5yRdPF8hk3i8lT7pxn7IkHGfolP3m0g9BjJYMs,443
+jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=A5jYC0Yfptk31eLbRrauPi49ymP0v-Hq9Swbaqq1IwA,6462
+jarvis/tools/__pycache__/file_ops.cpython-313.pyc,sha256=LbOp31JUzoRp5XVazy1VBqCQhpFg0qQYmVftFVY90V4,3628
+jarvis/tools/__pycache__/python_script.cpython-313.pyc,sha256=8JpryqTovEiTvBlWAK1KjZmPvHUuPc9GT9rTXBEQoJc,6693
+jarvis/tools/__pycache__/rag.cpython-313.pyc,sha256=JH6-PSZRMKAvTZqCwlRXJGClxYXNMs-vetU0q7hBLz0,6064
+jarvis/tools/__pycache__/search.cpython-313.pyc,sha256=WGNyExgaC3N_QixCzpcRBCKU2c52rkavaKtGWC3x_28,5254
+jarvis/tools/__pycache__/shell.cpython-313.pyc,sha256=QMaLUc1MtZXWod3msv_x7iMq2IybwMwz1OoaKsbm6U4,3271
+jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=qzNLnQxqFZoAiYOPH4GrCGxaQVs-QWfTLspW5a1Xa6c,3144
+jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRvoYmi7A0GzxYkzU-C4Wfhs5qW_HBqs,2271
+jarvis/tools/__pycache__/user_input.cpython-313.pyc,sha256=JjTFOhObKsKF4Pn8KBRuKfV1_Ssj083fjU7Mfc_5z7c,2531
+jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
+jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=BjzSfnNzsKCrLETCcWjt32lNDLzwnjqcVGg4JfWd9OM,3008
+jarvis_ai_assistant-0.1.7.dist-info/METADATA,sha256=6nDJNmJ6WSnu12NTX58R4X4EHvQeE3wtoOpg4BkypbU,3719
+jarvis_ai_assistant-0.1.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.7.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.7.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.7.dist-info/RECORD,,

jarvis/.jarvis

@@ -1 +0,0 @@
-- 查看当前git仓库状态，如果有未提交的变更，自动根据当前仓库的文件修改内容总结生成一个git commit，然后执行git push推送到远端仓库，全流程不要询问用户

jarvis/tools/python_script.py

@@ -1,150 +0,0 @@
-import os
-import time
-import subprocess
-import sys
-import pkgutil
-from pathlib import Path
-from typing import Dict, Any, Optional
-from ..utils import PrettyOutput, OutputType
-
-class PythonScript:
-    """Python脚本管理类"""
-    SCRIPTS_DIR = "/tmp/ai_scripts"
-
-    @classmethod
-    def init_scripts_dir(cls):
-        """初始化脚本目录"""
-        Path(cls.SCRIPTS_DIR).mkdir(parents=True, exist_ok=True)
-
-    @classmethod
-    def generate_script_path(cls, name: Optional[str] = None) -> str:
-        """生成脚本文件路径"""
-        if name:
-            safe_name = "".join(c for c in name if c.isalnum() or c in "._- ")
-            filename = f"{int(time.time())}_{safe_name}.py"
-        else:
-            filename = f"{int(time.time())}_script.py"
-        return str(Path(cls.SCRIPTS_DIR) / filename)
-
-class PythonScriptTool:
-    name = "execute_python"
-    description = """Execute Python code and return the results.
-    Notes:
-    1. Use print() to output results
-    2. Automatic dependency management
-    3. Code saved to temporary file
-    """
-    parameters = {
-        "type": "object",
-        "properties": {
-            "code": {
-                "type": "string",
-                "description": "Python code to execute"
-            },
-            "dependencies": {
-                "type": "array",
-                "items": {"type": "string"},
-                "description": "Python package dependencies",
-                "default": []
-            },
-            "name": {
-                "type": "string",
-                "description": "Script name",
-                "default": ""
-            }
-        },
-        "required": ["code"]
-    }
-
-    @staticmethod
-    def _is_builtin_package(package_name: str) -> bool:
-        package_name = package_name.split("==")[0].strip()
-        if hasattr(sys.modules, package_name) or package_name in sys.stdlib_module_names:
-            return True
-        try:
-            return pkgutil.find_spec(package_name) is not None
-        except Exception:
-            return False
-
-    def execute(self, args: Dict) -> Dict[str, Any]:
-        """执行Python代码"""
-        try:
-            code = args["code"]
-            dependencies = args.get("dependencies", [])
-            script_name = args.get("name", "")
-            
-            # 初始化脚本目录
-            PythonScript.init_scripts_dir()
-            
-            # 生成脚本路径
-            script_path = PythonScript.generate_script_path(script_name)
-            
-            # 安装依赖
-            missing_deps = []
-            for dep in dependencies:
-                if not self._is_builtin_package(dep):
-                    missing_deps.append(dep)
-            
-            if missing_deps:
-                PrettyOutput.print("正在安装依赖...", OutputType.INFO)
-                try:
-                    subprocess.run(
-                        [sys.executable, "-m", "pip", "install"] + missing_deps,
-                        check=True,
-                        capture_output=True,
-                        text=True
-                    )
-                    PrettyOutput.print("依赖安装完成", OutputType.INFO)
-                except subprocess.CalledProcessError as e:
-                    return {
-                        "success": False,
-                        "error": f"依赖安装失败: {e.stderr}"
-                    }
-            
-            # 写入脚本文件
-            with open(script_path, 'w', encoding='utf-8') as f:
-                f.write(code)
-            
-            # 执行脚本
-            PrettyOutput.print(f"执行脚本: {script_path}", OutputType.INFO)
-            result = subprocess.run(
-                [sys.executable, script_path],
-                capture_output=True,
-                text=True
-            )
-            
-            # 构建输出
-            output = []
-            
-            # 添加脚本信息
-            output.append(f"脚本路径: {script_path}")
-            if dependencies:
-                output.append(f"依赖项: {', '.join(dependencies)}")
-            output.append("")
-            
-            # 添加执行结果
-            if result.stdout:
-                output.append("输出:")
-                output.append(result.stdout)
-            
-            # 添加错误信息（如果有）
-            if result.stderr:
-                output.append("错误:")
-                output.append(result.stderr)
-            
-            # 添加返回码
-            output.append(f"返回码: {result.returncode}")
-            
-            return {
-                "success": result.returncode == 0,
-                "stdout": "\n".join(output),
-                "stderr": result.stderr,
-                "return_code": result.returncode,
-                "script_path": script_path
-            }
-            
-        except Exception as e:
-            return {
-                "success": False,
-                "error": f"执行Python代码失败: {str(e)}"
-            }

jarvis_ai_assistant-0.1.5.dist-info/RECORD

@@ -1,38 +0,0 @@
-jarvis/.jarvis,sha256=S4ZMmLqlVLHAPmnwHFQ3vYt0gnDFp-KQRH4okBh8Hpw,209
-jarvis/__init__.py,sha256=ArINt8uI8UveWy3H6iPntzn05IR-PEq6P7qb8dzmPjc,49
-jarvis/agent.py,sha256=YdtSBqwGl8xKN9xWIqYcAgxsLmXKyXzLcJ1D-Oie9fE,5536
-jarvis/main.py,sha256=egbfAhkHUGHI5J3j5ZMwb9EgOXE7ikJef-4lqFj0-mA,6063
-jarvis/models.py,sha256=NWXMsgnw6AHkfk22tvmGOjcyVhC74Us-t3T6rUF4R20,4186
-jarvis/utils.py,sha256=-5tugkGABZdi2QXVStVtCQfag9CRTfCsGUvReitmHUM,3816
-jarvis/zte_llm.py,sha256=ygUeGd8WGm0qrnkt5TrCLnaf5ZFZ0tdfwrA7nrByt4g,4504
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=viNe2ZOgBWfBtJpzh5J0oAhQphAwJi4m2ogxgBgCt6s,208
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=7Ae1sOwF6W2HCGjzDToWdCOYFiS47EUqDZVCz2OxH9Q,7125
-jarvis/__pycache__/main.cpython-313.pyc,sha256=lNKrL5HZQahMGpv5cOVriWZoNOScMWRk_toYD7X-Xeo,7444
-jarvis/__pycache__/models.cpython-313.pyc,sha256=fot2VOV0lgODg4b_WuD-kkq-g7uZGLuZlYXiljlW13U,6350
-jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
-jarvis/__pycache__/utils.cpython-313.pyc,sha256=m9l4R4U1vCG2WkXXNWCTbSASRiS6tWYEWK8pu29EtY4,7175
-jarvis/__pycache__/zte_llm.cpython-313.pyc,sha256=PcS-P2H96EyelWcPleCIcu0lGYYoLrdi9VSZgg2cooA,5340
-jarvis/tools/__init__.py,sha256=NZqKPfIbBxeM5FOrN1ssQQ4S9gVXNCSVXa3ov73AyEk,356
-jarvis/tools/base.py,sha256=I_XIwxb6hCH82qCVPESbDNC93Dj0G3KVSZRXSh6mHIM,6516
-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/search.py,sha256=dyJmeP_s2tWv5KQejOl-TuVF12B6SXViiXEyTemD1Wo,1412
-jarvis/tools/shell.py,sha256=VhEqEdoUGIRW6CT6F0YNMAlzJxpHcsKS9hSS0VC3ezw,2644
-jarvis/tools/sub_agent.py,sha256=vC495JBAEMgHbAkHzGlYhIPA5scKekwhy1RViNcwqy8,2683
-jarvis/tools/webpage.py,sha256=UTEomu5j7jbOw8c5az2jsjv5E7LeokWKj1QahvZO7xc,3077
-jarvis/tools/__pycache__/__init__.cpython-313.pyc,sha256=Qng3CpxPy9R_1hTjSSr_qLXHtlI8GneyYX6JHwUtmHE,642
-jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=wXXQs94_MAEuHVhFx80q_IgWBRuo1I4Dc7wz3G9ZMo4,8544
-jarvis/tools/__pycache__/file_ops.cpython-313.pyc,sha256=bawv11xhWSj5wCtW0QeJLI-InhUBUXaSkogq6rZzvTQ,3636
-jarvis/tools/__pycache__/python_script.cpython-313.pyc,sha256=8JpryqTovEiTvBlWAK1KjZmPvHUuPc9GT9rTXBEQoJc,6693
-jarvis/tools/__pycache__/rag.cpython-313.pyc,sha256=JH6-PSZRMKAvTZqCwlRXJGClxYXNMs-vetU0q7hBLz0,6064
-jarvis/tools/__pycache__/search.cpython-313.pyc,sha256=VX9zztOwIsPCkYwev0A0XJGyu4Tr0PQcQkbbqx8vfB0,1870
-jarvis/tools/__pycache__/shell.cpython-313.pyc,sha256=UUciwt3nW3mkHrMI7WvCASQ-YLwVx2N68RzQq97nL74,2972
-jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=p6vgjqdHW7ZAJYaiDh6F39CMndeA3tutbxXB9cwc6xY,3003
-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.5.dist-info/METADATA,sha256=pZCtN2L3EmGQMvpbxA6vED4RHJIWdJqXC2JnaD0whEw,3690
-jarvis_ai_assistant-0.1.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.5.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.5.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.5.dist-info/RECORD,,