@dbx-tools/appkit-web-search 0.9.131 → 0.9.136
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.
- package/README.md +50 -46
- package/index.ts +2 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.js +2 -2
- package/lib/src/fetch.d.ts +31 -0
- package/lib/src/fetch.js +93 -19
- package/lib/src/plugin.d.ts +5 -0
- package/lib/src/plugin.js +6 -2
- package/lib/src/runtime.d.ts +5 -1
- package/lib/src/runtime.js +17 -5
- package/lib/src/search.js +79 -32
- package/package.json +7 -7
- package/src/fetch.ts +151 -22
- package/src/plugin.ts +18 -1
- package/src/runtime.ts +20 -3
- package/src/search.ts +97 -33
package/README.md
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
# @dbx-tools/appkit-web-search
|
|
2
2
|
|
|
3
|
-
Server-side web-search runtime, Mastra tools, and AppKit plugin.
|
|
4
|
-
|
|
5
3
|
Add `web_search` and `web_fetch` to an AppKit or Mastra backend. `web_search`
|
|
6
4
|
runs on the
|
|
7
5
|
[Databricks Model Serving native web-search tool](https://docs.databricks.com/aws/en/machine-learning/model-serving/web-search):
|
|
8
6
|
the model searches the web server-side and returns a synthesized answer plus the
|
|
9
|
-
sources it used
|
|
10
|
-
through [
|
|
7
|
+
sources it used without a third-party search API key. `web_fetch` reads a single page
|
|
8
|
+
through [got-scraping](https://www.npmjs.com/package/got-scraping).
|
|
11
9
|
|
|
12
|
-
## Quick
|
|
10
|
+
## Quick start
|
|
13
11
|
|
|
14
12
|
Register the plugin and give its tools to an agent:
|
|
15
13
|
|
|
@@ -30,7 +28,7 @@ await createApp({
|
|
|
30
28
|
});
|
|
31
29
|
```
|
|
32
30
|
|
|
33
|
-
|
|
31
|
+
Registration provides:
|
|
34
32
|
|
|
35
33
|
- AppKit plugin registration that resolves and logs the effective policy at boot.
|
|
36
34
|
- Two Mastra tools: `web_search` (answer + citations) and `web_fetch` (page
|
|
@@ -39,13 +37,13 @@ await createApp({
|
|
|
39
37
|
- `web_search` resolves a dedicated web-search-capable model - defaulting to Gemini,
|
|
40
38
|
then GPT - independently of the calling agent's chat model (which may not
|
|
41
39
|
support web search). Loose names (`"gemini"`, `"gpt"`) fuzzy-match the live
|
|
42
|
-
catalogue
|
|
40
|
+
catalogue through [@dbx-tools/model](../model).
|
|
43
41
|
- A built-in provider -> request-fragment map (OpenAI Responses API
|
|
44
42
|
`{"tools":[{"type":"web_search"}]}`, Gemini Chat Completions
|
|
45
43
|
`{"google_search":{}}`),
|
|
46
|
-
overridable per provider
|
|
47
|
-
- A named URL policy (`allowlist` or `unrestricted`) over a glob
|
|
48
|
-
built on [
|
|
44
|
+
overridable per provider with the `WEB_SEARCH_TOOLS` setting.
|
|
45
|
+
- A named URL policy (`allowlist` or `unrestricted`) over a glob allowlist
|
|
46
|
+
built on [@dbx-tools/path](../path)'s `match` matcher: `web_search` silently
|
|
49
47
|
filters disallowed citations, `web_fetch` refuses a disallowed URL, and the
|
|
50
48
|
mode in force is logged at boot.
|
|
51
49
|
- Per-tool approval gating: gate every call, or (for `web_fetch`) only calls
|
|
@@ -57,18 +55,24 @@ await createApp({
|
|
|
57
55
|
- Page and fallback-result HTML use parser-backed text conversion and selectors,
|
|
58
56
|
including complete HTML entity decoding and malformed-markup recovery.
|
|
59
57
|
|
|
60
|
-
##
|
|
58
|
+
## Choose a web provider
|
|
61
59
|
|
|
62
60
|
AppKit has no first-party web-search or page-fetch surface. Use this package when
|
|
63
61
|
an agent needs to look things up on the open web or read a URL the user pasted,
|
|
64
|
-
with a policy layer (
|
|
65
|
-
controls which sites are reachable and which calls pause for a human.
|
|
66
|
-
|
|
62
|
+
with a policy layer (allowlist + optional approval) around it so a deployment
|
|
63
|
+
controls which sites are reachable and which calls pause for a human. The
|
|
64
|
+
web-search tool resolves its own web-search-capable model, so an agent
|
|
67
65
|
running on any chat model (including one without web search) can still search. It
|
|
68
|
-
|
|
69
|
-
|
|
66
|
+
provides a Mastra tool pair and an AppKit plugin, like
|
|
67
|
+
[@dbx-tools/email](../email).
|
|
68
|
+
|
|
69
|
+
Use native Databricks web search when a supported GPT or Gemini endpoint is
|
|
70
|
+
deployed. Use the DuckDuckGo scrape fallback only when no capable endpoint is
|
|
71
|
+
available and unsynthesized search results are acceptable. Use `web_fetch` for a
|
|
72
|
+
specific public HTTPS page. For indexed application data, use
|
|
73
|
+
[@dbx-tools/search](../search) instead.
|
|
70
74
|
|
|
71
|
-
## Configure
|
|
75
|
+
## Configure the AppKit plugin
|
|
72
76
|
|
|
73
77
|
```ts
|
|
74
78
|
import { createApp, lakebase, server } from "@databricks/appkit";
|
|
@@ -101,7 +105,7 @@ the native plugin toolkit as shown above, which preserves that plugin's policy,
|
|
|
101
105
|
OBO scope, and AppKit execution chain. Approval, when enabled, requires Mastra
|
|
102
106
|
storage, so register `lakebase()` or configure storage in the Mastra plugin.
|
|
103
107
|
|
|
104
|
-
The plugin is also an AppKit `ToolProvider`, so a
|
|
108
|
+
The plugin is also an AppKit `ToolProvider`, so a native code agent can
|
|
105
109
|
take the same two tools without Mastra. Put the definition at
|
|
106
110
|
`server/agents/researcher/agent.ts` so AppKit discovers it:
|
|
107
111
|
|
|
@@ -132,16 +136,16 @@ Both tools are annotated `effect: "read"` and require user context, and neither
|
|
|
132
136
|
is auto-inheritable: an agent has to ask for them, because `web_fetch` reaches
|
|
133
137
|
whatever URL the model produces.
|
|
134
138
|
|
|
135
|
-
Native volume skills
|
|
139
|
+
Native volume skills run as the service principal. The 0.81
|
|
136
140
|
`skillCredentialMode: "obo"` option is not wired. Keep request-scoped writable
|
|
137
141
|
skills, remote sources, asynchronous Graphiti discovery, Sandbox/Monty,
|
|
138
142
|
Mastra memory, and durable approvals on `@dbx-tools/appkit-mastra`.
|
|
139
143
|
|
|
140
|
-
## Choose
|
|
144
|
+
## Choose the web-search model
|
|
141
145
|
|
|
142
146
|
The native web-search tool only runs on certain models, and it is provider-
|
|
143
147
|
specific. This package resolves deployed endpoints through
|
|
144
|
-
[
|
|
148
|
+
[@dbx-tools/model](../model) and applies this order:
|
|
145
149
|
|
|
146
150
|
1. Highest-ranked web-search-capable **Gemini**.
|
|
147
151
|
2. Without Gemini, a capable **GPT** matching the calling/requested model.
|
|
@@ -159,26 +163,26 @@ Serving binding, and it is the field the plugin declares in its manifest, so
|
|
|
159
163
|
The request's `model`, plugin `model`, and environment model values are used to
|
|
160
164
|
match the calling GPT after Gemini availability is checked.
|
|
161
165
|
When the tool runs through `@dbx-tools/appkit-mastra`, the host injects the
|
|
162
|
-
|
|
166
|
+
resolved chat model, overriding any different model argument generated
|
|
163
167
|
by the LLM.
|
|
164
168
|
|
|
165
|
-
Model resolution runs against the
|
|
166
|
-
[
|
|
169
|
+
Model resolution runs against the live workspace catalogue through
|
|
170
|
+
[@dbx-tools/model](../model), so it only picks an endpoint that is
|
|
167
171
|
actually deployed - a configured id that doesn't exist is never called.
|
|
168
172
|
|
|
169
|
-
### Scrape
|
|
173
|
+
### Scrape fallback
|
|
170
174
|
|
|
171
|
-
The native tool is
|
|
175
|
+
The native tool is preferred. When the workspace has no deployed
|
|
172
176
|
GPT/Gemini endpoint (so native web search can't run at all), the tool falls
|
|
173
|
-
back to a DuckDuckGo scrape
|
|
177
|
+
back to a DuckDuckGo scrape using `got-scraping` so it still returns results
|
|
174
178
|
instead of erroring. Fallback results set `model` to `"scrape:duckduckgo"` and
|
|
175
179
|
carry the substance in `citations` (there is no model synthesizing an answer,
|
|
176
|
-
so `answer` is a lead-in over the top results). It is enabled by default
|
|
180
|
+
so `answer` is a lead-in over the top results). It is enabled by default. Set
|
|
177
181
|
`scrapeFallback: false` (or `WEB_SEARCH_SCRAPE_FALLBACK=0`) to require a native
|
|
178
182
|
model and error when none is deployed.
|
|
179
183
|
|
|
180
|
-
The
|
|
181
|
-
OpenAI GPT uses the Responses API `{"tools":[{"type":"web_search"}]}
|
|
184
|
+
The plugin selects the provider request fragment from the resolved model:
|
|
185
|
+
OpenAI GPT uses the Responses API `{"tools":[{"type":"web_search"}]}`. Gemini
|
|
182
186
|
uses the top-level Chat Completions field `{"google_search":{}}`. Override or extend that map per provider with
|
|
183
187
|
the `webSearchTools` setting (env `WEB_SEARCH_TOOLS`, JSON) as the platform
|
|
184
188
|
evolves:
|
|
@@ -190,7 +194,7 @@ plugin.webSearch({
|
|
|
190
194
|
});
|
|
191
195
|
```
|
|
192
196
|
|
|
193
|
-
## Search
|
|
197
|
+
## Search and fetch without an agent
|
|
194
198
|
|
|
195
199
|
```ts
|
|
196
200
|
import { search, fetch, runtime, tool } from "@dbx-tools/appkit-web-search";
|
|
@@ -217,7 +221,7 @@ const page = await fetch.runWebFetch({ url: result.citations[0]!.url, format: "t
|
|
|
217
221
|
|
|
218
222
|
Use direct calls for operational lookups, tests, or admin flows where a model is
|
|
219
223
|
not involved. Standalone Mastra tool factories likewise accept `runtime` or
|
|
220
|
-
`config
|
|
224
|
+
`config`. They never discover or attach to a process-global plugin:
|
|
221
225
|
|
|
222
226
|
```ts
|
|
223
227
|
const webRuntime = runtime.createWebSearchRuntime({
|
|
@@ -233,7 +237,7 @@ const tools = {
|
|
|
233
237
|
Pass the runtime explicitly or provide the executor to
|
|
234
238
|
`createWebSearchRuntime`.
|
|
235
239
|
|
|
236
|
-
## Restrict
|
|
240
|
+
## Restrict reachable URLs
|
|
237
241
|
|
|
238
242
|
```ts
|
|
239
243
|
import { allowlist } from "@dbx-tools/appkit-web-search";
|
|
@@ -246,9 +250,9 @@ list.allows("https://docs.databricks.com/aws/en/index.html"); // true
|
|
|
246
250
|
list.allows("https://evil.example.com/"); // false
|
|
247
251
|
```
|
|
248
252
|
|
|
249
|
-
Each entry is a glob compiled by [
|
|
250
|
-
A host entry (no path,
|
|
251
|
-
URL's hostname, and a bare host also matches its subdomains
|
|
253
|
+
Each entry is a glob compiled by [@dbx-tools/path](../path)'s `match` matcher.
|
|
254
|
+
A host entry (no path, for example `databricks.com` or `*.databricks.com`) matches the
|
|
255
|
+
URL's hostname, and a bare host also matches its subdomains. A path entry
|
|
252
256
|
(`docs.example.com/api/**`) matches host + pathname. Enforcement is asymmetric by
|
|
253
257
|
design: `web_search` citations are silently filtered to the permitted set (the
|
|
254
258
|
model never surfaces a source it then can't fetch), while an explicit `web_fetch`
|
|
@@ -277,10 +281,10 @@ plugin.webSearch({ urlPolicy: "unrestricted" });
|
|
|
277
281
|
plugin.webSearch({ urlPolicy: "allowlist", allowedUrls: ["*.databricks.com"] });
|
|
278
282
|
```
|
|
279
283
|
|
|
280
|
-
## Gate
|
|
284
|
+
## Gate calls for approval
|
|
281
285
|
|
|
282
286
|
Both tools run without approval by default. Pass `approval` to a tool (or set it
|
|
283
|
-
plugin-wide) to require
|
|
287
|
+
plugin-wide) to require approval. `true` gates every call. A URL pattern (or
|
|
284
288
|
list) gates only calls whose URL matches - a `web_fetch` is evaluated precisely
|
|
285
289
|
against its target URL, while a `web_search` (whose result URLs are unknown
|
|
286
290
|
before the call) treats a pattern gate as "gate every call".
|
|
@@ -307,7 +311,7 @@ tool.webFetchTool({ config: { approval: ["*.internal.example.com"] } });
|
|
|
307
311
|
Every spelling normalizes to one of three modes - `{ mode: "none" }`,
|
|
308
312
|
`{ mode: "always" }`, `{ mode: "urls", patterns }` - which is what the resolved
|
|
309
313
|
config carries and the boot log reports. Approval uses the same glob syntax as
|
|
310
|
-
the
|
|
314
|
+
the allowlist, so the two policies read identically.
|
|
311
315
|
|
|
312
316
|
## Configuration
|
|
313
317
|
|
|
@@ -334,7 +338,7 @@ built-in default.
|
|
|
334
338
|
| `WEB_SEARCH_MODEL` | `model` (dedicated override, wins over the binding below) |
|
|
335
339
|
| `DATABRICKS_SERVING_ENDPOINT_NAME` | `model` (AppKit's Model Serving binding, treated as a preference) |
|
|
336
340
|
| `WEB_SEARCH_MODEL_FALLBACKS` | `modelFallbacks` (comma/space-separated) |
|
|
337
|
-
| `WEB_SEARCH_TOOLS` | `webSearchTools` (JSON object
|
|
341
|
+
| `WEB_SEARCH_TOOLS` | `webSearchTools` (JSON object. Any other value fails at boot.) |
|
|
338
342
|
| `WEB_SEARCH_FUZZY` | `modelFuzzyMatch` |
|
|
339
343
|
| `WEB_SEARCH_FUZZY_THRESHOLD` | `modelFuzzyThreshold` |
|
|
340
344
|
| `WEB_SEARCH_MAX_CITATIONS` | `maxCitations` |
|
|
@@ -355,10 +359,10 @@ TTLs and retry budgets and why each was chosen.
|
|
|
355
359
|
|
|
356
360
|
OpenAI Responses web searches stream native search, page-read, and completion
|
|
357
361
|
status through the Mastra tool writer. The common tool-session pill updates
|
|
358
|
-
while the search runs
|
|
362
|
+
while the search runs. The completed Responses payload remains the tool result.
|
|
359
363
|
|
|
360
364
|
Requirements: the native web-search tool runs on pay-per-token GPT / Gemini
|
|
361
|
-
serving endpoints with cross-region processing enabled
|
|
365
|
+
serving endpoints with cross-region processing enabled. It is unavailable on
|
|
362
366
|
provisioned throughput, for external models, or under HIPAA/BAA compliance. See
|
|
363
367
|
the [Databricks docs](https://docs.databricks.com/aws/en/machine-learning/model-serving/web-search).
|
|
364
368
|
|
|
@@ -381,9 +385,9 @@ the [Databricks docs](https://docs.databricks.com/aws/en/machine-learning/model-
|
|
|
381
385
|
and `executeRead()`.
|
|
382
386
|
- `config` - config types, JSON schema, `resolveWebSearchConfig()`, URL policy
|
|
383
387
|
and approval helpers.
|
|
384
|
-
- `allowlist` - URL
|
|
388
|
+
- `allowlist` - URL allowlist parsing/compiling on top of `@dbx-tools/path`.
|
|
385
389
|
- `schema` - zod tool contracts and inferred types.
|
|
386
390
|
|
|
387
|
-
Pair this package with [
|
|
388
|
-
the tools
|
|
389
|
-
|
|
391
|
+
Pair this package with [@dbx-tools/appkit-mastra](../appkit-mastra) to add
|
|
392
|
+
the tools to an agent and resolve its model through [@dbx-tools/model](../model).
|
|
393
|
+
Use [@dbx-tools/email](../email) for the sibling approval-gated tool pattern.
|
package/index.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
|
|
5
5
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-web-search";
|
|
6
|
-
export const PACKAGE_VERSION = "0.9.
|
|
6
|
+
export const PACKAGE_VERSION = "0.9.136";
|
|
7
7
|
export * as allowlist from "./src/allowlist.ts";
|
|
8
8
|
export * as config from "./src/config.ts";
|
|
9
9
|
export * as defaults from "./src/defaults.ts";
|
|
@@ -21,6 +21,7 @@ export { MODEL_ENV, SERVING_ENDPOINT_ENV, DEFAULT_MODEL_FALLBACKS, DEFAULT_MAX_C
|
|
|
21
21
|
export type { ApprovalGate, ApprovalPolicy, UrlPolicyMode, ModelSource, WebSearchPluginConfig, ResolvedWebSearchConfig } from "./src/config.ts";
|
|
22
22
|
export { SEARCH_CACHE_TTL_SECONDS, FETCH_CACHE_TTL_SECONDS, SERVING_RETRY_ATTEMPTS, WEB_RETRY_ATTEMPTS, webSearchExecuteDefaults, webFetchExecuteDefaults, scrapeSearchExecuteDefaults } from "./src/defaults.ts";
|
|
23
23
|
export type { WebSearchExecuteConfig, WebSearchExecutionSettings } from "./src/defaults.ts";
|
|
24
|
+
export type { WebAssetPageFetchRequest, WebImageFetchRequest, WebImageFetchResult } from "./src/fetch.ts";
|
|
24
25
|
export { WebSearchPlugin, webSearch } from "./src/plugin.ts";
|
|
25
26
|
export { WebSearchProviderSpecSchema, WEB_SEARCH_PROVIDERS } from "./src/provider.ts";
|
|
26
27
|
export type { WebSearchProvider, WebSearchProviderSpec } from "./src/provider.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-web-search";
|
|
2
|
-
export declare const PACKAGE_VERSION = "0.9.
|
|
2
|
+
export declare const PACKAGE_VERSION = "0.9.136";
|
|
3
3
|
export * as allowlist from "./src/allowlist.ts";
|
|
4
4
|
export * as config from "./src/config.ts";
|
|
5
5
|
export * as defaults from "./src/defaults.ts";
|
|
@@ -17,6 +17,7 @@ export { MODEL_ENV, SERVING_ENDPOINT_ENV, DEFAULT_MODEL_FALLBACKS, DEFAULT_MAX_C
|
|
|
17
17
|
export type { ApprovalGate, ApprovalPolicy, UrlPolicyMode, ModelSource, WebSearchPluginConfig, ResolvedWebSearchConfig } from "./src/config.ts";
|
|
18
18
|
export { SEARCH_CACHE_TTL_SECONDS, FETCH_CACHE_TTL_SECONDS, SERVING_RETRY_ATTEMPTS, WEB_RETRY_ATTEMPTS, webSearchExecuteDefaults, webFetchExecuteDefaults, scrapeSearchExecuteDefaults } from "./src/defaults.ts";
|
|
19
19
|
export type { WebSearchExecuteConfig, WebSearchExecutionSettings } from "./src/defaults.ts";
|
|
20
|
+
export type { WebAssetPageFetchRequest, WebImageFetchRequest, WebImageFetchResult } from "./src/fetch.ts";
|
|
20
21
|
export { WebSearchPlugin, webSearch } from "./src/plugin.ts";
|
|
21
22
|
export { WebSearchProviderSpecSchema, WEB_SEARCH_PROVIDERS } from "./src/provider.ts";
|
|
22
23
|
export type { WebSearchProvider, WebSearchProviderSpec } from "./src/provider.ts";
|
package/lib/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Regenerated from the exporting modules in ./src.
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-web-search";
|
|
5
|
-
export const PACKAGE_VERSION = "0.9.
|
|
5
|
+
export const PACKAGE_VERSION = "0.9.136";
|
|
6
6
|
export * as allowlist from "./src/allowlist.js";
|
|
7
7
|
export * as config from "./src/config.js";
|
|
8
8
|
export * as defaults from "./src/defaults.js";
|
|
@@ -20,4 +20,4 @@ export { SEARCH_CACHE_TTL_SECONDS, FETCH_CACHE_TTL_SECONDS, SERVING_RETRY_ATTEMP
|
|
|
20
20
|
export { WebSearchPlugin, webSearch } from "./src/plugin.js";
|
|
21
21
|
export { WebSearchProviderSpecSchema, WEB_SEARCH_PROVIDERS } from "./src/provider.js";
|
|
22
22
|
export { WEB_SEARCH_TOOL_DESCRIPTION, WEB_FETCH_TOOL_DESCRIPTION, webSearchRequestSchema, webSearchToolRequestSchema, webSearchCitationSchema, webSearchResultSchema, webFetchRequestSchema, webFetchResultSchema } from "./src/schema.js";
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyw4QkFBOEIsQ0FBQztBQUNqRSxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxTQUFTLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssUUFBUSxNQUFNLG1CQUFtQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxLQUFLLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEMsT0FBTyxLQUFLLFFBQVEsTUFBTSxvQkFBb0IsQ0FBQztBQUMvQyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssSUFBSSxNQUFNLGVBQWUsQ0FBQztBQUV0QyxPQUFPLEVBQUUsU0FBUyxFQUFFLG9CQUFvQixFQUFFLHVCQUF1QixFQUFFLHFCQUFxQixFQUFFLHdCQUF3QixFQUFFLGtCQUFrQixFQUFFLHdCQUF3QixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFMUwsT0FBTyxFQUFFLHdCQUF3QixFQUFFLHVCQUF1QixFQUFFLHNCQUFzQixFQUFFLGtCQUFrQixFQUFFLHdCQUF3QixFQUFFLHVCQUF1QixFQUFFLDJCQUEyQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHbE4sT0FBTyxFQUFFLGVBQWUsRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUd0RixPQUFPLEVBQUUsMkJBQTJCLEVBQUUsMEJBQTBCLEVBQUUsc0JBQXNCLEVBQUUsMEJBQTBCLEVBQUUsdUJBQXVCLEVBQUUscUJBQXFCLEVBQUUscUJBQXFCLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIEdFTkVSQVRFRCBieSBwcm9qZW4gd2F0Y2ggLSBETyBOT1QgRURJVC5cbi8vIFJlZ2VuZXJhdGVkIGZyb20gdGhlIGV4cG9ydGluZyBtb2R1bGVzIGluIC4vc3JjLlxuLy8gSGFuZCBlZGl0cyBhcmUgb3ZlcndyaXR0ZW4gb24gdGhlIG5leHQgd2F0Y2g7IHRoaXMgZmlsZSBpcyByZWFkLW9ubHkuXG5cbmV4cG9ydCBjb25zdCBQQUNLQUdFX0lERU5USUZJRVIgPSBcIkBkYngtdG9vbHMvYXBwa2l0LXdlYi1zZWFyY2hcIjtcbmV4cG9ydCBjb25zdCBQQUNLQUdFX1ZFUlNJT04gPSBcIjAuOS4xMzZcIjtcbmV4cG9ydCAqIGFzIGFsbG93bGlzdCBmcm9tIFwiLi9zcmMvYWxsb3dsaXN0LnRzXCI7XG5leHBvcnQgKiBhcyBjb25maWcgZnJvbSBcIi4vc3JjL2NvbmZpZy50c1wiO1xuZXhwb3J0ICogYXMgZGVmYXVsdHMgZnJvbSBcIi4vc3JjL2RlZmF1bHRzLnRzXCI7XG5leHBvcnQgKiBhcyBmZXRjaCBmcm9tIFwiLi9zcmMvZmV0Y2gudHNcIjtcbmV4cG9ydCAqIGFzIGh0bWxUZXh0IGZyb20gXCIuL3NyYy9odG1sLXRleHQudHNcIjtcbmV4cG9ydCAqIGFzIHBsdWdpbiBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgKiBhcyBwcm92aWRlciBmcm9tIFwiLi9zcmMvcHJvdmlkZXIudHNcIjtcbmV4cG9ydCAqIGFzIHJ1bnRpbWUgZnJvbSBcIi4vc3JjL3J1bnRpbWUudHNcIjtcbmV4cG9ydCAqIGFzIHNjaGVtYSBmcm9tIFwiLi9zcmMvc2NoZW1hLnRzXCI7XG5leHBvcnQgKiBhcyBzY3JhcGUgZnJvbSBcIi4vc3JjL3NjcmFwZS50c1wiO1xuZXhwb3J0ICogYXMgc2VhcmNoIGZyb20gXCIuL3NyYy9zZWFyY2gudHNcIjtcbmV4cG9ydCAqIGFzIHRvb2wgZnJvbSBcIi4vc3JjL3Rvb2wudHNcIjtcbmV4cG9ydCB0eXBlIHsgVXJsQWxsb3dMaXN0IH0gZnJvbSBcIi4vc3JjL2FsbG93bGlzdC50c1wiO1xuZXhwb3J0IHsgTU9ERUxfRU5WLCBTRVJWSU5HX0VORFBPSU5UX0VOViwgREVGQVVMVF9NT0RFTF9GQUxMQkFDS1MsIERFRkFVTFRfTUFYX0NJVEFUSU9OUywgREVGQVVMVF9GRVRDSF9NQVhfTEVOR1RILCBERUZBVUxUX1RJTUVPVVRfTVMsIFdFQl9TRUFSQ0hfQ09ORklHX1NDSEVNQSB9IGZyb20gXCIuL3NyYy9jb25maWcudHNcIjtcbmV4cG9ydCB0eXBlIHsgQXBwcm92YWxHYXRlLCBBcHByb3ZhbFBvbGljeSwgVXJsUG9saWN5TW9kZSwgTW9kZWxTb3VyY2UsIFdlYlNlYXJjaFBsdWdpbkNvbmZpZywgUmVzb2x2ZWRXZWJTZWFyY2hDb25maWcgfSBmcm9tIFwiLi9zcmMvY29uZmlnLnRzXCI7XG5leHBvcnQgeyBTRUFSQ0hfQ0FDSEVfVFRMX1NFQ09ORFMsIEZFVENIX0NBQ0hFX1RUTF9TRUNPTkRTLCBTRVJWSU5HX1JFVFJZX0FUVEVNUFRTLCBXRUJfUkVUUllfQVRURU1QVFMsIHdlYlNlYXJjaEV4ZWN1dGVEZWZhdWx0cywgd2ViRmV0Y2hFeGVjdXRlRGVmYXVsdHMsIHNjcmFwZVNlYXJjaEV4ZWN1dGVEZWZhdWx0cyB9IGZyb20gXCIuL3NyYy9kZWZhdWx0cy50c1wiO1xuZXhwb3J0IHR5cGUgeyBXZWJTZWFyY2hFeGVjdXRlQ29uZmlnLCBXZWJTZWFyY2hFeGVjdXRpb25TZXR0aW5ncyB9IGZyb20gXCIuL3NyYy9kZWZhdWx0cy50c1wiO1xuZXhwb3J0IHR5cGUgeyBXZWJBc3NldFBhZ2VGZXRjaFJlcXVlc3QsIFdlYkltYWdlRmV0Y2hSZXF1ZXN0LCBXZWJJbWFnZUZldGNoUmVzdWx0IH0gZnJvbSBcIi4vc3JjL2ZldGNoLnRzXCI7XG5leHBvcnQgeyBXZWJTZWFyY2hQbHVnaW4sIHdlYlNlYXJjaCB9IGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCB7IFdlYlNlYXJjaFByb3ZpZGVyU3BlY1NjaGVtYSwgV0VCX1NFQVJDSF9QUk9WSURFUlMgfSBmcm9tIFwiLi9zcmMvcHJvdmlkZXIudHNcIjtcbmV4cG9ydCB0eXBlIHsgV2ViU2VhcmNoUHJvdmlkZXIsIFdlYlNlYXJjaFByb3ZpZGVyU3BlYyB9IGZyb20gXCIuL3NyYy9wcm92aWRlci50c1wiO1xuZXhwb3J0IHR5cGUgeyBXZWJTZWFyY2hFeGVjdXRvciwgV2ViU2VhcmNoUnVudGltZSwgV2ViU2VhcmNoUnVudGltZUlucHV0IH0gZnJvbSBcIi4vc3JjL3J1bnRpbWUudHNcIjtcbmV4cG9ydCB7IFdFQl9TRUFSQ0hfVE9PTF9ERVNDUklQVElPTiwgV0VCX0ZFVENIX1RPT0xfREVTQ1JJUFRJT04sIHdlYlNlYXJjaFJlcXVlc3RTY2hlbWEsIHdlYlNlYXJjaFRvb2xSZXF1ZXN0U2NoZW1hLCB3ZWJTZWFyY2hDaXRhdGlvblNjaGVtYSwgd2ViU2VhcmNoUmVzdWx0U2NoZW1hLCB3ZWJGZXRjaFJlcXVlc3RTY2hlbWEsIHdlYkZldGNoUmVzdWx0U2NoZW1hIH0gZnJvbSBcIi4vc3JjL3NjaGVtYS50c1wiO1xuZXhwb3J0IHR5cGUgeyBXZWJTZWFyY2hSZXF1ZXN0LCBXZWJTZWFyY2hUb29sUmVxdWVzdCwgV2ViU2VhcmNoQ2l0YXRpb24sIFdlYlNlYXJjaFJlc3VsdCwgV2ViRmV0Y2hSZXF1ZXN0LCBXZWJGZXRjaFJlc3VsdCB9IGZyb20gXCIuL3NyYy9zY2hlbWEudHNcIjtcbmV4cG9ydCB0eXBlIHsgV2ViU2VhcmNoQ29udGV4dCwgV2ViU2VhcmNoTW9kZWxTZWxlY3Rpb25PcHRpb25zIH0gZnJvbSBcIi4vc3JjL3NlYXJjaC50c1wiO1xuZXhwb3J0IHR5cGUgeyBXZWJTZWFyY2hUb29sT3B0aW9ucyB9IGZyb20gXCIuL3NyYy90b29sLnRzXCI7XG4iXX0=
|
package/lib/src/fetch.d.ts
CHANGED
|
@@ -16,6 +16,29 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import { type WebSearchRuntimeInput } from "./runtime.ts";
|
|
18
18
|
import type { WebFetchRequest, WebFetchResult } from "./schema.ts";
|
|
19
|
+
/** Input for a policy-checked HTML fetch used by in-process asset discovery. */
|
|
20
|
+
export interface WebAssetPageFetchRequest {
|
|
21
|
+
/** Public HTTPS page URL. */
|
|
22
|
+
url: string;
|
|
23
|
+
/** Maximum returned markup length. Defaults to 1.5 million characters. */
|
|
24
|
+
maxLength?: number;
|
|
25
|
+
}
|
|
26
|
+
/** Input for a policy-checked binary image fetch. */
|
|
27
|
+
export interface WebImageFetchRequest {
|
|
28
|
+
/** Public HTTPS image URL. */
|
|
29
|
+
url: string;
|
|
30
|
+
/** Maximum accepted response size. Defaults to 5 MiB. */
|
|
31
|
+
maxBytes?: number;
|
|
32
|
+
}
|
|
33
|
+
/** Binary image fetched through the web-search runtime's URL policy. */
|
|
34
|
+
export interface WebImageFetchResult {
|
|
35
|
+
/** Final URL after redirects. */
|
|
36
|
+
url: string;
|
|
37
|
+
/** Image media type returned by the server. */
|
|
38
|
+
contentType: string;
|
|
39
|
+
/** Fetched image bytes. */
|
|
40
|
+
data: Uint8Array;
|
|
41
|
+
}
|
|
19
42
|
/**
|
|
20
43
|
* Fetch a single URL and return its content in the requested format.
|
|
21
44
|
*
|
|
@@ -25,3 +48,11 @@ import type { WebFetchRequest, WebFetchResult } from "./schema.ts";
|
|
|
25
48
|
* `signal` cancels the in-flight fetch.
|
|
26
49
|
*/
|
|
27
50
|
export declare function runWebFetch(request: WebFetchRequest, runtimeOrConfig: WebSearchRuntimeInput, signal?: AbortSignal): Promise<WebFetchResult>;
|
|
51
|
+
/**
|
|
52
|
+
* Fetch bounded raw markup for deterministic in-process asset discovery.
|
|
53
|
+
*
|
|
54
|
+
* This does not widen the model-facing `web_fetch` cap.
|
|
55
|
+
*/
|
|
56
|
+
export declare function runWebAssetPageFetch(request: WebAssetPageFetchRequest, runtimeOrConfig: WebSearchRuntimeInput, signal?: AbortSignal): Promise<WebFetchResult>;
|
|
57
|
+
/** Fetch one public image while preserving URL policy, timeout, and redirect checks. */
|
|
58
|
+
export declare function runWebImageFetch(request: WebImageFetchRequest, runtimeOrConfig: WebSearchRuntimeInput, signal?: AbortSignal): Promise<WebImageFetchResult>;
|
package/lib/src/fetch.js
CHANGED
|
@@ -19,8 +19,10 @@ import { gotScraping } from "got-scraping";
|
|
|
19
19
|
import { assertFetchUrlAllowed } from "./_fetch-url.js";
|
|
20
20
|
import { toCallSettings, webFetchExecuteDefaults } from "./defaults.js";
|
|
21
21
|
import { decodeHtmlEntities, htmlToText } from "./html-text.js";
|
|
22
|
-
import { executeRead, toWebSearchRuntime } from "./runtime.js";
|
|
22
|
+
import { executeRead, toWebSearchRuntime, } from "./runtime.js";
|
|
23
23
|
const logger = log.logger("web-search/fetch");
|
|
24
|
+
const DEFAULT_IMAGE_MAX_BYTES = 5 * 1024 * 1024;
|
|
25
|
+
const DEFAULT_ASSET_PAGE_MAX_LENGTH = 1_500_000;
|
|
24
26
|
/** Pull the <title> text out of an HTML document, when present. */
|
|
25
27
|
function extractTitle(html) {
|
|
26
28
|
const match = /<title[^>]*>([\s\S]*?)<\/title>/i.exec(html);
|
|
@@ -33,29 +35,18 @@ function truncate(text, max) {
|
|
|
33
35
|
return { content: text, truncated: false };
|
|
34
36
|
return { content: text.slice(0, max), truncated: true };
|
|
35
37
|
}
|
|
36
|
-
/**
|
|
37
|
-
|
|
38
|
-
*
|
|
39
|
-
* Throws when the URL is not permitted by the allow-list (the visible,
|
|
40
|
-
* correctable failure the design calls for on the fetch path). The request's
|
|
41
|
-
* `maxLength` narrows (never widens) the plugin's `fetchMaxLength` cap.
|
|
42
|
-
* `signal` cancels the in-flight fetch.
|
|
43
|
-
*/
|
|
44
|
-
export async function runWebFetch(request, runtimeOrConfig, signal) {
|
|
45
|
-
const runtime = toWebSearchRuntime(runtimeOrConfig);
|
|
38
|
+
/** Fetch and cache one raw page before caller-specific output reduction. */
|
|
39
|
+
async function fetchPage(requestUrl, runtime, signal) {
|
|
46
40
|
const { config } = runtime;
|
|
47
|
-
await assertFetchUrlAllowed(
|
|
48
|
-
const cap = Math.min(request.maxLength ?? config.fetchMaxLength, config.fetchMaxLength);
|
|
49
|
-
// The response is cached before the format reduction, so the same page read
|
|
50
|
-
// as text and as html shares one network round trip.
|
|
41
|
+
await assertFetchUrlAllowed(requestUrl, config.allowList);
|
|
51
42
|
const page = await executeRead(runtime, "page-fetch", toCallSettings(webFetchExecuteDefaults, config.timeoutMs, [
|
|
52
43
|
"web-search",
|
|
53
44
|
"fetch",
|
|
54
|
-
|
|
45
|
+
requestUrl,
|
|
55
46
|
...config.allowList.patterns,
|
|
56
47
|
]), async (executeSignal) => {
|
|
57
48
|
const response = await gotScraping({
|
|
58
|
-
url:
|
|
49
|
+
url: requestUrl,
|
|
59
50
|
// Bun's node:http2 reports default-port origins with :443 while
|
|
60
51
|
// http2-wrapper compares them against URL-normalized origins.
|
|
61
52
|
http2: false,
|
|
@@ -74,13 +65,28 @@ export async function runWebFetch(request, runtimeOrConfig, signal) {
|
|
|
74
65
|
...(executeSignal ? { signal: executeSignal } : {}),
|
|
75
66
|
});
|
|
76
67
|
return {
|
|
77
|
-
url: response.url ??
|
|
68
|
+
url: response.url ?? requestUrl,
|
|
78
69
|
statusCode: response.statusCode,
|
|
79
70
|
contentType: response.headers["content-type"],
|
|
80
71
|
body: typeof response.body === "string" ? response.body : String(response.body ?? ""),
|
|
81
72
|
};
|
|
82
73
|
}, signal);
|
|
83
74
|
await assertFetchUrlAllowed(page.url, config.allowList);
|
|
75
|
+
return page;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Fetch a single URL and return its content in the requested format.
|
|
79
|
+
*
|
|
80
|
+
* Throws when the URL is not permitted by the allow-list (the visible,
|
|
81
|
+
* correctable failure the design calls for on the fetch path). The request's
|
|
82
|
+
* `maxLength` narrows (never widens) the plugin's `fetchMaxLength` cap.
|
|
83
|
+
* `signal` cancels the in-flight fetch.
|
|
84
|
+
*/
|
|
85
|
+
export async function runWebFetch(request, runtimeOrConfig, signal) {
|
|
86
|
+
const runtime = toWebSearchRuntime(runtimeOrConfig);
|
|
87
|
+
const { config } = runtime;
|
|
88
|
+
const cap = Math.min(request.maxLength ?? config.fetchMaxLength, config.fetchMaxLength);
|
|
89
|
+
const page = await fetchPage(request.url, runtime, signal);
|
|
84
90
|
const isHtml = !page.contentType || /html|xml/i.test(page.contentType);
|
|
85
91
|
const rawContent = request.format === "html" || !isHtml ? page.body : htmlToText(page.body);
|
|
86
92
|
const { content, truncated } = truncate(rawContent, cap);
|
|
@@ -101,4 +107,72 @@ export async function runWebFetch(request, runtimeOrConfig, signal) {
|
|
|
101
107
|
truncated,
|
|
102
108
|
};
|
|
103
109
|
}
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Page fetching over {@link https://www.npmjs.com/package/got-scraping | got-scraping}\n * - a `got` wrapper that generates browser-like TLS + header fingerprints, so\n * fetches survive the bot walls a plain `fetch` trips. {@link runWebFetch}\n * enforces the URL allow-list (an explicit fetch of a disallowed URL is\n * refused, not silently emptied), fetches with the plugin's timeout, and\n * returns either the raw HTML or a readable plain-text reduction, capped at\n * the configured length.\n *\n * The HTML-to-text reduction is deliberately dependency-free (strip\n * script/style, unwrap tags, decode a handful of entities, collapse\n * whitespace): good enough to feed a model, and it keeps the add-on's\n * dependency surface to the two libraries the task called for.\n *\n * @module\n */\n\nimport { log } from \"@dbx-tools/shared-core\";\nimport { gotScraping } from \"got-scraping\";\nimport { assertFetchUrlAllowed } from \"./_fetch-url.ts\";\nimport { toCallSettings, webFetchExecuteDefaults } from \"./defaults.ts\";\nimport { decodeHtmlEntities, htmlToText } from \"./html-text.ts\";\nimport { executeRead, toWebSearchRuntime, type WebSearchRuntimeInput } from \"./runtime.ts\";\nimport type { WebFetchRequest, WebFetchResult } from \"./schema.ts\";\n\nconst logger = log.logger(\"web-search/fetch\");\n\n/** The slice of a got-scraping response this module reads. */\ninterface FetchedPage {\n  url: string;\n  statusCode: number;\n  contentType: string | undefined;\n  body: string;\n}\n\n/** Pull the <title> text out of an HTML document, when present. */\nfunction extractTitle(html: string): string | undefined {\n  const match = /<title[^>]*>([\\s\\S]*?)<\\/title>/i.exec(html);\n  const title = match?.[1] ? decodeHtmlEntities(match[1]).trim() : \"\";\n  return title.length > 0 ? title : undefined;\n}\n\n/** Truncate `text` to `max` chars, reporting whether it was cut. */\nfunction truncate(text: string, max: number): { content: string; truncated: boolean } {\n  if (text.length <= max) return { content: text, truncated: false };\n  return { content: text.slice(0, max), truncated: true };\n}\n\n/**\n * Fetch a single URL and return its content in the requested format.\n *\n * Throws when the URL is not permitted by the allow-list (the visible,\n * correctable failure the design calls for on the fetch path). The request's\n * `maxLength` narrows (never widens) the plugin's `fetchMaxLength` cap.\n * `signal` cancels the in-flight fetch.\n */\nexport async function runWebFetch(\n  request: WebFetchRequest,\n  runtimeOrConfig: WebSearchRuntimeInput,\n  signal?: AbortSignal,\n): Promise<WebFetchResult> {\n  const runtime = toWebSearchRuntime(runtimeOrConfig);\n  const { config } = runtime;\n  await assertFetchUrlAllowed(request.url, config.allowList);\n  const cap = Math.min(request.maxLength ?? config.fetchMaxLength, config.fetchMaxLength);\n\n  // The response is cached before the format reduction, so the same page read\n  // as text and as html shares one network round trip.\n  const page = await executeRead(\n    runtime,\n    \"page-fetch\",\n    toCallSettings(webFetchExecuteDefaults, config.timeoutMs, [\n      \"web-search\",\n      \"fetch\",\n      request.url,\n      ...config.allowList.patterns,\n    ]),\n    async (executeSignal): Promise<FetchedPage> => {\n      const response = await gotScraping({\n        url: request.url,\n        // Bun's node:http2 reports default-port origins with :443 while\n        // http2-wrapper compares them against URL-normalized origins.\n        http2: false,\n        // got's own timeout aborts the socket and reports which phase timed\n        // out; the interceptor timeout bounds the whole attempt around it.\n        timeout: { request: config.timeoutMs },\n        throwHttpErrors: false,\n        followRedirect: true,\n        hooks: {\n          beforeRequest: [\n            async (options) => {\n              await assertFetchUrlAllowed(String(options.url), config.allowList);\n            },\n          ],\n        },\n        ...(executeSignal ? { signal: executeSignal } : {}),\n      });\n      return {\n        url: response.url ?? request.url,\n        statusCode: response.statusCode,\n        contentType: response.headers[\"content-type\"],\n        body: typeof response.body === \"string\" ? response.body : String(response.body ?? \"\"),\n      };\n    },\n    signal,\n  );\n  await assertFetchUrlAllowed(page.url, config.allowList);\n\n  const isHtml = !page.contentType || /html|xml/i.test(page.contentType);\n  const rawContent = request.format === \"html\" || !isHtml ? page.body : htmlToText(page.body);\n  const { content, truncated } = truncate(rawContent, cap);\n  const title = isHtml ? extractTitle(page.body) : undefined;\n\n  logger.debug(\"fetched\", {\n    url: page.url,\n    status: page.statusCode,\n    bytes: page.body.length,\n    returned: content.length,\n    ...(truncated ? { truncated: true } : {}),\n  });\n\n  return {\n    url: page.url,\n    status: page.statusCode,\n    ...(page.contentType ? { contentType: page.contentType } : {}),\n    ...(title ? { title } : {}),\n    content,\n    truncated,\n  };\n}\n"]}
|
|
110
|
+
/**
|
|
111
|
+
* Fetch bounded raw markup for deterministic in-process asset discovery.
|
|
112
|
+
*
|
|
113
|
+
* This does not widen the model-facing `web_fetch` cap.
|
|
114
|
+
*/
|
|
115
|
+
export async function runWebAssetPageFetch(request, runtimeOrConfig, signal) {
|
|
116
|
+
const runtime = toWebSearchRuntime(runtimeOrConfig);
|
|
117
|
+
const cap = Math.min(Math.max(1, request.maxLength ?? DEFAULT_ASSET_PAGE_MAX_LENGTH), DEFAULT_ASSET_PAGE_MAX_LENGTH);
|
|
118
|
+
const page = await fetchPage(request.url, runtime, signal);
|
|
119
|
+
const { content, truncated } = truncate(page.body, cap);
|
|
120
|
+
const title = extractTitle(page.body);
|
|
121
|
+
return {
|
|
122
|
+
url: page.url,
|
|
123
|
+
status: page.statusCode,
|
|
124
|
+
...(page.contentType ? { contentType: page.contentType } : {}),
|
|
125
|
+
...(title ? { title } : {}),
|
|
126
|
+
content,
|
|
127
|
+
truncated,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
/** Fetch one public image while preserving URL policy, timeout, and redirect checks. */
|
|
131
|
+
export async function runWebImageFetch(request, runtimeOrConfig, signal) {
|
|
132
|
+
const runtime = toWebSearchRuntime(runtimeOrConfig);
|
|
133
|
+
const { config } = runtime;
|
|
134
|
+
const maxBytes = Math.max(1, request.maxBytes ?? DEFAULT_IMAGE_MAX_BYTES);
|
|
135
|
+
await assertFetchUrlAllowed(request.url, config.allowList);
|
|
136
|
+
const page = await executeRead(runtime, "image-fetch", {
|
|
137
|
+
default: {
|
|
138
|
+
cache: { enabled: false },
|
|
139
|
+
retry: { enabled: true, attempts: 2 },
|
|
140
|
+
timeout: config.timeoutMs,
|
|
141
|
+
},
|
|
142
|
+
}, async (executeSignal) => {
|
|
143
|
+
const response = await gotScraping({
|
|
144
|
+
url: request.url,
|
|
145
|
+
responseType: "buffer",
|
|
146
|
+
http2: false,
|
|
147
|
+
timeout: { request: config.timeoutMs },
|
|
148
|
+
throwHttpErrors: true,
|
|
149
|
+
followRedirect: true,
|
|
150
|
+
hooks: {
|
|
151
|
+
beforeRequest: [
|
|
152
|
+
async (options) => {
|
|
153
|
+
await assertFetchUrlAllowed(String(options.url), config.allowList);
|
|
154
|
+
},
|
|
155
|
+
],
|
|
156
|
+
},
|
|
157
|
+
...(executeSignal ? { signal: executeSignal } : {}),
|
|
158
|
+
});
|
|
159
|
+
const contentType = String(response.headers["content-type"] ?? "")
|
|
160
|
+
.split(";")[0]
|
|
161
|
+
.trim()
|
|
162
|
+
.toLowerCase();
|
|
163
|
+
if (!contentType.startsWith("image/")) {
|
|
164
|
+
throw new TypeError(`Expected an image response, received ${contentType || "unknown"}`);
|
|
165
|
+
}
|
|
166
|
+
if (response.body.byteLength > maxBytes) {
|
|
167
|
+
throw new RangeError(`Image response exceeds ${maxBytes} bytes`);
|
|
168
|
+
}
|
|
169
|
+
return {
|
|
170
|
+
url: response.url ?? request.url,
|
|
171
|
+
contentType,
|
|
172
|
+
data: new Uint8Array(response.body),
|
|
173
|
+
};
|
|
174
|
+
}, signal, false);
|
|
175
|
+
await assertFetchUrlAllowed(page.url, config.allowList);
|
|
176
|
+
return page;
|
|
177
|
+
}
|
|
178
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Page fetching over {@link https://www.npmjs.com/package/got-scraping | got-scraping}\n * - a `got` wrapper that generates browser-like TLS + header fingerprints, so\n * fetches survive the bot walls a plain `fetch` trips. {@link runWebFetch}\n * enforces the URL allow-list (an explicit fetch of a disallowed URL is\n * refused, not silently emptied), fetches with the plugin's timeout, and\n * returns either the raw HTML or a readable plain-text reduction, capped at\n * the configured length.\n *\n * The HTML-to-text reduction is deliberately dependency-free (strip\n * script/style, unwrap tags, decode a handful of entities, collapse\n * whitespace): good enough to feed a model, and it keeps the add-on's\n * dependency surface to the two libraries the task called for.\n *\n * @module\n */\n\nimport { log } from \"@dbx-tools/shared-core\";\nimport { gotScraping } from \"got-scraping\";\nimport { assertFetchUrlAllowed } from \"./_fetch-url.ts\";\nimport { toCallSettings, webFetchExecuteDefaults } from \"./defaults.ts\";\nimport { decodeHtmlEntities, htmlToText } from \"./html-text.ts\";\nimport {\n  executeRead,\n  toWebSearchRuntime,\n  type WebSearchRuntime,\n  type WebSearchRuntimeInput,\n} from \"./runtime.ts\";\nimport type { WebFetchRequest, WebFetchResult } from \"./schema.ts\";\n\nconst logger = log.logger(\"web-search/fetch\");\nconst DEFAULT_IMAGE_MAX_BYTES = 5 * 1024 * 1024;\nconst DEFAULT_ASSET_PAGE_MAX_LENGTH = 1_500_000;\n\n/** Input for a policy-checked HTML fetch used by in-process asset discovery. */\nexport interface WebAssetPageFetchRequest {\n  /** Public HTTPS page URL. */\n  url: string;\n  /** Maximum returned markup length. Defaults to 1.5 million characters. */\n  maxLength?: number;\n}\n\n/** Input for a policy-checked binary image fetch. */\nexport interface WebImageFetchRequest {\n  /** Public HTTPS image URL. */\n  url: string;\n  /** Maximum accepted response size. Defaults to 5 MiB. */\n  maxBytes?: number;\n}\n\n/** Binary image fetched through the web-search runtime's URL policy. */\nexport interface WebImageFetchResult {\n  /** Final URL after redirects. */\n  url: string;\n  /** Image media type returned by the server. */\n  contentType: string;\n  /** Fetched image bytes. */\n  data: Uint8Array;\n}\n\n/** The slice of a got-scraping response this module reads. */\ninterface FetchedPage {\n  url: string;\n  statusCode: number;\n  contentType: string | undefined;\n  body: string;\n}\n\n/** Pull the <title> text out of an HTML document, when present. */\nfunction extractTitle(html: string): string | undefined {\n  const match = /<title[^>]*>([\\s\\S]*?)<\\/title>/i.exec(html);\n  const title = match?.[1] ? decodeHtmlEntities(match[1]).trim() : \"\";\n  return title.length > 0 ? title : undefined;\n}\n\n/** Truncate `text` to `max` chars, reporting whether it was cut. */\nfunction truncate(text: string, max: number): { content: string; truncated: boolean } {\n  if (text.length <= max) return { content: text, truncated: false };\n  return { content: text.slice(0, max), truncated: true };\n}\n\n/** Fetch and cache one raw page before caller-specific output reduction. */\nasync function fetchPage(\n  requestUrl: string,\n  runtime: WebSearchRuntime,\n  signal?: AbortSignal,\n): Promise<FetchedPage> {\n  const { config } = runtime;\n  await assertFetchUrlAllowed(requestUrl, config.allowList);\n  const page = await executeRead(\n    runtime,\n    \"page-fetch\",\n    toCallSettings(webFetchExecuteDefaults, config.timeoutMs, [\n      \"web-search\",\n      \"fetch\",\n      requestUrl,\n      ...config.allowList.patterns,\n    ]),\n    async (executeSignal): Promise<FetchedPage> => {\n      const response = await gotScraping({\n        url: requestUrl,\n        // Bun's node:http2 reports default-port origins with :443 while\n        // http2-wrapper compares them against URL-normalized origins.\n        http2: false,\n        // got's own timeout aborts the socket and reports which phase timed\n        // out; the interceptor timeout bounds the whole attempt around it.\n        timeout: { request: config.timeoutMs },\n        throwHttpErrors: false,\n        followRedirect: true,\n        hooks: {\n          beforeRequest: [\n            async (options) => {\n              await assertFetchUrlAllowed(String(options.url), config.allowList);\n            },\n          ],\n        },\n        ...(executeSignal ? { signal: executeSignal } : {}),\n      });\n      return {\n        url: response.url ?? requestUrl,\n        statusCode: response.statusCode,\n        contentType: response.headers[\"content-type\"],\n        body: typeof response.body === \"string\" ? response.body : String(response.body ?? \"\"),\n      };\n    },\n    signal,\n  );\n  await assertFetchUrlAllowed(page.url, config.allowList);\n  return page;\n}\n\n/**\n * Fetch a single URL and return its content in the requested format.\n *\n * Throws when the URL is not permitted by the allow-list (the visible,\n * correctable failure the design calls for on the fetch path). The request's\n * `maxLength` narrows (never widens) the plugin's `fetchMaxLength` cap.\n * `signal` cancels the in-flight fetch.\n */\nexport async function runWebFetch(\n  request: WebFetchRequest,\n  runtimeOrConfig: WebSearchRuntimeInput,\n  signal?: AbortSignal,\n): Promise<WebFetchResult> {\n  const runtime = toWebSearchRuntime(runtimeOrConfig);\n  const { config } = runtime;\n  const cap = Math.min(request.maxLength ?? config.fetchMaxLength, config.fetchMaxLength);\n  const page = await fetchPage(request.url, runtime, signal);\n\n  const isHtml = !page.contentType || /html|xml/i.test(page.contentType);\n  const rawContent = request.format === \"html\" || !isHtml ? page.body : htmlToText(page.body);\n  const { content, truncated } = truncate(rawContent, cap);\n  const title = isHtml ? extractTitle(page.body) : undefined;\n\n  logger.debug(\"fetched\", {\n    url: page.url,\n    status: page.statusCode,\n    bytes: page.body.length,\n    returned: content.length,\n    ...(truncated ? { truncated: true } : {}),\n  });\n\n  return {\n    url: page.url,\n    status: page.statusCode,\n    ...(page.contentType ? { contentType: page.contentType } : {}),\n    ...(title ? { title } : {}),\n    content,\n    truncated,\n  };\n}\n\n/**\n * Fetch bounded raw markup for deterministic in-process asset discovery.\n *\n * This does not widen the model-facing `web_fetch` cap.\n */\nexport async function runWebAssetPageFetch(\n  request: WebAssetPageFetchRequest,\n  runtimeOrConfig: WebSearchRuntimeInput,\n  signal?: AbortSignal,\n): Promise<WebFetchResult> {\n  const runtime = toWebSearchRuntime(runtimeOrConfig);\n  const cap = Math.min(\n    Math.max(1, request.maxLength ?? DEFAULT_ASSET_PAGE_MAX_LENGTH),\n    DEFAULT_ASSET_PAGE_MAX_LENGTH,\n  );\n  const page = await fetchPage(request.url, runtime, signal);\n  const { content, truncated } = truncate(page.body, cap);\n  const title = extractTitle(page.body);\n  return {\n    url: page.url,\n    status: page.statusCode,\n    ...(page.contentType ? { contentType: page.contentType } : {}),\n    ...(title ? { title } : {}),\n    content,\n    truncated,\n  };\n}\n\n/** Fetch one public image while preserving URL policy, timeout, and redirect checks. */\nexport async function runWebImageFetch(\n  request: WebImageFetchRequest,\n  runtimeOrConfig: WebSearchRuntimeInput,\n  signal?: AbortSignal,\n): Promise<WebImageFetchResult> {\n  const runtime = toWebSearchRuntime(runtimeOrConfig);\n  const { config } = runtime;\n  const maxBytes = Math.max(1, request.maxBytes ?? DEFAULT_IMAGE_MAX_BYTES);\n  await assertFetchUrlAllowed(request.url, config.allowList);\n  const page = await executeRead(\n    runtime,\n    \"image-fetch\",\n    {\n      default: {\n        cache: { enabled: false },\n        retry: { enabled: true, attempts: 2 },\n        timeout: config.timeoutMs,\n      },\n    },\n    async (executeSignal) => {\n      const response = await gotScraping({\n        url: request.url,\n        responseType: \"buffer\",\n        http2: false,\n        timeout: { request: config.timeoutMs },\n        throwHttpErrors: true,\n        followRedirect: true,\n        hooks: {\n          beforeRequest: [\n            async (options) => {\n              await assertFetchUrlAllowed(String(options.url), config.allowList);\n            },\n          ],\n        },\n        ...(executeSignal ? { signal: executeSignal } : {}),\n      });\n      const contentType = String(response.headers[\"content-type\"] ?? \"\")\n        .split(\";\")[0]!\n        .trim()\n        .toLowerCase();\n      if (!contentType.startsWith(\"image/\")) {\n        throw new TypeError(`Expected an image response, received ${contentType || \"unknown\"}`);\n      }\n      if (response.body.byteLength > maxBytes) {\n        throw new RangeError(`Image response exceeds ${maxBytes} bytes`);\n      }\n      return {\n        url: response.url ?? request.url,\n        contentType,\n        data: new Uint8Array(response.body),\n      };\n    },\n    signal,\n    false,\n  );\n  await assertFetchUrlAllowed(page.url, config.allowList);\n  return page;\n}\n"]}
|
package/lib/src/plugin.d.ts
CHANGED
|
@@ -19,6 +19,7 @@ import { type ToolRegistry } from "@databricks/appkit/beta";
|
|
|
19
19
|
import { ToolRegistryPlugin } from "@dbx-tools/appkit";
|
|
20
20
|
import type { AgentToolExecutionContext } from "@dbx-tools/appkit/tool-provider";
|
|
21
21
|
import { type WebSearchPluginConfig } from "./config.ts";
|
|
22
|
+
import { type WebAssetPageFetchRequest, type WebImageFetchRequest, type WebImageFetchResult } from "./fetch.ts";
|
|
22
23
|
import type { WebFetchRequest, WebFetchResult, WebSearchRequest, WebSearchResult } from "./schema.ts";
|
|
23
24
|
/**
|
|
24
25
|
* AppKit plugin that resolves and holds the web-search runtime config used
|
|
@@ -123,6 +124,10 @@ export declare class WebSearchPlugin extends ToolRegistryPlugin<WebSearchPluginC
|
|
|
123
124
|
* configured URL policy.
|
|
124
125
|
*/
|
|
125
126
|
fetch: (request: WebFetchRequest, signal?: AbortSignal) => Promise<WebFetchResult>;
|
|
127
|
+
/** Fetch expanded HTML for in-process asset discovery. */
|
|
128
|
+
fetchAssetPage: (request: WebAssetPageFetchRequest, signal?: AbortSignal) => Promise<WebFetchResult>;
|
|
129
|
+
/** Fetch one image for in-process visual research. */
|
|
130
|
+
fetchImage: (request: WebImageFetchRequest, signal?: AbortSignal) => Promise<WebImageFetchResult>;
|
|
126
131
|
};
|
|
127
132
|
private search;
|
|
128
133
|
private fetch;
|