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

jarvis/__init__.py

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

jarvis/agent.py

@@ -77,12 +77,13 @@ class Agent:
         except Exception as e:
             raise Exception(f"{self.name}: 模型调用失败: {str(e)}")
 
-    def run(self, user_input: str, file_list: Optional[List[str]] = None):
+    def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False):
         """处理用户输入并返回响应，返回任务总结报告
         
         Args:
             user_input: 用户输入的任务描述
             file_list: 可选的文件列表，默认为None
+            keep_history: 是否保留对话历史，默认为False
         
         Returns:
             str: 任务总结报告
@@ -245,11 +246,12 @@ arguments:
             return f"Task failed: {str(e)}"
         
         finally:
-            # 确保在所有情况下都删除会话
-            try:
-                self.model.delete_chat()
-            except Exception as e:
-                PrettyOutput.print(f"清理会话时发生错误: {str(e)}", OutputType.ERROR)
+            # 只在不保留历史时删除会话
+            if not keep_history:
+                try:
+                    self.model.delete_chat()
+                except Exception as e:
+                    PrettyOutput.print(f"清理会话时发生错误: {str(e)}", OutputType.ERROR)
 
     def clear_history(self):
         """清除对话历史，只保留系统提示"""

jarvis/main.py

@@ -90,6 +90,7 @@ def main():
     # Add argument parser
     parser = argparse.ArgumentParser(description='Jarvis AI Assistant')
     parser.add_argument('-f', '--files', nargs='*', help='List of files to process')
+    parser.add_argument('--keep-history', action='store_true', help='Keep chat history (do not delete chat session)')
     args = parser.parse_args()
 
     load_env_from_file()
@@ -125,6 +126,8 @@ def main():
 
         # 欢迎信息
         PrettyOutput.print(f"Jarvis 已初始化 - With Kimi", OutputType.SYSTEM)
+        if args.keep_history:
+            PrettyOutput.print("已启用历史保留模式", OutputType.INFO)
         
         # 加载预定义任务
         tasks = load_tasks()
@@ -132,7 +135,7 @@ def main():
             selected_task = select_task(tasks)
             if selected_task:
                 PrettyOutput.print(f"\n执行任务: {selected_task}", OutputType.INFO)
-                agent.run(selected_task, args.files)
+                agent.run(selected_task, args.files, keep_history=args.keep_history)
                 return 0
         
         # 如果没有选择预定义任务，进入交互模式
@@ -141,7 +144,7 @@ def main():
                 user_input = get_multiline_input("请输入您的任务(输入空行退出):")
                 if not user_input or user_input == "__interrupt__":
                     break
-                agent.run(user_input, args.files)
+                agent.run(user_input, args.files, keep_history=args.keep_history)
             except Exception as e:
                 PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 

jarvis/models/kimi.py

@@ -261,7 +261,7 @@ class KimiModel(BaseModel):
             response = requests.delete(url, headers=headers)
             if response.status_code == 200:
                 PrettyOutput.print("会话已删除", OutputType.SUCCESS)
-                self.chat_id = ""  # 清除会话ID
+                self.reset()
                 return True
             else:
                 PrettyOutput.print(f"删除会话失败: HTTP {response.status_code}", OutputType.ERROR)
@@ -272,8 +272,6 @@ class KimiModel(BaseModel):
 
     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 → jarvis_ai_assistant-0.1.17.dist-info}/METADATA

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

@@ -1,20 +1,20 @@
-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/__init__.py,sha256=xxLxgf6AkpQC_oecmvL8lRlgdfb5m-km2HjhnO8aW1U,50
+jarvis/agent.py,sha256=f8RIOFIiwRAuql4O32P_nDXByzBKbrNM-ergf_F8FfU,9409
+jarvis/main.py,sha256=Llbg-3oV5GkGxergaYbAByAunNol9cvBRitYURvjy4s,7051
 jarvis/utils.py,sha256=YipQpEuIRwFE3y3YrgGlSVLEPDrlbBNY1gRiOJix9DU,6602
-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__/__init__.cpython-313.pyc,sha256=TpUmCVKoqlVLwQ1cPv_nR5XhD2vW505asH_ltcKmAko,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=anFGVa4pfpsOCDbstPAPSsUmglCZUrRkuDN-jnvhSyI,12152
+jarvis/__pycache__/main.cpython-313.pyc,sha256=1Dc3AKvb_cgJnl-aZOkV1_dXxhrcZnxtczzo0uthRtY,9674
 jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
 jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
 jarvis/__pycache__/utils.cpython-313.pyc,sha256=Jpkf2GOA1d_fgrRftqZch1yiO0mB75LWHzQk8IfhHRU,8977
 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=YzMLC6_grynNVdPzBBmluFHvcDGdikwxMq7Tl7c6JLA,10791
+jarvis/models/kimi.py,sha256=CR3rU4wPSUQjmYOP516NXLU6h3YtcF6taB-4da3-rA4,10690
 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=RZIfeTDZgvJX7GyEZJ1NT_22WQJ2CyK5xR8RZ-L6WBQ,13717
+jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=-hOwhZrfvqfd5K_c34Tm-uR3gaZ9r6EV1NtwV0-FDmg,13647
 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,9 +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.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,,
+jarvis_ai_assistant-0.1.17.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.17.dist-info/METADATA,sha256=qrsMqKWDAyI_fvhoS18eKxn5TQ_28vIuzgIkb1-90yU,6525
+jarvis_ai_assistant-0.1.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.17.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.17.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.17.dist-info/RECORD,,