janito 3.5.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 +1 -4
- 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/core/getters.py +0 -3
- janito/cli/core/model_guesser.py +24 -40
- janito/cli/main_cli.py +12 -9
- janito/cli/prompt_core.py +9 -47
- janito/cli/rich_terminal_reporter.py +2 -2
- janito/docs/GETTING_STARTED.md +1 -1
- 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 +11 -0
- janito/tools/__init__.py +7 -31
- janito/tools/adapters/__init__.py +1 -6
- janito/tools/adapters/local/__init__.py +70 -7
- janito/{plugins/tools → tools/adapters/local}/ask_user.py +3 -3
- janito/{plugins/tools → tools/adapters/local}/create_file.py +6 -6
- janito/{plugins/tools → tools/adapters/local}/fetch_url.py +3 -3
- janito/{plugins/tools → tools/adapters/local}/python_code_run.py +7 -23
- janito/{plugins/tools → tools/adapters/local}/python_command_run.py +5 -21
- janito/{plugins/tools → tools/adapters/local}/python_file_run.py +5 -21
- janito/{plugins/tools → tools/adapters/local}/replace_text_in_file.py +4 -4
- janito/{plugins/tools → tools/adapters/local}/run_bash_command.py +3 -3
- janito/{plugins/tools → tools/adapters/local}/run_powershell_command.py +3 -3
- janito/{plugins/tools → tools/adapters/local}/show_image.py +6 -15
- janito/{plugins/core/imagedisplay/tools → tools/adapters/local}/show_image_grid.py +5 -13
- 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.5.1.dist-info → janito-3.7.0.dist-info}/RECORD +88 -157
- janito/cli/cli_commands/check_tools.py +0 -212
- 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/create_file.py +0 -87
- janito/plugins/core/filemanager/tools/replace_text_in_file.py +0 -270
- 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 -10
- janito/plugins/tools/copy_file.py +0 -87
- janito/plugins/tools/core_tools_plugin.py +0 -87
- janito/plugins/tools/create_directory.py +0 -70
- janito/plugins/tools/decorators.py +0 -19
- janito/plugins/tools/delete_text_in_file.py +0 -134
- janito/plugins/tools/find_files.py +0 -143
- janito/plugins/tools/get_file_outline/__init__.py +0 -7
- janito/plugins/tools/get_file_outline/core.py +0 -122
- janito/plugins/tools/get_file_outline/java_outline.py +0 -47
- janito/plugins/tools/get_file_outline/markdown_outline.py +0 -14
- janito/plugins/tools/get_file_outline/python_outline.py +0 -303
- janito/plugins/tools/get_file_outline/search_outline.py +0 -36
- janito/plugins/tools/move_file.py +0 -131
- janito/plugins/tools/open_html_in_browser.py +0 -51
- janito/plugins/tools/open_url.py +0 -37
- janito/plugins/tools/read_chart.py +0 -259
- janito/plugins/tools/read_files.py +0 -58
- janito/plugins/tools/remove_directory.py +0 -55
- janito/plugins/tools/remove_file.py +0 -58
- janito/plugins/tools/search_text/__init__.py +0 -7
- janito/plugins/tools/search_text/core.py +0 -205
- janito/plugins/tools/search_text/match_lines.py +0 -67
- janito/plugins/tools/search_text/pattern_utils.py +0 -73
- janito/plugins/tools/search_text/traverse_directory.py +0 -145
- janito/plugins/tools/show_image_grid.py +0 -85
- janito/plugins/tools/validate_file_syntax/__init__.py +0 -7
- janito/plugins/tools/validate_file_syntax/core.py +0 -114
- janito/plugins/tools/validate_file_syntax/css_validator.py +0 -35
- janito/plugins/tools/validate_file_syntax/html_validator.py +0 -100
- janito/plugins/tools/validate_file_syntax/jinja2_validator.py +0 -50
- janito/plugins/tools/validate_file_syntax/js_validator.py +0 -27
- janito/plugins/tools/validate_file_syntax/json_validator.py +0 -6
- janito/plugins/tools/validate_file_syntax/markdown_validator.py +0 -109
- janito/plugins/tools/validate_file_syntax/ps1_validator.py +0 -32
- janito/plugins/tools/validate_file_syntax/python_validator.py +0 -5
- janito/plugins/tools/validate_file_syntax/xml_validator.py +0 -11
- janito/plugins/tools/validate_file_syntax/yaml_validator.py +0 -6
- janito/plugins/tools/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 -33
- janito/plugins/web/webtools/tools/fetch_url.py +0 -458
- janito/providers/together/__init__.py +0 -1
- janito/providers/together/model_info.py +0 -69
- janito/providers/together/provider.py +0 -108
- janito/tools/cli_initializer.py +0 -88
- janito/tools/initialize.py +0 -70
- janito-3.5.1.dist-info/METADATA +0 -229
- /janito/{plugins/core/filemanager/tools → tools/adapters/local}/copy_file.py +0 -0
- /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/core/filemanager/tools → tools/adapters/local}/move_file.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/filemanager/tools → tools/adapters/local}/remove_file.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/{plugins/core/filemanager/tools → tools/adapters/local}/view_file.py +0 -0
- {janito-3.5.1.dist-info → janito-3.7.0.dist-info}/WHEEL +0 -0
- {janito-3.5.1.dist-info → janito-3.7.0.dist-info}/entry_points.txt +0 -0
- {janito-3.5.1.dist-info → janito-3.7.0.dist-info}/licenses/LICENSE +0 -0
- {janito-3.5.1.dist-info → janito-3.7.0.dist-info}/top_level.txt +0 -0
@@ -1,458 +0,0 @@
|
|
1
|
-
import requests
|
2
|
-
import time
|
3
|
-
import os
|
4
|
-
import json
|
5
|
-
from pathlib import Path
|
6
|
-
from bs4 import BeautifulSoup
|
7
|
-
from typing import Dict, Any, Optional
|
8
|
-
from janito.tools.adapters.local.adapter import register_local_tool
|
9
|
-
from janito.tools.tool_base import ToolBase, ToolPermissions
|
10
|
-
from janito.report_events import ReportAction
|
11
|
-
from janito.i18n import tr
|
12
|
-
from janito.tools.tool_utils import pluralize
|
13
|
-
from janito.tools.loop_protection_decorator import protect_against_loops
|
14
|
-
|
15
|
-
|
16
|
-
@register_local_tool
|
17
|
-
class FetchUrlTool(ToolBase):
|
18
|
-
"""
|
19
|
-
Fetch the content of a web page and extract its text.
|
20
|
-
|
21
|
-
This tool implements a **session-based caching mechanism** that provides
|
22
|
-
**in-memory caching** for the lifetime of the tool instance. URLs are cached
|
23
|
-
in RAM during the session, providing instant access to previously fetched
|
24
|
-
content without making additional HTTP requests.
|
25
|
-
|
26
|
-
**Session Cache Behavior:**
|
27
|
-
- **Lifetime**: Cache exists for the lifetime of the FetchUrlTool instance
|
28
|
-
- **Scope**: In-memory (RAM) cache, not persisted to disk
|
29
|
-
- **Storage**: Successful responses are cached as raw HTML content
|
30
|
-
- **Key**: Cache key is the exact URL string
|
31
|
-
- **Invalidation**: Cache is automatically cleared when the tool instance is destroyed
|
32
|
-
- **Performance**: Subsequent requests for the same URL return instantly
|
33
|
-
|
34
|
-
**Error Cache Behavior:**
|
35
|
-
- HTTP 403 errors: Cached for 24 hours (more permanent)
|
36
|
-
- HTTP 404 errors: Cached for 1 hour (temporary)
|
37
|
-
- Other 4xx errors: Cached for 30 minutes
|
38
|
-
- 5xx errors: Not cached (retried on each request)
|
39
|
-
|
40
|
-
Args:
|
41
|
-
url (str): The URL of the web page to fetch.
|
42
|
-
search_strings (list[str], optional): Strings to search for in the page content.
|
43
|
-
max_length (int, optional): Maximum number of characters to return. Defaults to 5000.
|
44
|
-
max_lines (int, optional): Maximum number of lines to return. Defaults to 200.
|
45
|
-
context_chars (int, optional): Characters of context around search matches. Defaults to 400.
|
46
|
-
timeout (int, optional): Timeout in seconds for the HTTP request. Defaults to 10.
|
47
|
-
save_to_file (str, optional): File path to save the full resource content. If provided,
|
48
|
-
the complete response will be saved to this file instead of being processed.
|
49
|
-
headers (Dict[str, str], optional): Custom HTTP headers to send with the request.
|
50
|
-
cookies (Dict[str, str], optional): Custom cookies to send with the request.
|
51
|
-
follow_redirects (bool, optional): Whether to follow HTTP redirects. Defaults to True.
|
52
|
-
Returns:
|
53
|
-
str: Extracted text content from the web page, or a warning message. Example:
|
54
|
-
- "<main text content...>"
|
55
|
-
- "No lines found for the provided search strings."
|
56
|
-
- "Warning: Empty URL provided. Operation skipped."
|
57
|
-
"""
|
58
|
-
|
59
|
-
permissions = ToolPermissions(read=True)
|
60
|
-
tool_name = "fetch_url"
|
61
|
-
|
62
|
-
def __init__(self):
|
63
|
-
super().__init__()
|
64
|
-
self.cache_dir = Path.home() / ".janito" / "cache" / "fetch_url"
|
65
|
-
self.cache_dir.mkdir(parents=True, exist_ok=True)
|
66
|
-
self.cache_file = self.cache_dir / "error_cache.json"
|
67
|
-
self.session_cache = (
|
68
|
-
{}
|
69
|
-
) # In-memory session cache - lifetime matches tool instance
|
70
|
-
self._load_cache()
|
71
|
-
|
72
|
-
# Browser-like session with cookies and headers
|
73
|
-
self.session = requests.Session()
|
74
|
-
self.session.headers.update(
|
75
|
-
{
|
76
|
-
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
|
77
|
-
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
|
78
|
-
"Accept-Language": "en-US,en;q=0.5",
|
79
|
-
"Accept-Encoding": "gzip, deflate, br",
|
80
|
-
"DNT": "1",
|
81
|
-
"Connection": "keep-alive",
|
82
|
-
"Upgrade-Insecure-Requests": "1",
|
83
|
-
}
|
84
|
-
)
|
85
|
-
|
86
|
-
# Load cookies from disk if they exist
|
87
|
-
self.cookies_file = self.cache_dir / "cookies.json"
|
88
|
-
self._load_cookies()
|
89
|
-
|
90
|
-
def _load_cache(self):
|
91
|
-
"""Load error cache from disk."""
|
92
|
-
if self.cache_file.exists():
|
93
|
-
try:
|
94
|
-
with open(self.cache_file, "r", encoding="utf-8") as f:
|
95
|
-
self.error_cache = json.load(f)
|
96
|
-
except (json.JSONDecodeError, IOError):
|
97
|
-
self.error_cache = {}
|
98
|
-
else:
|
99
|
-
self.error_cache = {}
|
100
|
-
|
101
|
-
def _save_cache(self):
|
102
|
-
"""Save error cache to disk."""
|
103
|
-
try:
|
104
|
-
with open(self.cache_file, "w", encoding="utf-8") as f:
|
105
|
-
json.dump(self.error_cache, f, indent=2)
|
106
|
-
except IOError:
|
107
|
-
pass # Silently fail if we can't write cache
|
108
|
-
|
109
|
-
def _load_cookies(self):
|
110
|
-
"""Load cookies from disk into session."""
|
111
|
-
if self.cookies_file.exists():
|
112
|
-
try:
|
113
|
-
with open(self.cookies_file, "r", encoding="utf-8") as f:
|
114
|
-
cookies_data = json.load(f)
|
115
|
-
for cookie in cookies_data:
|
116
|
-
self.session.cookies.set(**cookie)
|
117
|
-
except (json.JSONDecodeError, IOError):
|
118
|
-
pass # Silently fail if we can't load cookies
|
119
|
-
|
120
|
-
def _save_cookies(self):
|
121
|
-
"""Save session cookies to disk."""
|
122
|
-
try:
|
123
|
-
cookies_data = []
|
124
|
-
for cookie in self.session.cookies:
|
125
|
-
cookies_data.append(
|
126
|
-
{
|
127
|
-
"name": cookie.name,
|
128
|
-
"value": cookie.value,
|
129
|
-
"domain": cookie.domain,
|
130
|
-
"path": cookie.path,
|
131
|
-
}
|
132
|
-
)
|
133
|
-
with open(self.cookies_file, "w", encoding="utf-8") as f:
|
134
|
-
json.dump(cookies_data, f, indent=2)
|
135
|
-
except IOError:
|
136
|
-
pass # Silently fail if we can't write cookies
|
137
|
-
|
138
|
-
def _get_cached_error(self, url: str) -> tuple[str, bool]:
|
139
|
-
"""
|
140
|
-
Check if we have a cached error for this URL.
|
141
|
-
Returns (error_message, is_cached) tuple.
|
142
|
-
"""
|
143
|
-
if url not in self.error_cache:
|
144
|
-
return None, False
|
145
|
-
|
146
|
-
entry = self.error_cache[url]
|
147
|
-
current_time = time.time()
|
148
|
-
|
149
|
-
# Different expiration times for different status codes
|
150
|
-
if entry["status_code"] == 403:
|
151
|
-
# Cache 403 errors for 24 hours (more permanent)
|
152
|
-
expiration_time = 24 * 3600
|
153
|
-
elif entry["status_code"] == 404:
|
154
|
-
# Cache 404 errors for 1 hour (more temporary)
|
155
|
-
expiration_time = 3600
|
156
|
-
else:
|
157
|
-
# Cache other 4xx errors for 30 minutes
|
158
|
-
expiration_time = 1800
|
159
|
-
|
160
|
-
if current_time - entry["timestamp"] > expiration_time:
|
161
|
-
# Cache expired, remove it
|
162
|
-
del self.error_cache[url]
|
163
|
-
self._save_cache()
|
164
|
-
return None, False
|
165
|
-
|
166
|
-
return entry["message"], True
|
167
|
-
|
168
|
-
def _cache_error(self, url: str, status_code: int, message: str):
|
169
|
-
"""Cache an HTTP error response."""
|
170
|
-
self.error_cache[url] = {
|
171
|
-
"status_code": status_code,
|
172
|
-
"message": message,
|
173
|
-
"timestamp": time.time(),
|
174
|
-
}
|
175
|
-
self._save_cache()
|
176
|
-
|
177
|
-
def _fetch_url_content(
|
178
|
-
self,
|
179
|
-
url: str,
|
180
|
-
timeout: int = 10,
|
181
|
-
headers: Optional[Dict[str, str]] = None,
|
182
|
-
cookies: Optional[Dict[str, str]] = None,
|
183
|
-
follow_redirects: bool = True,
|
184
|
-
) -> str:
|
185
|
-
"""Fetch URL content and handle HTTP errors.
|
186
|
-
|
187
|
-
Implements two-tier caching:
|
188
|
-
1. Session cache: In-memory cache for successful responses (lifetime = tool instance)
|
189
|
-
2. Error cache: Persistent disk cache for HTTP errors with different expiration times
|
190
|
-
|
191
|
-
Also implements URL whitelist checking and browser-like behavior.
|
192
|
-
"""
|
193
|
-
# Check URL whitelist
|
194
|
-
from janito.tools.url_whitelist import get_url_whitelist_manager
|
195
|
-
|
196
|
-
whitelist_manager = get_url_whitelist_manager()
|
197
|
-
|
198
|
-
if not whitelist_manager.is_url_allowed(url):
|
199
|
-
error_message = tr("Blocked")
|
200
|
-
self.report_error(
|
201
|
-
tr("❗ Blocked"),
|
202
|
-
ReportAction.READ,
|
203
|
-
)
|
204
|
-
return error_message
|
205
|
-
|
206
|
-
# Check session cache first
|
207
|
-
if url in self.session_cache:
|
208
|
-
return self.session_cache[url]
|
209
|
-
|
210
|
-
# Check persistent cache for known errors
|
211
|
-
cached_error, is_cached = self._get_cached_error(url)
|
212
|
-
if cached_error:
|
213
|
-
self.report_warning(
|
214
|
-
tr(
|
215
|
-
"ℹ️ Using cached HTTP error for URL: {url}",
|
216
|
-
url=url,
|
217
|
-
),
|
218
|
-
ReportAction.READ,
|
219
|
-
)
|
220
|
-
return cached_error
|
221
|
-
|
222
|
-
try:
|
223
|
-
# Merge custom headers with default ones
|
224
|
-
request_headers = self.session.headers.copy()
|
225
|
-
if headers:
|
226
|
-
request_headers.update(headers)
|
227
|
-
|
228
|
-
# Merge custom cookies
|
229
|
-
if cookies:
|
230
|
-
self.session.cookies.update(cookies)
|
231
|
-
|
232
|
-
response = self.session.get(
|
233
|
-
url,
|
234
|
-
timeout=timeout,
|
235
|
-
headers=request_headers,
|
236
|
-
allow_redirects=follow_redirects,
|
237
|
-
)
|
238
|
-
response.raise_for_status()
|
239
|
-
content = response.text
|
240
|
-
|
241
|
-
# Save cookies after successful request
|
242
|
-
self._save_cookies()
|
243
|
-
|
244
|
-
# Cache successful responses in session cache
|
245
|
-
self.session_cache[url] = content
|
246
|
-
return content
|
247
|
-
except requests.exceptions.HTTPError as http_err:
|
248
|
-
status_code = http_err.response.status_code if http_err.response else None
|
249
|
-
|
250
|
-
# Map status codes to descriptions
|
251
|
-
status_descriptions = {
|
252
|
-
400: "Bad Request",
|
253
|
-
401: "Unauthorized",
|
254
|
-
403: "Forbidden",
|
255
|
-
404: "Not Found",
|
256
|
-
405: "Method Not Allowed",
|
257
|
-
408: "Request Timeout",
|
258
|
-
409: "Conflict",
|
259
|
-
410: "Gone",
|
260
|
-
413: "Payload Too Large",
|
261
|
-
414: "URI Too Long",
|
262
|
-
415: "Unsupported Media Type",
|
263
|
-
429: "Too Many Requests",
|
264
|
-
500: "Internal Server Error",
|
265
|
-
501: "Not Implemented",
|
266
|
-
502: "Bad Gateway",
|
267
|
-
503: "Service Unavailable",
|
268
|
-
504: "Gateway Timeout",
|
269
|
-
505: "HTTP Version Not Supported",
|
270
|
-
}
|
271
|
-
|
272
|
-
if status_code and 400 <= status_code < 500:
|
273
|
-
description = status_descriptions.get(status_code, "Client Error")
|
274
|
-
error_message = f"HTTP {status_code} {description}"
|
275
|
-
# Cache 403 and 404 errors
|
276
|
-
if status_code in [403, 404]:
|
277
|
-
self._cache_error(url, status_code, error_message)
|
278
|
-
|
279
|
-
self.report_error(
|
280
|
-
f"❗ HTTP {status_code} {description}",
|
281
|
-
ReportAction.READ,
|
282
|
-
)
|
283
|
-
return error_message
|
284
|
-
else:
|
285
|
-
status_code_str = str(status_code) if status_code else "Error"
|
286
|
-
description = status_descriptions.get(
|
287
|
-
status_code,
|
288
|
-
(
|
289
|
-
"Server Error"
|
290
|
-
if status_code and status_code >= 500
|
291
|
-
else "Client Error"
|
292
|
-
),
|
293
|
-
)
|
294
|
-
self.report_error(
|
295
|
-
f"❗ HTTP {status_code_str} {description}",
|
296
|
-
ReportAction.READ,
|
297
|
-
)
|
298
|
-
return f"HTTP {status_code_str} {description}"
|
299
|
-
except requests.exceptions.ConnectionError as conn_err:
|
300
|
-
self.report_error(
|
301
|
-
"❗ Network Error",
|
302
|
-
ReportAction.READ,
|
303
|
-
)
|
304
|
-
return f"Network Error: Failed to connect to {url}"
|
305
|
-
except requests.exceptions.Timeout as timeout_err:
|
306
|
-
self.report_error(
|
307
|
-
"❗ Timeout Error",
|
308
|
-
ReportAction.READ,
|
309
|
-
)
|
310
|
-
return f"Timeout Error: Request timed out after {timeout} seconds"
|
311
|
-
except requests.exceptions.RequestException as req_err:
|
312
|
-
self.report_error(
|
313
|
-
"❗ Request Error",
|
314
|
-
ReportAction.READ,
|
315
|
-
)
|
316
|
-
return f"Request Error: {str(req_err)}"
|
317
|
-
except Exception as err:
|
318
|
-
self.report_error(
|
319
|
-
"❗ Error fetching URL",
|
320
|
-
ReportAction.READ,
|
321
|
-
)
|
322
|
-
return f"Error: {str(err)}"
|
323
|
-
|
324
|
-
def _extract_and_clean_text(self, html_content: str) -> str:
|
325
|
-
"""Extract and clean text from HTML content."""
|
326
|
-
soup = BeautifulSoup(html_content, "html.parser")
|
327
|
-
text = soup.get_text(separator="\n")
|
328
|
-
|
329
|
-
# Clean up excessive whitespace
|
330
|
-
lines = [line.strip() for line in text.splitlines() if line.strip()]
|
331
|
-
return "\n".join(lines)
|
332
|
-
|
333
|
-
def _filter_by_search_strings(
|
334
|
-
self, text: str, search_strings: list[str], context_chars: int
|
335
|
-
) -> str:
|
336
|
-
"""Filter text by search strings with context."""
|
337
|
-
filtered = []
|
338
|
-
for s in search_strings:
|
339
|
-
idx = text.find(s)
|
340
|
-
if idx != -1:
|
341
|
-
start = max(0, idx - context_chars)
|
342
|
-
end = min(len(text), idx + len(s) + context_chars)
|
343
|
-
snippet = text[start:end]
|
344
|
-
filtered.append(snippet)
|
345
|
-
|
346
|
-
if filtered:
|
347
|
-
return "\n...\n".join(filtered)
|
348
|
-
else:
|
349
|
-
return tr("No lines found for the provided search strings.")
|
350
|
-
|
351
|
-
def _apply_limits(self, text: str, max_length: int, max_lines: int) -> str:
|
352
|
-
"""Apply length and line limits to text."""
|
353
|
-
# Apply length limit
|
354
|
-
if len(text) > max_length:
|
355
|
-
text = text[:max_length] + "\n... (content truncated due to length limit)"
|
356
|
-
|
357
|
-
# Apply line limit
|
358
|
-
lines = text.splitlines()
|
359
|
-
if len(lines) > max_lines:
|
360
|
-
text = (
|
361
|
-
"\n".join(lines[:max_lines])
|
362
|
-
+ "\n... (content truncated due to line limit)"
|
363
|
-
)
|
364
|
-
|
365
|
-
return text
|
366
|
-
|
367
|
-
@protect_against_loops(max_calls=5, time_window=10.0, key_field="url")
|
368
|
-
def run(
|
369
|
-
self,
|
370
|
-
url: str,
|
371
|
-
search_strings: list[str] = None,
|
372
|
-
max_length: int = 5000,
|
373
|
-
max_lines: int = 200,
|
374
|
-
context_chars: int = 400,
|
375
|
-
timeout: int = 10,
|
376
|
-
save_to_file: str = None,
|
377
|
-
headers: Dict[str, str] = None,
|
378
|
-
cookies: Dict[str, str] = None,
|
379
|
-
follow_redirects: bool = True,
|
380
|
-
) -> str:
|
381
|
-
if not url.strip():
|
382
|
-
self.report_warning(tr("ℹ️ Empty URL provided."), ReportAction.READ)
|
383
|
-
return tr("Warning: Empty URL provided. Operation skipped.")
|
384
|
-
|
385
|
-
self.report_action(tr("🌐 Fetch URL '{url}' ...", url=url), ReportAction.READ)
|
386
|
-
|
387
|
-
# Check if we should save to file
|
388
|
-
if save_to_file:
|
389
|
-
html_content = self._fetch_url_content(
|
390
|
-
url,
|
391
|
-
timeout=timeout,
|
392
|
-
headers=headers,
|
393
|
-
cookies=cookies,
|
394
|
-
follow_redirects=follow_redirects,
|
395
|
-
)
|
396
|
-
if (
|
397
|
-
html_content.startswith("HTTP Error ")
|
398
|
-
or html_content == "Error"
|
399
|
-
or html_content == "Blocked"
|
400
|
-
):
|
401
|
-
return html_content
|
402
|
-
|
403
|
-
try:
|
404
|
-
with open(save_to_file, "w", encoding="utf-8") as f:
|
405
|
-
f.write(html_content)
|
406
|
-
file_size = len(html_content)
|
407
|
-
self.report_success(
|
408
|
-
tr(
|
409
|
-
"✅ Saved {size} bytes to {file}",
|
410
|
-
size=file_size,
|
411
|
-
file=save_to_file,
|
412
|
-
),
|
413
|
-
ReportAction.READ,
|
414
|
-
)
|
415
|
-
return tr("Successfully saved content to: {file}", file=save_to_file)
|
416
|
-
except IOError as e:
|
417
|
-
error_msg = tr("Error saving to file: {error}", error=str(e))
|
418
|
-
self.report_error(error_msg, ReportAction.READ)
|
419
|
-
return error_msg
|
420
|
-
|
421
|
-
# Normal processing path
|
422
|
-
html_content = self._fetch_url_content(
|
423
|
-
url,
|
424
|
-
timeout=timeout,
|
425
|
-
headers=headers,
|
426
|
-
cookies=cookies,
|
427
|
-
follow_redirects=follow_redirects,
|
428
|
-
)
|
429
|
-
if (
|
430
|
-
html_content.startswith("HTTP Error ")
|
431
|
-
or html_content == "Error"
|
432
|
-
or html_content == "Blocked"
|
433
|
-
):
|
434
|
-
return html_content
|
435
|
-
|
436
|
-
# Extract and clean text
|
437
|
-
text = self._extract_and_clean_text(html_content)
|
438
|
-
|
439
|
-
# Filter by search strings if provided
|
440
|
-
if search_strings:
|
441
|
-
text = self._filter_by_search_strings(text, search_strings, context_chars)
|
442
|
-
|
443
|
-
# Apply limits
|
444
|
-
text = self._apply_limits(text, max_length, max_lines)
|
445
|
-
|
446
|
-
# Report success
|
447
|
-
num_lines = len(text.splitlines())
|
448
|
-
total_chars = len(text)
|
449
|
-
self.report_success(
|
450
|
-
tr(
|
451
|
-
"✅ {num_lines} {line_word}, {chars} chars",
|
452
|
-
num_lines=num_lines,
|
453
|
-
line_word=pluralize("line", num_lines),
|
454
|
-
chars=total_chars,
|
455
|
-
),
|
456
|
-
ReportAction.READ,
|
457
|
-
)
|
458
|
-
return text
|
@@ -1 +0,0 @@
|
|
1
|
-
# Together AI provider for Janito
|
@@ -1,69 +0,0 @@
|
|
1
|
-
"""
|
2
|
-
Model specifications for Together AI provider.
|
3
|
-
"""
|
4
|
-
|
5
|
-
MODEL_SPECS = {
|
6
|
-
"allenai/OLMo-2-0325-32B-Instruct": {
|
7
|
-
"max_tokens": 32768,
|
8
|
-
"max_input_tokens": 32768,
|
9
|
-
"max_output_tokens": 32768,
|
10
|
-
"description": "OLMo 2 32B Instruct - Fully open language model from AllenAI",
|
11
|
-
"supports_tools": True,
|
12
|
-
"supports_system_prompt": True,
|
13
|
-
"supports_streaming": True,
|
14
|
-
},
|
15
|
-
"allenai/OLMo-2-1124-7B-Instruct": {
|
16
|
-
"max_tokens": 32768,
|
17
|
-
"max_input_tokens": 32768,
|
18
|
-
"max_output_tokens": 32768,
|
19
|
-
"description": "OLMo 2 7B Instruct - Fully open language model from AllenAI",
|
20
|
-
"supports_tools": True,
|
21
|
-
"supports_system_prompt": True,
|
22
|
-
"supports_streaming": True,
|
23
|
-
},
|
24
|
-
"allenai/OLMo-2-0425-1B": {
|
25
|
-
"max_tokens": 32768,
|
26
|
-
"max_input_tokens": 32768,
|
27
|
-
"max_output_tokens": 32768,
|
28
|
-
"description": "OLMo 2 1B - Fully open language model from AllenAI",
|
29
|
-
"supports_tools": True,
|
30
|
-
"supports_system_prompt": True,
|
31
|
-
"supports_streaming": True,
|
32
|
-
},
|
33
|
-
"meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo": {
|
34
|
-
"max_tokens": 8192,
|
35
|
-
"max_input_tokens": 128000,
|
36
|
-
"max_output_tokens": 8192,
|
37
|
-
"description": "Llama 3.1 8B Instruct Turbo",
|
38
|
-
"supports_tools": True,
|
39
|
-
"supports_system_prompt": True,
|
40
|
-
"supports_streaming": True,
|
41
|
-
},
|
42
|
-
"meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo": {
|
43
|
-
"max_tokens": 8192,
|
44
|
-
"max_input_tokens": 128000,
|
45
|
-
"max_output_tokens": 8192,
|
46
|
-
"description": "Llama 3.1 70B Instruct Turbo",
|
47
|
-
"supports_tools": True,
|
48
|
-
"supports_system_prompt": True,
|
49
|
-
"supports_streaming": True,
|
50
|
-
},
|
51
|
-
"mistralai/Mixtral-8x7B-Instruct-v0.1": {
|
52
|
-
"max_tokens": 32768,
|
53
|
-
"max_input_tokens": 32768,
|
54
|
-
"max_output_tokens": 32768,
|
55
|
-
"description": "Mixtral 8x7B Instruct",
|
56
|
-
"supports_tools": True,
|
57
|
-
"supports_system_prompt": True,
|
58
|
-
"supports_streaming": True,
|
59
|
-
},
|
60
|
-
"deepseek-ai/deepseek-llm-67b-chat": {
|
61
|
-
"max_tokens": 4096,
|
62
|
-
"max_input_tokens": 4096,
|
63
|
-
"max_output_tokens": 4096,
|
64
|
-
"description": "DeepSeek LLM 67B Chat",
|
65
|
-
"supports_tools": True,
|
66
|
-
"supports_system_prompt": True,
|
67
|
-
"supports_streaming": True,
|
68
|
-
},
|
69
|
-
}
|
@@ -1,108 +0,0 @@
|
|
1
|
-
from janito.llm.provider import LLMProvider
|
2
|
-
from janito.llm.model import LLMModelInfo
|
3
|
-
from janito.llm.auth import LLMAuthManager
|
4
|
-
from janito.llm.driver_config import LLMDriverConfig
|
5
|
-
from janito.drivers.openai.driver import OpenAIModelDriver
|
6
|
-
from janito.tools import get_local_tools_adapter
|
7
|
-
from janito.providers.registry import LLMProviderRegistry
|
8
|
-
from .model_info import MODEL_SPECS
|
9
|
-
from queue import Queue
|
10
|
-
|
11
|
-
available = OpenAIModelDriver.available
|
12
|
-
unavailable_reason = OpenAIModelDriver.unavailable_reason
|
13
|
-
|
14
|
-
|
15
|
-
class TogetherProvider(LLMProvider):
|
16
|
-
name = 'together'
|
17
|
-
NAME = 'together'
|
18
|
-
MAINTAINER = 'Janito Team'
|
19
|
-
MODEL_SPECS = MODEL_SPECS
|
20
|
-
DEFAULT_MODEL = 'allenai/OLMo-2-0325-32B-Instruct'
|
21
|
-
|
22
|
-
def __init__(
|
23
|
-
self, auth_manager: LLMAuthManager = None, config: LLMDriverConfig = None
|
24
|
-
):
|
25
|
-
self._tools_adapter = get_local_tools_adapter()
|
26
|
-
self._driver = None
|
27
|
-
|
28
|
-
if not self.available:
|
29
|
-
return
|
30
|
-
|
31
|
-
self._initialize_config(auth_manager, config)
|
32
|
-
self._setup_model_config()
|
33
|
-
|
34
|
-
def _initialize_config(self, auth_manager, config):
|
35
|
-
self.auth_manager = auth_manager or LLMAuthManager()
|
36
|
-
self._api_key = self.auth_manager.get_credentials(type(self).NAME)
|
37
|
-
if not self._api_key:
|
38
|
-
from janito.llm.auth_utils import handle_missing_api_key
|
39
|
-
handle_missing_api_key(self.name, 'TOGETHER_API_KEY')
|
40
|
-
|
41
|
-
self._driver_config = config or LLMDriverConfig(model=None)
|
42
|
-
if not self._driver_config.model:
|
43
|
-
self._driver_config.model = self.DEFAULT_MODEL
|
44
|
-
if not self._driver_config.api_key:
|
45
|
-
self._driver_config.api_key = self._api_key
|
46
|
-
|
47
|
-
self._driver_config.base_url = 'https://api.together.xyz/v1'
|
48
|
-
|
49
|
-
def _setup_model_config(self):
|
50
|
-
model_name = self._driver_config.model
|
51
|
-
model_spec = self.MODEL_SPECS.get(model_name)
|
52
|
-
|
53
|
-
if hasattr(self._driver_config, 'max_tokens'):
|
54
|
-
self._driver_config.max_tokens = None
|
55
|
-
if hasattr(self._driver_config, 'max_completion_tokens'):
|
56
|
-
self._driver_config.max_completion_tokens = None
|
57
|
-
|
58
|
-
if model_spec:
|
59
|
-
max_tokens = getattr(model_spec, 'max_tokens', None)
|
60
|
-
if max_tokens and max_tokens != 'N/A':
|
61
|
-
self._driver_config.max_tokens = int(max_tokens)
|
62
|
-
|
63
|
-
self.fill_missing_device_info(self._driver_config)
|
64
|
-
|
65
|
-
@property
|
66
|
-
def driver(self) -> OpenAIModelDriver:
|
67
|
-
if not self.available:
|
68
|
-
raise ImportError(f'TogetherProvider unavailable: {self.unavailable_reason}')
|
69
|
-
return self._driver
|
70
|
-
|
71
|
-
@property
|
72
|
-
def available(self):
|
73
|
-
return available
|
74
|
-
|
75
|
-
@property
|
76
|
-
def unavailable_reason(self):
|
77
|
-
return unavailable_reason
|
78
|
-
|
79
|
-
def create_driver(self):
|
80
|
-
driver = OpenAIModelDriver(
|
81
|
-
tools_adapter=self._tools_adapter, provider_name=self.NAME
|
82
|
-
)
|
83
|
-
driver.config = self._driver_config
|
84
|
-
return driver
|
85
|
-
|
86
|
-
def create_agent(self, tools_adapter=None, agent_name: str = None, **kwargs):
|
87
|
-
from janito.llm.agent import LLMAgent
|
88
|
-
if tools_adapter is None:
|
89
|
-
tools_adapter = get_local_tools_adapter()
|
90
|
-
raise NotImplementedError(
|
91
|
-
'create_agent must be constructed via new factory using input/output queues and config.'
|
92
|
-
)
|
93
|
-
|
94
|
-
@property
|
95
|
-
def model_name(self):
|
96
|
-
return self._driver_config.model
|
97
|
-
|
98
|
-
@property
|
99
|
-
def driver_config(self):
|
100
|
-
return self._driver_config
|
101
|
-
|
102
|
-
def execute_tool(self, tool_name: str, event_bus, *args, **kwargs):
|
103
|
-
self._tools_adapter.event_bus = event_bus
|
104
|
-
return self._tools_adapter.execute_by_name(tool_name, *args, **kwargs)
|
105
|
-
|
106
|
-
|
107
|
-
LLMProviderRegistry.register(TogetherProvider.NAME, TogetherProvider)
|
108
|
-
|