zrb 1.5.6__py3-none-any.whl → 1.5.7__py3-none-any.whl

zrb/builtin/llm/tool/file.py

@@ -4,8 +4,7 @@ import os
 import re
 from typing import Any, Optional
 
-from zrb.util.file import read_file as _read_file
-from zrb.util.file import write_file as _write_file
+from zrb.util.file import read_file, read_file_with_line_numbers, write_file
 
 DEFAULT_EXCLUDED_PATTERNS = [
     # Common Python artifacts
@@ -182,7 +181,7 @@ def read_from_file(
     start_line: Optional[int] = None,
     end_line: Optional[int] = None,
 ) -> str:
-    """Read file content (or specific lines) at a path.
+    """Read file content (or specific lines) at a path, including line numbers.
     Args:
         path (str): Path to read. Pass exactly as provided, including '~'.
         start_line (Optional[int]): Starting line number (1-based).
@@ -191,6 +190,7 @@ def read_from_file(
             Defaults to None (end of file).
     Returns:
         str: JSON: {"path": "...", "content": "...", "start_line": N, ...} or {"error": "..."}
+        The content includes line numbers.
     Raises:
         Exception: If an error occurs.
     """
@@ -199,7 +199,7 @@ def read_from_file(
         # Check if file exists
         if not os.path.exists(abs_path):
             return json.dumps({"error": f"File {path} does not exist"})
-        content = _read_file(abs_path)
+        content = read_file_with_line_numbers(abs_path)
         lines = content.splitlines()
         total_lines = len(lines)
         # Adjust line indices (convert from 1-based to 0-based)
@@ -259,7 +259,7 @@ def write_to_file(
         directory = os.path.dirname(abs_path)
         if directory and not os.path.exists(directory):
             os.makedirs(directory, exist_ok=True)
-        _write_file(abs_path, content)
+        write_file(abs_path, content)
         result_data = {"success": True, "path": path}
         if warning:
             result_data["warning"] = warning
@@ -391,6 +391,7 @@ def apply_diff(
         replace_marker (str): Marker for end of replacement block.
             Defaults to ">>>>>> REPLACE".
     SEARCH block must exactly match file content including whitespace/indentation.
+    SEARCH block should NOT contains line numbers
     Format example:
         [Search Marker, e.g., <<<<<< SEARCH]
         :start_line:10
@@ -414,7 +415,7 @@ def apply_diff(
             return json.dumps(
                 {"success": False, "path": path, "error": f"File not found at {path}"}
             )
-        content = _read_file(abs_path)
+        content = read_file(abs_path)
         lines = content.splitlines()
         if start_line < 1 or end_line > len(lines) or start_line > end_line:
             return json.dumps(
@@ -444,7 +445,7 @@ def apply_diff(
         new_content = "\n".join(new_lines)
         if content.endswith("\n"):
             new_content += "\n"
-        _write_file(abs_path, new_content)
+        write_file(abs_path, new_content)
         return json.dumps({"success": True, "path": path})
     except ValueError as e:
         raise ValueError(f"Error parsing diff: {e}")

zrb/task/llm/default_context.py

@@ -4,7 +4,7 @@ import platform
 import re
 from typing import Any
 
-from zrb.util.file import read_dir, read_file
+from zrb.util.file import read_dir, read_file_with_line_numbers
 
 
 def get_default_context(user_message: str) -> dict[str, Any]:
@@ -14,12 +14,13 @@ def get_default_context(user_message: str) -> dict[str, Any]:
     for ref in references:
         resource_path = os.path.abspath(os.path.expanduser(ref))
         if os.path.isfile(resource_path):
-            content = read_file(resource_path)
+            content = read_file_with_line_numbers(resource_path)
             current_references.append(
                 {
                     "reference": ref,
                     "name": resource_path,
                     "type": "file",
+                    "note": "line numbers are included in the content",
                     "content": content,
                 }
             )

zrb/util/file.py

@@ -12,6 +12,15 @@ def read_file(file_path: str, replace_map: dict[str, str] = {}) -> str:
     return content
 
 
+def read_file_with_line_numbers(
+    file_path: str, replace_map: dict[str, str] = {}
+) -> str:
+    content = read_file(file_path, replace_map)
+    lines = content.splitlines()
+    numbered_lines = [f"{i + 1} | {line}" for i, line in enumerate(lines)]
+    return "\n".join(numbered_lines)
+
+
 def read_dir(dir_path: str) -> list[str]:
     return [f for f in os.listdir(os.path.abspath(os.path.expanduser(dir_path)))]
 

{zrb-1.5.6.dist-info → zrb-1.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.5.6
+Version: 1.5.7
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.5.6.dist-info → zrb-1.5.7.dist-info}/RECORD

@@ -13,7 +13,7 @@ zrb/builtin/llm/llm_chat.py,sha256=XL5HK_o1EejkYS0fJIBI39vApuqYYsGHFSigvXfS7CI,4
 zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sguePIoCjTY,816
 zrb/builtin/llm/tool/api.py,sha256=yR9I0ZsI96OeQl9pgwORMASVuXsAL0a89D_iPS4C8Dc,1699
 zrb/builtin/llm/tool/cli.py,sha256=_CNEmEc6K2Z0i9ppYeM7jGpqaEdT3uxaWQatmxP3jKE,858
-zrb/builtin/llm/tool/file.py,sha256=rBMSWvElWQN0-c2CkwTHqY_A3dq5p4XFAAO-pgpupQk,19163
+zrb/builtin/llm/tool/file.py,sha256=ecFBmbMaqCIfqNGTmvd-Yt3vLtKuQ15KbjXlnIMWdho,19269
 zrb/builtin/llm/tool/rag.py,sha256=tw4MW5VW_3hezGufS0nICHe28eg5hPLMO4SsiDp4srQ,7500
 zrb/builtin/llm/tool/web.py,sha256=4qzom9xX-JxztIaTWneNfyTRlgweHIxzC1uSEAxJ00A,5507
 zrb/builtin/md5.py,sha256=0pNlrfZA0wlZlHvFHLgyqN0JZJWGKQIF5oXxO44_OJk,949
@@ -305,7 +305,7 @@ zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
 zrb/task/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/llm/agent_runner.py,sha256=-6i351_AViek2xXpqPHa0LdwhhRDPLpcnKeyr-pAGyI,1848
 zrb/task/llm/context_enricher.py,sha256=eNjyHkL2g5X1jMtYR711-N_x7EtkoP6d577uT3anOYA,3016
-zrb/task/llm/default_context.py,sha256=ROC0n_QcULzd_CWIaWgdZgnasrNnRCZzaB-l6287xwU,1352
+zrb/task/llm/default_context.py,sha256=IgHpmlGsBXILJcWC4Fn9dr52UG-puMXlQ-AHoXd6Oh0,1460
 zrb/task/llm/error.py,sha256=YOwnEdFMtqOlaiA83tDHpC6uh2_9r5NeS-inrlb5a8E,3622
 zrb/task/llm/history.py,sha256=qQtp-8a71sYL0A9YWo94KRy9o9J5ZCCJlMk4jM-t_rI,3572
 zrb/task/llm/history_summarizer.py,sha256=WZRyVRh1eGOmZKHypaxEidzruDYEM-Gcmdy2Z_XJ4Ro,2572
@@ -339,7 +339,7 @@ zrb/util/codemod/modify_function_call.py,sha256=F7EejY7nzvYVElJPVneMcLIUig_Hj0lL
 zrb/util/codemod/modify_method.py,sha256=FPPkNtvf2QO2cEfYtiO_GlNDNFOLylEET1NEOqkV7aA,3684
 zrb/util/codemod/modify_module.py,sha256=_P6yq5TA_n72mmZIOrK914zPtv1RrRI8WC3YxpWNsRs,437
 zrb/util/cron.py,sha256=9fTGatUMYCRgmDFGg-z6_XerT4U5Vq72nD05NnEVUm4,2852
-zrb/util/file.py,sha256=lDEL_lOD7I7zr2liPNLa947gbSQcB0k2YBSgNeddwRE,1073
+zrb/util/file.py,sha256=wa86GQjCR0i-8_FSnA_4eWZoiuH9VCom7ajkN-NaFAw,1364
 zrb/util/git.py,sha256=TShnMxPAk20Tglp25d_XPVZX-q0mvKeqdprVMeXQ5f0,4787
 zrb/util/git_subtree.py,sha256=zyWl0aUEZJyUJKjfw1uglozB4R1kF9pWtfKjhu8DN44,2658
 zrb/util/group.py,sha256=Bg7HrSycoK110U5s_Tca6-uUQuZ5CMgb8wxZSrvDQ98,2790
@@ -352,7 +352,7 @@ zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/util/todo.py,sha256=1nDdwPc22oFoK_1ZTXyf3638Bg6sqE2yp_U4_-frHoc,16015
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.5.6.dist-info/METADATA,sha256=ca7RqSQ9hcGOJ_7lJH7x8L-bK_Og2sB2I-b0KujD24I,8470
-zrb-1.5.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.5.6.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.5.6.dist-info/RECORD,,
+zrb-1.5.7.dist-info/METADATA,sha256=jnJmD2uvg38nJvh5kYyMM77rWT4HEIEjnOCIgI8IhJY,8470
+zrb-1.5.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.5.7.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.5.7.dist-info/RECORD,,