janito 2.2.0__py3-none-any.whl → 2.3.0__py3-none-any.whl

janito/tools/adapters/local/search_text/core.py

@@ -1,201 +1,201 @@
-from janito.tools.tool_base import ToolBase
-from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
-from janito.tools.tool_utils import pluralize, display_path
-from janito.i18n import tr
-import os
-from .pattern_utils import prepare_pattern, format_result, summarize_total
-from .match_lines import read_file_lines
-from .traverse_directory import traverse_directory
-
-
-from janito.tools.adapters.local.adapter import register_local_tool as register_tool
-
-
-@register_tool
-class SearchTextTool(ToolBase):
-    """
-    Search for a text pattern (regex or plain string) in all files within one or more directories or file paths and return matching lines or counts. Respects .gitignore.
-    Args:
-        paths (str): String of one or more paths (space-separated) to search in. Each path can be a directory or a file.
-        pattern (str): Regex pattern or plain text substring to search for in files. Must not be empty. Tries regex first, falls back to substring if regex is invalid.
-        is_regex (bool): If True, treat pattern as a regular expression. If False, treat as plain text (default).
-        case_sensitive (bool): If False, perform a case-insensitive search. Default is True (case sensitive).
-        max_depth (int, optional): Maximum directory depth to search. If 0 (default), search is recursive with no depth limit. If >0, limits recursion to that depth. Setting max_depth=1 disables recursion (only top-level directory). Ignored for file paths.
-        max_results (int, optional): Maximum number of results to return. Defaults to 100. 0 means no limit.
-        count_only (bool): If True, return only the count of matches per file and total, not the matching lines. Default is False.
-    Returns:
-        str: If count_only is False, matching lines from files as a newline-separated string, each formatted as 'filepath:lineno: line'.
-             If count_only is True, returns per-file and total match counts.
-        If max_results is reached, appends a note to the output.
-    """
-
-    tool_name = "search_text"
-
-    def _handle_file(
-        self,
-        search_path,
-        pattern,
-        regex,
-        use_regex,
-        case_sensitive,
-        max_results,
-        total_results,
-        count_only,
-    ):
-        if count_only:
-            match_count, dir_limit_reached, _ = read_file_lines(
-                search_path,
-                pattern,
-                regex,
-                use_regex,
-                case_sensitive,
-                True,
-                max_results,
-                total_results,
-            )
-            per_file_counts = [(search_path, match_count)] if match_count > 0 else []
-            return [], dir_limit_reached, per_file_counts
-        else:
-            dir_output, dir_limit_reached, match_count_list = read_file_lines(
-                search_path,
-                pattern,
-                regex,
-                use_regex,
-                case_sensitive,
-                False,
-                max_results,
-                total_results,
-            )
-            per_file_counts = (
-                [(search_path, len(match_count_list))]
-                if match_count_list and len(match_count_list) > 0
-                else []
-            )
-            return dir_output, dir_limit_reached, per_file_counts
-
-    def _handle_path(
-        self,
-        search_path,
-        pattern,
-        regex,
-        use_regex,
-        case_sensitive,
-        max_depth,
-        max_results,
-        total_results,
-        count_only,
-    ):
-        info_str = tr(
-            "🔍 Search {search_type} '{pattern}' in '{disp_path}'",
-            search_type=("regex" if use_regex else "text"),
-            pattern=pattern,
-            disp_path=display_path(search_path),
-        )
-        if max_depth > 0:
-            info_str += tr(" [max_depth={max_depth}]", max_depth=max_depth)
-        if count_only:
-            info_str += " [count]"
-        self.report_action(info_str, ReportAction.READ)
-        if os.path.isfile(search_path):
-            dir_output, dir_limit_reached, per_file_counts = self._handle_file(
-                search_path,
-                pattern,
-                regex,
-                use_regex,
-                case_sensitive,
-                max_results,
-                total_results,
-                count_only,
-            )
-        else:
-            if count_only:
-                per_file_counts, dir_limit_reached, _ = traverse_directory(
-                    search_path,
-                    pattern,
-                    regex,
-                    use_regex,
-                    case_sensitive,
-                    max_depth,
-                    max_results,
-                    total_results,
-                    True,
-                )
-                dir_output = []
-            else:
-                dir_output, dir_limit_reached, per_file_counts = traverse_directory(
-                    search_path,
-                    pattern,
-                    regex,
-                    use_regex,
-                    case_sensitive,
-                    max_depth,
-                    max_results,
-                    total_results,
-                    False,
-                )
-        count = sum(count for _, count in per_file_counts)
-        file_word = pluralize("match", count)
-        num_files = len(per_file_counts)
-        file_label = pluralize("file", num_files)
-        file_word_max = file_word + (" (max)" if dir_limit_reached else "")
-        self.report_success(
-            tr(
-                " ✅ {count} {file_word} from {num_files} {file_label}",
-                count=count,
-                file_word=file_word_max,
-                num_files=num_files,
-                file_label=file_label,
-            ),
-            ReportAction.READ,
-        )
-        return info_str, dir_output, dir_limit_reached, per_file_counts
-
-    def run(
-        self,
-        paths: str,
-        pattern: str,
-        is_regex: bool = False,
-        case_sensitive: bool = False,
-        max_depth: int = 0,
-        max_results: int = 100,
-        count_only: bool = False,
-    ) -> str:
-        regex, use_regex, error_msg = prepare_pattern(
-            pattern, is_regex, case_sensitive, self.report_error, self.report_warning
-        )
-        if error_msg:
-            return error_msg
-        paths_list = paths.split()
-        results = []
-        all_per_file_counts = []
-        for search_path in paths_list:
-            info_str, dir_output, dir_limit_reached, per_file_counts = (
-                self._handle_path(
-                    search_path,
-                    pattern,
-                    regex,
-                    use_regex,
-                    case_sensitive,
-                    max_depth,
-                    max_results,
-                    0,
-                    count_only,
-                )
-            )
-            if count_only:
-                all_per_file_counts.extend(per_file_counts)
-            result_str = format_result(
-                pattern,
-                use_regex,
-                dir_output,
-                dir_limit_reached,
-                count_only,
-                per_file_counts,
-            )
-            results.append(info_str + "\n" + result_str)
-            if dir_limit_reached:
-                break
-        if count_only:
-            results.append(summarize_total(all_per_file_counts))
-        return "\n\n".join(results)
+from janito.tools.tool_base import ToolBase
+from janito.report_events import ReportAction
+from janito.tools.adapters.local.adapter import register_local_tool
+from janito.tools.tool_utils import pluralize, display_path
+from janito.i18n import tr
+import os
+from .pattern_utils import prepare_pattern, format_result, summarize_total
+from .match_lines import read_file_lines
+from .traverse_directory import traverse_directory
+
+
+from janito.tools.adapters.local.adapter import register_local_tool as register_tool
+
+
+@register_tool
+class SearchTextTool(ToolBase):
+    """
+    Search for a text pattern (regex or plain string) in all files within one or more directories or file paths and return matching lines or counts. Respects .gitignore.
+    Args:
+        paths (str): String of one or more paths (space-separated) to search in. Each path can be a directory or a file.
+        pattern (str): Regex pattern or plain text substring to search for in files. Must not be empty. Tries regex first, falls back to substring if regex is invalid.
+        is_regex (bool): If True, treat pattern as a regular expression. If False, treat as plain text (default).
+        case_sensitive (bool): If False, perform a case-insensitive search. Default is True (case sensitive).
+        max_depth (int, optional): Maximum directory depth to search. If 0 (default), search is recursive with no depth limit. If >0, limits recursion to that depth. Setting max_depth=1 disables recursion (only top-level directory). Ignored for file paths.
+        max_results (int, optional): Maximum number of results to return. Defaults to 100. 0 means no limit.
+        count_only (bool): If True, return only the count of matches per file and total, not the matching lines. Default is False.
+    Returns:
+        str: If count_only is False, matching lines from files as a newline-separated string, each formatted as 'filepath:lineno: line'.
+             If count_only is True, returns per-file and total match counts.
+        If max_results is reached, appends a note to the output.
+    """
+
+    tool_name = "search_text"
+
+    def _handle_file(
+        self,
+        search_path,
+        pattern,
+        regex,
+        use_regex,
+        case_sensitive,
+        max_results,
+        total_results,
+        count_only,
+    ):
+        if count_only:
+            match_count, dir_limit_reached, _ = read_file_lines(
+                search_path,
+                pattern,
+                regex,
+                use_regex,
+                case_sensitive,
+                True,
+                max_results,
+                total_results,
+            )
+            per_file_counts = [(search_path, match_count)] if match_count > 0 else []
+            return [], dir_limit_reached, per_file_counts
+        else:
+            dir_output, dir_limit_reached, match_count_list = read_file_lines(
+                search_path,
+                pattern,
+                regex,
+                use_regex,
+                case_sensitive,
+                False,
+                max_results,
+                total_results,
+            )
+            per_file_counts = (
+                [(search_path, len(match_count_list))]
+                if match_count_list and len(match_count_list) > 0
+                else []
+            )
+            return dir_output, dir_limit_reached, per_file_counts
+
+    def _handle_path(
+        self,
+        search_path,
+        pattern,
+        regex,
+        use_regex,
+        case_sensitive,
+        max_depth,
+        max_results,
+        total_results,
+        count_only,
+    ):
+        info_str = tr(
+            "🔍 Search {search_type} '{pattern}' in '{disp_path}'",
+            search_type=("regex" if use_regex else "text"),
+            pattern=pattern,
+            disp_path=display_path(search_path),
+        )
+        if max_depth > 0:
+            info_str += tr(" [max_depth={max_depth}]", max_depth=max_depth)
+        if count_only:
+            info_str += " [count]"
+        self.report_action(info_str, ReportAction.READ)
+        if os.path.isfile(search_path):
+            dir_output, dir_limit_reached, per_file_counts = self._handle_file(
+                search_path,
+                pattern,
+                regex,
+                use_regex,
+                case_sensitive,
+                max_results,
+                total_results,
+                count_only,
+            )
+        else:
+            if count_only:
+                per_file_counts, dir_limit_reached, _ = traverse_directory(
+                    search_path,
+                    pattern,
+                    regex,
+                    use_regex,
+                    case_sensitive,
+                    max_depth,
+                    max_results,
+                    total_results,
+                    True,
+                )
+                dir_output = []
+            else:
+                dir_output, dir_limit_reached, per_file_counts = traverse_directory(
+                    search_path,
+                    pattern,
+                    regex,
+                    use_regex,
+                    case_sensitive,
+                    max_depth,
+                    max_results,
+                    total_results,
+                    False,
+                )
+        count = sum(count for _, count in per_file_counts)
+        file_word = pluralize("match", count)
+        num_files = len(per_file_counts)
+        file_label = pluralize("file", num_files)
+        file_word_max = file_word + (" (max)" if dir_limit_reached else "")
+        self.report_success(
+            tr(
+                " ✅ {count} {file_word} from {num_files} {file_label}",
+                count=count,
+                file_word=file_word_max,
+                num_files=num_files,
+                file_label=file_label,
+            ),
+            ReportAction.READ,
+        )
+        return info_str, dir_output, dir_limit_reached, per_file_counts
+
+    def run(
+        self,
+        paths: str,
+        pattern: str,
+        is_regex: bool = False,
+        case_sensitive: bool = False,
+        max_depth: int = 0,
+        max_results: int = 100,
+        count_only: bool = False,
+    ) -> str:
+        regex, use_regex, error_msg = prepare_pattern(
+            pattern, is_regex, case_sensitive, self.report_error, self.report_warning
+        )
+        if error_msg:
+            return error_msg
+        paths_list = paths.split()
+        results = []
+        all_per_file_counts = []
+        for search_path in paths_list:
+            info_str, dir_output, dir_limit_reached, per_file_counts = (
+                self._handle_path(
+                    search_path,
+                    pattern,
+                    regex,
+                    use_regex,
+                    case_sensitive,
+                    max_depth,
+                    max_results,
+                    0,
+                    count_only,
+                )
+            )
+            if count_only:
+                all_per_file_counts.extend(per_file_counts)
+            result_str = format_result(
+                pattern,
+                use_regex,
+                dir_output,
+                dir_limit_reached,
+                count_only,
+                per_file_counts,
+            )
+            results.append(info_str + "\n" + result_str)
+            if dir_limit_reached:
+                break
+        if count_only:
+            results.append(summarize_total(all_per_file_counts))
+        return "\n\n".join(results)

janito/tools/adapters/local/search_text/match_lines.py

@@ -24,7 +24,7 @@ def match_line(line, pattern, regex, use_regex, case_sensitive):
     if use_regex:
         return regex and regex.search(line)
     if not case_sensitive:
-        return pattern in line.lower()
+        return pattern.lower() in line.lower()
     return pattern in line
 
 

janito/tools/adapters/local/search_text/pattern_utils.py

@@ -1,73 +1,73 @@
-import re
-from janito.i18n import tr
-from janito.tools.tool_utils import pluralize
-
-
-def prepare_pattern(pattern, is_regex, case_sensitive, report_error, report_warning):
-    if not pattern:
-        report_error(
-            tr("Error: Empty search pattern provided. Operation aborted."),
-            ReportAction.SEARCH,
-        )
-        return (
-            None,
-            False,
-            tr("Error: Empty search pattern provided. Operation aborted."),
-        )
-    regex = None
-    use_regex = False
-    if is_regex:
-        try:
-            flags = 0
-            if not case_sensitive:
-                flags |= re.IGNORECASE
-            regex = re.compile(pattern, flags=flags)
-            use_regex = True
-        except re.error as e:
-            report_warning(tr("⚠️ Invalid regex pattern."))
-            return (
-                None,
-                False,
-                tr(
-                    "Error: Invalid regex pattern: {error}. Operation aborted.", error=e
-                ),
-            )
-    else:
-        # Do not compile as regex if is_regex is False; treat as plain text
-        regex = None
-        use_regex = False
-        if not case_sensitive:
-            pattern = pattern.lower()
-    return regex, use_regex, None
-
-
-def format_result(
-    pattern, use_regex, output, limit_reached, count_only=False, per_file_counts=None
-):
-    # Ensure output is always a list for joining
-    if output is None or not isinstance(output, (list, tuple)):
-        output = []
-    if count_only:
-        lines = []
-        total = 0
-        if per_file_counts:
-            for file_path, count in per_file_counts:
-                lines.append(f"{file_path}: {count}")
-                total += count
-        lines.append(f"Total matches: {total}")
-        if limit_reached:
-            lines.append(tr("[Max results reached. Output truncated.]"))
-        return "\n".join(lines)
-    else:
-        if not output:
-            return tr("No matches found.")
-        result = "\n".join(output)
-        if limit_reached:
-            result += tr("\n[Max results reached. Output truncated.]")
-        return result
-
-
-def summarize_total(all_per_file_counts):
-    total = sum(count for _, count in all_per_file_counts)
-    summary = f"\nGrand total matches: {total}"
-    return summary
+import re
+from janito.i18n import tr
+from janito.tools.tool_utils import pluralize
+
+
+def prepare_pattern(pattern, is_regex, case_sensitive, report_error, report_warning):
+    if not pattern:
+        report_error(
+            tr("Error: Empty search pattern provided. Operation aborted."),
+            ReportAction.SEARCH,
+        )
+        return (
+            None,
+            False,
+            tr("Error: Empty search pattern provided. Operation aborted."),
+        )
+    regex = None
+    use_regex = False
+    if is_regex:
+        try:
+            flags = 0
+            if not case_sensitive:
+                flags |= re.IGNORECASE
+            regex = re.compile(pattern, flags=flags)
+            use_regex = True
+        except re.error as e:
+            report_warning(tr("⚠️ Invalid regex pattern."))
+            return (
+                None,
+                False,
+                tr(
+                    "Error: Invalid regex pattern: {error}. Operation aborted.", error=e
+                ),
+            )
+    else:
+        # Do not compile as regex if is_regex is False; treat as plain text
+        regex = None
+        use_regex = False
+        if not case_sensitive:
+            pattern = pattern.lower()
+    return regex, use_regex, None
+
+
+def format_result(
+    pattern, use_regex, output, limit_reached, count_only=False, per_file_counts=None
+):
+    # Ensure output is always a list for joining
+    if output is None or not isinstance(output, (list, tuple)):
+        output = []
+    if count_only:
+        lines = []
+        total = 0
+        if per_file_counts:
+            for file_path, count in per_file_counts:
+                lines.append(f"{file_path}: {count}")
+                total += count
+        lines.append(f"Total matches: {total}")
+        if limit_reached:
+            lines.append(tr("[Max results reached. Output truncated.]"))
+        return "\n".join(lines)
+    else:
+        if not output:
+            return tr("No matches found.")
+        result = "\n".join(output)
+        if limit_reached:
+            result += tr("\n[Max results reached. Output truncated.]")
+        return result
+
+
+def summarize_total(all_per_file_counts):
+    total = sum(count for _, count in all_per_file_counts)
+    summary = f"\nGrand total matches: {total}"
+    return summary