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

janito/plugins/tools/{python_command_run.py → core/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.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 
 
@@ -92,6 +92,9 @@ class PythonCommandRun(ToolBase):
         def stream_output(stream, file_obj, report_func, count_func):
             nonlocal stdout_lines, stderr_lines
             for line in stream:
+                # Check for cancellation
+                if hasattr(self, '_cancel_event') and self._cancel_event.is_set():
+                    break
                 file_obj.write(line)
                 file_obj.flush()
                 from janito.tools.tool_base import ReportAction
@@ -102,6 +105,11 @@ class PythonCommandRun(ToolBase):
                 else:
                     stderr_lines += 1
 
+        # Set up cancellation event
+        from janito.llm.cancellation_manager import get_cancellation_manager
+        cancel_manager = get_cancellation_manager()
+        self._cancel_event = cancel_manager.get_current_cancel_event()
+        
         stdout_thread = threading.Thread(
             target=stream_output,
             args=(process.stdout, stdout_file, self.report_stdout, "stdout"),
@@ -112,8 +120,16 @@ class PythonCommandRun(ToolBase):
         )
         stdout_thread.start()
         stderr_thread.start()
-        stdout_thread.join()
-        stderr_thread.join()
+        
+        try:
+            stdout_thread.join()
+            stderr_thread.join()
+        except Exception as e:
+            # Handle cancellation
+            if self._cancel_event and self._cancel_event.is_set():
+                process.kill()
+                self.report_warning(tr("Code execution cancelled by user"), ReportAction.EXECUTE)
+            raise
         return stdout_lines, stderr_lines
 
     def _wait_for_process(self, process, timeout):

janito/plugins/tools/{python_file_run.py → core/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.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 
 
@@ -92,6 +92,9 @@ class PythonFileRun(ToolBase):
         def stream_output(stream, file_obj, report_func, count_func):
             nonlocal stdout_lines, stderr_lines
             for line in stream:
+                # Check for cancellation
+                if hasattr(self, '_cancel_event') and self._cancel_event.is_set():
+                    break
                 file_obj.write(line)
                 file_obj.flush()
                 # Always supply a default action for stdout/stderr reporting
@@ -103,6 +106,11 @@ class PythonFileRun(ToolBase):
                 else:
                     stderr_lines += 1
 
+        # Set up cancellation event
+        from janito.llm.cancellation_manager import get_cancellation_manager
+        cancel_manager = get_cancellation_manager()
+        self._cancel_event = cancel_manager.get_current_cancel_event()
+        
         stdout_thread = threading.Thread(
             target=stream_output,
             args=(process.stdout, stdout_file, self.report_stdout, "stdout"),
@@ -113,8 +121,16 @@ class PythonFileRun(ToolBase):
         )
         stdout_thread.start()
         stderr_thread.start()
-        stdout_thread.join()
-        stderr_thread.join()
+        
+        try:
+            stdout_thread.join()
+            stderr_thread.join()
+        except Exception as e:
+            # Handle cancellation
+            if self._cancel_event and self._cancel_event.is_set():
+                process.kill()
+                self.report_warning(tr("File execution cancelled by user"), ReportAction.EXECUTE)
+            raise
         return stdout_lines, stderr_lines
 
     def _wait_for_process(self, process, timeout):

janito/plugins/tools/{read_chart.py → core/read_chart.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.tools.tool_utils import display_path
 from janito.i18n import tr
 import json

janito/plugins/tools/{read_files.py → core/read_files.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.tools.tool_utils import pluralize
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops

janito/plugins/tools/{remove_directory.py → core/remove_directory.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.tools.tool_utils import pluralize, display_path
 from janito.i18n import tr
 import shutil

janito/plugins/tools/{remove_file.py → core/remove_file.py}

@@ -1,7 +1,7 @@
 import os
 from janito.tools.path_utils import expand_path
 import shutil
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 
 from janito.tools.tool_utils import display_path
 from janito.tools.tool_base import ToolBase, ToolPermissions

janito/plugins/tools/{replace_text_in_file.py → core/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.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 import shutil
 import re
-from janito.plugins.tools.validate_file_syntax.core import validate_file_syntax
+from .validate_file_syntax.core import validate_file_syntax
 
 
 @register_core_tool

janito/plugins/tools/{run_bash_command.py → core/run_bash_command.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 import subprocess
 import tempfile

janito/plugins/tools/{run_powershell_command.py → core/run_powershell_command.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 import subprocess
 import os

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

@@ -11,7 +11,7 @@ from .traverse_directory import traverse_directory
 from janito.tools.loop_protection_decorator import protect_against_loops
 
 
-from janito.plugins.tools.decorators import register_core_tool
+from ..decorators import register_core_tool
 
 
 @register_core_tool

janito/plugins/tools/{show_image.py → core/show_image.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops
 

janito/plugins/tools/{show_image_grid.py → core/show_image_grid.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops
 from typing import Sequence

janito/plugins/tools/{validate_file_syntax → core/validate_file_syntax}/core.py

@@ -5,7 +5,7 @@ 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.tools.tool_utils import display_path
-from janito.plugins.tools.decorators import register_core_tool as register_tool
+from ..decorators import register_core_tool as register_tool
 
 from .python_validator import validate_python
 from .json_validator import validate_json

janito/plugins/tools/{view_file.py → core/view_file.py}

@@ -1,6 +1,6 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.tools.tool_utils import pluralize
 from janito.i18n import tr
 from janito.tools.loop_protection_decorator import protect_against_loops

janito/plugins/web/webtools/__init__.py

@@ -7,16 +7,6 @@ Web scraping, browsing, and URL operations.
 from typing import Optional, Dict, List
 
 
-def fetch_url(
-    url: str,
-    search_strings: Optional[List[str]] = None,
-    max_length: int = 5000,
-    timeout: int = 10,
-) -> str:
-    """Download web pages with advanced options"""
-    return f"fetch_url(url='{url}', search={len(search_strings or [])} terms)"
-
-
 def open_url(url: str) -> str:
     """Open URLs in default browser"""
     return f"open_url(url='{url}')"
@@ -30,4 +20,4 @@ def open_html_in_browser(path: str) -> str:
 # Plugin metadata
 __plugin_name__ = "web.webtools"
 __plugin_description__ = "Web scraping, browsing, and URL operations"
-__plugin_tools__ = [fetch_url, open_url, open_html_in_browser]
+__plugin_tools__ = [open_url, open_html_in_browser]

janito/providers/moonshot/model_info.py

@@ -1,8 +1,19 @@
 from janito.llm.model import LLMModelInfo
 
 MOONSHOT_MODEL_SPECS = {
-    "kimi-k2-0711-preview": LLMModelInfo(
-        name="kimi-k2-0711-preview",
+    "kimi-k2-0905": LLMModelInfo(
+        name="kimi-k2-0905",
+        context=256000,
+        max_input=200000,
+        max_cot="N/A",
+        max_response=8192,
+        thinking_supported=False,
+        default_temp=0.2,
+        open="moonshot",
+        driver="OpenAIModelDriver",
+    ),
+    "kimi-k2-turbo-preview": LLMModelInfo(
+        name="kimi-k2-turbo-preview",
         context=128000,
         max_input=100000,
         max_cot="N/A",
@@ -12,8 +23,8 @@ MOONSHOT_MODEL_SPECS = {
         open="moonshot",
         driver="OpenAIModelDriver",
     ),
-    "kimi-k2-turbo-preview": LLMModelInfo(
-        name="kimi-k2-turbo-preview",
+    "kimi-k2-0711-preview": LLMModelInfo(
+        name="kimi-k2-0711-preview",
         context=128000,
         max_input=100000,
         max_cot="N/A",

janito/providers/moonshot/provider.py

@@ -12,7 +12,7 @@ class MoonshotProvider(LLMProvider):
     NAME = "moonshot"
     MAINTAINER = "João Pinto <janito@ikignosis.org>"
     MODEL_SPECS = MOONSHOT_MODEL_SPECS
-    DEFAULT_MODEL = "kimi-k2-turbo-preview"
+    DEFAULT_MODEL = "kimi-k2-0905"
 
     def __init__(
         self, auth_manager: LLMAuthManager = None, config: LLMDriverConfig = None

janito/tools/__init__.py

@@ -33,14 +33,24 @@ def get_local_tools_adapter(workdir=None, allowed_permissions=None):
 local_tools_adapter = None
 
 
+def _initialize_global_adapter():
+    """Initialize the global tools adapter."""
+    global local_tools_adapter
+    if local_tools_adapter is None:
+        from janito.tools.cli_initializer import get_cli_tools_adapter
+        # Try CLI initialization first
+        local_tools_adapter = get_cli_tools_adapter()
+        if local_tools_adapter is None:
+            # Fallback to regular initialization
+            from janito.tools.initialize import initialize_tools
+            local_tools_adapter = initialize_tools(LocalToolsAdapter())
+
+
 def get_local_tools_adapter(workdir=None, allowed_permissions=None):
     """Get the global tools adapter, initializing on first use."""
     global local_tools_adapter
     if local_tools_adapter is None:
-        from janito.tools.initialize import initialize_tools
-
-        adapter = LocalToolsAdapter(workdir=workdir)
-        local_tools_adapter = initialize_tools(adapter)
+        _initialize_global_adapter()
 
     # Handle workdir if provided
     if workdir is not None and local_tools_adapter is not None:

janito/tools/blocked_sites.py

@@ -0,0 +1,74 @@
+"""Blocked sites management for fetch_url tool to prevent access to known problematic sites."""
+
+from pathlib import Path
+from typing import Set
+from urllib.parse import urlparse
+
+
+class BlockedSitesManager:
+    """Manages blocked sites for the fetch_url tool using the local blocked.txt file."""
+
+    def __init__(self):
+        # Use package data directory for blocked.txt
+        import janito
+        package_dir = Path(janito.__file__).parent
+        self.blocked_file_path = package_dir / "data" / "blocked.txt"
+        self._blocked_sites = self._load_blocked_sites()
+
+    def _load_blocked_sites(self) -> Set[str]:
+        """Load blocked sites from the blocked.txt file."""
+        blocked = set()
+        
+        if self.blocked_file_path.exists():
+            try:
+                with open(self.blocked_file_path, "r", encoding="utf-8") as f:
+                    for line in f:
+                        line = line.strip()
+                        if line and not line.startswith("#"):
+                            # Extract domain from URL if it's a full URL
+                            if line.startswith("http://") or line.startswith("https://"):
+                                parsed = urlparse(line)
+                                domain = parsed.netloc
+                                if domain:
+                                    blocked.add(domain.lower())
+                            else:
+                                # Assume it's already a domain
+                                blocked.add(line.lower())
+            except IOError:
+                pass
+        
+        return blocked
+
+    def is_url_blocked(self, url: str) -> bool:
+        """Check if a URL is blocked."""
+        if not self._blocked_sites:
+            return False
+
+        try:
+            parsed = urlparse(url)
+            domain = parsed.netloc.lower()
+
+            # Check exact matches and subdomain matches
+            for blocked in self._blocked_sites:
+                if domain == blocked or domain.endswith("." + blocked):
+                    return True
+
+            return False
+        except Exception:
+            return False  # Invalid URLs are not blocked by default
+
+    def get_blocked_sites(self) -> list[str]:
+        """Get the list of blocked sites."""
+        return sorted(self._blocked_sites)
+
+
+# Global singleton
+_blocked_sites_manager = None
+
+
+def get_blocked_sites_manager() -> BlockedSitesManager:
+    """Get the global blocked sites manager instance."""
+    global _blocked_sites_manager
+    if _blocked_sites_manager is None:
+        _blocked_sites_manager = BlockedSitesManager()
+    return _blocked_sites_manager

{janito-3.5.0.dist-info → janito-3.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 3.5.0
+Version: 3.6.1
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito
@@ -29,7 +29,6 @@ Requires-Dist: codespell==2.4.1; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: questionary>=2.0.1; extra == "dev"
 Requires-Dist: setuptools_scm>=8.0; extra == "dev"
-Provides-Extra: coder
 Dynamic: license-file
 
 # Janito CLI
@@ -46,7 +45,7 @@ pip install janito
 
 ### First-Time Setup
 
-1. **Get your API key**: Sign up at [Moonshot AI](https://platform.moonshot.cn/) and get your API key
+1. **Get your API key**: Sign up at [Moonshot AI](https://platform.moonshot.ai) and get your API key
 2. **Set your API key**:
    ```bash
    janito --set-api-key YOUR_MOONSHOT_API_KEY -p moonshot
@@ -60,7 +59,7 @@ pip install janito
 janito "Create a Python script that reads a CSV file"
 
 # Using a specific Moonshot model
-janito -m kimi-k1-8k "Explain quantum computing"
+janito -m kimi-k2-0905 "Explain quantum computing"
 ```
 
 **Other Providers**
@@ -106,16 +105,16 @@ In chat mode, you can:
 Set default provider and model:
 ```bash
 janito --set provider=moonshot
-janito --set model=kimi-k1-8k
+janito --set model=kimi-k2-0905
 ```
 
 ## Providers
 
 ### Moonshot (Recommended)
 
-- **Models**: kimi-k1-8k, kimi-k1-32k, kimi-k1-128k, kimi-k2-turbo-preview
+- **Models**: kimi-k2-0905, kimi-k2-turbo-preview, kimi-k2-0711-preview
 - **Strengths**: Excellent Chinese/English support, competitive pricing, fast responses
-- **Setup**: Get API key from [Moonshot AI Platform](https://platform.moonshot.cn/)
+- **Setup**: Get API key from [Moonshot AI Platform](https://platform.moonshot.ai)
 
 ### OpenAI
 
@@ -167,7 +166,7 @@ You can also configure via environment variables:
 ```bash
 export MOONSHOT_API_KEY=your_key_here
 export JANITO_PROVIDER=moonshot
-export JANITO_MODEL=kimi-k1-8k
+export JANITO_MODEL=kimi-k2-0905
 ```
 
 **OpenAI:**