jarvis-ai-assistant 0.1.186__py3-none-any.whl → 0.1.187__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.186"
+__version__ = "0.1.187"

jarvis/jarvis_agent/__init__.py

@@ -436,7 +436,9 @@ class Agent:
         if self.conversation_length > self.max_token_count:
             message = self._summarize_and_clear_history() + "\n\n" + message
             self.conversation_length += get_context_token_count(message)
-        return self.model.chat_until_success(message)  # type: ignore
+        response = self.model.chat_until_success(message)  # type: ignore
+        self.conversation_length += get_context_token_count(response)
+        return response
 
     def _summarize_and_clear_history(self) -> str:
         """总结当前对话并清理历史记录
@@ -780,27 +782,23 @@ arguments:
                 # 如果有上传文件，先上传文件
                 if self.files and isinstance(self.model, BasePlatform) and hasattr(self.model, "upload_files"):
                     self.model.upload_files(self.files)
-                    self.prompt = f"{user_input}\n\n已上传{len(self.files)}个文件到平台"
+                    self.prompt = f"{user_input}"
                 
                 # 如果启用方法论且没有上传文件，上传方法论
                 elif self.use_methodology:
                     platform = self.model if hasattr(self.model, "upload_files") else None
                     if platform and upload_methodology(platform):
-                        self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
+                        self.prompt = f"{user_input}"
                     else:
                         # 上传失败则回退到本地加载
                         self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(user_input, self.get_tool_registry())}"
 
                 self.first = False
 
-            self.conversation_length = get_context_token_count(self.prompt)
             while True:
                 try:
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
-                    self.conversation_length += get_context_token_count(
-                        current_response
-                    )
 
                     need_return, self.prompt = self._call_tools(current_response)
 

jarvis/jarvis_agent/main.py

@@ -35,7 +35,7 @@ def main():
     """Main entry point for Jarvis agent"""
     # Set up argument parser
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
-    parser.add_argument('-f', '--config', type=str, required=True,
+    parser.add_argument('-f', '--config', type=str, required=False,
                         help='Path to agent config file')
     parser.add_argument('-c', '--agent_definition', type=str,
                         help='Path to agent definition file')

{jarvis_ai_assistant-0.1.186.dist-info → jarvis_ai_assistant-0.1.187.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.186
+Version: 0.1.187
 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.186.dist-info → jarvis_ai_assistant-0.1.187.dist-info}/RECORD

@@ -1,9 +1,9 @@
-jarvis/__init__.py,sha256=2Jubd1by59etw8bG1OynB8re955CEag1nBes2ilDJD4,74
-jarvis/jarvis_agent/__init__.py,sha256=Mho0roePyuitHFjVCbK0_v9FPgEarcpvgIvY3sQKLws,30843
+jarvis/__init__.py,sha256=asOF79piCkaX_uxiI4Oz9X7T0At-IuYPfb0XQlJZ6k8,74
+jarvis/jarvis_agent/__init__.py,sha256=GBlsKYlZUpBekI7mTYFqAsmjXhlxMbIAoHkBpNjwt7M,30611
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=f4DaEHPakXcAbgykFP-tiOQP6fh_yGFlZx_h91_j2tQ,1529
 jarvis/jarvis_agent/file_input_handler.py,sha256=7u8pXWD7F9mmiJkr9XO83mhFu40FSRoYQm55DbZHgQo,4203
 jarvis/jarvis_agent/jarvis.py,sha256=gOZfTwVlG-GZxPjgCoSiIcFsl4RwwfPA0CGUjE5J7oU,6249
-jarvis/jarvis_agent/main.py,sha256=EDHk8N4QD2ssS9yWnxXC7rYMgWdsHeHf3VSLIz31fBk,2851
+jarvis/jarvis_agent/main.py,sha256=hgyf0QDESx88GlqYfGelxJ5HCpYOpm3FlcDXc-5jtjE,2852
 jarvis/jarvis_agent/output_handler.py,sha256=7qori-RGrQmdiFepoEe3oPPKJIvRt90l_JDmvCoa4zA,1219
 jarvis/jarvis_agent/shell_input_handler.py,sha256=pi3AtPKrkKc6K9e99S1djKXQ_XrxtP6FrSWebQmRT6E,1261
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -91,9 +91,9 @@ jarvis/jarvis_utils/methodology.py,sha256=A8pE8ZqNHvGKaDO4TFtg7Oz-hAXPBcQfhmSPWM
 jarvis/jarvis_utils/output.py,sha256=QboL42GtG_dnvd1O64sl8o72mEBhXNRADPXQMXgDE7Q,9661
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
 jarvis/jarvis_utils/utils.py,sha256=dTFIN6EV48BuC4VOyvcVcj4P0tsWysc9ennbMRhLJjk,10960
-jarvis_ai_assistant-0.1.186.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.186.dist-info/METADATA,sha256=9W9DQ__NkfHLemo6-uXEn62SiFyrg9iVuNSE2yPs2mE,15923
-jarvis_ai_assistant-0.1.186.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.186.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.186.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.186.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.187.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.187.dist-info/METADATA,sha256=lbhXX4AEUFxgJOFe_c2Sz40dB98YotFgNHHnhtB4WU4,15923
+jarvis_ai_assistant-0.1.187.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.187.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.187.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.187.dist-info/RECORD,,