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

janito/plugin_system/core_loader.py

@@ -0,0 +1,217 @@
+"""
+Fixed core plugin loader.
+
+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.plugin_system.base import Plugin, PluginMetadata
+from janito.tools.tool_base import ToolBase, ToolPermissions
+
+
+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,
+            version="1.0.0",
+            description=self._description,
+            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,
+        }
+        
+        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 by creating tool classes."""
+        self._tool_classes = []
+        for tool_func in self._tools:
+            if callable(tool_func):
+                tool_class = self._create_tool_class(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
+
+        # Handle imagedisplay specially
+        if plugin_name == "core.imagedisplay":
+            # Import the actual plugin class
+            try:
+                # 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("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}"
+        )
+        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, valid_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",
+    ]
+
+    # All core plugins are always available
+    return core_plugins

janito/plugin_system/core_loader_fixed.py

@@ -0,0 +1,225 @@
+"""
+Fixed core plugin loader.
+
+This module provides a working implementation to load core plugins
+by directly using the Plugin base class properly.
+"""
+
+import importlib.util
+import sys
+from pathlib import Path
+from typing import Optional, List, Type
+
+from janito.plugin_system.base import Plugin, PluginMetadata
+from janito.tools.tool_base import ToolBase, ToolPermissions
+
+
+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,
+            version="1.0.0",
+            description=self._description,
+            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 by creating tool classes."""
+        self._tool_classes = []
+        for tool_func in self._tools:
+            if callable(tool_func):
+                tool_class = self._create_tool_class(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
+
+        # Handle imagedisplay specially
+        if plugin_name == "core.imagedisplay":
+            # Import the actual plugin class
+            try:
+                from janito.plugins.core.imagedisplay.plugin import ImageDisplayPlugin
+
+                return ImageDisplayPlugin()
+            except ImportError as e:
+                print(f"Failed to load imagedisplay: {e}")
+                return None
+
+        # Build path to plugin
+        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)
+
+        # Add module to sys.modules to prevent circular imports
+        sys.modules[plugin_name] = module
+
+        try:
+            # Read and execute the module content
+            with open(plugin_path, "r", encoding="utf-8") as f:
+                code = f.read()
+
+            # Execute in module's namespace
+            exec(code, module.__dict__)
+
+            # Get plugin info
+            name = module.__dict__.get("__plugin_name__", plugin_name)
+            description = module.__dict__.get(
+                "__plugin_description__", f"Core plugin: {plugin_name}"
+            )
+            tools = module.__dict__.get("__plugin_tools__", [])
+
+            if not tools:
+                return None
+
+            # Ensure all tools have tool_name attribute
+            for tool in tools:
+                if tool is not None and not hasattr(tool, "tool_name"):
+                    tool.tool_name = tool.__name__
+
+            # Create plugin
+            plugin = CorePlugin(name, description, tools)
+            plugin.initialize()
+            return plugin
+        finally:
+            # Clean up sys.modules
+            if plugin_name in sys.modules:
+                del sys.modules[plugin_name]
+
+    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",
+    ]
+
+    # All core plugins are always available
+    return core_plugins

janito/plugins/__init__.py

@@ -1,17 +1,36 @@
 """
-Plugin system for janito.
+Plugin System for Development Tools
 
-This package provides a flexible plugin system that allows extending
-janito's functionality with custom tools, commands, and features.
+This package organizes all available tools into logical plugin groups
+for easier discovery and usage.
 """
 
-from .manager import PluginManager
-from .base import Plugin, PluginMetadata
-from .discovery import discover_plugins
+__version__ = "1.0.0"
+__author__ = "Development Assistant"
 
-__all__ = [
-    "PluginManager",
-    "Plugin",
-    "PluginMetadata",
-    "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)

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,10 +82,11 @@ 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.plugins.core_loader_fixed import load_core_plugin, get_core_plugins
+from janito.plugin_system.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,10 +81,11 @@ 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/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.plugins.base import Plugin
+from janito.plugin_system.base import Plugin
 
 
 class BuiltinPluginRegistry:
@@ -83,6 +83,20 @@ 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/__init__.py

@@ -0,0 +1,7 @@
+"""
+Core Plugin Package
+
+Contains essential system and file management plugins.
+"""
+
+__all__ = ["filemanager", "codeanalyzer", "system"]