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

janito/__init__.py

@@ -1,6 +1,6 @@
-"""
-janito: A Python package for managing and interacting with Large Language Model (LLM) providers and their APIs.
-Provides a CLI for credential management and an extensible driver system for LLMs.
-"""
-
-__version__ = "2.3.0"
+"""
+janito: A Python package for managing and interacting with Large Language Model (LLM) providers and their APIs.
+Provides a CLI for credential management and an extensible driver system for LLMs.
+"""
+
+__version__ = "2.3.1"

janito/cli/chat_mode/shell/autocomplete.py

@@ -1,21 +1,21 @@
-from prompt_toolkit.completion import Completer, Completion
-from janito.cli.chat_mode.shell.commands import get_shell_command_names
-
-
-class ShellCommandCompleter(Completer):
-    """
-    Provides autocomplete suggestions for shell commands starting with '/'.
-    Uses the COMMAND_HANDLERS registry for available commands.
-    """
-
-    def __init__(self):
-        # Only commands starting with '/'
-        self.commands = get_shell_command_names()
-
-    def get_completions(self, document, complete_event):
-        text = document.text_before_cursor
-        if text.startswith("/"):
-            prefix = text[1:]
-            for cmd in self.commands:
-                if cmd[1:].startswith(prefix):
-                    yield Completion(cmd, start_position=-(len(prefix) + 1))
+from prompt_toolkit.completion import Completer, Completion
+from janito.cli.chat_mode.shell.commands import get_shell_command_names
+
+
+class ShellCommandCompleter(Completer):
+    """
+    Provides autocomplete suggestions for shell commands starting with '/'.
+    Uses the COMMAND_HANDLERS registry for available commands.
+    """
+
+    def __init__(self):
+        # Only commands starting with '/'
+        self.commands = get_shell_command_names()
+
+    def get_completions(self, document, complete_event):
+        text = document.text_before_cursor
+        if text.startswith("/"):
+            prefix = text[1:]
+            for cmd in self.commands:
+                if cmd[1:].startswith(prefix):
+                    yield Completion(cmd, start_position=-(len(prefix) + 1))

janito/cli/chat_mode/shell/commands/clear.py

@@ -1,12 +1,12 @@
-from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler
-from janito.cli.console import shared_console
-
-
-class ClearShellHandler(ShellCmdHandler):
-    help_text = "Clear the terminal screen using Rich console."
-
-    def run(self):
-        shared_console.clear()
-        # Optionally show a message after clearing
-        # shared_console.print("[green]Screen cleared.[/green]")
-        return None
+from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler
+from janito.cli.console import shared_console
+
+
+class ClearShellHandler(ShellCmdHandler):
+    help_text = "Clear the terminal screen using Rich console."
+
+    def run(self):
+        shared_console.clear()
+        # Optionally show a message after clearing
+        # shared_console.print("[green]Screen cleared.[/green]")
+        return None

janito/cli/chat_mode/shell/commands/multi.py

@@ -1,51 +1,51 @@
-from prompt_toolkit.shortcuts import prompt
-from prompt_toolkit.application.current import get_app
-from prompt_toolkit.document import Document
-from prompt_toolkit.key_binding import KeyBindings
-from janito.cli.console import shared_console
-from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler
-
-
-class MultiShellHandler(ShellCmdHandler):
-    help_text = "Prompt for multi-line input and display the result. Usage: /multi"
-
-    def run(self):
-        shared_console.print(
-            "[bold blue]Entering multi-line input mode. Press Esc+Enter or Ctrl+D to submit, Ctrl+C to cancel.[/bold blue]"
-        )
-        # Prompt for multi-line input
-        bindings = KeyBindings()
-        submitted = {"value": None}
-
-        @bindings.add("escape", "enter")
-        def _(event):
-            buffer = event.app.current_buffer
-            submitted["value"] = buffer.text
-            event.app.exit(result=buffer.text)
-
-        # Support Ctrl+D
-        @bindings.add("c-d")
-        def _(event):
-            buffer = event.app.current_buffer
-            submitted["value"] = buffer.text
-            event.app.exit(result=buffer.text)
-
-        try:
-            user_input = prompt(
-                "Multi-line > ",
-                multiline=True,
-                key_bindings=bindings,
-            )
-        except (EOFError, KeyboardInterrupt):
-            shared_console.print("[red]Multi-line input cancelled.[/red]")
-            return
-
-        # Save input to history if available
-        user_input_history = getattr(self.shell_state, "user_input_history", None)
-        if user_input_history is not None:
-            user_input_history.append(user_input)
-        # Store input for main chat loop to consume as if just entered by the user
-        self.shell_state.injected_input = user_input
-        shared_console.print(
-            "[green]Multi-line input will be sent as your next chat prompt.[/green]"
-        )
+from prompt_toolkit.shortcuts import prompt
+from prompt_toolkit.application.current import get_app
+from prompt_toolkit.document import Document
+from prompt_toolkit.key_binding import KeyBindings
+from janito.cli.console import shared_console
+from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler
+
+
+class MultiShellHandler(ShellCmdHandler):
+    help_text = "Prompt for multi-line input and display the result. Usage: /multi"
+
+    def run(self):
+        shared_console.print(
+            "[bold blue]Entering multi-line input mode. Press Esc+Enter or Ctrl+D to submit, Ctrl+C to cancel.[/bold blue]"
+        )
+        # Prompt for multi-line input
+        bindings = KeyBindings()
+        submitted = {"value": None}
+
+        @bindings.add("escape", "enter")
+        def _(event):
+            buffer = event.app.current_buffer
+            submitted["value"] = buffer.text
+            event.app.exit(result=buffer.text)
+
+        # Support Ctrl+D
+        @bindings.add("c-d")
+        def _(event):
+            buffer = event.app.current_buffer
+            submitted["value"] = buffer.text
+            event.app.exit(result=buffer.text)
+
+        try:
+            user_input = prompt(
+                "Multi-line > ",
+                multiline=True,
+                key_bindings=bindings,
+            )
+        except (EOFError, KeyboardInterrupt):
+            shared_console.print("[red]Multi-line input cancelled.[/red]")
+            return
+
+        # Save input to history if available
+        user_input_history = getattr(self.shell_state, "user_input_history", None)
+        if user_input_history is not None:
+            user_input_history.append(user_input)
+        # Store input for main chat loop to consume as if just entered by the user
+        self.shell_state.injected_input = user_input
+        shared_console.print(
+            "[green]Multi-line input will be sent as your next chat prompt.[/green]"
+        )

janito/cli/chat_mode/shell/input_history.py

@@ -1,62 +1,62 @@
-import os
-import json
-from datetime import datetime
-from typing import List, Any, Dict
-
-
-class UserInputHistory:
-    """
-    Handles loading, saving, and appending of user input history for the shell.
-    Each day's history is stored in a line-delimited JSONL file (.jsonl) under .janito/input_history/.
-    Each line is a JSON dict, e.g., {"input": ..., "ts": ...}
-    """
-
-    def __init__(self, history_dir=None):
-        self.history_dir = history_dir or os.path.join(".janito", "input_history")
-        os.makedirs(self.history_dir, exist_ok=True)
-
-    def _get_today_file(self):
-        today_str = datetime.now().strftime("%y%m%d")
-        return os.path.join(self.history_dir, f"{today_str}.jsonl")
-
-    def load(self) -> List[Dict[str, Any]]:
-        """Load today's input history as a list of dicts."""
-        history_file = self._get_today_file()
-        history = []
-        try:
-            with open(history_file, "r", encoding="utf-8") as f:
-                for line in f:
-                    line = line.strip()
-                    if not line:
-                        continue
-                    try:
-                        history.append(json.loads(line))
-                    except json.JSONDecodeError:
-                        continue
-        except FileNotFoundError:
-            pass
-        return history
-
-    def sanitize_surrogates(self, s):
-        if isinstance(s, str):
-            return s.encode("utf-8", errors="replace").decode("utf-8")
-        return s
-
-    def append(self, input_str: str):
-        """Append a new input as a JSON dict to today's history file."""
-        history_file = self._get_today_file()
-        input_str = self.sanitize_surrogates(input_str)
-        entry = {"input": input_str, "ts": datetime.now().isoformat()}
-        with open(history_file, "a", encoding="utf-8") as f:
-            f.write(json.dumps(entry, ensure_ascii=False) + "\n")
-
-    def save(self, history_list: List[Any]):
-        """Overwrite today's history file with the given list (for compatibility)."""
-        history_file = self._get_today_file()
-        with open(history_file, "w", encoding="utf-8") as f:
-            for item in history_list:
-                if isinstance(item, dict):
-                    f.write(json.dumps(item, ensure_ascii=False) + "\n")
-                else:
-                    entry = {"input": str(item), "ts": datetime.now().isoformat()}
-                    f.write(json.dumps(entry, ensure_ascii=False) + "\n")
+import os
+import json
+from datetime import datetime
+from typing import List, Any, Dict
+
+
+class UserInputHistory:
+    """
+    Handles loading, saving, and appending of user input history for the shell.
+    Each day's history is stored in a line-delimited JSONL file (.jsonl) under .janito/input_history/.
+    Each line is a JSON dict, e.g., {"input": ..., "ts": ...}
+    """
+
+    def __init__(self, history_dir=None):
+        self.history_dir = history_dir or os.path.join(".janito", "input_history")
+        os.makedirs(self.history_dir, exist_ok=True)
+
+    def _get_today_file(self):
+        today_str = datetime.now().strftime("%y%m%d")
+        return os.path.join(self.history_dir, f"{today_str}.jsonl")
+
+    def load(self) -> List[Dict[str, Any]]:
+        """Load today's input history as a list of dicts."""
+        history_file = self._get_today_file()
+        history = []
+        try:
+            with open(history_file, "r", encoding="utf-8") as f:
+                for line in f:
+                    line = line.strip()
+                    if not line:
+                        continue
+                    try:
+                        history.append(json.loads(line))
+                    except json.JSONDecodeError:
+                        continue
+        except FileNotFoundError:
+            pass
+        return history
+
+    def sanitize_surrogates(self, s):
+        if isinstance(s, str):
+            return s.encode("utf-8", errors="replace").decode("utf-8")
+        return s
+
+    def append(self, input_str: str):
+        """Append a new input as a JSON dict to today's history file."""
+        history_file = self._get_today_file()
+        input_str = self.sanitize_surrogates(input_str)
+        entry = {"input": input_str, "ts": datetime.now().isoformat()}
+        with open(history_file, "a", encoding="utf-8") as f:
+            f.write(json.dumps(entry, ensure_ascii=False) + "\n")
+
+    def save(self, history_list: List[Any]):
+        """Overwrite today's history file with the given list (for compatibility)."""
+        history_file = self._get_today_file()
+        with open(history_file, "w", encoding="utf-8") as f:
+            for item in history_list:
+                if isinstance(item, dict):
+                    f.write(json.dumps(item, ensure_ascii=False) + "\n")
+                else:
+                    entry = {"input": str(item), "ts": datetime.now().isoformat()}
+                    f.write(json.dumps(entry, ensure_ascii=False) + "\n")

janito/cli/cli_commands/list_models.py

@@ -1,35 +1,35 @@
-"""
-CLI Command: List models for the specified/current provider
-"""
-
-from janito.cli.cli_commands.model_utils import _print_models_table
-import sys
-
-_provider_instance = None
-
-
-def get_provider_instance():
-    global _provider_instance
-    if _provider_instance is None:
-        _provider_instance = setup_provider()
-    return _provider_instance
-
-
-def handle_list_models(args, provider_instance):
-    provider_name = getattr(provider_instance, "name", None)
-    if not provider_name:
-        print(
-            "Error: Provider must be specified with --provider or set as default before listing models."
-        )
-        sys.exit(1)
-    try:
-        models = list(provider_instance.get_model_info().values())
-        if models and isinstance(models[0], dict):
-            _print_models_table(models, provider_name)
-        else:
-            print(f"Supported models for provider '{provider_name}':")
-            for m in models:
-                print(f"- {m}")
-    except Exception as e:
-        print(f"Error listing models for provider '{provider_name}': {e}")
-    sys.exit(0)
+"""
+CLI Command: List models for the specified/current provider
+"""
+
+from janito.cli.cli_commands.model_utils import _print_models_table
+import sys
+
+_provider_instance = None
+
+
+def get_provider_instance():
+    global _provider_instance
+    if _provider_instance is None:
+        _provider_instance = setup_provider()
+    return _provider_instance
+
+
+def handle_list_models(args, provider_instance):
+    provider_name = getattr(provider_instance, "name", None)
+    if not provider_name:
+        print(
+            "Error: Provider must be specified with --provider or set as default before listing models."
+        )
+        sys.exit(1)
+    try:
+        models = list(provider_instance.get_model_info().values())
+        if models and isinstance(models[0], dict):
+            _print_models_table(models, provider_name)
+        else:
+            print(f"Supported models for provider '{provider_name}':")
+            for m in models:
+                print(f"- {m}")
+    except Exception as e:
+        print(f"Error listing models for provider '{provider_name}': {e}")
+    sys.exit(0)

janito/cli/cli_commands/list_providers.py

@@ -1,9 +1,9 @@
-"""
-CLI Command: List supported LLM providers
-"""
-
-from janito.provider_registry import list_providers
-
-
-def handle_list_providers(args=None):
-    list_providers()
+"""
+CLI Command: List supported LLM providers
+"""
+
+from janito.provider_registry import list_providers
+
+
+def handle_list_providers(args=None):
+    list_providers()

janito/cli/cli_commands/list_tools.py

@@ -1,53 +1,53 @@
-"""
-CLI Command: List available tools
-"""
-
-
-def handle_list_tools(args=None):
-    from janito.tools.adapters.local.adapter import LocalToolsAdapter
-    import janito.tools  # Ensure all tools are registered
-
-    registry = janito.tools.get_local_tools_adapter()
-    tools = registry.list_tools()
-    if tools:
-        from rich.table import Table
-        from rich.console import Console
-        console = Console()
-        # Get tool instances to check provides_execution and get info
-        tool_instances = {t.tool_name: t for t in registry.get_tools()}
-        normal_tools = []
-        exec_tools = []
-        for tool in tools:
-            inst = tool_instances.get(tool, None)
-            # Extract parameter names from run signature
-            param_names = []
-            if inst and hasattr(inst, "run"):
-                import inspect
-                sig = inspect.signature(inst.run)
-                param_names = [p for p in sig.parameters if p != "self"]
-            info = {
-                "name": tool,
-                "params": ", ".join(param_names),
-            }
-            if getattr(inst, "provides_execution", False):
-                exec_tools.append(info)
-            else:
-                normal_tools.append(info)
-        table = Table(title="Registered tools", show_header=True, header_style="bold", show_lines=False, box=None)
-        table.add_column("Name", style="cyan", no_wrap=True)
-        table.add_column("Parameters", style="yellow")
-        for info in normal_tools:
-            table.add_row(info["name"], info["params"] or "-")
-        console.print(table)
-        if exec_tools:
-            exec_table = Table(title="Execution tools (only available with -x)", show_header=True, header_style="bold", show_lines=False, box=None)
-            exec_table.add_column("Name", style="cyan", no_wrap=True)
-            exec_table.add_column("Parameters", style="yellow")
-            for info in exec_tools:
-                exec_table.add_row(info["name"], info["params"] or "-")
-            console.print(exec_table)
-    else:
-        print("No tools registered.")
-    import sys
-
-    sys.exit(0)
+"""
+CLI Command: List available tools
+"""
+
+
+def handle_list_tools(args=None):
+    from janito.tools.adapters.local.adapter import LocalToolsAdapter
+    import janito.tools  # Ensure all tools are registered
+
+    registry = janito.tools.get_local_tools_adapter()
+    tools = registry.list_tools()
+    if tools:
+        from rich.table import Table
+        from rich.console import Console
+        console = Console()
+        # Get tool instances to check provides_execution and get info
+        tool_instances = {t.tool_name: t for t in registry.get_tools()}
+        normal_tools = []
+        exec_tools = []
+        for tool in tools:
+            inst = tool_instances.get(tool, None)
+            # Extract parameter names from run signature
+            param_names = []
+            if inst and hasattr(inst, "run"):
+                import inspect
+                sig = inspect.signature(inst.run)
+                param_names = [p for p in sig.parameters if p != "self"]
+            info = {
+                "name": tool,
+                "params": ", ".join(param_names),
+            }
+            if getattr(inst, "provides_execution", False):
+                exec_tools.append(info)
+            else:
+                normal_tools.append(info)
+        table = Table(title="Registered tools", show_header=True, header_style="bold", show_lines=False, box=None)
+        table.add_column("Name", style="cyan", no_wrap=True)
+        table.add_column("Parameters", style="yellow")
+        for info in normal_tools:
+            table.add_row(info["name"], info["params"] or "-")
+        console.print(table)
+        if exec_tools:
+            exec_table = Table(title="Execution tools (only available with -x)", show_header=True, header_style="bold", show_lines=False, box=None)
+            exec_table.add_column("Name", style="cyan", no_wrap=True)
+            exec_table.add_column("Parameters", style="yellow")
+            for info in exec_tools:
+                exec_table.add_row(info["name"], info["params"] or "-")
+            console.print(exec_table)
+    else:
+        print("No tools registered.")
+    import sys
+
+    sys.exit(0)

janito/cli/cli_commands/model_selection.py

@@ -1,50 +1,50 @@
-"""
-CLI Command: Validate and set the model provider selection
-"""
-
-from janito.cli.config import config
-
-_provider_instance = None
-
-
-def get_provider_instance():
-    global _provider_instance
-    if _provider_instance is None:
-        _provider_instance = setup_provider()
-    return _provider_instance
-
-
-def handle_model_selection(args):
-    if getattr(args, "model", None):
-        provider_instance = get_provider_instance()
-        provider_name = getattr(provider_instance, "name", None)
-        if not provider_name:
-            print(
-                "Error: Provider must be specified with --provider or set as default before selecting a model."
-            )
-            import sys
-
-            sys.exit(1)
-        if not validate_model_for_provider(provider_name, args.model):
-            sys.exit(1)
-        config.runtime_set("model", args.model)
-
-
-def validate_model_for_provider(provider_name, model_name):
-    try:
-        provider_instance = get_provider_instance()
-        info_dict = provider_instance.get_model_info()
-        available_names = [
-            m["name"] for m in info_dict.values() if isinstance(m, dict) and "name" in m
-        ]
-        if model_name in available_names:
-            return True
-        else:
-            print(
-                f"Error: Model '{model_name}' is not available for provider '{provider_name}'."
-            )
-            print(f"Available models: {', '.join(available_names)}")
-            return False
-    except Exception as e:
-        print(f"Error validating model for provider '{provider_name}': {e}")
-        return False
+"""
+CLI Command: Validate and set the model provider selection
+"""
+
+from janito.cli.config import config
+
+_provider_instance = None
+
+
+def get_provider_instance():
+    global _provider_instance
+    if _provider_instance is None:
+        _provider_instance = setup_provider()
+    return _provider_instance
+
+
+def handle_model_selection(args):
+    if getattr(args, "model", None):
+        provider_instance = get_provider_instance()
+        provider_name = getattr(provider_instance, "name", None)
+        if not provider_name:
+            print(
+                "Error: Provider must be specified with --provider or set as default before selecting a model."
+            )
+            import sys
+
+            sys.exit(1)
+        if not validate_model_for_provider(provider_name, args.model):
+            sys.exit(1)
+        config.runtime_set("model", args.model)
+
+
+def validate_model_for_provider(provider_name, model_name):
+    try:
+        provider_instance = get_provider_instance()
+        info_dict = provider_instance.get_model_info()
+        available_names = [
+            m["name"] for m in info_dict.values() if isinstance(m, dict) and "name" in m
+        ]
+        if model_name in available_names:
+            return True
+        else:
+            print(
+                f"Error: Model '{model_name}' is not available for provider '{provider_name}'."
+            )
+            print(f"Available models: {', '.join(available_names)}")
+            return False
+    except Exception as e:
+        print(f"Error validating model for provider '{provider_name}': {e}")
+        return False