jarvis-ai-assistant 0.1.181__py3-none-any.whl → 0.1.182__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -2,7 +2,7 @@
 # 标准库导入
 import datetime
 import platform
-from typing import Any, Callable, List, Optional, Protocol, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
 # 第三方库导入
 from yaspin import yaspin  # type: ignore
@@ -205,6 +205,8 @@ class Agent:
         if model_name is not None:
             self.model.set_model_name(model_name)
 
+        self.user_data: Dict[str, Any] = {}
+
         self.model.set_suppress_output(False)
 
         from jarvis.jarvis_tools.registry import ToolRegistry
@@ -319,6 +321,14 @@ class Agent:
         )
         self.first = True
 
+    def set_user_data(self, key: str, value: Any):
+        """设置用户数据"""
+        self.user_data[key] = value
+
+    def get_user_data(self, key: str) -> Optional[Any]:
+        """获取用户数据"""
+        return self.user_data.get(key, None)
+
     def set_use_tools(self, use_tools):
         """设置要使用的工具列表"""
         from jarvis.jarvis_tools.registry import ToolRegistry
@@ -372,7 +382,7 @@ class Agent:
         )
 
         addon_prompt = f"""
-[系统提示开始]
+<system_prompt>
     请判断是否已经完成任务，如果已经完成：
     - 直接输出完成原因，不需要再有新的操作，不要输出{ot("TOOL_CALL")}标签
     {complete_prompt}
@@ -381,7 +391,7 @@ class Agent:
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
     - 操作列表：{action_handlers}
-[系统提示结束]
+</system_prompt>
 
 请继续。
 """

jarvis/jarvis_agent/file_input_handler.py

@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+
+import os
+import re
+from typing import Any, Tuple
+
+from yaspin import yaspin
+
+from jarvis.jarvis_tools.file_operation import FileOperationTool
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+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)
+        
+    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)
+    for ref in file_refs:
+        # Handle file:start,end or file:start:end format
+        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
+                    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)
+                    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,
+                    "start_line": start_line,
+                    "end_line": end_line
+                })
+        else:
+            # Handle simple file path
+            if os.path.isfile(ref):
+                files.append({
+                    "path": ref,
+                    "start_line": 1,  # 1-based
+                    "end_line": -1
+                })
+
+    # Read and process files if any were found
+    if files:
+        with yaspin(text="正在读取文件...", color="cyan") as spinner:
+            old_prompt = prompt
+            result = FileOperationTool().execute({"operation":"read","files": files})
+            if result["success"]:
+                spinner.text = "文件读取完成"
+                spinner.ok("✅")
+                # Prepend file contents to prompt and check for overflow
+                prompt = f"""{prompt} 
+
+<file_context>
+{result["stdout"]}
+</file_context>"""
+                if is_context_overflow(prompt):
+                    return old_prompt, False
+
+    return prompt, False
+

jarvis/jarvis_code_agent/code_agent.py

@@ -15,6 +15,7 @@ from yaspin import yaspin  # type: ignore
 from jarvis import __version__
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_agent.file_input_handler import file_input_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 # 忽略yaspin的类型检查
 from jarvis.jarvis_code_agent.lint import get_lint_tools
@@ -108,6 +109,7 @@ class CodeAgent:
             output_handler=[tool_registry],
             platform=platform_instance,
             input_handler=[
+                file_input_handler,
                 shell_input_handler,
                 builtin_input_handler
             ],

jarvis/jarvis_tools/edit_file.py

@@ -138,6 +138,7 @@ class FileSearchReplaceTool:
         
         file_path = args["file"]
         changes = args["changes"]
+        agent = args.get("agent", None)
         
         # 创建已处理文件变量，用于失败时回滚
         original_content = None
@@ -153,6 +154,17 @@ class FileSearchReplaceTool:
                     with open(file_path, 'r', encoding='utf-8') as f:
                         content = f.read()
                         original_content = content
+
+                if file_exists and agent:
+                    files = agent.get_user_data("files")
+                    if not files or files.get(file_path, None) is None:
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": f"请先读取文件 {file_path} 的内容后再编辑"
+                        }
+
+
                 with yaspin(text=f"正在处理文件 {file_path}...", color="cyan") as spinner:
                     success, temp_content = fast_edit(file_path, changes, spinner)
                     if not success:

jarvis/jarvis_tools/file_operation.py

@@ -50,7 +50,7 @@ class FileOperationTool:
         return None  # 如果没有合适的处理器，返回None
     
     def _handle_single_file(self, operation: str, filepath: str, content: str = "",
-                          start_line: int = 1, end_line: int = -1) -> Dict[str, Any]:
+                          start_line: int = 1, end_line: int = -1, agent: Any = None) -> Dict[str, Any]:
         """Handle operations for a single file"""
         try:
             abs_path = os.path.abspath(filepath)
@@ -128,6 +128,15 @@ class FileOperationTool:
                     
                     spinner.text = f"文件读取完成: {abs_path}"
                     spinner.ok("✅")
+
+                    if agent:
+                        files = agent.get_user_data("files")
+                        if files:
+                            files.append(abs_path)
+                        else:
+                            files = [abs_path]
+                        agent.set_user_data("files", files)
+                        
                     return {
                         "success": True,
                         "stdout": output,
@@ -173,7 +182,7 @@ class FileOperationTool:
         """
         try:
             operation = args["operation"].strip()
-
+            agent = args.get("agent", None)
             if "files" not in args or not isinstance(args["files"], list):
                 return {
                     "success": False,
@@ -194,7 +203,8 @@ class FileOperationTool:
                     file_info["path"].strip(),
                     content,
                     file_info.get("start_line", 1),
-                    file_info.get("end_line", -1)
+                    file_info.get("end_line", -1),
+                    agent
                 )
 
                 if result["success"]:

jarvis/jarvis_tools/read_code.py

@@ -31,7 +31,7 @@ class ReadCodeTool:
         "required": ["files"]
     }
 
-    def _handle_single_file(self, filepath: str, start_line: int = 1, end_line: int = -1) -> Dict[str, Any]:
+    def _handle_single_file(self, filepath: str, start_line: int = 1, end_line: int = -1, agent: Any = None) -> Dict[str, Any]:
         """处理单个文件的读取操作
 
         Args:
@@ -99,6 +99,14 @@ class ReadCodeTool:
                 spinner.text = f"文件读取完成: {abs_path}"
                 spinner.ok("✅")
 
+                if agent:
+                    files = agent.get_user_data("files")
+                    if files:
+                        files.append(abs_path)
+                    else:
+                        files = [abs_path]
+                    agent.set_user_data("files", files)
+
                 return {
                     "success": True,
                     "stdout": output,
@@ -123,6 +131,7 @@ class ReadCodeTool:
             Dict[str, Any]: 包含成功状态、输出内容和错误信息的字典
         """
         try:
+            agent = args.get("agent", None)
             if "files" not in args or not isinstance(args["files"], list):
                 return {
                     "success": False,
@@ -140,7 +149,8 @@ class ReadCodeTool:
                 result = self._handle_single_file(
                     file_info["path"].strip(),
                     file_info.get("start_line", 1),
-                    file_info.get("end_line", -1)
+                    file_info.get("end_line", -1),
+                    agent
                 )
 
                 if result["success"]:

{jarvis_ai_assistant-0.1.181.dist-info → jarvis_ai_assistant-0.1.182.dist-info}/METADATA

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

@@ -1,12 +1,13 @@
-jarvis/__init__.py,sha256=dgQhg6Gd7pGul0ij7e_dHnY6CjyGHRhshKt8hag08qo,74
-jarvis/jarvis_agent/__init__.py,sha256=9vyME5JbA4koVoqJ_zv5N9eNdvu6iBkB4o4a1CmkVgA,30054
+jarvis/__init__.py,sha256=0L3xbrhIunJRm7imt5CFTJQk-Ck5Or4XgYyygPYg_Dg,74
+jarvis/jarvis_agent/__init__.py,sha256=AxT_2n-IQkbtoQlAS3SJ0tsvcUenWD7_Xrc-RZZCWiA,30352
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=f4DaEHPakXcAbgykFP-tiOQP6fh_yGFlZx_h91_j2tQ,1529
+jarvis/jarvis_agent/file_input_handler.py,sha256=LDNXoTtyjhyBmfzDnAdbWZ2BWdu4q-r6thSKRK8Iwjk,4187
 jarvis/jarvis_agent/jarvis.py,sha256=UkNMVUlSNKV6y3v12eAhqc_gIDB6Obxrwk5f7-sQeiQ,6137
 jarvis/jarvis_agent/main.py,sha256=GkjMTIbsd56nkVuRwD_tU_PZWyzixZZhMjVOCd0SzOA,2669
 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
-jarvis/jarvis_code_agent/code_agent.py,sha256=IHUDqZ2RvJFoYIUuJAVCsbEOtYPHwXLfrmPXnpxKjvU,15721
+jarvis/jarvis_code_agent/code_agent.py,sha256=2TG_Hi_2mbiZHUcWnxYs4C30eYpgSedtIYZLs7BbyUk,15827
 jarvis/jarvis_code_agent/lint.py,sha256=TZlhNbeaoLzO9DzExjN5GAjrt66owd8lyQV56LTfkrs,4370
 jarvis/jarvis_code_analysis/code_review.py,sha256=SEK5NOGDWgMNX3zmRMWrIOtq3Xr8cKt_asG51U8h6SA,30219
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=cKQ_FOGy5TQgM-YkRCqORo-mUOZaPAJ9VDmZoFX58us,78
@@ -63,13 +64,13 @@ 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=OiTP50yaUE-WTSKnp8axo96OfddHufWKpGuEa6YRG30,16269
+jarvis/jarvis_tools/edit_file.py,sha256=gxnVijz-mOHpb9A7WTPIqCwmZHInSHwu_Psa_GvNWRQ,16724
 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=RcOKuMFUv01tvKoiOfu1ERCjvDVfJBvkT4oBpq-8vNQ,9036
+jarvis/jarvis_tools/file_operation.py,sha256=WloC1-oPJLwgICu4WBc9f7XA8N_Ggl73QQ5CxM2XTlE,9464
 jarvis/jarvis_tools/generate_new_tool.py,sha256=k1Vt88kI1bYi1OwxvJqFKr3Ewwwv7lOegYNmZ-1F7x0,10283
 jarvis/jarvis_tools/methodology.py,sha256=m7cQmVhhQpUUl_uYTVvcW0JBovQLx5pWTXh_8K77HsU,5237
-jarvis/jarvis_tools/read_code.py,sha256=j4niDMOAKW_3rVxmOo3wxYBQ2T8vkxqEiTkBt28gUT8,5898
+jarvis/jarvis_tools/read_code.py,sha256=pL2SwZDsJbJMXo4stW96quFsLgbtPVIAW-h4sDKsLtM,6274
 jarvis/jarvis_tools/read_webpage.py,sha256=PFAYuKjay9j6phWzyuZ99ZfNaHJljmRWAgS0bsvbcvE,2219
 jarvis/jarvis_tools/registry.py,sha256=WvYPiaUrleFqeXvwRkxM-6TNs1sWm61mpg1MFVo_kas,25113
 jarvis/jarvis_tools/rewrite_file.py,sha256=3V2l7kG5DG9iRimBce-1qCRuJPL0QM32SBTzOl2zCqM,7004
@@ -89,9 +90,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=atSK-2cUr7_tOIFsQzJnuQxebi7aFN4jtmaoXEaV4jM,10692
-jarvis_ai_assistant-0.1.181.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.181.dist-info/METADATA,sha256=0rpJwI0H5WiJsTHHQgmWeyeM7P4RZ7ei_L-Tnzt5ktI,15059
-jarvis_ai_assistant-0.1.181.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-jarvis_ai_assistant-0.1.181.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.181.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.181.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.182.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.182.dist-info/METADATA,sha256=Op8V2ma_T4C2rrhuEXgSn0qN7lZEfeiozSES036fdak,15059
+jarvis_ai_assistant-0.1.182.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+jarvis_ai_assistant-0.1.182.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.182.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.182.dist-info/RECORD,,