janito 2.6.0__py3-none-any.whl → 2.7.0__py3-none-any.whl

janito/providers/moonshotai/provider.py

@@ -0,0 +1,82 @@
+from janito.llm.provider import LLMProvider
+from janito.llm.auth import LLMAuthManager
+from janito.llm.driver_config import LLMDriverConfig
+from janito.drivers.openai.driver import OpenAIModelDriver
+from janito.tools import get_local_tools_adapter
+from janito.providers.registry import LLMProviderRegistry
+from .model_info import MOONSHOTAI_MODEL_SPECS
+
+class MoonshotAIProvider(LLMProvider):
+    name = "moonshotai"
+    maintainer = "João Pinto <lamego.pinto@gmail.com>"
+    MODEL_SPECS = MOONSHOTAI_MODEL_SPECS
+    DEFAULT_MODEL = "kimi-k2-0711-preview"
+
+    def __init__(self, auth_manager: LLMAuthManager = None, config: LLMDriverConfig = None):
+        if not self.available:
+            self._tools_adapter = get_local_tools_adapter()
+            self._driver = None
+        else:
+            self.auth_manager = auth_manager or LLMAuthManager()
+            self._api_key = self.auth_manager.get_credentials(type(self).name)
+            self._tools_adapter = get_local_tools_adapter()
+            self._driver_config = config or LLMDriverConfig(model=None)
+            if not self._driver_config.model:
+                self._driver_config.model = self.DEFAULT_MODEL
+            if not self._driver_config.api_key:
+                self._driver_config.api_key = self._api_key
+            # Set only the correct token parameter for the model
+            model_name = self._driver_config.model
+            model_spec = self.MODEL_SPECS.get(model_name)
+            if hasattr(self._driver_config, "max_tokens"):
+                self._driver_config.max_tokens = None
+            if hasattr(self._driver_config, "max_completion_tokens"):
+                self._driver_config.max_completion_tokens = None
+            if model_spec:
+                if getattr(model_spec, "thinking_supported", False):
+                    max_cot = getattr(model_spec, "max_cot", None)
+                    if max_cot and max_cot != "N/A":
+                        self._driver_config.max_completion_tokens = int(max_cot)
+                else:
+                    max_response = getattr(model_spec, "max_response", None)
+                    if max_response and max_response != "N/A":
+                        self._driver_config.max_tokens = int(max_response)
+            self.fill_missing_device_info(self._driver_config)
+            self._driver = None
+            # Set MoonshotAI base_url
+            self._driver_config.base_url = "https://api.moonshot.ai/v1"
+
+    @property
+    def driver(self) -> OpenAIModelDriver:
+        if not self.available:
+            raise ImportError(f"MoonshotAIProvider unavailable: {self.unavailable_reason}")
+        return self._driver
+
+    @property
+    def available(self):
+        return OpenAIModelDriver.available
+
+    @property
+    def unavailable_reason(self):
+        return OpenAIModelDriver.unavailable_reason
+
+    def create_driver(self):
+        driver = OpenAIModelDriver(
+            tools_adapter=self._tools_adapter, provider_name=self.name
+        )
+        driver.config = self._driver_config
+        return driver
+
+    @property
+    def model_name(self):
+        return self._driver_config.model
+
+    @property
+    def driver_config(self):
+        return self._driver_config
+
+    def execute_tool(self, tool_name: str, event_bus, *args, **kwargs):
+        self._tools_adapter.event_bus = event_bus
+        return self._tools_adapter.execute_by_name(tool_name, *args, **kwargs)
+
+LLMProviderRegistry.register(MoonshotAIProvider.name, MoonshotAIProvider)

janito/providers/openai/model_info.py

@@ -123,4 +123,5 @@ MODEL_SPECS = {
         open="openai",
         driver="OpenAIModelDriver",
     ),
+
 }

janito/providers/provider_static_info.py

@@ -1,18 +1,21 @@
-# Provider static metadata registry for listing purposes (name, maintainer, and future fields)
-STATIC_PROVIDER_METADATA = {
-    "openai": {
-    },
-    "google": {
-        "maintainer": "João Pinto <lamego.pinto@gmail.com>",
-    },
-    "azure_openai": {
-        "maintainer": "João Pinto <lamego.pinto@gmail.com>",
-    },
-    "anthropic": {
-        "maintainer": "Alberto Minetti <alberto.minetti@gmail.com>",
-    },
-
-    "deepseek": {
-        "maintainer": "João Pinto <lamego.pinto@gmail.com>",
-    },
-}
+# Provider static metadata registry for listing purposes (name, maintainer, and future fields)
+STATIC_PROVIDER_METADATA = {
+    "openai": {},
+    "moonshotai": {
+        "maintainer": "João Pinto <lamego.pinto@gmail.com>",
+        "note": "MoonshotAI uses OpenAI-compatible API at https://api.moonshot.ai"
+    },
+    "google": {
+        "maintainer": "João Pinto <lamego.pinto@gmail.com>",
+    },
+    "azure_openai": {
+        "maintainer": "João Pinto <lamego.pinto@gmail.com>",
+    },
+    "anthropic": {
+        "maintainer": "Alberto Minetti <alberto.minetti@gmail.com>",
+    },
+
+    "deepseek": {
+        "maintainer": "João Pinto <lamego.pinto@gmail.com>",
+    },
+}

janito/tools/adapters/local/__init__.py

@@ -1,66 +1,66 @@
-from .adapter import LocalToolsAdapter
-
-from .ask_user import AskUserTool
-from .copy_file import CopyFileTool
-from .create_directory import CreateDirectoryTool
-from .create_file import CreateFileTool
-from .fetch_url import FetchUrlTool
-from .find_files import FindFilesTool
-from .view_file import ViewFileTool
-from .read_files import ReadFilesTool
-from .move_file import MoveFileTool
-from .open_url import OpenUrlTool
-from .open_html_in_browser import OpenHtmlInBrowserTool
-from .python_code_run import PythonCodeRunTool
-from .python_command_run import PythonCommandRunTool
-from .python_file_run import PythonFileRunTool
-from .remove_directory import RemoveDirectoryTool
-from .remove_file import RemoveFileTool
-from .replace_text_in_file import ReplaceTextInFileTool
-from .run_bash_command import RunBashCommandTool
-from .run_powershell_command import RunPowershellCommandTool
-from .get_file_outline.core import GetFileOutlineTool
-from .get_file_outline.search_outline import SearchOutlineTool
-from .search_text.core import SearchTextTool
-from .validate_file_syntax.core import ValidateFileSyntaxTool
-
-from janito.tools.tool_base import ToolPermissions
-import os
-from janito.tools.permissions import get_global_allowed_permissions
-
-# Singleton tools adapter with all standard tools registered
-local_tools_adapter = LocalToolsAdapter(workdir=os.getcwd())
-
-def get_local_tools_adapter(workdir=None):
-    return LocalToolsAdapter(workdir=workdir or os.getcwd())
-
-# Register tools
-for tool_class in [
-    AskUserTool,
-    CopyFileTool,
-    CreateDirectoryTool,
-    CreateFileTool,
-    FetchUrlTool,
-    FindFilesTool,
-    ViewFileTool,
-    ReadFilesTool,
-    MoveFileTool,
-    OpenUrlTool,
-    OpenHtmlInBrowserTool,
-    PythonCodeRunTool,
-    PythonCommandRunTool,
-    PythonFileRunTool,
-    RemoveDirectoryTool,
-    RemoveFileTool,
-    ReplaceTextInFileTool,
-    RunBashCommandTool,
-    RunPowershellCommandTool,
-    GetFileOutlineTool,
-    SearchOutlineTool,
-    SearchTextTool,
-    ValidateFileSyntaxTool,
-]:
-    local_tools_adapter.register_tool(tool_class)
-
-# DEBUG: Print registered tools at startup
-
+from .adapter import LocalToolsAdapter
+
+from .ask_user import AskUserTool
+from .copy_file import CopyFileTool
+from .create_directory import CreateDirectoryTool
+from .create_file import CreateFileTool
+from .fetch_url import FetchUrlTool
+from .find_files import FindFilesTool
+from .view_file import ViewFileTool
+from .read_files import ReadFilesTool
+from .move_file import MoveFileTool
+from .open_url import OpenUrlTool
+from .open_html_in_browser import OpenHtmlInBrowserTool
+from .python_code_run import PythonCodeRunTool
+from .python_command_run import PythonCommandRunTool
+from .python_file_run import PythonFileRunTool
+from .remove_directory import RemoveDirectoryTool
+from .remove_file import RemoveFileTool
+from .replace_text_in_file import ReplaceTextInFileTool
+from .run_bash_command import RunBashCommandTool
+from .run_powershell_command import RunPowershellCommandTool
+from .get_file_outline.core import GetFileOutlineTool
+from .get_file_outline.search_outline import SearchOutlineTool
+from .search_text.core import SearchTextTool
+from .validate_file_syntax.core import ValidateFileSyntaxTool
+
+from janito.tools.tool_base import ToolPermissions
+import os
+from janito.tools.permissions import get_global_allowed_permissions
+
+# Singleton tools adapter with all standard tools registered
+local_tools_adapter = LocalToolsAdapter(workdir=os.getcwd())
+
+def get_local_tools_adapter(workdir=None):
+    return LocalToolsAdapter(workdir=workdir or os.getcwd())
+
+# Register tools
+for tool_class in [
+    AskUserTool,
+    CopyFileTool,
+    CreateDirectoryTool,
+    CreateFileTool,
+    FetchUrlTool,
+    FindFilesTool,
+    ViewFileTool,
+    ReadFilesTool,
+    MoveFileTool,
+    OpenUrlTool,
+    OpenHtmlInBrowserTool,
+    PythonCodeRunTool,
+    PythonCommandRunTool,
+    PythonFileRunTool,
+    RemoveDirectoryTool,
+    RemoveFileTool,
+    ReplaceTextInFileTool,
+    RunBashCommandTool,
+    RunPowershellCommandTool,
+    GetFileOutlineTool,
+    SearchOutlineTool,
+    SearchTextTool,
+    ValidateFileSyntaxTool,
+]:
+    local_tools_adapter.register_tool(tool_class)
+
+# DEBUG: Print registered tools at startup
+

janito/tools/adapters/local/move_file.py

@@ -55,7 +55,7 @@ class MoveFileTool(ToolBase):
                     disp_src=disp_src,
                     disp_dest=disp_dest,
                 ),
-                ReportAction.CREATE,
+                ReportAction.UPDATE,
             )
             shutil.move(src, dest)
             self.report_success(tr("✅ Move complete."))
@@ -106,7 +106,7 @@ class MoveFileTool(ToolBase):
                         "❗ Destination '{disp_dest}' exists and overwrite is False.",
                         disp_dest=disp_dest,
                     ),
-                    ReportAction.MOVE,
+                    ReportAction.UPDATE,
                 )
                 return None, tr(
                     "❗ Destination '{disp_dest}' already exists and overwrite is False.",
@@ -121,7 +121,7 @@ class MoveFileTool(ToolBase):
             except Exception as e:
                 self.report_error(
                     tr("❌ Error removing destination before move: {error}", error=e),
-                    ReportAction.MOVE,
+                    ReportAction.UPDATE,
                 )
                 return None, tr(
                     "❌ Error removing destination before move: {error}", error=e

janito/tools/adapters/local/read_files.py

@@ -1,40 +1,40 @@
-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 pluralize
-from janito.i18n import tr
-
-@register_local_tool
-class ReadFilesTool(ToolBase):
-    """
-    Read all text content from multiple files.
-
-    Args:
-        paths (list[str]): List of file paths to read.
-
-    Returns:
-        str: Concatenated content of all files, each prefixed by a header with the file name. If a file cannot be read, an error message is included for that file.
-    """
-    permissions = ToolPermissions(read=True)
-    tool_name = "read_files"
-
-    def run(self, paths: list[str]) -> str:
-        from janito.tools.tool_utils import display_path
-        import os
-        results = []
-        for path in paths:
-            disp_path = display_path(path)
-            self.report_action(tr("📖 Read '{disp_path}'", disp_path=disp_path), ReportAction.READ)
-            if not os.path.isfile(path):
-                self.report_warning(tr("❗ not found: {disp_path}", disp_path=disp_path))
-                results.append(f"--- File: {disp_path} (not found) ---\n")
-                continue
-            try:
-                with open(path, "r", encoding="utf-8", errors="replace") as f:
-                    content = f.read()
-                results.append(f"--- File: {disp_path} ---\n{content}\n")
-                self.report_success(tr("✅ Read {disp_path}", disp_path=disp_path))
-            except Exception as e:
-                self.report_error(tr(" ❌ Error reading {disp_path}: {error}", disp_path=disp_path, error=e))
-                results.append(f"--- File: {disp_path} (error) ---\nError reading file: {e}\n")
-        return "\n".join(results)
+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 pluralize
+from janito.i18n import tr
+
+@register_local_tool
+class ReadFilesTool(ToolBase):
+    """
+    Read all text content from multiple files.
+
+    Args:
+        paths (list[str]): List of file paths to read.
+
+    Returns:
+        str: Concatenated content of all files, each prefixed by a header with the file name. If a file cannot be read, an error message is included for that file.
+    """
+    permissions = ToolPermissions(read=True)
+    tool_name = "read_files"
+
+    def run(self, paths: list[str]) -> str:
+        from janito.tools.tool_utils import display_path
+        import os
+        results = []
+        for path in paths:
+            disp_path = display_path(path)
+            self.report_action(tr("📖 Read '{disp_path}'", disp_path=disp_path), ReportAction.READ)
+            if not os.path.isfile(path):
+                self.report_warning(tr("❗ not found: {disp_path}", disp_path=disp_path))
+                results.append(f"--- File: {disp_path} (not found) ---\n")
+                continue
+            try:
+                with open(path, "r", encoding="utf-8", errors="replace") as f:
+                    content = f.read()
+                results.append(f"--- File: {disp_path} ---\n{content}\n")
+                self.report_success(tr("✅ Read {disp_path}", disp_path=disp_path))
+            except Exception as e:
+                self.report_error(tr(" ❌ Error reading {disp_path}: {error}", disp_path=disp_path, error=e))
+                results.append(f"--- File: {disp_path} (error) ---\nError reading file: {e}\n")
+        return "\n".join(results)