janito 3.2.0__tar.gz → 3.4.0__tar.gz

{janito-3.2.0 → janito-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 3.2.0
+Version: 3.4.0
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito
@@ -30,6 +30,7 @@ Requires-Dist: black; extra == "dev"
 Requires-Dist: questionary>=2.0.1; extra == "dev"
 Requires-Dist: setuptools_scm>=8.0; extra == "dev"
 Provides-Extra: coder
+Requires-Dist: janito-coder; extra == "coder"
 Dynamic: license-file
 
 # nctl

janito-3.4.0/docs/CHANGELOG.md

@@ -0,0 +1,49 @@
+# Changelog
+
+All notable changes to Janito will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Removed
+
+- **Breaking Change**: Removed `--role` argument and interactive profile selection
+  - The `--role` argument has been completely removed from the CLI
+  - Interactive profile selection has been removed from chat mode
+  - Use `--profile <name>` or shorthand flags like `--developer` and `--market` instead
+  - Default behavior now uses the Developer profile when no profile is specified
+
+### Changed
+
+- Updated documentation to reflect removal of role argument
+- Added comprehensive profile documentation in `PROFILES.md`
+- Simplified profile selection to use explicit flags only
+
+## [Previous Versions]
+
+### Added
+
+- Initial support for profiles and roles
+- Interactive profile selection in chat mode
+- `--role` argument for specifying developer roles
+- `--profile` argument for system prompt templates
+- `--developer` and `--market` shorthand flags
+
+### Available Profiles
+
+- **Developer**: Optimized for software development tasks
+- **Market Analyst**: Specialized for market analysis and business insights
+
+### Supported Providers
+
+- Moonshot AI (default)
+- OpenAI
+- Anthropic
+- IBM WatsonX
+- Google AI
+
+---
+
+For detailed information about profiles and their usage, see [PROFILES.md](PROFILES.md).

{janito-3.2.0 → janito-3.4.0}/docs/changelogs/CHANGELOG.md

@@ -517,37 +517,4 @@ For users upgrading from previous versions:
 
 ---
 
-## [3.1.0] - 2025-08-23
-
-### Added
-
-- **Enter Key Cancellation Support for Chat Mode**: Revolutionary usability improvement for interactive chat sessions
-  - **Instant Request Cancellation**: Press **Enter key** at any time to immediately cancel current LLM operations
-  - **Global Cancellation Manager**: Robust cross-component cancellation system spanning agent, driver, and prompt handler
-  - **User Feedback**: Clear visual confirmation with red "Request cancelled by Enter key" message
-  - **Clean State Management**: Automatic cleanup of cancellation state after request completion
-  - **Thread-Safe Implementation**: Safe cancellation across multiple threads and async operations
-
-### Technical Implementation
-
-- **Global Cancellation Manager**: New `janito.llm.cancellation_manager` module provides centralized cancellation handling
-- **Key Binding Integration**: Enhanced chat mode with dedicated Enter key handling for cancellation
-- **Cross-Component Support**: Cancellation signals properly propagate through entire application stack
-- **Backward Compatible**: All existing functionality preserved, cancellation is additive feature
-
-### Developer Experience
-
-- **Extensible Architecture**: Cancellation system designed for future integration with other components
-- **Clean API**: Simple interface for starting, cancelling, and clearing requests across application
-- **Comprehensive Testing**: Full test coverage for cancellation scenarios and edge cases
-
-### Documentation
-
-- Updated CLI options documentation with new cancellation behavior
-- Enhanced chat mode guides with cancellation instructions
-- Added troubleshooting section for long-running requests
-- New dedicated changelog: [CHANGELOG_3.1.0.md](../changelogs/CHANGELOG_3.1.0.md)
-
----
-
 **Full Changelog**: https://github.com/ikignosis/janito/compare/v2.22.0...v2.23.0

{janito-3.2.0 → janito-3.4.0}/docs/guides/using.md

@@ -24,7 +24,6 @@ janito --web
 ## Basic Usage Tips
 - Use natural language to describe what you want Janito to do (e.g., "Add type hints to all functions in utils.py").
 - In the chat shell, use `/help` for available commands. Use `/exec on` to enable code/shell execution tools at runtime.
-- **Press Enter** at any time to cancel a long-running request in chat mode
 - Use CLI flags to customize behavior (see [CLI Options](../reference/cli-options.md)).
 
 ## More Resources

{janito-3.2.0 → janito-3.4.0}/docs/plugins/built-in-plugins/filemanager.md

@@ -74,7 +74,7 @@ Overwrite existing file (use with caution):
 - **Path Expansion**: Supports `~` for home directory and environment variables like `$HOME`
 - **Directory Creation**: Automatically creates parent directories as needed
 - **Encoding Safety**: Uses UTF-8 encoding with proper error handling for international characters
-- **Loop Protection**: Prevents repeated create calls for the same path within a short window (1 allowed per 10 seconds)
+- **Loop Protection**: Prevents excessive file creation calls (max 5 per 10 seconds per file)
 
 **Return Values:**
 

{janito-3.2.0 → janito-3.4.0}/janito/README.md

@@ -106,9 +106,6 @@ janito --set model=kimi-k1-8k
 
 ## Advanced Features
 
-### 🚀 New in v3.1.0: Enter Key Cancellation
-**Chat Mode Enhancement**: Press **Enter** at any time to instantly cancel long-running requests in interactive chat mode. No more waiting for stuck requests!
-
 ### Tool Usage
 
 Janito includes powerful built-in tools for:

janito-3.4.0/janito/cli/chat_mode/bindings.py

@@ -0,0 +1,38 @@
+"""
+Key bindings for Janito Chat CLI.
+"""
+
+from prompt_toolkit.key_binding import KeyBindings
+from janito.tools.permissions import get_global_allowed_permissions
+
+
+class KeyBindingsFactory:
+    @staticmethod
+    def create():
+        bindings = KeyBindings()
+
+        @bindings.add("c-y")
+        def _(event):
+            buf = event.app.current_buffer
+            buf.text = "Yes"
+            buf.validate_and_handle()
+
+        @bindings.add("c-n")
+        def _(event):
+            buf = event.app.current_buffer
+            buf.text = "No"
+            buf.validate_and_handle()
+
+        @bindings.add("f2")
+        def _(event):
+            buf = event.app.current_buffer
+            buf.text = "/restart"
+            buf.validate_and_handle()
+
+        @bindings.add("f12")
+        def _(event):
+            buf = event.app.current_buffer
+            buf.text = "Do It"
+            buf.validate_and_handle()
+
+        return bindings

{janito-3.2.0 → janito-3.4.0}/janito/cli/chat_mode/session.py

@@ -22,7 +22,6 @@ import time
 
 # Shared prompt/agent factory
 from janito.cli.prompt_setup import setup_agent_and_prompt_handler
-from janito.llm.cancellation_manager import get_cancellation_manager
 
 import time
 
@@ -114,10 +113,6 @@ class ChatSession:
 
         # Check if multi-line mode should be enabled by default
         self.multi_line_mode = getattr(args, "multi", False) if args else False
-        
-        # Default to single-line mode (Enter submits) unless explicitly enabled
-        if not self.multi_line_mode:
-            self.multi_line_mode = False
 
     def _select_profile_and_role(self, args, role):
         profile, role_arg, python_profile, market_profile = self._extract_args(args)
@@ -288,13 +283,7 @@ class ChatSession:
                 )
             )
 
-            try:
-                self._prompt_handler.run_prompt(cmd_input)
-            finally:
-                # Ensure cancellation manager is cleared
-                cancel_manager = get_cancellation_manager()
-                cancel_manager.clear_current_request()
-
+            self._prompt_handler.run_prompt(cmd_input)
             end_time = time.time()
             elapsed = end_time - start_time
             self.msg_count += 1

{janito-3.2.0 → janito-3.4.0}/janito/cli/chat_mode/shell/commands/security/allowed_sites.py

@@ -59,53 +59,39 @@ Examples:
         command = args[0].lower()
         whitelist_manager = get_url_whitelist_manager()
 
-        handlers = {
-            "list": self._handle_list,
-            "add": self._handle_add,
-            "remove": self._handle_remove,
-            "clear": self._handle_clear,
-        }
-
-        handler = handlers.get(command)
-        if handler:
-            handler(args, whitelist_manager)
+        if command == "list":
+            sites = whitelist_manager.get_allowed_sites()
+            if sites:
+                print("Allowed sites:")
+                for site in sites:
+                    print(f"  • {site}")
+            else:
+                print("No sites are whitelisted (all sites are allowed)")
+
+        elif command == "add":
+            if len(args) < 2:
+                print("Error: Please specify a site to add")
+                return
+            site = args[1]
+            if whitelist_manager.add_allowed_site(site):
+                print(f"✅ Added '{site}' to allowed sites")
+            else:
+                print(f"ℹ️ '{site}' is already in allowed sites")
+
+        elif command == "remove":
+            if len(args) < 2:
+                print("Error: Please specify a site to remove")
+                return
+            site = args[1]
+            if whitelist_manager.remove_allowed_site(site):
+                print(f"✅ Removed '{site}' from allowed sites")
+            else:
+                print(f"ℹ️ '{site}' was not in allowed sites")
+
+        elif command == "clear":
+            whitelist_manager.clear_whitelist()
+            print("✅ Cleared all allowed sites (all sites are now allowed)")
+
         else:
             print(f"Error: Unknown command '{command}'")
             print(self.get_usage())
-
-    def _handle_list(self, args, whitelist_manager):
-        """Handle list command."""
-        sites = whitelist_manager.get_allowed_sites()
-        if sites:
-            print("Allowed sites:")
-            for site in sites:
-                print(f"  • {site}")
-        else:
-            print("No sites are whitelisted (all sites are allowed)")
-
-    def _handle_add(self, args, whitelist_manager):
-        """Handle add command."""
-        if len(args) < 2:
-            print("Error: Please specify a site to add")
-            return
-        site = args[1]
-        if whitelist_manager.add_allowed_site(site):
-            print(f"✅ Added '{site}' to allowed sites")
-        else:
-            print(f"ℹ️ '{site}' is already in allowed sites")
-
-    def _handle_remove(self, args, whitelist_manager):
-        """Handle remove command."""
-        if len(args) < 2:
-            print("Error: Please specify a site to remove")
-            return
-        site = args[1]
-        if whitelist_manager.remove_allowed_site(site):
-            print(f"✅ Removed '{site}' from allowed sites")
-        else:
-            print(f"ℹ️ '{site}' was not in allowed sites")
-
-    def _handle_clear(self, args, whitelist_manager):
-        """Handle clear command."""
-        whitelist_manager.clear_whitelist()
-        print("✅ Cleared all allowed sites (all sites are now allowed)")

{janito-3.2.0 → janito-3.4.0}/janito/cli/cli_commands/list_plugins.py

@@ -8,11 +8,7 @@ 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
@@ -55,8 +51,7 @@ def _list_available_plugins():
         console.print(table)
 
         # Show core plugins
-        from janito.plugin_system.core_loader_fixed import get_core_plugins
-
+        from janito.plugins.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)
@@ -67,16 +62,14 @@ 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):
@@ -99,7 +92,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()
@@ -107,11 +100,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"]
@@ -129,25 +122,19 @@ 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):
@@ -175,7 +162,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()
@@ -190,38 +177,42 @@ 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-3.2.0 → janito-3.4.0}/janito/cli/core/getters.py

@@ -5,7 +5,6 @@ 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
@@ -29,7 +28,6 @@ GETTER_KEYS = [
     "list_plugins",
     "list_plugins_available",
     "list_resources",
-    "check_tools",
 ]
 
 
@@ -66,7 +64,6 @@ 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-3.4.0/janito/cli/core/model_guesser.py

@@ -0,0 +1,54 @@
+"""
+Module for guessing the provider based on model names.
+"""
+
+from janito.providers.registry import LLMProviderRegistry
+
+
+def guess_provider_from_model(model_name: str) -> str:
+    """
+    Guess the provider based on the model name.
+
+    Args:
+        model_name: The name of the model to guess the provider for
+
+    Returns:
+        The provider name if a match is found, None otherwise
+    """
+    if not model_name:
+        return None
+
+    model_name = model_name.lower()
+
+    # Check each provider's models
+    for provider_name in LLMProviderRegistry.list_providers():
+        provider_class = LLMProviderRegistry.get(provider_name)
+        if not provider_class:
+            continue
+
+        # Get model specs for this provider
+        try:
+            if hasattr(provider_class, "MODEL_SPECS"):
+                model_specs = provider_class.MODEL_SPECS
+                for spec_model_name in model_specs.keys():
+                    if spec_model_name.lower() == model_name:
+                        return provider_name
+
+            # Handle special cases like moonshot
+            if provider_name == "moonshot":
+                try:
+                    from janito.providers.moonshot.model_info import (
+                        MOONSHOT_MODEL_SPECS,
+                    )
+
+                    for spec_model_name in MOONSHOT_MODEL_SPECS.keys():
+                        if spec_model_name.lower() == model_name:
+                            return "moonshot"
+                except ImportError:
+                    pass
+
+        except Exception:
+            # Skip providers that have issues accessing model specs
+            continue
+
+    return None

{janito-3.2.0 → janito-3.4.0}/janito/cli/main_cli.py

@@ -238,13 +238,6 @@ 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 = [
@@ -276,7 +269,18 @@ GETTER_KEYS = [
     "region_info",
     "list_providers_region",
     "ping",
-    "check_tools",
+]
+GETTER_KEYS = [
+    "show_config",
+    "list_providers",
+    "list_profiles",
+    "list_models",
+    "list_tools",
+    "list_config",
+    "list_drivers",
+    "region_info",
+    "list_providers_region",
+    "ping",
 ]
 
 
@@ -402,7 +406,6 @@ 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-3.2.0 → janito-3.4.0}/janito/cli/prompt_core.py

@@ -207,26 +207,15 @@ class PromptHandler:
         """
         try:
             self._print_verbose_debug("Calling agent.chat()...")
-
-            # 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()
-
-            try:
-                final_event = self.agent.chat(prompt=user_prompt)
-                if hasattr(self.agent, "set_latest_event"):
-                    self.agent.set_latest_event(final_event)
-                self.agent.last_event = final_event
-                self._print_verbose_debug(f"agent.chat() returned: {final_event}")
-                self._print_verbose_final_event(final_event)
-                if on_event and final_event is not None:
-                    on_event(final_event)
-                    global_event_bus.publish(final_event)
-            finally:
-                cancel_manager.clear_current_request()
-
+            final_event = self.agent.chat(prompt=user_prompt)
+            if hasattr(self.agent, "set_latest_event"):
+                self.agent.set_latest_event(final_event)
+            self.agent.last_event = final_event
+            self._print_verbose_debug(f"agent.chat() returned: {final_event}")
+            self._print_verbose_final_event(final_event)
+            if on_event and final_event is not None:
+                on_event(final_event)
+                global_event_bus.publish(final_event)
         except KeyboardInterrupt:
             # Capture user interrupt / cancellation
             self.console.print("[red]Interrupted by the user.[/red]")

{janito-3.2.0 → janito-3.4.0}/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-3.2.0 → janito-3.4.0}/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