jarvis-ai-assistant 0.1.183__py3-none-any.whl → 0.1.185__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.183"
+__version__ = "0.1.185"

jarvis/jarvis_agent/__init__.py

@@ -4,6 +4,8 @@ import datetime
 import platform
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
+from jarvis.jarvis_platform.base import BasePlatform
+
 # 第三方库导入
 from yaspin import yaspin  # type: ignore
 
@@ -166,7 +168,9 @@ class Agent:
         multiline_inputer: Optional[Callable[[str], str]] = None,
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
+        files: List[str] = [],
     ):
+        self.files = files
         """初始化Jarvis Agent实例
 
         参数:
@@ -218,8 +222,9 @@ class Agent:
             multiline_inputer if multiline_inputer else get_multiline_input
         )
 
+        # 如果有上传文件，自动禁用方法论
         self.use_methodology = (
-            use_methodology if use_methodology is not None else is_use_methodology()
+            False if files else (use_methodology if use_methodology is not None else is_use_methodology())
         )
         self.use_analysis = (
             use_analysis if use_analysis is not None else is_use_analysis()
@@ -766,27 +771,31 @@ arguments:
         try:
             set_agent(self.name, self)
 
+            for handler in self.input_handler:
+                user_input, _ = handler(user_input, self)
+
             self.prompt = f"{user_input}"
 
-            if self.first and self.use_methodology:
-                # 先尝试上传方法轮
-                platform = self.model if hasattr(self.model, "upload_files") else None
-                if platform and upload_methodology(platform):
-                    self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
-                else:
-                    msg = user_input
-                    for handler in self.input_handler:
-                        msg, _ = handler(msg, self)
-                    # 上传失败则回退到本地加载
-                    self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+            if self.first:
+                # 如果有上传文件，先上传文件
+                if self.files and isinstance(self.model, BasePlatform) and hasattr(self.model, "upload_files"):
+                    self.model.upload_files(self.files)
+                    self.prompt = f"{user_input}\n\n已上传{len(self.files)}个文件到平台"
+                
+                # 如果启用方法论且没有上传文件，上传方法论
+                elif self.use_methodology:
+                    platform = self.model if hasattr(self.model, "upload_files") else None
+                    if platform and upload_methodology(platform):
+                        self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
+                    else:
+                        # 上传失败则回退到本地加载
+                        self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(user_input, self.get_tool_registry())}"
 
                 self.first = False
 
             self.conversation_length = get_context_token_count(self.prompt)
             while True:
                 try:
-                    # 如果对话历史长度超过限制，在提示中添加提醒
-
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
                     self.conversation_length += get_context_token_count(

jarvis/jarvis_agent/file_input_handler.py

@@ -95,7 +95,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     if files:
         with yaspin(text="正在读取文件...", color="cyan") as spinner:
             old_prompt = prompt
-            result = FileOperationTool().execute({"operation":"read","files": files})
+            result = FileOperationTool().execute({"operation":"read","files": files, "agent": agent})
             if result["success"]:
                 spinner.text = "文件读取完成"
                 spinner.ok("✅")

jarvis/jarvis_platform/tongyi.py

@@ -1,19 +1,25 @@
 # -*- coding: utf-8 -*-
 import json
 import os
-from typing import Any, Dict, Generator, List, Tuple
+import time
 import uuid
+from typing import Any, Dict, Generator, List, Tuple
 
 import requests
+from yaspin import yaspin
+from yaspin.spinners import Spinners
 
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
 
 
 class TongyiPlatform(BasePlatform):
     """Tongyi platform implementation"""
 
+    # Supported image formats
+    IMAGE_EXTENSIONS = {".jpg", ".jpeg", ".png", ".gif", ".webp", ".bmp", ".tiff"}
+
     platform_name = "tongyi"
 
     def __init__(self):
@@ -25,7 +31,8 @@ class TongyiPlatform(BasePlatform):
         self.msg_id = ""
         self.model_name = ""
         self.uploaded_file_info = []
-
+        self.system_message = ""  # System message for initialization
+        self.first_chat = True  # Flag for first chat
 
     def _get_base_headers(self):
         return {
@@ -46,12 +53,12 @@ class TongyiPlatform(BasePlatform):
             "Referer": "https://www.tongyi.com/qianwen",
             "Accept-Encoding": "gzip, deflate, br, zstd",
             "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
-            "Cookie": self.cookies
+            "Cookie": self.cookies,
         }
 
     def set_model_name(self, model_name: str):
         """Set model name
-        
+
         Args:
             model_name: Model name to use
         """
@@ -67,37 +74,63 @@ class TongyiPlatform(BasePlatform):
         headers = self._get_base_headers()
 
         headers["accept"] = "text/event-stream"
-        
+
         # Prepare contents array with message
-        contents = [{
-            "content": message,
-            "contentType": "text",
-            "role": "user",
-            "ext": {
-                "searchType": "",
-                "pptGenerate": False,
-                "deepThink": False,
-                "deepResearch": False
+        contents = [
+            {
+                "content": message,
+                "contentType": "text",
+                "role": "user",
+                "ext": {
+                    "searchType": "",
+                    "pptGenerate": False,
+                    "deepThink": False,
+                    "deepResearch": False,
+                },
             }
-        }]
+        ]
+
+        # Add system message if it's first chat
+        if self.first_chat and self.system_message:
+            contents.insert(
+                0,
+                {
+                    "content": self.system_message,
+                    "contentType": "text",
+                    "role": "system",
+                    "ext": {
+                        "searchType": "",
+                        "pptGenerate": False,
+                        "deepThink": False,
+                        "deepResearch": False,
+                    },
+                },
+            )
+            self.first_chat = False
 
         # Add uploaded files to contents if available and clear after use
         if self.uploaded_file_info:
             for file_info in self.uploaded_file_info:
-                contents.append({
-                    "role": "user",
-                    "contentType": "file",
-                    "content": file_info["url"],
-                    "ext": {
-                        "fileSize": file_info.get("fileSize", 0),
-                        "batchId": file_info.get("batchId", ""),
-                        "docId": file_info.get("docId", "")
+                # Determine content type based on fileKey extension
+                file_ext = os.path.splitext(file_info["fileKey"])[1].lower()
+                is_image = file_ext in self.IMAGE_EXTENSIONS
+                
+                contents.append(
+                    {
+                        "role": "user",
+                        "contentType": "image" if is_image else "file",
+                        "content": file_info["url"],
+                        "ext": {
+                            "fileSize": file_info.get("fileSize", 0),
+                            "batchId": file_info.get("batchId", ""),
+                            "docId": file_info.get("docId", ""),
+                        },
                     }
-                })
+                )
             # Clear uploaded file info after using it
             self.uploaded_file_info = []
 
-        payload = {
+        payload: Dict[str, Any] = {
             "model": "",
             "action": "next",
             "mode": "chat",
@@ -115,13 +148,18 @@ class TongyiPlatform(BasePlatform):
                 "specifiedModel": "",
                 "deepThink": True if self.model_name == "Thinking" else False,
                 "deepResearch": False,
-                "fileUploadBatchId": self.uploaded_file_info[0]["batchId"] if self.uploaded_file_info else ""
+                "fileUploadBatchId": self.uploaded_file_info[0]["batchId"]
+                if self.uploaded_file_info
+                else "",
             },
-            "contents": contents
+            "contents": contents,
         }
 
         try:
-            response = while_success(lambda: requests.post(url, headers=headers, json=payload, stream=True), sleep_time=5)
+            response = while_success(
+                lambda: requests.post(url, headers=headers, json=payload, stream=True),
+                sleep_time=5,
+            )
             if response.status_code != 200:
                 raise Exception(f"HTTP {response.status_code}: {response.text}")
             msg_id = ""
@@ -132,7 +170,7 @@ class TongyiPlatform(BasePlatform):
             for line in response.iter_lines():
                 if not line:
                     continue
-                line_str = line.decode('utf-8')
+                line_str = line.decode("utf-8")
                 if not line_str.startswith("data: "):
                     continue
 
@@ -143,7 +181,7 @@ class TongyiPlatform(BasePlatform):
                         msg_id = data["msgId"]
                     if "sessionId" in data:
                         session_id = data["sessionId"]
-                    
+
                     if "contents" in data and len(data["contents"]) > 0:
                         for content in data["contents"]:
                             if content.get("contentType") == "think":
@@ -151,13 +189,17 @@ class TongyiPlatform(BasePlatform):
                                     yield "<think>\n\n"
                                     in_thinking = True
                                 if content.get("incremental"):
-                                    tmp_content = json.loads(content.get("content"))["content"]
+                                    tmp_content = json.loads(content.get("content"))[
+                                        "content"
+                                    ]
                                     thinking_content += tmp_content
                                     yield tmp_content
                                 else:
-                                    tmp_content = json.loads(content.get("content"))["content"]
+                                    tmp_content = json.loads(content.get("content"))[
+                                        "content"
+                                    ]
                                     if len(thinking_content) < len(tmp_content):
-                                        yield tmp_content[len(thinking_content):]
+                                        yield tmp_content[len(thinking_content) :]
                                         thinking_content = tmp_content
                                     else:
                                         # thinking_content = "aaa</thi"
@@ -171,7 +213,9 @@ class TongyiPlatform(BasePlatform):
                                         # print("--------------------------------")
                                         # print(tmp_content)
                                         # print("--------------------------------")
-                                        yield "\r\n</think>\n"[len(thinking_content)-len(tmp_content):]
+                                        yield "\r\n</think>\n"[
+                                            len(thinking_content) - len(tmp_content) :
+                                        ]
                                         thinking_content = tmp_content
                                     in_thinking = False
                             elif content.get("contentType") == "text":
@@ -184,10 +228,9 @@ class TongyiPlatform(BasePlatform):
                                 else:
                                     tmp_content = content.get("content")
                                     if len(text_content) < len(tmp_content):
-                                        yield tmp_content[len(text_content):]
+                                        yield tmp_content[len(text_content) :]
                                         text_content = tmp_content
 
-
                 except json.JSONDecodeError:
                     continue
 
@@ -198,10 +241,10 @@ class TongyiPlatform(BasePlatform):
 
         except Exception as e:
             raise Exception(f"Chat failed: {str(e)}")
-            
+
     def _get_upload_token(self) -> Dict[str, Any]:
         """Get upload token from Tongyi API
-        
+
         Returns:
             Dict[str, Any]: Upload token information including accessId, bucketName, etc.
         """
@@ -210,161 +253,205 @@ class TongyiPlatform(BasePlatform):
         payload = {}
 
         try:
-            response = while_success(lambda: requests.post(url, headers=headers, json=payload), sleep_time=5)
+            response = while_success(
+                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+            )
             if response.status_code != 200:
                 raise Exception(f"HTTP {response.status_code}: {response.text}")
-                
+
             result = response.json()
             if not result.get("success"):
                 raise Exception(f"Failed to get upload token: {result.get('errorMsg')}")
-                
+
             return result.get("data", {})
-            
+
         except Exception as e:
             raise Exception(f"Failed to get upload token: {str(e)}")
-            
 
     def upload_files(self, file_list: List[str]) -> bool:
         """Upload files to Tongyi platform and get download links
-        
+
         Args:
             file_list: List of file paths to upload
-            
+
         Returns:
             List[Dict[str, str]]: List of dictionaries containing file info and download URLs
         """
         try:
             upload_token = self._get_upload_token()
             uploaded_files = []
-            
+
             for file_path in file_list:
-                if not os.path.exists(file_path):
-                    PrettyOutput.print(f"File not found: {file_path}", OutputType.ERROR)
-                    return False
-                    
-                # Get file name and content type
                 file_name = os.path.basename(file_path)
-                content_type = self._get_content_type(file_path)
-                
-                # Prepare form data
-                form_data = {
-                    'OSSAccessKeyId': upload_token['accessId'],
-                    'policy': upload_token['policy'],
-                    'signature': upload_token['signature'],
-                    'key': f"{upload_token['dir']}{file_name}",
-                    'dir': upload_token['dir'],
-                    'success_action_status': '200'
-                }
-                
-                # Prepare files
-                files = {
-                    'file': (file_name, open(file_path, 'rb'), content_type)
-                }
-                
-                # Upload file
-                response = requests.post(
-                    upload_token['host'],
-                    data=form_data,
-                    files=files
-                )
-                
-                if response.status_code != 200:
-                    PrettyOutput.print(f"Failed to upload {file_name}: HTTP {response.status_code}", OutputType.ERROR)
-                    return False
-                    
-                uploaded_files.append({
-                    'fileKey': file_name,
-                    'fileType': 'file',
-                    'dir': upload_token['dir']
-                })
-            
-            # Get download links for uploaded files
-            url = "https://api.tongyi.com/dialog/downloadLink/batch"
-            headers = self._get_base_headers()
-            payload = {
-                "fileKeys": [f['fileKey'] for f in uploaded_files],
-                "fileType": "file",
-                "dir": upload_token['dir']
-            }
-            
-            response = requests.post(url, headers=headers, json=payload)
-            if response.status_code != 200:
-                PrettyOutput.print(f"Failed to get download links: HTTP {response.status_code}", OutputType.ERROR)
-                return False
-                
-            result = response.json()
-            if not result.get("success"):
-                PrettyOutput.print(f"Failed to get download links: {result.get('errorMsg')}", OutputType.ERROR)
-                return False
-                
-            # Add files to chat
-            self.uploaded_file_info = result.get("data", {}).get("results", [])
-            for file_info in self.uploaded_file_info:
-                add_url = "https://api.tongyi.com/assistant/api/chat/file/add"
-                add_payload = {
-                    "workSource": "chat",
-                    "terminal": "web",
-                    "workCode": "0",
-                    "channel": "home",
-                    "workType": "file",
-                    "module": "uploadhistory",
-                    "workName": file_info["fileKey"],
-                    "workId": file_info["docId"],
-                    "workResourcePath": file_info["url"],
-                    "sessionId": "",
-                    "batchId": str(uuid.uuid4()).replace('-', '')[:32],  # Generate random batchId
-                    "fileSize": os.path.getsize(file_path)
-                }
-                
-                add_response = requests.post(add_url, headers=headers, json=add_payload)
-                if add_response.status_code != 200:
-                    PrettyOutput.print(f"Failed to add file to chat: HTTP {add_response.status_code}", OutputType.ERROR)
-                    continue
-                    
-                add_result = add_response.json()
-                if not add_result.get("success"):
-                    PrettyOutput.print(f"Failed to add file to chat: {add_result.get('errorMsg')}", OutputType.ERROR)
-                    continue
-                    
-                file_info.update(add_result.get("data", {}))
-                
+                with yaspin(Spinners.dots, text=f"上传文件 {file_name}") as spinner:
+                    try:
+                        if not os.path.exists(file_path):
+                            spinner.text = f"文件不存在: {file_path}"
+                            spinner.fail("❌")
+                            return False
+
+                        # Get file name and content type
+                        content_type = self._get_content_type(file_path)
+
+                        spinner.text = f"准备上传文件: {file_name}"
+
+                        # Prepare form data
+                        form_data = {
+                            "OSSAccessKeyId": upload_token["accessId"],
+                            "policy": upload_token["policy"],
+                            "signature": upload_token["signature"],
+                            "key": f"{upload_token['dir']}{file_name}",
+                            "dir": upload_token["dir"],
+                            "success_action_status": "200",
+                        }
+
+                        # Prepare files
+                        files = {
+                            "file": (file_name, open(file_path, "rb"), content_type)
+                        }
+
+                        spinner.text = f"正在上传文件: {file_name}"
+
+                        # Upload file
+                        response = requests.post(
+                            upload_token["host"], data=form_data, files=files
+                        )
+
+                        if response.status_code != 200:
+                            spinner.text = (
+                                f"上传失败 {file_name}: HTTP {response.status_code}"
+                            )
+                            spinner.fail("❌")
+                            return False
+
+                        # Determine file type based on extension
+                        file_ext = os.path.splitext(file_path)[1].lower()
+                        is_image = file_ext in self.IMAGE_EXTENSIONS
+                        
+                        uploaded_files.append(
+                            {
+                                "fileKey": file_name,
+                                "fileType": "image" if is_image else "file",
+                                "dir": upload_token["dir"],
+                            }
+                        )
+
+                        spinner.text = f"获取下载链接: {file_name}"
+
+                        # Get download links for uploaded files
+                        url = "https://api.tongyi.com/dialog/downloadLink/batch"
+                        headers = self._get_base_headers()
+                        payload = {
+                            "fileKeys": [f["fileKey"] for f in uploaded_files],
+                            "fileType": "image" if any(f["fileType"] == "image" for f in uploaded_files) else "file",
+                            "dir": upload_token["dir"],
+                        }
+
+                        response = requests.post(url, headers=headers, json=payload)
+                        if response.status_code != 200:
+                            spinner.text = f"获取下载链接失败: HTTP {response.status_code}"
+                            spinner.fail("❌")
+                            return False
+
+                        result = response.json()
+                        if not result.get("success"):
+                            spinner.text = f"获取下载链接失败: {result.get('errorMsg')}"
+                            spinner.fail("❌")
+                            return False
+
+                        # Add files to chat
+                        self.uploaded_file_info = result.get("data", {}).get(
+                            "results", []
+                        )
+                        for file_info in self.uploaded_file_info:
+                            spinner.text = f"添加文件到对话: {file_name}"
+                            add_url = (
+                                "https://api.tongyi.com/assistant/api/chat/file/add"
+                            )
+                            add_payload = {
+                                "workSource": "chat",
+                                "terminal": "web",
+                                "workCode": "0",
+                                "channel": "home",
+                                "workType": "file",
+                                "module": "uploadhistory",
+                                "workName": file_info["fileKey"],
+                                "workId": file_info["docId"],
+                                "workResourcePath": file_info["url"],
+                                "sessionId": "",
+                                "batchId": str(uuid.uuid4()).replace("-", "")[
+                                    :32
+                                ],  # Generate random batchId
+                                "fileSize": os.path.getsize(file_path),
+                            }
+
+                            add_response = requests.post(
+                                add_url, headers=headers, json=add_payload
+                            )
+                            if add_response.status_code != 200:
+                                spinner.text = (
+                                    f"添加文件到对话失败: HTTP {add_response.status_code}"
+                                )
+                                spinner.fail("❌")
+                                continue
+
+                            add_result = add_response.json()
+                            if not add_result.get("success"):
+                                spinner.text = (
+                                    f"添加文件到对话失败: {add_result.get('errorMsg')}"
+                                )
+                                spinner.fail("❌")
+                                continue
+
+                            file_info.update(add_result.get("data", {}))
+
+                        spinner.text = f"文件 {file_name} 上传成功"
+                        spinner.ok("✅")
+                        time.sleep(1)  # 短暂暂停以便用户看到成功状态
+
+                    except Exception as e:
+                        spinner.text = f"上传文件 {file_name} 时出错: {str(e)}"
+                        spinner.fail("❌")
+                        return False
             return True
-            
+
         except Exception as e:
             PrettyOutput.print(f"Error uploading files: {str(e)}", OutputType.ERROR)
             return False
-            
+
     def _get_content_type(self, file_path: str) -> str:
         """Get content type for file
-        
+
         Args:
             file_path: Path to file
-            
+
         Returns:
             str: Content type
         """
         ext = os.path.splitext(file_path)[1].lower()
         content_types = {
-            '.txt': 'text/plain',
-            '.md': 'text/markdown',
-            '.doc': 'application/msword',
-            '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            '.xls': 'application/vnd.ms-excel',
-            '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            '.pdf': 'application/pdf',
-            '.png': 'image/png',
-            '.jpg': 'image/jpeg',
-            '.jpeg': 'image/jpeg',
-            '.gif': 'image/gif',
-            '.mp4': 'video/mp4',
-            '.mp3': 'audio/mpeg',
-            '.wav': 'audio/wav'
+            ".txt": "text/plain",
+            ".md": "text/markdown",
+            ".doc": "application/msword",
+            ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            ".xls": "application/vnd.ms-excel",
+            ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            ".pdf": "application/pdf",
+            ".epub": "application/epub+zip",
+            ".mobi": "application/x-mobipocket-ebook",
+            ".jpg": "image/jpeg",
+            ".jpeg": "image/jpeg",
+            ".png": "image/png",
+            ".gif": "image/gif",
+            ".webp": "image/webp",
+            ".bmp": "image/bmp",
+            ".tiff": "image/tiff",
         }
-        return content_types.get(ext, 'application/octet-stream')
+        return content_types.get(ext, "application/octet-stream")
 
     def name(self) -> str:
         """Get platform name
-        
+
         Returns:
             str: Platform name
         """
@@ -372,7 +459,7 @@ class TongyiPlatform(BasePlatform):
 
     def delete_chat(self) -> bool:
         """Delete chat history
-        
+
         Returns:
             bool: True if deletion successful, False otherwise
         """
@@ -381,18 +468,22 @@ class TongyiPlatform(BasePlatform):
 
         url = "https://api.tongyi.com/dialog/session/delete"
         headers = self._get_base_headers()
-        payload = {
-            "sessionId": self.session_id
-        }
+        payload: Dict[str, Any] = {"sessionId": self.session_id}
 
         try:
-            response = while_success(lambda: requests.post(url, headers=headers, json=payload), sleep_time=5)
+            response = while_success(
+                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+            )
             if response.status_code != 200:
-                PrettyOutput.print(f"Failed to delete chat: HTTP {response.status_code}", OutputType.ERROR)
+                PrettyOutput.print(
+                    f"Failed to delete chat: HTTP {response.status_code}",
+                    OutputType.ERROR,
+                )
                 return False
             self.request_id = ""
             self.session_id = ""
             self.msg_id = ""
+            self.first_chat = True  # Reset first_chat flag
             return True
         except Exception as e:
             PrettyOutput.print(f"Error deleting chat: {str(e)}", OutputType.ERROR)
@@ -400,7 +491,7 @@ class TongyiPlatform(BasePlatform):
 
     def set_system_message(self, message: str):
         """Set system message
-        
+
         Args:
             message: System message to set
         """
@@ -408,7 +499,7 @@ class TongyiPlatform(BasePlatform):
 
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get available model list
-        
+
         Returns:
             List[Tuple[str, str]]: List of (model_id, model_name) tuples
         """
@@ -421,7 +512,7 @@ class TongyiPlatform(BasePlatform):
 
     def support_web(self) -> bool:
         """Check if platform supports web functionality
-        
+
         Returns:
             bool: True if web is supported, False otherwise
         """

jarvis/jarvis_tools/edit_file.py

@@ -157,7 +157,7 @@ class FileSearchReplaceTool:
 
                 if file_exists and agent:
                     files = agent.get_user_data("files")
-                    if not files or files.get(file_path, None) is None:
+                    if not files or file_path not in files:
                         return {
                             "success": False,
                             "stdout": "",
@@ -169,6 +169,21 @@ class FileSearchReplaceTool:
                     success, temp_content = fast_edit(file_path, changes, spinner)
                     if not success:
                         success, temp_content = slow_edit(file_path, yaml.safe_dump(changes, allow_unicode=True), spinner)
+                        if not success:
+                            spinner.text = f"文件 {file_path} 处理失败"
+                            spinner.fail("❌")
+                            return {
+                                "success": False,
+                                "stdout": "",
+                                "stderr": temp_content
+                            }
+                        else:
+                            spinner.text = f"文件 {file_path} 内容生成完成"
+                            spinner.ok("✅")
+                    else:
+                        spinner.text = f"文件 {file_path} 内容生成完成"
+                        spinner.ok("✅")
+
 
                 # 只有当所有替换操作都成功时，才写回文件
                 if success and (temp_content != original_content or not file_exists):
@@ -184,13 +199,6 @@ class FileSearchReplaceTool:
                     stdout_message = f"文件 {file_path} {action} 完成"
                     stdout_messages.append(stdout_message)
                     PrettyOutput.print(stdout_message, OutputType.SUCCESS)
-                elif success:
-                    stdout_message = f"文件 {file_path} 没有找到需要替换的内容"
-                    stdout_messages.append(stdout_message)
-                    PrettyOutput.print(stdout_message, OutputType.INFO)
-                else:
-                    stdout_message = f"文件 {file_path} 修改失败"
-                    stdout_messages.append(stdout_message)
                 
             except Exception as e:
                 stderr_message = f"处理文件 {file_path} 时出错: {str(e)}"
@@ -344,7 +352,7 @@ def slow_edit(filepath: str, patch_content: str, spinner: Yaspin) -> Tuple[bool,
                 if upload_success:
                     response = model.chat_until_success(main_prompt)
                 else:
-                    return False, ""
+                    return False, "文件上传失败"
 
             # 解析差异化补丁
             diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"),
@@ -357,17 +365,17 @@ def slow_edit(filepath: str, patch_content: str, spinner: Yaspin) -> Tuple[bool,
                     "replace": match.group(2).strip()
                 })
 
-            success, modified_content = fast_edit(filepath, patches, spinner)
+            success, modified_content_or_err = fast_edit(filepath, patches, spinner)
             if success:
-                return True, modified_content
+                return True, modified_content_or_err
         spinner.text = f"文件 {filepath} 修改失败"
         spinner.fail("❌")
-        return False, ""
+        return False, f"文件修改失败: {modified_content_or_err}"
 
     except Exception as e:
         spinner.text = f"文件修改失败: {str(e)}"
         spinner.fail("❌")
-        return False, ""
+        return False, f"文件修改失败: {str(e)}"
 
 
 def fast_edit(filepath: str, patches: List[Dict[str,str]], spinner: Yaspin) -> Tuple[bool, str]:
@@ -410,6 +418,7 @@ def fast_edit(filepath: str, patches: List[Dict[str,str]], spinner: Yaspin) -> T
     modified_content = file_content
     patch_count = 0
     success = True
+    err_msg = ""
     for patch in patches:
         search_text = patch["search"]
         replace_text = patch["replace"]
@@ -419,6 +428,7 @@ def fast_edit(filepath: str, patches: List[Dict[str,str]], spinner: Yaspin) -> T
             # 如果有多处，报错
             if modified_content.count(search_text) > 1:
                 success = False
+                err_msg = f"搜索文本 {search_text} 在文件中存在多处，请检查补丁内容"
                 break
             # 应用替换
             modified_content = modified_content.replace(
@@ -426,10 +436,11 @@ def fast_edit(filepath: str, patches: List[Dict[str,str]], spinner: Yaspin) -> T
             spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
         else:
             success = False
+            err_msg = f"搜索文本 {search_text} 在文件中不存在，请检查补丁内容"
             break
     if not success:
         revert_file(filepath)
-        return False, ""
+        return False, err_msg
 
 
     spinner.text = f"文件 {filepath} 修改完成，应用了 {patch_count} 个补丁"

jarvis/jarvis_tools/generate_new_tool.py

@@ -88,18 +88,9 @@ class generate_new_tool:
                     "stderr": f"工具 '{tool_name}' 已经存在于 {tool_file_path}"
                 }
             
-            # 验证并处理工具代码
-            processed_code, error_msg = self._validate_and_process_code(tool_name, tool_code)
-            if error_msg:
-                return {
-                    "success": False,
-                    "stdout": "",
-                    "stderr": error_msg
-                }
-            
             # 写入工具文件
             with open(tool_file_path, "w", encoding="utf-8") as f:
-                f.write(processed_code)
+                f.write(tool_code)
             
             # 注册新工具到当前的工具注册表
             success_message = f"工具 '{tool_name}' 已成功生成在 {tool_file_path}"
@@ -152,87 +143,4 @@ class generate_new_tool:
                 "success": False,
                 "stdout": "",
                 "stderr": error_msg
-            }
-    
-    def _validate_and_process_code(self, tool_name: str, tool_code: str) -> Tuple[str, str]:
-        """
-        验证并处理工具代码
-        
-        参数:
-            tool_name: 工具名称
-            tool_code: 工具代码
-            
-        返回:
-            Tuple[str, str]: (处理后的代码, 错误信息)
-        """
-        # 检查工具代码中是否包含类定义
-        if f"class {tool_name}" not in tool_code:
-            # 尝试找到任何类定义
-            class_match = re.search(r"class\s+(\w+)", tool_code)
-            if class_match:
-                old_class_name = class_match.group(1)
-                # 替换类名为工具名
-                tool_code = tool_code.replace(f"class {old_class_name}", f"class {tool_name}")
-                tool_code = tool_code.replace(f'name = "{old_class_name}"', f'name = "{tool_name}"')
-            else:
-                # 没有找到类定义，返回错误
-                return "", f"工具代码中缺少类定义 'class {tool_name}'"
-        
-        # 检查工具代码中是否包含必要的属性和方法
-        missing_components = []
-        
-        if f'name = "{tool_name}"' not in tool_code and f"name = '{tool_name}'" not in tool_code:
-            # 尝试查找任何name属性并修复
-            name_match = re.search(r'name\s*=\s*["\'](\w+)["\']', tool_code)
-            if name_match:
-                old_name = name_match.group(1)
-                tool_code = re.sub(r'name\s*=\s*["\'](\w+)["\']', f'name = "{tool_name}"', tool_code)
-            else:
-                missing_components.append(f"name = \"{tool_name}\"")
-        
-        if "description = " not in tool_code:
-            missing_components.append("description 属性")
-        
-        if "parameters = " not in tool_code:
-            missing_components.append("parameters 属性")
-        
-        if "def execute(self, args:" not in tool_code:
-            missing_components.append("execute 方法")
-        
-        if "def check(" not in tool_code:
-            # 添加默认的check方法
-            class_match = re.search(r"class\s+(\w+).*?:", tool_code, re.DOTALL)
-            if class_match:
-                indent = "    "  # 默认缩进
-                # 找到类定义后的第一个属性
-                first_attr_match = re.search(r"class\s+(\w+).*?:(.*?)(\w+\s*=)", tool_code, re.DOTALL)
-                if first_attr_match:
-                    # 获取属性前的缩进
-                    attr_indent = re.search(r"\n([ \t]*)\w+\s*=", first_attr_match.group(2))
-                    if attr_indent:
-                        indent = attr_indent.group(1)
-                
-                check_method = f"\n{indent}@staticmethod\n{indent}def check() -> bool:\n{indent}    \"\"\"检查工具是否可用\"\"\"\n{indent}    return True\n"
-                
-                # 在类定义后插入check方法
-                pattern = r"(class\s+(\w+).*?:.*?)(\n\s*\w+\s*=|\n\s*@|\n\s*def)"
-                replacement = r"\1" + check_method + r"\3"
-                tool_code = re.sub(pattern, replacement, tool_code, 1, re.DOTALL)
-        
-        # 如果缺少必要组件，返回错误信息
-        if missing_components:
-            return "", f"工具代码中缺少以下必要组件: {', '.join(missing_components)}"
-        
-        # 确保代码有正确的Python文件头部
-        if not tool_code.startswith("# -*- coding:") and not tool_code.startswith("# coding="):
-            tool_code = "# -*- coding: utf-8 -*-\n" + tool_code
-        
-        # 确保导入了必要的模块
-        if "from typing import Dict, Any" not in tool_code:
-            imports_pos = tool_code.find("\n\n")
-            if imports_pos > 0:
-                tool_code = tool_code[:imports_pos] + "\nfrom typing import Dict, Any" + tool_code[imports_pos:]
-            else:
-                tool_code = "from typing import Dict, Any\n\n" + tool_code
-        
-        return tool_code, ""
+            }

jarvis/jarvis_tools/registry.py

@@ -100,6 +100,7 @@ arguments:
 - 假设工具结果
 - 创建虚构对话
 - 在没有所需信息的情况下继续
+- yaml 格式错误
 </common_errors>
 </tool_system_guide>
 """
@@ -532,7 +533,7 @@ class ToolRegistry(OutputHandlerProtocol):
                 else:
                     return (
                         {},
-                        f"""工具调用格式错误，请检查工具调用格式。
+                        f"""工具调用格式错误，请检查工具调用格式（缺少name、arguments、want字段）。
 
                     {tool_call_help}""",
                     )
@@ -541,6 +542,8 @@ class ToolRegistry(OutputHandlerProtocol):
                     {},
                     f"""工具调用格式错误，请检查工具调用格式。
 
+                    {e}
+
                 {tool_call_help}""",
                 )
         if len(ret) > 1:

{jarvis_ai_assistant-0.1.183.dist-info → jarvis_ai_assistant-0.1.185.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.183
+Version: 0.1.185
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -85,7 +85,7 @@ Dynamic: requires-python
 
 ## 🌟 核心特色 <a id="core-features"></a>
 
-- 🆓 零成本接入：无缝集成元宝、Kimi等优质模型，无需支付API费用，同时保留强大的文件处理、搜索和推理能力
+- 🆓 零成本接入：无缝集成腾讯元宝(推荐首选)、Kimi等优质模型，无需支付API费用，同时保留强大的文件处理、搜索和推理能力
 - 🛠️ 工具驱动：内置丰富工具集，涵盖脚本执行、代码开发、网页搜索、终端操作等核心功能
 - 👥 人机协作：支持实时交互，用户可随时介入指导，确保AI行为符合预期
 - 🔌 高度可扩展：支持自定义工具和平台，轻松集成MCP协议
@@ -117,9 +117,9 @@ pip3 install jarvis-ai-assistant
 
 将以下配置写入到`~/.jarvis/config.yaml`文件中。
 
-#### 腾讯元宝
+#### 腾讯元宝 (推荐首选)
 ```yaml
-JARVIS_PLATFORM: yuanbao
+JARVIS_PLATFORM: yuanbao  # 推荐使用腾讯元宝平台，适配性最佳
 JARVIS_MODEL: deep_seek_v3
 JARVIS_THINKING_PLATFORM: yuanbao
 JARVIS_THINKING_MODEL: deep_seek

{jarvis_ai_assistant-0.1.183.dist-info → jarvis_ai_assistant-0.1.185.dist-info}/RECORD

@@ -1,7 +1,7 @@
-jarvis/__init__.py,sha256=KysQNyO0AUjUMLzRISa3Wf1q9ffBDepVKiOh2ztirYg,74
-jarvis/jarvis_agent/__init__.py,sha256=AxT_2n-IQkbtoQlAS3SJ0tsvcUenWD7_Xrc-RZZCWiA,30352
+jarvis/__init__.py,sha256=ctjj6eadc4jmCb3OWiljzQVxwTvbZ3urmkzwzSyoUYQ,74
+jarvis/jarvis_agent/__init__.py,sha256=Mho0roePyuitHFjVCbK0_v9FPgEarcpvgIvY3sQKLws,30843
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=f4DaEHPakXcAbgykFP-tiOQP6fh_yGFlZx_h91_j2tQ,1529
-jarvis/jarvis_agent/file_input_handler.py,sha256=LDNXoTtyjhyBmfzDnAdbWZ2BWdu4q-r6thSKRK8Iwjk,4187
+jarvis/jarvis_agent/file_input_handler.py,sha256=7u8pXWD7F9mmiJkr9XO83mhFu40FSRoYQm55DbZHgQo,4203
 jarvis/jarvis_agent/jarvis.py,sha256=UkNMVUlSNKV6y3v12eAhqc_gIDB6Obxrwk5f7-sQeiQ,6137
 jarvis/jarvis_agent/main.py,sha256=GkjMTIbsd56nkVuRwD_tU_PZWyzixZZhMjVOCd0SzOA,2669
 jarvis/jarvis_agent/output_handler.py,sha256=7qori-RGrQmdiFepoEe3oPPKJIvRt90l_JDmvCoa4zA,1219
@@ -52,7 +52,7 @@ jarvis/jarvis_platform/human.py,sha256=xwaTZ1zdrAYZZFXxkbHvUdECwCGsic0kgAFUncUr4
 jarvis/jarvis_platform/kimi.py,sha256=b3EpnmHseZwrfCc8sMmvwLJ6Jg2FWf8ATItSDz5G3eQ,11978
 jarvis/jarvis_platform/openai.py,sha256=VyX3bR1rGxrJdWOtUBf8PgSL9n06KaNbOewL1urzOnk,4741
 jarvis/jarvis_platform/registry.py,sha256=3djxE8AB4gwrdAOvRSL0612Rt_CcsaZhzZ0_oXHu6xk,7820
-jarvis/jarvis_platform/tongyi.py,sha256=m44aZHZ1oCbYdlSMuG3qYPFZbHW4e3VlaFZ2i3H7xrE,16927
+jarvis/jarvis_platform/tongyi.py,sha256=NhE8ssvTI_XoDkXhaGtrUJG6q6-0OApWvh8d7wuFZXg,20944
 jarvis/jarvis_platform/yuanbao.py,sha256=FDi-D9Jnw_MiwI0skPNMYz874o6GhWhdNRdZg-ECoUA,20632
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=OXWj18SqiV0Gl75YT6D9wspCCB4Nes04EY-ShI9kbpU,25677
@@ -65,15 +65,15 @@ jarvis/jarvis_tools/chdir.py,sha256=DNKVFrWqu6t_sZ2ipv99s6802QR4cSGlqKlmaI--arE,
 jarvis/jarvis_tools/code_plan.py,sha256=gWR0lzY62x2PxWKoMRBqW6jq7zQuO8vhpjC4TcHSYjk,7685
 jarvis/jarvis_tools/create_code_agent.py,sha256=-nHfo5O5pDIG5IX3w1ClQafGvGcdI2_w75-KGrD-gUQ,3458
 jarvis/jarvis_tools/create_sub_agent.py,sha256=lyFrrg4V0yXULmU3vldwGp_euZjwZzJcRU6mJ20zejY,3023
-jarvis/jarvis_tools/edit_file.py,sha256=gxnVijz-mOHpb9A7WTPIqCwmZHInSHwu_Psa_GvNWRQ,16724
+jarvis/jarvis_tools/edit_file.py,sha256=czpJOY7Y7Q-SH3UiGfgfB1lRcqtzuIZjLBLZzozcl0A,17330
 jarvis/jarvis_tools/execute_script.py,sha256=IA1SkcnwBB9PKG2voBNx5N9GXL303OC7OOtdqRfqWOk,6428
 jarvis/jarvis_tools/file_analyzer.py,sha256=7ILHkUFm8pPZn1y_s4uT0kaWHP-EmlHnpkovDdA1yRE,4872
 jarvis/jarvis_tools/file_operation.py,sha256=WloC1-oPJLwgICu4WBc9f7XA8N_Ggl73QQ5CxM2XTlE,9464
-jarvis/jarvis_tools/generate_new_tool.py,sha256=k1Vt88kI1bYi1OwxvJqFKr3Ewwwv7lOegYNmZ-1F7x0,10283
+jarvis/jarvis_tools/generate_new_tool.py,sha256=dLfOliIUm0ovLrHcZAhKm7lqhxwACv8mnGxxGtLJ--o,5960
 jarvis/jarvis_tools/methodology.py,sha256=m7cQmVhhQpUUl_uYTVvcW0JBovQLx5pWTXh_8K77HsU,5237
 jarvis/jarvis_tools/read_code.py,sha256=pL2SwZDsJbJMXo4stW96quFsLgbtPVIAW-h4sDKsLtM,6274
 jarvis/jarvis_tools/read_webpage.py,sha256=PFAYuKjay9j6phWzyuZ99ZfNaHJljmRWAgS0bsvbcvE,2219
-jarvis/jarvis_tools/registry.py,sha256=WvYPiaUrleFqeXvwRkxM-6TNs1sWm61mpg1MFVo_kas,25113
+jarvis/jarvis_tools/registry.py,sha256=qdA0fgWeh_UG-_Rt5COnHTcKmOsYBiIU69uX4cLvfWI,25199
 jarvis/jarvis_tools/rewrite_file.py,sha256=3V2l7kG5DG9iRimBce-1qCRuJPL0QM32SBTzOl2zCqM,7004
 jarvis/jarvis_tools/search_web.py,sha256=rzxrCOTEo-MmLQrKI4k-AbfidUfJUeCPK4f5ZJy48G8,952
 jarvis/jarvis_tools/virtual_tty.py,sha256=8E_n-eC-RRPTqYx6BI5Q2RnorY8dbhKFBfAjIiRQROA,16397
@@ -91,9 +91,9 @@ jarvis/jarvis_utils/methodology.py,sha256=A8pE8ZqNHvGKaDO4TFtg7Oz-hAXPBcQfhmSPWM
 jarvis/jarvis_utils/output.py,sha256=QboL42GtG_dnvd1O64sl8o72mEBhXNRADPXQMXgDE7Q,9661
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
 jarvis/jarvis_utils/utils.py,sha256=atSK-2cUr7_tOIFsQzJnuQxebi7aFN4jtmaoXEaV4jM,10692
-jarvis_ai_assistant-0.1.183.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.183.dist-info/METADATA,sha256=RRkBRiDEeBnEfQQFAufn9jE2RV7BA90P5o5G_PnJUp0,15836
-jarvis_ai_assistant-0.1.183.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-jarvis_ai_assistant-0.1.183.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.183.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.183.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.185.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.185.dist-info/METADATA,sha256=_DBSrubK80hRPGRBLXCpPy7r7tgcEhMM_RDS82mvaFw,15923
+jarvis_ai_assistant-0.1.185.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+jarvis_ai_assistant-0.1.185.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.185.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.185.dist-info/RECORD,,