janito 1.8.1__py3-none-any.whl → 1.10.0__py3-none-any.whl

janito/agent/tools/get_lines.py

@@ -1,40 +1,49 @@
 from janito.agent.tool_base import ToolBase
+from janito.agent.tools_utils.action_type import ActionType
 from janito.agent.tool_registry import register_tool
-from janito.agent.tools.tools_utils import pluralize
+from janito.agent.tools_utils.utils import pluralize
 from janito.i18n import tr
 
 
 @register_tool(name="get_lines")
 class GetLinesTool(ToolBase):
     """
-    Read lines from a file. Returns specific lines if a range is provided, or the entire file if no range is given. If both from_line and to_line are None, the entire file is returned in one call—no need to chunk or split requests when reading the full file.
+    Read lines from a file. You can specify a line range, or read the entire file by simply omitting the from_line and to_line parameters.
+
     Args:
         file_path (str): Path to the file to read lines from.
-        from_line (int, optional): Starting line number (1-based). If None, starts from the first line.
-        to_line (int, optional): Ending line number (1-based). If None, reads to the end of the file. If both are None, the entire file is returned.
+        from_line (int, optional): Starting line number (1-based). Omit to start from the first line.
+        to_line (int, optional): Ending line number (1-based). Omit to read to the end of the file.
+
+    To read the full file, just provide file_path and leave from_line and to_line unset.
+
     Returns:
         str: File content with a header indicating the file name and line range. Example:
             - "---\nFile: /path/to/file.py | Lines: 1-10 (of 100)\n---\n<lines...>"
-            - "---\nFile: /path/to/file.py | All lines (total: 100)\n---\n<all lines...>"
+            - "---\nFile: /path/to/file.py | All lines (total: 100 (all))\n---\n<all lines...>"
             - "Error reading file: <error message>"
             - "❗ not found"
     """
 
     def run(self, file_path: str, from_line: int = None, to_line: int = None) -> str:
-        from janito.agent.tools.tools_utils import display_path
+        from janito.agent.tools_utils.utils import display_path
 
         disp_path = display_path(file_path)
         if from_line and to_line:
             self.report_info(
+                ActionType.READ,
                 tr(
-                    "📖 Reading {disp_path} {from_line}-{to_line}",
+                    "📖 Reading file '{disp_path}' {from_line}-{to_line}",
                     disp_path=disp_path,
                     from_line=from_line,
                     to_line=to_line,
-                )
+                ),
             )
         else:
-            self.report_info(tr("📖 Reading {disp_path} all", disp_path=disp_path))
+            self.report_info(
+                ActionType.READ,
+                tr("📖 Reading file '{disp_path}'", disp_path=disp_path),
+            )
         try:
             with open(file_path, "r", encoding="utf-8", errors="replace") as f:
                 lines = f.readlines()
@@ -59,7 +68,7 @@ class GetLinesTool(ToolBase):
                 elif to_line < total_lines:
                     self.report_success(
                         tr(
-                            " ✅ {selected_len} {line_word} ({remaining} to eof)",
+                            " ✅ {selected_len} {line_word} ({remaining} to end)",
                             selected_len=selected_len,
                             line_word=pluralize("line", selected_len),
                             remaining=total_lines - to_line,
@@ -68,7 +77,7 @@ class GetLinesTool(ToolBase):
             else:
                 self.report_success(
                     tr(
-                        " ✅ {selected_len} {line_word}",
+                        " ✅ {selected_len} {line_word} (all)",
                         selected_len=selected_len,
                         line_word=pluralize("line", selected_len),
                     )
@@ -98,7 +107,7 @@ class GetLinesTool(ToolBase):
                 )
             else:
                 header = tr(
-                    "---\n{disp_path} All lines (total: {total_lines})\n---\n",
+                    "---\n{disp_path} All lines (total: {total_lines} (all))\n---\n",
                     disp_path=disp_path,
                     total_lines=total_lines,
                 )

janito/agent/tools/move_file.py

@@ -1,8 +1,11 @@
 import os
 import shutil
 from janito.agent.tool_registry import register_tool
-from janito.agent.tools.utils import expand_path, display_path
+
+# from janito.agent.tools_utils.expand_path import expand_path
+from janito.agent.tools_utils.utils import display_path
 from janito.agent.tool_base import ToolBase
+from janito.agent.tools_utils.action_type import ActionType
 from janito.i18n import tr
 
 
@@ -29,8 +32,8 @@ class MoveFileTool(ToolBase):
     ) -> str:
         original_src = src_path
         original_dest = dest_path
-        src = expand_path(src_path)
-        dest = expand_path(dest_path)
+        src = src_path  # Using src_path as is
+        dest = dest_path  # Using dest_path as is
         disp_src = display_path(original_src)
         disp_dest = display_path(original_dest)
         backup_path = None
@@ -82,19 +85,17 @@ class MoveFileTool(ToolBase):
                 )
                 return tr("❌ Error removing destination before move: {error}", error=e)
         try:
-            shutil.move(src, dest)
-            self.report_success(
+            self.report_info(
+                ActionType.WRITE,
                 tr(
-                    "✅ Moved from '{disp_src}' to '{disp_dest}'",
+                    "📝 Moving from '{disp_src}' to '{disp_dest}' ...",
                     disp_src=disp_src,
                     disp_dest=disp_dest,
-                )
-            )
-            msg = tr(
-                "✅ Successfully moved from '{disp_src}' to '{disp_dest}'.",
-                disp_src=disp_src,
-                disp_dest=disp_dest,
+                ),
             )
+            shutil.move(src, dest)
+            self.report_success(tr("✅ Move complete."))
+            msg = tr("✅ Move complete.")
             if backup_path:
                 msg += tr(
                     " (backup at {backup_disp})",

janito/agent/tools/present_choices.py

@@ -1,5 +1,6 @@
 from typing import List
 from janito.agent.tool_base import ToolBase
+from janito.agent.tools_utils.action_type import ActionType
 from janito.agent.tool_registry import register_tool
 from janito.i18n import tr
 import questionary
@@ -36,11 +37,12 @@ class PresentChoicesTool(ToolBase):
         if not choices:
             return tr("⚠️ No choices provided.")
         self.report_info(
+            ActionType.EXECUTE,
             tr(
                 "ℹ️ Prompting user: {prompt} (multi_select={multi_select}) ...",
                 prompt=prompt,
                 multi_select=multi_select,
-            )
+            ),
         )
         if multi_select:
             result = questionary.checkbox(

janito/agent/tools/python_command_runner.py

@@ -0,0 +1,150 @@
+import subprocess
+import sys
+import tempfile
+import threading
+from janito.agent.tool_base import ToolBase
+from janito.agent.tools_utils.action_type import ActionType
+from janito.agent.tool_registry import register_tool
+from janito.i18n import tr
+
+
+@register_tool(name="python_command_runner")
+class PythonCommandRunnerTool(ToolBase):
+    """
+    Tool to execute Python code using the `python -c` command-line flag.
+    Args:
+        code (str): The Python code to execute as a string.
+        timeout (int, optional): Timeout in seconds for the command. Defaults to 60.
+    Returns:
+        str: Output and status message, or file paths/line counts if output is large.
+    """
+
+    def run(self, code: str, timeout: int = 60) -> str:
+        if not code.strip():
+            self.report_warning(tr("\u2139\ufe0f Empty code provided."))
+            return tr("Warning: Empty code provided. Operation skipped.")
+        self.report_info(
+            ActionType.EXECUTE, tr("🐍 Running: python -c ...\n{code}\n", code=code)
+        )
+        try:
+            with (
+                tempfile.NamedTemporaryFile(
+                    mode="w+",
+                    prefix="python_cmd_stdout_",
+                    delete=False,
+                    encoding="utf-8",
+                ) as stdout_file,
+                tempfile.NamedTemporaryFile(
+                    mode="w+",
+                    prefix="python_cmd_stderr_",
+                    delete=False,
+                    encoding="utf-8",
+                ) as stderr_file,
+            ):
+                process = subprocess.Popen(
+                    [sys.executable, "-c", code],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                    bufsize=1,
+                    universal_newlines=True,
+                    encoding="utf-8",
+                    env={**dict(), **dict(PYTHONIOENCODING="utf-8")},
+                )
+                stdout_lines = 0
+                stderr_lines = 0
+
+                def stream_output(stream, file_obj, report_func, count_func):
+                    nonlocal stdout_lines, stderr_lines
+                    for line in stream:
+                        file_obj.write(line)
+                        file_obj.flush()
+                        report_func(line)
+                        if count_func == "stdout":
+                            stdout_lines += 1
+                        else:
+                            stderr_lines += 1
+
+                stdout_thread = threading.Thread(
+                    target=stream_output,
+                    args=(process.stdout, stdout_file, self.report_stdout, "stdout"),
+                )
+                stderr_thread = threading.Thread(
+                    target=stream_output,
+                    args=(process.stderr, stderr_file, self.report_stderr, "stderr"),
+                )
+                stdout_thread.start()
+                stderr_thread.start()
+                try:
+                    return_code = process.wait(timeout=timeout)
+                except subprocess.TimeoutExpired:
+                    process.kill()
+                    self.report_error(
+                        tr("\u274c Timed out after {timeout} seconds.", timeout=timeout)
+                    )
+                    return tr(
+                        "Code timed out after {timeout} seconds.", timeout=timeout
+                    )
+                stdout_thread.join()
+                stderr_thread.join()
+                stdout_file.flush()
+                stderr_file.flush()
+
+                self.report_success(
+                    tr("\u2705 Return code {return_code}", return_code=return_code)
+                )
+                # Read back the content for summary if not too large
+                with open(
+                    stdout_file.name, "r", encoding="utf-8", errors="replace"
+                ) as out_f:
+                    stdout_content = out_f.read()
+                with open(
+                    stderr_file.name, "r", encoding="utf-8", errors="replace"
+                ) as err_f:
+                    stderr_content = err_f.read()
+                max_lines = 100
+                stdout_lines = stdout_content.count("\n")
+                stderr_lines = stderr_content.count("\n")
+
+                def head_tail(text, n=10):
+                    lines = text.splitlines()
+                    if len(lines) <= 2 * n:
+                        return "\n".join(lines)
+                    return "\n".join(
+                        lines[:n]
+                        + ["... ({} lines omitted) ...".format(len(lines) - 2 * n)]
+                        + lines[-n:]
+                    )
+
+                if stdout_lines <= max_lines and stderr_lines <= max_lines:
+                    result = (
+                        f"Return code: {return_code}\n--- STDOUT ---\n{stdout_content}"
+                    )
+                    if stderr_content.strip():
+                        result += f"\n--- STDERR ---\n{stderr_content}"
+                    return result
+                else:
+                    result = (
+                        f"stdout_file: {stdout_file.name} (lines: {stdout_lines})\n"
+                    )
+                    if stderr_lines > 0 and stderr_content.strip():
+                        result += (
+                            f"stderr_file: {stderr_file.name} (lines: {stderr_lines})\n"
+                        )
+                    result += f"returncode: {return_code}\n"
+                    result += (
+                        "--- STDOUT (head/tail) ---\n"
+                        + head_tail(stdout_content)
+                        + "\n"
+                    )
+                    if stderr_content.strip():
+                        result += (
+                            "--- STDERR (head/tail) ---\n"
+                            + head_tail(stderr_content)
+                            + "\n"
+                        )
+                    result += "Use the get_lines tool to inspect the contents of these files when needed."
+                    return result
+        except Exception as e:
+            self.report_error(tr("\u274c Error: {error}", error=e))
+            return tr("Error running code: {error}", error=e)

janito/agent/tools/python_file_runner.py

@@ -0,0 +1,148 @@
+import subprocess
+import sys
+import tempfile
+import threading
+from janito.agent.tool_base import ToolBase
+from janito.agent.tools_utils.action_type import ActionType
+from janito.agent.tool_registry import register_tool
+from janito.i18n import tr
+
+
+@register_tool(name="python_file_runner")
+class PythonFileRunnerTool(ToolBase):
+    """
+    Tool to execute a specified Python script file.
+    Args:
+        file_path (str): Path to the Python script file to execute.
+        timeout (int, optional): Timeout in seconds for the command. Defaults to 60.
+    Returns:
+        str: Output and status message, or file paths/line counts if output is large.
+    """
+
+    def run(self, file_path: str, timeout: int = 60) -> str:
+        self.report_info(
+            ActionType.EXECUTE,
+            tr("🚀 Running: python {file_path}", file_path=file_path),
+        )
+        try:
+            with (
+                tempfile.NamedTemporaryFile(
+                    mode="w+",
+                    prefix="python_file_stdout_",
+                    delete=False,
+                    encoding="utf-8",
+                ) as stdout_file,
+                tempfile.NamedTemporaryFile(
+                    mode="w+",
+                    prefix="python_file_stderr_",
+                    delete=False,
+                    encoding="utf-8",
+                ) as stderr_file,
+            ):
+                process = subprocess.Popen(
+                    [sys.executable, file_path],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                    bufsize=1,
+                    universal_newlines=True,
+                    encoding="utf-8",
+                    env={**dict(), **dict(PYTHONIOENCODING="utf-8")},
+                )
+                stdout_lines = 0
+                stderr_lines = 0
+
+                def stream_output(stream, file_obj, report_func, count_func):
+                    nonlocal stdout_lines, stderr_lines
+                    for line in stream:
+                        file_obj.write(line)
+                        file_obj.flush()
+                        report_func(line)
+                        if count_func == "stdout":
+                            stdout_lines += 1
+                        else:
+                            stderr_lines += 1
+
+                stdout_thread = threading.Thread(
+                    target=stream_output,
+                    args=(process.stdout, stdout_file, self.report_stdout, "stdout"),
+                )
+                stderr_thread = threading.Thread(
+                    target=stream_output,
+                    args=(process.stderr, stderr_file, self.report_stderr, "stderr"),
+                )
+                stdout_thread.start()
+                stderr_thread.start()
+                try:
+                    return_code = process.wait(timeout=timeout)
+                except subprocess.TimeoutExpired:
+                    process.kill()
+                    self.report_error(
+                        tr("\u274c Timed out after {timeout} seconds.", timeout=timeout)
+                    )
+                    return tr(
+                        "Code timed out after {timeout} seconds.", timeout=timeout
+                    )
+                stdout_thread.join()
+                stderr_thread.join()
+                stdout_file.flush()
+                stderr_file.flush()
+
+                self.report_success(
+                    tr("\u2705 Return code {return_code}", return_code=return_code)
+                )
+                # Read back the content for summary if not too large
+                with open(
+                    stdout_file.name, "r", encoding="utf-8", errors="replace"
+                ) as out_f:
+                    stdout_content = out_f.read()
+                with open(
+                    stderr_file.name, "r", encoding="utf-8", errors="replace"
+                ) as err_f:
+                    stderr_content = err_f.read()
+                max_lines = 100
+                stdout_lines = stdout_content.count("\n")
+                stderr_lines = stderr_content.count("\n")
+
+                def head_tail(text, n=10):
+                    lines = text.splitlines()
+                    if len(lines) <= 2 * n:
+                        return "\n".join(lines)
+                    return "\n".join(
+                        lines[:n]
+                        + ["... ({} lines omitted) ...".format(len(lines) - 2 * n)]
+                        + lines[-n:]
+                    )
+
+                if stdout_lines <= max_lines and stderr_lines <= max_lines:
+                    result = (
+                        f"Return code: {return_code}\n--- STDOUT ---\n{stdout_content}"
+                    )
+                    if stderr_content.strip():
+                        result += f"\n--- STDERR ---\n{stderr_content}"
+                    return result
+                else:
+                    result = (
+                        f"stdout_file: {stdout_file.name} (lines: {stdout_lines})\n"
+                    )
+                    if stderr_lines > 0 and stderr_content.strip():
+                        result += (
+                            f"stderr_file: {stderr_file.name} (lines: {stderr_lines})\n"
+                        )
+                    result += f"returncode: {return_code}\n"
+                    result += (
+                        "--- STDOUT (head/tail) ---\n"
+                        + head_tail(stdout_content)
+                        + "\n"
+                    )
+                    if stderr_content.strip():
+                        result += (
+                            "--- STDERR (head/tail) ---\n"
+                            + head_tail(stderr_content)
+                            + "\n"
+                        )
+                    result += "Use the get_lines tool to inspect the contents of these files when needed."
+                    return result
+        except Exception as e:
+            self.report_error(tr("\u274c Error: {error}", error=e))
+            return tr("Error running file: {error}", error=e)

janito/agent/tools/python_stdin_runner.py

@@ -0,0 +1,154 @@
+import subprocess
+import sys
+import tempfile
+import threading
+from janito.agent.tool_base import ToolBase
+from janito.agent.tools_utils.action_type import ActionType
+from janito.agent.tool_registry import register_tool
+from janito.i18n import tr
+
+
+@register_tool(name="python_stdin_runner")
+class PythonStdinRunnerTool(ToolBase):
+    """
+    Tool to execute Python code by passing it to the interpreter via standard input (stdin).
+    Args:
+        code (str): The Python code to execute as a string.
+        timeout (int, optional): Timeout in seconds for the command. Defaults to 60.
+    Returns:
+        str: Output and status message, or file paths/line counts if output is large.
+    """
+
+    def run(self, code: str, timeout: int = 60) -> str:
+        if not code.strip():
+            self.report_warning(tr("\u2139\ufe0f Empty code provided."))
+            return tr("Warning: Empty code provided. Operation skipped.")
+        self.report_info(
+            ActionType.EXECUTE,
+            tr("⚡ Running: python (stdin mode) ...\n{code}\n", code=code),
+        )
+        try:
+            with (
+                tempfile.NamedTemporaryFile(
+                    mode="w+",
+                    prefix="python_stdin_stdout_",
+                    delete=False,
+                    encoding="utf-8",
+                ) as stdout_file,
+                tempfile.NamedTemporaryFile(
+                    mode="w+",
+                    prefix="python_stdin_stderr_",
+                    delete=False,
+                    encoding="utf-8",
+                ) as stderr_file,
+            ):
+                process = subprocess.Popen(
+                    [sys.executable],
+                    stdin=subprocess.PIPE,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                    bufsize=1,
+                    universal_newlines=True,
+                    encoding="utf-8",
+                    env={**dict(), **dict(PYTHONIOENCODING="utf-8")},
+                )
+                stdout_lines = 0
+                stderr_lines = 0
+
+                def stream_output(stream, file_obj, report_func, count_func):
+                    nonlocal stdout_lines, stderr_lines
+                    for line in stream:
+                        file_obj.write(line)
+                        file_obj.flush()
+                        report_func(line)
+                        if count_func == "stdout":
+                            stdout_lines += 1
+                        else:
+                            stderr_lines += 1
+
+                stdout_thread = threading.Thread(
+                    target=stream_output,
+                    args=(process.stdout, stdout_file, self.report_stdout, "stdout"),
+                )
+                stderr_thread = threading.Thread(
+                    target=stream_output,
+                    args=(process.stderr, stderr_file, self.report_stderr, "stderr"),
+                )
+                stdout_thread.start()
+                stderr_thread.start()
+                try:
+                    process.stdin.write(code)
+                    process.stdin.close()
+                    return_code = process.wait(timeout=timeout)
+                except subprocess.TimeoutExpired:
+                    process.kill()
+                    self.report_error(
+                        tr("\u274c Timed out after {timeout} seconds.", timeout=timeout)
+                    )
+                    return tr(
+                        "Code timed out after {timeout} seconds.", timeout=timeout
+                    )
+                stdout_thread.join()
+                stderr_thread.join()
+                stdout_file.flush()
+                stderr_file.flush()
+
+                self.report_success(
+                    tr("\u2705 Return code {return_code}", return_code=return_code)
+                )
+                # Read back the content for summary if not too large
+                with open(
+                    stdout_file.name, "r", encoding="utf-8", errors="replace"
+                ) as out_f:
+                    stdout_content = out_f.read()
+                with open(
+                    stderr_file.name, "r", encoding="utf-8", errors="replace"
+                ) as err_f:
+                    stderr_content = err_f.read()
+                max_lines = 100
+                stdout_lines = stdout_content.count("\n")
+                stderr_lines = stderr_content.count("\n")
+
+                def head_tail(text, n=10):
+                    lines = text.splitlines()
+                    if len(lines) <= 2 * n:
+                        return "\n".join(lines)
+                    return "\n".join(
+                        lines[:n]
+                        + ["... ({} lines omitted) ...".format(len(lines) - 2 * n)]
+                        + lines[-n:]
+                    )
+
+                if stdout_lines <= max_lines and stderr_lines <= max_lines:
+                    result = (
+                        f"Return code: {return_code}\n--- STDOUT ---\n{stdout_content}"
+                    )
+                    if stderr_content.strip():
+                        result += f"\n--- STDERR ---\n{stderr_content}"
+                    return result
+                else:
+                    result = (
+                        f"stdout_file: {stdout_file.name} (lines: {stdout_lines})\n"
+                    )
+                    if stderr_lines > 0 and stderr_content.strip():
+                        result += (
+                            f"stderr_file: {stderr_file.name} (lines: {stderr_lines})\n"
+                        )
+                    result += f"returncode: {return_code}\n"
+                    result += (
+                        "--- STDOUT (head/tail) ---\n"
+                        + head_tail(stdout_content)
+                        + "\n"
+                    )
+                    if stderr_content.strip():
+                        result += (
+                            "--- STDERR (head/tail) ---\n"
+                            + head_tail(stderr_content)
+                            + "\n"
+                        )
+                    result += "Use the get_lines tool to inspect the contents of these files when needed."
+                    return result
+        except Exception as e:
+            self.report_error(tr("\u274c Error: {error}", error=e))
+            return tr("Error running code via stdin: {error}", error=e)

janito/agent/tools/remove_directory.py

@@ -1,6 +1,7 @@
 from janito.agent.tool_base import ToolBase
+from janito.agent.tools_utils.action_type import ActionType
 from janito.agent.tool_registry import register_tool
-from janito.agent.tools.tools_utils import pluralize, display_path
+from janito.agent.tools_utils.utils import pluralize, display_path
 from janito.i18n import tr
 import shutil
 import os
@@ -24,7 +25,8 @@ class RemoveDirectoryTool(ToolBase):
     def run(self, file_path: str, recursive: bool = False) -> str:
         disp_path = display_path(file_path)
         self.report_info(
-            tr("🗃️  Removing directory: {disp_path} ...", disp_path=disp_path)
+            ActionType.WRITE,
+            tr("🗃️ Removing directory '{disp_path}' ...", disp_path=disp_path),
         )
         backup_zip = None
         try: