jarvis-ai-assistant 0.1.25__py3-none-any.whl → 0.1.27__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.25" 
+__version__ = "0.1.27" 

jarvis/agent.py

@@ -1,5 +1,6 @@
 import json
 import subprocess
+import time
 from typing import Dict, Any, List, Optional, Tuple
 
 import yaml
@@ -56,13 +57,13 @@ class Agent:
                             }]
                         else:
                             PrettyOutput.print("工具调用缺少必要字段", OutputType.ERROR)
-                            raise '工具调用缺少必要字段'
+                            raise Exception("工具调用缺少必要字段")
                     except yaml.YAMLError as e:
                         PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
-                        raise 'YAML解析错误'
+                        raise Exception(f"YAML解析错误: {str(e)}")
                     except Exception as e:
                         PrettyOutput.print(f"处理工具调用时发生错误: {str(e)}", OutputType.ERROR)
-                        raise '处理工具调用时发生错误'
+                        raise Exception(f"处理工具调用时发生错误: {str(e)}")
                 in_tool_call = False
                 continue
             
@@ -74,7 +75,13 @@ class Agent:
     def _call_model(self, message: str) -> str:
         """调用模型获取响应"""
         try:
-            return self.model.chat(message)
+            while True:
+                ret = self.model.chat(message)
+                if not ret:
+                    PrettyOutput.print("模型返回空值，可能负载过重，5s后重试...", OutputType.WARNING)
+                    time.sleep(5)
+                    continue
+                return ret
         except Exception as e:
             raise Exception(f"{self.name}: 模型调用失败: {str(e)}")
 
@@ -110,24 +117,21 @@ class Agent:
 
 核心能力：
 1. 使用现有工具完成任务
-2. 通过 generate_tool 创建新工具扩展功能
-3. 通过 create_sub_agent 创建子代理处理独立任务
-4. 访问和理解网页内容（无需使用工具）
+2. 访问和理解网页内容（无需使用工具）
 5. 遵循 ReAct (思考-行动-观察) 框架
 
 工作流程：
 1. 思考
    - 分析需求和可用工具
-   - 评估是否需要新工具
-   - 考虑是否需要拆分子任务
+   - 评估是否能用现有工具完成
+   - 考虑是否需要访问网页
    - 规划解决方案
-   - 确定是否需要访问网页
 
 2. 行动 (如果需要)
-   - 使用现有工具
-   - 创建新工具
-   - 创建子代理
+   - 优先使用现有工具
    - 访问网页获取信息
+   - 创建新工具（成本高，谨慎使用）
+   - 创建子代理（成本高，谨慎使用）
    - 询问更多信息
    
 3. 观察
@@ -135,58 +139,12 @@ class Agent:
    - 分析反馈
    - 规划下一步
 
-网页访问能力：
-- 可以直接访问和阅读网页内容
-- 无需使用额外工具
-- 可以提取和分析网页信息
-- 支持多种网页格式
-- 注意：仅支持公开访问的网页
-
-任务拆分建议：
-- 当任务包含多个独立步骤时
-- 当子任务需要独立的上下文时
-- 当子任务有明确的完成目标时
-- 当需要并行处理多个任务时
-
-创建子代理时，必须提供尽可能多的上下文信息，以确保其正确工作。
-
-创建子代理示例：
-<START_TOOL_CALL>
-name: create_sub_agent
-arguments:
-    agent_name: CodeAnalyzer
-    task: 分析项目代码质量
-    context: |
-        这是一个Python项目
-        使用了Flask框架
-        需要关注性能和安全性
-    goal: 生成代码质量分析报告
-<END_TOOL_CALL>
-
-创建新工具示例：
-<START_TOOL_CALL>
-name: generate_tool
-arguments:
-    tool_name: custom_tool_name
-    class_name: CustomToolName
-    description: 详细的工具描述
-    parameters:
-        type: object
-        properties:
-            param1: 
-                type: string
-                description: 参数1的描述
-        required: [param1]
-<END_TOOL_CALL>
-
 工具使用格式：
 <START_TOOL_CALL>
 name: tool_name
 arguments:
     param1: value1
-    param2: |
-        multiline
-        value
+    param2: value2
 <END_TOOL_CALL>
 
 严格规则：

jarvis/models/kimi.py

@@ -45,11 +45,11 @@ class KimiModel(BaseModel):
             PrettyOutput.print(f"Failed to create chat: {e}: Response: {response.text}", OutputType.ERROR)
             return False
 
-    def _get_presigned_url(self, filename: str) -> Dict:
+    def _get_presigned_url(self, filename: str, action: str) -> Dict:
         """获取预签名上传URL"""
         url = "https://kimi.moonshot.cn/api/pre-sign-url"
-        mime_type, _ = mimetypes.guess_type(filename)
-        action = "image" if mime_type and mime_type.startswith('image/') else "file"
+        
+        
         
         payload = json.dumps({
             "action": action,
@@ -75,11 +75,11 @@ class KimiModel(BaseModel):
             PrettyOutput.print(f"Failed to upload file: {e}", OutputType.ERROR)
             return False
 
-    def _get_file_info(self, file_data: Dict, name: str) -> Dict:
+    def _get_file_info(self, file_data: Dict, name: str, file_type: str) -> Dict:
         """获取文件信息"""
         url = "https://kimi.moonshot.cn/api/file"
         payload = json.dumps({
-            "type": "file",
+            "type": file_type,
             "name": name,
             "object_name": file_data["object_name"],
             "chat_id": self.chat_id,
@@ -114,6 +114,7 @@ class KimiModel(BaseModel):
                     continue
                     
                 line = line.decode('utf-8')
+                print(data)
                 if not line.startswith("data: "):
                     continue
                     
@@ -149,25 +150,33 @@ class KimiModel(BaseModel):
         for index, file_path in enumerate(file_list, 1):
             try:
                 PrettyOutput.print(f"处理文件 [{index}/{len(file_list)}]: {file_path}", OutputType.PROGRESS)
+
+                mime_type, _ = mimetypes.guess_type(file_path)
+                action = "image" if mime_type and mime_type.startswith('image/') else "file"
                 
                 # 获取预签名URL
                 PrettyOutput.print("获取上传URL...", OutputType.PROGRESS)
-                presigned_data = self._get_presigned_url(file_path)
+                presigned_data = self._get_presigned_url(file_path, action)
                 
                 # 上传文件
                 PrettyOutput.print("上传文件内容...", OutputType.PROGRESS)
                 if self._upload_file(file_path, presigned_data["url"]):
                     # 获取文件信息
                     PrettyOutput.print("获取文件信息...", OutputType.PROGRESS)
-                    file_info = self._get_file_info(presigned_data, os.path.basename(file_path))
-                    
+                    file_info = self._get_file_info(presigned_data, os.path.basename(file_path), action)
                     # 等待文件解析
                     PrettyOutput.print("等待文件解析完成...", OutputType.PROGRESS)
-                    if self._wait_for_parse(file_info["id"]):
+
+                    # 只有文件需要解析
+                    if action == "file":
+                        if self._wait_for_parse(file_info["id"]):
+                            uploaded_files.append(file_info)
+                            PrettyOutput.print(f"✓ 文件处理成功: {file_path}", OutputType.SUCCESS)
+                        else:
+                            PrettyOutput.print(f"✗ 文件解析失败: {file_path}", OutputType.ERROR)
+                    else:
                         uploaded_files.append(file_info)
                         PrettyOutput.print(f"✓ 文件处理成功: {file_path}", OutputType.SUCCESS)
-                    else:
-                        PrettyOutput.print(f"✗ 文件解析失败: {file_path}", OutputType.ERROR)
                 else:
                     PrettyOutput.print(f"✗ 文件上传失败: {file_path}", OutputType.ERROR)
                     

{jarvis_ai_assistant-0.1.25.dist-info → jarvis_ai_assistant-0.1.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.25
+Version: 0.1.27
 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.25.dist-info → jarvis_ai_assistant-0.1.27.dist-info}/RECORD

@@ -1,9 +1,9 @@
-jarvis/__init__.py,sha256=YnjXMmRo_KCSQrr3qXoD-Bcxme06VXLi3Hv_Gkg5Wb0,50
-jarvis/agent.py,sha256=hfb3_62s8ZA6p5HZhoThn1J6lsyEtENEx1f5TnX26rY,9950
+jarvis/__init__.py,sha256=Fj_UT_4WMGLEY1mjykZXmNgbvAZS2nJ4td9FdLfDzm0,50
+jarvis/agent.py,sha256=xAOckL7bousDnNPGD_4hHGEiXXel5RDSEPE69EazZsM,9012
 jarvis/main.py,sha256=5_8cFOMfHJskLYj4kIP6yRq589Rvn4oPk1yDE0iMNzQ,7806
 jarvis/utils.py,sha256=YuY8zpfD2kgjjJyWcT62OCq3ADuFuqwStqXFTbq16o8,6603
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=OaWsicQD_Ymg9e-BeO8jBfDD9YvwJuE0B-nDRHvCw60,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=PtH_PA_LT0ZjROfRdKFgjL0yTAsv_llnm7qW2n3RaV0,12885
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=5U6YTtU4f-ueIzY1qA5oYSr5RGj98HbxmPDSSleZS8c,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=Bpi1WRBOY9_Pg9hSph_4AQDDxK_v9RNXpTEInBqTA8I,12016
 jarvis/__pycache__/main.cpython-313.pyc,sha256=jVqTajUJ1gOKj2cyPWB-D5cddFvTMjeRYcKoSCF7Nws,10343
 jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
 jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
@@ -11,10 +11,10 @@ jarvis/__pycache__/utils.cpython-313.pyc,sha256=zs6OSkLlBeTHuIrJoRfnzFdJ5VkcdrUm
 jarvis/__pycache__/zte_llm.cpython-313.pyc,sha256=kMm9IGundGmOPqjsgrm9oIaWLDagYGCPRAaE3ipkc-0,5662
 jarvis/models/__init__.py,sha256=B_IJFvKTaxdg19FAD1ea288tYp3-bRYRpkeGI0_OcBI,262
 jarvis/models/base.py,sha256=GgVl5N0qDqn-yqRcX_PX3wHjogouE6GPFAWktG40cXg,403
-jarvis/models/kimi.py,sha256=ALT-QJkqPPMPMac996qSD2x7WIBUz8cP92EAlH6QgD8,15102
+jarvis/models/kimi.py,sha256=Kg-GCiRkO-YAfRLxUNAeugksK8JcaoJGx9NaMvTF2Pk,15488
 jarvis/models/__pycache__/__init__.cpython-313.pyc,sha256=jAwySX4diR7EWM_alK75tiIb_J8bVfs4Bh_U3bdjDLo,534
 jarvis/models/__pycache__/base.cpython-313.pyc,sha256=4I9KZlXHvTB7vENA9YWK4Fx0sns_KvIOtWqzE9y_-Co,1094
-jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=eooGg5L_tbOLH4Ct2ZMH1eW9ShKzW7pXO1X04iliwlo,17733
+jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=7ZpjS1imnK8urSXnCr-Bz2MhMIdGCZRUCI1oz0sfF18,18018
 jarvis/tools/__init__.py,sha256=AjmFYLXt-_ulZXdYiXya2fD7QCJ-RaK91PEZCNj-UbA,262
 jarvis/tools/base.py,sha256=zILvGZ-V5LH1Zicor4rpc9XZvZ9Q4y6kMauqNtn0_p8,7404
 jarvis/tools/file_ops.py,sha256=KbQLVCCXw-MtJg-12iyMeVGu8BTtLq7Mk7fpVKau40U,4296
@@ -37,9 +37,9 @@ jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRv
 jarvis/tools/__pycache__/user_input.cpython-313.pyc,sha256=JjTFOhObKsKF4Pn8KBRuKfV1_Ssj083fjU7Mfc_5z7c,2531
 jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
 jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=BjzSfnNzsKCrLETCcWjt32lNDLzwnjqcVGg4JfWd9OM,3008
-jarvis_ai_assistant-0.1.25.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.25.dist-info/METADATA,sha256=AV6t-KcHXghM9InUiq17_Si-C4irZxDJ1b4ZaJWynBc,10193
-jarvis_ai_assistant-0.1.25.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.25.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.25.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.25.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.27.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.27.dist-info/METADATA,sha256=R5uxbH_zh24BN8xL0W44U-teN8RZeP_tEqyY5-Zhpl4,10193
+jarvis_ai_assistant-0.1.27.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.27.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.27.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.27.dist-info/RECORD,,