jarvis-ai-assistant 0.1.185__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.185"
+__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/jarvis.py

@@ -105,12 +105,13 @@ def _select_task(tasks: Dict[str, str]) -> str:
 def main() -> None:
 
     
-    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！")
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
     parser.add_argument('-p', '--platform', type=str, help='Platform to use')
     parser.add_argument('-m', '--model', type=str, help='Model to use')
     parser.add_argument('-t', '--task', type=str, help='Directly input task content from command line')
+    parser.add_argument('-f', '--config', type=str, help='Path to custom config file')
     args = parser.parse_args()
+    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config)
 
     try:
         agent = Agent(

jarvis/jarvis_agent/main.py

@@ -33,19 +33,21 @@ def load_config(config_path: str) -> dict:
 
 def main():
     """Main entry point for Jarvis agent"""
-    # Initialize environment
-    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！")
-
     # Set up argument parser
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
-    parser.add_argument('-c', '--config', type=str, required=True,
-                        help='Path to the YAML configuration file')
+    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')
     parser.add_argument('-t', '--task', type=str,
                         help='Initial task to execute')
     args = parser.parse_args()
 
+    # Initialize environment
+    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config)
+
     # Load configuration
-    config = load_config(args.config)
+    config = load_config(args.agent_definition) if args.agent_definition else {}
 
     # Create and run agent
     try:

jarvis/jarvis_tools/edit_file.py

@@ -136,7 +136,7 @@ class FileSearchReplaceTool:
         stderr_messages = []
         success = True
         
-        file_path = args["file"]
+        file_path = os.path.abspath(args["file"])
         changes = args["changes"]
         agent = args.get("agent", None)
         

jarvis/jarvis_utils/utils.py

@@ -5,7 +5,7 @@ import subprocess
 import tarfile
 import time
 from pathlib import Path
-from typing import Any, Callable, Dict
+from typing import Any, Callable, Dict, Optional
 
 import yaml
 
@@ -17,7 +17,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 
-def init_env(welcome_str: str) -> None:
+def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
     """初始化环境变量从jarvis_data/env文件
     功能：
     1. 创建不存在的jarvis_data目录
@@ -25,6 +25,10 @@ def init_env(welcome_str: str) -> None:
     3. 处理文件读取异常
     4. 检查git仓库状态并在落后时更新
     5. 统计当前命令使用次数
+
+    参数:
+        welcome_str: 欢迎信息字符串
+        config_file: 配置文件路径，默认为None(使用~/.jarvis/config.yaml)
     """
     count_cmd_usage()
 
@@ -43,35 +47,32 @@ def init_env(welcome_str: str) -> None:
     if welcome_str:
         PrettyOutput.print_gradient_text(jarvis_ascii_art, (0, 120, 255), (0, 255, 200))
 
-    jarvis_dir = Path(get_data_dir())
-    config_file = jarvis_dir / "config.yaml"
+    config_file_path = Path(config_file) if config_file is not None else Path(os.path.expanduser("~/.jarvis/config.yaml"))
 
-    # 检查jarvis_data目录是否存在
-    if not jarvis_dir.exists():
-        jarvis_dir.mkdir(parents=True)
+    # 加载配置文件
+    if not config_file_path.exists():
+        old_config_file = config_file_path.parent / "env"
+        if old_config_file.exists():# 旧的配置文件存在
+            _read_old_config_file(old_config_file)
+    else:
+        _read_config_file(config_file_path.parent, config_file_path)
 
+    # 现在获取最终的数据目录(可能被配置文件修改)
+    data_dir = Path(get_data_dir())
     script_dir = Path(os.path.dirname(os.path.dirname(__file__)))
     hf_archive = script_dir / "jarvis_data" / "huggingface.tar.gz"
 
 
     # 检查并解压huggingface模型
-    hf_dir = jarvis_dir / "huggingface" / "hub"
+    hf_dir = data_dir / "huggingface" / "hub"
     if not hf_dir.exists() and hf_archive.exists():
         try:
             PrettyOutput.print("正在解压HuggingFace模型...", OutputType.INFO)
             with tarfile.open(hf_archive, "r:gz") as tar:
-                tar.extractall(path=jarvis_dir)
+                tar.extractall(path=data_dir)
             PrettyOutput.print("HuggingFace模型解压完成", OutputType.SUCCESS)
         except Exception as e:
-            PrettyOutput.print(f"解压HuggingFace模型失败: {e}", OutputType.ERROR)
-
-
-    if not config_file.exists():
-        old_config_file = jarvis_dir / "env"
-        if old_config_file.exists():# 旧的配置文件存在
-            _read_old_config_file(old_config_file)
-    else:
-        _read_config_file(jarvis_dir, config_file)        
+            PrettyOutput.print(f"解压HuggingFace模型失败: {e}", OutputType.ERROR)   
 
         # 检查是否是git仓库并更新
     from jarvis.jarvis_utils.git_utils import check_and_update_git_repo

{jarvis_ai_assistant-0.1.185.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.185
+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.185.dist-info → jarvis_ai_assistant-0.1.187.dist-info}/RECORD

@@ -1,9 +1,9 @@
-jarvis/__init__.py,sha256=ctjj6eadc4jmCb3OWiljzQVxwTvbZ3urmkzwzSyoUYQ,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=UkNMVUlSNKV6y3v12eAhqc_gIDB6Obxrwk5f7-sQeiQ,6137
-jarvis/jarvis_agent/main.py,sha256=GkjMTIbsd56nkVuRwD_tU_PZWyzixZZhMjVOCd0SzOA,2669
+jarvis/jarvis_agent/jarvis.py,sha256=gOZfTwVlG-GZxPjgCoSiIcFsl4RwwfPA0CGUjE5J7oU,6249
+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
@@ -65,7 +65,7 @@ jarvis/jarvis_tools/chdir.py,sha256=DNKVFrWqu6t_sZ2ipv99s6802QR4cSGlqKlmaI--arE,
 jarvis/jarvis_tools/code_plan.py,sha256=gWR0lzY62x2PxWKoMRBqW6jq7zQuO8vhpjC4TcHSYjk,7685
 jarvis/jarvis_tools/create_code_agent.py,sha256=-nHfo5O5pDIG5IX3w1ClQafGvGcdI2_w75-KGrD-gUQ,3458
 jarvis/jarvis_tools/create_sub_agent.py,sha256=lyFrrg4V0yXULmU3vldwGp_euZjwZzJcRU6mJ20zejY,3023
-jarvis/jarvis_tools/edit_file.py,sha256=czpJOY7Y7Q-SH3UiGfgfB1lRcqtzuIZjLBLZzozcl0A,17330
+jarvis/jarvis_tools/edit_file.py,sha256=o8Arp2-779m8GLVtocS4kfVbAjoBb87nND2fy3bzbV0,17347
 jarvis/jarvis_tools/execute_script.py,sha256=IA1SkcnwBB9PKG2voBNx5N9GXL303OC7OOtdqRfqWOk,6428
 jarvis/jarvis_tools/file_analyzer.py,sha256=7ILHkUFm8pPZn1y_s4uT0kaWHP-EmlHnpkovDdA1yRE,4872
 jarvis/jarvis_tools/file_operation.py,sha256=WloC1-oPJLwgICu4WBc9f7XA8N_Ggl73QQ5CxM2XTlE,9464
@@ -90,10 +90,10 @@ jarvis/jarvis_utils/input.py,sha256=FkLW7MXL8awQUghFLQnW1r5F1wV8K3EZeVPwHFRHJTo,
 jarvis/jarvis_utils/methodology.py,sha256=A8pE8ZqNHvGKaDO4TFtg7Oz-hAXPBcQfhmSPWMr6vdg,8629
 jarvis/jarvis_utils/output.py,sha256=QboL42GtG_dnvd1O64sl8o72mEBhXNRADPXQMXgDE7Q,9661
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
-jarvis/jarvis_utils/utils.py,sha256=atSK-2cUr7_tOIFsQzJnuQxebi7aFN4jtmaoXEaV4jM,10692
-jarvis_ai_assistant-0.1.185.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.185.dist-info/METADATA,sha256=_DBSrubK80hRPGRBLXCpPy7r7tgcEhMM_RDS82mvaFw,15923
-jarvis_ai_assistant-0.1.185.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-jarvis_ai_assistant-0.1.185.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.185.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.185.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=dTFIN6EV48BuC4VOyvcVcj4P0tsWysc9ennbMRhLJjk,10960
+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,,

{jarvis_ai_assistant-0.1.185.dist-info → jarvis_ai_assistant-0.1.187.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any