jarvis-ai-assistant 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.14" 
+__version__ = "0.1.16" 

jarvis/agent.py

@@ -87,21 +87,22 @@ class Agent:
         Returns:
             str: 任务总结报告
         """
-        self.clear_history()
-        
-        if file_list:
-            self.model.upload_files(file_list)
-        
-        # 显示任务开始
-        PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
+        try:
+            self.clear_history()
+            
+            if file_list:
+                self.model.upload_files(file_list)
+            
+            # 显示任务开始
+            PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
 
-        tools_prompt = "可用工具:\n"
-        for tool in self.tool_registry.get_all_tools():
-            tools_prompt += f"- 名称: {tool['name']}\n"
-            tools_prompt += f"  描述: {tool['description']}\n"
-            tools_prompt += f"  参数: {tool['parameters']}\n"
+            tools_prompt = "可用工具:\n"
+            for tool in self.tool_registry.get_all_tools():
+                tools_prompt += f"- 名称: {tool['name']}\n"
+                tools_prompt += f"  描述: {tool['description']}\n"
+                tools_prompt += f"  参数: {tool['parameters']}\n"
 
-        self.prompt =f"""你是 {self.name}，一个严格遵循 ReAct 框架进行逐步推理和行动的 AI 助手。
+            self.prompt = f"""你是 {self.name}，一个严格遵循 ReAct 框架进行逐步推理和行动的 AI 助手。
 
 {tools_prompt}
 
@@ -194,53 +195,61 @@ arguments:
 任务:
 {user_input}
 """
-            
-        
-        while True:
-            try:
-                # 显示思考状态
-                PrettyOutput.print("分析任务...", OutputType.PROGRESS)
-                
-                current_response = self._call_model(self.prompt)
 
+            while True:
                 try:
-                    result = Agent.extract_tool_calls(current_response)
-                except Exception as e:
-                    PrettyOutput.print(f"工具调用错误: {str(e)}", OutputType.ERROR)
-                    self.prompt = f"工具调用错误: {str(e)}"
-                    continue
-                
-                if len(result) > 0:
+                    # 显示思考状态
+                    PrettyOutput.print("分析任务...", OutputType.PROGRESS)
+                    
+                    current_response = self._call_model(self.prompt)
+
                     try:
-                        # 显示工具调用
-                        PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
-                        tool_result = self.tool_registry.handle_tool_calls(result)
-                        PrettyOutput.print(tool_result, OutputType.RESULT)
+                        result = Agent.extract_tool_calls(current_response)
                     except Exception as e:
-                        PrettyOutput.print(str(e), OutputType.ERROR)
-                        tool_result = f"Tool call failed: {str(e)}"
-
-                    self.prompt = tool_result
-                    continue
-                
-                # 获取用户输入
-                user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行结束当前任务")
-                if user_input == "__interrupt__":
-                    PrettyOutput.print("任务已取消", OutputType.WARNING)
-                    return "Task cancelled by user"
-                if user_input:
-                    self.prompt = user_input
-                    continue
-                
-                if not user_input:
+                        PrettyOutput.print(f"工具调用错误: {str(e)}", OutputType.ERROR)
+                        self.prompt = f"工具调用错误: {str(e)}"
+                        continue
+                    
+                    if len(result) > 0:
+                        try:
+                            # 显示工具调用
+                            PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
+                            tool_result = self.tool_registry.handle_tool_calls(result)
+                            PrettyOutput.print(tool_result, OutputType.RESULT)
+                        except Exception as e:
+                            PrettyOutput.print(str(e), OutputType.ERROR)
+                            tool_result = f"Tool call failed: {str(e)}"
+
+                        self.prompt = tool_result
+                        continue
+                    
+                    # 获取用户输入
+                    user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行结束当前任务")
+                    if user_input == "__interrupt__":
+                        PrettyOutput.print("任务已取消", OutputType.WARNING)
+                        return "Task cancelled by user"
+                    if user_input:
+                        self.prompt = user_input
+                        continue
+                    
+                    if not user_input:
                         PrettyOutput.section("任务完成", OutputType.SUCCESS)
                         return 
-                
 
-                
-                
+                except Exception as e:
+                    PrettyOutput.print(str(e), OutputType.ERROR)
+                    return f"Task failed: {str(e)}"
+
+        except Exception as e:
+            PrettyOutput.print(str(e), OutputType.ERROR)
+            return f"Task failed: {str(e)}"
+        
+        finally:
+            # 确保在所有情况下都删除会话
+            try:
+                self.model.delete_chat()
             except Exception as e:
-                PrettyOutput.print(str(e), OutputType.ERROR)
+                PrettyOutput.print(f"清理会话时发生错误: {str(e)}", OutputType.ERROR)
 
     def clear_history(self):
         """清除对话历史，只保留系统提示"""

jarvis/models/kimi.py

@@ -246,8 +246,34 @@ class KimiModel(BaseModel):
         except Exception as e:
             raise Exception(f"Chat failed: {str(e)}")
 
+    def delete_chat(self) -> bool:
+        """删除当前会话"""
+        if not self.chat_id:
+            return True  # 如果没有会话ID，视为删除成功
+            
+        url = f"https://kimi.moonshot.cn/api/chat/{self.chat_id}"
+        headers = {
+            'Authorization': self.auth_header,
+            'Content-Type': 'application/json'
+        }
+        
+        try:
+            response = requests.delete(url, headers=headers)
+            if response.status_code == 200:
+                PrettyOutput.print("会话已删除", OutputType.SUCCESS)
+                self.chat_id = ""  # 清除会话ID
+                return True
+            else:
+                PrettyOutput.print(f"删除会话失败: HTTP {response.status_code}", OutputType.ERROR)
+                return False
+        except Exception as e:
+            PrettyOutput.print(f"删除会话时发生错误: {str(e)}", OutputType.ERROR)
+            return False
+
     def reset(self):
         """重置对话"""
+        if self.chat_id:
+            self.delete_chat()  # 删除现有会话
         self.chat_id = ""
         self.uploaded_files = []
         self.first_chat = True  # 重置first_chat标记

jarvis_ai_assistant-0.1.16.dist-info/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 skyfire
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{jarvis_ai_assistant-0.1.14.dist-info → jarvis_ai_assistant-0.1.16.dist-info}/METADATA

@@ -1,10 +1,31 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.14
+Version: 0.1.16
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
 Author-email: Your Name <your.email@example.com>
+License: MIT License
+        
+        Copyright (c) 2025 skyfire
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
 Project-URL: Homepage, https://github.com/skyfireitdiy/Jarvis
 Keywords: jarvis,ai,assistant,tools,automation
 Classifier: License :: OSI Approved :: MIT License
@@ -16,6 +37,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: requests>=2.25.1
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: colorama>=0.4.6

{jarvis_ai_assistant-0.1.14.dist-info → jarvis_ai_assistant-0.1.16.dist-info}/RECORD

@@ -1,9 +1,9 @@
-jarvis/__init__.py,sha256=ASmWOyubd5yF30GOCGKZ5qOTjVIoSmQ4eOT7ImnQHpw,50
-jarvis/agent.py,sha256=xo5YdY8UbgE3AJaitT1dXoNoVm769LrWyFzEXxVCG7A,8672
+jarvis/__init__.py,sha256=IrFrXtY58xy8OQAUNGadwY5YeK6GgT8xcnXUEb2EWb8,50
+jarvis/agent.py,sha256=sa8un7OmbGRlSAD4V-Be0Y9-TCT-S_0OFFthEBXWdVs,9267
 jarvis/main.py,sha256=QD8FlhpJ-PFUEOjt77gllpHEgqtfNKV_S8NQZSWRTbE,6760
 jarvis/utils.py,sha256=YipQpEuIRwFE3y3YrgGlSVLEPDrlbBNY1gRiOJix9DU,6602
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=LOM8mV9fUUpfEt-eCawXu9EW44gzfiAAUY7tOmgtjBM,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=DP0zgyKjGuwc62rH_vpoy_hXmGMI3zoHPlXZYu0qqp4,9956
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=P5b0eXfExQu7lDPOOOphvz7WiD2NJHJfsRVoYfDdTbw,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=rrAZtJSYuJZcTL8gdF0S7XdaNQxpMA8BnNrSoLAny_Q,11913
 jarvis/__pycache__/main.cpython-313.pyc,sha256=vsL4l0JZFp805S22a0uZR_9k6NhpHrb-YHFY61JXF4M,9279
 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=Jpkf2GOA1d_fgrRftqZch1yiO0mB75LW
 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=J_0QB6XY61tY-Oeu2cexWto58QbMU_liYj1f6PKbNRw,9763
+jarvis/models/kimi.py,sha256=YzMLC6_grynNVdPzBBmluFHvcDGdikwxMq7Tl7c6JLA,10791
 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=ks1WiR1d8NTu-0B4s9zIyifWUvijBN4qI6AFD0Jtgk0,12524
+jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=RZIfeTDZgvJX7GyEZJ1NT_22WQJ2CyK5xR8RZ-L6WBQ,13717
 jarvis/tools/__init__.py,sha256=000SvX1Z0yzKtuVR9NS45r41DHUVpE6EiSEzzE99uR0,196
 jarvis/tools/base.py,sha256=qm73kMOkqAWHjUisUWFye-x69LJuZdwm0U3Tct-mmMc,3890
 jarvis/tools/file_ops.py,sha256=zTksx45NZm3iz9itN5iQGZ8DoxnSeTHdrnF08_ix7PU,3770
@@ -32,8 +32,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.14.dist-info/METADATA,sha256=c9CfamgEPsk1HeSU6wx7onzQ7rWerFpOkh1Jz7IgkYU,5270
-jarvis_ai_assistant-0.1.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.14.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.14.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.14.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.16.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.16.dist-info/METADATA,sha256=MM6V4lp04d0vFDoNIhU6NqFpi8zgXBsMXlX5wAHrJII,6525
+jarvis_ai_assistant-0.1.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.16.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.16.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.16.dist-info/RECORD,,