@dbx-tools/search 0.9.154 → 0.9.157
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/index.ts +13 -8
- package/lib/index.d.ts +13 -8
- package/lib/index.js +12 -7
- package/lib/src/client.d.ts +1 -2
- package/lib/src/client.js +15 -15
- package/lib/src/config.js +16 -16
- package/lib/src/lakebase-plugin.js +9 -11
- package/lib/src/lakebase.js +9 -11
- package/lib/src/native.js +5 -5
- package/lib/src/plugin.d.ts +5 -5
- package/lib/src/plugin.js +20 -20
- package/lib/src/query.js +4 -4
- package/lib/src/schema.d.ts +0 -66
- package/lib/src/schema.js +7 -20
- package/lib/src/tool.js +14 -16
- package/package.json +9 -105
- package/src/client.ts +14 -17
- package/src/config.ts +16 -44
- package/src/lakebase-plugin.ts +8 -10
- package/src/lakebase.ts +16 -13
- package/src/native.ts +6 -6
- package/src/plugin.ts +31 -24
- package/src/query.ts +3 -3
- package/src/schema.ts +6 -25
- package/src/tool.ts +22 -20
package/lib/src/tool.js
CHANGED
|
@@ -14,14 +14,14 @@
|
|
|
14
14
|
*
|
|
15
15
|
* @module
|
|
16
16
|
*/
|
|
17
|
-
import {
|
|
17
|
+
import { createIndexRequestSchema, indexInfoSchema, searchDocumentSchema, searchRequestSchema, searchResultSchema, syncIndexRequestSchema, universalSearchRequestSchema, upsertResultSchema, } from "@dbx-tools/shared-search";
|
|
18
18
|
import { createTool } from "@mastra/core/tools";
|
|
19
19
|
import { z } from "zod";
|
|
20
20
|
import { toSearchOptions, toUniversalSearchOptions } from "./_search-options.js";
|
|
21
21
|
import { toCreateIndexOptions } from "./index-options.js";
|
|
22
22
|
import { toDocumentArray } from "./query.js";
|
|
23
23
|
import { createSearchRuntime } from "./runtime.js";
|
|
24
|
-
import { ADD_DOCUMENTS_TOOL_DESCRIPTION, CREATE_INDEX_TOOL_DESCRIPTION, SEARCH_TOOL_DESCRIPTION, SYNC_INDEX_TOOL_DESCRIPTION, UNIVERSAL_SEARCH_TOOL_DESCRIPTION,
|
|
24
|
+
import { ADD_DOCUMENTS_TOOL_DESCRIPTION, CREATE_INDEX_TOOL_DESCRIPTION, SEARCH_TOOL_DESCRIPTION, SYNC_INDEX_TOOL_DESCRIPTION, UNIVERSAL_SEARCH_TOOL_DESCRIPTION, } from "./schema.js";
|
|
25
25
|
/** Resolve the isolated runtime captured by one standalone tool factory. */
|
|
26
26
|
function toolRuntime(options) {
|
|
27
27
|
if (options.runtime && (options.config || options.readBackend)) {
|
|
@@ -53,10 +53,10 @@ export function searchTool(options = {}) {
|
|
|
53
53
|
return createTool({
|
|
54
54
|
id: options.id ?? "search",
|
|
55
55
|
description: SEARCH_TOOL_DESCRIPTION,
|
|
56
|
-
inputSchema:
|
|
56
|
+
inputSchema: searchRequestSchema,
|
|
57
57
|
outputSchema: searchResultSchema,
|
|
58
58
|
execute: async (input, context) => {
|
|
59
|
-
const request =
|
|
59
|
+
const request = searchRequestSchema.parse(input);
|
|
60
60
|
return runtime.client.search(request.query, toSearchOptions(request, context?.abortSignal));
|
|
61
61
|
},
|
|
62
62
|
});
|
|
@@ -67,10 +67,10 @@ export function universalSearchTool(options = {}) {
|
|
|
67
67
|
return createTool({
|
|
68
68
|
id: options.id ?? "universal_search",
|
|
69
69
|
description: UNIVERSAL_SEARCH_TOOL_DESCRIPTION,
|
|
70
|
-
inputSchema:
|
|
70
|
+
inputSchema: universalSearchRequestSchema,
|
|
71
71
|
outputSchema: searchResultSchema,
|
|
72
72
|
execute: async (input, context) => {
|
|
73
|
-
const request =
|
|
73
|
+
const request = universalSearchRequestSchema.parse(input);
|
|
74
74
|
return runtime.client.universalSearch(request.query, toUniversalSearchOptions(request, context?.abortSignal));
|
|
75
75
|
},
|
|
76
76
|
});
|
|
@@ -81,16 +81,14 @@ export function universalSearchTool(options = {}) {
|
|
|
81
81
|
*/
|
|
82
82
|
export function addDocumentsTool(options = {}) {
|
|
83
83
|
const runtime = toolRuntime(options);
|
|
84
|
-
const inputSchema =
|
|
84
|
+
const inputSchema = searchDocumentSchema
|
|
85
85
|
.array()
|
|
86
86
|
.describe("Documents to add or update. Each must include the index primary key.");
|
|
87
87
|
return createTool({
|
|
88
88
|
id: options.id ?? "add_documents",
|
|
89
89
|
description: ADD_DOCUMENTS_TOOL_DESCRIPTION,
|
|
90
|
-
inputSchema:
|
|
91
|
-
|
|
92
|
-
.extend({ documents: inputSchema }),
|
|
93
|
-
outputSchema: searchSchemas.upsertResultSchema,
|
|
90
|
+
inputSchema: searchRequestSchema.pick({ index: true }).extend({ documents: inputSchema }),
|
|
91
|
+
outputSchema: upsertResultSchema,
|
|
94
92
|
execute: async (input, context) => {
|
|
95
93
|
const { client, config } = runtime;
|
|
96
94
|
const record = input;
|
|
@@ -111,10 +109,10 @@ export function createIndexTool(options = {}) {
|
|
|
111
109
|
return createTool({
|
|
112
110
|
id: options.id ?? "create_index",
|
|
113
111
|
description: CREATE_INDEX_TOOL_DESCRIPTION,
|
|
114
|
-
inputSchema:
|
|
112
|
+
inputSchema: createIndexRequestSchema,
|
|
115
113
|
outputSchema: indexInfoSchema,
|
|
116
114
|
execute: async (input, context) => {
|
|
117
|
-
const request =
|
|
115
|
+
const request = createIndexRequestSchema.parse(input);
|
|
118
116
|
return runtime.client.createIndex(request.name, toCreateIndexOptions(request, context?.abortSignal));
|
|
119
117
|
},
|
|
120
118
|
});
|
|
@@ -133,10 +131,10 @@ export function syncIndexTool(options = {}) {
|
|
|
133
131
|
return createTool({
|
|
134
132
|
id: options.id ?? "sync_index",
|
|
135
133
|
description: SYNC_INDEX_TOOL_DESCRIPTION,
|
|
136
|
-
inputSchema:
|
|
134
|
+
inputSchema: syncIndexRequestSchema,
|
|
137
135
|
outputSchema: syncIndexResultSchema,
|
|
138
136
|
execute: async (input, context) => {
|
|
139
|
-
const request =
|
|
137
|
+
const request = syncIndexRequestSchema.parse(input);
|
|
140
138
|
const { client, config } = runtime;
|
|
141
139
|
const index = request.index ?? config.defaultIndex ?? "";
|
|
142
140
|
await client.syncIndex(index, context?.abortSignal);
|
|
@@ -144,4 +142,4 @@ export function syncIndexTool(options = {}) {
|
|
|
144
142
|
},
|
|
145
143
|
});
|
|
146
144
|
}
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/tool.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The `search`, `universal_search`, and (opt-in) `add_documents`,\n * `create_index`, and `sync_index` Mastra tools.\n *\n * App-integrated agents should consume the plugin's native toolkit so calls\n * retain that plugin's config and provider backend. These standalone factories\n * capture an explicit runtime or build an isolated one from config plus a\n * provider. They run under the caller's OBO scope (the client resolves the\n * execution context's workspace client), so search runs as the requesting user\n * and Unity Catalog ACLs apply.\n *\n * The same tools are exposed to AppKit's own agents through the plugin's\n * `ToolProvider` (see `plugin.ts`).\n *\n * @module\n */\n\nimport { searchSchemas, type UpsertResult } from \"@dbx-tools/shared-search\";\nimport { createTool } from \"@mastra/core/tools\";\nimport { z } from \"zod\";\nimport { toSearchOptions, toUniversalSearchOptions } from \"./_search-options.ts\";\nimport type { SearchReadBackend } from \"./client.ts\";\nimport type { SearchPluginConfig } from \"./config.ts\";\nimport { toCreateIndexOptions } from \"./index-options.ts\";\nimport { toDocumentArray } from \"./query.ts\";\nimport { createSearchRuntime, type SearchRuntime } from \"./runtime.ts\";\nimport {\n  ADD_DOCUMENTS_TOOL_DESCRIPTION,\n  CREATE_INDEX_TOOL_DESCRIPTION,\n  SEARCH_TOOL_DESCRIPTION,\n  SYNC_INDEX_TOOL_DESCRIPTION,\n  UNIVERSAL_SEARCH_TOOL_DESCRIPTION,\n  createIndexToolSchema,\n  indexInfoSchema,\n  searchResultSchema,\n  searchToolSchema,\n  syncIndexToolSchema,\n  universalSearchToolSchema,\n} from \"./schema.ts\";\n\n/** Options accepted by every standalone tool factory. */\nexport interface SearchToolOptions {\n  /** Override the tool id (defaults per tool). */\n  id?: string;\n  /** Isolated runtime used by this standalone tool. Mutually exclusive with config/backend. */\n  runtime?: SearchRuntime;\n  /** Config used to create an isolated runtime. */\n  config?: SearchPluginConfig;\n  /** Provider used when creating a runtime from config. */\n  readBackend?: SearchReadBackend;\n}\n\n/** Resolve the isolated runtime captured by one standalone tool factory. */\nfunction toolRuntime(options: SearchToolOptions): SearchRuntime {\n  if (options.runtime && (options.config || options.readBackend)) {\n    throw new TypeError(\"search tool options accept runtime or config/readBackend, not both\");\n  }\n  return (\n    options.runtime ??\n    createSearchRuntime({\n      config: options.config,\n      readBackend: options.readBackend,\n    })\n  );\n}\n\n/**\n * Build the `search` tool. Spread it into any agent that should be able to look\n * things up in an index.\n *\n * @example\n * ```ts\n * import { searchTool } from \"@dbx-tools/search\";\n * import { createAgent } from \"@dbx-tools/appkit-mastra\";\n *\n * const support = createAgent({\n *   instructions: \"Answer from the docs. Use `search` to find them.\",\n *   tools: () => ({ search: searchTool() }),\n * });\n * ```\n */\nexport function searchTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"search\",\n    description: SEARCH_TOOL_DESCRIPTION,\n    inputSchema: searchToolSchema,\n    outputSchema: searchResultSchema,\n    execute: async (input, context) => {\n      const request = searchToolSchema.parse(input);\n      return runtime.client.search(request.query, toSearchOptions(request, context?.abortSignal));\n    },\n  });\n}\n\n/** Build the `universal_search` tool (federated search across every index). */\nexport function universalSearchTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"universal_search\",\n    description: UNIVERSAL_SEARCH_TOOL_DESCRIPTION,\n    inputSchema: universalSearchToolSchema,\n    outputSchema: searchResultSchema,\n    execute: async (input, context) => {\n      const request = universalSearchToolSchema.parse(input);\n      return runtime.client.universalSearch(\n        request.query,\n        toUniversalSearchOptions(request, context?.abortSignal),\n      );\n    },\n  });\n}\n\n/**\n * Build the opt-in `add_documents` tool (write into a direct-access index).\n * Only install it when the plugin's write surface is enabled.\n */\nexport function addDocumentsTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  const inputSchema = searchSchemas.searchDocumentSchema\n    .array()\n    .describe(\"Documents to add or update. Each must include the index primary key.\");\n  return createTool({\n    id: options.id ?? \"add_documents\",\n    description: ADD_DOCUMENTS_TOOL_DESCRIPTION,\n    inputSchema: searchSchemas.searchRequestSchema\n      .pick({ index: true })\n      .extend({ documents: inputSchema }),\n    outputSchema: searchSchemas.upsertResultSchema,\n    execute: async (input, context): Promise<UpsertResult> => {\n      const { client, config } = runtime;\n      const record = input as { index?: string; documents: unknown };\n      const documents = toDocumentArray(record.documents);\n      const index = record.index ?? config.defaultIndex ?? \"\";\n      return client.addDocuments(index, documents, context?.abortSignal);\n    },\n  });\n}\n\n/**\n * Build the opt-in `create_index` tool (provision a Vector Search index).\n * Only install it when the plugin's write surface is enabled. Delegates to\n * {@link SearchClient.createIndex}, inferring the endpoint, embedding model,\n * key, and columns from the request + plugin config.\n */\nexport function createIndexTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"create_index\",\n    description: CREATE_INDEX_TOOL_DESCRIPTION,\n    inputSchema: createIndexToolSchema,\n    outputSchema: indexInfoSchema,\n    execute: async (input, context) => {\n      const request = createIndexToolSchema.parse(input);\n      return runtime.client.createIndex(\n        request.name,\n        toCreateIndexOptions(request, context?.abortSignal),\n      );\n    },\n  });\n}\n\n/** Output schema for the `sync_index` tool. */\nconst syncIndexResultSchema = z.object({\n  index: z.string().describe(\"The index that was synced.\"),\n  synced: z.boolean().describe(\"True once the sync was triggered.\"),\n});\n\n/**\n * Build the opt-in `sync_index` tool (refresh a Delta Sync index from its\n * source table). Only install it when the plugin's write surface is enabled.\n */\nexport function syncIndexTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"sync_index\",\n    description: SYNC_INDEX_TOOL_DESCRIPTION,\n    inputSchema: syncIndexToolSchema,\n    outputSchema: syncIndexResultSchema,\n    execute: async (input, context) => {\n      const request = syncIndexToolSchema.parse(input);\n      const { client, config } = runtime;\n      const index = request.index ?? config.defaultIndex ?? \"\";\n      await client.syncIndex(index, context?.abortSignal);\n      return { index, synced: true };\n    },\n  });\n}\n"]}
|
|
145
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EACL,wBAAwB,EACxB,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,4BAA4B,EAC5B,kBAAkB,GAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAGjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAsB,MAAM,cAAc,CAAC;AACvE,OAAO,EACL,8BAA8B,EAC9B,6BAA6B,EAC7B,uBAAuB,EACvB,2BAA2B,EAC3B,iCAAiC,GAClC,MAAM,aAAa,CAAC;AAcrB,4EAA4E;AAC5E,SAAS,WAAW,CAAC,OAA0B;IAC7C,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,SAAS,CAAC,oEAAoE,CAAC,CAAC;IAC5F,CAAC;IACD,OAAO,CACL,OAAO,CAAC,OAAO;QACf,mBAAmB,CAAC;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,UAAU,CAAC,UAA6B,EAAE;IACxD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,UAAU,CAAC;QAChB,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,QAAQ;QAC1B,WAAW,EAAE,uBAAuB;QACpC,WAAW,EAAE,mBAAmB;QAChC,YAAY,EAAE,kBAAkB;QAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9F,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,mBAAmB,CAAC,UAA6B,EAAE;IACjE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,UAAU,CAAC;QAChB,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,kBAAkB;QACpC,WAAW,EAAE,iCAAiC;QAC9C,WAAW,EAAE,4BAA4B;QACzC,YAAY,EAAE,kBAAkB;QAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,4BAA4B,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1D,OAAO,OAAO,CAAC,MAAM,CAAC,eAAe,CACnC,OAAO,CAAC,KAAK,EACb,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CACxD,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,UAA6B,EAAE;IAC9D,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,oBAAoB;SACrC,KAAK,EAAE;SACP,QAAQ,CAAC,sEAAsE,CAAC,CAAC;IACpF,OAAO,UAAU,CAAC;QAChB,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,eAAe;QACjC,WAAW,EAAE,8BAA8B;QAC3C,WAAW,EAAE,mBAAmB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QACzF,YAAY,EAAE,kBAAkB;QAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAyB,EAAE;YACvD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YACnC,MAAM,MAAM,GAAG,KAA+C,CAAC;YAC/D,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACpD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;YACxD,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QACrE,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,UAA6B,EAAE;IAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,UAAU,CAAC;QAChB,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,cAAc;QAChC,WAAW,EAAE,6BAA6B;QAC1C,WAAW,EAAE,wBAAwB;QACrC,YAAY,EAAE,eAAe;QAC7B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtD,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAC/B,OAAO,CAAC,IAAI,EACZ,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CACpD,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,+CAA+C;AAC/C,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC;IACxD,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;CAClE,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,UAA6B,EAAE;IAC3D,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,UAAU,CAAC;QAChB,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,YAAY;QAC9B,WAAW,EAAE,2BAA2B;QACxC,WAAW,EAAE,sBAAsB;QACnC,YAAY,EAAE,qBAAqB;QACnC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YACnC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;YACzD,MAAM,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YACpD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,CAAC;KACF,CAAC,CAAC;AACL,CAAC","sourcesContent":["/**\n * The `search`, `universal_search`, and (opt-in) `add_documents`,\n * `create_index`, and `sync_index` Mastra tools.\n *\n * App-integrated agents should consume the plugin's native toolkit so calls\n * retain that plugin's config and provider backend. These standalone factories\n * capture an explicit runtime or build an isolated one from config plus a\n * provider. They run under the caller's OBO scope (the client resolves the\n * execution context's workspace client), so search runs as the requesting user\n * and Unity Catalog ACLs apply.\n *\n * The same tools are exposed to AppKit's own agents through the plugin's\n * `ToolProvider` (see `plugin.ts`).\n *\n * @module\n */\n\nimport {\n  createIndexRequestSchema,\n  indexInfoSchema,\n  searchDocumentSchema,\n  searchRequestSchema,\n  searchResultSchema,\n  syncIndexRequestSchema,\n  universalSearchRequestSchema,\n  upsertResultSchema,\n  type UpsertResult,\n} from \"@dbx-tools/shared-search\";\nimport { createTool } from \"@mastra/core/tools\";\nimport { z } from \"zod\";\nimport { toSearchOptions, toUniversalSearchOptions } from \"./_search-options.ts\";\nimport type { SearchReadBackend } from \"./client.ts\";\nimport type { SearchPluginConfig } from \"./config.ts\";\nimport { toCreateIndexOptions } from \"./index-options.ts\";\nimport { toDocumentArray } from \"./query.ts\";\nimport { createSearchRuntime, type SearchRuntime } from \"./runtime.ts\";\nimport {\n  ADD_DOCUMENTS_TOOL_DESCRIPTION,\n  CREATE_INDEX_TOOL_DESCRIPTION,\n  SEARCH_TOOL_DESCRIPTION,\n  SYNC_INDEX_TOOL_DESCRIPTION,\n  UNIVERSAL_SEARCH_TOOL_DESCRIPTION,\n} from \"./schema.ts\";\n\n/** Options accepted by every standalone tool factory. */\nexport interface SearchToolOptions {\n  /** Override the tool id (defaults per tool). */\n  id?: string;\n  /** Isolated runtime used by this standalone tool. Mutually exclusive with config/backend. */\n  runtime?: SearchRuntime;\n  /** Config used to create an isolated runtime. */\n  config?: SearchPluginConfig;\n  /** Provider used when creating a runtime from config. */\n  readBackend?: SearchReadBackend;\n}\n\n/** Resolve the isolated runtime captured by one standalone tool factory. */\nfunction toolRuntime(options: SearchToolOptions): SearchRuntime {\n  if (options.runtime && (options.config || options.readBackend)) {\n    throw new TypeError(\"search tool options accept runtime or config/readBackend, not both\");\n  }\n  return (\n    options.runtime ??\n    createSearchRuntime({\n      config: options.config,\n      readBackend: options.readBackend,\n    })\n  );\n}\n\n/**\n * Build the `search` tool. Spread it into any agent that should be able to look\n * things up in an index.\n *\n * @example\n * ```ts\n * import { searchTool } from \"@dbx-tools/search\";\n * import { createAgent } from \"@dbx-tools/appkit-mastra\";\n *\n * const support = createAgent({\n *   instructions: \"Answer from the docs. Use `search` to find them.\",\n *   tools: () => ({ search: searchTool() }),\n * });\n * ```\n */\nexport function searchTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"search\",\n    description: SEARCH_TOOL_DESCRIPTION,\n    inputSchema: searchRequestSchema,\n    outputSchema: searchResultSchema,\n    execute: async (input, context) => {\n      const request = searchRequestSchema.parse(input);\n      return runtime.client.search(request.query, toSearchOptions(request, context?.abortSignal));\n    },\n  });\n}\n\n/** Build the `universal_search` tool (federated search across every index). */\nexport function universalSearchTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"universal_search\",\n    description: UNIVERSAL_SEARCH_TOOL_DESCRIPTION,\n    inputSchema: universalSearchRequestSchema,\n    outputSchema: searchResultSchema,\n    execute: async (input, context) => {\n      const request = universalSearchRequestSchema.parse(input);\n      return runtime.client.universalSearch(\n        request.query,\n        toUniversalSearchOptions(request, context?.abortSignal),\n      );\n    },\n  });\n}\n\n/**\n * Build the opt-in `add_documents` tool (write into a direct-access index).\n * Only install it when the plugin's write surface is enabled.\n */\nexport function addDocumentsTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  const inputSchema = searchDocumentSchema\n    .array()\n    .describe(\"Documents to add or update. Each must include the index primary key.\");\n  return createTool({\n    id: options.id ?? \"add_documents\",\n    description: ADD_DOCUMENTS_TOOL_DESCRIPTION,\n    inputSchema: searchRequestSchema.pick({ index: true }).extend({ documents: inputSchema }),\n    outputSchema: upsertResultSchema,\n    execute: async (input, context): Promise<UpsertResult> => {\n      const { client, config } = runtime;\n      const record = input as { index?: string; documents: unknown };\n      const documents = toDocumentArray(record.documents);\n      const index = record.index ?? config.defaultIndex ?? \"\";\n      return client.addDocuments(index, documents, context?.abortSignal);\n    },\n  });\n}\n\n/**\n * Build the opt-in `create_index` tool (provision a Vector Search index).\n * Only install it when the plugin's write surface is enabled. Delegates to\n * {@link SearchClient.createIndex}, inferring the endpoint, embedding model,\n * key, and columns from the request + plugin config.\n */\nexport function createIndexTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"create_index\",\n    description: CREATE_INDEX_TOOL_DESCRIPTION,\n    inputSchema: createIndexRequestSchema,\n    outputSchema: indexInfoSchema,\n    execute: async (input, context) => {\n      const request = createIndexRequestSchema.parse(input);\n      return runtime.client.createIndex(\n        request.name,\n        toCreateIndexOptions(request, context?.abortSignal),\n      );\n    },\n  });\n}\n\n/** Output schema for the `sync_index` tool. */\nconst syncIndexResultSchema = z.object({\n  index: z.string().describe(\"The index that was synced.\"),\n  synced: z.boolean().describe(\"True once the sync was triggered.\"),\n});\n\n/**\n * Build the opt-in `sync_index` tool (refresh a Delta Sync index from its\n * source table). Only install it when the plugin's write surface is enabled.\n */\nexport function syncIndexTool(options: SearchToolOptions = {}) {\n  const runtime = toolRuntime(options);\n  return createTool({\n    id: options.id ?? \"sync_index\",\n    description: SYNC_INDEX_TOOL_DESCRIPTION,\n    inputSchema: syncIndexRequestSchema,\n    outputSchema: syncIndexResultSchema,\n    execute: async (input, context) => {\n      const request = syncIndexRequestSchema.parse(input);\n      const { client, config } = runtime;\n      const index = request.index ?? config.defaultIndex ?? \"\";\n      await client.syncIndex(index, context?.abortSignal);\n      return { index, synced: true };\n    },\n  });\n}\n"]}
|
package/package.json
CHANGED
|
@@ -28,13 +28,13 @@
|
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@databricks/appkit": "0.81.0",
|
|
30
30
|
"@databricks/sdk-experimental": "^0.17.0",
|
|
31
|
-
"@dbx-tools/appkit": "^0.9.
|
|
32
|
-
"@dbx-tools/core": "^0.9.
|
|
33
|
-
"@dbx-tools/model": "^0.9.
|
|
34
|
-
"@dbx-tools/postgres": "^0.9.
|
|
35
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
36
|
-
"@dbx-tools/shared-model": "^0.9.
|
|
37
|
-
"@dbx-tools/shared-search": "^0.9.
|
|
31
|
+
"@dbx-tools/appkit": "^0.9.157",
|
|
32
|
+
"@dbx-tools/core": "^0.9.157",
|
|
33
|
+
"@dbx-tools/model": "^0.9.157",
|
|
34
|
+
"@dbx-tools/postgres": "^0.9.157",
|
|
35
|
+
"@dbx-tools/shared-core": "^0.9.157",
|
|
36
|
+
"@dbx-tools/shared-model": "^0.9.157",
|
|
37
|
+
"@dbx-tools/shared-search": "^0.9.157",
|
|
38
38
|
"@mastra/core": "1.71.0",
|
|
39
39
|
"pg": "^8.22.0",
|
|
40
40
|
"zod": "4.3.6"
|
|
@@ -50,58 +50,10 @@
|
|
|
50
50
|
"types": "./lib/index.d.ts",
|
|
51
51
|
"default": "./lib/index.js"
|
|
52
52
|
},
|
|
53
|
-
"./client": {
|
|
54
|
-
"types": "./lib/src/client.d.ts",
|
|
55
|
-
"default": "./lib/src/client.js"
|
|
56
|
-
},
|
|
57
|
-
"./config": {
|
|
58
|
-
"types": "./lib/src/config.d.ts",
|
|
59
|
-
"default": "./lib/src/config.js"
|
|
60
|
-
},
|
|
61
|
-
"./index-options": {
|
|
62
|
-
"types": "./lib/src/index-options.d.ts",
|
|
63
|
-
"default": "./lib/src/index-options.js"
|
|
64
|
-
},
|
|
65
|
-
"./lakebase-plugin": {
|
|
66
|
-
"types": "./lib/src/lakebase-plugin.d.ts",
|
|
67
|
-
"default": "./lib/src/lakebase-plugin.js"
|
|
68
|
-
},
|
|
69
|
-
"./lakebase": {
|
|
70
|
-
"types": "./lib/src/lakebase.d.ts",
|
|
71
|
-
"default": "./lib/src/lakebase.js"
|
|
72
|
-
},
|
|
73
|
-
"./native": {
|
|
74
|
-
"types": "./lib/src/native.d.ts",
|
|
75
|
-
"default": "./lib/src/native.js"
|
|
76
|
-
},
|
|
77
|
-
"./plugin": {
|
|
78
|
-
"types": "./lib/src/plugin.d.ts",
|
|
79
|
-
"default": "./lib/src/plugin.js"
|
|
80
|
-
},
|
|
81
|
-
"./query": {
|
|
82
|
-
"types": "./lib/src/query.d.ts",
|
|
83
|
-
"default": "./lib/src/query.js"
|
|
84
|
-
},
|
|
85
|
-
"./runtime": {
|
|
86
|
-
"types": "./lib/src/runtime.d.ts",
|
|
87
|
-
"default": "./lib/src/runtime.js"
|
|
88
|
-
},
|
|
89
|
-
"./schema": {
|
|
90
|
-
"types": "./lib/src/schema.d.ts",
|
|
91
|
-
"default": "./lib/src/schema.js"
|
|
92
|
-
},
|
|
93
|
-
"./tool": {
|
|
94
|
-
"types": "./lib/src/tool.d.ts",
|
|
95
|
-
"default": "./lib/src/tool.js"
|
|
96
|
-
},
|
|
97
|
-
"./*": {
|
|
98
|
-
"types": "./lib/src/*/index.d.ts",
|
|
99
|
-
"default": "./lib/src/*/index.js"
|
|
100
|
-
},
|
|
101
53
|
"./package.json": "./package.json"
|
|
102
54
|
}
|
|
103
55
|
},
|
|
104
|
-
"version": "0.9.
|
|
56
|
+
"version": "0.9.157",
|
|
105
57
|
"types": "./lib/index.d.ts",
|
|
106
58
|
"dbxToolsConfig": {
|
|
107
59
|
"tags": [
|
|
@@ -114,58 +66,10 @@
|
|
|
114
66
|
"types": "./lib/index.d.ts",
|
|
115
67
|
"default": "./lib/index.js"
|
|
116
68
|
},
|
|
117
|
-
"./client": {
|
|
118
|
-
"types": "./lib/src/client.d.ts",
|
|
119
|
-
"default": "./lib/src/client.js"
|
|
120
|
-
},
|
|
121
|
-
"./config": {
|
|
122
|
-
"types": "./lib/src/config.d.ts",
|
|
123
|
-
"default": "./lib/src/config.js"
|
|
124
|
-
},
|
|
125
|
-
"./index-options": {
|
|
126
|
-
"types": "./lib/src/index-options.d.ts",
|
|
127
|
-
"default": "./lib/src/index-options.js"
|
|
128
|
-
},
|
|
129
|
-
"./lakebase-plugin": {
|
|
130
|
-
"types": "./lib/src/lakebase-plugin.d.ts",
|
|
131
|
-
"default": "./lib/src/lakebase-plugin.js"
|
|
132
|
-
},
|
|
133
|
-
"./lakebase": {
|
|
134
|
-
"types": "./lib/src/lakebase.d.ts",
|
|
135
|
-
"default": "./lib/src/lakebase.js"
|
|
136
|
-
},
|
|
137
|
-
"./native": {
|
|
138
|
-
"types": "./lib/src/native.d.ts",
|
|
139
|
-
"default": "./lib/src/native.js"
|
|
140
|
-
},
|
|
141
|
-
"./plugin": {
|
|
142
|
-
"types": "./lib/src/plugin.d.ts",
|
|
143
|
-
"default": "./lib/src/plugin.js"
|
|
144
|
-
},
|
|
145
|
-
"./query": {
|
|
146
|
-
"types": "./lib/src/query.d.ts",
|
|
147
|
-
"default": "./lib/src/query.js"
|
|
148
|
-
},
|
|
149
|
-
"./runtime": {
|
|
150
|
-
"types": "./lib/src/runtime.d.ts",
|
|
151
|
-
"default": "./lib/src/runtime.js"
|
|
152
|
-
},
|
|
153
|
-
"./schema": {
|
|
154
|
-
"types": "./lib/src/schema.d.ts",
|
|
155
|
-
"default": "./lib/src/schema.js"
|
|
156
|
-
},
|
|
157
|
-
"./tool": {
|
|
158
|
-
"types": "./lib/src/tool.d.ts",
|
|
159
|
-
"default": "./lib/src/tool.js"
|
|
160
|
-
},
|
|
161
|
-
"./*": {
|
|
162
|
-
"types": "./lib/src/*/index.d.ts",
|
|
163
|
-
"default": "./lib/src/*/index.js"
|
|
164
|
-
},
|
|
165
69
|
"./package.json": "./package.json"
|
|
166
70
|
},
|
|
167
71
|
"files": [
|
|
168
|
-
"index
|
|
72
|
+
"index*.ts",
|
|
169
73
|
"src",
|
|
170
74
|
"lib"
|
|
171
75
|
],
|
package/src/client.ts
CHANGED
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
|
|
22
22
|
import { ExecutionError, getExecutionContext } from "@databricks/appkit";
|
|
23
23
|
import { Context } from "@databricks/sdk-experimental";
|
|
24
|
-
import { appkit,
|
|
25
|
-
import { invoke,
|
|
26
|
-
import {
|
|
24
|
+
import { appkit, tryGetExecutionContext, toContext } from "@dbx-tools/appkit";
|
|
25
|
+
import { invoke, selection, modelCatalog } from "@dbx-tools/model";
|
|
26
|
+
import { log, sleep, parseRecord, trimToEmpty, trimToNull } from "@dbx-tools/shared-core";
|
|
27
27
|
import { ModelClass } from "@dbx-tools/shared-model";
|
|
28
28
|
import type {
|
|
29
29
|
IndexInfo,
|
|
@@ -141,9 +141,6 @@ export class SearchIndex {
|
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
143
|
|
|
144
|
-
/** A resolved live index definition. */
|
|
145
|
-
export type { IndexInfo };
|
|
146
|
-
|
|
147
144
|
/**
|
|
148
145
|
* Options for {@link SearchClient.createIndex} / {@link SearchClient.ensureIndex}.
|
|
149
146
|
* The goal is the same as the rest of the client: name a source table and a
|
|
@@ -250,7 +247,7 @@ export class SearchClient {
|
|
|
250
247
|
query: string,
|
|
251
248
|
options: SearchOptions & { index?: string } = {},
|
|
252
249
|
): Promise<SearchResult> {
|
|
253
|
-
const text =
|
|
250
|
+
const text = trimToEmpty(query);
|
|
254
251
|
const name = resolveIndexName(this.config, options.index);
|
|
255
252
|
if (name === null) {
|
|
256
253
|
throw new ExecutionError("search: no index configured; set a default index or pass one", {
|
|
@@ -279,7 +276,7 @@ export class SearchClient {
|
|
|
279
276
|
query: string,
|
|
280
277
|
options: UniversalSearchOptions = {},
|
|
281
278
|
): Promise<SearchResult> {
|
|
282
|
-
const text =
|
|
279
|
+
const text = trimToEmpty(query);
|
|
283
280
|
const names =
|
|
284
281
|
options.indexes && options.indexes.length > 0
|
|
285
282
|
? options.indexes.map((ref) => resolveIndexName(this.config, ref) ?? ref)
|
|
@@ -318,7 +315,7 @@ export class SearchClient {
|
|
|
318
315
|
* `ENDPOINT_NOT_FOUND` instead of naming the real problem.
|
|
319
316
|
*/
|
|
320
317
|
private requireIndexName(reference: string, operation: string): string {
|
|
321
|
-
const name =
|
|
318
|
+
const name = trimToNull(resolveIndexName(this.config, reference) ?? reference);
|
|
322
319
|
if (name === null) {
|
|
323
320
|
throw new ExecutionError(
|
|
324
321
|
`search: no index configured; set a default index or pass one to ${operation}`,
|
|
@@ -351,7 +348,7 @@ export class SearchClient {
|
|
|
351
348
|
let columns = (spec?.embedding_source_columns ?? []).map((c) => c.name ?? "").filter(Boolean);
|
|
352
349
|
const schemaJson = index.direct_access_index_spec?.schema_json;
|
|
353
350
|
if (directAccess && schemaJson) {
|
|
354
|
-
const schema =
|
|
351
|
+
const schema = parseRecord(schemaJson) ?? {};
|
|
355
352
|
const vectorNames = new Set(
|
|
356
353
|
(index.direct_access_index_spec?.embedding_vector_columns ?? [])
|
|
357
354
|
.map((c) => c.name)
|
|
@@ -415,7 +412,7 @@ export class SearchClient {
|
|
|
415
412
|
* live catalogue, otherwise the highest-ranked embedding endpoint is chosen.
|
|
416
413
|
*/
|
|
417
414
|
async resolveEmbeddingModel(requested?: string, signal?: AbortSignal): Promise<string | null> {
|
|
418
|
-
const explicit =
|
|
415
|
+
const explicit = trimToNull(requested ?? this.config.embeddingModel);
|
|
419
416
|
// An explicit name that already looks like an endpoint id (no whitespace)
|
|
420
417
|
// is used verbatim - no need to fetch and fuzzy-match the live catalogue.
|
|
421
418
|
// A genuinely loose name (e.g. "gte large") still resolves against it.
|
|
@@ -425,10 +422,10 @@ export class SearchClient {
|
|
|
425
422
|
const host = (await client.config.getHost()).toString();
|
|
426
423
|
const endpoints = await modelCatalog.listServingEndpoints(client, host);
|
|
427
424
|
signal?.throwIfAborted();
|
|
428
|
-
const { modelId } =
|
|
425
|
+
const { modelId } = selection.resolveModel(endpoints, {
|
|
429
426
|
...(explicit ? { explicit } : { modelClass: ModelClass.Embedding }),
|
|
430
427
|
});
|
|
431
|
-
return
|
|
428
|
+
return trimToNull(modelId);
|
|
432
429
|
}
|
|
433
430
|
|
|
434
431
|
/**
|
|
@@ -621,7 +618,7 @@ export class SearchClient {
|
|
|
621
618
|
const needEmbed = seed.some((doc) => doc[vectorColumn] === undefined);
|
|
622
619
|
let rows = seed;
|
|
623
620
|
if (needEmbed) {
|
|
624
|
-
const texts = seed.map((doc) =>
|
|
621
|
+
const texts = seed.map((doc) => trimToEmpty(String(doc[sourceColumn] ?? "")));
|
|
625
622
|
const vectors = await this.embed(texts, options.embeddingModel, options.signal);
|
|
626
623
|
rows = seed.map((doc, i) =>
|
|
627
624
|
doc[vectorColumn] === undefined ? { ...doc, [vectorColumn]: vectors[i] } : doc,
|
|
@@ -648,7 +645,7 @@ export class SearchClient {
|
|
|
648
645
|
context: { operation: "provision" },
|
|
649
646
|
});
|
|
650
647
|
}
|
|
651
|
-
await
|
|
648
|
+
await sleep(5000, signal);
|
|
652
649
|
info = await this.getIndex(name, signal);
|
|
653
650
|
}
|
|
654
651
|
return info;
|
|
@@ -735,7 +732,7 @@ export class SearchClient {
|
|
|
735
732
|
const client = this.workspaceClientFactory();
|
|
736
733
|
const controller = new AbortController();
|
|
737
734
|
const timer = setTimeout(() => controller.abort(), this.config.timeoutMs);
|
|
738
|
-
const context =
|
|
735
|
+
const context = toContext(controller, signal);
|
|
739
736
|
try {
|
|
740
737
|
return await fn(client, context);
|
|
741
738
|
} catch (err) {
|
|
@@ -755,7 +752,7 @@ function defaultWorkspaceClient(): WorkspaceClientLike {
|
|
|
755
752
|
|
|
756
753
|
/** AppKit workspace-client facade from the active request or service context. */
|
|
757
754
|
function defaultAppKitWorkspaceClient(): appkit.WorkspaceClientLike {
|
|
758
|
-
const ctx =
|
|
755
|
+
const ctx = tryGetExecutionContext();
|
|
759
756
|
if (ctx?.client) return ctx.client;
|
|
760
757
|
// Outside a request scope (a script, a test): a fresh env-auth client.
|
|
761
758
|
return getExecutionContext().client;
|
package/src/config.ts
CHANGED
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
25
|
import { ConfigurationError, type BasePluginConfig } from "@databricks/appkit";
|
|
26
|
-
import {
|
|
27
|
-
import {
|
|
26
|
+
import { text, ENV_ONLY, string, list, positiveInt, boolean } from "@dbx-tools/core";
|
|
27
|
+
import { optional, trimToNull } from "@dbx-tools/shared-core";
|
|
28
28
|
import type { SearchDocument, SearchMode } from "@dbx-tools/shared-search";
|
|
29
29
|
import type { JSONSchema7 } from "json-schema";
|
|
30
30
|
|
|
@@ -222,11 +222,11 @@ export function defaultAlias(name: string): string {
|
|
|
222
222
|
/** Normalize a config index entry (string or object) into a {@link ResolvedIndexConfig}. */
|
|
223
223
|
function toResolvedIndex(entry: string | SearchIndexConfig): ResolvedIndexConfig | null {
|
|
224
224
|
const raw = typeof entry === "string" ? { name: entry } : entry;
|
|
225
|
-
const name =
|
|
225
|
+
const name = trimToNull(raw.name);
|
|
226
226
|
if (name === null) return null;
|
|
227
227
|
return {
|
|
228
228
|
name,
|
|
229
|
-
alias:
|
|
229
|
+
alias: trimToNull(raw.alias) ?? defaultAlias(name),
|
|
230
230
|
...(raw.primaryKey ? { primaryKey: raw.primaryKey } : {}),
|
|
231
231
|
...(raw.columns && raw.columns.length > 0 ? { columns: [...raw.columns] } : {}),
|
|
232
232
|
};
|
|
@@ -234,7 +234,7 @@ function toResolvedIndex(entry: string | SearchIndexConfig): ResolvedIndexConfig
|
|
|
234
234
|
|
|
235
235
|
/** Parse and validate a {@link SearchMode} from config or an env var. */
|
|
236
236
|
function resolveMode(configured: SearchMode | undefined): SearchMode {
|
|
237
|
-
const raw = configured ??
|
|
237
|
+
const raw = configured ?? text("SEARCH_MODE", ENV_ONLY);
|
|
238
238
|
if (raw === undefined) return DEFAULT_MODE;
|
|
239
239
|
if (raw !== "hybrid" && raw !== "vector" && raw !== "keyword") {
|
|
240
240
|
throw new ConfigurationError(
|
|
@@ -252,11 +252,7 @@ function resolveMode(configured: SearchMode | undefined): SearchMode {
|
|
|
252
252
|
* and a bad mode throws a {@link ConfigurationError} naming the field.
|
|
253
253
|
*/
|
|
254
254
|
export function resolveSearchConfig(config: SearchPluginConfig = {}): ResolvedSearchConfig {
|
|
255
|
-
const defaultIndexRaw =
|
|
256
|
-
config.index,
|
|
257
|
-
[INDEX_ENV, DATABRICKS_INDEX_ENV],
|
|
258
|
-
configUtils.ENV_ONLY,
|
|
259
|
-
);
|
|
255
|
+
const defaultIndexRaw = string(config.index, [INDEX_ENV, DATABRICKS_INDEX_ENV], ENV_ONLY);
|
|
260
256
|
|
|
261
257
|
const configured = (config.indexes ?? [])
|
|
262
258
|
.map(toResolvedIndex)
|
|
@@ -264,12 +260,7 @@ export function resolveSearchConfig(config: SearchPluginConfig = {}): ResolvedSe
|
|
|
264
260
|
|
|
265
261
|
// Ensure the default index is represented in the known set.
|
|
266
262
|
if (defaultIndexRaw && !configured.some((i) => i.name === defaultIndexRaw)) {
|
|
267
|
-
const envColumns =
|
|
268
|
-
undefined,
|
|
269
|
-
"SEARCH_COLUMNS",
|
|
270
|
-
undefined,
|
|
271
|
-
configUtils.ENV_ONLY,
|
|
272
|
-
);
|
|
263
|
+
const envColumns = list(undefined, "SEARCH_COLUMNS", undefined, ENV_ONLY);
|
|
273
264
|
configured.unshift({
|
|
274
265
|
name: defaultIndexRaw,
|
|
275
266
|
alias: defaultAlias(defaultIndexRaw),
|
|
@@ -286,40 +277,21 @@ export function resolveSearchConfig(config: SearchPluginConfig = {}): ResolvedSe
|
|
|
286
277
|
});
|
|
287
278
|
|
|
288
279
|
const defaultIndex = defaultIndexRaw ?? indexes[0]?.name;
|
|
289
|
-
const columns =
|
|
290
|
-
config.columns,
|
|
291
|
-
"SEARCH_COLUMNS",
|
|
292
|
-
undefined,
|
|
293
|
-
configUtils.ENV_ONLY,
|
|
294
|
-
);
|
|
280
|
+
const columns = list(config.columns, "SEARCH_COLUMNS", undefined, ENV_ONLY);
|
|
295
281
|
|
|
296
282
|
return {
|
|
297
|
-
...
|
|
283
|
+
...optional("defaultIndex", defaultIndex),
|
|
298
284
|
indexes,
|
|
299
|
-
...
|
|
300
|
-
"endpoint",
|
|
301
|
-
configUtils.string(config.endpoint, ENDPOINT_ENV, configUtils.ENV_ONLY),
|
|
302
|
-
),
|
|
285
|
+
...optional("endpoint", string(config.endpoint, ENDPOINT_ENV, ENV_ONLY)),
|
|
303
286
|
...(columns.length > 0 ? { columns } : {}),
|
|
304
|
-
pageSize:
|
|
305
|
-
config.pageSize,
|
|
306
|
-
"SEARCH_PAGE_SIZE",
|
|
307
|
-
DEFAULT_PAGE_SIZE,
|
|
308
|
-
configUtils.ENV_ONLY,
|
|
309
|
-
),
|
|
287
|
+
pageSize: positiveInt(config.pageSize, "SEARCH_PAGE_SIZE", DEFAULT_PAGE_SIZE, ENV_ONLY),
|
|
310
288
|
mode: resolveMode(config.mode),
|
|
311
|
-
...
|
|
289
|
+
...optional(
|
|
312
290
|
"embeddingModel",
|
|
313
|
-
|
|
314
|
-
),
|
|
315
|
-
timeoutMs: configUtils.positiveInt(
|
|
316
|
-
config.timeoutMs,
|
|
317
|
-
"SEARCH_TIMEOUT_MS",
|
|
318
|
-
DEFAULT_TIMEOUT_MS,
|
|
319
|
-
configUtils.ENV_ONLY,
|
|
291
|
+
string(config.embeddingModel, "SEARCH_EMBEDDING_MODEL", ENV_ONLY),
|
|
320
292
|
),
|
|
321
|
-
|
|
322
|
-
|
|
293
|
+
timeoutMs: positiveInt(config.timeoutMs, "SEARCH_TIMEOUT_MS", DEFAULT_TIMEOUT_MS, ENV_ONLY),
|
|
294
|
+
allowWrite: boolean(config.allowWrite, "SEARCH_WRITE", ENV_ONLY) ?? false,
|
|
323
295
|
...(config.ensureOnSetup ? { ensureOnSetup: config.ensureOnSetup } : {}),
|
|
324
296
|
};
|
|
325
297
|
}
|
|
@@ -334,7 +306,7 @@ export function resolveIndexName(
|
|
|
334
306
|
config: ResolvedSearchConfig,
|
|
335
307
|
reference: string | undefined,
|
|
336
308
|
): string | null {
|
|
337
|
-
const ref =
|
|
309
|
+
const ref = trimToNull(reference);
|
|
338
310
|
if (ref === null) return config.defaultIndex ?? null;
|
|
339
311
|
const byAlias = config.indexes.find((i) => i.alias === ref || i.name === ref);
|
|
340
312
|
if (byAlias) return byAlias.name;
|
package/src/lakebase-plugin.ts
CHANGED
|
@@ -14,8 +14,8 @@ import {
|
|
|
14
14
|
type PluginManifest,
|
|
15
15
|
} from "@databricks/appkit";
|
|
16
16
|
import type { IndexConfig, SearchRequest, SearchResponse } from "@databricks/appkit/beta";
|
|
17
|
-
import {
|
|
18
|
-
import { log,
|
|
17
|
+
import { require } from "@dbx-tools/appkit";
|
|
18
|
+
import { log, isRecord, trimToNull } from "@dbx-tools/shared-core";
|
|
19
19
|
import type { SearchDocument } from "@dbx-tools/shared-search";
|
|
20
20
|
import type express from "express";
|
|
21
21
|
import type { JSONSchema7 } from "json-schema";
|
|
@@ -96,8 +96,8 @@ export class LakebaseAiSearchPlugin extends Plugin<LakebaseAiSearchConfig> {
|
|
|
96
96
|
const indexes = this.indexes();
|
|
97
97
|
for (const index of indexes) this.validateAuth(index);
|
|
98
98
|
this.context?.onLifecycle("setup:complete", async () => {
|
|
99
|
-
const lake =
|
|
100
|
-
const schema =
|
|
99
|
+
const lake = require(this.context, lakebase, this);
|
|
100
|
+
const schema = trimToNull(this.config.schema) ?? "public";
|
|
101
101
|
this.servicePrincipalBackend = new LakebaseSearchBackend(lake.exports().pool, schema);
|
|
102
102
|
this.userBackend = new LakebaseSearchBackend(
|
|
103
103
|
{ managedPool: () => lake.exports().pool },
|
|
@@ -125,9 +125,7 @@ export class LakebaseAiSearchPlugin extends Plugin<LakebaseAiSearchConfig> {
|
|
|
125
125
|
try {
|
|
126
126
|
const alias = routeParam(req.params.alias);
|
|
127
127
|
const index = this.resolveIndex(alias);
|
|
128
|
-
const { columns: _untrustedColumns, ...request } =
|
|
129
|
-
? req.body
|
|
130
|
-
: {};
|
|
128
|
+
const { columns: _untrustedColumns, ...request } = isRecord(req.body) ? req.body : {};
|
|
131
129
|
res.json(await this.routeRuntime(index, req).query(alias, request as SearchRequest));
|
|
132
130
|
} catch (error) {
|
|
133
131
|
res.status(400).json({
|
|
@@ -162,7 +160,7 @@ export class LakebaseAiSearchPlugin extends Plugin<LakebaseAiSearchConfig> {
|
|
|
162
160
|
const alias = routeParam(req.params.alias);
|
|
163
161
|
const index = this.resolveIndex(alias);
|
|
164
162
|
const documents = Array.isArray(req.body?.documents)
|
|
165
|
-
? req.body.documents.filter(
|
|
163
|
+
? req.body.documents.filter(isRecord)
|
|
166
164
|
: [];
|
|
167
165
|
res.json(await this.routeRuntime(index, req).addDocuments(alias, documents));
|
|
168
166
|
},
|
|
@@ -211,7 +209,7 @@ export class LakebaseAiSearchPlugin extends Plugin<LakebaseAiSearchConfig> {
|
|
|
211
209
|
const index = this.resolveIndex(alias);
|
|
212
210
|
return this.requireBackend(index).addDocuments(
|
|
213
211
|
index.indexName,
|
|
214
|
-
documents.filter(
|
|
212
|
+
documents.filter(isRecord),
|
|
215
213
|
index.config.textColumn ?? "text",
|
|
216
214
|
);
|
|
217
215
|
}
|
|
@@ -243,7 +241,7 @@ export class LakebaseAiSearchPlugin extends Plugin<LakebaseAiSearchConfig> {
|
|
|
243
241
|
private indexes(): ResolvedLakebaseIndex[] {
|
|
244
242
|
return Object.entries(this.config.indexes ?? {}).map(([alias, config]) => ({
|
|
245
243
|
alias,
|
|
246
|
-
indexName:
|
|
244
|
+
indexName: trimToNull(config.indexName) ?? alias,
|
|
247
245
|
config,
|
|
248
246
|
}));
|
|
249
247
|
}
|