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

jarvis/__init__.py

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

jarvis/jarvis_platform/tongyi.py

@@ -3,8 +3,11 @@ import json
 import os
 from typing import Any, Dict, Generator, List, Tuple
 import uuid
+import time
 
 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
@@ -25,6 +28,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):
@@ -81,6 +86,21 @@ class TongyiPlatform(BasePlatform):
             }
         }]
 
+        # 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:
@@ -238,96 +258,120 @@ class TongyiPlatform(BasePlatform):
             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
+                            
+                        uploaded_files.append({
+                            'fileKey': file_name,
+                            'fileType': '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": "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:
@@ -393,6 +437,7 @@ class TongyiPlatform(BasePlatform):
             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)

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_ai_assistant-0.1.183.dist-info → jarvis_ai_assistant-0.1.184.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.183
+Version: 0.1.184
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

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

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=KysQNyO0AUjUMLzRISa3Wf1q9ffBDepVKiOh2ztirYg,74
+jarvis/__init__.py,sha256=UVbYHDbtqKBl_4D6WpfOn7709w_VMH6nNObt9rvVuV0,74
 jarvis/jarvis_agent/__init__.py,sha256=AxT_2n-IQkbtoQlAS3SJ0tsvcUenWD7_Xrc-RZZCWiA,30352
 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
@@ -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=mgnNC9II3TpiNLD8VgqswqoEAFXoMg8ZG29L3f5kYOo,19711
 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
@@ -69,7 +69,7 @@ jarvis/jarvis_tools/edit_file.py,sha256=gxnVijz-mOHpb9A7WTPIqCwmZHInSHwu_Psa_GvN
 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
@@ -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.184.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.184.dist-info/METADATA,sha256=1H6UQ0hW12J_lgy6Mhq3pOj7BrD1_1a_taBK9JE4oi0,15836
+jarvis_ai_assistant-0.1.184.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+jarvis_ai_assistant-0.1.184.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.184.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.184.dist-info/RECORD,,