janito 2.33.0__py3-none-any.whl → 3.0.0__py3-none-any.whl

janito/cli/cli_commands/check_tools.py

@@ -0,0 +1,212 @@
+"""
+CLI Command: Check all registered tools for signature validation and availability
+"""
+
+import inspect
+import sys
+from typing import Dict, List, Tuple, Any
+
+
+def _validate_tool_signature(tool_instance) -> Tuple[bool, List[str]]:
+    """Validate the signature of a tool's run method."""
+    errors = []
+
+    if not hasattr(tool_instance, "run"):
+        errors.append("Missing 'run' method")
+        return False, errors
+
+    try:
+        sig = inspect.signature(tool_instance.run)
+    except ValueError as e:
+        errors.append(f"Invalid signature: {e}")
+        return False, errors
+
+    # Basic signature validation - just check if it's callable
+    if not callable(getattr(tool_instance, "run")):
+        errors.append("'run' method is not callable")
+
+    return len(errors) == 0, errors
+
+
+def _check_tool_availability(tool_instance) -> Tuple[bool, List[str]]:
+    """Check if a tool is available for use."""
+    errors = []
+
+    # Check if tool has required attributes
+    required_attrs = ["tool_name"]
+    for attr in required_attrs:
+        if not hasattr(tool_instance, attr):
+            errors.append(f"Missing required attribute: {attr}")
+
+    # Check description (optional for now)
+    if not hasattr(tool_instance, "description"):
+        pass  # Allow missing description
+
+    # Check permissions
+    if not hasattr(tool_instance, "permissions"):
+        # Function-based tools use permissions from function decorators
+        pass  # Allow missing permissions for function-based tools
+    else:
+        perms = tool_instance.permissions
+        if (
+            not hasattr(perms, "read")
+            or not hasattr(perms, "write")
+            or not hasattr(perms, "execute")
+        ):
+            errors.append("Invalid permissions structure")
+
+    return len(errors) == 0, errors
+
+
+def _get_tool_status_summary(
+    tools: List[Any], disabled_tools: List[str]
+) -> Dict[str, Any]:
+    """Get a comprehensive status summary for all tools."""
+    summary = {
+        "total": len(tools),
+        "available": 0,
+        "disabled": 0,
+        "invalid": 0,
+        "details": [],
+    }
+
+    for tool in tools:
+        tool_name = getattr(tool, "tool_name", str(tool))
+
+        # Check if disabled
+        is_disabled = tool_name in disabled_tools
+
+        # Validate signature and availability
+        sig_valid, sig_errors = _validate_tool_signature(tool)
+        avail_valid, avail_errors = _check_tool_availability(tool)
+
+        status = {
+            "name": tool_name,
+            "disabled": is_disabled,
+            "signature_valid": sig_valid,
+            "available": avail_valid,
+            "signature_errors": sig_errors,
+            "availability_errors": avail_errors,
+        }
+
+        summary["details"].append(status)
+
+        if is_disabled:
+            summary["disabled"] += 1
+        elif not sig_valid or not avail_valid:
+            summary["invalid"] += 1
+        else:
+            summary["available"] += 1
+
+    return summary
+
+
+def _print_check_results(console, summary: Dict[str, Any], verbose: bool = False):
+    """Print the tool check results in a formatted way."""
+    from rich.table import Table
+    from rich.panel import Panel
+    from rich.text import Text
+
+    # Overall summary
+    summary_text = Text()
+    summary_text.append(f"Total tools: {summary['total']}", style="cyan")
+    summary_text.append(" | ")
+    summary_text.append(f"Available: {summary['available']}", style="green")
+    summary_text.append(" | ")
+    summary_text.append(f"Disabled: {summary['disabled']}", style="yellow")
+    summary_text.append(" | ")
+    summary_text.append(f"Invalid: {summary['invalid']}", style="red")
+
+    console.print(Panel(summary_text, title="Tool Check Summary", style="bold"))
+
+    # Always show the table for check-tools
+    table = Table(title="Tool Details", show_header=True, header_style="bold")
+    table.add_column("Tool", style="cyan", no_wrap=True)
+    table.add_column("Status", style="green")
+    table.add_column("Issues", style="red")
+
+    for detail in summary["details"]:
+        name = detail["name"]
+
+        if detail["disabled"]:
+            status = "[yellow]Disabled[/yellow]"
+            issues = "-"
+        elif not detail["available"] or not detail["signature_valid"]:
+            status = "[red]Invalid[/red]"
+            all_issues = detail["signature_errors"] + detail["availability_errors"]
+            issues = "\n".join(all_issues)
+        else:
+            status = "[green]Available[/green]"
+            issues = "-"
+
+        table.add_row(name, status, issues)
+
+    console.print(table)
+
+
+def handle_check_tools(args=None):
+    """Handle the --check-tools CLI command."""
+    from janito.tools.adapters.local.adapter import LocalToolsAdapter
+    import janito.tools  # Ensure all tools are registered
+
+    # Load disabled tools from config
+    from janito.tools.disabled_tools import DisabledToolsState
+    from janito.config import config
+
+    disabled_str = config.get("disabled_tools", "")
+    if disabled_str:
+        DisabledToolsState.set_disabled_tools(disabled_str)
+    disabled_tools = DisabledToolsState.get_disabled_tools()
+
+    # Initialize tools properly using the same approach as list_tools.py
+    from janito.tools.adapters.local.adapter import LocalToolsAdapter
+    from janito.tools.tool_base import ToolPermissions
+    import janito.tools  # Ensure all tools are registered
+
+    read = getattr(args, "read", False) if args else False
+    write = getattr(args, "write", False) if args else False
+    execute = getattr(args, "exec", False) if args else False
+    if not (read or write or execute):
+        read = write = execute = True
+    from janito.tools.permissions import set_global_allowed_permissions
+
+    set_global_allowed_permissions(
+        ToolPermissions(read=read, write=write, execute=execute)
+    )
+
+    # Load disabled tools from config
+    from janito.tools.disabled_tools import DisabledToolsState
+    from janito.config import config
+
+    disabled_str = config.get("disabled_tools", "")
+    if disabled_str:
+        DisabledToolsState.set_disabled_tools(disabled_str)
+    disabled_tools = DisabledToolsState.get_disabled_tools()
+
+    # Initialize tools using the same method as list_tools.py
+    from janito.tools.initialize import initialize_tools
+
+    registry = initialize_tools()
+
+    # Get actual tool instances
+    tool_instances = []
+    for name, tool_info in registry._tools.items():
+        if "instance" in tool_info:
+            tool_instances.append(tool_info["instance"])
+
+    if not tool_instances:
+        print("No tools registered.")
+        return
+
+    from rich.console import Console
+
+    console = Console()
+
+    verbose = getattr(args, "verbose", False) if args else False
+
+    summary = _get_tool_status_summary(tool_instances, disabled_tools)
+    _print_check_results(console, summary, verbose=verbose)
+
+    # Exit with error code if there are invalid tools
+    if summary["invalid"] > 0:
+        sys.exit(1)

janito/cli/cli_commands/list_plugins.py

@@ -8,7 +8,11 @@ from janito.plugins.discovery import list_available_plugins
 import os
 from janito.plugins.manager import PluginManager
 from janito.plugins.builtin import BuiltinPluginRegistry
-from janito.plugins.auto_loader_fixed import load_core_plugins, get_loaded_core_plugins, is_core_plugin
+from janito.plugins.auto_loader_fixed import (
+    load_core_plugins,
+    get_loaded_core_plugins,
+    is_core_plugin,
+)
 from rich.console import Console
 from rich.table import Table
 from rich.panel import Panel
@@ -51,7 +55,8 @@ def _list_available_plugins():
         console.print(table)
 
         # Show core plugins
-        from janito.plugins.core_loader_fixed import get_core_plugins
+        from janito.plugin_system.core_loader_fixed import get_core_plugins
+
         core_plugins = get_core_plugins()
         core_table = Table(title="Core Plugins (Enabled by Default)")
         core_table.add_column("Plugin Name", style="cyan", no_wrap=True)
@@ -62,14 +67,16 @@ def _list_available_plugins():
 
         console.print(core_table)
     else:
-        console.print(Panel(
-            "No plugins found in search paths\n"
-            f"[dim]Search paths:[/dim]\n"
-            f"  • {os.getcwd()}/plugins\n"
-            f"  • {os.path.expanduser('~')}/.janito/plugins",
-            title="No Plugins Found",
-            style="yellow"
-        ))
+        console.print(
+            Panel(
+                "No plugins found in search paths\n"
+                f"[dim]Search paths:[/dim]\n"
+                f"  • {os.getcwd()}/plugins\n"
+                f"  • {os.path.expanduser('~')}/.janito/plugins",
+                title="No Plugins Found",
+                style="yellow",
+            )
+        )
 
 
 def _print_builtin_plugins(builtin_plugins):
@@ -92,7 +99,7 @@ def _print_external_plugins(available, builtin_plugins):
 def _list_plugin_resources():
     """List all resources from loaded plugins using rich formatting."""
     from janito.plugins.auto_loader_fixed import get_plugin_manager
-    
+
     console = Console()
     manager = get_plugin_manager()
     all_resources = manager.list_all_resources()
@@ -100,11 +107,11 @@ def _list_plugin_resources():
     if all_resources:
         for plugin_name, resources in all_resources.items():
             metadata = manager.get_plugin_metadata(plugin_name)
-            version = metadata.version if metadata else 'unknown'
-            
+            version = metadata.version if metadata else "unknown"
+
             # Create panel for each plugin
             panel_content = []
-            
+
             tools = [r for r in resources if r["type"] == "tool"]
             commands = [r for r in resources if r["type"] == "command"]
             configs = [r for r in resources if r["type"] == "config"]
@@ -122,19 +129,25 @@ def _list_plugin_resources():
             if configs:
                 panel_content.append("[bold yellow]Configuration:[/bold yellow]")
                 for config in configs:
-                    panel_content.append(f"  • {config['name']}: {config['description']}")
-
-            console.print(Panel(
-                "\n".join(panel_content),
-                title=f"{plugin_name} v{version}",
-                style="cyan"
-            ))
+                    panel_content.append(
+                        f"  • {config['name']}: {config['description']}"
+                    )
+
+            console.print(
+                Panel(
+                    "\n".join(panel_content),
+                    title=f"{plugin_name} v{version}",
+                    style="cyan",
+                )
+            )
     else:
-        console.print(Panel(
-            "No plugins are currently loaded.",
-            title="No Plugin Resources",
-            style="yellow"
-        ))
+        console.print(
+            Panel(
+                "No plugins are currently loaded.",
+                title="No Plugin Resources",
+                style="yellow",
+            )
+        )
 
 
 def _print_resources_by_type(resources):
@@ -162,7 +175,7 @@ def _print_resources_by_type(resources):
 def _list_loaded_plugins():
     """List loaded plugins using rich formatting."""
     from janito.plugins.auto_loader_fixed import get_plugin_manager
-    
+
     console = Console()
     manager = get_plugin_manager()
     loaded = manager.list_plugins()
@@ -177,42 +190,38 @@ def _list_loaded_plugins():
 
         core_plugins = []
         other_plugins = []
-        
+
         for plugin_name in loaded:
             if is_core_plugin(plugin_name):
                 core_plugins.append(plugin_name)
             else:
                 other_plugins.append(plugin_name)
-        
+
         # Add core plugins
         for plugin_name in core_plugins:
             metadata = manager.get_plugin_metadata(plugin_name)
             if metadata:
                 table.add_row(
-                    metadata.name,
-                    metadata.version,
-                    metadata.description,
-                    "🔵 Core"
+                    metadata.name, metadata.version, metadata.description, "🔵 Core"
                 )
-        
+
         # Add other plugins
         for plugin_name in other_plugins:
             metadata = manager.get_plugin_metadata(plugin_name)
             if metadata:
                 table.add_row(
-                    metadata.name,
-                    metadata.version,
-                    metadata.description,
-                    "🔶 External"
+                    metadata.name, metadata.version, metadata.description, "🔶 External"
                 )
 
         console.print(table)
     else:
-        console.print(Panel(
-            "No plugins are currently loaded.",
-            title="No Plugins Loaded",
-            style="yellow"
-        ))
+        console.print(
+            Panel(
+                "No plugins are currently loaded.",
+                title="No Plugins Loaded",
+                style="yellow",
+            )
+        )
 
 
 def _print_plugin_details(manager, plugin_name):

janito/cli/core/getters.py

@@ -5,6 +5,7 @@ import sys
 from janito.cli.cli_commands.list_providers import handle_list_providers
 from janito.cli.cli_commands.list_models import handle_list_models
 from janito.cli.cli_commands.list_tools import handle_list_tools
+from janito.cli.cli_commands.check_tools import handle_check_tools
 from janito.cli.cli_commands.show_config import handle_show_config
 from janito.cli.cli_commands.list_config import handle_list_config
 from janito.cli.cli_commands.list_drivers import handle_list_drivers
@@ -28,6 +29,7 @@ GETTER_KEYS = [
     "list_plugins",
     "list_plugins_available",
     "list_resources",
+    "check_tools",
 ]
 
 
@@ -64,6 +66,7 @@ def handle_getter(args, config_mgr=None):
         "list_plugins": partial(handle_list_plugins, args),
         "list_plugins_available": partial(handle_list_plugins, args),
         "list_resources": partial(handle_list_plugins, args),
+        "check_tools": partial(handle_check_tools, args),
     }
     for arg in GETTER_KEYS:
         if getattr(args, arg, False) and arg in GETTER_DISPATCH:

janito/cli/main_cli.py

@@ -238,6 +238,13 @@ definition = [
             "help": "List all resources (tools, commands, config) from loaded plugins",
         },
     ),
+    (
+        ["--check-tools"],
+        {
+            "action": "store_true",
+            "help": "Check all registered tools for signature validation and availability",
+        },
+    ),
 ]
 
 MODIFIER_KEYS = [
@@ -269,18 +276,7 @@ GETTER_KEYS = [
     "region_info",
     "list_providers_region",
     "ping",
-]
-GETTER_KEYS = [
-    "show_config",
-    "list_providers",
-    "list_profiles",
-    "list_models",
-    "list_tools",
-    "list_config",
-    "list_drivers",
-    "region_info",
-    "list_providers_region",
-    "ping",
+    "check_tools",
 ]
 
 
@@ -406,6 +402,7 @@ class JanitoCLI:
             or self.args.list_plugins_available
             or self.args.list_resources
             or self.args.ping
+            or self.args.check_tools
         ):
             self._maybe_print_verbose_provider_model()
             handle_getter(self.args)

janito/drivers/openai/driver.py

@@ -181,6 +181,7 @@ class OpenAIModelDriver(LLMDriver):
         is_insufficient_quota = (
             "insufficient_quota" in lower_err
             or "exceeded your current quota" in lower_err
+            or "exceeded_current_quota_error" in lower_err
         )
         is_rate_limit = (
             status_code == 429

janito/drivers/zai/driver.py

@@ -174,6 +174,7 @@ class ZAIModelDriver(LLMDriver):
         is_insufficient_quota = (
             "insufficient_quota" in lower_err
             or "exceeded your current quota" in lower_err
+            or "exceeded_current_quota_error" in lower_err
         )
         is_rate_limit = (
             status_code == 429

janito/llm/auth_utils.py

@@ -13,9 +13,18 @@ def handle_missing_api_key(provider_name: str, env_var_name: str) -> None:
         provider_name: Name of the provider (e.g., 'alibaba', 'openai')
         env_var_name: Environment variable name (e.g., 'ALIBABA_API_KEY')
     """
-    print(
-        f"[ERROR] No API key found for provider '{provider_name}'. Please set the API key using:"
-    )
-    print(f"  janito --set-api-key YOUR_API_KEY -p {provider_name}")
-    print(f"Or set the {env_var_name} environment variable.")
+    if provider_name == "moonshot":
+        print(
+            f"[ERROR] You exceeded your current token quota for Moonshot. Please check your account balance at:"
+        )
+        print(f"  https://platform.moonshot.ai/console/pay")
+        print()
+        print(f"To set a new API key, use:")
+        print(f"  janito --set-api-key YOUR_NEW_API_KEY -p moonshot")
+    else:
+        print(
+            f"[ERROR] No API key found for provider '{provider_name}'. Please set the API key using:"
+        )
+        print(f"  janito --set-api-key YOUR_API_KEY -p {provider_name}")
+        print(f"Or set the {env_var_name} environment variable.")
     sys.exit(1)

janito/plugin_system/__init__.py

@@ -0,0 +1,10 @@
+"""
+Plugin System Core Package
+
+This package provides the foundational plugin system architecture.
+It should not depend on any specific plugin implementations.
+"""
+
+from .base import Plugin, PluginMetadata, PluginResource
+
+__all__ = ["Plugin", "PluginMetadata", "PluginResource"]

janito/{plugins → plugin_system}/base.py

@@ -5,7 +5,10 @@ Base classes for janito plugins.
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from typing import Dict, Any, List, Optional, Type, Union
-from janito.tools.tool_base import ToolBase
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from janito.tools.tool_base import ToolBase
 
 
 @dataclass
@@ -50,7 +53,7 @@ class Plugin(ABC):
         """Return metadata describing this plugin."""
         pass
 
-    def get_tools(self) -> List[Type[ToolBase]]:
+    def get_tools(self) -> List[Type["ToolBase"]]:
         """
         Return a list of tool classes provided by this plugin.
 

janito/{plugins/core_loader_fixed.py → plugin_system/core_loader.py}

@@ -5,26 +5,27 @@ This module provides a working implementation to load core plugins
 by directly using the Plugin base class properly.
 """
 
+import importlib
 import importlib.util
 import sys
 from pathlib import Path
 from typing import Optional, List, Type
 
-from janito.plugins.base import Plugin, PluginMetadata
+from janito.plugin_system.base import Plugin, PluginMetadata
 from janito.tools.function_adapter import create_function_tool
 from janito.tools.tool_base import ToolBase
 
 
 class CorePlugin(Plugin):
     """Working core plugin implementation."""
-    
+
     def __init__(self, name: str, description: str, tools: list):
         self._plugin_name = name
         self._description = description
         self._tools = tools
         self._tool_classes = []
         super().__init__()  # Call super after setting attributes
-        
+
     def get_metadata(self) -> PluginMetadata:
         return PluginMetadata(
             name=self._plugin_name,
@@ -33,10 +34,10 @@ class CorePlugin(Plugin):
             author="Janito",
             license="MIT",
         )
-    
+
     def get_tools(self) -> List[Type[ToolBase]]:
         return self._tool_classes
-    
+
     def initialize(self):
         """Initialize by creating tool classes."""
         self._tool_classes = []
@@ -49,10 +50,10 @@ class CorePlugin(Plugin):
 def load_core_plugin(plugin_name: str) -> Optional[Plugin]:
     """
     Load a core plugin by name.
-    
+
     Args:
         plugin_name: Name of the plugin (e.g., 'core.filemanager')
-        
+
     Returns:
         Plugin instance if loaded successfully
     """
@@ -60,49 +61,67 @@ def load_core_plugin(plugin_name: str) -> Optional[Plugin]:
         # Parse plugin name
         if "." not in plugin_name:
             return None
-            
+
         parts = plugin_name.split(".")
         if len(parts) != 2:
             return None
-            
+
         package_name, submodule_name = parts
-        
+
         # Handle imagedisplay specially
         if plugin_name == "core.imagedisplay":
             # Import the actual plugin class
             try:
-                from plugins.core.imagedisplay.plugin import ImageDisplayPlugin
-                return ImageDisplayPlugin()
-            except ImportError:
-                # If import fails, return None - don't return True
+                # Use dynamic import to avoid circular dependency
+                plugin_module = importlib.import_module(
+                    "janito.plugins.core.imagedisplay.plugin"
+                )
+                return plugin_module.ImageDisplayPlugin()
+            except ImportError as e:
+                print(f"Failed to load imagedisplay: {e}")
                 return None
-        
+
         # Build path to plugin
-        plugin_path = Path("plugins") / package_name / submodule_name / "__init__.py"
+        plugin_path = (
+            Path("janito/plugins") / package_name / submodule_name / "__init__.py"
+        )
         if not plugin_path.exists():
             return None
-            
+
         # Load the module
         spec = importlib.util.spec_from_file_location(plugin_name, plugin_path)
         if spec is None or spec.loader is None:
             return None
-            
+
         module = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(module)
-        
+
         # Get plugin info
         name = getattr(module, "__plugin_name__", plugin_name)
-        description = getattr(module, "__plugin_description__", f"Core plugin: {plugin_name}")
+        description = getattr(
+            module, "__plugin_description__", f"Core plugin: {plugin_name}"
+        )
         tools = getattr(module, "__plugin_tools__", [])
-        
+
         if not tools:
             return None
-            
+
+        # Filter out None values and ensure all tools have tool_name
+        valid_tools = []
+        for tool in tools:
+            if tool is not None:
+                if not hasattr(tool, "tool_name"):
+                    tool.tool_name = tool.__name__
+                valid_tools.append(tool)
+
+        if not valid_tools:
+            return None
+
         # Create plugin
-        plugin = CorePlugin(name, description, tools)
+        plugin = CorePlugin(name, description, valid_tools)
         plugin.initialize()
         return plugin
-        
+
     except Exception as e:
         print(f"Error loading core plugin {plugin_name}: {e}")
         return None
@@ -120,6 +139,6 @@ def get_core_plugins() -> list:
         "ui.userinterface",
         "web.webtools",
     ]
-    
+
     # All core plugins are always available
-    return core_plugins
+    return core_plugins