janito 3.6.1__py3-none-any.whl → 3.7.0__py3-none-any.whl

janito/docs/GETTING_STARTED.md

@@ -14,7 +14,7 @@ pip install janito
 Janito supports multiple AI providers. Choose one to get started:
 
 **Moonshot (Recommended for Chinese users)**
-1. Go to [Moonshot AI Platform](https://platform.moonshot.ai)
+1. Go to [Moonshot AI Platform](https://platform.moonshot.cn/)
 2. Sign up for an account
 3. Navigate to API Keys section
 4. Create a new API key
@@ -67,7 +67,7 @@ janito "Hello, can you introduce yourself?"
 janito "Create a Python script to calculate fibonacci numbers"
 
 # With specific model
-janito -m kimi-k2-0905 "Explain machine learning in simple terms"
+janito -m kimi-k1-8k "Explain machine learning in simple terms"
 
 # Interactive chat mode
 janito --chat
@@ -88,7 +88,7 @@ janito -W ./my_project "Create a REST API with FastAPI"
 ```bash
 # Make your chosen provider the permanent default
 janito --set provider=moonshot  # or openai, ibm, etc.
-janito --set model=kimi-k2-0905     # or gpt-5, ibm/granite-3-8b-instruct, etc.
+janito --set model=kimi-k1-8k     # or gpt-5, ibm/granite-3-8b-instruct, etc.
 ```
 
 ### Environment Variables
@@ -98,7 +98,7 @@ You can also use environment variables:
 ```bash
 export MOONSHOT_API_KEY=your_key_here
 export JANITO_PROVIDER=moonshot
-export JANITO_MODEL=kimi-k2-0905
+export JANITO_MODEL=kimi-k1-8k
 ```
 
 **OpenAI:**
@@ -120,10 +120,11 @@ export JANITO_MODEL=ibm/granite-3-3-8b-instruct
 ## Available Models by Provider
 
 ### Moonshot Models
-
-- **kimi-k2-0905**: Latest flagship model with 256k context and enhanced coding
-- **kimi-k2-turbo-preview**: Turbo version with 128k context window
-- **kimi-k2-0711-preview**: Previous preview version with 128k context window
+- **kimi-k1-8k**: Fast responses, good for general tasks
+- **kimi-k1-32k**: Better for longer contexts
+- **kimi-k1-128k**: Best for very long documents
+- **kimi-k2-turbo-preview**: Latest model with enhanced capabilities
+- **kimi-k2-0905-preview**: Newest model with 256K context window for handling very large documents and complex tasks
 
 ### OpenAI Models
 - **gpt-5**: Latest GPT model with advanced capabilities

janito/drivers/openai/driver.py

@@ -181,7 +181,6 @@ 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,7 +174,6 @@ 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/i18n/it.py

@@ -1,46 +1,46 @@
-# pragma: allowlist secret
-translations = {
-    "36107ed78ab25f6fb12ad8ce13018cd1ce6735d1": "Avvio del server web...",
-    "70a0d194687568a47aa617fd85036ace1e69a982": "Vuoi davvero uscire? (s/n): ",
-    "5c9ebcbbd7632ecb328bd52958b17158afaa32c6": "F12 = Azione Rapida (segue l'azione raccomandata)",
-    "fe21121e2934234b68d19b2757532117d440c1e3": "Chiave API non trovata. Si prega di configurare 'api_key' nel file di configurazione.",
-    "c9e3759b1756eba35b381ce2b72cd659e132b01f": "Ciao, {name}!",
-    "ca1fee2f55baabdc2e4b0e9529c89ee024e62079": "Nessun prompt fornito nei messaggi",
-    "f7449d23d0c500ae2a0b31e04f92b47a4d8ae845": "max_tokens deve essere un intero, ricevuto: {resolved_max_tokens!r}",
-    "70a9ed8edb6da12e208431a31aa16ba54419b26f": "Risposta non valida/malformed da OpenAI (tentativo {attempt}/{max_retries}). Riprovo tra {wait_time} secondi...",
-    "a873085e3b06184fb5d27e842f97b06b6190976d": "Numero massimo di tentativi per risposta non valida raggiunto. Generazione errore.",
-    "66a34568bbe846bb1bde3619eb4d6dfa10211104": "L'API non supporta l'uso degli strumenti.",
-    "09b81476b75586da4116b83f8be70d77b174cec3": "Limit di richieste API OpenAI (429) (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
-    "5717a35dd2a1533fb7e15edc8c9329cb69f3410b": "Errore server API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
-    "02e760ba15ed863176c1290ac8a9b923963103cd": "Errore client API OpenAI {status_code}: {e}. Nessun nuovo tentativo.",
-    "2e52b0bbc8f16226b70e3e20f95c9245d2bcdb47": "Errore API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
-    "012cc970e039fdd79c452fc676202c814ffc76ae": "Numero massimo di tentativi per errore API OpenAI raggiunto. Generazione errore.",
-    "d0438e45667d31e0022b2497b5901cd4300f084b": "QueuedMessageHandler.handle_message si aspetta un dizionario con 'type' e 'message', ricevuto {msg_type}: {msg!r}",
-    "9d3460187ffa19c7c8a4020157072b1087e1bd2f": "[QueuedMessageHandler] {msg_type}: {msg}",
-    "3813833343430e8afa8fce33385c5e39fb24dd60": "[QueuedMessageHandler] {msg_type}: {message}",
-    "0be9a22226e16a40797010d23a0f581542dca40e": "[ToolExecutor] {tool_name} chiamato con argomenti: {args}",
-    "42c68edcb25442f518b1af77c6a2ddc07461aae0": "[ToolExecutor] Motivo chiamata: {tool_call_reason}",
-    "002ff598115d84595ffeee6219cb5c03d3a1d4a6": "Domanda",
-    "35747d13dcd91e8e8790c7f767d5ed764f541b9e": "procedi",
-    "33dde3a1afbc418768a69fa53168d9b0638fe1aa": "avanti",
-    "eee0bbba4ff92adbeb038a77df0466d660f15716": "continua",
-    "edee9402d198b04ac77dcf5dc9cc3dac44573782": "prossimo",
-    "8fdb7e2fa84f4faf0d9b92f466df424ec47a165b": "ok",
-    "5f8f924671cda79b5205a6bf1b776f347c4a7a07": "Opzioni di configurazione disponibili:\n",
-    "cef780a309cd234750764d42697882c24168ddab": "{key:15} {desc} (predefinito: {default})",
-    "68c2cc7f0ceaa3e499ecb4db331feb4debbbcc23": "Modello",
-    "c3f104d1365744b538bfde9f4adb6a6df4b80355": "Funzione",
-    "99a0efc6cfd85d8ff2732a6718140f822cb90472": "Stile",
-    "f1702b4686278becffc88baabe6f4b7a8355532c": "Messaggi",
-    "c38c6c1f3a2743f8626703abb302e403d20ff81c": "Token",
-    "a817d7eb8e0f1dab755ab5203a082e5c3c094fce": "Prompt",
-    "2ff255684a2277f806fcebf3fe338ed27857f350": "Completamento",
-    "b25928c69902557b0ef0a628490a3a1768d7b82f": "Totale",
-    "76e63d65c883ed50df40ac3aeef0c2d6a1c4ad60": "Azione Rapida",
-    "5397e0583f14f6c88de06b1ef28f460a1fb5b0ae": "Sì",
-    "816c52fd2bdd94a63cd0944823a6c0aa9384c103": "No",
-    "c47ae15370cfe1ed2781eedc1dc2547d12d9e972": "Aiuto",
-    "cc3dbd47e1cf9003a55d3366b3adbcd72275e525": "Nuovo Task",
-    "efa5a8b84e1afe65c81ecfce28c398c48f19ddc2": "Benvenuto su Janito{version_str}! Modalità chat attiva. Digita /exit per uscire.",
-    "b314d6e1460f86e0f21abc5aceb7935a2a0667e8": "Benvenuto su Janito{version_str} in modalità [white on magenta]VANILLA[/white on magenta]! Strumenti, prompt di sistema e temperatura sono disattivati, a meno che non siano sovrascritti.",
-}
+# pragma: allowlist secret
+translations = {
+    "36107ed78ab25f6fb12ad8ce13018cd1ce6735d1": "Avvio del server web...",
+    "70a0d194687568a47aa617fd85036ace1e69a982": "Vuoi davvero uscire? (s/n): ",
+    "5c9ebcbbd7632ecb328bd52958b17158afaa32c6": "F12 = Azione Rapida (segue l'azione raccomandata)",
+    "fe21121e2934234b68d19b2757532117d440c1e3": "Chiave API non trovata. Si prega di configurare 'api_key' nel file di configurazione.",
+    "c9e3759b1756eba35b381ce2b72cd659e132b01f": "Ciao, {name}!",
+    "ca1fee2f55baabdc2e4b0e9529c89ee024e62079": "Nessun prompt fornito nei messaggi",
+    "f7449d23d0c500ae2a0b31e04f92b47a4d8ae845": "max_tokens deve essere un intero, ricevuto: {resolved_max_tokens!r}",
+    "70a9ed8edb6da12e208431a31aa16ba54419b26f": "Risposta non valida/malformed da OpenAI (tentativo {attempt}/{max_retries}). Riprovo tra {wait_time} secondi...",
+    "a873085e3b06184fb5d27e842f97b06b6190976d": "Numero massimo di tentativi per risposta non valida raggiunto. Generazione errore.",
+    "66a34568bbe846bb1bde3619eb4d6dfa10211104": "L'API non supporta l'uso degli strumenti.",
+    "09b81476b75586da4116b83f8be70d77b174cec3": "Limite di richieste API OpenAI (429) (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
+    "5717a35dd2a1533fb7e15edc8c9329cb69f3410b": "Errore server API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
+    "02e760ba15ed863176c1290ac8a9b923963103cd": "Errore client API OpenAI {status_code}: {e}. Nessun nuovo tentativo.",
+    "2e52b0bbc8f16226b70e3e20f95c9245d2bcdb47": "Errore API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
+    "012cc970e039fdd79c452fc676202c814ffc76ae": "Numero massimo di tentativi per errore API OpenAI raggiunto. Generazione errore.",
+    "d0438e45667d31e0022b2497b5901cd4300f084b": "QueuedMessageHandler.handle_message si aspetta un dizionario con 'type' e 'message', ricevuto {msg_type}: {msg!r}",
+    "9d3460187ffa19c7c8a4020157072b1087e1bd2f": "[QueuedMessageHandler] {msg_type}: {msg}",
+    "3813833343430e8afa8fce33385c5e39fb24dd60": "[QueuedMessageHandler] {msg_type}: {message}",
+    "0be9a22226e16a40797010d23a0f581542dca40e": "[ToolExecutor] {tool_name} chiamato con argomenti: {args}",
+    "42c68edcb25442f518b1af77c6a2ddc07461aae0": "[ToolExecutor] Motivo chiamata: {tool_call_reason}",
+    "002ff598115d84595ffeee6219cb5c03d3a1d4a6": "Domanda",
+    "35747d13dcd91e8e8790c7f767d5ed764f541b9e": "procedi",
+    "33dde3a1afbc418768a69fa53168d9b0638fe1aa": "avanti",
+    "eee0bbba4ff92adbeb038a77df0466d660f15716": "continua",
+    "edee9402d198b04ac77dcf5dc9cc3dac44573782": "prossimo",
+    "8fdb7e2fa84f4faf0d9b92f466df424ec47a165b": "ok",
+    "5f8f924671cda79b5205a6bf1b776f347c4a7a07": "Opzioni di configurazione disponibili:\n",
+    "cef780a309cd234750764d42697882c24168ddab": "{key:15} {desc} (predefinito: {default})",
+    "68c2cc7f0ceaa3e499ecb4db331feb4debbbcc23": "Modello",
+    "c3f104d1365744b538bfde9f4adb6a6df4b80355": "Funzione",
+    "99a0efc6cfd85d8ff2732a6718140f822cb90472": "Stile",
+    "f1702b4686278becffc88baabe6f4b7a8355532c": "Messaggi",
+    "c38c6c1f3a2743f8626703abb302e403d20ff81c": "Token",
+    "a817d7eb8e0f1dab755ab5203a082e5c3c094fce": "Prompt",
+    "2ff255684a2277f806fcebf3fe338ed27857f350": "Completamento",
+    "b25928c69902557b0ef0a628490a3a1768d7b82f": "Totale",
+    "76e63d65c883ed50df40ac3aeef0c2d6a1c4ad60": "Azione Rapida",
+    "5397e0583f14f6c88de06b1ef28f460a1fb5b0ae": "Sì",
+    "816c52fd2bdd94a63cd0944823a6c0aa9384c103": "No",
+    "c47ae15370cfe1ed2781eedc1dc2547d12d9e972": "Aiuto",
+    "cc3dbd47e1cf9003a55d3366b3adbcd72275e525": "Nuovo Task",
+    "efa5a8b84e1afe65c81ecfce28c398c48f19ddc2": "Benvenuto su Janito{version_str}! Modalità chat attiva. Digita /exit per uscire.",
+    "b314d6e1460f86e0f21abc5aceb7935a2a0667e8": "Benvenuto su Janito{version_str} in modalità [white on magenta]VANILLA[/white on magenta]! Strumenti, prompt di sistema e temperatura sono disattivati, a meno che non siano sovrascritti.",
+}

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)