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

jarvis/__init__.py

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

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:
         """总结当前对话并清理历史记录
@@ -771,36 +773,32 @@ arguments:
         try:
             set_agent(self.name, self)
 
-            for handler in self.input_handler:
-                user_input, _ = handler(user_input, self)
-
             self.prompt = f"{user_input}"
 
             if self.first:
                 # 如果有上传文件，先上传文件
                 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())}"
+                        msg = user_input
+                        for handler in self.input_handler:
+                            msg, _ = handler(msg, self)
+                        self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, 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/file_input_handler.py

@@ -13,69 +13,69 @@ from jarvis.jarvis_utils.utils import is_context_overflow
 
 
 def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
-    """Process user input containing file references and read file contents.
+    """处理包含文件引用的用户输入并读取文件内容。
     
-    Args:
-        user_input: Input string that may contain file references in format:
-            - 'file_path' (whole file)
-            - 'file_path:start_line,end_line' (line range)
-            - 'file_path:start_line:end_line' (alternative range format)
-        agent: Agent object for further processing (currently unused)
+    参数:
+        user_input: 可能包含文件引用的输入字符串，格式为:
+            - 'file_path' (整个文件)
+            - 'file_path:start_line,end_line' (行范围)
+            - 'file_path:start_line:end_line' (替代范围格式)
+        agent: 用于进一步处理的Agent对象(当前未使用)
         
-    Returns:
+    返回:
         Tuple[str, bool]: 
-            - Processed prompt string with file contents prepended
-            - Boolean indicating if context overflow occurred
+            - 处理后的提示字符串，前面附加文件内容
+            - 布尔值，指示是否发生上下文溢出
     """
     prompt = user_input
     files = []
 
-    file_refs = re.findall(r"'([^']+)'", user_input)
+    file_refs = re.findall(r"'([^'\n]+)'", user_input)
     for ref in file_refs:
-        # Handle file:start,end or file:start:end format
+        # 处理 file:start,end 或 file:start:end 格式
         if ':' in ref:
             file_path, line_range = ref.split(':', 1)
-            # Initialize with default values
+            # 使用默认值初始化
             start_line = 1  # 1-based
             end_line = -1
 
-            # Process line range if specified
+            # 如果指定了行范围则进行处理
             if ',' in line_range or ':' in line_range:
                 try:
                     raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
 
-                    # Handle special values and Python-style negative indices
+                    # 处理特殊值和Python风格的负索引
                     try:
                         with open(file_path, 'r', encoding='utf-8', errors="ignore") as f:
                             total_lines = len(f.readlines())
                     except FileNotFoundError:
                         PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
                         continue
-                    # Process start line (0 means whole file, negative means from end)
+                    # 处理起始行(0表示整个文件，负数表示从末尾开始)
                     if raw_start == 0:  # 0表示整个文件
                         start_line = 1
                         end_line = total_lines
                     else:
                         start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
 
-                    # Process end line
+                    # 处理结束行
                     if raw_end == 0:  # 0表示整个文件（如果start也是0）
                         end_line = total_lines
                     else:
                         end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
 
-                    # Auto-correct ranges
+                    # 自动校正范围
                     start_line = max(1, min(start_line, total_lines))
                     end_line = max(start_line, min(end_line, total_lines))
 
-                    # Final validation
+                    # 最终验证
                     if start_line < 1 or end_line > total_lines or start_line > end_line:
                         raise ValueError
 
                 except:
                     continue
 
-            # Add file if it exists
+            # 如果文件存在则添加
             if os.path.isfile(file_path):
                 files.append({
                     "path": file_path,
@@ -83,7 +83,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                     "end_line": end_line
                 })
         else:
-            # Handle simple file path
+            # 处理简单文件路径
             if os.path.isfile(ref):
                 files.append({
                     "path": ref,
@@ -91,7 +91,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                     "end_line": -1
                 })
 
-    # Read and process files if any were found
+    # 如果找到文件则读取并处理
     if files:
         with yaspin(text="正在读取文件...", color="cyan") as spinner:
             old_prompt = prompt

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')
@@ -59,16 +59,15 @@ def main():
             agent.run(args.task)
             return 0
 
-        # Enter interactive mode if no initial task
-        while True:
-            try:
-                user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
-                if not user_input:
-                    break
-                agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行")
-                agent.run(user_input)
-            except Exception as e:
-                PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
+
+        try:
+            user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
+            if not user_input:
+                return 0
+            agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行")
+            agent.run(user_input)
+        except Exception as e:
+            PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 
     except Exception as e:
         PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)

jarvis/jarvis_git_utils/git_commiter.py

@@ -2,7 +2,6 @@
 import argparse
 import os
 import re
-import shlex
 import subprocess
 import sys
 import tempfile
@@ -53,7 +52,7 @@ class GitCommitTool:
         )
         if r:
             # 直接返回原始内容，仅去除外围空白
-            return shlex.quote(r.group(1).strip())
+            return r.group(1).strip()
         return None
 
     def _get_last_commit_hash(self):

jarvis/jarvis_tools/edit_file.py

@@ -435,9 +435,26 @@ def fast_edit(filepath: str, patches: List[Dict[str,str]], spinner: Yaspin) -> T
                 search_text, replace_text)
             spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
         else:
-            success = False
-            err_msg = f"搜索文本 {search_text} 在文件中不存在，请检查补丁内容"
-            break
+            # 尝试增加缩进重试
+            found = False
+            for space_count in range(1, 17):
+                indented_search = '\n'.join(' ' * space_count + line for line in search_text.split('\n'))
+                indented_replace = '\n'.join(' ' * space_count + line for line in replace_text.split('\n'))
+                if indented_search in modified_content:
+                    if modified_content.count(indented_search) > 1:
+                        success = False
+                        err_msg = f"搜索文本 {indented_search} 在文件中存在多处，请检查补丁内容"
+                        break
+                    modified_content = modified_content.replace(
+                        indented_search, indented_replace)
+                    spinner.write(f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)")
+                    found = True
+                    break
+            
+            if not found:
+                success = False
+                err_msg = f"搜索文本 {search_text} 在文件中不存在，尝试增加1-16个空格缩进后仍未找到匹配"
+                break
     if not success:
         revert_file(filepath)
         return False, err_msg

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.186
+Version: 0.1.188
 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.188.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=KuZvt3HQLtENkv0s1NLND9zxkPs9blE1UCYGe9GmPNw,74
+jarvis/jarvis_agent/__init__.py,sha256=76gF2jieAQjP3M6YlDxx2dzaE2XD95nfAFRMySP-Azs,30654
 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/file_input_handler.py,sha256=OfoYI5on6w5BDUUg4OadFcfWzMsUF70GNrlt9QyauvA,4181
 jarvis/jarvis_agent/jarvis.py,sha256=gOZfTwVlG-GZxPjgCoSiIcFsl4RwwfPA0CGUjE5J7oU,6249
-jarvis/jarvis_agent/main.py,sha256=EDHk8N4QD2ssS9yWnxXC7rYMgWdsHeHf3VSLIz31fBk,2851
+jarvis/jarvis_agent/main.py,sha256=miR8wnWBzmbhOfnscyiKo1oI4wZBRU6FEE-k1lkqtiI,2752
 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
@@ -38,7 +38,7 @@ jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jarvis/jarvis_git_details/main.py,sha256=MfR7feVVQ7Eo9eZk-wO2bFypnA6uRrYUQn6iTeoF0Os,9007
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=q8-r0TtVOaCqY_uYwnWAY76k8YCDd5se_feB6ZWKo9M,2278
-jarvis/jarvis_git_utils/git_commiter.py,sha256=RMI1VunK643CS6vL5ZD3ehXr4LbhPKRspzagV8AcPIY,12984
+jarvis/jarvis_git_utils/git_commiter.py,sha256=S8fplYbw5Nl3tj-R6Qqn94MV1bJKX8VAJsBqUX5XAiY,12958
 jarvis/jarvis_mcp/__init__.py,sha256=NF_vqRxaNyz8ColcpRh0bOkinV90YLAKHEN--jkP-B8,2114
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=QNA7HqFvLbvhNaFp3ZsXzs2Rm6_gHUMcpd4t4qAzymY,23485
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=IEkas4ojP5J0TdVaUglvlEp61RyezBtuejv4lN3n1I4,11831
@@ -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=o8Arp2-779m8GLVtocS4kfVbAjoBb87nND2fy3bzbV0,17347
+jarvis/jarvis_tools/edit_file.py,sha256=lI6x2Vf7wrF-WdZN9qsmuiSm8jAUSyGSTk1mlGXq9FQ,18369
 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
@@ -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.188.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.188.dist-info/METADATA,sha256=rZMrwx4kWz3yKD4jlL5fqJw8L-zMYb8ZEhv3gIlmZMc,15923
+jarvis_ai_assistant-0.1.188.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.188.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.188.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.188.dist-info/RECORD,,