jarvis-ai-assistant 0.1.138__py3-none-any.whl → 0.1.141__py3-none-any.whl

jarvis/jarvis_platform/kimi.py

@@ -7,6 +7,8 @@ import time
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
+from yaspin import yaspin
+
 class KimiModel(BasePlatform):
     """Kimi model implementation"""
 
@@ -14,7 +16,10 @@ class KimiModel(BasePlatform):
 
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""
-        return [("kimi", "Based on the web Kimi, free interface")]
+        return [
+            ("kimi", "基于网页的 Kimi，免费接口"),
+            ("k1", "基于网页的 Kimi，深度思考模型")
+            ]
 
     def __init__(self):
         """
@@ -44,9 +49,12 @@ class KimiModel(BasePlatform):
             PrettyOutput.print(message, OutputType.INFO)
             PrettyOutput.print("KIMI_API_KEY 未设置", OutputType.WARNING)
         self.auth_header = f"Bearer {self.api_key}"
+        self.uploaded_files = []  # 存储已上传文件的信息
         self.chat_id = ""
         self.first_chat = True  # 添加标记，用于判断是否是第一次对话
         self.system_message = ""
+        self.model_name = "kimi"
+        self.web = os.getenv("KIMI_WEB", "false") == "true"
 
     def set_system_message(self, message: str):
         """Set system message"""
@@ -54,7 +62,7 @@ class KimiModel(BasePlatform):
 
     def set_model_name(self, model_name: str):
         """Set model name"""
-        pass
+        self.model_name = model_name
 
     def _create_chat(self) -> bool:
         """Create a new chat session"""
@@ -75,6 +83,156 @@ class KimiModel(BasePlatform):
         except Exception as e:
             PrettyOutput.print(f"错误：创建会话失败：{e}", OutputType.ERROR)
             return False
+        
+    def _get_presigned_url(self, filename: str, action: str) -> Dict:
+        """Get presigned upload URL"""
+        url = "https://kimi.moonshot.cn/api/pre-sign-url"
+        
+        
+        
+        payload = json.dumps({
+            "action": action,
+            "name": os.path.basename(filename)
+        }, ensure_ascii=False)
+        
+        headers = {
+            'Authorization': self.auth_header,
+            'Content-Type': 'application/json'
+        }
+        
+        response = while_success(lambda: requests.post(url, headers=headers, data=payload), sleep_time=5)
+        return response.json()
+
+    def _upload_file(self, file_path: str, presigned_url: str) -> bool:
+        """Upload file to presigned URL"""
+        try:
+            with open(file_path, 'rb') as f:
+                content = f.read()
+                response = while_success(lambda: requests.put(presigned_url, data=content), sleep_time=5)
+                return response.status_code == 200
+        except Exception as e:
+            PrettyOutput.print(f"错误：上传文件失败：{e}", OutputType.ERROR)
+            return False
+
+    def _get_file_info(self, file_data: Dict, name: str, file_type: str) -> Dict:
+        """Get file information"""
+        url = "https://kimi.moonshot.cn/api/file"
+        payload = json.dumps({
+            "type": file_type,
+            "name": name,
+            "object_name": file_data["object_name"],
+            "chat_id": self.chat_id,
+            "file_id": file_data.get("file_id", "")
+        }, ensure_ascii=False)
+        
+        headers = {
+            'Authorization': self.auth_header,
+            'Content-Type': 'application/json'
+        }
+        
+        response = while_success(lambda: requests.post(url, headers=headers, data=payload), sleep_time=5)
+        return response.json()
+
+    def _wait_for_parse(self, file_id: str) -> bool:
+        """Wait for file parsing to complete"""
+        url = "https://kimi.moonshot.cn/api/file/parse_process"
+        headers = {
+            'Authorization': self.auth_header,
+            'Content-Type': 'application/json'
+        }
+        
+        max_retries = 30
+        retry_count = 0
+        
+        while retry_count < max_retries:
+            payload = json.dumps({"ids": [file_id]}, ensure_ascii=False)
+            response = while_success(lambda: requests.post(url, headers=headers, data=payload, stream=True), sleep_time=5)
+            
+            for line in response.iter_lines():
+                if not line:
+                    continue
+                    
+                line = line.decode('utf-8')
+                if not line.startswith("data: "):
+                    continue
+                    
+                try:
+                    data = json.loads(line[6:])
+                    if data.get("event") == "resp":
+                        status = data.get("file_info", {}).get("status")
+                        if status == "parsed":
+                            return True
+                        elif status == "failed":
+                            return False
+                except json.JSONDecodeError:
+                    continue
+            
+            retry_count += 1
+            time.sleep(1)
+        
+        return False
+    def upload_files(self, file_list: List[str]) -> bool:
+        """Upload file list and return file information"""
+        if not file_list:
+            return True
+
+        from yaspin import yaspin
+        
+        if not self.chat_id:
+            with yaspin(text="创建聊天会话...", color="yellow") as spinner:
+                if not self._create_chat():
+                    yaspin.text = "创建聊天会话失败"
+                    spinner.fail("❌")
+                    return False
+                spinner.text = "创建聊天会话成功"
+                spinner.ok("✅")
+
+        uploaded_files = []
+        for index, file_path in enumerate(file_list, 1):
+            file_name = os.path.basename(file_path)
+            with yaspin(text=f"处理文件 [{index}/{len(file_list)}]: {file_name}", color="yellow") as spinner:
+                try:
+                    mime_type, _ = mimetypes.guess_type(file_path)
+                    action = "image" if mime_type and mime_type.startswith('image/') else "file"
+                    
+                    # 获取预签名URL
+                    spinner.text = f"获取上传URL: {file_name}"
+                    presigned_data = self._get_presigned_url(file_path, action)
+                    
+                    # 上传文件
+                    spinner.text = f"上传文件: {file_name}"
+                    if self._upload_file(file_path, presigned_data["url"]):
+                        # 获取文件信息
+                        spinner.text = f"获取文件信息: {file_name}"
+                        file_info = self._get_file_info(presigned_data, file_name, action)
+                        
+                        # 只有文件需要解析
+                        if action == "file":
+                            spinner.text = f"等待文件解析: {file_name}"
+                            if self._wait_for_parse(file_info["id"]):
+                                uploaded_files.append(file_info)
+                                spinner.text = f"文件处理完成: {file_name}"
+                                spinner.ok("✅")
+                            else:
+                                spinner.text = f"❌文件解析失败: {file_name}"
+                                spinner.fail("")
+                                return False
+                        else:
+                            uploaded_files.append(file_info)
+                            spinner.write( f"✅图片处理完成: {file_name}")
+                    else:
+                        spinner.text = f"文件上传失败: {file_name}"
+                        spinner.fail("❌")
+                        return False
+                    
+                except Exception as e:
+                    spinner.text = f"处理文件出错 {file_path}: {str(e)}"
+                    spinner.fail("❌")
+                    return False
+        
+        self.uploaded_files = uploaded_files
+        self.chat_until_success("我上传了文件，收到请回复“收到”")
+        return True
 
 
     def chat(self, message: str) -> str:
@@ -85,17 +243,27 @@ class KimiModel(BasePlatform):
 
         url = f"https://kimi.moonshot.cn/api/chat/{self.chat_id}/completion/stream"
 
+        refs = []
+        refs_file = []
+        if self.uploaded_files:
+            refs = [f["id"] for f in self.uploaded_files]
+            refs_file = self.uploaded_files
+            self.uploaded_files = []
 
+        if self.first_chat:
+            message = self.system_message + "\n" + message
+            self.first_chat = False
 
         payload = {
             "messages": [{"role": "user", "content": message}],
-            "use_search": True,
+            "use_search": True if self.web else False,
             "extend": {"sidebar": True},
             "kimiplus_id": "kimi",
             "use_research": False,
             "use_math": False,
-            "refs": [],
-            "refs_file": []
+            "refs": refs,
+            "refs_file": refs_file,
+            "model": self.model_name,
         }
 
         headers = {

jarvis/jarvis_platform/openai.py

@@ -43,6 +43,9 @@ class OpenAIModel(BasePlatform):
         self.messages: List[Dict[str, str]] = []
         self.system_message = ""
 
+    def upload_files(self, file_list: List[str]) -> bool:
+        return False
+
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""
         try:

jarvis/jarvis_platform/registry.py

@@ -15,6 +15,7 @@ REQUIRED_METHODS = [
     ('set_model_name', ['model_name']),
     ('get_model_list', []),
     ('set_suppress_output', ['suppress']),
+    ('upload_files', ['file_list']),
 ]
 
 class PlatformRegistry:

jarvis/jarvis_platform/yuanbao.py

@@ -1,7 +1,16 @@
-from typing import List, Tuple
+from typing import Dict, List, Tuple
 import requests
 import json
 import os
+import mimetypes
+import hmac
+import hashlib
+import time
+import urllib.parse
+from pathlib import Path
+from PIL import Image
+from yaspin import yaspin
+from yaspin.spinners import Spinners
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
@@ -51,6 +60,7 @@ class YuanbaoPlatform(BasePlatform):
         self.system_message = ""  # 系统消息，用于初始化对话
         self.first_chat = True  # 标识是否为第一次对话
         self.model_name = "deep_seek_v3"  # 默认模型名称，使用下划线保持一致
+        self.multimedia = []
 
     def set_system_message(self, message: str):
         """Set system message"""
@@ -114,8 +124,268 @@ class YuanbaoPlatform(BasePlatform):
             PrettyOutput.print(f"错误：创建会话失败：{e}", OutputType.ERROR)
             return False
 
+    def upload_files(self, file_list: List[str]) -> bool:
+        """Upload files to Yuanbao platform
+        
+        Args:
+            file_list: List of file paths to upload
+            
+        Returns:
+            List of file metadata dictionaries for use in chat messages
+        """
+        if not self.cookies:
+            PrettyOutput.print("未设置YUANBAO_COOKIES，无法上传文件", OutputType.ERROR)
+            return False
+            
+        uploaded_files = []
+        
+        for file_path in file_list:
+            file_name = os.path.basename(file_path)
+            with yaspin(Spinners.dots, text=f"上传文件 {file_name}") as spinner:
+                try:
+                
+                    # 1. Prepare the file information
+                    spinner.text = f"准备文件信息: {file_name}"
+                    file_size = os.path.getsize(file_path)
+                    file_extension = os.path.splitext(file_path)[1].lower().lstrip('.')
+                    
+                    # Determine file_type using mimetypes
+                    mime_type, _ = mimetypes.guess_type(file_path)
+                    
+                    # Default to txt if mime_type couldn't be determined
+                    if not mime_type:
+                        file_type = "txt"
+                    # Image types
+                    elif mime_type.startswith('image/'):
+                        file_type = "image"
+                    # PDF type
+                    elif mime_type == 'application/pdf':
+                        file_type = "pdf"
+                    # Document types
+                    elif mime_type in ['application/msword', 
+                                     'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                                     'application/rtf', 
+                                     'application/vnd.oasis.opendocument.text']:
+                        file_type = "doc"
+                    # Default to txt for all other types
+                    else:
+                        file_type = "txt"
+                    
+                    # 2. Generate upload information
+                    spinner.text = f"获取上传信息: {file_name}"
+                    upload_info = self._generate_upload_info(file_name)
+                    if not upload_info:
+                        spinner.text = f"无法获取文件 {file_name} 的上传信息"
+                        spinner.fail("❌")
+                        return False
+                        
+                    # 3. Upload the file to COS
+                    spinner.text = f"上传文件到云存储: {file_name}"
+                    upload_success = self._upload_file_to_cos(file_path, upload_info)
+                    if not upload_success:
+                        spinner.text = f"上传文件 {file_name} 失败"
+                        spinner.fail("❌")
+                        return False
+                        
+                    # 4. Create file metadata for chat
+                    spinner.text = f"生成文件元数据: {file_name}"
+                    file_metadata = {
+                        "type": file_type,
+                        "docType": file_extension if file_extension else file_type,
+                        "url": upload_info.get("resourceUrl", ""),
+                        "fileName": file_name,
+                        "size": file_size,
+                        "width": 0,
+                        "height": 0
+                    }
+                    
+                    # Get image dimensions if it's an image file
+                    if file_type == "img":
+                        try:
+                            with Image.open(file_path) as img:
+                                file_metadata["width"] = img.width
+                                file_metadata["height"] = img.height
+                        except Exception as e:
+                            spinner.write(f"⚠️ 无法获取图片 {file_name} 的尺寸: {str(e)}")
+                    
+                    uploaded_files.append(file_metadata)
+                    spinner.text = f"文件 {file_name} 上传成功"
+                    spinner.ok("✅")
+                
+                except Exception as e:
+                    spinner.text = f"上传文件 {file_path} 时出错: {str(e)}"
+                    spinner.fail("❌")
+                    return False
+        
+        self.multimedia = uploaded_files
+        return True
+        
+    def _generate_upload_info(self, file_name: str) -> Dict:
+        """Generate upload information from Yuanbao API
+        
+        Args:
+            file_name: Name of the file to upload
+            
+        Returns:
+            Dictionary containing upload information or empty dict if failed
+        """
+        url = "https://yuanbao.tencent.com/api/resource/genUploadInfo"
+        
+        headers = self._get_base_headers()
+        
+        payload = {
+            "fileName": file_name,
+            "docFrom": "localDoc",
+            "docOpenId": ""
+        }
+        
+        try:
+            response = while_success(
+                lambda: requests.post(url, headers=headers, json=payload), 
+                sleep_time=5
+            )
+            
+            if response.status_code != 200:
+                PrettyOutput.print(f"获取上传信息失败，状态码: {response.status_code}", OutputType.ERROR)
+                if hasattr(response, 'text'):
+                    PrettyOutput.print(f"响应: {response.text}", OutputType.ERROR)
+                return {}
+                
+            upload_info = response.json()
+            return upload_info
+            
+        except Exception as e:
+            PrettyOutput.print(f"获取上传信息时出错: {str(e)}", OutputType.ERROR)
+            return {}
+            
+    def _upload_file_to_cos(self, file_path: str, upload_info: Dict) -> bool:
+        """Upload file to Tencent COS using the provided upload information
+        
+        Args:
+            file_path: Path to the file to upload
+            upload_info: Upload information from generate_upload_info
+            
+        Returns:
+            Boolean indicating success or failure
+        """
+        try:
+            # Extract required information from upload_info
+            bucket_url = f"https://{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"
+            object_path = upload_info.get('location', '')
+            url = f"{bucket_url}{object_path}"
+            
+            # Security credentials
+            tmp_secret_id = upload_info.get('encryptTmpSecretId', '')
+            tmp_secret_key = upload_info.get('encryptTmpSecretKey', '')
+            token = upload_info.get('encryptToken', '')
+            start_time = upload_info.get('startTime', int(time.time()))
+            expired_time = upload_info.get('expiredTime', start_time + 600)
+            key_time = f"{start_time};{expired_time}"
+            
+            # Read file content
+            with open(file_path, 'rb') as file:
+                file_content = file.read()
+                
+            # Prepare headers for PUT request
+            host = f"{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"
+            headers = {
+                'Host': host,
+                'Content-Length': str(len(file_content)),
+                'Content-Type': 'application/octet-stream',
+                'x-cos-security-token': token
+            }
+            
+            # Generate signature for COS request (per Tencent Cloud documentation)
+            signature = self._generate_cos_signature(
+                secret_key=tmp_secret_key,
+                method="PUT",
+                path=urllib.parse.quote(object_path),
+                params={},
+                headers={'host': host, 'content-length': headers['Content-Length']},
+                key_time=key_time
+            )
+            
+            # Add Authorization header with signature
+            headers['Authorization'] = (
+                f"q-sign-algorithm=sha1&q-ak={tmp_secret_id}&q-sign-time={key_time}&"
+                f"q-key-time={key_time}&q-header-list=content-length;host&"
+                f"q-url-param-list=&q-signature={signature}"
+            )
+            
+            # Upload the file
+            response = requests.put(url, headers=headers, data=file_content)
+            
+            if response.status_code not in [200, 204]:
+                PrettyOutput.print(f"文件上传到COS失败，状态码: {response.status_code}", OutputType.ERROR)
+                if hasattr(response, 'text'):
+                    PrettyOutput.print(f"响应: {response.text}", OutputType.ERROR)
+                return False
+                
+            return True
+            
+        except Exception as e:
+            PrettyOutput.print(f"上传文件到COS时出错: {str(e)}", OutputType.ERROR)
+            return False
+    
+    def _generate_cos_signature(self, secret_key: str, method: str, path: str, 
+                              params: Dict, headers: Dict, key_time: str) -> str:
+        """Generate COS signature according to Tencent Cloud COS documentation
+        
+        Args:
+            secret_key: Temporary secret key
+            method: HTTP method (GET, PUT, etc.)
+            path: Object path
+            params: URL parameters
+            headers: HTTP headers
+            key_time: Time range for signature
+            
+        Returns:
+            Signature string
+        """
+        try:
+            # 1. Generate SignKey
+            sign_key = hmac.new(
+                secret_key.encode('utf-8'),
+                key_time.encode('utf-8'),
+                hashlib.sha1
+            ).hexdigest()
+            
+            # 2. Format parameters and headers
+            formatted_params = '&'.join([f"{k.lower()}={urllib.parse.quote(str(v), safe='')}" 
+                               for k, v in sorted(params.items())])
+            
+            formatted_headers = '&'.join([f"{k.lower()}={urllib.parse.quote(str(v), safe='')}" 
+                                for k, v in sorted(headers.items())])
+            
+            # 3. Generate HttpString
+            http_string = f"{method.lower()}\n{path}\n{formatted_params}\n{formatted_headers}\n"
+            
+            # 4. Generate StringToSign
+            string_to_sign = f"sha1\n{key_time}\n{hashlib.sha1(http_string.encode('utf-8')).hexdigest()}\n"
+            
+            # 5. Generate Signature
+            signature = hmac.new(
+                sign_key.encode('utf-8'),
+                string_to_sign.encode('utf-8'),
+                hashlib.sha1
+            ).hexdigest()
+            
+            return signature
+            
+        except Exception as e:
+            PrettyOutput.print(f"生成签名时出错: {str(e)}", OutputType.ERROR)
+            raise e
+
     def chat(self, message: str) -> str:
-        """Send message and get response"""
+        """Send message and get response with optional file attachments
+        
+        Args:
+            message: Message text to send
+            file_list: Optional list of file paths to upload and attach
+            
+        Returns:
+            Response from the model
+        """
         if not self.conversation_id:
             if not self._create_conversation():
                 raise Exception("Failed to create conversation session")
@@ -138,7 +408,7 @@ class YuanbaoPlatform(BasePlatform):
                     "intentionStatus": True
                 }
             },
-            "multimedia": [],
+            "multimedia": self.multimedia,
             "agentId": self.agent_id,
             "supportHint": 1,
             "version": "v2",
@@ -146,10 +416,11 @@ class YuanbaoPlatform(BasePlatform):
             "chatModelId": self.model_name,
         }
 
+        self.multimedia = []
+
         if self.web:
             payload["supportFunctions"] = ["supportInternetSearch"]
 
-
         # 添加系统消息（如果是第一次对话）
         if self.first_chat and self.system_message:
             payload["prompt"] = f"{self.system_message}\n\n{message}"
@@ -217,7 +488,6 @@ class YuanbaoPlatform(BasePlatform):
         except Exception as e:
             raise Exception(f"对话失败: {str(e)}")
 
-
     def delete_chat(self) -> bool:
         """Delete current session"""
         if not self.conversation_id:

jarvis/jarvis_tools/ask_codebase.py

@@ -23,7 +23,8 @@ class AskCodebaseTool:
     """
 
     name = "ask_codebase"
-    description = "查询代码库中特定功能的位置和实现原理，适合定位功能所在文件和理解单点实现，不适合跨文件大范围分析"
+    description = "查询代码库中特定功能的位置和实现原理，适合定位功能所在文件和理解单点实现"
+    labels = ['code', 'analysis', 'qa']
     parameters = {
         "type": "object",
         "properties": {
@@ -44,7 +45,7 @@ class AskCodebaseTool:
         self.auto_complete = auto_complete
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        """Execute codebase analysis using an Agent with execute_shell and rag tools
+        """Execute codebase analysis using an Agent with execute_script
 
         Args:
             args: Dictionary containing:
@@ -86,7 +87,7 @@ class AskCodebaseTool:
                 # Create tools registry
                 from jarvis.jarvis_tools.registry import ToolRegistry
                 tool_registry = ToolRegistry()
-                tool_registry.use_tools(["execute_shell", "read_code", "rag"])
+                tool_registry.use_tools(["execute_script", "read_code", "methodology"])
 
                 # Create and run Agent
                 analyzer_agent = Agent(
@@ -141,7 +142,7 @@ class AskCodebaseTool:
 - 代码库根目录: {git_root}
 
 ## 工具使用优先级
-1. **绝对优先使用 execute_shell**:
+1. **绝对优先使用 execute_script**:
    - 使用 fd 查找文件: `fd -t f -e py` 查找Python文件等
    - 使用 rg 搜索代码: `rg "pattern" --type py` 在Python文件中搜索等
    - 使用 loc 统计代码: `loc"` 统计代码量
@@ -150,10 +151,6 @@ class AskCodebaseTool:
    - 找到相关文件后优先使用read_code读取文件内容
    - 对大文件使用行范围参数读取指定区域
 
-3. **避免使用 rag**:
-   - 仅在fd、rg和read_code无法解决问题时作为最后手段
-   - 使用rag前必须先尝试使用shell命令解决问题
-
 ## 分析策略
 1. 首先理解问题，确定需要查找的关键信息和代码组件
 2. 使用fd命令查找可能相关的文件
@@ -161,7 +158,7 @@ class AskCodebaseTool:
 4. 使用read_code工具直接读取和分析相关文件内容
 5. 只有在fd、rg和read_code都无法解决问题时才考虑使用RAG工具
 6. 根据文件内容提供具体、准确的回答
-7. 确保分析的完整性，收集充分的信息后再得出结论
+7. 确保分析的完整性，收集充分的信息后再得出结论，不要在只掌握部分信息就得出结论
 8. 优先查阅README文件、文档目录和项目文档
 
 ## 分析步骤