Personal AI, On Personal Devices
Python
Merge remote-tracking branch 'origin/main' into elliot/fix-pr1104-calendar-precision
Elliot Sluskyaa96fc12d7c7
diff --cc docs/getting-started/configuration.mdindex 265cb000,c7a39c14..3026ad03--- a/docs/getting-started/configuration.md+++ b/docs/getting-started/configuration.md@@@ -1132,8 -1132,9 +1132,10 @@@ OpenJarvis respects the following envir| `YOUDOTCOM_API_KEY` | API key for the You.com web search engine. Optional — raises the keyless free-tier limits and enables You.com Contents extraction for URL queries. || `SERPLY_API_KEY` | API key for the Serply web search engine, which proxies Google. Optional. When set and no other search key is, `auto` engine selection prefers Serply over the keyless tier. Keys: [serply.io](https://serply.io). || `SERPLY_PROXY_LOCATION` | Two-letter country code asking Serply for that country's Google result set, for example `DE`. Optional. Unset means the API answers from its own default region. See [serply.io/docs](https://serply.io/docs). |+| `FXMACRODATA_API_KEY` | API key for the `fx_macro_data` tool. Optional: recent USD releases, the USD release calendar and every currency's indicator catalogue work without it. The key unlocks other currencies, full history and FX rates. Keys: [fxmacrodata.com](https://fxmacrodata.com/subscribe). |- | `OPENJARVIS_WEB_SEARCH_ENGINE` | Web search engine for the `web_search` tool: `auto` (default), `youcom`, `tavily`, `serply`, or `duckduckgo`. |+ | `FIRECRAWL_API_KEY` | API key for the Firecrawl web search engine. Optional. When set and no other search key is, `auto` engine selection prefers Firecrawl over the keyless tier, and URL queries return the page or PDF as markdown. Keys: [firecrawl.dev](https://www.firecrawl.dev/app/api-keys?utm_source=openjarvis&utm_medium=integration). |+ | `FIRECRAWL_API_URL` | Base URL of the Firecrawl API, for example a [self-hosted Firecrawl](https://docs.firecrawl.dev/contributing/self-host). Optional. Defaults to `https://api.firecrawl.dev`. Any other URL enables the Firecrawl engine without a key, for instances that run without auth. |+ | `OPENJARVIS_WEB_SEARCH_ENGINE` | Web search engine for the `web_search` tool: `auto` (default), `youcom`, `tavily`, `serply`, `firecrawl`, or `duckduckgo`. |In the desktop app, you can save `ATLASCLOUD_API_KEY` in **Cloud Models** or**Settings → API Keys** instead of setting an environment variable.diff --cc src/openjarvis/core/credentials.pyindex 5e20492c,c65f9bd9..259d5582--- a/src/openjarvis/core/credentials.py+++ b/src/openjarvis/core/credentials.py@@@ -33,9 -33,13 +33,14 @@@ def _default_path() -> PathTOOL_CREDENTIALS: dict[str, list[str]] = {- "web_search": ["TAVILY_API_KEY", "YOUDOTCOM_API_KEY", "SERPLY_API_KEY"],+ "web_search": [+ "TAVILY_API_KEY",+ "YOUDOTCOM_API_KEY",+ "SERPLY_API_KEY",+ "FIRECRAWL_API_KEY",+ ],"get_weather": ["OPENWEATHERMAP_API_KEY"],+ "fx_macro_data": ["FXMACRODATA_API_KEY"],"image_generate": ["OPENAI_API_KEY"],"slack": ["SLACK_BOT_TOKEN", "SLACK_APP_TOKEN"],"telegram": ["TELEGRAM_BOT_TOKEN"],@@@ -75,10 -79,14 +80,17 @@@# and every listed key only raises limits, changes the engine, or improves# result quality.OPTIONAL_TOOL_CREDENTIALS: dict[str, frozenset[str]] = {- "web_search": frozenset({"TAVILY_API_KEY", "YOUDOTCOM_API_KEY", "SERPLY_API_KEY"}),+ "web_search": frozenset(+ {+ "TAVILY_API_KEY",+ "YOUDOTCOM_API_KEY",+ "SERPLY_API_KEY",+ "FIRECRAWL_API_KEY",+ }+ ),+ # Recent USD releases, the USD calendar and every catalogue are keyless;+ # the key unlocks other currencies, full history and FX rates.+ "fx_macro_data": frozenset({"FXMACRODATA_API_KEY"}),}