jarvis-ai-assistant 0.1.24__py3-none-any.whl → 0.1.26__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.24" 
+__version__ = "0.1.26" 

jarvis/models/kimi.py

@@ -10,7 +10,7 @@ import time
 class KimiModel(BaseModel):
     """Kimi模型实现"""
     
-    def __init__(self, api_key: str, verbose: bool = False):
+    def __init__(self, api_key: Optional[str] = None, verbose: bool = False):
         """
         初始化Kimi模型
         Args:
@@ -42,14 +42,14 @@ class KimiModel(BaseModel):
             self.chat_id = response.json()["id"]
             return True
         except Exception as e:
-            PrettyOutput.print(f"Failed to create chat: {e}", OutputType.ERROR)
+            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/tools/base.py

@@ -106,7 +106,7 @@ class ToolRegistry:
                     hasattr(item, 'parameters')):
                     
                     # 实例化工具类，传入模型和输出处理器
-                    tool_instance = item(model=KimiModel(self.verbose), register=self, output_handler=self.output_handler)
+                    tool_instance = item(model=KimiModel(verbose=self.verbose), register=self, output_handler=self.output_handler)
                     
                     # 注册工具
                     self.register_tool(

{jarvis_ai_assistant-0.1.24.dist-info → jarvis_ai_assistant-0.1.26.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
-jarvis/__init__.py,sha256=nanlbBf5leSgDsqUDpE5iGFnYyzKYTa9JxGzj2LVAYI,50
+jarvis/__init__.py,sha256=9OHRsOGRDWhP3EJS60c3-iXj0x4fUS5VIIpMM1p7KH0,50
 jarvis/agent.py,sha256=hfb3_62s8ZA6p5HZhoThn1J6lsyEtENEx1f5TnX26rY,9950
 jarvis/main.py,sha256=5_8cFOMfHJskLYj4kIP6yRq589Rvn4oPk1yDE0iMNzQ,7806
 jarvis/utils.py,sha256=YuY8zpfD2kgjjJyWcT62OCq3ADuFuqwStqXFTbq16o8,6603
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=zwblZMtb8j7BoaOH3V_9YTf9CTPmITqyweh2kAJfYjI,209
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=xkkgNtiHAmhRCRGa8pkI5gthH407tPH74ku_GWH7olI,209
 jarvis/__pycache__/agent.cpython-313.pyc,sha256=PtH_PA_LT0ZjROfRdKFgjL0yTAsv_llnm7qW2n3RaV0,12885
 jarvis/__pycache__/main.cpython-313.pyc,sha256=jVqTajUJ1gOKj2cyPWB-D5cddFvTMjeRYcKoSCF7Nws,10343
 jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
@@ -11,18 +11,18 @@ 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=rFZBQNHsb4KkDMLCy1koGfeN8nJZoscrr8c306T1edM,15058
+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=GeDyquqf1irlwwFEEQ6AW9d77fjQBgxGfCriCNOVmg8,17661
+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=bJt5tZHKeCDPnNzo2cthoyGgU3MWTu8LsaP8knCsDlk,7396
+jarvis/tools/base.py,sha256=zILvGZ-V5LH1Zicor4rpc9XZvZ9Q4y6kMauqNtn0_p8,7404
 jarvis/tools/file_ops.py,sha256=KbQLVCCXw-MtJg-12iyMeVGu8BTtLq7Mk7fpVKau40U,4296
 jarvis/tools/generator.py,sha256=qURQ2ct61tRaN-CNhnbpjoj7recGGjFWnQUteKvej_g,7430
 jarvis/tools/shell.py,sha256=MWe9-BAGApbGJfR60XG4nElGYHNBnbdF9vsOQTnEZ4g,2989
 jarvis/tools/sub_agent.py,sha256=jU0j__Y5ufBktxIF5qdT3NyLHnybE23c39QRj3oz5CI,3381
 jarvis/tools/__pycache__/__init__.cpython-313.pyc,sha256=KC48FS57427navbkxZ0eDKLePMCH2BKc5vAIu0b8lFc,404
-jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=Xk9d0W4uY3BeNgqR9IX2MpOMupfZVETvvb96bPE2sKs,9986
+jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=NTatHbOlZpVFNJWhroIpJtJ6YZpUVsgs40-hhY8jL-4,10000
 jarvis/tools/__pycache__/bing_search.cpython-313.pyc,sha256=1G_wPbk5wcQYh7H0drLIS2Aw0XOG2ZM8ztgfQaqu3P8,2031
 jarvis/tools/__pycache__/calculator.cpython-313.pyc,sha256=C_qwTDGm6gc7QNxtPzPZXyStdKEintJVQIt5NMHQ8oY,4205
 jarvis/tools/__pycache__/calculator_tool.cpython-313.pyc,sha256=PI4LZNDTPdSe3ffWDRovLZ-r-vF8Kl-n6xdGdFWiBpY,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.24.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.24.dist-info/METADATA,sha256=BbzIp_CZ1cA3lNCuN5HW7OqiErAkJdksqK7rLFThVNM,10193
-jarvis_ai_assistant-0.1.24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.24.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.24.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.24.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.26.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.26.dist-info/METADATA,sha256=p9er_0dmX2gEeAUs143JqAthnglF_F47q-DEq-jSGcg,10193
+jarvis_ai_assistant-0.1.26.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.26.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.26.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.26.dist-info/RECORD,,