janito 3.5.1__py3-none-any.whl → 3.6.1__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-k1-8k "Explain quantum computing"
+janito -m kimi-k2-0905 "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-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/)
 
@@ -133,7 +133,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:**

janito/cli/cli_commands/list_tools.py

@@ -76,7 +76,12 @@ def handle_list_tools(args=None):
         DisabledToolsState.set_disabled_tools(disabled_str)
     disabled_tools = DisabledToolsState.get_disabled_tools()
 
-    registry = janito.tools.local_tools_adapter
+    # 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
     tools = registry.list_tools()
     if tools:
         from rich.console import Console

janito/cli/main_cli.py

@@ -292,7 +292,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-k1-8k 'Your prompt here'\n\n"
+            "\n\nExample usage: janito -p moonshot -m kimi-k2-0905 'Your prompt here'\n\n"
             "Use -m or --model to set the model for the session.",
         )
         self._define_args()

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.
         """
-        sys.stdout.write("\033[2K\r")
-        sys.stdout.flush()
+        self.console.file.write("\033[2K\r")
+        self.console.file.flush()
 
     def on_RequestFinished(self, event):
         self.delete_current_line()

janito/data/blocked.txt

@@ -0,0 +1,96 @@
+# Sites known to be unexplorable due to authentication/paywall restrictions
+# This list helps identify URLs that should be skipped during automated exploration
+
+# News sites with paywalls
+https://www.reuters.com
+https://www.wsj.com
+https://www.ft.com
+https://www.thetimes.co.uk
+https://www.nytimes.com
+https://www.washingtonpost.com
+https://www.economist.com
+https://www.bloomberg.com
+https://www.thestreet.com
+https://www.marketwatch.com
+
+# Academic/research databases
+https://www.jstor.org
+https://academic.oup.com
+https://www.sciencedirect.com
+https://ieeexplore.ieee.org
+https://dl.acm.org
+https://pubs.acs.org
+https://www.nature.com
+https://www.science.org
+https://link.springer.com
+https://onlinelibrary.wiley.com
+
+# Social media platforms (require login)
+https://www.facebook.com
+https://www.twitter.com
+https://www.instagram.com
+https://www.linkedin.com
+https://www.tiktok.com
+https://www.snapchat.com
+https://www.threads.net
+
+# Streaming services
+https://www.netflix.com
+https://www.hulu.com
+https://www.disneyplus.com
+https://www.primevideo.com
+https://www.hbomax.com
+https://www.spotify.com
+https://music.apple.com
+
+# Cloud services requiring authentication
+https://drive.google.com
+https://www.dropbox.com
+https://onedrive.live.com
+https://www.icloud.com
+https://github.com (private repos)
+https://gitlab.com (private repos)
+
+# Financial services
+https://www.paypal.com
+https://www.venmo.com
+https://www.cash.app
+https://www.zellepay.com
+https://www.robinhood.com
+https://www.coinbase.com
+
+# Government services requiring login
+https://www.irs.gov
+https://www.ssa.gov
+https://www.medicare.gov
+https://www.dmv.ca.gov
+https://www.gov.uk
+
+# Shopping sites requiring accounts
+https://www.amazon.com (account areas)
+https://www.ebay.com (account areas)
+https://www.etsy.com (account areas)
+
+# Professional tools
+https://slack.com
+https://zoom.us
+https://teams.microsoft.com
+https://www.notion.so
+https://trello.com
+https://asana.com
+
+# Dating apps
+https://tinder.com
+https://www.bumble.com
+https://www.okcupid.com
+https://match.com
+https://eharmony.com
+
+# Gaming platforms
+https://www.steamcommunity.com
+https://www.xbox.com
+https://www.playstation.com
+https://www.nintendo.com
+
+# Note: These URLs are generally inaccessible without proper authentication
+# Some may allow limited public access, but core functionality requires login

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.cn/)
+1. Go to [Moonshot AI Platform](https://platform.moonshot.ai)
 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-k1-8k "Explain machine learning in simple terms"
+janito -m kimi-k2-0905 "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-k1-8k     # or gpt-5, ibm/granite-3-8b-instruct, etc.
+janito --set model=kimi-k2-0905     # 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-k1-8k
+export JANITO_MODEL=kimi-k2-0905
 ```
 
 **OpenAI:**
@@ -120,11 +120,10 @@ export JANITO_MODEL=ibm/granite-3-3-8b-instruct
 ## Available Models by Provider
 
 ### Moonshot Models
-- **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-turbo-preview**: Turbo version of the advanced reasoning model
+
+- **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
 
 ### OpenAI Models
 - **gpt-5**: Latest GPT model with advanced capabilities

janito/plugins/tools/__init__.py

@@ -1,10 +1,39 @@
 """
-Core tools plugin for janito.
+Core tools package for janito.
 
-This plugin provides the essential tools for file operations, code execution,
-and system interactions that are core to janito's functionality.
+This package contains the essential tools for file operations, code execution,
+web scraping, and system interactions that are core to janito's functionality.
 """
 
-from .core_tools_plugin import CoreToolsPlugin
+from .core import *
 
-__all__ = ["CoreToolsPlugin"]
+__all__ = [
+    'FetchUrl',
+    'AskUser',
+    'CopyFile',
+    'CreateDirectory',
+    'CreateFile',
+    'DeleteTextInFile',
+    'FindFiles',
+    'MoveFile',
+    'OpenHtmlInBrowser',
+    'OpenUrl',
+    'PythonCodeRun',
+    'PythonCommandRun',
+    'PythonFileRun',
+    'ReadChart',
+    'ReadFiles',
+    'RemoveDirectory',
+    'RemoveFile',
+    'ReplaceTextInFile',
+    'RunBashCommand',
+    'RunPowershellCommand',
+    'ShowImage',
+    'ShowImageGrid',
+    'ViewFile',
+    'ValidateFileSyntax',
+    'GetFileOutline',
+    'SearchText',
+    'get_core_tools',
+    'register_core_tool',
+]

janito/plugins/tools/core/__init__.py

@@ -0,0 +1,65 @@
+"""
+Core tools for janito.
+
+This package contains the essential tools that provide basic functionality
+for file operations, code execution, web scraping, and system interactions.
+"""
+
+from .fetch_url import FetchUrl
+from .ask_user import AskUser
+from .copy_file import CopyFile
+from .create_directory import CreateDirectory
+from .create_file import CreateFile
+from .delete_text_in_file import DeleteTextInFile
+from .find_files import FindFiles
+from .move_file import MoveFile
+from .open_html_in_browser import OpenHtmlInBrowser
+from .open_url import OpenUrl
+from .python_code_run import PythonCodeRun
+from .python_command_run import PythonCommandRun
+from .python_file_run import PythonFileRun
+from .read_chart import ReadChart
+from .read_files import ReadFiles
+from .remove_directory import RemoveDirectory
+from .remove_file import RemoveFile
+from .replace_text_in_file import ReplaceTextInFile
+from .run_bash_command import RunBashCommand
+from .run_powershell_command import RunPowershellCommand
+from .show_image import ShowImage
+from .show_image_grid import ShowImageGrid
+from .view_file import ViewFile
+from .validate_file_syntax.core import ValidateFileSyntax
+from .get_file_outline.core import GetFileOutline
+from .search_text.core import SearchText
+from .decorators import get_core_tools, register_core_tool
+
+__all__ = [
+    'FetchUrl',
+    'AskUser',
+    'CopyFile',
+    'CreateDirectory',
+    'CreateFile',
+    'DeleteTextInFile',
+    'FindFiles',
+    'MoveFile',
+    'OpenHtmlInBrowser',
+    'OpenUrl',
+    'PythonCodeRun',
+    'PythonCommandRun',
+    'PythonFileRun',
+    'ReadChart',
+    'ReadFiles',
+    'RemoveDirectory',
+    'RemoveFile',
+    'ReplaceTextInFile',
+    'RunBashCommand',
+    'RunPowershellCommand',
+    'ShowImage',
+    'ShowImageGrid',
+    'ViewFile',
+    'ValidateFileSyntax',
+    'GetFileOutline',
+    'SearchText',
+    'get_core_tools',
+    'register_core_tool',
+]

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

@@ -1,5 +1,5 @@
 from janito.tools.tool_base import ToolBase, ToolPermissions
-from janito.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.tools.loop_protection_decorator import protect_against_loops
 
 from rich import print as rich_print

janito/plugins/tools/{copy_file.py → core/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.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.tools.tool_utils import display_path
 from janito.report_events import ReportAction

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

@@ -1,4 +1,4 @@
-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/{create_file.py → core/create_file.py}

@@ -1,6 +1,6 @@
 import os
 from janito.tools.path_utils import expand_path
-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
@@ -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.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/{delete_text_in_file.py → core/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.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.i18n import tr
 import shutil
-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/{fetch_url.py → core/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.plugins.tools.decorators import register_core_tool
+from .decorators import register_core_tool
 from janito.tools.tool_base import ToolBase, ToolPermissions
 from janito.report_events import ReportAction
 from janito.i18n import tr
@@ -190,11 +190,23 @@ class FetchUrl(ToolBase):
 
         Also implements URL whitelist checking and browser-like behavior.
         """
-        # Check URL whitelist
+        # Check URL whitelist and blocked sites
         from janito.tools.url_whitelist import get_url_whitelist_manager
+        from janito.tools.blocked_sites import get_blocked_sites_manager
 
         whitelist_manager = get_url_whitelist_manager()
+        blocked_manager = get_blocked_sites_manager()
 
+        # Check blocked sites first
+        if blocked_manager.is_url_blocked(url):
+            error_message = tr("Blocked: Site is in blocked list")
+            self.report_error(
+                tr("❗ Blocked: Site is in blocked list"),
+                ReportAction.READ,
+            )
+            return error_message
+
+        # Then check whitelist
         if not whitelist_manager.is_url_allowed(url):
             error_message = tr("Blocked")
             self.report_error(
@@ -245,7 +257,7 @@ class FetchUrl(ToolBase):
             self.session_cache[url] = content
             return content
         except requests.exceptions.HTTPError as http_err:
-            status_code = http_err.response.status_code if http_err.response else None
+            status_code = http_err.response.status_code if http_err.response is not None else None
 
             # Map status codes to descriptions
             status_descriptions = {
@@ -291,14 +303,7 @@ class FetchUrl(ToolBase):
                 return error_message
             else:
                 status_code_str = str(status_code) if status_code else "Error"
-                description = status_descriptions.get(
-                    status_code,
-                    (
-                        "Server Error"
-                        if status_code and status_code >= 500
-                        else "Client Error"
-                    ),
-                )
+                description = status_descriptions.get(status_code, "Error")
                 self.report_error(
                     f"❗ HTTP {status_code_str} {description}",
                     ReportAction.READ,
@@ -401,11 +406,7 @@ class FetchUrl(ToolBase):
                 cookies=cookies,
                 follow_redirects=follow_redirects,
             )
-            if (
-                html_content.startswith("HTTP Error ")
-                or html_content == "Error"
-                or html_content == "Blocked"
-            ):
+            if html_content.startswith("HTTP") or "Error" in html_content or html_content == "Blocked":
                 return html_content
 
             try:
@@ -434,11 +435,7 @@ class FetchUrl(ToolBase):
             cookies=cookies,
             follow_redirects=follow_redirects,
         )
-        if (
-            html_content.startswith("HTTP Error ")
-            or html_content == "Error"
-            or html_content == "Blocked"
-        ):
+        if html_content.startswith("HTTP") or "Error" in html_content or html_content == "Blocked":
             return html_content
 
         # Extract and clean text

janito/plugins/tools/{find_files.py → core/find_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, display_path
 from janito.dir_walk_utils import walk_dir_with_gitignore
 from janito.i18n import tr

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

@@ -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.plugins.tools.decorators import register_core_tool
+from ..decorators import register_core_tool
 from janito.tools.loop_protection_decorator import protect_against_loops
 
 

janito/plugins/tools/{move_file.py → core/move_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
 from janito.report_events import ReportAction

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

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

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

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

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

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
 
 

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
 
 

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