Refactor is_provided into helpers.py.

Author: jamwil

aider/tools/insert_block.py

@@ -9,6 +9,7 @@
     format_tool_result,
     generate_unified_diff_snippet,
     handle_tool_error,
+    is_provided,
     select_occurrence_index,
     validate_file_for_edit,
 )
@@ -75,14 +76,7 @@ def execute(
         tool_name = "InsertBlock"
         try:
             # 1. Validate parameters
-            def _is_provided(value):
-                if value is None:
-                    return False
-                if isinstance(value, str) and value == "":
-                    return False
-                return True
-
-            if sum(_is_provided(x) for x in [after_pattern, before_pattern, position]) != 1:
+            if sum(is_provided(x) for x in [after_pattern, before_pattern, position]) != 1:
                 raise ToolError(
                     "Must specify exactly one of: after_pattern, before_pattern, or position"
                 )

aider/tools/show_numbered_context.py

@@ -1,7 +1,12 @@
 import os
 
 from aider.tools.utils.base_tool import BaseTool
-from aider.tools.utils.helpers import ToolError, handle_tool_error, resolve_paths
+from aider.tools.utils.helpers import (
+    ToolError,
+    handle_tool_error,
+    is_provided,
+    resolve_paths,
+)
 
 
 class Tool(BaseTool):
@@ -34,22 +39,15 @@ def execute(cls, coder, file_path, pattern=None, line_number=None, context_lines
         tool_name = "ShowNumberedContext"
         try:
             # 1. Validate arguments
-            def _is_provided(value):
-                if value is None:
-                    return False
-                if isinstance(value, str) and value == "":
-                    return False
-                if isinstance(value, (int, float)) and value == 0:
-                    return False
-                return True
-
-            provided_counts = [_is_provided(x) for x in [pattern, line_number]]
-            if sum(provided_counts) != 1:
+            pattern_provided = is_provided(pattern)
+            line_number_provided = is_provided(line_number, treat_zero_as_missing=True)
+
+            if sum([pattern_provided, line_number_provided]) != 1:
                 raise ToolError("Provide exactly one of 'pattern' or 'line_number'.")
 
-            if not provided_counts[0]:
+            if not pattern_provided:
                 pattern = None
-            if not provided_counts[1]:
+            if not line_number_provided:
                 line_number = None
 
             # 2. Resolve path

aider/tools/utils/helpers.py

@@ -10,6 +10,21 @@ class ToolError(Exception):
     pass
 
 
+def is_provided(value, *, treat_zero_as_missing=False):
+    """
+    Normalizes parameter presence checks across tools.
+
+    Returns True when the value should be considered user-provided.
+    """
+    if value is None:
+        return False
+    if isinstance(value, str) and value == "":
+        return False
+    if treat_zero_as_missing and isinstance(value, (int, float)) and value == 0:
+        return False
+    return True
+
+
 def resolve_paths(coder, file_path):
     """Resolves absolute and relative paths for a given file path."""
     try:
@@ -106,17 +121,10 @@ def determine_line_range(
     Raises ToolError if end_pattern is not found or line_count is invalid.
     """
 
-    def _is_provided(value):
-        if value is None:
-            return False
-        if isinstance(value, str) and value == "":
-            return False
-        return True
-
     # Parameter validation: Ensure only one targeting method is used
     targeting_methods = [
-        _is_provided(target_symbol),
-        _is_provided(start_pattern_line_index),
+        is_provided(target_symbol),
+        is_provided(start_pattern_line_index),
         # Note: line_count and end_pattern depend on start_pattern_line_index
     ]
     if sum(targeting_methods) > 1: