janito 3.2.0__py3-none-any.whl → 3.4.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.
Files changed (160) hide show
  1. janito/README.md +0 -3
  2. janito/cli/chat_mode/bindings.py +0 -26
  3. janito/cli/chat_mode/session.py +1 -12
  4. janito/cli/chat_mode/shell/commands/security/allowed_sites.py +33 -47
  5. janito/cli/cli_commands/list_plugins.py +43 -52
  6. janito/cli/core/getters.py +0 -3
  7. janito/cli/core/model_guesser.py +24 -40
  8. janito/cli/main_cli.py +12 -9
  9. janito/cli/prompt_core.py +9 -20
  10. janito/drivers/openai/driver.py +0 -1
  11. janito/drivers/zai/driver.py +0 -1
  12. janito/hello.txt +0 -0
  13. janito/i18n/it.py +46 -46
  14. janito/llm/agent.py +16 -32
  15. janito/llm/auth_utils.py +5 -14
  16. janito/llm/driver.py +0 -8
  17. janito/plugins/__init__.py +12 -31
  18. janito/plugins/auto_loader.py +11 -12
  19. janito/plugins/auto_loader_fixed.py +11 -12
  20. janito/{plugin_system → plugins}/base.py +2 -5
  21. janito/plugins/builtin.py +1 -15
  22. janito/plugins/core_adapter.py +11 -89
  23. janito/plugins/core_loader.py +120 -0
  24. janito/plugins/core_loader_fixed.py +125 -0
  25. janito/plugins/discovery.py +5 -5
  26. janito/plugins/discovery_core.py +9 -14
  27. janito/plugins/manager.py +1 -1
  28. janito/providers/__init__.py +0 -1
  29. janito/tools/__init__.py +7 -31
  30. janito/tools/adapters/__init__.py +1 -6
  31. janito/tools/adapters/local/__init__.py +70 -7
  32. janito/{plugins/tools → tools/adapters/local}/ask_user.py +3 -3
  33. janito/{plugins/tools → tools/adapters/local}/create_file.py +6 -6
  34. janito/{plugins/tools → tools/adapters/local}/fetch_url.py +3 -3
  35. janito/{plugins/tools → tools/adapters/local}/replace_text_in_file.py +4 -4
  36. janito/{plugins/tools → tools/adapters/local}/show_image.py +6 -15
  37. janito/{plugins/core/imagedisplay/tools → tools/adapters/local}/show_image_grid.py +5 -13
  38. janito/tools/function_adapter.py +65 -0
  39. janito/tools/loop_protection_decorator.py +117 -114
  40. {janito-3.2.0.dist-info → janito-3.4.0.dist-info}/METADATA +2 -1
  41. {janito-3.2.0.dist-info → janito-3.4.0.dist-info}/RECORD +85 -156
  42. janito/cli/cli_commands/check_tools.py +0 -212
  43. janito/llm/cancellation_manager.py +0 -63
  44. janito/llm/enter_cancellation.py +0 -107
  45. janito/plugin_system/__init__.py +0 -10
  46. janito/plugin_system/core_loader.py +0 -217
  47. janito/plugin_system/core_loader_fixed.py +0 -225
  48. janito/plugins/core/__init__.py +0 -7
  49. janito/plugins/core/codeanalyzer/__init__.py +0 -43
  50. janito/plugins/core/filemanager/__init__.py +0 -124
  51. janito/plugins/core/filemanager/tools/create_file.py +0 -87
  52. janito/plugins/core/filemanager/tools/replace_text_in_file.py +0 -270
  53. janito/plugins/core/imagedisplay/__init__.py +0 -14
  54. janito/plugins/core/imagedisplay/plugin.py +0 -51
  55. janito/plugins/core/imagedisplay/tools/__init__.py +0 -1
  56. janito/plugins/core/imagedisplay/tools/show_image.py +0 -83
  57. janito/plugins/core/system/__init__.py +0 -23
  58. janito/plugins/dev/__init__.py +0 -7
  59. janito/plugins/dev/pythondev/__init__.py +0 -37
  60. janito/plugins/dev/visualization/__init__.py +0 -23
  61. janito/plugins/example_plugin.py +0 -108
  62. janito/plugins/tools/__init__.py +0 -10
  63. janito/plugins/tools/copy_file.py +0 -87
  64. janito/plugins/tools/core_tools_plugin.py +0 -87
  65. janito/plugins/tools/create_directory.py +0 -70
  66. janito/plugins/tools/decorators.py +0 -19
  67. janito/plugins/tools/delete_text_in_file.py +0 -134
  68. janito/plugins/tools/find_files.py +0 -143
  69. janito/plugins/tools/get_file_outline/__init__.py +0 -7
  70. janito/plugins/tools/get_file_outline/core.py +0 -122
  71. janito/plugins/tools/get_file_outline/java_outline.py +0 -47
  72. janito/plugins/tools/get_file_outline/markdown_outline.py +0 -14
  73. janito/plugins/tools/get_file_outline/python_outline.py +0 -303
  74. janito/plugins/tools/get_file_outline/search_outline.py +0 -36
  75. janito/plugins/tools/move_file.py +0 -131
  76. janito/plugins/tools/open_html_in_browser.py +0 -51
  77. janito/plugins/tools/open_url.py +0 -37
  78. janito/plugins/tools/python_code_run.py +0 -172
  79. janito/plugins/tools/python_command_run.py +0 -171
  80. janito/plugins/tools/python_file_run.py +0 -172
  81. janito/plugins/tools/read_chart.py +0 -259
  82. janito/plugins/tools/read_files.py +0 -58
  83. janito/plugins/tools/remove_directory.py +0 -55
  84. janito/plugins/tools/remove_file.py +0 -58
  85. janito/plugins/tools/run_bash_command.py +0 -183
  86. janito/plugins/tools/run_powershell_command.py +0 -218
  87. janito/plugins/tools/search_text/__init__.py +0 -7
  88. janito/plugins/tools/search_text/core.py +0 -205
  89. janito/plugins/tools/search_text/match_lines.py +0 -67
  90. janito/plugins/tools/search_text/pattern_utils.py +0 -73
  91. janito/plugins/tools/search_text/traverse_directory.py +0 -145
  92. janito/plugins/tools/show_image_grid.py +0 -85
  93. janito/plugins/tools/validate_file_syntax/__init__.py +0 -7
  94. janito/plugins/tools/validate_file_syntax/core.py +0 -114
  95. janito/plugins/tools/validate_file_syntax/css_validator.py +0 -35
  96. janito/plugins/tools/validate_file_syntax/html_validator.py +0 -100
  97. janito/plugins/tools/validate_file_syntax/jinja2_validator.py +0 -50
  98. janito/plugins/tools/validate_file_syntax/js_validator.py +0 -27
  99. janito/plugins/tools/validate_file_syntax/json_validator.py +0 -6
  100. janito/plugins/tools/validate_file_syntax/markdown_validator.py +0 -109
  101. janito/plugins/tools/validate_file_syntax/ps1_validator.py +0 -32
  102. janito/plugins/tools/validate_file_syntax/python_validator.py +0 -5
  103. janito/plugins/tools/validate_file_syntax/xml_validator.py +0 -11
  104. janito/plugins/tools/validate_file_syntax/yaml_validator.py +0 -6
  105. janito/plugins/tools/view_file.py +0 -172
  106. janito/plugins/ui/__init__.py +0 -7
  107. janito/plugins/ui/userinterface/__init__.py +0 -16
  108. janito/plugins/ui/userinterface/tools/ask_user.py +0 -110
  109. janito/plugins/web/__init__.py +0 -7
  110. janito/plugins/web/webtools/__init__.py +0 -33
  111. janito/plugins/web/webtools/tools/fetch_url.py +0 -458
  112. janito/providers/together/__init__.py +0 -1
  113. janito/providers/together/model_info.py +0 -69
  114. janito/providers/together/provider.py +0 -108
  115. janito/tools/cli_initializer.py +0 -88
  116. janito/tools/initialize.py +0 -70
  117. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/copy_file.py +0 -0
  118. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/create_directory.py +0 -0
  119. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/delete_text_in_file.py +0 -0
  120. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/find_files.py +0 -0
  121. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/__init__.py +0 -0
  122. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/core.py +0 -0
  123. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/java_outline.py +0 -0
  124. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/markdown_outline.py +0 -0
  125. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/python_outline.py +0 -0
  126. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/get_file_outline/search_outline.py +0 -0
  127. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/move_file.py +0 -0
  128. /janito/{plugins/web/webtools/tools → tools/adapters/local}/open_html_in_browser.py +0 -0
  129. /janito/{plugins/web/webtools/tools → tools/adapters/local}/open_url.py +0 -0
  130. /janito/{plugins/dev/pythondev/tools → tools/adapters/local}/python_code_run.py +0 -0
  131. /janito/{plugins/dev/pythondev/tools → tools/adapters/local}/python_command_run.py +0 -0
  132. /janito/{plugins/dev/pythondev/tools → tools/adapters/local}/python_file_run.py +0 -0
  133. /janito/{plugins/dev/visualization/tools → tools/adapters/local}/read_chart.py +0 -0
  134. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/read_files.py +0 -0
  135. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/remove_directory.py +0 -0
  136. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/remove_file.py +0 -0
  137. /janito/{plugins/core/system/tools → tools/adapters/local}/run_bash_command.py +0 -0
  138. /janito/{plugins/core/system/tools → tools/adapters/local}/run_powershell_command.py +0 -0
  139. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/__init__.py +0 -0
  140. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/core.py +0 -0
  141. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/match_lines.py +0 -0
  142. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/pattern_utils.py +0 -0
  143. /janito/{plugins/core/codeanalyzer/tools → tools/adapters/local}/search_text/traverse_directory.py +0 -0
  144. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/__init__.py +0 -0
  145. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/core.py +0 -0
  146. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/css_validator.py +0 -0
  147. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/html_validator.py +0 -0
  148. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/jinja2_validator.py +0 -0
  149. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/js_validator.py +0 -0
  150. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/json_validator.py +0 -0
  151. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/markdown_validator.py +0 -0
  152. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/ps1_validator.py +0 -0
  153. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/python_validator.py +0 -0
  154. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/xml_validator.py +0 -0
  155. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/validate_file_syntax/yaml_validator.py +0 -0
  156. /janito/{plugins/core/filemanager/tools → tools/adapters/local}/view_file.py +0 -0
  157. {janito-3.2.0.dist-info → janito-3.4.0.dist-info}/WHEEL +0 -0
  158. {janito-3.2.0.dist-info → janito-3.4.0.dist-info}/entry_points.txt +0 -0
  159. {janito-3.2.0.dist-info → janito-3.4.0.dist-info}/licenses/LICENSE +0 -0
  160. {janito-3.2.0.dist-info → janito-3.4.0.dist-info}/top_level.txt +0 -0
janito/README.md CHANGED
@@ -106,9 +106,6 @@ janito --set model=kimi-k1-8k
106
106
 
107
107
  ## Advanced Features
108
108
 
109
- ### 🚀 New in v3.1.0: Enter Key Cancellation
110
- **Chat Mode Enhancement**: Press **Enter** at any time to instantly cancel long-running requests in interactive chat mode. No more waiting for stuck requests!
111
-
112
109
  ### Tool Usage
113
110
 
114
111
  Janito includes powerful built-in tools for:
@@ -35,30 +35,4 @@ class KeyBindingsFactory:
35
35
  buf.text = "Do It"
36
36
  buf.validate_and_handle()
37
37
 
38
- @bindings.add("c-c")
39
- def _(event):
40
- """Handle Ctrl+C to interrupt current request or exit chat."""
41
- # Use global cancellation manager for robust cancellation
42
- from janito.llm.cancellation_manager import get_cancellation_manager
43
-
44
- cancel_manager = get_cancellation_manager()
45
-
46
- cancelled = cancel_manager.cancel_current_request()
47
- if cancelled:
48
- # Provide user feedback
49
- from rich.console import Console
50
-
51
- console = Console()
52
- console.print("[red]Request cancelled by Ctrl+C[/red]")
53
-
54
- # Prevent the Ctrl+C from being processed as input
55
- event.app.output.flush()
56
- return
57
- else:
58
- # No active request to cancel, exit the chat
59
- from rich.console import Console
60
- console = Console()
61
- console.print("[yellow]Goodbye![/yellow]")
62
- event.app.exit()
63
-
64
38
  return bindings
@@ -22,7 +22,6 @@ import time
22
22
 
23
23
  # Shared prompt/agent factory
24
24
  from janito.cli.prompt_setup import setup_agent_and_prompt_handler
25
- from janito.llm.cancellation_manager import get_cancellation_manager
26
25
 
27
26
  import time
28
27
 
@@ -114,10 +113,6 @@ class ChatSession:
114
113
 
115
114
  # Check if multi-line mode should be enabled by default
116
115
  self.multi_line_mode = getattr(args, "multi", False) if args else False
117
-
118
- # Default to single-line mode (Enter submits) unless explicitly enabled
119
- if not self.multi_line_mode:
120
- self.multi_line_mode = False
121
116
 
122
117
  def _select_profile_and_role(self, args, role):
123
118
  profile, role_arg, python_profile, market_profile = self._extract_args(args)
@@ -288,13 +283,7 @@ class ChatSession:
288
283
  )
289
284
  )
290
285
 
291
- try:
292
- self._prompt_handler.run_prompt(cmd_input)
293
- finally:
294
- # Ensure cancellation manager is cleared
295
- cancel_manager = get_cancellation_manager()
296
- cancel_manager.clear_current_request()
297
-
286
+ self._prompt_handler.run_prompt(cmd_input)
298
287
  end_time = time.time()
299
288
  elapsed = end_time - start_time
300
289
  self.msg_count += 1
@@ -59,53 +59,39 @@ Examples:
59
59
  command = args[0].lower()
60
60
  whitelist_manager = get_url_whitelist_manager()
61
61
 
62
- handlers = {
63
- "list": self._handle_list,
64
- "add": self._handle_add,
65
- "remove": self._handle_remove,
66
- "clear": self._handle_clear,
67
- }
68
-
69
- handler = handlers.get(command)
70
- if handler:
71
- handler(args, whitelist_manager)
62
+ if command == "list":
63
+ sites = whitelist_manager.get_allowed_sites()
64
+ if sites:
65
+ print("Allowed sites:")
66
+ for site in sites:
67
+ print(f" • {site}")
68
+ else:
69
+ print("No sites are whitelisted (all sites are allowed)")
70
+
71
+ elif command == "add":
72
+ if len(args) < 2:
73
+ print("Error: Please specify a site to add")
74
+ return
75
+ site = args[1]
76
+ if whitelist_manager.add_allowed_site(site):
77
+ print(f"✅ Added '{site}' to allowed sites")
78
+ else:
79
+ print(f"ℹ️ '{site}' is already in allowed sites")
80
+
81
+ elif command == "remove":
82
+ if len(args) < 2:
83
+ print("Error: Please specify a site to remove")
84
+ return
85
+ site = args[1]
86
+ if whitelist_manager.remove_allowed_site(site):
87
+ print(f"✅ Removed '{site}' from allowed sites")
88
+ else:
89
+ print(f"ℹ️ '{site}' was not in allowed sites")
90
+
91
+ elif command == "clear":
92
+ whitelist_manager.clear_whitelist()
93
+ print("✅ Cleared all allowed sites (all sites are now allowed)")
94
+
72
95
  else:
73
96
  print(f"Error: Unknown command '{command}'")
74
97
  print(self.get_usage())
75
-
76
- def _handle_list(self, args, whitelist_manager):
77
- """Handle list command."""
78
- sites = whitelist_manager.get_allowed_sites()
79
- if sites:
80
- print("Allowed sites:")
81
- for site in sites:
82
- print(f" • {site}")
83
- else:
84
- print("No sites are whitelisted (all sites are allowed)")
85
-
86
- def _handle_add(self, args, whitelist_manager):
87
- """Handle add command."""
88
- if len(args) < 2:
89
- print("Error: Please specify a site to add")
90
- return
91
- site = args[1]
92
- if whitelist_manager.add_allowed_site(site):
93
- print(f"✅ Added '{site}' to allowed sites")
94
- else:
95
- print(f"ℹ️ '{site}' is already in allowed sites")
96
-
97
- def _handle_remove(self, args, whitelist_manager):
98
- """Handle remove command."""
99
- if len(args) < 2:
100
- print("Error: Please specify a site to remove")
101
- return
102
- site = args[1]
103
- if whitelist_manager.remove_allowed_site(site):
104
- print(f"✅ Removed '{site}' from allowed sites")
105
- else:
106
- print(f"ℹ️ '{site}' was not in allowed sites")
107
-
108
- def _handle_clear(self, args, whitelist_manager):
109
- """Handle clear command."""
110
- whitelist_manager.clear_whitelist()
111
- print("✅ Cleared all allowed sites (all sites are now allowed)")
@@ -8,11 +8,7 @@ from janito.plugins.discovery import list_available_plugins
8
8
  import os
9
9
  from janito.plugins.manager import PluginManager
10
10
  from janito.plugins.builtin import BuiltinPluginRegistry
11
- from janito.plugins.auto_loader_fixed import (
12
- load_core_plugins,
13
- get_loaded_core_plugins,
14
- is_core_plugin,
15
- )
11
+ from janito.plugins.auto_loader_fixed import load_core_plugins, get_loaded_core_plugins, is_core_plugin
16
12
  from rich.console import Console
17
13
  from rich.table import Table
18
14
  from rich.panel import Panel
@@ -55,8 +51,7 @@ def _list_available_plugins():
55
51
  console.print(table)
56
52
 
57
53
  # Show core plugins
58
- from janito.plugin_system.core_loader_fixed import get_core_plugins
59
-
54
+ from janito.plugins.core_loader_fixed import get_core_plugins
60
55
  core_plugins = get_core_plugins()
61
56
  core_table = Table(title="Core Plugins (Enabled by Default)")
62
57
  core_table.add_column("Plugin Name", style="cyan", no_wrap=True)
@@ -67,16 +62,14 @@ def _list_available_plugins():
67
62
 
68
63
  console.print(core_table)
69
64
  else:
70
- console.print(
71
- Panel(
72
- "No plugins found in search paths\n"
73
- f"[dim]Search paths:[/dim]\n"
74
- f" • {os.getcwd()}/plugins\n"
75
- f" {os.path.expanduser('~')}/.janito/plugins",
76
- title="No Plugins Found",
77
- style="yellow",
78
- )
79
- )
65
+ console.print(Panel(
66
+ "No plugins found in search paths\n"
67
+ f"[dim]Search paths:[/dim]\n"
68
+ f" {os.getcwd()}/plugins\n"
69
+ f" • {os.path.expanduser('~')}/.janito/plugins",
70
+ title="No Plugins Found",
71
+ style="yellow"
72
+ ))
80
73
 
81
74
 
82
75
  def _print_builtin_plugins(builtin_plugins):
@@ -99,7 +92,7 @@ def _print_external_plugins(available, builtin_plugins):
99
92
  def _list_plugin_resources():
100
93
  """List all resources from loaded plugins using rich formatting."""
101
94
  from janito.plugins.auto_loader_fixed import get_plugin_manager
102
-
95
+
103
96
  console = Console()
104
97
  manager = get_plugin_manager()
105
98
  all_resources = manager.list_all_resources()
@@ -107,11 +100,11 @@ def _list_plugin_resources():
107
100
  if all_resources:
108
101
  for plugin_name, resources in all_resources.items():
109
102
  metadata = manager.get_plugin_metadata(plugin_name)
110
- version = metadata.version if metadata else "unknown"
111
-
103
+ version = metadata.version if metadata else 'unknown'
104
+
112
105
  # Create panel for each plugin
113
106
  panel_content = []
114
-
107
+
115
108
  tools = [r for r in resources if r["type"] == "tool"]
116
109
  commands = [r for r in resources if r["type"] == "command"]
117
110
  configs = [r for r in resources if r["type"] == "config"]
@@ -129,25 +122,19 @@ def _list_plugin_resources():
129
122
  if configs:
130
123
  panel_content.append("[bold yellow]Configuration:[/bold yellow]")
131
124
  for config in configs:
132
- panel_content.append(
133
- f" • {config['name']}: {config['description']}"
134
- )
135
-
136
- console.print(
137
- Panel(
138
- "\n".join(panel_content),
139
- title=f"{plugin_name} v{version}",
140
- style="cyan",
141
- )
142
- )
125
+ panel_content.append(f" • {config['name']}: {config['description']}")
126
+
127
+ console.print(Panel(
128
+ "\n".join(panel_content),
129
+ title=f"{plugin_name} v{version}",
130
+ style="cyan"
131
+ ))
143
132
  else:
144
- console.print(
145
- Panel(
146
- "No plugins are currently loaded.",
147
- title="No Plugin Resources",
148
- style="yellow",
149
- )
150
- )
133
+ console.print(Panel(
134
+ "No plugins are currently loaded.",
135
+ title="No Plugin Resources",
136
+ style="yellow"
137
+ ))
151
138
 
152
139
 
153
140
  def _print_resources_by_type(resources):
@@ -175,7 +162,7 @@ def _print_resources_by_type(resources):
175
162
  def _list_loaded_plugins():
176
163
  """List loaded plugins using rich formatting."""
177
164
  from janito.plugins.auto_loader_fixed import get_plugin_manager
178
-
165
+
179
166
  console = Console()
180
167
  manager = get_plugin_manager()
181
168
  loaded = manager.list_plugins()
@@ -190,38 +177,42 @@ def _list_loaded_plugins():
190
177
 
191
178
  core_plugins = []
192
179
  other_plugins = []
193
-
180
+
194
181
  for plugin_name in loaded:
195
182
  if is_core_plugin(plugin_name):
196
183
  core_plugins.append(plugin_name)
197
184
  else:
198
185
  other_plugins.append(plugin_name)
199
-
186
+
200
187
  # Add core plugins
201
188
  for plugin_name in core_plugins:
202
189
  metadata = manager.get_plugin_metadata(plugin_name)
203
190
  if metadata:
204
191
  table.add_row(
205
- metadata.name, metadata.version, metadata.description, "🔵 Core"
192
+ metadata.name,
193
+ metadata.version,
194
+ metadata.description,
195
+ "🔵 Core"
206
196
  )
207
-
197
+
208
198
  # Add other plugins
209
199
  for plugin_name in other_plugins:
210
200
  metadata = manager.get_plugin_metadata(plugin_name)
211
201
  if metadata:
212
202
  table.add_row(
213
- metadata.name, metadata.version, metadata.description, "🔶 External"
203
+ metadata.name,
204
+ metadata.version,
205
+ metadata.description,
206
+ "🔶 External"
214
207
  )
215
208
 
216
209
  console.print(table)
217
210
  else:
218
- console.print(
219
- Panel(
220
- "No plugins are currently loaded.",
221
- title="No Plugins Loaded",
222
- style="yellow",
223
- )
224
- )
211
+ console.print(Panel(
212
+ "No plugins are currently loaded.",
213
+ title="No Plugins Loaded",
214
+ style="yellow"
215
+ ))
225
216
 
226
217
 
227
218
  def _print_plugin_details(manager, plugin_name):
@@ -5,7 +5,6 @@ import sys
5
5
  from janito.cli.cli_commands.list_providers import handle_list_providers
6
6
  from janito.cli.cli_commands.list_models import handle_list_models
7
7
  from janito.cli.cli_commands.list_tools import handle_list_tools
8
- from janito.cli.cli_commands.check_tools import handle_check_tools
9
8
  from janito.cli.cli_commands.show_config import handle_show_config
10
9
  from janito.cli.cli_commands.list_config import handle_list_config
11
10
  from janito.cli.cli_commands.list_drivers import handle_list_drivers
@@ -29,7 +28,6 @@ GETTER_KEYS = [
29
28
  "list_plugins",
30
29
  "list_plugins_available",
31
30
  "list_resources",
32
- "check_tools",
33
31
  ]
34
32
 
35
33
 
@@ -66,7 +64,6 @@ def handle_getter(args, config_mgr=None):
66
64
  "list_plugins": partial(handle_list_plugins, args),
67
65
  "list_plugins_available": partial(handle_list_plugins, args),
68
66
  "list_resources": partial(handle_list_plugins, args),
69
- "check_tools": partial(handle_check_tools, args),
70
67
  }
71
68
  for arg in GETTER_KEYS:
72
69
  if getattr(args, arg, False) and arg in GETTER_DISPATCH:
@@ -21,50 +21,34 @@ def guess_provider_from_model(model_name: str) -> str:
21
21
  model_name = model_name.lower()
22
22
 
23
23
  # Check each provider's models
24
- return _find_provider_for_model(model_name)
25
-
26
-
27
- def _find_provider_for_model(model_name: str) -> str:
28
- """Find provider for given model name."""
29
24
  for provider_name in LLMProviderRegistry.list_providers():
30
25
  provider_class = LLMProviderRegistry.get(provider_name)
31
26
  if not provider_class:
32
27
  continue
33
28
 
34
- if _check_provider_models(provider_name, provider_class, model_name):
35
- return provider_name
29
+ # Get model specs for this provider
30
+ try:
31
+ if hasattr(provider_class, "MODEL_SPECS"):
32
+ model_specs = provider_class.MODEL_SPECS
33
+ for spec_model_name in model_specs.keys():
34
+ if spec_model_name.lower() == model_name:
35
+ return provider_name
36
+
37
+ # Handle special cases like moonshot
38
+ if provider_name == "moonshot":
39
+ try:
40
+ from janito.providers.moonshot.model_info import (
41
+ MOONSHOT_MODEL_SPECS,
42
+ )
43
+
44
+ for spec_model_name in MOONSHOT_MODEL_SPECS.keys():
45
+ if spec_model_name.lower() == model_name:
46
+ return "moonshot"
47
+ except ImportError:
48
+ pass
49
+
50
+ except Exception:
51
+ # Skip providers that have issues accessing model specs
52
+ continue
36
53
 
37
54
  return None
38
-
39
-
40
- def _check_provider_models(provider_name: str, provider_class, model_name: str) -> bool:
41
- """Check if provider has matching model."""
42
- try:
43
- if hasattr(provider_class, "MODEL_SPECS"):
44
- model_specs = provider_class.MODEL_SPECS
45
- for spec_model_name in model_specs.keys():
46
- if spec_model_name.lower() == model_name:
47
- return True
48
-
49
- # Handle special cases like moonshot
50
- if provider_name == "moonshot":
51
- return _check_moonshot_models(model_name)
52
-
53
- except Exception:
54
- # Skip providers that have issues accessing model specs
55
- pass
56
-
57
- return False
58
-
59
-
60
- def _check_moonshot_models(model_name: str) -> bool:
61
- """Check moonshot models specifically."""
62
- try:
63
- from janito.providers.moonshot.model_info import MOONSHOT_MODEL_SPECS
64
-
65
- for spec_model_name in MOONSHOT_MODEL_SPECS.keys():
66
- if spec_model_name.lower() == model_name:
67
- return True
68
- except ImportError:
69
- pass
70
- return False
janito/cli/main_cli.py CHANGED
@@ -238,13 +238,6 @@ definition = [
238
238
  "help": "List all resources (tools, commands, config) from loaded plugins",
239
239
  },
240
240
  ),
241
- (
242
- ["--check-tools"],
243
- {
244
- "action": "store_true",
245
- "help": "Check all registered tools for signature validation and availability",
246
- },
247
- ),
248
241
  ]
249
242
 
250
243
  MODIFIER_KEYS = [
@@ -276,7 +269,18 @@ GETTER_KEYS = [
276
269
  "region_info",
277
270
  "list_providers_region",
278
271
  "ping",
279
- "check_tools",
272
+ ]
273
+ GETTER_KEYS = [
274
+ "show_config",
275
+ "list_providers",
276
+ "list_profiles",
277
+ "list_models",
278
+ "list_tools",
279
+ "list_config",
280
+ "list_drivers",
281
+ "region_info",
282
+ "list_providers_region",
283
+ "ping",
280
284
  ]
281
285
 
282
286
 
@@ -402,7 +406,6 @@ class JanitoCLI:
402
406
  or self.args.list_plugins_available
403
407
  or self.args.list_resources
404
408
  or self.args.ping
405
- or self.args.check_tools
406
409
  ):
407
410
  self._maybe_print_verbose_provider_model()
408
411
  handle_getter(self.args)
janito/cli/prompt_core.py CHANGED
@@ -207,26 +207,15 @@ class PromptHandler:
207
207
  """
208
208
  try:
209
209
  self._print_verbose_debug("Calling agent.chat()...")
210
-
211
- # Use global cancellation manager
212
- from janito.llm.cancellation_manager import get_cancellation_manager
213
-
214
- cancel_manager = get_cancellation_manager()
215
- driver_cancel_event = cancel_manager.start_new_request()
216
-
217
- try:
218
- final_event = self.agent.chat(prompt=user_prompt)
219
- if hasattr(self.agent, "set_latest_event"):
220
- self.agent.set_latest_event(final_event)
221
- self.agent.last_event = final_event
222
- self._print_verbose_debug(f"agent.chat() returned: {final_event}")
223
- self._print_verbose_final_event(final_event)
224
- if on_event and final_event is not None:
225
- on_event(final_event)
226
- global_event_bus.publish(final_event)
227
- finally:
228
- cancel_manager.clear_current_request()
229
-
210
+ final_event = self.agent.chat(prompt=user_prompt)
211
+ if hasattr(self.agent, "set_latest_event"):
212
+ self.agent.set_latest_event(final_event)
213
+ self.agent.last_event = final_event
214
+ self._print_verbose_debug(f"agent.chat() returned: {final_event}")
215
+ self._print_verbose_final_event(final_event)
216
+ if on_event and final_event is not None:
217
+ on_event(final_event)
218
+ global_event_bus.publish(final_event)
230
219
  except KeyboardInterrupt:
231
220
  # Capture user interrupt / cancellation
232
221
  self.console.print("[red]Interrupted by the user.[/red]")
@@ -181,7 +181,6 @@ class OpenAIModelDriver(LLMDriver):
181
181
  is_insufficient_quota = (
182
182
  "insufficient_quota" in lower_err
183
183
  or "exceeded your current quota" in lower_err
184
- or "exceeded_current_quota_error" in lower_err
185
184
  )
186
185
  is_rate_limit = (
187
186
  status_code == 429
@@ -174,7 +174,6 @@ class ZAIModelDriver(LLMDriver):
174
174
  is_insufficient_quota = (
175
175
  "insufficient_quota" in lower_err
176
176
  or "exceeded your current quota" in lower_err
177
- or "exceeded_current_quota_error" in lower_err
178
177
  )
179
178
  is_rate_limit = (
180
179
  status_code == 429
janito/hello.txt ADDED
File without changes
janito/i18n/it.py CHANGED
@@ -1,46 +1,46 @@
1
- # pragma: allowlist secret
2
- translations = {
3
- "36107ed78ab25f6fb12ad8ce13018cd1ce6735d1": "Avvio del server web...",
4
- "70a0d194687568a47aa617fd85036ace1e69a982": "Vuoi davvero uscire? (s/n): ",
5
- "5c9ebcbbd7632ecb328bd52958b17158afaa32c6": "F12 = Azione Rapida (segue l'azione raccomandata)",
6
- "fe21121e2934234b68d19b2757532117d440c1e3": "Chiave API non trovata. Si prega di configurare 'api_key' nel file di configurazione.",
7
- "c9e3759b1756eba35b381ce2b72cd659e132b01f": "Ciao, {name}!",
8
- "ca1fee2f55baabdc2e4b0e9529c89ee024e62079": "Nessun prompt fornito nei messaggi",
9
- "f7449d23d0c500ae2a0b31e04f92b47a4d8ae845": "max_tokens deve essere un intero, ricevuto: {resolved_max_tokens!r}",
10
- "70a9ed8edb6da12e208431a31aa16ba54419b26f": "Risposta non valida/malformed da OpenAI (tentativo {attempt}/{max_retries}). Riprovo tra {wait_time} secondi...",
11
- "a873085e3b06184fb5d27e842f97b06b6190976d": "Numero massimo di tentativi per risposta non valida raggiunto. Generazione errore.",
12
- "66a34568bbe846bb1bde3619eb4d6dfa10211104": "L'API non supporta l'uso degli strumenti.",
13
- "09b81476b75586da4116b83f8be70d77b174cec3": "Limit di richieste API OpenAI (429) (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
14
- "5717a35dd2a1533fb7e15edc8c9329cb69f3410b": "Errore server API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
15
- "02e760ba15ed863176c1290ac8a9b923963103cd": "Errore client API OpenAI {status_code}: {e}. Nessun nuovo tentativo.",
16
- "2e52b0bbc8f16226b70e3e20f95c9245d2bcdb47": "Errore API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
17
- "012cc970e039fdd79c452fc676202c814ffc76ae": "Numero massimo di tentativi per errore API OpenAI raggiunto. Generazione errore.",
18
- "d0438e45667d31e0022b2497b5901cd4300f084b": "QueuedMessageHandler.handle_message si aspetta un dizionario con 'type' e 'message', ricevuto {msg_type}: {msg!r}",
19
- "9d3460187ffa19c7c8a4020157072b1087e1bd2f": "[QueuedMessageHandler] {msg_type}: {msg}",
20
- "3813833343430e8afa8fce33385c5e39fb24dd60": "[QueuedMessageHandler] {msg_type}: {message}",
21
- "0be9a22226e16a40797010d23a0f581542dca40e": "[ToolExecutor] {tool_name} chiamato con argomenti: {args}",
22
- "42c68edcb25442f518b1af77c6a2ddc07461aae0": "[ToolExecutor] Motivo chiamata: {tool_call_reason}",
23
- "002ff598115d84595ffeee6219cb5c03d3a1d4a6": "Domanda",
24
- "35747d13dcd91e8e8790c7f767d5ed764f541b9e": "procedi",
25
- "33dde3a1afbc418768a69fa53168d9b0638fe1aa": "avanti",
26
- "eee0bbba4ff92adbeb038a77df0466d660f15716": "continua",
27
- "edee9402d198b04ac77dcf5dc9cc3dac44573782": "prossimo",
28
- "8fdb7e2fa84f4faf0d9b92f466df424ec47a165b": "ok",
29
- "5f8f924671cda79b5205a6bf1b776f347c4a7a07": "Opzioni di configurazione disponibili:\n",
30
- "cef780a309cd234750764d42697882c24168ddab": "{key:15} {desc} (predefinito: {default})",
31
- "68c2cc7f0ceaa3e499ecb4db331feb4debbbcc23": "Modello",
32
- "c3f104d1365744b538bfde9f4adb6a6df4b80355": "Funzione",
33
- "99a0efc6cfd85d8ff2732a6718140f822cb90472": "Stile",
34
- "f1702b4686278becffc88baabe6f4b7a8355532c": "Messaggi",
35
- "c38c6c1f3a2743f8626703abb302e403d20ff81c": "Token",
36
- "a817d7eb8e0f1dab755ab5203a082e5c3c094fce": "Prompt",
37
- "2ff255684a2277f806fcebf3fe338ed27857f350": "Completamento",
38
- "b25928c69902557b0ef0a628490a3a1768d7b82f": "Totale",
39
- "76e63d65c883ed50df40ac3aeef0c2d6a1c4ad60": "Azione Rapida",
40
- "5397e0583f14f6c88de06b1ef28f460a1fb5b0ae": "Sì",
41
- "816c52fd2bdd94a63cd0944823a6c0aa9384c103": "No",
42
- "c47ae15370cfe1ed2781eedc1dc2547d12d9e972": "Aiuto",
43
- "cc3dbd47e1cf9003a55d3366b3adbcd72275e525": "Nuovo Task",
44
- "efa5a8b84e1afe65c81ecfce28c398c48f19ddc2": "Benvenuto su Janito{version_str}! Modalità chat attiva. Digita /exit per uscire.",
45
- "b314d6e1460f86e0f21abc5aceb7935a2a0667e8": "Benvenuto su Janito{version_str} in modalità [white on magenta]VANILLA[/white on magenta]! Strumenti, prompt di sistema e temperatura sono disattivati, a meno che non siano sovrascritti.",
46
- }
1
+ # pragma: allowlist secret
2
+ translations = {
3
+ "36107ed78ab25f6fb12ad8ce13018cd1ce6735d1": "Avvio del server web...",
4
+ "70a0d194687568a47aa617fd85036ace1e69a982": "Vuoi davvero uscire? (s/n): ",
5
+ "5c9ebcbbd7632ecb328bd52958b17158afaa32c6": "F12 = Azione Rapida (segue l'azione raccomandata)",
6
+ "fe21121e2934234b68d19b2757532117d440c1e3": "Chiave API non trovata. Si prega di configurare 'api_key' nel file di configurazione.",
7
+ "c9e3759b1756eba35b381ce2b72cd659e132b01f": "Ciao, {name}!",
8
+ "ca1fee2f55baabdc2e4b0e9529c89ee024e62079": "Nessun prompt fornito nei messaggi",
9
+ "f7449d23d0c500ae2a0b31e04f92b47a4d8ae845": "max_tokens deve essere un intero, ricevuto: {resolved_max_tokens!r}",
10
+ "70a9ed8edb6da12e208431a31aa16ba54419b26f": "Risposta non valida/malformed da OpenAI (tentativo {attempt}/{max_retries}). Riprovo tra {wait_time} secondi...",
11
+ "a873085e3b06184fb5d27e842f97b06b6190976d": "Numero massimo di tentativi per risposta non valida raggiunto. Generazione errore.",
12
+ "66a34568bbe846bb1bde3619eb4d6dfa10211104": "L'API non supporta l'uso degli strumenti.",
13
+ "09b81476b75586da4116b83f8be70d77b174cec3": "Limite di richieste API OpenAI (429) (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
14
+ "5717a35dd2a1533fb7e15edc8c9329cb69f3410b": "Errore server API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
15
+ "02e760ba15ed863176c1290ac8a9b923963103cd": "Errore client API OpenAI {status_code}: {e}. Nessun nuovo tentativo.",
16
+ "2e52b0bbc8f16226b70e3e20f95c9245d2bcdb47": "Errore API OpenAI (tentativo {attempt}/{max_retries}): {e}. Riprovo tra {wait_time} secondi...",
17
+ "012cc970e039fdd79c452fc676202c814ffc76ae": "Numero massimo di tentativi per errore API OpenAI raggiunto. Generazione errore.",
18
+ "d0438e45667d31e0022b2497b5901cd4300f084b": "QueuedMessageHandler.handle_message si aspetta un dizionario con 'type' e 'message', ricevuto {msg_type}: {msg!r}",
19
+ "9d3460187ffa19c7c8a4020157072b1087e1bd2f": "[QueuedMessageHandler] {msg_type}: {msg}",
20
+ "3813833343430e8afa8fce33385c5e39fb24dd60": "[QueuedMessageHandler] {msg_type}: {message}",
21
+ "0be9a22226e16a40797010d23a0f581542dca40e": "[ToolExecutor] {tool_name} chiamato con argomenti: {args}",
22
+ "42c68edcb25442f518b1af77c6a2ddc07461aae0": "[ToolExecutor] Motivo chiamata: {tool_call_reason}",
23
+ "002ff598115d84595ffeee6219cb5c03d3a1d4a6": "Domanda",
24
+ "35747d13dcd91e8e8790c7f767d5ed764f541b9e": "procedi",
25
+ "33dde3a1afbc418768a69fa53168d9b0638fe1aa": "avanti",
26
+ "eee0bbba4ff92adbeb038a77df0466d660f15716": "continua",
27
+ "edee9402d198b04ac77dcf5dc9cc3dac44573782": "prossimo",
28
+ "8fdb7e2fa84f4faf0d9b92f466df424ec47a165b": "ok",
29
+ "5f8f924671cda79b5205a6bf1b776f347c4a7a07": "Opzioni di configurazione disponibili:\n",
30
+ "cef780a309cd234750764d42697882c24168ddab": "{key:15} {desc} (predefinito: {default})",
31
+ "68c2cc7f0ceaa3e499ecb4db331feb4debbbcc23": "Modello",
32
+ "c3f104d1365744b538bfde9f4adb6a6df4b80355": "Funzione",
33
+ "99a0efc6cfd85d8ff2732a6718140f822cb90472": "Stile",
34
+ "f1702b4686278becffc88baabe6f4b7a8355532c": "Messaggi",
35
+ "c38c6c1f3a2743f8626703abb302e403d20ff81c": "Token",
36
+ "a817d7eb8e0f1dab755ab5203a082e5c3c094fce": "Prompt",
37
+ "2ff255684a2277f806fcebf3fe338ed27857f350": "Completamento",
38
+ "b25928c69902557b0ef0a628490a3a1768d7b82f": "Totale",
39
+ "76e63d65c883ed50df40ac3aeef0c2d6a1c4ad60": "Azione Rapida",
40
+ "5397e0583f14f6c88de06b1ef28f460a1fb5b0ae": "Sì",
41
+ "816c52fd2bdd94a63cd0944823a6c0aa9384c103": "No",
42
+ "c47ae15370cfe1ed2781eedc1dc2547d12d9e972": "Aiuto",
43
+ "cc3dbd47e1cf9003a55d3366b3adbcd72275e525": "Nuovo Task",
44
+ "efa5a8b84e1afe65c81ecfce28c398c48f19ddc2": "Benvenuto su Janito{version_str}! Modalità chat attiva. Digita /exit per uscire.",
45
+ "b314d6e1460f86e0f21abc5aceb7935a2a0667e8": "Benvenuto su Janito{version_str} in modalità [white on magenta]VANILLA[/white on magenta]! Strumenti, prompt di sistema e temperatura sono disattivati, a meno che non siano sovrascritti.",
46
+ }