janito 3.6.1__py3-none-any.whl → 3.7.0__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/README.md +4 -7
- janito/cli/chat_mode/bindings.py +0 -50
- janito/cli/chat_mode/session.py +1 -12
- janito/cli/chat_mode/shell/commands/multi.py +0 -5
- janito/cli/chat_mode/shell/commands/security/allowed_sites.py +33 -47
- janito/cli/cli_commands/list_plugins.py +43 -52
- janito/cli/cli_commands/list_tools.py +1 -6
- janito/cli/core/getters.py +0 -3
- janito/cli/core/model_guesser.py +24 -40
- janito/cli/main_cli.py +13 -10
- janito/cli/prompt_core.py +9 -47
- janito/cli/rich_terminal_reporter.py +4 -4
- janito/docs/GETTING_STARTED.md +9 -8
- janito/drivers/openai/driver.py +0 -1
- janito/drivers/zai/driver.py +0 -1
- janito/i18n/it.py +46 -46
- janito/llm/agent.py +16 -32
- janito/llm/auth_utils.py +5 -14
- janito/llm/driver.py +0 -8
- janito/plugins/__init__.py +12 -31
- janito/plugins/auto_loader.py +11 -12
- janito/plugins/auto_loader_fixed.py +11 -12
- janito/{plugin_system → plugins}/base.py +2 -5
- janito/plugins/builtin.py +1 -15
- janito/plugins/core_adapter.py +11 -89
- janito/plugins/core_loader.py +120 -0
- janito/plugins/core_loader_fixed.py +125 -0
- janito/plugins/discovery.py +5 -5
- janito/plugins/discovery_core.py +9 -14
- janito/plugins/manager.py +1 -1
- janito/providers/__init__.py +0 -1
- janito/providers/moonshot/model_info.py +7 -7
- janito/providers/moonshot/provider.py +1 -1
- janito/tools/__init__.py +7 -41
- janito/tools/adapters/__init__.py +1 -6
- janito/tools/adapters/local/__init__.py +70 -7
- janito/{plugins/tools/core → tools/adapters/local}/ask_user.py +3 -3
- janito/tools/adapters/local/copy_file.py +87 -0
- janito/tools/adapters/local/create_file.py +138 -0
- janito/{plugins/tools/core → tools/adapters/local}/fetch_url.py +23 -20
- janito/tools/adapters/local/move_file.py +131 -0
- janito/{plugins/tools/core → tools/adapters/local}/python_code_run.py +7 -23
- janito/{plugins/tools/core → tools/adapters/local}/python_command_run.py +5 -21
- janito/{plugins/tools/core → tools/adapters/local}/python_file_run.py +5 -21
- janito/tools/adapters/local/remove_file.py +58 -0
- janito/{plugins/tools/core → tools/adapters/local}/replace_text_in_file.py +4 -4
- janito/{plugins/tools/core → tools/adapters/local}/run_bash_command.py +3 -3
- janito/{plugins/tools/core → tools/adapters/local}/run_powershell_command.py +3 -3
- janito/{plugins/tools/core → tools/adapters/local}/show_image.py +6 -15
- janito/{plugins/core/imagedisplay/tools → tools/adapters/local}/show_image_grid.py +5 -13
- janito/tools/adapters/local/view_file.py +172 -0
- janito/tools/function_adapter.py +65 -0
- janito/tools/loop_protection_decorator.py +117 -114
- janito-3.7.0.dist-info/METADATA +84 -0
- janito-3.7.0.dist-info/RECORD +264 -0
- janito/cli/cli_commands/check_tools.py +0 -212
- janito/data/blocked.txt +0 -96
- janito/llm/cancellation_manager.py +0 -63
- janito/llm/enter_cancellation.py +0 -107
- janito/plugin_system/__init__.py +0 -10
- janito/plugin_system/core_loader.py +0 -217
- janito/plugin_system/core_loader_fixed.py +0 -225
- janito/plugins/core/__init__.py +0 -7
- janito/plugins/core/codeanalyzer/__init__.py +0 -43
- janito/plugins/core/filemanager/__init__.py +0 -124
- janito/plugins/core/filemanager/tools/copy_file.py +0 -87
- janito/plugins/core/filemanager/tools/create_file.py +0 -87
- janito/plugins/core/filemanager/tools/move_file.py +0 -131
- janito/plugins/core/filemanager/tools/remove_file.py +0 -58
- janito/plugins/core/filemanager/tools/replace_text_in_file.py +0 -270
- janito/plugins/core/filemanager/tools/view_file.py +0 -172
- janito/plugins/core/imagedisplay/__init__.py +0 -14
- janito/plugins/core/imagedisplay/plugin.py +0 -51
- janito/plugins/core/imagedisplay/tools/__init__.py +0 -1
- janito/plugins/core/imagedisplay/tools/show_image.py +0 -83
- janito/plugins/core/system/__init__.py +0 -23
- janito/plugins/core/system/tools/run_bash_command.py +0 -204
- janito/plugins/core/system/tools/run_powershell_command.py +0 -234
- janito/plugins/dev/__init__.py +0 -7
- janito/plugins/dev/pythondev/__init__.py +0 -37
- janito/plugins/dev/visualization/__init__.py +0 -23
- janito/plugins/example_plugin.py +0 -108
- janito/plugins/tools/__init__.py +0 -39
- janito/plugins/tools/core/__init__.py +0 -65
- janito/plugins/tools/core/copy_file.py +0 -87
- janito/plugins/tools/core/create_directory.py +0 -70
- janito/plugins/tools/core/create_file.py +0 -138
- janito/plugins/tools/core/decorators.py +0 -19
- janito/plugins/tools/core/delete_text_in_file.py +0 -134
- janito/plugins/tools/core/find_files.py +0 -143
- janito/plugins/tools/core/get_file_outline/__init__.py +0 -7
- janito/plugins/tools/core/get_file_outline/core.py +0 -122
- janito/plugins/tools/core/get_file_outline/java_outline.py +0 -47
- janito/plugins/tools/core/get_file_outline/markdown_outline.py +0 -14
- janito/plugins/tools/core/get_file_outline/python_outline.py +0 -303
- janito/plugins/tools/core/get_file_outline/search_outline.py +0 -36
- janito/plugins/tools/core/move_file.py +0 -131
- janito/plugins/tools/core/open_html_in_browser.py +0 -51
- janito/plugins/tools/core/open_url.py +0 -37
- janito/plugins/tools/core/read_chart.py +0 -259
- janito/plugins/tools/core/read_files.py +0 -58
- janito/plugins/tools/core/remove_directory.py +0 -55
- janito/plugins/tools/core/remove_file.py +0 -58
- janito/plugins/tools/core/search_text/__init__.py +0 -7
- janito/plugins/tools/core/search_text/core.py +0 -205
- janito/plugins/tools/core/search_text/match_lines.py +0 -67
- janito/plugins/tools/core/search_text/pattern_utils.py +0 -73
- janito/plugins/tools/core/search_text/traverse_directory.py +0 -145
- janito/plugins/tools/core/show_image_grid.py +0 -85
- janito/plugins/tools/core/validate_file_syntax/__init__.py +0 -7
- janito/plugins/tools/core/validate_file_syntax/core.py +0 -114
- janito/plugins/tools/core/validate_file_syntax/css_validator.py +0 -35
- janito/plugins/tools/core/validate_file_syntax/html_validator.py +0 -100
- janito/plugins/tools/core/validate_file_syntax/jinja2_validator.py +0 -50
- janito/plugins/tools/core/validate_file_syntax/js_validator.py +0 -27
- janito/plugins/tools/core/validate_file_syntax/json_validator.py +0 -6
- janito/plugins/tools/core/validate_file_syntax/markdown_validator.py +0 -109
- janito/plugins/tools/core/validate_file_syntax/ps1_validator.py +0 -32
- janito/plugins/tools/core/validate_file_syntax/python_validator.py +0 -5
- janito/plugins/tools/core/validate_file_syntax/xml_validator.py +0 -11
- janito/plugins/tools/core/validate_file_syntax/yaml_validator.py +0 -6
- janito/plugins/tools/core/view_file.py +0 -172
- janito/plugins/ui/__init__.py +0 -7
- janito/plugins/ui/userinterface/__init__.py +0 -16
- janito/plugins/ui/userinterface/tools/ask_user.py +0 -110
- janito/plugins/web/__init__.py +0 -7
- janito/plugins/web/webtools/__init__.py +0 -23
- janito/providers/together/__init__.py +0 -1
- janito/providers/together/model_info.py +0 -69
- janito/providers/together/provider.py +0 -108
- janito/tools/blocked_sites.py +0 -74
- janito/tools/cli_initializer.py +0 -88
- janito/tools/initialize.py +0 -70
- janito-3.6.1.dist-info/METADATA +0 -228
- janito-3.6.1.dist-info/RECORD +0 -339
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/create_directory.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/delete_text_in_file.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/find_files.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/__init__.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/core.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/java_outline.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/markdown_outline.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/python_outline.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/search_outline.py +0 -0
- /janito/{plugins/web/webtools/tools → tools/adapters/local}/open_html_in_browser.py +0 -0
- /janito/{plugins/web/webtools/tools → tools/adapters/local}/open_url.py +0 -0
- /janito/{plugins/dev/visualization/tools → tools/adapters/local}/read_chart.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/read_files.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/remove_directory.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/__init__.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/core.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/match_lines.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/pattern_utils.py +0 -0
- /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/traverse_directory.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/__init__.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/core.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/css_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/html_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/jinja2_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/js_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/json_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/markdown_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/ps1_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/python_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/xml_validator.py +0 -0
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/yaml_validator.py +0 -0
- {janito-3.6.1.dist-info → janito-3.7.0.dist-info}/WHEEL +0 -0
- {janito-3.6.1.dist-info → janito-3.7.0.dist-info}/entry_points.txt +0 -0
- {janito-3.6.1.dist-info → janito-3.7.0.dist-info}/licenses/LICENSE +0 -0
- {janito-3.6.1.dist-info → janito-3.7.0.dist-info}/top_level.txt +0 -0
@@ -1,122 +0,0 @@
|
|
1
|
-
from janito.tools.adapters.local.adapter import register_local_tool
|
2
|
-
from .python_outline import parse_python_outline
|
3
|
-
from .markdown_outline import parse_markdown_outline
|
4
|
-
from janito.formatting import OutlineFormatter
|
5
|
-
from .java_outline import parse_java_outline
|
6
|
-
import os
|
7
|
-
from janito.tools.path_utils import expand_path
|
8
|
-
from janito.tools.tool_base import ToolBase, ToolPermissions
|
9
|
-
from janito.report_events import ReportAction
|
10
|
-
from janito.tools.tool_utils import display_path, pluralize
|
11
|
-
from janito.i18n import tr
|
12
|
-
|
13
|
-
from ..decorators import register_core_tool
|
14
|
-
from janito.tools.loop_protection_decorator import protect_against_loops
|
15
|
-
|
16
|
-
|
17
|
-
@register_core_tool
|
18
|
-
class GetFileOutline(ToolBase):
|
19
|
-
"""
|
20
|
-
Get an outline of a file's structure. Supports Python and Markdown files.
|
21
|
-
|
22
|
-
Args:
|
23
|
-
path (str): Path to the file to outline.
|
24
|
-
"""
|
25
|
-
|
26
|
-
permissions = ToolPermissions(read=True)
|
27
|
-
tool_name = "get_file_outline"
|
28
|
-
|
29
|
-
@protect_against_loops(max_calls=5, time_window=10.0, key_field="path")
|
30
|
-
def run(self, path: str) -> str:
|
31
|
-
try:
|
32
|
-
path = expand_path(path)
|
33
|
-
self.report_action(
|
34
|
-
tr(
|
35
|
-
"📄 Outline file '{disp_path}' ...",
|
36
|
-
disp_path=display_path(path),
|
37
|
-
),
|
38
|
-
ReportAction.READ,
|
39
|
-
)
|
40
|
-
ext = os.path.splitext(path)[1].lower()
|
41
|
-
with open(path, "r", encoding="utf-8", errors="replace") as f:
|
42
|
-
lines = f.readlines()
|
43
|
-
return self._outline_by_extension(ext, lines)
|
44
|
-
except Exception as e:
|
45
|
-
self.report_error(
|
46
|
-
tr("❌ Error reading file: {error}", error=e),
|
47
|
-
ReportAction.READ,
|
48
|
-
)
|
49
|
-
return tr("Error reading file: {error}", error=e)
|
50
|
-
|
51
|
-
def _outline_by_extension(self, ext, lines):
|
52
|
-
if ext == ".py":
|
53
|
-
outline_items = parse_python_outline(lines)
|
54
|
-
outline_type = "python"
|
55
|
-
table = OutlineFormatter.format_outline_table(outline_items)
|
56
|
-
self.report_success(
|
57
|
-
tr(
|
58
|
-
"✅ Outlined {count} {item_word}",
|
59
|
-
count=len(outline_items),
|
60
|
-
item_word=pluralize("item", len(outline_items)),
|
61
|
-
),
|
62
|
-
ReportAction.READ,
|
63
|
-
)
|
64
|
-
return (
|
65
|
-
tr(
|
66
|
-
"Outline: {count} items ({outline_type})\n",
|
67
|
-
count=len(outline_items),
|
68
|
-
outline_type=outline_type,
|
69
|
-
)
|
70
|
-
+ table
|
71
|
-
)
|
72
|
-
elif ext == ".md":
|
73
|
-
outline_items = parse_markdown_outline(lines)
|
74
|
-
outline_type = "markdown"
|
75
|
-
table = OutlineFormatter.format_markdown_outline_table(outline_items)
|
76
|
-
self.report_success(
|
77
|
-
tr(
|
78
|
-
"✅ Outlined {count} {item_word}",
|
79
|
-
count=len(outline_items),
|
80
|
-
item_word=pluralize("item", len(outline_items)),
|
81
|
-
),
|
82
|
-
ReportAction.READ,
|
83
|
-
)
|
84
|
-
return (
|
85
|
-
tr(
|
86
|
-
"Outline: {count} items ({outline_type})\n",
|
87
|
-
count=len(outline_items),
|
88
|
-
outline_type=outline_type,
|
89
|
-
)
|
90
|
-
+ table
|
91
|
-
)
|
92
|
-
elif ext == ".java":
|
93
|
-
outline_items = parse_java_outline(lines)
|
94
|
-
outline_type = "java"
|
95
|
-
table = OutlineFormatter.format_outline_table(outline_items)
|
96
|
-
self.report_success(
|
97
|
-
tr(
|
98
|
-
"✅ Outlined {count} {item_word}",
|
99
|
-
count=len(outline_items),
|
100
|
-
item_word=pluralize("item", len(outline_items)),
|
101
|
-
),
|
102
|
-
ReportAction.READ,
|
103
|
-
)
|
104
|
-
return (
|
105
|
-
tr(
|
106
|
-
"Outline: {count} items ({outline_type})\n",
|
107
|
-
count=len(outline_items),
|
108
|
-
outline_type=outline_type,
|
109
|
-
)
|
110
|
-
+ table
|
111
|
-
)
|
112
|
-
else:
|
113
|
-
outline_type = "default"
|
114
|
-
self.report_success(
|
115
|
-
tr("✅ Outlined {count} items", count=len(lines)),
|
116
|
-
ReportAction.READ,
|
117
|
-
)
|
118
|
-
return tr(
|
119
|
-
"Outline: {count} lines ({outline_type})\nFile has {count} lines.",
|
120
|
-
count=len(lines),
|
121
|
-
outline_type=outline_type,
|
122
|
-
)
|
@@ -1,47 +0,0 @@
|
|
1
|
-
import re
|
2
|
-
from typing import List, Dict
|
3
|
-
|
4
|
-
|
5
|
-
def parse_java_outline(lines: List[str]) -> List[Dict]:
|
6
|
-
"""
|
7
|
-
Parses Java source code lines and extracts classes and methods with their signatures.
|
8
|
-
Returns a list of outline items: {type, name, return_type, parameters, generics, line}
|
9
|
-
"""
|
10
|
-
outline = []
|
11
|
-
class_pattern = re.compile(r"\bclass\s+(\w+)(\s*<[^>]+>)?")
|
12
|
-
# Match methods with or without visibility modifiers (including package-private)
|
13
|
-
method_pattern = re.compile(
|
14
|
-
r"^(?:\s*(public|protected|private)\s+)?(?:static\s+)?([\w<>\[\]]+)\s+(\w+)\s*\(([^)]*)\)"
|
15
|
-
)
|
16
|
-
current_class = None
|
17
|
-
for idx, line in enumerate(lines, 1):
|
18
|
-
class_match = class_pattern.search(line)
|
19
|
-
if class_match:
|
20
|
-
class_name = class_match.group(1)
|
21
|
-
generics = class_match.group(2) or ""
|
22
|
-
outline.append(
|
23
|
-
{
|
24
|
-
"type": "class",
|
25
|
-
"name": class_name,
|
26
|
-
"generics": generics.strip("<>") if generics else None,
|
27
|
-
"line": idx,
|
28
|
-
}
|
29
|
-
)
|
30
|
-
current_class = class_name
|
31
|
-
else:
|
32
|
-
method_match = method_pattern.search(line)
|
33
|
-
if method_match:
|
34
|
-
return_type = method_match.group(2)
|
35
|
-
method_name = method_match.group(3)
|
36
|
-
params = method_match.group(4)
|
37
|
-
outline.append(
|
38
|
-
{
|
39
|
-
"type": "method",
|
40
|
-
"class": current_class,
|
41
|
-
"name": method_name,
|
42
|
-
"return_type": return_type,
|
43
|
-
"parameters": params.strip(),
|
44
|
-
"line": idx,
|
45
|
-
}
|
46
|
-
)
|
47
|
-
return outline
|
@@ -1,14 +0,0 @@
|
|
1
|
-
import re
|
2
|
-
from typing import List
|
3
|
-
|
4
|
-
|
5
|
-
def parse_markdown_outline(lines: List[str]):
|
6
|
-
header_pat = re.compile(r"^(#+)\s+(.*)")
|
7
|
-
outline = []
|
8
|
-
for idx, line in enumerate(lines):
|
9
|
-
match = header_pat.match(line)
|
10
|
-
if match:
|
11
|
-
level = len(match.group(1))
|
12
|
-
title = match.group(2).strip()
|
13
|
-
outline.append({"level": level, "title": title, "line": idx + 1})
|
14
|
-
return outline
|
@@ -1,303 +0,0 @@
|
|
1
|
-
import re
|
2
|
-
from typing import List
|
3
|
-
|
4
|
-
|
5
|
-
def handle_assignment(idx, assign_match, outline):
|
6
|
-
var_name = assign_match.group(2)
|
7
|
-
var_type = "const" if var_name.isupper() else "var"
|
8
|
-
outline.append(
|
9
|
-
{
|
10
|
-
"type": var_type,
|
11
|
-
"name": var_name,
|
12
|
-
"start": idx + 1,
|
13
|
-
"end": idx + 1,
|
14
|
-
"parent": "",
|
15
|
-
"docstring": "",
|
16
|
-
}
|
17
|
-
)
|
18
|
-
|
19
|
-
|
20
|
-
def handle_main(idx, outline):
|
21
|
-
outline.append(
|
22
|
-
{
|
23
|
-
"type": "main",
|
24
|
-
"name": "__main__",
|
25
|
-
"start": idx + 1,
|
26
|
-
"end": idx + 1,
|
27
|
-
"parent": "",
|
28
|
-
"docstring": "",
|
29
|
-
}
|
30
|
-
)
|
31
|
-
|
32
|
-
|
33
|
-
def close_stack_objects(idx, indent, stack, obj_ranges):
|
34
|
-
while stack and indent < stack[-1][2]:
|
35
|
-
popped = stack.pop()
|
36
|
-
obj_ranges.append((popped[0], popped[1], popped[3], idx, popped[4], popped[2]))
|
37
|
-
|
38
|
-
|
39
|
-
def close_last_top_obj(idx, last_top_obj, stack, obj_ranges):
|
40
|
-
if last_top_obj and last_top_obj in stack:
|
41
|
-
stack.remove(last_top_obj)
|
42
|
-
obj_ranges.append(
|
43
|
-
(
|
44
|
-
last_top_obj[0],
|
45
|
-
last_top_obj[1],
|
46
|
-
last_top_obj[3],
|
47
|
-
idx,
|
48
|
-
last_top_obj[4],
|
49
|
-
last_top_obj[2],
|
50
|
-
)
|
51
|
-
)
|
52
|
-
return None
|
53
|
-
return last_top_obj
|
54
|
-
|
55
|
-
|
56
|
-
def handle_class(idx, class_match, indent, stack, last_top_obj):
|
57
|
-
name = class_match.group(2)
|
58
|
-
parent = stack[-1][1] if stack and stack[-1][0] == "class" else ""
|
59
|
-
obj = ("class", name, indent, idx + 1, parent)
|
60
|
-
stack.append(obj)
|
61
|
-
if indent == 0:
|
62
|
-
last_top_obj = obj
|
63
|
-
return last_top_obj
|
64
|
-
|
65
|
-
|
66
|
-
def handle_function(idx, func_match, indent, stack, last_top_obj):
|
67
|
-
name = func_match.group(2)
|
68
|
-
parent = ""
|
69
|
-
for s in reversed(stack):
|
70
|
-
if s[0] == "class" and indent > s[2]:
|
71
|
-
parent = s[1]
|
72
|
-
break
|
73
|
-
obj = ("function", name, indent, idx + 1, parent)
|
74
|
-
stack.append(obj)
|
75
|
-
if indent == 0:
|
76
|
-
last_top_obj = obj
|
77
|
-
return last_top_obj
|
78
|
-
|
79
|
-
|
80
|
-
def process_line(idx, line, regexes, stack, obj_ranges, outline, last_top_obj):
|
81
|
-
class_pat, func_pat, assign_pat, main_pat = regexes
|
82
|
-
class_match = class_pat.match(line)
|
83
|
-
func_match = func_pat.match(line)
|
84
|
-
assign_match = assign_pat.match(line)
|
85
|
-
indent = len(line) - len(line.lstrip())
|
86
|
-
# If a new top-level class or function starts, close the previous one
|
87
|
-
if (class_match or func_match) and indent == 0 and last_top_obj:
|
88
|
-
last_top_obj = close_last_top_obj(idx, last_top_obj, stack, obj_ranges)
|
89
|
-
if class_match:
|
90
|
-
last_top_obj = handle_class(idx, class_match, indent, stack, last_top_obj)
|
91
|
-
elif func_match:
|
92
|
-
last_top_obj = handle_function(idx, func_match, indent, stack, last_top_obj)
|
93
|
-
elif assign_match and indent == 0:
|
94
|
-
handle_assignment(idx, assign_match, outline)
|
95
|
-
main_match = main_pat.match(line)
|
96
|
-
if main_match:
|
97
|
-
handle_main(idx, outline)
|
98
|
-
close_stack_objects(idx, indent, stack, obj_ranges)
|
99
|
-
return last_top_obj
|
100
|
-
|
101
|
-
|
102
|
-
def extract_signature_and_decorators(lines, start_idx):
|
103
|
-
"""
|
104
|
-
Extracts the signature line and leading decorators for a given function/class/method.
|
105
|
-
Returns (signature:str, decorators:List[str], signature_lineno:int)
|
106
|
-
"""
|
107
|
-
decorators = []
|
108
|
-
sig_line = None
|
109
|
-
sig_lineno = start_idx
|
110
|
-
for i in range(start_idx - 1, -1, -1):
|
111
|
-
striped = lines[i].strip()
|
112
|
-
if striped.startswith("@"):
|
113
|
-
decorators.insert(0, striped)
|
114
|
-
sig_lineno = i
|
115
|
-
elif not striped:
|
116
|
-
continue
|
117
|
-
else:
|
118
|
-
break
|
119
|
-
# Find the signature line itself
|
120
|
-
for k in range(start_idx, len(lines)):
|
121
|
-
striped = lines[k].strip()
|
122
|
-
if striped.startswith("def ") or striped.startswith("class "):
|
123
|
-
sig_line = striped
|
124
|
-
sig_lineno = k
|
125
|
-
break
|
126
|
-
return sig_line, decorators, sig_lineno
|
127
|
-
|
128
|
-
|
129
|
-
def extract_docstring(lines, start_idx, end_idx):
|
130
|
-
"""Extracts a docstring from lines[start_idx:end_idx] if present."""
|
131
|
-
for i in range(start_idx, min(end_idx, len(lines))):
|
132
|
-
line = lines[i].lstrip()
|
133
|
-
if not line:
|
134
|
-
continue
|
135
|
-
if line.startswith('"""') or line.startswith("'''"):
|
136
|
-
quote = line[:3]
|
137
|
-
doc = line[3:]
|
138
|
-
if doc.strip().endswith(quote):
|
139
|
-
return doc.strip()[:-3].strip()
|
140
|
-
docstring_lines = [doc]
|
141
|
-
for j in range(i + 1, min(end_idx, len(lines))):
|
142
|
-
line = lines[j]
|
143
|
-
if line.strip().endswith(quote):
|
144
|
-
docstring_lines.append(line.strip()[:-3])
|
145
|
-
return "\n".join([d.strip() for d in docstring_lines]).strip()
|
146
|
-
docstring_lines.append(line)
|
147
|
-
break
|
148
|
-
else:
|
149
|
-
break
|
150
|
-
return ""
|
151
|
-
|
152
|
-
|
153
|
-
def build_outline_entry(obj, lines, outline):
|
154
|
-
obj_type, name, start, end, parent, indent = obj
|
155
|
-
# Determine if this is a method
|
156
|
-
if obj_type == "function" and parent:
|
157
|
-
outline_type = "method"
|
158
|
-
elif obj_type == "function":
|
159
|
-
outline_type = "function"
|
160
|
-
else:
|
161
|
-
outline_type = obj_type
|
162
|
-
docstring = extract_docstring(lines, start, end)
|
163
|
-
outline.append(
|
164
|
-
{
|
165
|
-
"type": outline_type,
|
166
|
-
"name": name,
|
167
|
-
"start": start,
|
168
|
-
"end": end,
|
169
|
-
"parent": parent,
|
170
|
-
"docstring": docstring,
|
171
|
-
}
|
172
|
-
)
|
173
|
-
|
174
|
-
|
175
|
-
def process_lines(lines, regexes):
|
176
|
-
outline = []
|
177
|
-
stack = []
|
178
|
-
obj_ranges = []
|
179
|
-
last_top_obj = None
|
180
|
-
for idx, line in enumerate(lines):
|
181
|
-
last_top_obj = process_line(
|
182
|
-
idx, line, regexes, stack, obj_ranges, outline, last_top_obj
|
183
|
-
)
|
184
|
-
# Close any remaining open objects
|
185
|
-
for popped in stack:
|
186
|
-
obj_ranges.append(
|
187
|
-
(popped[0], popped[1], popped[3], len(lines), popped[4], popped[2])
|
188
|
-
)
|
189
|
-
return outline, obj_ranges
|
190
|
-
|
191
|
-
|
192
|
-
def build_outline(obj_ranges, lines, outline):
|
193
|
-
for obj in obj_ranges:
|
194
|
-
build_outline_entry(obj, lines, outline)
|
195
|
-
return outline
|
196
|
-
|
197
|
-
|
198
|
-
def parse_python_outline(lines: List[str]):
|
199
|
-
class_pat = re.compile(r"^(\s*)class\s+(\w+)")
|
200
|
-
func_pat = re.compile(r"^(\s*)def\s+(\w+)")
|
201
|
-
assign_pat = re.compile(r"^(\s*)([A-Za-z_][A-Za-z0-9_]*)\s*=.*")
|
202
|
-
main_pat = re.compile(r"^\s*if\s+__name__\s*==\s*[\'\"]__main__[\'\"]\s*:")
|
203
|
-
outline = []
|
204
|
-
stack = []
|
205
|
-
obj_ranges = []
|
206
|
-
last_top_obj = None
|
207
|
-
for idx, line in enumerate(lines):
|
208
|
-
class_match = class_pat.match(line)
|
209
|
-
func_match = func_pat.match(line)
|
210
|
-
assign_match = assign_pat.match(line)
|
211
|
-
indent = len(line) - len(line.lstrip())
|
212
|
-
parent = ""
|
213
|
-
for s in reversed(stack):
|
214
|
-
if s[0] == "class" and indent > s[2]:
|
215
|
-
parent = s[1]
|
216
|
-
break
|
217
|
-
if class_match:
|
218
|
-
obj = ("class", class_match.group(2), idx + 1, None, parent, indent)
|
219
|
-
stack.append(obj)
|
220
|
-
last_top_obj = obj
|
221
|
-
elif func_match:
|
222
|
-
obj = ("function", func_match.group(2), idx + 1, None, parent, indent)
|
223
|
-
stack.append(obj)
|
224
|
-
last_top_obj = obj
|
225
|
-
elif assign_match and indent == 0:
|
226
|
-
outline.append(
|
227
|
-
{
|
228
|
-
"type": "const" if assign_match.group(2).isupper() else "var",
|
229
|
-
"name": assign_match.group(2),
|
230
|
-
"start": idx + 1,
|
231
|
-
"end": idx + 1,
|
232
|
-
"parent": "",
|
233
|
-
"signature": line.strip(),
|
234
|
-
"decorators": [],
|
235
|
-
"docstring": "",
|
236
|
-
}
|
237
|
-
)
|
238
|
-
if line.strip().startswith("if __name__ == "):
|
239
|
-
outline.append(
|
240
|
-
{
|
241
|
-
"type": "main",
|
242
|
-
"name": "__main__",
|
243
|
-
"start": idx + 1,
|
244
|
-
"end": idx + 1,
|
245
|
-
"parent": "",
|
246
|
-
"signature": line.strip(),
|
247
|
-
"decorators": [],
|
248
|
-
"docstring": "",
|
249
|
-
}
|
250
|
-
)
|
251
|
-
# Close stack objects if indent falls back
|
252
|
-
while stack and indent <= stack[-1][5] and idx + 1 > stack[-1][2]:
|
253
|
-
finished = stack.pop()
|
254
|
-
outline_entry = finished[:2] + (
|
255
|
-
finished[2],
|
256
|
-
idx + 1,
|
257
|
-
finished[4],
|
258
|
-
finished[5],
|
259
|
-
)
|
260
|
-
build_outline_entry(outline_entry, lines, outline)
|
261
|
-
# Close any remaining objects
|
262
|
-
while stack:
|
263
|
-
finished = stack.pop()
|
264
|
-
outline_entry = finished[:2] + (
|
265
|
-
finished[2],
|
266
|
-
len(lines),
|
267
|
-
finished[4],
|
268
|
-
finished[5],
|
269
|
-
)
|
270
|
-
build_outline_entry(outline_entry, lines, outline)
|
271
|
-
return outline
|
272
|
-
|
273
|
-
class_pat = re.compile(r"^(\s*)class\s+(\w+)")
|
274
|
-
func_pat = re.compile(r"^(\s*)def\s+(\w+)")
|
275
|
-
assign_pat = re.compile(r"^(\s*)([A-Za-z_][A-Za-z0-9_]*)\s*=.*")
|
276
|
-
main_pat = re.compile(r"^\s*if\s+__name__\s*==\s*[\'\"]__main__[\'\"]\s*:")
|
277
|
-
regexes = (class_pat, func_pat, assign_pat, main_pat)
|
278
|
-
outline, obj_ranges = process_lines(lines, regexes)
|
279
|
-
return build_outline(obj_ranges, lines, outline)
|
280
|
-
|
281
|
-
|
282
|
-
def extract_docstring(lines, start_idx, end_idx):
|
283
|
-
"""Extracts a docstring from lines[start_idx:end_idx] if present."""
|
284
|
-
for i in range(start_idx, min(end_idx, len(lines))):
|
285
|
-
line = lines[i].lstrip()
|
286
|
-
if not line:
|
287
|
-
continue
|
288
|
-
if line.startswith('"""') or line.startswith("'''"):
|
289
|
-
quote = line[:3]
|
290
|
-
doc = line[3:]
|
291
|
-
if doc.strip().endswith(quote):
|
292
|
-
return doc.strip()[:-3].strip()
|
293
|
-
docstring_lines = [doc]
|
294
|
-
for j in range(i + 1, min(end_idx, len(lines))):
|
295
|
-
line = lines[j]
|
296
|
-
if line.strip().endswith(quote):
|
297
|
-
docstring_lines.append(line.strip()[:-3])
|
298
|
-
return "\n".join([d.strip() for d in docstring_lines]).strip()
|
299
|
-
docstring_lines.append(line)
|
300
|
-
break
|
301
|
-
else:
|
302
|
-
break
|
303
|
-
return ""
|
@@ -1,36 +0,0 @@
|
|
1
|
-
from janito.tools.tool_base import ToolBase, ToolPermissions
|
2
|
-
from janito.report_events import ReportAction
|
3
|
-
from janito.tools.loop_protection_decorator import protect_against_loops
|
4
|
-
|
5
|
-
|
6
|
-
class SearchOutlineTool(ToolBase):
|
7
|
-
"""
|
8
|
-
Tool for searching outlines in files.
|
9
|
-
|
10
|
-
Args:
|
11
|
-
path (str): Path to the file for which to generate an outline.
|
12
|
-
Returns:
|
13
|
-
str: Outline search result or status message.
|
14
|
-
"""
|
15
|
-
|
16
|
-
permissions = ToolPermissions(read=True)
|
17
|
-
tool_name = "search_outline"
|
18
|
-
|
19
|
-
@protect_against_loops(max_calls=5, time_window=10.0, key_field="path")
|
20
|
-
def run(self, path: str) -> str:
|
21
|
-
from janito.tools.tool_utils import display_path
|
22
|
-
from janito.i18n import tr
|
23
|
-
|
24
|
-
self.report_action(
|
25
|
-
tr(
|
26
|
-
"🔍 Searching for outline in '{disp_path}'",
|
27
|
-
disp_path=display_path(path),
|
28
|
-
),
|
29
|
-
ReportAction.READ,
|
30
|
-
)
|
31
|
-
# ... rest of implementation ...
|
32
|
-
# Example warnings and successes:
|
33
|
-
# self.report_warning(tr("No files found with supported extensions."))
|
34
|
-
# self.report_warning(tr("Error reading {path}: {error}", path=path, error=e))
|
35
|
-
# self.report_success(tr("✅ {count} {match_word} found", count=len(output), match_word=pluralize('match', len(output))))
|
36
|
-
pass
|
@@ -1,131 +0,0 @@
|
|
1
|
-
import os
|
2
|
-
from janito.tools.path_utils import expand_path
|
3
|
-
import shutil
|
4
|
-
from .decorators import register_core_tool
|
5
|
-
from janito.tools.tool_utils import display_path
|
6
|
-
from janito.tools.tool_base import ToolBase, ToolPermissions
|
7
|
-
from janito.report_events import ReportAction
|
8
|
-
from janito.i18n import tr
|
9
|
-
|
10
|
-
|
11
|
-
@register_core_tool
|
12
|
-
class MoveFile(ToolBase):
|
13
|
-
"""
|
14
|
-
Move a file or directory from src_path to dest_path.
|
15
|
-
|
16
|
-
Args:
|
17
|
-
src_path (str): Source file or directory path.
|
18
|
-
dest_path (str): Destination file or directory path.
|
19
|
-
overwrite (bool, optional): Whether to overwrite if the destination exists. Defaults to False.
|
20
|
-
backup (bool, optional): Deprecated. No backups are created anymore. This flag is ignored. Defaults to False.
|
21
|
-
Returns:
|
22
|
-
str: Status message indicating the result.
|
23
|
-
"""
|
24
|
-
|
25
|
-
permissions = ToolPermissions(read=True, write=True)
|
26
|
-
tool_name = "move_file"
|
27
|
-
|
28
|
-
def run(
|
29
|
-
self,
|
30
|
-
src_path: str,
|
31
|
-
dest_path: str,
|
32
|
-
overwrite: bool = False,
|
33
|
-
backup: bool = False,
|
34
|
-
) -> str:
|
35
|
-
src = expand_path(src_path)
|
36
|
-
dest = expand_path(dest_path)
|
37
|
-
original_src = src_path
|
38
|
-
original_dest = dest_path
|
39
|
-
disp_src = display_path(original_src)
|
40
|
-
disp_dest = display_path(original_dest)
|
41
|
-
backup_path = None
|
42
|
-
|
43
|
-
valid, is_src_file, is_src_dir, err_msg = self._validate_source(src, disp_src)
|
44
|
-
if not valid:
|
45
|
-
return err_msg
|
46
|
-
|
47
|
-
dest_result = self._handle_destination(dest, disp_dest, overwrite, backup)
|
48
|
-
if dest_result is not None:
|
49
|
-
backup_path, err_msg = dest_result
|
50
|
-
if err_msg:
|
51
|
-
return err_msg
|
52
|
-
|
53
|
-
try:
|
54
|
-
self.report_action(
|
55
|
-
tr(
|
56
|
-
"📝 Moving from '{disp_src}' to '{disp_dest}' ...",
|
57
|
-
disp_src=disp_src,
|
58
|
-
disp_dest=disp_dest,
|
59
|
-
),
|
60
|
-
ReportAction.UPDATE,
|
61
|
-
)
|
62
|
-
shutil.move(src, dest)
|
63
|
-
self.report_success(tr("✅ Move complete."))
|
64
|
-
msg = tr("✅ Move complete.")
|
65
|
-
|
66
|
-
return msg
|
67
|
-
except Exception as e:
|
68
|
-
self.report_error(tr("❌ Error moving: {error}", error=e))
|
69
|
-
return tr("❌ Error moving: {error}", error=e)
|
70
|
-
|
71
|
-
def _validate_source(self, src, disp_src):
|
72
|
-
if not os.path.exists(src):
|
73
|
-
self.report_error(
|
74
|
-
tr("❌ Source '{disp_src}' does not exist.", disp_src=disp_src)
|
75
|
-
)
|
76
|
-
return (
|
77
|
-
False,
|
78
|
-
False,
|
79
|
-
False,
|
80
|
-
tr("❌ Source '{disp_src}' does not exist.", disp_src=disp_src),
|
81
|
-
)
|
82
|
-
is_src_file = os.path.isfile(src)
|
83
|
-
is_src_dir = os.path.isdir(src)
|
84
|
-
if not (is_src_file or is_src_dir):
|
85
|
-
self.report_error(
|
86
|
-
tr(
|
87
|
-
"❌ Source path '{disp_src}' is neither a file nor a directory.",
|
88
|
-
disp_src=disp_src,
|
89
|
-
)
|
90
|
-
)
|
91
|
-
return (
|
92
|
-
False,
|
93
|
-
False,
|
94
|
-
False,
|
95
|
-
tr(
|
96
|
-
"❌ Source path '{disp_src}' is neither a file nor a directory.",
|
97
|
-
disp_src=disp_src,
|
98
|
-
),
|
99
|
-
)
|
100
|
-
return True, is_src_file, is_src_dir, None
|
101
|
-
|
102
|
-
def _handle_destination(self, dest, disp_dest, overwrite, backup):
|
103
|
-
backup_path = None
|
104
|
-
if os.path.exists(dest):
|
105
|
-
if not overwrite:
|
106
|
-
self.report_error(
|
107
|
-
tr(
|
108
|
-
"❗ Destination '{disp_dest}' exists and overwrite is False.",
|
109
|
-
disp_dest=disp_dest,
|
110
|
-
),
|
111
|
-
ReportAction.UPDATE,
|
112
|
-
)
|
113
|
-
return None, tr(
|
114
|
-
"❗ Destination '{disp_dest}' already exists and overwrite is False.",
|
115
|
-
disp_dest=disp_dest,
|
116
|
-
)
|
117
|
-
|
118
|
-
try:
|
119
|
-
if os.path.isfile(dest):
|
120
|
-
os.remove(dest)
|
121
|
-
elif os.path.isdir(dest):
|
122
|
-
shutil.rmtree(dest)
|
123
|
-
except Exception as e:
|
124
|
-
self.report_error(
|
125
|
-
tr("❌ Error removing destination before move: {error}", error=e),
|
126
|
-
ReportAction.UPDATE,
|
127
|
-
)
|
128
|
-
return None, tr(
|
129
|
-
"❌ Error removing destination before move: {error}", error=e
|
130
|
-
)
|
131
|
-
return backup_path, None
|