janito 2.5.1__py3-none-any.whl → 2.6.0__py3-none-any.whl

janito/llm/agent.py

@@ -299,38 +299,13 @@ class LLMAgent:
         role: str = "user",
         config=None,
     ):
-        if (
-            hasattr(self, "driver")
-            and self.driver
-            and hasattr(self.driver, "clear_output_queue")
-        ):
-            self.driver.clear_output_queue()
-        # Drain input queue before sending new messages
-        if (
-            hasattr(self, "driver")
-            and self.driver
-            and hasattr(self.driver, "clear_input_queue")
-        ):
-            self.driver.clear_input_queue()
-        """
-        Main agent conversation loop supporting function/tool calls and conversation history extension, now as a blocking event-driven loop with event publishing.
-
-        Args:
-            prompt: The user prompt as a string (optional if messages is provided).
-            messages: A list of message dicts (optional if prompt is provided).
-            role: The role for the prompt (default: 'user').
-            config: Optional driver config (defaults to provider config).
-
-        Returns:
-            The final ResponseReceived event (or error event) when the conversation is complete.
-        """
+        self._clear_driver_queues()
         self._validate_and_update_history(prompt, messages, role)
         self._ensure_system_prompt()
         if config is None:
             config = self.llm_provider.driver_config
         loop_count = 1
         import threading
-
         cancel_event = threading.Event()
         while True:
             self._print_verbose_chat_loop(loop_count)
@@ -339,27 +314,32 @@ class LLMAgent:
             try:
                 result, added_tool_results = self._process_next_response()
             except KeyboardInterrupt:
-                # Propagate the interrupt to the caller, but signal the driver to cancel first
                 cancel_event.set()
                 raise
             if getattr(self, "verbose_agent", False):
-                print(
-                    f"[agent] [DEBUG] Returned from _process_next_response: result={result}, added_tool_results={added_tool_results}"
-                )
-            if result is None:
-                if getattr(self, "verbose_agent", False):
-                    print(
-                        f"[agent] [INFO] Exiting chat loop: _process_next_response returned None result (likely timeout or error). Returning (None, False)."
-                    )
-                return None, False
-            if not added_tool_results:
-                if getattr(self, "verbose_agent", False):
-                    print(
-                        f"[agent] [INFO] Exiting chat loop: _process_next_response returned added_tool_results=False (final response or no more tool calls). Returning result: {result}"
-                    )
+                print(f"[agent] [DEBUG] Returned from _process_next_response: result={result}, added_tool_results={added_tool_results}")
+            if self._should_exit_chat_loop(result, added_tool_results):
                 return result
             loop_count += 1
 
+    def _clear_driver_queues(self):
+        if hasattr(self, "driver") and self.driver:
+            if hasattr(self.driver, "clear_output_queue"):
+                self.driver.clear_output_queue()
+            if hasattr(self.driver, "clear_input_queue"):
+                self.driver.clear_input_queue()
+
+    def _should_exit_chat_loop(self, result, added_tool_results):
+        if result is None:
+            if getattr(self, "verbose_agent", False):
+                print("[agent] [INFO] Exiting chat loop: _process_next_response returned None result (likely timeout or error). Returning (None, False).")
+            return True
+        if not added_tool_results:
+            if getattr(self, "verbose_agent", False):
+                print(f"[agent] [INFO] Exiting chat loop: _process_next_response returned added_tool_results=False (final response or no more tool calls). Returning result: {result}")
+            return True
+        return False
+
     def _print_verbose_chat_loop(self, loop_count):
         if getattr(self, "verbose_agent", False):
             print(
@@ -436,42 +416,48 @@ class LLMAgent:
         Reset all driver config fields to the model's defaults for the current provider (overwriting any user customizations).
         """
         provider = self.llm_provider
-        # Find model spec
-        model_spec = None
-        if hasattr(provider, "MODEL_SPECS"):
-            model_spec = provider.MODEL_SPECS.get(model_name)
-        if not model_spec:
-            raise ValueError(f"Model '{model_name}' not found in provider MODEL_SPECS.")
-        # Overwrite all config fields with model defaults
+        model_spec = self._get_model_spec(provider, model_name)
         config = getattr(provider, "driver_config", None)
         if config is None:
             return
+        self._apply_model_defaults_to_config(config, model_spec, model_name)
+        self._update_driver_model_config(model_name, config)
+
+    def _get_model_spec(self, provider, model_name):
+        if hasattr(provider, "MODEL_SPECS"):
+            model_spec = provider.MODEL_SPECS.get(model_name)
+            if model_spec:
+                return model_spec
+        raise ValueError(f"Model '{model_name}' not found in provider MODEL_SPECS.")
+
+    def _apply_model_defaults_to_config(self, config, model_spec, model_name):
         config.model = model_name
-        # Standard fields, with safe conversion for int fields
-        def safe_int(val):
-            try:
-                if val is None or val == "N/A":
-                    return None
-                return int(val)
-            except Exception:
-                return None
-        def safe_float(val):
-            try:
-                if val is None or val == "N/A":
-                    return None
-                return float(val)
-            except Exception:
-                return None
-        config.temperature = safe_float(getattr(model_spec, "default_temp", None))
-        config.max_tokens = safe_int(getattr(model_spec, "max_response", None))
-        config.max_completion_tokens = safe_int(getattr(model_spec, "max_cot", None))
-        # Optionally reset other fields to None/defaults
+        config.temperature = self._safe_float(getattr(model_spec, "default_temp", None))
+        config.max_tokens = self._safe_int(getattr(model_spec, "max_response", None))
+        config.max_completion_tokens = self._safe_int(getattr(model_spec, "max_cot", None))
         config.top_p = None
         config.presence_penalty = None
         config.frequency_penalty = None
         config.stop = None
         config.reasoning_effort = None
-        # Update driver if present
+
+    def _safe_int(self, val):
+        try:
+            if val is None or val == "N/A":
+                return None
+            return int(val)
+        except Exception:
+            return None
+
+    def _safe_float(self, val):
+        try:
+            if val is None or val == "N/A":
+                return None
+            return float(val)
+        except Exception:
+            return None
+
+    def _update_driver_model_config(self, model_name, config):
         if self.driver is not None:
             if hasattr(self.driver, "model_name"):
                 self.driver.model_name = model_name

janito/provider_registry.py

@@ -1,178 +1,178 @@
-"""
-ProviderRegistry: Handles provider listing and selection logic for janito CLI.
-"""
-
-from rich.table import Table
-from janito.cli.console import shared_console
-from janito.providers.registry import LLMProviderRegistry
-from janito.providers.provider_static_info import STATIC_PROVIDER_METADATA
-from janito.llm.auth import LLMAuthManager
-import sys
-from janito.exceptions import MissingProviderSelectionException
-
-
-class ProviderRegistry:
-    def list_providers(self):
-        """List all supported LLM providers as a table using rich, showing if auth is configured and supported model names."""
-        providers = self._get_provider_names()
-        table = self._create_table()
-        rows = self._get_all_provider_rows(providers)
-        self._add_rows_to_table(table, rows)
-        self._print_table(table)
-
-    def _get_provider_names(self):
-        return list(STATIC_PROVIDER_METADATA.keys())
-
-    def _create_table(self):
-        table = Table(title="Supported LLM Providers")
-        table.add_column("Provider", style="cyan")
-        table.add_column("Maintainer", style="yellow", justify="center")
-        table.add_column("Model Names", style="magenta")
-        return table
-
-    def _get_all_provider_rows(self, providers):
-        rows = []
-        for p in providers:
-            info = self._get_provider_info(p)
-            # info is (provider_name, maintainer, model_names, skip)
-            if len(info) == 4 and info[3]:
-                continue  # skip providers flagged as not implemented
-            rows.append(info[:3])
-        rows.sort(key=self._maintainer_sort_key)
-        return rows
-
-    def _add_rows_to_table(self, table, rows):
-        for idx, (p, maintainer, model_names) in enumerate(rows):
-            table.add_row(p, maintainer, model_names)
-            if idx != len(rows) - 1:
-                table.add_section()
-
-    def _print_table(self, table):
-        """Print the table using rich when running in a terminal; otherwise fall back to a plain ASCII listing.
-        This avoids UnicodeDecodeError when the parent process captures the output with a non-UTF8 encoding.
-        """
-        import sys
-
-        if sys.stdout.isatty():
-            # Safe to use rich's unicode output when attached to an interactive terminal.
-            shared_console.print(table)
-            return
-
-        # Fallback: plain ASCII output (render without rich formatting)
-        print("Supported LLM Providers")
-        # Build header from column titles
-        header_titles = [column.header or "" for column in table.columns]
-        print(" | ".join(header_titles))
-        # rich.table.Row objects in recent Rich versions don't expose a public `.cells` attribute.
-        # Instead, cell content is stored in each column's private `_cells` list.
-        for row_index, _ in enumerate(table.rows):
-            cells_text = [str(column._cells[row_index]) for column in table.columns]
-            ascii_row = " | ".join(cells_text).encode("ascii", "ignore").decode("ascii")
-            print(ascii_row)
-
-    def _get_provider_info(self, provider_name):
-        static_info = STATIC_PROVIDER_METADATA.get(provider_name, {})
-        maintainer_val = static_info.get("maintainer", "-")
-        maintainer = (
-            "[red]🚨 Needs maintainer[/red]"
-            if maintainer_val == "Needs maintainer"
-            else f"👤 {maintainer_val}"
-        )
-        model_names = "-"
-        unavailable_reason = None
-        skip = False
-        try:
-            provider_class = LLMProviderRegistry.get(provider_name)
-            creds = LLMAuthManager().get_credentials(provider_name)
-            provider_instance = None
-            instantiation_failed = False
-            try:
-                provider_instance = provider_class()
-            except NotImplementedError:
-                skip = True
-                unavailable_reason = "Not implemented"
-                model_names = f"[red]❌ Not implemented[/red]"
-            except Exception as e:
-                instantiation_failed = True
-                unavailable_reason = (
-                    f"Unavailable (import error or missing dependency): {str(e)}"
-                )
-                model_names = f"[red]❌ {unavailable_reason}[/red]"
-            if not instantiation_failed and provider_instance is not None:
-                available, unavailable_reason = self._get_availability(
-                    provider_instance
-                )
-                if (
-                    not available
-                    and unavailable_reason
-                    and "not implemented" in str(unavailable_reason).lower()
-                ):
-                    skip = True
-                if available:
-                    model_names = self._get_model_names(provider_name)
-                else:
-                    model_names = f"[red]❌ {unavailable_reason}[/red]"
-        except Exception as import_error:
-            model_names = f"[red]❌ Unavailable (cannot import provider module): {str(import_error)}[/red]"
-        return (provider_name, maintainer, model_names, skip)
-
-    def _get_availability(self, provider_instance):
-        try:
-            available = getattr(provider_instance, "available", True)
-            unavailable_reason = getattr(provider_instance, "unavailable_reason", None)
-        except Exception as e:
-            available = False
-            unavailable_reason = f"Error reading runtime availability: {str(e)}"
-        return available, unavailable_reason
-
-    def _get_model_names(self, provider_name):
-        provider_to_specs = {
-            "openai": "janito.providers.openai.model_info",
-            "azure_openai": "janito.providers.azure_openai.model_info",
-            "google": "janito.providers.google.model_info",
-            
-            "deepseek": "janito.providers.deepseek.model_info",
-        }
-        if provider_name in provider_to_specs:
-            try:
-                mod = __import__(
-                    provider_to_specs[provider_name], fromlist=["MODEL_SPECS"]
-                )
-                return ", ".join(mod.MODEL_SPECS.keys())
-            except Exception:
-                return "(Error)"
-        return "-"
-
-    def _maintainer_sort_key(self, row):
-        maint = row[1]
-        is_needs_maint = "Needs maintainer" in maint
-        return (is_needs_maint, row[2] != "✅ Auth")
-
-    def get_provider(self, provider_name):
-        """Return the provider class for the given provider name. Returns None if not found."""
-        from janito.providers.registry import LLMProviderRegistry
-
-        if not provider_name:
-            print("Error: Provider name must be specified.")
-            return None
-        provider_class = LLMProviderRegistry.get(provider_name)
-        if provider_class is None:
-            available = ', '.join(LLMProviderRegistry.list_providers())
-            print(f"Error: Provider '{provider_name}' is not recognized. Available providers: {available}.")
-            return None
-        return provider_class
-
-    def get_instance(self, provider_name, config=None):
-        """Return an instance of the provider for the given provider name, optionally passing a config object. Returns None if not found."""
-        provider_class = self.get_provider(provider_name)
-        if provider_class is None:
-            return None
-        if config is not None:
-            return provider_class(config=config)
-        return provider_class()
-
-
-# For backward compatibility
-def list_providers():
-    """Legacy function for listing providers, now uses ProviderRegistry class."""
-    ProviderRegistry().list_providers()
+"""
+ProviderRegistry: Handles provider listing and selection logic for janito CLI.
+"""
+
+from rich.table import Table
+from janito.cli.console import shared_console
+from janito.providers.registry import LLMProviderRegistry
+from janito.providers.provider_static_info import STATIC_PROVIDER_METADATA
+from janito.llm.auth import LLMAuthManager
+import sys
+from janito.exceptions import MissingProviderSelectionException
+
+
+class ProviderRegistry:
+    def list_providers(self):
+        """List all supported LLM providers as a table using rich, showing if auth is configured and supported model names."""
+        providers = self._get_provider_names()
+        table = self._create_table()
+        rows = self._get_all_provider_rows(providers)
+        self._add_rows_to_table(table, rows)
+        self._print_table(table)
+
+    def _get_provider_names(self):
+        return list(STATIC_PROVIDER_METADATA.keys())
+
+    def _create_table(self):
+        table = Table(title="Supported LLM Providers")
+        table.add_column("Provider", style="cyan")
+        table.add_column("Maintainer", style="yellow", justify="center")
+        table.add_column("Model Names", style="magenta")
+        return table
+
+    def _get_all_provider_rows(self, providers):
+        rows = []
+        for p in providers:
+            info = self._get_provider_info(p)
+            # info is (provider_name, maintainer, model_names, skip)
+            if len(info) == 4 and info[3]:
+                continue  # skip providers flagged as not implemented
+            rows.append(info[:3])
+        rows.sort(key=self._maintainer_sort_key)
+        return rows
+
+    def _add_rows_to_table(self, table, rows):
+        for idx, (p, maintainer, model_names) in enumerate(rows):
+            table.add_row(p, maintainer, model_names)
+            if idx != len(rows) - 1:
+                table.add_section()
+
+    def _print_table(self, table):
+        """Print the table using rich when running in a terminal; otherwise fall back to a plain ASCII listing.
+        This avoids UnicodeDecodeError when the parent process captures the output with a non-UTF8 encoding.
+        """
+        import sys
+
+        if sys.stdout.isatty():
+            # Safe to use rich's unicode output when attached to an interactive terminal.
+            shared_console.print(table)
+            return
+
+        # Fallback: plain ASCII output (render without rich formatting)
+        print("Supported LLM Providers")
+        # Build header from column titles
+        header_titles = [column.header or "" for column in table.columns]
+        print(" | ".join(header_titles))
+        # rich.table.Row objects in recent Rich versions don't expose a public `.cells` attribute.
+        # Instead, cell content is stored in each column's private `_cells` list.
+        for row_index, _ in enumerate(table.rows):
+            cells_text = [str(column._cells[row_index]) for column in table.columns]
+            ascii_row = " | ".join(cells_text).encode("ascii", "ignore").decode("ascii")
+            print(ascii_row)
+
+    def _get_provider_info(self, provider_name):
+        static_info = STATIC_PROVIDER_METADATA.get(provider_name, {})
+        maintainer_val = static_info.get("maintainer", "-")
+        maintainer = (
+            "[red]🚨 Needs maintainer[/red]"
+            if maintainer_val == "Needs maintainer"
+            else f"👤 {maintainer_val}"
+        )
+        model_names = "-"
+        unavailable_reason = None
+        skip = False
+        try:
+            provider_class = LLMProviderRegistry.get(provider_name)
+            creds = LLMAuthManager().get_credentials(provider_name)
+            provider_instance = None
+            instantiation_failed = False
+            try:
+                provider_instance = provider_class()
+            except NotImplementedError:
+                skip = True
+                unavailable_reason = "Not implemented"
+                model_names = f"[red]❌ Not implemented[/red]"
+            except Exception as e:
+                instantiation_failed = True
+                unavailable_reason = (
+                    f"Unavailable (import error or missing dependency): {str(e)}"
+                )
+                model_names = f"[red]❌ {unavailable_reason}[/red]"
+            if not instantiation_failed and provider_instance is not None:
+                available, unavailable_reason = self._get_availability(
+                    provider_instance
+                )
+                if (
+                    not available
+                    and unavailable_reason
+                    and "not implemented" in str(unavailable_reason).lower()
+                ):
+                    skip = True
+                if available:
+                    model_names = self._get_model_names(provider_name)
+                else:
+                    model_names = f"[red]❌ {unavailable_reason}[/red]"
+        except Exception as import_error:
+            model_names = f"[red]❌ Unavailable (cannot import provider module): {str(import_error)}[/red]"
+        return (provider_name, maintainer, model_names, skip)
+
+    def _get_availability(self, provider_instance):
+        try:
+            available = getattr(provider_instance, "available", True)
+            unavailable_reason = getattr(provider_instance, "unavailable_reason", None)
+        except Exception as e:
+            available = False
+            unavailable_reason = f"Error reading runtime availability: {str(e)}"
+        return available, unavailable_reason
+
+    def _get_model_names(self, provider_name):
+        provider_to_specs = {
+            "openai": "janito.providers.openai.model_info",
+            "azure_openai": "janito.providers.azure_openai.model_info",
+            "google": "janito.providers.google.model_info",
+            "anthropic": "janito.providers.anthropic.model_info",
+            "deepseek": "janito.providers.deepseek.model_info",
+        }
+        if provider_name in provider_to_specs:
+            try:
+                mod = __import__(
+                    provider_to_specs[provider_name], fromlist=["MODEL_SPECS"]
+                )
+                return ", ".join(mod.MODEL_SPECS.keys())
+            except Exception:
+                return "(Error)"
+        return "-"
+
+    def _maintainer_sort_key(self, row):
+        maint = row[1]
+        is_needs_maint = "Needs maintainer" in maint
+        return (is_needs_maint, row[2] != "✅ Auth")
+
+    def get_provider(self, provider_name):
+        """Return the provider class for the given provider name. Returns None if not found."""
+        from janito.providers.registry import LLMProviderRegistry
+
+        if not provider_name:
+            print("Error: Provider name must be specified.")
+            return None
+        provider_class = LLMProviderRegistry.get(provider_name)
+        if provider_class is None:
+            available = ', '.join(LLMProviderRegistry.list_providers())
+            print(f"Error: Provider '{provider_name}' is not recognized. Available providers: {available}.")
+            return None
+        return provider_class
+
+    def get_instance(self, provider_name, config=None):
+        """Return an instance of the provider for the given provider name, optionally passing a config object. Returns None if not found."""
+        provider_class = self.get_provider(provider_name)
+        if provider_class is None:
+            return None
+        if config is not None:
+            return provider_class(config=config)
+        return provider_class()
+
+
+# For backward compatibility
+def list_providers():
+    """Legacy function for listing providers, now uses ProviderRegistry class."""
+    ProviderRegistry().list_providers()

janito/providers/anthropic/model_info.py

@@ -1,22 +1,41 @@
-from janito.llm.model import LLMModelInfo
-
-MODEL_SPECS = {
-    "claude-3-opus-20240229": LLMModelInfo(
-        name="claude-3-opus-20240229",
-        max_response=200000,
-        default_temp=0.7,
-        driver="AnthropicModelDriver",
-    ),
-    "claude-3-sonnet-20240229": LLMModelInfo(
-        name="claude-3-sonnet-20240229",
-        max_response=200000,
-        default_temp=0.7,
-        driver="AnthropicModelDriver",
-    ),
-    "claude-3-haiku-20240307": LLMModelInfo(
-        name="claude-3-haiku-20240307",
-        max_response=200000,
-        default_temp=0.7,
-        driver="AnthropicModelDriver",
-    ),
-}
+from janito.llm.model import LLMModelInfo
+
+MODEL_SPECS = {
+    "claude-opus-4-20250514": LLMModelInfo(
+        name="claude-opus-4-20250514",
+        max_response=32000,
+        default_temp=0.7,
+        driver="OpenAIModelDriver",
+    ),
+    "claude-sonnet-4-20250514": LLMModelInfo(
+        name="claude-sonnet-4-20250514",
+        max_response=64000,
+        default_temp=0.7,
+        driver="OpenAIModelDriver",
+    ),
+    "claude-3-7-sonnet-20250219": LLMModelInfo(
+        name="claude-3-7-sonnet-20250219",
+        max_response=64000,
+        default_temp=0.7,
+        driver="OpenAIModelDriver",
+    ),
+    "claude-3-5-haiku-20241022": LLMModelInfo(
+        name="claude-3-5-haiku-20241022",
+        max_response=8192,
+        default_temp=0.7,
+        driver="OpenAIModelDriver",
+    ),
+    "claude-3-5-sonnet-20241022": LLMModelInfo(
+        name="claude-3-5-sonnet-20241022",
+        max_response=8192,
+        default_temp=0.7,
+        driver="OpenAIModelDriver",
+    ),
+    "claude-3-haiku-20240307": LLMModelInfo(
+        name="claude-3-haiku-20240307",
+        max_response=4096,
+        default_temp=0.7,
+        driver="OpenAIModelDriver",
+    ),
+}
+