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

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",
-            "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()
+"""
+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/__init__.py

@@ -4,3 +4,4 @@ import janito.providers.google.provider
 import janito.providers.azure_openai.provider
 import janito.providers.anthropic.provider
 import janito.providers.deepseek.provider
+import janito.providers.moonshotai.provider

janito/providers/anthropic/model_info.py

@@ -1,41 +1,41 @@
-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",
-    ),
-}
-
+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",
+    ),
+}
+

janito/providers/anthropic/provider.py

@@ -1,80 +1,80 @@
-from janito.llm.provider import LLMProvider
-from janito.llm.model import LLMModelInfo
-from janito.llm.auth import LLMAuthManager
-from janito.llm.driver_config import LLMDriverConfig
-from janito.tools import get_local_tools_adapter
-from janito.providers.registry import LLMProviderRegistry
-
-from .model_info import MODEL_SPECS
-
-from janito.llm.provider import LLMProvider
-from janito.llm.model import LLMModelInfo
-from janito.llm.auth import LLMAuthManager
-from janito.llm.driver_config import LLMDriverConfig
-from janito.tools import get_local_tools_adapter
-from janito.providers.registry import LLMProviderRegistry
-from .model_info import MODEL_SPECS
-from janito.drivers.openai.driver import OpenAIModelDriver
-
-class AnthropicProvider(LLMProvider):
-    name = "anthropic"
-    maintainer = "Needs maintainer"
-    MODEL_SPECS = MODEL_SPECS
-    DEFAULT_MODEL = "claude-3-7-sonnet-20250219"
-
-    def __init__(
-        self, auth_manager: LLMAuthManager = None, config: LLMDriverConfig = None
-    ):
-        self._tools_adapter = get_local_tools_adapter()
-        self.auth_manager = auth_manager or LLMAuthManager()
-        self._api_key = self.auth_manager.get_credentials(type(self).name)
-        self._tools_adapter = get_local_tools_adapter()
-        self._driver_config = config or LLMDriverConfig(model=None)
-        if not getattr(self._driver_config, 'model', None):
-            self._driver_config.model = self.DEFAULT_MODEL
-        if not self._driver_config.api_key:
-            self._driver_config.api_key = self._api_key
-        # Set the Anthropic OpenAI-compatible API endpoint
-        self._driver_config.base_url = "https://api.anthropic.com/v1/"
-        self.fill_missing_device_info(self._driver_config)
-        self._driver = None  # to be provided by factory/agent
-
-    @property
-    def driver(self) -> OpenAIModelDriver:
-        if not self.available:
-            raise ImportError(f"AnthropicProvider unavailable: {self.unavailable_reason}")
-        return self._driver
-
-    @property
-    def available(self):
-        return OpenAIModelDriver.available
-
-    @property
-    def unavailable_reason(self):
-        return OpenAIModelDriver.unavailable_reason
-
-    def create_driver(self):
-        """
-        Creates and returns a new OpenAIModelDriver instance configured for Anthropic API.
-        """
-        driver = OpenAIModelDriver(
-            tools_adapter=self._tools_adapter, provider_name=self.name
-        )
-        driver.config = self._driver_config
-        return driver
-
-    @property
-    def model_name(self):
-        return self._driver_config.model
-
-    @property
-    def driver_config(self):
-        """Public, read-only access to the provider's LLMDriverConfig object."""
-        return self._driver_config
-
-    def execute_tool(self, tool_name: str, event_bus, *args, **kwargs):
-        self._tools_adapter.event_bus = event_bus
-        return self._tools_adapter.execute_by_name(tool_name, *args, **kwargs)
-
-
-LLMProviderRegistry.register(AnthropicProvider.name, AnthropicProvider)
+from janito.llm.provider import LLMProvider
+from janito.llm.model import LLMModelInfo
+from janito.llm.auth import LLMAuthManager
+from janito.llm.driver_config import LLMDriverConfig
+from janito.tools import get_local_tools_adapter
+from janito.providers.registry import LLMProviderRegistry
+
+from .model_info import MODEL_SPECS
+
+from janito.llm.provider import LLMProvider
+from janito.llm.model import LLMModelInfo
+from janito.llm.auth import LLMAuthManager
+from janito.llm.driver_config import LLMDriverConfig
+from janito.tools import get_local_tools_adapter
+from janito.providers.registry import LLMProviderRegistry
+from .model_info import MODEL_SPECS
+from janito.drivers.openai.driver import OpenAIModelDriver
+
+class AnthropicProvider(LLMProvider):
+    name = "anthropic"
+    maintainer = "Needs maintainer"
+    MODEL_SPECS = MODEL_SPECS
+    DEFAULT_MODEL = "claude-3-7-sonnet-20250219"
+
+    def __init__(
+        self, auth_manager: LLMAuthManager = None, config: LLMDriverConfig = None
+    ):
+        self._tools_adapter = get_local_tools_adapter()
+        self.auth_manager = auth_manager or LLMAuthManager()
+        self._api_key = self.auth_manager.get_credentials(type(self).name)
+        self._tools_adapter = get_local_tools_adapter()
+        self._driver_config = config or LLMDriverConfig(model=None)
+        if not getattr(self._driver_config, 'model', None):
+            self._driver_config.model = self.DEFAULT_MODEL
+        if not self._driver_config.api_key:
+            self._driver_config.api_key = self._api_key
+        # Set the Anthropic OpenAI-compatible API endpoint
+        self._driver_config.base_url = "https://api.anthropic.com/v1/"
+        self.fill_missing_device_info(self._driver_config)
+        self._driver = None  # to be provided by factory/agent
+
+    @property
+    def driver(self) -> OpenAIModelDriver:
+        if not self.available:
+            raise ImportError(f"AnthropicProvider unavailable: {self.unavailable_reason}")
+        return self._driver
+
+    @property
+    def available(self):
+        return OpenAIModelDriver.available
+
+    @property
+    def unavailable_reason(self):
+        return OpenAIModelDriver.unavailable_reason
+
+    def create_driver(self):
+        """
+        Creates and returns a new OpenAIModelDriver instance configured for Anthropic API.
+        """
+        driver = OpenAIModelDriver(
+            tools_adapter=self._tools_adapter, provider_name=self.name
+        )
+        driver.config = self._driver_config
+        return driver
+
+    @property
+    def model_name(self):
+        return self._driver_config.model
+
+    @property
+    def driver_config(self):
+        """Public, read-only access to the provider's LLMDriverConfig object."""
+        return self._driver_config
+
+    def execute_tool(self, tool_name: str, event_bus, *args, **kwargs):
+        self._tools_adapter.event_bus = event_bus
+        return self._tools_adapter.execute_by_name(tool_name, *args, **kwargs)
+
+
+LLMProviderRegistry.register(AnthropicProvider.name, AnthropicProvider)

janito/providers/moonshotai/__init__.py

@@ -0,0 +1 @@
+# MoonshotAI provider package

janito/providers/moonshotai/model_info.py

@@ -0,0 +1,15 @@
+from janito.llm.model import LLMModelInfo
+
+MOONSHOTAI_MODEL_SPECS = {
+    "kimi-k2-0711-preview": LLMModelInfo(
+        name="kimi-k2-0711-preview",
+        context=128000,
+        max_input=100000,
+        max_cot="N/A",
+        max_response=4096,
+        thinking_supported=False,
+        default_temp=0.2,
+        open="moonshotai",
+        driver="OpenAIModelDriver",
+    ),
+}