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

janito/cli/core/getters.py

@@ -1,4 +1,5 @@
 """Handlers for get-type CLI commands (show_config, list_providers, models, tools)."""
+import sys
 
 from janito.cli.cli_commands.list_providers import handle_list_providers
 from janito.cli.cli_commands.list_models import handle_list_models
@@ -15,10 +16,11 @@ def handle_getter(args, config_mgr=None):
     if getattr(args, "list_models", False):
         provider = getattr(args, "provider", None)
         if not provider:
+            import sys
             print(
                 "Error: No provider selected. Please set a provider using '-p PROVIDER', '--set provider=name', or configure a provider."
             )
-            return
+            sys.exit(1)
         provider_instance = ProviderRegistry().get_instance(provider)
     GETTER_DISPATCH = {
         "list_providers": partial(handle_list_providers, args),

janito/cli/core/runner.py

@@ -28,6 +28,10 @@ def _populate_driver_config_data(args, modifiers, provider, model):
     driver_config_data = {"model": model}
     if getattr(args, "verbose_api", None) is not None:
         driver_config_data["verbose_api"] = args.verbose_api
+
+    # Add reasoning_effort from --effort CLI argument
+    if getattr(args, "effort", None) is not None:
+        driver_config_data["reasoning_effort"] = args.effort
     for field in LLMDriverConfig.__dataclass_fields__:
         if field in CONFIG_LOOKUP_KEYS:
             if field in modifiers and modifiers[field] is not None:
@@ -64,8 +68,10 @@ def prepare_llm_driver_config(args, modifiers):
         from janito.provider_registry import ProviderRegistry
 
         provider_instance = None
+        provider_instance = ProviderRegistry().get_instance(provider)
+        if provider_instance is None:
+            return provider, None, None
         try:
-            provider_instance = ProviderRegistry().get_instance(provider)
             if not provider_instance.is_model_available(model):
                 print(
                     f"Error: Model '{model}' is not available for provider '{provider}'."
@@ -98,16 +104,28 @@ def handle_runner(args, provider, llm_driver_config, agent_role, verbose_tools=F
     from janito.provider_registry import ProviderRegistry
 
     # Patch: disable execution/run tools if not enabled
+    import janito.tools
+    adapter = janito.tools.get_local_tools_adapter(workdir=getattr(args, "workdir", None))
     if not exec_enabled:
-        import janito.tools
-        adapter = janito.tools.get_local_tools_adapter(workdir=getattr(args, "workdir", None))
         if hasattr(adapter, "disable_execution_tools"):
             adapter.disable_execution_tools()
     else:
-        import janito.tools
-        adapter = janito.tools.get_local_tools_adapter(workdir=getattr(args, "workdir", None))
+        # Try to re-register execution tools if possible (print warning if not supported)
+        if hasattr(adapter, "register_tool"):
+            # This is a no-op if already registered, but we can attempt to re-register known execution tools
+            try:
+                from janito.tools.adapters.local import PythonCodeRunTool, PythonCommandRunTool, PythonFileRunTool, RunBashCommandTool, RunPowershellCommandTool
+                for tool_cls in [PythonCodeRunTool, PythonCommandRunTool, PythonFileRunTool, RunBashCommandTool, RunPowershellCommandTool]:
+                    try:
+                        adapter.register_tool(tool_cls)
+                    except Exception:
+                        pass  # Already registered or error
+            except Exception:
+                pass
 
     provider_instance = ProviderRegistry().get_instance(provider, llm_driver_config)
+    if provider_instance is None:
+        return
     mode = get_prompt_mode(args)
     if getattr(args, "verbose", False):
         print_verbose_info(
@@ -119,8 +137,10 @@ def handle_runner(args, provider, llm_driver_config, agent_role, verbose_tools=F
             PromptHandler as SingleShotPromptHandler,
         )
 
+        # DEBUG: Print exec_enabled propagation at runner
+        
         handler = SingleShotPromptHandler(
-            args, provider_instance, llm_driver_config, role=agent_role
+            args, provider_instance, llm_driver_config, role=agent_role, exec_enabled=exec_enabled
         )
         handler.handle()
     else:
@@ -136,6 +156,7 @@ def handle_runner(args, provider, llm_driver_config, agent_role, verbose_tools=F
             args=args,
             verbose_tools=verbose_tools,
             verbose_agent=getattr(args, "verbose_agent", False),
+            exec_enabled=exec_enabled,
         )
         session.run()
 

janito/cli/core/setters.py

@@ -37,10 +37,14 @@ def handle_set(args, config_mgr=None):
             return _handle_set_max_tokens(value)
         if key == "base_url":
             return _handle_set_base_url(value)
+        if key in ["azure_deployment_name", "azure-deployment-name"]:
+            global_config.file_set("azure_deployment_name", value)
+            print(f"Azure deployment name set to '{value}'.")
+            return True
         if ".max_tokens" in key or ".base_url" in key:
             return _handle_set_provider_level_setting(key, value)
         print(
-            f"Error: Unknown config key '{key}'. Supported: provider, model, <provider>.model, max_tokens, base_url, <provider>.max_tokens, <provider>.base_url, <provider>.<model>.max_tokens, <provider>.<model>.base_url"
+            f"Error: Unknown config key '{key}'. Supported: provider, model, <provider>.model, max_tokens, base_url, azure_deployment_name, <provider>.max_tokens, <provider>.base_url, <provider>.<model>.max_tokens, <provider>.<model>.base_url"
         )
         return True
     except Exception as e:

janito/cli/core/unsetters.py

@@ -1,54 +1,54 @@
-from janito.config import config as global_config
-
-
-def handle_unset(args):
-    unset_arg = getattr(args, "unset", None)
-    if not unset_arg:
-        return False
-    key = unset_arg.strip().replace("-", "_")
-    if "." in key:
-        # Provider or model-specific keys
-        parts = key.split(".")
-        if len(parts) == 2:
-            provider, subkey = parts
-            current_val = (
-                global_config.file_config.get("providers", {})
-                .get(provider, {})
-                .get(subkey)
-            )
-            if current_val is not None:
-                del global_config.file_config["providers"][provider][subkey]
-                global_config.save()
-                print(f"{key}={current_val} was removed.")
-                return True
-        elif len(parts) == 3:
-            provider, model, subkey = parts
-            model_conf = (
-                global_config.file_config.get("providers", {})
-                .get(provider, {})
-                .get("models", {})
-                .get(model, {})
-            )
-            current_val = model_conf.get(subkey)
-            if current_val is not None:
-                del global_config.file_config["providers"][provider]["models"][model][
-                    subkey
-                ]
-                global_config.save()
-                print(f"{key}={current_val} was removed.")
-                return True
-    else:
-        current_val = global_config.file_config.get(key)
-        if current_val is not None:
-            del global_config.file_config[key]
-            global_config.save()
-            print(f"{key}={current_val} was removed.")
-            return True
-    if "=" in unset_arg:
-        provided_key = unset_arg.split("=")[0].strip()
-        print(
-            f"Error: --unset expected a key, not key=value. Did you mean: --unset {provided_key}?"
-        )
-    else:
-        print(f"Error: no value set for {key} (cannot remove)")
-    return True
+from janito.config import config as global_config
+
+
+def handle_unset(args):
+    unset_arg = getattr(args, "unset", None)
+    if not unset_arg:
+        return False
+    key = unset_arg.strip().replace("-", "_")
+    if "." in key:
+        # Provider or model-specific keys
+        parts = key.split(".")
+        if len(parts) == 2:
+            provider, subkey = parts
+            current_val = (
+                global_config.file_config.get("providers", {})
+                .get(provider, {})
+                .get(subkey)
+            )
+            if current_val is not None:
+                del global_config.file_config["providers"][provider][subkey]
+                global_config.save()
+                print(f"{key}={current_val} was removed.")
+                return True
+        elif len(parts) == 3:
+            provider, model, subkey = parts
+            model_conf = (
+                global_config.file_config.get("providers", {})
+                .get(provider, {})
+                .get("models", {})
+                .get(model, {})
+            )
+            current_val = model_conf.get(subkey)
+            if current_val is not None:
+                del global_config.file_config["providers"][provider]["models"][model][
+                    subkey
+                ]
+                global_config.save()
+                print(f"{key}={current_val} was removed.")
+                return True
+    else:
+        current_val = global_config.file_config.get(key)
+        if current_val is not None:
+            del global_config.file_config[key]
+            global_config.save()
+            print(f"{key}={current_val} was removed.")
+            return True
+    if "=" in unset_arg:
+        provided_key = unset_arg.split("=")[0].strip()
+        print(
+            f"Error: --unset expected a key, not key=value. Did you mean: --unset {provided_key}?"
+        )
+    else:
+        print(f"Error: no value set for {key} (cannot remove)")
+    return True

janito/cli/main_cli.py

@@ -1,4 +1,5 @@
 import argparse
+import sys
 import enum
 from janito.cli.core.setters import handle_api_key_set, handle_set
 from janito.cli.core.getters import handle_getter
@@ -118,6 +119,13 @@ definition = [
             "help": "Port for the termweb server (default: 8088)",
         },
     ),
+    (["--effort"],
+        {
+            "choices": ["low", "medium", "high", "none"],
+            "default": None,
+            "help": "Set the reasoning effort for models that support it (low, medium, high, none)",
+        },
+    ),
     (["user_prompt"], {"nargs": argparse.REMAINDER, "help": "Prompt to submit"}),
     (
         ["-e", "--event-log"],
@@ -138,6 +146,7 @@ MODIFIER_KEYS = [
     "role",
     "system",
     "temperature",
+
     "verbose",
     "raw",
     "web",
@@ -238,7 +247,7 @@ class JanitoCLI:
             print(
                 "Error: No provider selected and no provider found in config. Please set a provider using '-p PROVIDER', '--set provider=name', or configure a provider."
             )
-            return
+            sys.exit(1)
         modifiers = self.collect_modifiers()
         self._maybe_print_verbose_modifiers(modifiers)
         setup_event_logger_if_needed(self.args)
@@ -251,6 +260,8 @@ class JanitoCLI:
         self._maybe_print_verbose_llm_config(llm_driver_config, run_mode)
         if run_mode == RunMode.RUN:
             self._maybe_print_verbose_run_mode()
+            # DEBUG: Print exec_enabled propagation at main_cli
+            
             handle_runner(
                 self.args,
                 provider,

janito/cli/prompt_core.py

@@ -8,7 +8,7 @@ from janito.performance_collector import PerformanceCollector
 from rich.status import Status
 from rich.console import Console
 from typing import Any, Optional, Callable
-from janito.driver_events import RequestStarted, RequestFinished, RequestStatus
+from janito.driver_events import RequestStarted, RequestFinished, RequestStatus, RateLimitRetry
 from janito.tools.tool_events import ToolCallError
 import threading
 from janito.cli.verbose_output import print_verbose_header
@@ -59,13 +59,16 @@ class PromptHandler:
             else:
                 self.console.print(inner_event.result)
             return None
+        if isinstance(inner_event, RateLimitRetry):
+            status.update(f"[yellow]Rate limited. Waiting {inner_event.retry_delay:.0f}s before retry (attempt {inner_event.attempt}).[yellow]")
+            return None
         if isinstance(inner_event, RequestFinished):
             status.update("[bold green]Received response![bold green]")
             return "break"
         elif (
             isinstance(inner_event, RequestFinished)
             and getattr(inner_event, "status", None) == "error"
-        ):
+        ):  # noqa
             error_msg = (
                 inner_event.error if hasattr(inner_event, "error") else "Unknown error"
             )

janito/cli/rich_terminal_reporter.py

@@ -32,17 +32,25 @@ class RichTerminalReporter(EventHandlerBase):
         self._waiting_printed = False
 
     def on_RequestStarted(self, event):
-        # Print waiting message with provider name
+        # Print waiting message with provider and model name
         provider = None
+        model = None
         if hasattr(event, "payload") and isinstance(event.payload, dict):
             provider = event.payload.get("provider_name")
+            model = event.payload.get("model") or event.payload.get("model_name")
         if not provider:
             provider = getattr(event, "provider_name", None)
         if not provider:
             provider = getattr(event, "driver_name", None)
         if not provider:
             provider = "LLM"
-        self.console.print(f"[bold cyan]Waiting for {provider}...[/bold cyan]", end="")
+        if not model:
+            model = getattr(event, "model", None)
+        if not model:
+            model = getattr(event, "model_name", None)
+        if not model:
+            model = "?"
+        self.console.print(f"[bold cyan]Waiting for {provider} (model: {model})...[/bold cyan]", end="")
 
     def on_ResponseReceived(self, event):
         parts = event.parts if hasattr(event, "parts") else None
@@ -58,7 +66,18 @@ class RichTerminalReporter(EventHandlerBase):
     def on_RequestFinished(self, event):
         self.console.print("")  # Print end of line after waiting message
         self._waiting_printed = False
-        response = event.response if hasattr(event, "response") else None
+        response = getattr(event, "response", None)
+        error = getattr(event, "error", None)
+        exception = getattr(event, "exception", None)
+
+        # Print error and exception if present
+        if error:
+            self.console.print(f"[bold red]Error:[/] {error}")
+            self.console.file.flush()
+        if exception:
+            self.console.print(f"[red]Exception:[/] {exception}")
+            self.console.file.flush()
+
         if response is not None:
             if self.raw_mode:
                 self.console.print(Pretty(response, expand_all=True))

janito/cli/single_shot_mode/__init__.py

@@ -1,6 +1,6 @@
-# janito.cli.single_shot_mode package
-from .handler import PromptHandler
-
-__all__ = [
-    "PromptHandler",
-]
+# janito.cli.single_shot_mode package
+from .handler import PromptHandler
+
+__all__ = [
+    "PromptHandler",
+]

janito/cli/single_shot_mode/handler.py

@@ -15,21 +15,31 @@ from janito.cli.console import shared_console
 
 
 class PromptHandler:
-    def __init__(self, args, provider_instance, llm_driver_config, role=None):
+    def __init__(self, args, provider_instance, llm_driver_config, role=None, exec_enabled=False):
         self.args = args
         self.provider_instance = provider_instance
         self.llm_driver_config = llm_driver_config
         self.role = role
+        self.exec_enabled = exec_enabled
         from janito.agent.setup_agent import create_configured_agent
 
+        # DEBUG: Print exec_enabled propagation
         self.agent = create_configured_agent(
             provider_instance=provider_instance,
             llm_driver_config=llm_driver_config,
             role=role,
             verbose_tools=getattr(args, "verbose_tools", False),
             verbose_agent=getattr(args, "verbose_agent", False),
+            exec_enabled=exec_enabled,
         )
         # Setup conversation/history if needed
+        # Dynamically enable/disable execution tools in the registry
+        try:
+            registry = __import__('janito.tools', fromlist=['get_local_tools_adapter']).get_local_tools_adapter()
+            if hasattr(registry, 'set_execution_tools_enabled'):
+                registry.set_execution_tools_enabled(exec_enabled)
+        except Exception as e:
+            shared_console.print(f"[yellow]Warning: Could not update execution tools dynamically in single-shot mode: {e}[/yellow]")
         self.generic_handler = GenericPromptHandler(
             args, [], provider_instance=provider_instance
         )

janito/cli/verbose_output.py

@@ -19,7 +19,7 @@ def print_verbose_header(agent, args):
         parts = [
             f"Janito {VERSION}",
             f"Provider: {agent.llm_provider.__class__.__name__}",
-            f"Model: {agent.llm_provider.model_name}{role_part}",
+            (f"Model: {agent.llm_provider.driver_config.extra.get('azure_deployment_name', agent.llm_provider.driver_config.model)}{role_part}" if agent.llm_provider.__class__.__name__ == 'AzureOpenAIProvider' else f"Model: {getattr(agent.llm_provider.driver_config, 'model', '-')}{role_part}"),
             f"Driver: {agent.llm_provider.__class__.__module__.split('.')[-2] if len(agent.llm_provider.__class__.__module__.split('.')) > 1 else agent.llm_provider.__class__.__name__}",
         ]
         if hasattr(args, "think") and args.think:

janito/config.py

@@ -1,5 +1,5 @@
-# Shared Janito ConfigManager singleton
-from janito.config_manager import ConfigManager
-
-# Only one global instance! Used by CLI, provider_config, others:
-config = ConfigManager(config_path=None)
+# Shared Janito ConfigManager singleton
+from janito.config_manager import ConfigManager
+
+# Only one global instance! Used by CLI, provider_config, others:
+config = ConfigManager(config_path=None)

janito/config_manager.py

@@ -46,6 +46,7 @@ class ConfigManager:
         self.config_path.parent.mkdir(parents=True, exist_ok=True)
         with open(self.config_path, "w", encoding="utf-8") as f:
             json.dump(self.file_config, f, indent=2)
+            f.write("\n")
 
     def get(self, key, default=None):
         # Precedence: runtime_overrides > file_config > defaults
@@ -63,6 +64,7 @@ class ConfigManager:
         self.file_config[key] = value
         with open(self.config_path, "w", encoding="utf-8") as f:
             json.dump(self.file_config, f, indent=2)
+            f.write("\n")
 
     def all(self, layered=False):
         merged = dict(self.defaults)

janito/driver_events.py

@@ -90,6 +90,20 @@ class ToolCallFinished(DriverEvent):
         return self.name
 
 
+@attr.s(auto_attribs=True, kw_only=True)
+@attr.s(auto_attribs=True, kw_only=True)
+class RateLimitRetry(DriverEvent):
+    """Emitted by a driver when it encounters a provider rate-limit (HTTP 429) and
+    decides to retry the request after a delay. This allows UIs or logging layers
+    to give feedback to the user while the driver automatically waits.
+    """
+
+    attempt: int = 0  # Retry attempt number (starting at 1)
+    retry_delay: float = 0  # Delay in seconds before the next attempt
+    error: str = None  # The original error message
+    details: dict = None  # Additional details extracted from the provider response
+
+
 @attr.s(auto_attribs=True, kw_only=True)
 class ResponseReceived(DriverEvent):
     parts: list = None