jarvis-ai-assistant 0.1.186__tar.gz → 0.1.187__tar.gz

{jarvis_ai_assistant-0.1.186/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.187}/PKG-INFO

@@ -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 → jarvis_ai_assistant-0.1.187}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.186"
+version = "0.1.187"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.1.186 → jarvis_ai_assistant-0.1.187}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.186",
+    version="0.1.187",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.186 → jarvis_ai_assistant-0.1.187}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.186 → jarvis_ai_assistant-0.1.187}/src/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_ai_assistant-0.1.186 → jarvis_ai_assistant-0.1.187}/src/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 → jarvis_ai_assistant-0.1.187/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -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