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

janito/README.md

@@ -79,7 +79,7 @@ janito --set model=kimi-k1-8k
 
 ### Moonshot (Recommended)
 
-- **Models**: kimi-k1-8k, kimi-k1-32k, kimi-k1-128k, kimi-k2-turbo-preview, kimi-k2-0905-preview
+- **Models**: kimi-k1-8k, kimi-k1-32k, kimi-k1-128k, kimi-k2-turbo-preview
 - **Strengths**: Excellent Chinese/English support, competitive pricing, fast responses
 - **Setup**: Get API key from [Moonshot AI Platform](https://platform.moonshot.cn/)
 

janito/cli/cli_commands/list_tools.py

@@ -53,7 +53,7 @@ def _print_tools_table(console, title, tools_info):
 
 
 def handle_list_tools(args=None):
-    from janito.tools.adapters.local.adapter import LocalToolsAdapter
+    from janito.plugins.tools.local.adapter import LocalToolsAdapter
     import janito.tools  # Ensure all tools are registered
     from janito.tools.tool_base import ToolPermissions
 

janito/cli/prompt_core.py

@@ -14,7 +14,7 @@ from janito.driver_events import (
     RequestStatus,
     RateLimitRetry,
 )
-from janito.tools.tool_events import ToolCallError
+from janito.tools.tool_events import ToolCallError, ToolCallStarted
 import threading
 from janito.cli.verbose_output import print_verbose_header
 from janito.event_bus import event_bus as global_event_bus
@@ -52,8 +52,10 @@ class PromptHandler:
     def _handle_inner_event(self, inner_event, on_event, status):
         if on_event:
             on_event(inner_event)
-        from janito.tools.tool_events import ToolCallFinished
+        from janito.tools.tool_events import ToolCallFinished, ToolCallStarted
 
+        if isinstance(inner_event, ToolCallStarted):
+            return self._handle_tool_call_started(inner_event, status)
         if isinstance(inner_event, ToolCallFinished):
             return self._handle_tool_call_finished(inner_event)
         if isinstance(inner_event, RateLimitRetry):
@@ -76,6 +78,14 @@ class PromptHandler:
         )
         return None
 
+    def _handle_tool_call_started(self, inner_event, status):
+        """Handle ToolCallStarted event - pause the timer when ask_user tool is called."""
+        if hasattr(inner_event, 'tool_name') and inner_event.tool_name == 'ask_user':
+            # Pause the status timer by clearing the status
+            if status:
+                status.update("")
+        return None
+
     def _handle_tool_call_finished(self, inner_event):
         if hasattr(self.args, "verbose_tools") and self.args.verbose_tools:
             self.console.print(
@@ -207,7 +217,42 @@ class PromptHandler:
         """
         try:
             self._print_verbose_debug("Calling agent.chat()...")
-            final_event = self.agent.chat(prompt=user_prompt)
+            
+            # Show waiting status with elapsed time
+            start_time = time.time()
+            
+            # Get provider and model info for status display
+            provider_name = self.agent.get_provider_name() if hasattr(self.agent, 'get_provider_name') else 'LLM'
+            model_name = self.agent.get_model_name() if hasattr(self.agent, 'get_model_name') else 'unknown'
+            
+            status = Status(f"[bold blue]Waiting for {provider_name} (model: {model_name})...[/bold blue]")
+            
+            # Thread coordination event
+            stop_updater = threading.Event()
+            
+            def update_status():
+                elapsed = time.time() - start_time
+                status.update(f"[bold blue]Waiting for {provider_name} (model: {model_name})... ({elapsed:.1f}s)[/bold blue]")
+            
+            # Start status display and update timer
+            with status:
+                # Update status every second in a separate thread
+                def status_updater():
+                    while not stop_updater.is_set():
+                        update_status()
+                        stop_updater.wait(1.0)  # Wait for 1 second or until stopped
+                
+                updater_thread = threading.Thread(target=status_updater, daemon=True)
+                updater_thread.start()
+                
+                try:
+                    final_event = self.agent.chat(prompt=user_prompt)
+                finally:
+                    # Signal the updater thread to stop
+                    stop_updater.set()
+                    # Wait a bit for the thread to clean up
+                    updater_thread.join(timeout=0.1)
+                
             if hasattr(self.agent, "set_latest_event"):
                 self.agent.set_latest_event(final_event)
             self.agent.last_event = final_event

janito/cli/rich_terminal_reporter.py

@@ -74,8 +74,16 @@ class RichTerminalReporter(EventHandlerBase):
         """
         Clears the entire current line in the terminal and returns the cursor to column 1.
         """
-        sys.stdout.write("\033[2K\r")
-        sys.stdout.flush()
+        # Use raw ANSI escape sequences but write directly to the underlying file
+        # to bypass Rich's escaping/interpretation
+        if hasattr(self.console, 'file') and hasattr(self.console.file, 'write'):
+            self.console.file.write("\r\033[2K")
+            self.console.file.flush()
+        else:
+            # Fallback to sys.stdout if console.file is not available
+            import sys
+            sys.stdout.write("\r\033[2K")
+            sys.stdout.flush()
 
     def on_RequestFinished(self, event):
         self.delete_current_line()

janito/docs/GETTING_STARTED.md

@@ -124,7 +124,7 @@ export JANITO_MODEL=ibm/granite-3-3-8b-instruct
 - **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
+- **kimi-k2-turbo-preview**: Turbo version of the advanced reasoning model
 
 ### OpenAI Models
 - **gpt-5**: Latest GPT model with advanced capabilities

janito/llm/agent.py

@@ -183,6 +183,9 @@ class LLMAgent:
         elapsed = 0.0
         if getattr(self, "verbose_agent", False):
             print("[agent] [DEBUG] Waiting for event from output_queue...")
+        # Show initial wait message
+        if getattr(self, "verbose_agent", False):
+            print(f"[agent] [DEBUG] Starting to wait for LLM response... (timeout: {max_wait_time}s)")
         # Let KeyboardInterrupt propagate to caller
         return self._poll_for_event(poll_timeout, max_wait_time)
 
@@ -197,6 +200,9 @@ class LLMAgent:
                     print(error_msg)
                     print("[DEBUG] Exiting _process_next_response due to timeout")
                     return None, False
+                # Show elapsed time info while waiting
+                if getattr(self, "verbose_agent", False):
+                    print(f"[agent] [DEBUG] Waiting for LLM response... ({elapsed:.1f}s elapsed)")
                 continue
             if getattr(self, "verbose_agent", False):
                 print(f"[agent] [DEBUG] Received event from output_queue: {event}")

janito/{tools/adapters/local → plugins/core/filemanager/tools}/validate_file_syntax/core.py

@@ -3,9 +3,9 @@ from janito.tools.path_utils import expand_path
 from janito.i18n import tr
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_utils import display_path
-from janito.tools.adapters.local.adapter import register_local_tool as register_tool
+from janito.plugins.tools.local.adapter import register_local_tool as register_tool
 
 from .python_validator import validate_python
 from .json_validator import validate_json
@@ -17,6 +17,7 @@ from .markdown_validator import validate_markdown
 from .js_validator import validate_js
 from .css_validator import validate_css
 from .jinja2_validator import validate_jinja2
+from .txt_validator import validate_txt
 from janito.tools.loop_protection_decorator import protect_against_loops
 
 
@@ -37,6 +38,8 @@ def _get_validator(ext):
         ".css": validate_css,
         ".j2": validate_jinja2,
         ".jinja2": validate_jinja2,
+        ".txt": validate_txt,
+        ".text": validate_txt,
     }
     return mapping.get(ext)
 
@@ -79,6 +82,7 @@ class ValidateFileSyntaxTool(ToolBase):
       - Markdown (.md)
       - JavaScript (.js)
       - Jinja2 templates (.j2, .jinja2)
+      - Text files (.txt, .text) [UTF-8 validation]
 
     Args:
         path (str): Path to the file to validate.
@@ -86,6 +90,7 @@ class ValidateFileSyntaxTool(ToolBase):
         str: Validation status message. Example:
             - "✅ Syntax OK"
             - "⚠️ Warning: Syntax error: <error message>"
+            - "⚠️ Warning: UTF-8 decoding error: <error details>"
             - "⚠️ Warning: Unsupported file extension: <ext>"
     """
 

janito/plugins/core/filemanager/tools/validate_file_syntax/txt_validator.py

@@ -0,0 +1,28 @@
+"""Text file validator for UTF-8 encoding validation."""
+
+import codecs
+from pathlib import Path
+
+
+def validate_txt(path: str) -> str:
+    """
+    Validate a text file for UTF-8 encoding issues.
+    
+    Args:
+        path (str): Path to the text file to validate
+        
+    Returns:
+        str: Validation status message
+            - "✅ Syntax OK" if file is valid UTF-8
+            - "⚠️ Warning: UTF-8 decoding error: <error details>" if invalid
+    """
+    try:
+        # Try to read the file with UTF-8 encoding
+        with codecs.open(path, 'r', encoding='utf-8') as f:
+            # Read the entire file to trigger any decoding errors
+            f.read()
+        return "✅ Syntax OK"
+    except UnicodeDecodeError as e:
+        return f"⚠️ Warning: UTF-8 decoding error: {e}"
+    except Exception as e:
+        return f"⚠️ Warning: File read error: {e}"

janito/plugins/manager.py

@@ -14,7 +14,7 @@ from .base import Plugin, PluginMetadata
 from .discovery import discover_plugins
 from .config import load_plugins_config, get_user_plugins_dir
 from .builtin import BuiltinPluginRegistry, load_builtin_plugin
-from janito.tools.adapters.local import LocalToolsAdapter
+from janito.plugins.tools.local import LocalToolsAdapter
 
 logger = logging.getLogger(__name__)
 

janito/{tools/adapters → plugins/tools}/local/adapter.py

@@ -207,7 +207,7 @@ def register_local_tool(tool=None):
         # Register the tool on a *fresh* adapter instance to avoid circular
         # import issues during package initialisation.  This keeps behaviour
         # identical to the original implementation while still allowing
-        # immediate use via the singleton in janito.tools.adapters.local.
+        # immediate use via the singleton in janito.plugins.tools.local.
         LocalToolsAdapter().register_tool(cls)
         return cls
 

janito/{tools/adapters → plugins/tools}/local/ask_user.py

@@ -1,5 +1,5 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.loop_protection_decorator import protect_against_loops
 
 from rich import print as rich_print

janito/{tools/adapters → plugins/tools}/local/copy_file.py

@@ -2,7 +2,7 @@ import os
 from janito.tools.path_utils import expand_path
 import shutil
 from typing import List, Union
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.tools.tool_utils import display_path
 from janito.report_events import ReportAction

janito/{tools/adapters → plugins/tools}/local/create_directory.py

@@ -1,4 +1,4 @@
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 
 from janito.tools.tool_utils import display_path
 from janito.tools.tool_base import ToolBase, ToolPermissions

janito/{tools/adapters → plugins/tools}/local/create_file.py

@@ -1,6 +1,6 @@
 import os
 from janito.tools.path_utils import expand_path
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 
 from janito.tools.tool_utils import display_path
 from janito.tools.tool_base import ToolBase, ToolPermissions
@@ -8,7 +8,7 @@ from janito.report_events import ReportAction
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops
 
-from janito.tools.adapters.local.validate_file_syntax.core import validate_file_syntax
+from janito.plugins.tools.local.validate_file_syntax.core import validate_file_syntax
 
 
 @register_local_tool
@@ -30,12 +30,12 @@ class CreateFileTool(ToolBase):
     - Cross-platform path handling (Windows, macOS, Linux)
 
     Args:
-        path (str): Target file path. Supports relative and absolute paths, with automatic
+        path (str, required): Target file path. Supports relative and absolute paths, with automatic
                    expansion of user home directory (~) and environment variables.
                    Examples: "src/main.py", "~/Documents/config.json", "$HOME/.env"
-        content (str): File content to write. Empty string creates empty file.
+        content (str, optional): File content to write. Empty string creates empty file.
                       Supports any text content including Unicode characters, newlines,
-                      and binary-safe text representation.
+                      and binary-safe text representation. Default: "" (empty file)
         overwrite (bool, optional): If True, allows overwriting existing files. Default: False.
                                    When False, prevents accidental overwrites by checking
                                    file existence and showing current content. Always review
@@ -71,6 +71,10 @@ class CreateFileTool(ToolBase):
         ✅ Created file 2 lines.
         ✅ Syntax OK
 
+        Creating empty file:
+        >>> create_file("empty.txt", "")
+        ✅ Created file 0 lines.
+
         Overwrite protection:
         >>> create_file("existing.txt", "new content")
         ❗ Cannot create file: file already exists at 'existing.txt'.
@@ -85,7 +89,7 @@ class CreateFileTool(ToolBase):
     tool_name = "create_file"
 
     @protect_against_loops(max_calls=5, time_window=10.0, key_field="path")
-    def run(self, path: str, content: str, overwrite: bool = False) -> str:
+    def run(self, path: str, content: str = "", overwrite: bool = False) -> str:
         path = expand_path(path)
         disp_path = display_path(path)
         if os.path.exists(path) and not overwrite:

janito/{tools/adapters → plugins/tools}/local/delete_text_in_file.py

@@ -1,9 +1,9 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 import shutil
-from janito.tools.adapters.local.validate_file_syntax.core import validate_file_syntax
+from janito.plugins.tools.local.validate_file_syntax.core import validate_file_syntax
 
 
 @register_local_tool

janito/{tools/adapters → plugins/tools}/local/fetch_url.py

@@ -5,7 +5,7 @@ import json
 from pathlib import Path
 from bs4 import BeautifulSoup
 from typing import Dict, Any, Optional
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
 from janito.i18n import tr
@@ -33,7 +33,7 @@ class FetchUrlTool(ToolBase):
 
     **Error Cache Behavior:**
     - HTTP 403 errors: Cached for 24 hours (more permanent)
-    - HTTP 404 errors: Cached for 1 hour (temporary)
+    - HTTP 404 errors: Cached for 1 hour (shorter duration)
     - Other 4xx errors: Cached for 30 minutes
     - 5xx errors: Not cached (retried on each request)
 
@@ -151,7 +151,7 @@ class FetchUrlTool(ToolBase):
             # Cache 403 errors for 24 hours (more permanent)
             expiration_time = 24 * 3600
         elif entry["status_code"] == 404:
-            # Cache 404 errors for 1 hour (more temporary)
+            # Cache 404 errors for 1 hour (shorter duration)
             expiration_time = 3600
         else:
             # Cache other 4xx errors for 30 minutes

janito/{tools/adapters → plugins/tools}/local/find_files.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_utils import pluralize, display_path
 from janito.dir_walk_utils import walk_dir_with_gitignore
 from janito.i18n import tr

janito/{tools/adapters → plugins/tools}/local/get_file_outline/core.py

@@ -1,4 +1,4 @@
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from .python_outline import parse_python_outline
 from .markdown_outline import parse_markdown_outline
 from janito.formatting import OutlineFormatter
@@ -10,7 +10,7 @@ from janito.report_events import ReportAction
 from janito.tools.tool_utils import display_path, pluralize
 from janito.i18n import tr
 
-from janito.tools.adapters.local.adapter import register_local_tool as register_tool
+from janito.plugins.tools.local.adapter import register_local_tool as register_tool
 from janito.tools.loop_protection_decorator import protect_against_loops
 
 

janito/{tools/adapters → plugins/tools}/local/move_file.py

@@ -1,7 +1,7 @@
 import os
 from janito.tools.path_utils import expand_path
 import shutil
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_utils import display_path
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction

janito/{tools/adapters → plugins/tools}/local/open_html_in_browser.py

@@ -1,6 +1,6 @@
 import os
 import webbrowser
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
 from janito.i18n import tr

janito/{tools/adapters → plugins/tools}/local/open_url.py

@@ -1,5 +1,5 @@
 import webbrowser
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
 from janito.i18n import tr

janito/{tools/adapters → plugins/tools}/local/python_code_run.py

@@ -5,7 +5,7 @@ import tempfile
 import threading
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 
 

janito/{tools/adapters → plugins/tools}/local/python_command_run.py

@@ -5,7 +5,7 @@ import tempfile
 import threading
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 
 

janito/{tools/adapters → plugins/tools}/local/python_file_run.py

@@ -5,7 +5,7 @@ import tempfile
 import threading
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 
 

janito/{tools/adapters → plugins/tools}/local/read_chart.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_utils import display_path
 from janito.i18n import tr
 import json

janito/{tools/adapters → plugins/tools}/local/read_files.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_utils import pluralize
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops

janito/{tools/adapters → plugins/tools}/local/remove_directory.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_utils import pluralize, display_path
 from janito.i18n import tr
 import shutil

janito/{tools/adapters → plugins/tools}/local/remove_file.py

@@ -1,7 +1,7 @@
 import os
 from janito.tools.path_utils import expand_path
 import shutil
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 
 from janito.tools.tool_utils import display_path
 from janito.tools.tool_base import ToolBase, ToolPermissions

janito/{tools/adapters → plugins/tools}/local/replace_text_in_file.py

@@ -1,10 +1,10 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 import shutil
 import re
-from janito.tools.adapters.local.validate_file_syntax.core import validate_file_syntax
+from janito.plugins.tools.local.validate_file_syntax.core import validate_file_syntax
 
 
 @register_local_tool

janito/{tools/adapters → plugins/tools}/local/run_bash_command.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 import subprocess
 import tempfile

janito/{tools/adapters → plugins/tools}/local/run_powershell_command.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 import subprocess
 import os

janito/{tools/adapters → plugins/tools}/local/search_text/core.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.tools.tool_utils import pluralize, display_path
 from janito.i18n import tr
 import os
@@ -11,7 +11,7 @@ from .traverse_directory import traverse_directory
 from janito.tools.loop_protection_decorator import protect_against_loops
 
 
-from janito.tools.adapters.local.adapter import register_local_tool as register_tool
+from janito.plugins.tools.local.adapter import register_local_tool as register_tool
 
 
 @register_tool

janito/{tools/adapters → plugins/tools}/local/show_image.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops
 

janito/{tools/adapters → plugins/tools}/local/show_image_grid.py

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.tools.adapters.local.adapter import register_local_tool
+from janito.plugins.tools.local.adapter import register_local_tool
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops
 from typing import Sequence

janito/plugins/tools/local/validate_file_syntax/__init__.py

@@ -0,0 +1 @@
+# Validation syntax package