zrb 1.5.10__py3-none-any.whl → 1.5.11__py3-none-any.whl

zrb/builtin/llm/tool/file.py

@@ -92,6 +92,10 @@ def list_files(
     """
     all_files: list[str] = []
     abs_path = os.path.abspath(os.path.expanduser(path))
+    # Explicitly check if path exists before proceeding
+    if not os.path.exists(abs_path):
+        # Raise FileNotFoundError, which is a subclass of OSError
+        raise FileNotFoundError(f"Path does not exist: {path}")
     # Determine effective exclusion patterns
     patterns_to_exclude = (
         excluded_patterns
@@ -150,14 +154,17 @@ def list_files(
 
 def _is_hidden(path: str) -> bool:
     """
-    Check if path is hidden (starts with '.').
+    Check if path is hidden (starts with '.') but ignore '.' and '..'.
     Args:
         path: File or directory path to check
     Returns:
         True if the path is hidden, False otherwise
     """
-    # Extract just the basename to check if it starts with a dot
-    return os.path.basename(path).startswith(".")
+    basename = os.path.basename(path)
+    # Ignore '.' and '..' as they are not typically considered hidden in listings
+    if basename == "." or basename == "..":
+        return False
+    return basename.startswith(".")
 
 
 def _is_excluded(name: str, patterns: list[str]) -> bool:
@@ -373,41 +380,27 @@ def _get_file_matches(
 
 def apply_diff(
     path: str,
-    diff: str,
-    search_marker: str = "<<<<<< SEARCH",
-    meta_marker: str = "------",
-    separator: str = "======",
-    replace_marker: str = ">>>>>> REPLACE",
+    start_line: int,
+    end_line: int,
+    search_content: str,
+    replace_content: str,
 ) -> str:
-    """Apply a precise search/replace diff to a file.
+    """Apply a precise search/replace to a file based on line numbers and content.
     Args:
         path (str): Path to modify. Pass exactly as provided, including '~'.
-        diff (str): Search/replace block defining changes (see format example below).
-        search_marker (str): Marker for start of search block. Defaults to "<<<<<< SEARCH".
-        meta_marker (str): Marker for start of content to search for. Defaults to "------".
-        separator (str): Marker separating search/replace content. Defaults to "======".
-        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
-        :end_line:15
-        [Meta Marker, e.g., ------]
-        [exact content to find including whitespace]
-        [Separator, e.g., ======]
-        [new content to replace with]
-        [Replace Marker, e.g., >>>>>> REPLACE]
+        start_line (int): The 1-based starting line number of the content to replace.
+        end_line (int): The 1-based ending line number (inclusive) of the content to replace.
+        search_content (str): The exact content expected to be found in the specified
+            line range. Must exactly match file content including whitespace/indentation,
+            excluding line numbers.
+        replace_content (str): The new content to replace the search_content with.
+            Excluding line numbers.
     Returns:
         str: JSON: {"success": true, "path": "f.py"} or {"success": false, "error": "..."}
     Raises:
         Exception: If an error occurs.
     """
     try:
-        start_line, end_line, search_content, replace_content = _parse_diff(
-            diff, search_marker, meta_marker, separator, replace_marker
-        )
         abs_path = os.path.abspath(os.path.expanduser(path))
         if not os.path.exists(abs_path):
             return json.dumps(
@@ -451,62 +444,3 @@ def apply_diff(
         raise OSError(f"Error applying diff to {path}: {e}")
     except Exception as e:
         raise RuntimeError(f"Unexpected error applying diff to {path}: {e}")
-
-
-def _parse_diff(
-    diff: str,
-    search_marker: str,
-    meta_marker: str,
-    separator: str,
-    replace_marker: str,
-) -> tuple[int, int, str, str]:
-    """
-    Parse diff content into components.
-    Args:
-        diff: The diff content to parse
-        search_marker: Marker indicating the start of the search block
-        meta_marker: Marker indicating the start of the content to search for
-        separator: Marker separating search content from replacement content
-        replace_marker: Marker indicating the end of the replacement block
-    Returns:
-        Tuple of (start_line, end_line, search_content, replace_content)
-    Raises:
-        ValueError: If diff format is invalid or missing required markers
-        ValueError: If start_line or end_line cannot be parsed
-    """
-    # Find all marker positions
-    search_start_idx = diff.find(search_marker)
-    meta_start_idx = diff.find(meta_marker)
-    separator_idx = diff.find(separator)
-    replace_end_idx = diff.find(replace_marker)
-    # Validate all markers are present
-    missing_markers = []
-    if search_start_idx == -1:
-        missing_markers.append("search marker")
-    if meta_start_idx == -1:
-        missing_markers.append("meta marker")
-    if separator_idx == -1:
-        missing_markers.append("separator")
-    if replace_end_idx == -1:
-        missing_markers.append("replace marker")
-    if missing_markers:
-        raise ValueError(f"Invalid diff format - missing: {', '.join(missing_markers)}")
-    # Extract metadata
-    meta_content = diff[search_start_idx + len(search_marker) : meta_start_idx].strip()
-    # Parse line numbers
-    start_line_match = re.search(r":start_line:(\d+)", meta_content)
-    end_line_match = re.search(r":end_line:(\d+)", meta_content)
-    if not start_line_match:
-        raise ValueError("Missing start_line in diff metadata")
-    if not end_line_match:
-        raise ValueError("Missing end_line in diff metadata")
-    start_line = int(start_line_match.group(1))
-    end_line = int(end_line_match.group(1))
-    # Extract content sections
-    search_content = diff[meta_start_idx + len(meta_marker) : separator_idx].strip(
-        "\r\n"
-    )
-    replace_content = diff[separator_idx + len(separator) : replace_end_idx].strip(
-        "\r\n"
-    )
-    return start_line, end_line, search_content, replace_content

zrb/task/cmd_task.py

@@ -255,14 +255,14 @@ class CmdTask(BaseTask):
     def __render_single_cmd_val(
         self, ctx: AnyContext, single_cmd_val: SingleCmdVal
     ) -> str | None:
+        if isinstance(single_cmd_val, AnyCmdVal):
+            return single_cmd_val.to_str(ctx)
         if callable(single_cmd_val):
             return single_cmd_val(ctx)
         if isinstance(single_cmd_val, str):
             if self._render_cmd:
                 return ctx.render(single_cmd_val)
             return single_cmd_val
-        if isinstance(single_cmd_val, AnyCmdVal):
-            return single_cmd_val.to_str(ctx)
         return None
 
     def __get_multiline_repr(self, text: str) -> str:

{zrb-1.5.10.dist-info → zrb-1.5.11.dist-info}/METADATA

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

{zrb-1.5.10.dist-info → zrb-1.5.11.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=e2-Mh9AeltCJGZrvhuMFMzmgQgsQbaxvSpAzcruIB9o,19222
+zrb/builtin/llm/tool/file.py,sha256=ig4tZGYnGjE96U9KgOpbANmyAgFmTcQzym1wVAsZYRM,16620
 zrb/builtin/llm/tool/rag.py,sha256=45t0o88l7F62oq2P61NnC1hsZJ4h72dZsVQfcsOIUc8,7521
 zrb/builtin/llm/tool/web.py,sha256=4qzom9xX-JxztIaTWneNfyTRlgweHIxzC1uSEAxJ00A,5507
 zrb/builtin/md5.py,sha256=0pNlrfZA0wlZlHvFHLgyqN0JZJWGKQIF5oXxO44_OJk,949
@@ -300,14 +300,13 @@ zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/any_task.py,sha256=zklUjkLRQ62TEvfnOUUYfXChj8Zk4igee3w8V3_rN08,5846
 zrb/task/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/base/context.py,sha256=73k3fKwup0AJwTTLpay0f_-axJextaxgbTem4w4Bmas,3670
-zrb/task/base/dependencies.py,sha256=Kcxhn7z4OU9Fc_y-cD1Sc96wgNXs0VDoi8r5cJMu0oY,1952
 zrb/task/base/execution.py,sha256=lB6cfivk-EM6sZSaPjYs_ufb7jb-A2jLJNhBupwBFgI,11101
 zrb/task/base/lifecycle.py,sha256=YIugyqRmEKMnc9MTCDEZr9jVhie3Kwt7LTMtAVAN9Ks,7278
 zrb/task/base/monitoring.py,sha256=UAOEcPiYNtZR4FFxzWCosuOEFE_P3c4GT5vAhQmohqI,5663
 zrb/task/base/operators.py,sha256=uAMFqpZJsPnCrojgOl1FUDXTS15mtOa_IqiAXltyYRU,1576
 zrb/task/base_task.py,sha256=3MLPYDzNgjIJiQTxSyKLmvG_FspOl61htuRZG7l34QA,8915
 zrb/task/base_trigger.py,sha256=jC722rDvodaBLeNaFghkTyv1u0QXrK6BLZUUqcmBJ7Q,4581
-zrb/task/cmd_task.py,sha256=f1OWajOBmdtx2QcXBr_8s6o82Fp4UTLqCXJqp2gxwzU,10750
+zrb/task/cmd_task.py,sha256=xFAdOvLDK9Qaye40T_lG3K6AIKgbPAMHk_3GIAYeJAM,10750
 zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
 zrb/task/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/llm/agent.py,sha256=2u1zlX41oBzMKozXWXD3gDEOzOsHNsFpedRcJXbUNHI,5105
@@ -362,7 +361,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.10.dist-info/METADATA,sha256=ukEcYJvB_RA35-S1X5JPJT8v3qq5oN2Y2L2sYp4hiic,8469
-zrb-1.5.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.5.10.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.5.10.dist-info/RECORD,,
+zrb-1.5.11.dist-info/METADATA,sha256=TAOvXdXnUwI1_y0VSDOLxYElSCv441WHSRogvF5EUYU,8469
+zrb-1.5.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.5.11.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.5.11.dist-info/RECORD,,

zrb/task/base/dependencies.py

@@ -1,57 +0,0 @@
-from typing import TypeVar
-
-from zrb.task.any_task import AnyTask
-
-T = TypeVar("T", bound="AnyTask")
-
-
-def get_dependency_list(task: AnyTask, attr_name: str) -> list[AnyTask]:
-    """
-    Safely retrieves a list of dependencies (upstreams, fallbacks, etc.)
-    from a task attribute, handling None or single-task values.
-    """
-    dependencies = getattr(task, attr_name, None)
-    if dependencies is None:
-        return []
-    elif isinstance(dependencies, list):
-        # Ensure all elements are AnyTask (or compatible) if needed,
-        # but for now, assume the list contains tasks.
-        return dependencies
-    # Assume it's a single AnyTask instance
-    return [dependencies]
-
-
-def append_dependency(
-    task: T, attr_name: str, dependencies_to_add: AnyTask | list[AnyTask]
-) -> None:
-    """
-    Appends one or more dependencies to the specified attribute list of a task,
-    ensuring the attribute becomes a list and avoiding duplicates.
-
-    Modifies the attribute on the task object directly.
-    """
-    # Retrieve the current list, handling None or single item cases
-    current_deps_list = getattr(task, attr_name, None)
-    if current_deps_list is None:
-        current_deps_list = []
-    elif not isinstance(current_deps_list, list):
-        current_deps_list = [current_deps_list]
-    else:
-        # Create a copy to avoid modifying the original list if no changes occur
-        current_deps_list = list(current_deps_list)
-
-    if isinstance(dependencies_to_add, list):
-        new_deps = dependencies_to_add
-    else:
-        new_deps = [dependencies_to_add]  # Ensure it's always a list
-
-    added = False
-    for dep in new_deps:
-        # Check for existence before appending
-        if dep not in current_deps_list:
-            current_deps_list.append(dep)
-            added = True
-
-    # Update the attribute on the task object only if changes were made
-    if added:
-        setattr(task, attr_name, current_deps_list)