janito 2.3.0__py3-none-any.whl → 2.3.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- janito/__init__.py +6 -6
- janito/cli/chat_mode/shell/autocomplete.py +21 -21
- janito/cli/chat_mode/shell/commands/clear.py +12 -12
- janito/cli/chat_mode/shell/commands/multi.py +51 -51
- janito/cli/chat_mode/shell/input_history.py +62 -62
- janito/cli/cli_commands/list_models.py +35 -35
- janito/cli/cli_commands/list_providers.py +9 -9
- janito/cli/cli_commands/list_tools.py +53 -53
- janito/cli/cli_commands/model_selection.py +50 -50
- janito/cli/cli_commands/model_utils.py +95 -95
- janito/cli/cli_commands/set_api_key.py +19 -19
- janito/cli/cli_commands/show_config.py +51 -51
- janito/cli/cli_commands/show_system_prompt.py +62 -62
- janito/cli/core/__init__.py +4 -4
- janito/cli/core/event_logger.py +59 -59
- janito/cli/core/getters.py +33 -33
- janito/cli/core/unsetters.py +54 -54
- janito/cli/single_shot_mode/__init__.py +6 -6
- janito/config.py +5 -5
- janito/config_manager.py +112 -112
- janito/drivers/anthropic/driver.py +113 -113
- janito/formatting_token.py +54 -54
- janito/i18n/__init__.py +35 -35
- janito/i18n/messages.py +23 -23
- janito/i18n/pt.py +47 -47
- janito/llm/__init__.py +5 -5
- janito/llm/agent.py +443 -443
- janito/llm/auth.py +63 -63
- janito/llm/driver_config_builder.py +34 -34
- janito/llm/driver_input.py +12 -12
- janito/llm/message_parts.py +60 -60
- janito/llm/model.py +38 -38
- janito/llm/provider.py +196 -196
- janito/provider_registry.py +176 -176
- janito/providers/anthropic/model_info.py +22 -22
- janito/providers/anthropic/provider.py +2 -0
- janito/providers/azure_openai/model_info.py +16 -16
- janito/providers/azure_openai/provider.py +3 -0
- janito/providers/deepseek/__init__.py +1 -1
- janito/providers/deepseek/model_info.py +16 -16
- janito/providers/deepseek/provider.py +94 -91
- janito/providers/google/provider.py +3 -0
- janito/providers/mistralai/provider.py +3 -0
- janito/providers/openai/provider.py +4 -0
- janito/tools/adapters/__init__.py +1 -1
- janito/tools/adapters/local/ask_user.py +102 -102
- janito/tools/adapters/local/copy_file.py +84 -84
- janito/tools/adapters/local/create_directory.py +69 -69
- janito/tools/adapters/local/create_file.py +82 -82
- janito/tools/adapters/local/fetch_url.py +97 -97
- janito/tools/adapters/local/find_files.py +138 -138
- janito/tools/adapters/local/get_file_outline/__init__.py +1 -1
- janito/tools/adapters/local/get_file_outline/core.py +117 -117
- janito/tools/adapters/local/get_file_outline/java_outline.py +40 -40
- janito/tools/adapters/local/get_file_outline/markdown_outline.py +14 -14
- janito/tools/adapters/local/get_file_outline/python_outline.py +303 -303
- janito/tools/adapters/local/get_file_outline/python_outline_v2.py +156 -156
- janito/tools/adapters/local/get_file_outline/search_outline.py +33 -33
- janito/tools/adapters/local/python_code_run.py +166 -166
- janito/tools/adapters/local/python_command_run.py +164 -164
- janito/tools/adapters/local/python_file_run.py +163 -163
- janito/tools/adapters/local/run_bash_command.py +176 -176
- janito/tools/adapters/local/run_powershell_command.py +219 -219
- janito/tools/adapters/local/search_text/__init__.py +1 -1
- janito/tools/adapters/local/search_text/core.py +201 -201
- janito/tools/adapters/local/search_text/pattern_utils.py +73 -73
- janito/tools/adapters/local/search_text/traverse_directory.py +145 -145
- janito/tools/adapters/local/validate_file_syntax/__init__.py +1 -1
- janito/tools/adapters/local/validate_file_syntax/core.py +106 -106
- janito/tools/adapters/local/validate_file_syntax/css_validator.py +35 -35
- janito/tools/adapters/local/validate_file_syntax/html_validator.py +93 -93
- janito/tools/adapters/local/validate_file_syntax/js_validator.py +27 -27
- janito/tools/adapters/local/validate_file_syntax/json_validator.py +6 -6
- janito/tools/adapters/local/validate_file_syntax/markdown_validator.py +109 -109
- janito/tools/adapters/local/validate_file_syntax/ps1_validator.py +32 -32
- janito/tools/adapters/local/validate_file_syntax/python_validator.py +5 -5
- janito/tools/adapters/local/validate_file_syntax/xml_validator.py +11 -11
- janito/tools/adapters/local/validate_file_syntax/yaml_validator.py +6 -6
- janito/tools/adapters/local/view_file.py +167 -167
- janito/tools/inspect_registry.py +17 -17
- janito/tools/tool_base.py +105 -105
- janito/tools/tool_events.py +58 -58
- janito/tools/tool_run_exception.py +12 -12
- janito/tools/tool_use_tracker.py +81 -81
- janito/tools/tool_utils.py +45 -45
- janito/tools/tools_schema.py +104 -104
- janito/version.py +4 -4
- {janito-2.3.0.dist-info → janito-2.3.1.dist-info}/METADATA +390 -388
- {janito-2.3.0.dist-info → janito-2.3.1.dist-info}/RECORD +93 -93
- {janito-2.3.0.dist-info → janito-2.3.1.dist-info}/WHEEL +0 -0
- {janito-2.3.0.dist-info → janito-2.3.1.dist-info}/entry_points.txt +0 -0
- {janito-2.3.0.dist-info → janito-2.3.1.dist-info}/licenses/LICENSE +0 -0
- {janito-2.3.0.dist-info → janito-2.3.1.dist-info}/top_level.txt +0 -0
@@ -1,163 +1,163 @@
|
|
1
|
-
import subprocess
|
2
|
-
import os
|
3
|
-
import sys
|
4
|
-
import tempfile
|
5
|
-
import threading
|
6
|
-
from janito.tools.tool_base import ToolBase
|
7
|
-
from janito.report_events import ReportAction
|
8
|
-
from janito.tools.adapters.local.adapter import register_local_tool
|
9
|
-
from janito.i18n import tr
|
10
|
-
|
11
|
-
|
12
|
-
@register_local_tool
|
13
|
-
class PythonFileRunTool(ToolBase):
|
14
|
-
"""
|
15
|
-
Tool to execute a specified Python script file.
|
16
|
-
|
17
|
-
Parameters:
|
18
|
-
file_path (str): Path to the Python script file to execute.
|
19
|
-
timeout (int): Timeout in seconds for the command. Defaults to 60.
|
20
|
-
|
21
|
-
Returns:
|
22
|
-
str: Output and status message, or file paths/line counts if output is large.
|
23
|
-
"""
|
24
|
-
provides_execution = True
|
25
|
-
tool_name = "python_file_run"
|
26
|
-
|
27
|
-
def run(self, file_path: str, timeout: int = 60) -> str:
|
28
|
-
self.report_action(
|
29
|
-
tr("🚀 Running: python {file_path}", file_path=file_path),
|
30
|
-
ReportAction.EXECUTE,
|
31
|
-
)
|
32
|
-
self.report_stdout("\n")
|
33
|
-
try:
|
34
|
-
with (
|
35
|
-
tempfile.NamedTemporaryFile(
|
36
|
-
mode="w+",
|
37
|
-
prefix="python_file_stdout_",
|
38
|
-
delete=False,
|
39
|
-
encoding="utf-8",
|
40
|
-
) as stdout_file,
|
41
|
-
tempfile.NamedTemporaryFile(
|
42
|
-
mode="w+",
|
43
|
-
prefix="python_file_stderr_",
|
44
|
-
delete=False,
|
45
|
-
encoding="utf-8",
|
46
|
-
) as stderr_file,
|
47
|
-
):
|
48
|
-
process = subprocess.Popen(
|
49
|
-
[sys.executable, file_path],
|
50
|
-
stdout=subprocess.PIPE,
|
51
|
-
stderr=subprocess.PIPE,
|
52
|
-
text=True,
|
53
|
-
bufsize=1,
|
54
|
-
universal_newlines=True,
|
55
|
-
encoding="utf-8",
|
56
|
-
env={**os.environ, "PYTHONIOENCODING": "utf-8"},
|
57
|
-
)
|
58
|
-
stdout_lines, stderr_lines = self._stream_process_output(
|
59
|
-
process, stdout_file, stderr_file
|
60
|
-
)
|
61
|
-
return_code = self._wait_for_process(process, timeout)
|
62
|
-
if return_code is None:
|
63
|
-
return tr(
|
64
|
-
"Code timed out after {timeout} seconds.", timeout=timeout
|
65
|
-
)
|
66
|
-
stdout_file.flush()
|
67
|
-
stderr_file.flush()
|
68
|
-
self.report_success(
|
69
|
-
tr("✅ Return code {return_code}", return_code=return_code),
|
70
|
-
ReportAction.EXECUTE,
|
71
|
-
)
|
72
|
-
return self._format_result(
|
73
|
-
stdout_file.name, stderr_file.name, return_code
|
74
|
-
)
|
75
|
-
except Exception as e:
|
76
|
-
self.report_error(tr("❌ Error: {error}", error=e), ReportAction.EXECUTE)
|
77
|
-
return tr("Error running file: {error}", error=e)
|
78
|
-
|
79
|
-
def _stream_process_output(self, process, stdout_file, stderr_file):
|
80
|
-
stdout_lines = 0
|
81
|
-
stderr_lines = 0
|
82
|
-
|
83
|
-
def stream_output(stream, file_obj, report_func, count_func):
|
84
|
-
nonlocal stdout_lines, stderr_lines
|
85
|
-
for line in stream:
|
86
|
-
file_obj.write(line)
|
87
|
-
file_obj.flush()
|
88
|
-
# Always supply a default action for stdout/stderr reporting
|
89
|
-
from janito.report_events import ReportAction
|
90
|
-
|
91
|
-
report_func(line.rstrip("\r\n"), ReportAction.EXECUTE)
|
92
|
-
if count_func == "stdout":
|
93
|
-
stdout_lines += 1
|
94
|
-
else:
|
95
|
-
stderr_lines += 1
|
96
|
-
|
97
|
-
stdout_thread = threading.Thread(
|
98
|
-
target=stream_output,
|
99
|
-
args=(process.stdout, stdout_file, self.report_stdout, "stdout"),
|
100
|
-
)
|
101
|
-
stderr_thread = threading.Thread(
|
102
|
-
target=stream_output,
|
103
|
-
args=(process.stderr, stderr_file, self.report_stderr, "stderr"),
|
104
|
-
)
|
105
|
-
stdout_thread.start()
|
106
|
-
stderr_thread.start()
|
107
|
-
stdout_thread.join()
|
108
|
-
stderr_thread.join()
|
109
|
-
return stdout_lines, stderr_lines
|
110
|
-
|
111
|
-
def _wait_for_process(self, process, timeout):
|
112
|
-
try:
|
113
|
-
return process.wait(timeout=timeout)
|
114
|
-
except subprocess.TimeoutExpired:
|
115
|
-
process.kill()
|
116
|
-
self.report_error(
|
117
|
-
tr("❌ Timed out after {timeout} seconds.", timeout=timeout),
|
118
|
-
ReportAction.EXECUTE,
|
119
|
-
)
|
120
|
-
return None
|
121
|
-
|
122
|
-
def _format_result(self, stdout_file_name, stderr_file_name, return_code):
|
123
|
-
with open(stdout_file_name, "r", encoding="utf-8", errors="replace") as out_f:
|
124
|
-
stdout_content = out_f.read()
|
125
|
-
with open(stderr_file_name, "r", encoding="utf-8", errors="replace") as err_f:
|
126
|
-
stderr_content = err_f.read()
|
127
|
-
max_lines = 100
|
128
|
-
stdout_lines = stdout_content.count("\n")
|
129
|
-
stderr_lines = stderr_content.count("\n")
|
130
|
-
|
131
|
-
def head_tail(text, n=10):
|
132
|
-
lines = text.splitlines()
|
133
|
-
if len(lines) <= 2 * n:
|
134
|
-
return "\n".join(lines)
|
135
|
-
return "\n".join(
|
136
|
-
lines[:n]
|
137
|
-
+ ["... ({} lines omitted) ...".format(len(lines) - 2 * n)]
|
138
|
-
+ lines[-n:]
|
139
|
-
)
|
140
|
-
|
141
|
-
if stdout_lines <= max_lines and stderr_lines <= max_lines:
|
142
|
-
result = f"Return code: {return_code}\n--- python_file_run: STDOUT ---\n{stdout_content}"
|
143
|
-
if stderr_content.strip():
|
144
|
-
result += f"\n--- python_file_run: STDERR ---\n{stderr_content}"
|
145
|
-
return result
|
146
|
-
else:
|
147
|
-
result = f"stdout_file: {stdout_file_name} (lines: {stdout_lines})\n"
|
148
|
-
if stderr_lines > 0 and stderr_content.strip():
|
149
|
-
result += f"stderr_file: {stderr_file_name} (lines: {stderr_lines})\n"
|
150
|
-
result += f"returncode: {return_code}\n"
|
151
|
-
result += (
|
152
|
-
"--- python_file_run: STDOUT (head/tail) ---\n"
|
153
|
-
+ head_tail(stdout_content)
|
154
|
-
+ "\n"
|
155
|
-
)
|
156
|
-
if stderr_content.strip():
|
157
|
-
result += (
|
158
|
-
"--- python_file_run: STDERR (head/tail) ---\n"
|
159
|
-
+ head_tail(stderr_content)
|
160
|
-
+ "\n"
|
161
|
-
)
|
162
|
-
result += "Use the view_file tool to inspect the contents of these files when needed."
|
163
|
-
return result
|
1
|
+
import subprocess
|
2
|
+
import os
|
3
|
+
import sys
|
4
|
+
import tempfile
|
5
|
+
import threading
|
6
|
+
from janito.tools.tool_base import ToolBase
|
7
|
+
from janito.report_events import ReportAction
|
8
|
+
from janito.tools.adapters.local.adapter import register_local_tool
|
9
|
+
from janito.i18n import tr
|
10
|
+
|
11
|
+
|
12
|
+
@register_local_tool
|
13
|
+
class PythonFileRunTool(ToolBase):
|
14
|
+
"""
|
15
|
+
Tool to execute a specified Python script file.
|
16
|
+
|
17
|
+
Parameters:
|
18
|
+
file_path (str): Path to the Python script file to execute.
|
19
|
+
timeout (int): Timeout in seconds for the command. Defaults to 60.
|
20
|
+
|
21
|
+
Returns:
|
22
|
+
str: Output and status message, or file paths/line counts if output is large.
|
23
|
+
"""
|
24
|
+
provides_execution = True
|
25
|
+
tool_name = "python_file_run"
|
26
|
+
|
27
|
+
def run(self, file_path: str, timeout: int = 60) -> str:
|
28
|
+
self.report_action(
|
29
|
+
tr("🚀 Running: python {file_path}", file_path=file_path),
|
30
|
+
ReportAction.EXECUTE,
|
31
|
+
)
|
32
|
+
self.report_stdout("\n")
|
33
|
+
try:
|
34
|
+
with (
|
35
|
+
tempfile.NamedTemporaryFile(
|
36
|
+
mode="w+",
|
37
|
+
prefix="python_file_stdout_",
|
38
|
+
delete=False,
|
39
|
+
encoding="utf-8",
|
40
|
+
) as stdout_file,
|
41
|
+
tempfile.NamedTemporaryFile(
|
42
|
+
mode="w+",
|
43
|
+
prefix="python_file_stderr_",
|
44
|
+
delete=False,
|
45
|
+
encoding="utf-8",
|
46
|
+
) as stderr_file,
|
47
|
+
):
|
48
|
+
process = subprocess.Popen(
|
49
|
+
[sys.executable, file_path],
|
50
|
+
stdout=subprocess.PIPE,
|
51
|
+
stderr=subprocess.PIPE,
|
52
|
+
text=True,
|
53
|
+
bufsize=1,
|
54
|
+
universal_newlines=True,
|
55
|
+
encoding="utf-8",
|
56
|
+
env={**os.environ, "PYTHONIOENCODING": "utf-8"},
|
57
|
+
)
|
58
|
+
stdout_lines, stderr_lines = self._stream_process_output(
|
59
|
+
process, stdout_file, stderr_file
|
60
|
+
)
|
61
|
+
return_code = self._wait_for_process(process, timeout)
|
62
|
+
if return_code is None:
|
63
|
+
return tr(
|
64
|
+
"Code timed out after {timeout} seconds.", timeout=timeout
|
65
|
+
)
|
66
|
+
stdout_file.flush()
|
67
|
+
stderr_file.flush()
|
68
|
+
self.report_success(
|
69
|
+
tr("✅ Return code {return_code}", return_code=return_code),
|
70
|
+
ReportAction.EXECUTE,
|
71
|
+
)
|
72
|
+
return self._format_result(
|
73
|
+
stdout_file.name, stderr_file.name, return_code
|
74
|
+
)
|
75
|
+
except Exception as e:
|
76
|
+
self.report_error(tr("❌ Error: {error}", error=e), ReportAction.EXECUTE)
|
77
|
+
return tr("Error running file: {error}", error=e)
|
78
|
+
|
79
|
+
def _stream_process_output(self, process, stdout_file, stderr_file):
|
80
|
+
stdout_lines = 0
|
81
|
+
stderr_lines = 0
|
82
|
+
|
83
|
+
def stream_output(stream, file_obj, report_func, count_func):
|
84
|
+
nonlocal stdout_lines, stderr_lines
|
85
|
+
for line in stream:
|
86
|
+
file_obj.write(line)
|
87
|
+
file_obj.flush()
|
88
|
+
# Always supply a default action for stdout/stderr reporting
|
89
|
+
from janito.report_events import ReportAction
|
90
|
+
|
91
|
+
report_func(line.rstrip("\r\n"), ReportAction.EXECUTE)
|
92
|
+
if count_func == "stdout":
|
93
|
+
stdout_lines += 1
|
94
|
+
else:
|
95
|
+
stderr_lines += 1
|
96
|
+
|
97
|
+
stdout_thread = threading.Thread(
|
98
|
+
target=stream_output,
|
99
|
+
args=(process.stdout, stdout_file, self.report_stdout, "stdout"),
|
100
|
+
)
|
101
|
+
stderr_thread = threading.Thread(
|
102
|
+
target=stream_output,
|
103
|
+
args=(process.stderr, stderr_file, self.report_stderr, "stderr"),
|
104
|
+
)
|
105
|
+
stdout_thread.start()
|
106
|
+
stderr_thread.start()
|
107
|
+
stdout_thread.join()
|
108
|
+
stderr_thread.join()
|
109
|
+
return stdout_lines, stderr_lines
|
110
|
+
|
111
|
+
def _wait_for_process(self, process, timeout):
|
112
|
+
try:
|
113
|
+
return process.wait(timeout=timeout)
|
114
|
+
except subprocess.TimeoutExpired:
|
115
|
+
process.kill()
|
116
|
+
self.report_error(
|
117
|
+
tr("❌ Timed out after {timeout} seconds.", timeout=timeout),
|
118
|
+
ReportAction.EXECUTE,
|
119
|
+
)
|
120
|
+
return None
|
121
|
+
|
122
|
+
def _format_result(self, stdout_file_name, stderr_file_name, return_code):
|
123
|
+
with open(stdout_file_name, "r", encoding="utf-8", errors="replace") as out_f:
|
124
|
+
stdout_content = out_f.read()
|
125
|
+
with open(stderr_file_name, "r", encoding="utf-8", errors="replace") as err_f:
|
126
|
+
stderr_content = err_f.read()
|
127
|
+
max_lines = 100
|
128
|
+
stdout_lines = stdout_content.count("\n")
|
129
|
+
stderr_lines = stderr_content.count("\n")
|
130
|
+
|
131
|
+
def head_tail(text, n=10):
|
132
|
+
lines = text.splitlines()
|
133
|
+
if len(lines) <= 2 * n:
|
134
|
+
return "\n".join(lines)
|
135
|
+
return "\n".join(
|
136
|
+
lines[:n]
|
137
|
+
+ ["... ({} lines omitted) ...".format(len(lines) - 2 * n)]
|
138
|
+
+ lines[-n:]
|
139
|
+
)
|
140
|
+
|
141
|
+
if stdout_lines <= max_lines and stderr_lines <= max_lines:
|
142
|
+
result = f"Return code: {return_code}\n--- python_file_run: STDOUT ---\n{stdout_content}"
|
143
|
+
if stderr_content.strip():
|
144
|
+
result += f"\n--- python_file_run: STDERR ---\n{stderr_content}"
|
145
|
+
return result
|
146
|
+
else:
|
147
|
+
result = f"stdout_file: {stdout_file_name} (lines: {stdout_lines})\n"
|
148
|
+
if stderr_lines > 0 and stderr_content.strip():
|
149
|
+
result += f"stderr_file: {stderr_file_name} (lines: {stderr_lines})\n"
|
150
|
+
result += f"returncode: {return_code}\n"
|
151
|
+
result += (
|
152
|
+
"--- python_file_run: STDOUT (head/tail) ---\n"
|
153
|
+
+ head_tail(stdout_content)
|
154
|
+
+ "\n"
|
155
|
+
)
|
156
|
+
if stderr_content.strip():
|
157
|
+
result += (
|
158
|
+
"--- python_file_run: STDERR (head/tail) ---\n"
|
159
|
+
+ head_tail(stderr_content)
|
160
|
+
+ "\n"
|
161
|
+
)
|
162
|
+
result += "Use the view_file tool to inspect the contents of these files when needed."
|
163
|
+
return result
|