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

janito/README.md

@@ -26,7 +26,7 @@ pip install janito
 janito "Create a Python script that reads a CSV file"
 
 # Using a specific Moonshot model
-janito -m kimi-k2-0905 "Explain quantum computing"
+janito -m kimi-k1-8k "Explain quantum computing"
 ```
 
 **Other Providers**
@@ -72,14 +72,14 @@ In chat mode, you can:
 Set default provider and model:
 ```bash
 janito --set provider=moonshot
-janito --set model=kimi-k2-0905
+janito --set model=kimi-k1-8k
 ```
 
 ## Providers
 
 ### Moonshot (Recommended)
 
-- **Models**: kimi-k2-0905, kimi-k2-turbo-preview, kimi-k2-0711-preview
+- **Models**: kimi-k1-8k, kimi-k1-32k, kimi-k1-128k, kimi-k2-turbo-preview, kimi-k2-0905-preview
 - **Strengths**: Excellent Chinese/English support, competitive pricing, fast responses
 - **Setup**: Get API key from [Moonshot AI Platform](https://platform.moonshot.cn/)
 
@@ -106,9 +106,6 @@ janito --set model=kimi-k2-0905
 
 ## 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:
@@ -133,7 +130,7 @@ You can also configure via 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:**

janito/cli/chat_mode/bindings.py

@@ -35,54 +35,4 @@ class KeyBindingsFactory:
             buf.text = "Do It"
             buf.validate_and_handle()
 
-        @bindings.add("c-c")
-        def _(event):
-            """Handle Ctrl+C to interrupt current request or exit chat."""
-            # Use global cancellation manager for robust cancellation
-            from janito.llm.cancellation_manager import get_cancellation_manager
-
-            cancel_manager = get_cancellation_manager()
-
-            cancelled = cancel_manager.cancel_current_request()
-            if cancelled:
-                # Provide user feedback
-                from rich.console import Console
-
-                console = Console()
-                console.print("[red]Request cancelled by Ctrl+C[/red]")
-
-                # Prevent the Ctrl+C from being processed as input
-                event.app.output.flush()
-                return
-            else:
-                # No active request to cancel, exit the chat
-                from rich.console import Console
-                console = Console()
-                console.print("[yellow]Goodbye![/yellow]")
-                event.app.exit()
-
-        @bindings.add("escape", eager=True)
-        def _(event):
-            """Handle ESC key to interrupt current request (like Ctrl+C)."""
-            import threading
-
-            # Use global cancellation manager for robust cancellation
-            from janito.llm.cancellation_manager import get_cancellation_manager
-
-            cancel_manager = get_cancellation_manager()
-
-            cancelled = cancel_manager.cancel_current_request()
-            if cancelled:
-                # Provide user feedback
-                from rich.console import Console
-
-                console = Console()
-                console.print("[red]Request cancelled by ESC key[/red]")
-
-                # Prevent the ESC key from being processed as input
-                event.app.output.flush()
-                return
-
-            # If no active request to cancel, ESC does nothing
-
         return bindings

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/cli/chat_mode/shell/commands/multi.py

@@ -23,11 +23,6 @@ class MultiShellHandler(ShellCmdHandler):
             submitted["value"] = buffer.text
             event.app.exit(result=buffer.text)
 
-        # Support single ESC to cancel/interrupt (like Ctrl+C)
-        @bindings.add("escape")
-        def _(event):
-            raise KeyboardInterrupt
-
         # Support Ctrl+D
         @bindings.add("c-d")
         def _(event):

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/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/cli/cli_commands/list_tools.py

@@ -76,12 +76,7 @@ def handle_list_tools(args=None):
         DisabledToolsState.set_disabled_tools(disabled_str)
     disabled_tools = DisabledToolsState.get_disabled_tools()
 
-    # Ensure tools are initialized
-    from janito.tools import get_local_tools_adapter
-    registry = get_local_tools_adapter()
-    if registry is None:
-        print("No tools available - tools initialization failed.")
-        return
+    registry = janito.tools.local_tools_adapter
     tools = registry.list_tools()
     if tools:
         from rich.console import Console

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/cli/core/model_guesser.py

@@ -21,50 +21,34 @@ def guess_provider_from_model(model_name: str) -> str:
     model_name = model_name.lower()
 
     # Check each provider's models
-    return _find_provider_for_model(model_name)
-
-
-def _find_provider_for_model(model_name: str) -> str:
-    """Find provider for given model name."""
     for provider_name in LLMProviderRegistry.list_providers():
         provider_class = LLMProviderRegistry.get(provider_name)
         if not provider_class:
             continue
 
-        if _check_provider_models(provider_name, provider_class, model_name):
-            return provider_name
+        # 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
-
-
-def _check_provider_models(provider_name: str, provider_class, model_name: str) -> bool:
-    """Check if provider has matching model."""
-    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 True
-
-        # Handle special cases like moonshot
-        if provider_name == "moonshot":
-            return _check_moonshot_models(model_name)
-
-    except Exception:
-        # Skip providers that have issues accessing model specs
-        pass
-
-    return False
-
-
-def _check_moonshot_models(model_name: str) -> bool:
-    """Check moonshot models specifically."""
-    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 True
-    except ImportError:
-        pass
-    return False

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",
 ]
 
 
@@ -292,7 +296,7 @@ class JanitoCLI:
 
         self.parser = argparse.ArgumentParser(
             description="Janito CLI - A tool for running LLM-powered workflows from the command line."
-            "\n\nExample usage: janito -p moonshot -m kimi-k2-0905 'Your prompt here'\n\n"
+            "\n\nExample usage: janito -p moonshot -m kimi-k1-8k 'Your prompt here'\n\n"
             "Use -m or --model to set the model for the session.",
         )
         self._define_args()
@@ -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/cli/prompt_core.py

@@ -207,53 +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
-            import time
-            from threading import Thread, Event
-
-            cancel_manager = get_cancellation_manager()
-            driver_cancel_event = cancel_manager.start_new_request()
-
-            # Timer setup with live status display
-            start_time = time.time()
-            stop_timer = Event()
-            
-            # Create a status display with timer
-            from rich.live import Live
-            from rich.text import Text
-            
-            def get_timer_text():
-                elapsed = time.time() - start_time
-                minutes, seconds = divmod(int(elapsed), 60)
-                return Text(f"⏱️  Waiting for response... {minutes:02d}:{seconds:02d}", style="cyan")
-            
-            # Use Live display for updating timer
-            with Live(get_timer_text(), refresh_per_second=4, console=self.console) as live:
-                def update_timer():
-                    while not stop_timer.wait(0.25):  # Update every 250ms
-                        live.update(get_timer_text())
-                
-                timer_thread = Thread(target=update_timer, daemon=True)
-                timer_thread.start()
-
-                try:
-                    final_event = self.agent.chat(prompt=user_prompt)
-                    stop_timer.set()  # Stop the timer
-                    
-                    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:
-                    stop_timer.set()  # Ensure timer stops
-                    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/cli/rich_terminal_reporter.py

@@ -74,8 +74,8 @@ class RichTerminalReporter(EventHandlerBase):
         """
         Clears the entire current line in the terminal and returns the cursor to column 1.
         """
-        self.console.file.write("\033[2K\r")
-        self.console.file.flush()
+        sys.stdout.write("\033[2K\r")
+        sys.stdout.flush()
 
     def on_RequestFinished(self, event):
         self.delete_current_line()
@@ -161,10 +161,10 @@ class RichTerminalReporter(EventHandlerBase):
             self.console.print(msg)
             self.console.file.flush()
         elif subtype == ReportSubtype.STDOUT:
-            self.console.print(msg, style=None)
+            self.console.print(msg)
             self.console.file.flush()
         elif subtype == ReportSubtype.STDERR:
-            self.console.print(msg, style=None)
+            self.console.print(Text(msg, style="on red"))
             self.console.file.flush()
         else:
             self.console.print(msg)