janito 1.5.2__py3-none-any.whl → 1.6.0__py3-none-any.whl

janito/agent/tools/search_files.py

@@ -1,54 +1,71 @@
-from janito.agent.tools.tool_base import ToolBase
+from janito.agent.tool_base import ToolBase
 from janito.agent.tool_registry import register_tool
+from janito.agent.tools.tools_utils import pluralize
 
 import os
 from janito.agent.tools.gitignore_utils import filter_ignored
 
+
 @register_tool(name="search_files")
 class SearchFilesTool(ToolBase):
-    """Search for a text pattern in all files within a directory and return matching lines. Respects .gitignore."""
-    def call(self, directories: list[str], pattern: str, max_results: int=100) -> str:
-        """
-        Search for a text pattern in all files within one or more directories and return matching lines.
+    """
+    Search for a text pattern in all files within a directory and return matching lines. Respects .gitignore.
 
-        Args:
-            directories (list[str]): List of directories to search in.
-            pattern (str): Plain text substring to search for in files. (Not a regular expression or glob pattern.)
-            max_results (int): Maximum number of results to return. Defaults to 100.
+    Args:
+        directories (list[str]): List of directories to search in.
+        pattern (str): Plain text substring to search for in files. (Not a regular expression or glob pattern.)
+        recursive (bool): Whether to search recursively in subdirectories. Defaults to True.
+        max_depth (int, optional): Maximum directory depth to search (0 = only top-level). If None, unlimited. Defaults to None.
+    Returns:
+        str: Matching lines from files as a newline-separated string, each formatted as 'filepath:lineno: line'. Example:
+            - "/path/to/file.py:10: def my_function():"
+            - "Warning: Empty search pattern provided. Operation skipped."
+    """
 
-        Returns:
-            str: Matching lines from files as a newline-separated string, each formatted as 'filepath:lineno: line'. Example:
-                - "/path/to/file.py:10: def my_function():"
-                - "Warning: Empty search pattern provided. Operation skipped."
-        """
+    def call(
+        self,
+        directories: list[str],
+        pattern: str,
+        recursive: bool = True,
+        max_depth: int = None,
+    ) -> str:
         if not pattern:
-            self.report_warning("⚠️ Warning: Empty search pattern provided. Operation skipped.")
+            self.report_warning(
+                "⚠️ Warning: Empty search pattern provided. Operation skipped."
+            )
             return "Warning: Empty search pattern provided. Operation skipped."
-        matches = []
+        output = []
         for directory in directories:
-            self.report_info(f"🔎 Searching for text '{pattern}' in '{directory}'")
-            for root, dirs, files in os.walk(directory):
+            info_str = f"🔎 Searching for text '{pattern}' in '{directory}'"
+            if recursive is False:
+                info_str += f" (recursive={recursive})"
+            self.report_info(info_str)
+            if recursive:
+                walker = os.walk(directory)
+            else:
+                # Only the top directory, not recursive
+                dirs, files = filter_ignored(
+                    directory, *os.walk(directory).__next__()[1:]
+                )
+                walker = [(directory, dirs, files)]
+            for root, dirs, files in walker:
+                # Calculate depth
+                rel_path = os.path.relpath(root, directory)
+                depth = 0 if rel_path == "." else rel_path.count(os.sep) + 1
+                if max_depth is not None and depth > max_depth:
+                    dirs[:] = []
+                    continue
+                if not recursive and depth > 0:
+                    break
                 dirs, files = filter_ignored(root, dirs, files)
                 for filename in files:
                     path = os.path.join(root, filename)
                     try:
-                        with open(path, 'r', encoding='utf-8', errors='ignore') as f:
+                        with open(path, "r", encoding="utf-8", errors="ignore") as f:
                             for lineno, line in enumerate(f, 1):
                                 if pattern in line:
-                                    matches.append(f"{path}:{lineno}: {line.strip()}")
-                                    if len(matches) >= max_results:
-                                        break
+                                    output.append(f"{path}:{lineno}: {line.strip()}")
                     except Exception:
                         continue
-        
-        warning = ""
-        if len(matches) >= max_results:
-            warning = "\n⚠️ Warning: Maximum result limit reached. Some matches may not be shown."
-            suffix = " (Max Reached)"
-        else:
-            suffix = ""
-        self.report_success(f" ✅ {len(matches)} {pluralize('line', len(matches))}{suffix}")
-        return '\n'.join(matches) + warning
-
-
-from janito.agent.tools.tools_utils import pluralize
+        self.report_success(f" ✅ {len(output)} {pluralize('line', len(output))} found")
+        return "\n".join(output)

janito/agent/tools/tools_utils.py

@@ -1,11 +1,13 @@
 def display_path(path):
     import os
+
     if os.path.isabs(path):
         return path
     return os.path.relpath(path)
 
+
 def pluralize(word: str, count: int) -> str:
     """Return the pluralized form of word if count != 1, unless word already ends with 's'."""
-    if count == 1 or word.endswith('s'):
+    if count == 1 or word.endswith("s"):
         return word
-    return word + 's'
+    return word + "s"

janito/agent/tools/utils.py

@@ -20,11 +20,15 @@ def display_path(original_path: str, expanded_path: str) -> str:
     - Else, show the expanded path.
     """
     # Detect relative path (POSIX or Windows)
-    if not (original_path.startswith("/") or original_path.startswith("~") or (os.name == "nt" and len(original_path) > 1 and original_path[1] == ":")):
+    if not (
+        original_path.startswith("/")
+        or original_path.startswith("~")
+        or (os.name == "nt" and len(original_path) > 1 and original_path[1] == ":")
+    ):
         return original_path
     home = os.path.expanduser("~")
     if original_path.startswith("~"):
         return original_path
     if expanded_path.startswith(home):
-        return "~" + expanded_path[len(home):]
+        return "~" + expanded_path[len(home) :]
     return expanded_path

janito/cli/_print_config.py

@@ -2,6 +2,7 @@ import os
 from janito.rich_utils import print_info, print_warning, print_magenta
 from ._utils import home_shorten
 
+
 def print_config_items(items, color_label=None):
     if not items:
         return
@@ -9,7 +10,7 @@ def print_config_items(items, color_label=None):
         print_info(color_label)
     home = os.path.expanduser("~")
     for key, value in items.items():
-        if key == "system_prompt" and isinstance(value, str):
+        if key == "system_prompt_template" and isinstance(value, str):
             if value.startswith(home):
                 print(f"{key} = {home_shorten(value)}")
             else:
@@ -18,51 +19,76 @@ def print_config_items(items, color_label=None):
             print_info(f"{key} = {value}")
     print_info("")
 
-def print_full_config(local_config, global_config, unified_config, config_defaults, console=None):
+
+def print_full_config(
+    local_config, global_config, unified_config, config_defaults, console=None
+):
     """
     Print local, global, and default config values in a unified way.
-    Handles masking API keys and showing the template file for system_prompt if not set.
+    Handles masking API keys and showing the template file for system_prompt_template if not set.
     """
     local_items = {}
     global_items = {}
     local_keys = set(local_config.all().keys())
     global_keys = set(global_config.all().keys())
-    all_keys = set(config_defaults.keys()) | global_keys | local_keys
-    out = print_info if console is None else console.print
     if not (local_keys or global_keys):
         print_warning("No configuration found.")
     else:
         for key in sorted(local_keys):
             if key == "api_key":
                 value = local_config.get("api_key")
-                value = value[:4] + '...' + value[-4:] if value and len(value) > 8 else ('***' if value else None)
+                value = (
+                    value[:4] + "..." + value[-4:]
+                    if value and len(value) > 8
+                    else ("***" if value else None)
+                )
             else:
                 value = unified_config.get(key)
             local_items[key] = value
         for key in sorted(global_keys - local_keys):
             if key == "api_key":
                 value = global_config.get("api_key")
-                value = value[:4] + '...' + value[-4:] if value and len(value) > 8 else ('***' if value else None)
+                value = (
+                    value[:4] + "..." + value[-4:]
+                    if value and len(value) > 8
+                    else ("***" if value else None)
+                )
             else:
                 value = unified_config.get(key)
             global_items[key] = value
         # Mask API key
         for cfg in (local_items, global_items):
-            if 'api_key' in cfg and cfg['api_key']:
-                val = cfg['api_key']
-                cfg['api_key'] = val[:4] + '...' + val[-4:] if len(val) > 8 else '***'
-        print_config_items(local_items, color_label="[cyan]🏠 Local Configuration[/cyan]")
-        print_config_items(global_items, color_label="[yellow]🌐 Global Configuration[/yellow]")
+            if "api_key" in cfg and cfg["api_key"]:
+                val = cfg["api_key"]
+                cfg["api_key"] = val[:4] + "..." + val[-4:] if len(val) > 8 else "***"
+        print_config_items(
+            local_items, color_label="[cyan]🏠 Local Configuration[/cyan]"
+        )
+        print_config_items(
+            global_items, color_label="[yellow]🌐 Global Configuration[/yellow]"
+        )
         # Show defaults for unset keys
         shown_keys = set(local_items.keys()) | set(global_items.keys())
-        default_items = {k: v for k, v in config_defaults.items() if k not in shown_keys and k != 'api_key'}
+        default_items = {
+            k: v
+            for k, v in config_defaults.items()
+            if k not in shown_keys and k != "api_key"
+        }
         if default_items:
             print_magenta("[green]🟢 Defaults (not set in config files)[/green]")
             from pathlib import Path
-            template_path = Path(__file__).parent / "agent" / "templates" / "system_instructions.j2"
+
+            template_path = (
+                Path(__file__).parent
+                / "agent"
+                / "templates"
+                / "system_prompt_template.j2"
+            )
             for key, value in default_items.items():
-                if key == "system_prompt" and value is None:
-                    print_info(f"{key} = (default template path: {home_shorten(str(template_path))})")
+                if key == "system_prompt_template" and value is None:
+                    print_info(
+                        f"{key} = (default template path: {home_shorten(str(template_path))})"
+                    )
                 else:
                     print_info(f"{key} = {value}")
             print_info("")

janito/cli/_utils.py

@@ -1,5 +1,6 @@
 import os
 
+
 def home_shorten(path: str) -> str:
     """If path starts with the user's home directory, replace it with ~."""
     home = os.path.expanduser("~")

janito/cli/arg_parser.py

@@ -2,38 +2,191 @@ import argparse
 
 
 def create_parser():
-    parser = argparse.ArgumentParser(description="OpenRouter API call using OpenAI Python SDK")
-    parser.add_argument("prompt", type=str, nargs="?", help="Prompt to send to the model")
+    parser = argparse.ArgumentParser(
+        description="OpenRouter API call using OpenAI Python SDK"
+    )
+    parser.add_argument(
+        "prompt", type=str, nargs="?", help="Prompt to send to the model"
+    )
 
-    parser.add_argument("--max-tokens", type=int, default=None, help="Maximum tokens for model response (overrides config, default: 200000)")
-    parser.add_argument("--max-tools", type=int, default=None, help="Maximum number of tool calls allowed within a chat session (default: unlimited)")
-    parser.add_argument("--model", type=str, default=None, help="Model name to use for this session (overrides config, does not persist)")
-    parser.add_argument("--max-rounds", type=int, default=None, help="Maximum number of agent rounds per prompt (overrides config, default: 50)")
+    parser.add_argument(
+        "--max-tokens",
+        type=int,
+        default=None,
+        help="Maximum tokens for model response (overrides config, default: 200000)",
+    )
+    parser.add_argument(
+        "--max-tools",
+        type=int,
+        default=None,
+        help="Maximum number of tool calls allowed within a chat session (default: unlimited)",
+    )
+    parser.add_argument(
+        "--model",
+        type=str,
+        default=None,
+        help="Model name to use for this session (overrides config, does not persist)",
+    )
+    parser.add_argument(
+        "--max-rounds",
+        type=int,
+        default=None,
+        help="Maximum number of agent rounds per prompt (overrides config, default: 50)",
+    )
 
     # Mutually exclusive group for system prompt options
     group = parser.add_mutually_exclusive_group()
-    group.add_argument("-s", "--system", type=str, default=None, help="Optional system prompt as a raw string.")
-    group.add_argument("--system-file", type=str, default=None, help="Path to a plain text file to use as the system prompt (no template rendering, takes precedence over --system-prompt)")
+    group.add_argument(
+        "-s",
+        "--system",
+        type=str,
+        default=None,
+        help="Optional system prompt as a raw string.",
+    )
+    group.add_argument(
+        "--system-file",
+        type=str,
+        default=None,
+        help="Path to a plain text file to use as the system prompt (no template rendering, takes precedence over --system-prompt)",
+    )
 
-    parser.add_argument("-r", "--role", type=str, default=None, help="Role description for the default system prompt")
-    parser.add_argument("-t", "--temperature", type=float, default=None, help="Sampling temperature (e.g., 0.0 - 2.0)")
-    parser.add_argument("--verbose-http", action="store_true", help="Enable verbose HTTP logging")
-    parser.add_argument("--verbose-http-raw", action="store_true", help="Enable raw HTTP wire-level logging")
-    parser.add_argument("--verbose-response", action="store_true", help="Pretty print the full response object")
-    parser.add_argument("--show-system", action="store_true", help="Show model, parameters, system prompt, and tool definitions, then exit")
-    parser.add_argument("--verbose-tools", action="store_true", help="Print tool call parameters and results")
-    parser.add_argument("-n", "--no-tools", action="store_true", default=False, help="Disable tool use (default: enabled)")
-    parser.add_argument("--set-local-config", type=str, default=None, help='Set a local config key-value pair, format "key=val"')
-    parser.add_argument("--set-global-config", type=str, default=None, help='Set a global config key-value pair, format "key=val"')
-    parser.add_argument("--run-config", type=str, action='append', default=None, help='Set a runtime (in-memory only) config key-value pair, format "key=val". Can be repeated.')
-    parser.add_argument("--show-config", action="store_true", help="Show effective configuration and exit")
-    parser.add_argument("--set-api-key", type=str, default=None, help="Set and save the API key globally")
-    parser.add_argument("--version", action="store_true", help="Show program's version number and exit")
-    parser.add_argument("--help-config", action="store_true", help="Show all configuration options and exit")
-    parser.add_argument("--continue-session", action="store_true", help="Continue from the last saved conversation")
-    parser.add_argument("--web", action="store_true", help="Launch the Janito web server instead of CLI")
-    parser.add_argument("--config-reset-local", action="store_true", help="Remove the local config file (~/.janito/config.json)")
-    parser.add_argument("--config-reset-global", action="store_true", help="Remove the global config file (~/.janito/config.json)")
-    parser.add_argument("--trust", action="store_true", help="Enable trust mode: suppresses run_bash_command output, only shows output file locations.")
-    parser.add_argument("-V", "--vanilla", action="store_true", default=False, help="Vanilla mode: disables tools, system prompt, and temperature (unless -t is set)")
+    parser.add_argument(
+        "-r",
+        "--role",
+        type=str,
+        default=None,
+        help="Role description for the default system prompt",
+    )
+    parser.add_argument(
+        "-t",
+        "--temperature",
+        type=float,
+        default=None,
+        help="Sampling temperature (e.g., 0.0 - 2.0)",
+    )
+    parser.add_argument(
+        "--verbose-http", action="store_true", help="Enable verbose HTTP logging"
+    )
+    parser.add_argument(
+        "--verbose-http-raw",
+        action="store_true",
+        help="Enable raw HTTP wire-level logging",
+    )
+    parser.add_argument(
+        "--verbose-response",
+        action="store_true",
+        help="Pretty print the full response object",
+    )
+    parser.add_argument(
+        "--show-system",
+        action="store_true",
+        help="Show model, parameters, system prompt, and tool definitions, then exit",
+    )
+    parser.add_argument(
+        "--verbose-tools",
+        action="store_true",
+        help="Print tool call parameters and results",
+    )
+    parser.add_argument(
+        "-n",
+        "--no-tools",
+        action="store_true",
+        default=False,
+        help="Disable tool use (default: enabled)",
+    )
+    parser.add_argument(
+        "--set-local-config",
+        type=str,
+        default=None,
+        help='Set a local config key-value pair, format "key=val"',
+    )
+    parser.add_argument(
+        "--set-global-config",
+        type=str,
+        default=None,
+        help='Set a global config key-value pair, format "key=val"',
+    )
+    parser.add_argument(
+        "--run-config",
+        type=str,
+        action="append",
+        default=None,
+        help='Set a runtime (in-memory only) config key-value pair, format "key=val". Can be repeated.',
+    )
+    parser.add_argument(
+        "--show-config",
+        action="store_true",
+        help="Show effective configuration and exit",
+    )
+    parser.add_argument(
+        "--set-api-key",
+        type=str,
+        default=None,
+        help="Set and save the API key globally",
+    )
+    parser.add_argument(
+        "--version", action="store_true", help="Show program's version number and exit"
+    )
+    parser.add_argument(
+        "--help-config",
+        action="store_true",
+        help="Show all configuration options and exit",
+    )
+    parser.add_argument(
+        "--continue-session",
+        action="store_true",
+        help="Continue from the last saved conversation",
+    )
+    parser.add_argument(
+        "--web", action="store_true", help="Launch the Janito web server instead of CLI"
+    )
+    parser.add_argument(
+        "--config-reset-local",
+        action="store_true",
+        help="Remove the local config file (~/.janito/config.json)",
+    )
+    parser.add_argument(
+        "--config-reset-global",
+        action="store_true",
+        help="Remove the global config file (~/.janito/config.json)",
+    )
+    parser.add_argument(
+        "--verbose-events",
+        action="store_true",
+        help="Print all agent events before dispatching to the message handler (for debugging)",
+    )
+    parser.add_argument(
+        "-V",
+        "--vanilla",
+        action="store_true",
+        default=False,
+        help="Vanilla mode: disables tools, system prompt, and temperature (unless -t is set)",
+    )
+    parser.add_argument(
+        "-T",
+        "--trust-tools",
+        action="store_true",
+        help="Suppress all tool output (trusted tools mode: only shows output file locations)",
+    )
+    parser.add_argument(
+        "--style",
+        type=str,
+        default=None,
+        help="Interaction style for system prompt template (e.g., default, technical)",
+    )
+    parser.add_argument(
+        "--stream",
+        action="store_true",
+        help="Enable OpenAI streaming mode (yields tokens as they arrive)",
+    )
+    parser.add_argument(
+        "--verbose-stream",
+        action="store_true",
+        help="Print raw chunks as they are fetched from OpenAI (for debugging)",
+    )
+    parser.add_argument(
+        "--scan",
+        action="store_true",
+        help="Scan the project to auto-detect relevant tech/skills and save to .janito/tech.txt (no chat)",
+    )
     return parser

janito/cli/config_commands.py

@@ -19,7 +19,9 @@ def handle_config_commands(args):
                 sys.exit(1)
             key = key.strip()
             if key not in CONFIG_OPTIONS:
-                print(f"Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}")
+                print(
+                    f"Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}"
+                )
                 sys.exit(1)
             runtime_config.set(key, val.strip())
     if args.set_local_config:
@@ -30,7 +32,9 @@ def handle_config_commands(args):
             sys.exit(1)
         key = key.strip()
         if key not in CONFIG_OPTIONS:
-            print(f"Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}")
+            print(
+                f"Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}"
+            )
             sys.exit(1)
         local_config.set(key, val.strip())
         local_config.save()
@@ -46,18 +50,20 @@ def handle_config_commands(args):
             sys.exit(1)
         key = key.strip()
         if key not in CONFIG_OPTIONS and not key.startswith("template."):
-            print(f"Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}")
+            print(
+                f"Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}"
+            )
             sys.exit(1)
-        if key.startswith('template.'):
-            subkey = key[len('template.'):]
-            template_dict = global_config.get('template', {})
+        if key.startswith("template."):
+            subkey = key[len("template.") :]
+            template_dict = global_config.get("template", {})
             template_dict[subkey] = val.strip()
-            global_config.set('template', template_dict)
+            global_config.set("template", template_dict)
             global_config.save()
             # Remove legacy flat key if present
             if key in global_config._data:
                 del global_config._data[key]
-            runtime_config.set('template', template_dict)
+            runtime_config.set("template", template_dict)
             print(f"Global config updated: template.{subkey} = {val.strip()}")
             did_something = True
         else:
@@ -84,7 +90,6 @@ def handle_config_commands(args):
         # Collect and group keys
         local_keys = set(local_config.all().keys())
         global_keys = set(global_config.all().keys())
-        all_keys = set(CONFIG_DEFAULTS.keys()) | global_keys | local_keys
         if not (local_keys or global_keys):
             print("No configuration found.")
         else:
@@ -103,7 +108,11 @@ def handle_config_commands(args):
                     continue
                 if key == "api_key":
                     value = local_config.get("api_key")
-                    value = value[:4] + '...' + value[-4:] if value and len(value) > 8 else ('***' if value else None)
+                    value = (
+                        value[:4] + "..." + value[-4:]
+                        if value and len(value) > 8
+                        else ("***" if value else None)
+                    )
                 else:
                     value = unified_config.get(key)
                 local_items[key] = value
@@ -119,36 +128,58 @@ def handle_config_commands(args):
                     continue
                 if key == "api_key":
                     value = global_config.get("api_key")
-                    value = value[:4] + '...' + value[-4:] if value and len(value) > 8 else ('***' if value else None)
+                    value = (
+                        value[:4] + "..." + value[-4:]
+                        if value and len(value) > 8
+                        else ("***" if value else None)
+                    )
                 else:
                     value = unified_config.get(key)
                 global_items[key] = value
 
             # Mask API key
             for cfg in (local_items, global_items):
-                if 'api_key' in cfg and cfg['api_key']:
-                    val = cfg['api_key']
-                    cfg['api_key'] = val[:4] + '...' + val[-4:] if len(val) > 8 else '***'
+                if "api_key" in cfg and cfg["api_key"]:
+                    val = cfg["api_key"]
+                    cfg["api_key"] = (
+                        val[:4] + "..." + val[-4:] if len(val) > 8 else "***"
+                    )
 
             # Print local config
             from ._print_config import print_config_items
-            print_config_items(local_items, color_label="[cyan]🏠 Local Configuration[/cyan]")
 
-            # Print global config
-            print_config_items(global_items, color_label="[yellow]🌐 Global Configuration[/yellow]")
+            print_config_items(
+                local_items, color_label="[cyan]🏠 Local Configuration[/cyan]"
+            )
 
+            # Print global config
+            print_config_items(
+                global_items, color_label="[yellow]🌐 Global Configuration[/yellow]"
+            )
 
         # Show defaults for unset keys
         shown_keys = set(local_items.keys()) | set(global_items.keys())
-        default_items = {k: v for k, v in CONFIG_DEFAULTS.items() if k not in shown_keys and k != 'api_key'}
+        default_items = {
+            k: v
+            for k, v in CONFIG_DEFAULTS.items()
+            if k not in shown_keys and k != "api_key"
+        }
         if default_items:
             print("[green]🟢 Defaults (not set in config files)[/green]")
             for key, value in default_items.items():
                 # Special case for system_prompt: show template file if None
                 if key == "system_prompt" and value is None:
                     from pathlib import Path
-                    template_path = Path(__file__).parent / "agent" / "templates" / "system_instructions.j2"
-                    print(f"{key} = (default template path: {home_shorten(str(template_path))})")
+
+                    template_path = (
+                        Path(__file__).parent
+                        / "agent"
+                        / "templates"
+                        / "system_prompt_template.j2"
+                    )
+                    print(
+                        f"{key} = (default template path: {home_shorten(str(template_path))})"
+                    )
                 else:
                     print(f"{key} = {value}")
             print()
@@ -156,8 +187,9 @@ def handle_config_commands(args):
 
     import os
     from pathlib import Path
+
     if getattr(args, "config_reset_local", False):
-        local_path = Path('.janito/config.json')
+        local_path = Path(".janito/config.json")
         if local_path.exists():
             os.remove(local_path)
             print(f"Removed local config file: {local_path}")
@@ -165,7 +197,7 @@ def handle_config_commands(args):
             print(f"Local config file does not exist: {local_path}")
         sys.exit(0)
     if getattr(args, "config_reset_global", False):
-        global_path = Path.home() / '.janito/config.json'
+        global_path = Path.home() / ".janito/config.json"
         if global_path.exists():
             os.remove(global_path)
             print(f"Removed global config file: {global_path}")