janito 3.2.0__py3-none-any.whl → 3.4.0__py3-none-any.whl

janito/llm/agent.py

@@ -318,39 +318,23 @@ class LLMAgent:
         loop_count = 1
         import threading
 
-        # Use global cancellation manager
-        from janito.llm.cancellation_manager import get_cancellation_manager
-
-        cancel_manager = get_cancellation_manager()
-        driver_cancel_event = cancel_manager.start_new_request()
-
-        # Store cancellation event on agent for external access
-        self.cancel_event = driver_cancel_event
-
-        try:
-            while True:
-                self._print_verbose_chat_loop(loop_count)
-                driver_input = self._prepare_driver_input(
-                    config, cancel_event=driver_cancel_event
+        cancel_event = threading.Event()
+        while True:
+            self._print_verbose_chat_loop(loop_count)
+            driver_input = self._prepare_driver_input(config, cancel_event=cancel_event)
+            self.input_queue.put(driver_input)
+            try:
+                result, added_tool_results = self._process_next_response()
+            except KeyboardInterrupt:
+                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}"
                 )
-                self.input_queue.put(driver_input)
-                try:
-                    result, added_tool_results = self._process_next_response()
-                except KeyboardInterrupt:
-                    cancel_manager.cancel_current_request()
-                    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 self._should_exit_chat_loop(result, added_tool_results):
-                    return result
-                loop_count += 1
-        finally:
-            cancel_manager.clear_current_request()
-            # Clean up cancellation event
-            if hasattr(self, "cancel_event"):
-                delattr(self, "cancel_event")
+            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:

janito/llm/auth_utils.py

@@ -13,18 +13,9 @@ 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')
     """
-    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.")
+    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/llm/driver.py

@@ -252,11 +252,3 @@ class LLMDriver(ABC):
     def _get_message_from_result(self, result):
         """Extract the message object from the provider result. Subclasses must implement this."""
         raise NotImplementedError("Subclasses must implement _get_message_from_result.")
-
-    def cancel_current_request(self):
-        """Cancel the current request being processed."""
-        # Use global cancellation manager to cancel the current request
-        from janito.llm.cancellation_manager import get_cancellation_manager
-
-        cancel_manager = get_cancellation_manager()
-        cancel_manager.cancel_current_request()

janito/plugins/__init__.py

@@ -1,36 +1,17 @@
 """
-Plugin System for Development Tools
+Plugin system for janito.
 
-This package organizes all available tools into logical plugin groups
-for easier discovery and usage.
+This package provides a flexible plugin system that allows extending
+janito's functionality with custom tools, commands, and features.
 """
 
-__version__ = "1.0.0"
-__author__ = "Development Assistant"
+from .manager import PluginManager
+from .base import Plugin, PluginMetadata
+from .discovery import discover_plugins
 
-from .core import filemanager, codeanalyzer, system, imagedisplay
-from .web import webtools
-from .dev import pythondev, visualization
-from .ui import userinterface
-
-# Plugin registry
-PLUGINS = {
-    "core.filemanager": filemanager,
-    "core.codeanalyzer": codeanalyzer,
-    "core.system": system,
-    "core.imagedisplay": imagedisplay,
-    "web.webtools": webtools,
-    "dev.pythondev": pythondev,
-    "dev.visualization": visualization,
-    "ui.userinterface": userinterface,
-}
-
-
-def list_plugins():
-    """Return all available plugins"""
-    return list(PLUGINS.keys())
-
-
-def get_plugin(name):
-    """Get a specific plugin by name"""
-    return PLUGINS.get(name)
+__all__ = [
+    "PluginManager",
+    "Plugin",
+    "PluginMetadata",
+    "discover_plugins",
+]

janito/plugins/auto_loader.py

@@ -13,7 +13,7 @@ from janito.plugins.discovery import list_available_plugins
 # List of core plugins that should be enabled by default
 CORE_PLUGINS = [
     "core.filemanager",
-    "core.codeanalyzer",
+    "core.codeanalyzer", 
     "core.system",
     "core.imagedisplay",
     "dev.pythondev",
@@ -26,23 +26,23 @@ CORE_PLUGINS = [
 def load_core_plugins(pm: PluginManager = None) -> List[str]:
     """
     Load all core plugins.
-
+    
     Args:
         pm: PluginManager instance. If None, creates a new one.
-
+        
     Returns:
         List of successfully loaded plugin names
     """
     if pm is None:
         pm = PluginManager()
-
+    
     # Ensure plugins directory is in search path
     plugins_dir = Path.cwd() / "plugins"
     if plugins_dir.exists():
         pm.add_plugin_path(str(plugins_dir))
-
+    
     loaded = []
-
+    
     # Load core plugins
     for plugin_name in CORE_PLUGINS:
         try:
@@ -50,14 +50,14 @@ def load_core_plugins(pm: PluginManager = None) -> List[str]:
                 loaded.append(plugin_name)
         except Exception as e:
             print(f"Warning: Failed to load core plugin {plugin_name}: {e}")
-
+    
     return loaded
 
 
 def get_loaded_core_plugins() -> List[str]:
     """
     Get list of currently loaded core plugins.
-
+    
     Returns:
         List of loaded core plugin names
     """
@@ -69,10 +69,10 @@ def get_loaded_core_plugins() -> List[str]:
 def is_core_plugin(plugin_name: str) -> bool:
     """
     Check if a plugin is a core plugin.
-
+    
     Args:
         plugin_name: Name of the plugin to check
-
+        
     Returns:
         True if it's a core plugin
     """
@@ -82,11 +82,10 @@ def is_core_plugin(plugin_name: str) -> bool:
 # Auto-load core plugins when module is imported
 _plugin_manager = None
 
-
 def get_plugin_manager() -> PluginManager:
     """Get the global plugin manager with core plugins loaded."""
     global _plugin_manager
     if _plugin_manager is None:
         _plugin_manager = PluginManager()
         load_core_plugins(_plugin_manager)
-    return _plugin_manager
+    return _plugin_manager

janito/plugins/auto_loader_fixed.py

@@ -9,12 +9,12 @@ import os
 from pathlib import Path
 from typing import List
 from janito.plugins.manager import PluginManager
-from janito.plugin_system.core_loader_fixed import load_core_plugin, get_core_plugins
+from janito.plugins.core_loader_fixed import load_core_plugin, get_core_plugins
 
 # List of core plugins that should be enabled by default
 CORE_PLUGINS = [
     "core.filemanager",
-    "core.codeanalyzer",
+    "core.codeanalyzer", 
     "core.system",
     "core.imagedisplay",
     "dev.pythondev",
@@ -27,18 +27,18 @@ CORE_PLUGINS = [
 def load_core_plugins(pm: PluginManager = None) -> List[str]:
     """
     Load all core plugins.
-
+    
     Args:
         pm: PluginManager instance. If None, creates a new one.
-
+        
     Returns:
         List of successfully loaded plugin names
     """
     if pm is None:
         pm = PluginManager()
-
+    
     loaded = []
-
+    
     # Load core plugins
     for plugin_name in CORE_PLUGINS:
         try:
@@ -49,14 +49,14 @@ def load_core_plugins(pm: PluginManager = None) -> List[str]:
                 loaded.append(plugin_name)
         except Exception as e:
             print(f"Warning: Failed to load core plugin {plugin_name}: {e}")
-
+    
     return loaded
 
 
 def get_loaded_core_plugins() -> List[str]:
     """
     Get list of currently loaded core plugins.
-
+    
     Returns:
         List of loaded core plugin names
     """
@@ -68,10 +68,10 @@ def get_loaded_core_plugins() -> List[str]:
 def is_core_plugin(plugin_name: str) -> bool:
     """
     Check if a plugin is a core plugin.
-
+    
     Args:
         plugin_name: Name of the plugin to check
-
+        
     Returns:
         True if it's a core plugin
     """
@@ -81,11 +81,10 @@ def is_core_plugin(plugin_name: str) -> bool:
 # Auto-load core plugins when module is imported
 _plugin_manager = None
 
-
 def get_plugin_manager() -> PluginManager:
     """Get the global plugin manager with core plugins loaded."""
     global _plugin_manager
     if _plugin_manager is None:
         _plugin_manager = PluginManager()
         load_core_plugins(_plugin_manager)
-    return _plugin_manager
+    return _plugin_manager

janito/{plugin_system → plugins}/base.py

@@ -5,10 +5,7 @@ Base classes for janito plugins.
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from typing import Dict, Any, List, Optional, Type, Union
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from janito.tools.tool_base import ToolBase
+from janito.tools.tool_base import ToolBase
 
 
 @dataclass
@@ -53,7 +50,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/builtin.py

@@ -7,7 +7,7 @@ with janito and available by default without requiring external installation.
 
 import importlib
 from typing import Dict, List, Optional, Type
-from janito.plugin_system.base import Plugin
+from janito.plugins.base import Plugin
 
 
 class BuiltinPluginRegistry:
@@ -83,20 +83,6 @@ try:
         "documentation_generator", DocumentationGeneratorPlugin
     )
 
-    # Register core tools plugin
-    from janito.plugins.tools import CoreToolsPlugin
-
-    BuiltinPluginRegistry.register("core_tools", CoreToolsPlugin)
-
 except ImportError:
     # janito-coder not available, skip registration
     pass
-
-# Register core tools plugin (always available)
-try:
-    from janito.plugins.tools import CoreToolsPlugin
-
-    BuiltinPluginRegistry.register("core_tools", CoreToolsPlugin)
-except ImportError:
-    # Should not happen, but handle gracefully
-    pass

janito/plugins/core_adapter.py

@@ -5,24 +5,25 @@ This module provides proper Plugin class implementations for core plugins
 that use the function-based approach instead of class-based.
 """
 
-from janito.plugin_system.base import Plugin, PluginMetadata
+from janito.plugins.base import Plugin, PluginMetadata
 from typing import List, Type
-from janito.tools.tool_base import ToolBase, ToolPermissions
+from janito.tools.tool_base import ToolBase
+from janito.tools.function_adapter import create_function_tool
 
 
 class CorePluginAdapter(Plugin):
     """Adapter for core plugins using function-based tools."""
-
+    
     def __init__(self, plugin_name: str, description: str, tools_module):
         super().__init__()
         self._plugin_name = plugin_name
         self._description = description
         self._tools_module = tools_module
         self._tool_classes = []
-
+        
         # Set the metadata attribute that Plugin expects
         self.metadata = self.get_metadata()
-
+        
     def get_metadata(self) -> PluginMetadata:
         return PluginMetadata(
             name=self._plugin_name,
@@ -31,101 +32,22 @@ class CorePluginAdapter(Plugin):
             author="Janito",
             license="MIT",
         )
-
+    
     def get_tools(self) -> List[Type[ToolBase]]:
         return self._tool_classes
-
-    def _create_tool_class(self, func):
-        """Create a ToolBase class from a function."""
-        resolved_tool_name = getattr(func, "tool_name", func.__name__)
-        
-        # Create a proper tool class with explicit parameters and documentation
-        import inspect
-        from typing import get_type_hints
-        
-        func_sig = inspect.signature(func)
-        type_hints = get_type_hints(func)
-        
-        # Build parameter definitions for the run method
-        param_defs = []
-        param_docs = []
-        for name, param in func_sig.parameters.items():
-            type_hint = type_hints.get(name, str)
-            if param.default == inspect.Parameter.empty:
-                param_defs.append(f"{name}: {type_hint.__name__}")
-            else:
-                param_defs.append(f"{name}: {type_hint.__name__} = {repr(param.default)}")
-            
-            # Add parameter documentation
-            param_docs.append(f"    {name}: {type_hint.__name__} - Parameter {name}")
-        
-        # Get function docstring or create one
-        func_doc = func.__doc__ or f"Execute {resolved_tool_name} tool"
-        
-        # Create the tool class with proper signature and documentation
-        exec_globals = {
-            'ToolBase': ToolBase,
-            'ToolPermissions': ToolPermissions,
-            'func': func,
-            'inspect': inspect,
-            'str': str,
-            'List': list,
-            'Dict': dict,
-            'Optional': type(None),
-        }
-        
-        param_docs_str = '\n'.join(param_docs)
-        
-        class_def = f'''
-class DynamicTool(ToolBase):
-    """
-    {func_doc}
-    
-    Parameters:
-{param_docs_str}
-    
-    Returns:
-        str: Execution result
-    """
-    tool_name = "{resolved_tool_name}"
-    permissions = ToolPermissions(read=True, write=True, execute=True)
     
-    def __init__(self):
-        super().__init__()
-    
-    def run(self, {', '.join(param_defs)}) -> str:
-        kwargs = locals()
-        sig = inspect.signature(func)
-        
-        # Filter kwargs to only include parameters the function accepts
-        filtered_kwargs = {{}}
-        for name, param in sig.parameters.items():
-            if name in kwargs and kwargs[name] is not None:
-                filtered_kwargs[name] = kwargs[name]
-        
-        result = func(**filtered_kwargs)
-        return str(result) if result is not None else ""
-'''
-        
-        exec(class_def, exec_globals)
-        return exec_globals['DynamicTool']
-        
-        return DynamicTool
-
     def initialize(self):
         """Initialize the plugin by creating tool classes."""
         # Get tools from the module
         tools = getattr(self._tools_module, "__plugin_tools__", [])
-
+        
         self._tool_classes = []
         for tool_func in tools:
             if callable(tool_func):
-                tool_class = self._create_tool_class(tool_func)
+                tool_class = create_function_tool(tool_func)
                 self._tool_classes.append(tool_class)
 
 
-def create_core_plugin(
-    plugin_name: str, description: str, tools_module
-) -> CorePluginAdapter:
+def create_core_plugin(plugin_name: str, description: str, tools_module) -> CorePluginAdapter:
     """Create a core plugin adapter."""
-    return CorePluginAdapter(plugin_name, description, tools_module)
+    return CorePluginAdapter(plugin_name, description, tools_module)

janito/plugins/core_loader.py

@@ -0,0 +1,120 @@
+"""
+Core plugin loader that properly handles function-based plugins.
+
+This module provides a simplified approach to load core plugins
+without the complex discovery mechanism.
+"""
+
+import importlib.util
+import sys
+from pathlib import Path
+from typing import Optional
+
+from janito.plugins.base import Plugin, PluginMetadata
+from janito.tools.function_adapter import create_function_tool
+from janito.tools.tool_base import ToolBase
+
+
+class CorePlugin(Plugin):
+    """Simple core plugin implementation."""
+    
+    def __init__(self, name: str, description: str, tools: list):
+        super().__init__()
+        self._plugin_name = name
+        self._description = description
+        self._tools = tools
+        self._tool_classes = []
+        
+    def get_metadata(self) -> PluginMetadata:
+        return PluginMetadata(
+            name=self._plugin_name,
+            version="1.0.0",
+            description=self._description,
+            author="Janito",
+            license="MIT",
+        )
+    
+    def get_tools(self) -> list:
+        return self._tool_classes
+    
+    def initialize(self):
+        """Initialize by creating tool classes."""
+        self._tool_classes = []
+        for tool_func in self._tools:
+            if callable(tool_func):
+                tool_class = create_function_tool(tool_func)
+                self._tool_classes.append(tool_class)
+
+
+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
+    """
+    try:
+        # 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
+        
+        # Build path to plugin
+        plugin_path = Path("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}")
+        tools = getattr(module, "__plugin_tools__", [])
+        
+        if not tools:
+            return None
+            
+        # Create plugin
+        plugin = CorePlugin(name, description, tools)
+        plugin.initialize()
+        return plugin
+        
+    except Exception as e:
+        print(f"Error loading core plugin {plugin_name}: {e}")
+        return None
+
+
+def get_core_plugins() -> list:
+    """Get list of all available core plugins."""
+    core_plugins = [
+        "core.filemanager",
+        "core.codeanalyzer",
+        "core.system",
+        "core.imagedisplay",
+        "dev.pythondev",
+        "dev.visualization",
+        "ui.userinterface",
+        "web.webtools",
+    ]
+    
+    available = []
+    for plugin_name in core_plugins:
+        plugin = load_core_plugin(plugin_name)
+        if plugin:
+            available.append(plugin_name)
+    
+    return available