jarvis-ai-assistant 0.1.207__py3-none-any.whl → 0.1.209__py3-none-any.whl

jarvis/jarvis_platform/kimi.py

@@ -7,9 +7,8 @@ import os
 import time
 from typing import Dict, Generator, List, Tuple
 
-import requests  # type: ignore
-
 from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils import http
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
 
@@ -67,7 +66,7 @@ class KimiModel(BasePlatform):
         }
         try:
             response = while_success(
-                lambda: requests.request("POST", url, headers=headers, data=payload),
+                lambda: http.post(url, headers=headers, data=payload),
                 sleep_time=5,
             )
             if response.status_code != 200:
@@ -95,7 +94,7 @@ class KimiModel(BasePlatform):
         }
 
         response = while_success(
-            lambda: requests.post(url, headers=headers, data=payload), sleep_time=5
+            lambda: http.post(url, headers=headers, data=payload), sleep_time=5
         )
         return response.json()
 
@@ -109,7 +108,7 @@ class KimiModel(BasePlatform):
             with open(file_path, "rb") as f:
                 content = f.read()
                 response = while_success(
-                    lambda: requests.put(presigned_url, data=content), sleep_time=5
+                    lambda: http.put(presigned_url, data=content), sleep_time=5
                 )
                 return response.status_code == 200
         except Exception as e:
@@ -136,7 +135,7 @@ class KimiModel(BasePlatform):
         }
 
         response = while_success(
-            lambda: requests.post(url, headers=headers, data=payload), sleep_time=5
+            lambda: http.post(url, headers=headers, data=payload), sleep_time=5
         )
         return response.json()
 
@@ -154,7 +153,7 @@ class KimiModel(BasePlatform):
         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),
+                lambda: http.post(url, headers=headers, data=payload, stream=True),
                 sleep_time=5,
             )
 
@@ -162,7 +161,12 @@ class KimiModel(BasePlatform):
                 if not line:
                     continue
 
-                line = line.decode("utf-8")
+                # httpx 返回字符串，requests 返回字节，需要兼容处理
+                if isinstance(line, bytes):
+                    line = line.decode("utf-8")
+                else:
+                    line = str(line)
+
                 if not line.startswith("data: "):
                     continue
 
@@ -187,68 +191,54 @@ class KimiModel(BasePlatform):
         if not file_list:
             return True
 
-        from yaspin import yaspin  # type: ignore
-
         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("✅")
+            print("🚀 正在创建聊天会话...")
+            if not self._create_chat():
+                print("❌ 创建聊天会话失败")
+                return False
+            print("✅ 创建聊天会话成功")
 
         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:
+            print(f"🔍 处理文件 [{index}/{len(file_list)}]: {file_name}")
+            try:
+                mime_type, _ = mimetypes.guess_type(file_path)
+                action = (
+                    "image" if mime_type and mime_type.startswith("image/") else "file"
+                )
+
+                # 获取预签名URL
+                print(f"🔍 获取上传URL: {file_name}")
+                presigned_data = self._get_presigned_url(file_path, action)
+
+                # 上传文件
+                print(f"🔍 上传文件: {file_name}")
+                if self._upload_file(file_path, presigned_data["url"]):
+                    # 获取文件信息
+                    print(f"🔍 获取文件信息: {file_name}")
+                    file_info = self._get_file_info(presigned_data, file_name, action)
+
+                    # 只有文件需要解析
+                    if action == "file":
+                        print(f"🔍 等待文件解析: {file_name}")
+                        if self._wait_for_parse(file_info["id"]):
                             uploaded_files.append(file_info)
-                            spinner.write(f"✅图片处理完成: {file_name}")
+                            print(f"✅ 文件处理完成: {file_name}")
+                        else:
+                            print(f"❌ 文件解析失败: {file_name}")
+                            return False
                     else:
-                        spinner.text = f"文件上传失败: {file_name}"
-                        spinner.fail("❌")
-                        return False
-
-                except Exception as e:
-                    spinner.text = f"处理文件出错 {file_path}: {str(e)}"
-                    spinner.fail("❌")
+                        uploaded_files.append(file_info)
+                        print(f"✅ 图片处理完成: {file_name}")
+                else:
+                    print(f"❌ 文件上传失败: {file_name}")
                     return False
 
+            except Exception as e:
+                print(f"❌ 处理文件出错 {file_path}: {str(e)}")
+                return False
+
         self.uploaded_files = uploaded_files
         return True
 
@@ -295,7 +285,7 @@ class KimiModel(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload, stream=True),
+                lambda: http.post(url, headers=headers, json=payload, stream=True),
                 sleep_time=5,
             )
             # 如果禁止输出，则静默处理
@@ -303,7 +293,12 @@ class KimiModel(BasePlatform):
                 if not line:
                     continue
 
-                line = line.decode("utf-8")
+                # httpx 返回字符串，requests 返回字节，需要兼容处理
+                if isinstance(line, bytes):
+                    line = line.decode("utf-8")
+                else:
+                    line = str(line)
+
                 if not line.startswith("data: "):
                     continue
 
@@ -337,7 +332,7 @@ class KimiModel(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.delete(url, headers=headers), sleep_time=5
+                lambda: http.delete(url, headers=headers), sleep_time=5
             )
             if response.status_code == 200:
                 self.chat_id = ""

jarvis/jarvis_platform/tongyi.py

@@ -5,11 +5,8 @@ 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 import http
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
 
@@ -163,7 +160,7 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload, stream=True),
+                lambda: http.post(url, headers=headers, json=payload, stream=True),
                 sleep_time=5,
             )
             if response.status_code != 200:
@@ -176,7 +173,13 @@ class TongyiPlatform(BasePlatform):
             for line in response.iter_lines():
                 if not line:
                     continue
-                line_str = line.decode("utf-8")
+
+                # httpx 返回字符串，requests 返回字节，需要兼容处理
+                if isinstance(line, bytes):
+                    line_str = line.decode("utf-8")
+                else:
+                    line_str = str(line)
+
                 if not line_str.startswith("data: "):
                     continue
 
@@ -260,7 +263,7 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+                lambda: http.post(url, headers=headers, json=payload), sleep_time=5
             )
             if response.status_code != 200:
                 raise Exception(f"HTTP {response.status_code}: {response.text}")
@@ -289,140 +292,124 @@ class TongyiPlatform(BasePlatform):
 
             for file_path in file_list:
                 file_name = os.path.basename(file_path)
-                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",
-                        }
+                print(f"🔍 上传文件 {file_name}")
+                try:
+                    if not os.path.exists(file_path):
+                        print(f"❌ 文件不存在: {file_path}")
+                        return False
 
-                        # Prepare files
-                        files = {
-                            "file": (file_name, open(file_path, "rb"), content_type)
-                        }
+                    # Get file name and content type
+                    content_type = self._get_content_type(file_path)
 
-                        spinner.text = f"正在上传文件: {file_name}"
+                    print(f"🔍 准备上传文件: {file_name}")
 
-                        # Upload file
-                        response = requests.post(
-                            upload_token["host"], data=form_data, files=files
-                        )
+                    # 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",
+                    }
 
-                        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"],
-                            }
-                        )
+                    # Prepare files
+                    files = {"file": (file_name, open(file_path, "rb"), content_type)}
+
+                    print(f"📤 正在上传文件: {file_name}")
+
+                    # Upload file
+                    response = http.post(
+                        upload_token["host"], data=form_data, files=files
+                    )
+
+                    if response.status_code != 200:
+                        print(f"❌ 上传失败 {file_name}: HTTP {response.status_code}")
+                        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
 
-                        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"
-                            ),
+                    uploaded_files.append(
+                        {
+                            "fileKey": file_name,
+                            "fileType": "image" if is_image else "file",
                             "dir": upload_token["dir"],
                         }
+                    )
+
+                    print(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", []
+                    response = http.post(url, headers=headers, json=payload)
+                    if response.status_code != 200:
+                        print(f"❌ 获取下载链接失败: HTTP {response.status_code}")
+                        return False
+
+                    result = response.json()
+                    if not result.get("success"):
+                        print(f"❌ 获取下载链接失败: {result.get('errorMsg')}")
+                        return False
+
+                    # Add files to chat
+                    self.uploaded_file_info = result.get("data", {}).get("results", [])
+                    for file_info in self.uploaded_file_info:
+                        print(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 = http.post(
+                            add_url, headers=headers, json=add_payload
                         )
-                        for file_info in self.uploaded_file_info:
-                            spinner.text = f"添加文件到对话: {file_name}"
-                            add_url = (
-                                "https://api.tongyi.com/assistant/api/chat/file/add"
+                        if add_response.status_code != 200:
+                            print(
+                                f"❌ 添加文件到对话失败: HTTP {add_response.status_code}"
                             )
-                            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
+                            continue
+
+                        add_result = add_response.json()
+                        if not add_result.get("success"):
+                            print(
+                                f"❌ 添加文件到对话失败: {add_result.get('errorMsg')}"
                             )
-                            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
+                            continue
+
+                        file_info.update(add_result.get("data", {}))
+
+                    print(f"✅ 文件 {file_name} 上传成功")
+                    time.sleep(1)  # 短暂暂停以便用户看到成功状态
+
+                except Exception as e:
+                    print(f"❌ 上传文件 {file_name} 时出错: {str(e)}")
+                    return False
             return True
 
         except Exception as e:
@@ -482,7 +469,7 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+                lambda: http.post(url, headers=headers, json=payload), sleep_time=5
             )
             if response.status_code != 200:
                 PrettyOutput.print(