@fabric-harness/databricks 4.3.2 → 4.4.1
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/dist/agent-services.js +142 -0
- package/dist/agent-services.js.map +1 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +197 -2
- package/dist/agent.js.map +1 -1
- package/dist/ai-gateway.js +51 -0
- package/dist/ai-gateway.js.map +1 -0
- package/dist/ai-search-admin.js +194 -0
- package/dist/ai-search-admin.js.map +1 -0
- package/dist/ai.js +22 -0
- package/dist/ai.js.map +1 -0
- package/dist/app-user-authorization.js +5 -1
- package/dist/app-user-authorization.js.map +1 -1
- package/dist/app.js +143 -0
- package/dist/app.js.map +1 -0
- package/dist/authoring-certification.js +476 -0
- package/dist/authoring-certification.js.map +1 -0
- package/dist/capabilities.d.ts.map +1 -1
- package/dist/capabilities.js +633 -0
- package/dist/capabilities.js.map +1 -0
- package/dist/certification-environment.d.ts.map +1 -1
- package/dist/certification-resource.js +17 -0
- package/dist/certification-resource.js.map +1 -0
- package/dist/certification-sweeper.js +128 -0
- package/dist/certification-sweeper.js.map +1 -0
- package/dist/certification.d.ts +8 -1
- package/dist/certification.d.ts.map +1 -1
- package/dist/certification.js +236 -0
- package/dist/certification.js.map +1 -0
- package/dist/certify.js +118 -19
- package/dist/certify.js.map +1 -1
- package/dist/client.d.ts +58 -0
- package/dist/client.d.ts.map +1 -0
- package/dist/client.js +184 -0
- package/dist/client.js.map +1 -0
- package/dist/compatibility.js +88 -0
- package/dist/compatibility.js.map +1 -0
- package/dist/consumption.js +85 -0
- package/dist/consumption.js.map +1 -0
- package/dist/cost-budget-actuals.js +316 -0
- package/dist/cost-budget-actuals.js.map +1 -0
- package/dist/embeddings.js +24 -0
- package/dist/embeddings.js.map +1 -0
- package/dist/feature-serving.js +29 -0
- package/dist/feature-serving.js.map +1 -0
- package/dist/genie-agent-mode.js +374 -0
- package/dist/genie-agent-mode.js.map +1 -0
- package/dist/genie-authoring.js +898 -0
- package/dist/genie-authoring.js.map +1 -0
- package/dist/genie.js +405 -0
- package/dist/genie.js.map +1 -0
- package/dist/governance.js +353 -0
- package/dist/governance.js.map +1 -0
- package/dist/identity.js +229 -0
- package/dist/identity.js.map +1 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +402 -28
- package/dist/index.js.map +1 -1
- package/dist/jobs-authoring.js +570 -0
- package/dist/jobs-authoring.js.map +1 -0
- package/dist/jobs.js +173 -0
- package/dist/jobs.js.map +1 -0
- package/dist/lakebase.js +110 -0
- package/dist/lakebase.js.map +1 -0
- package/dist/lakeflow-authoring.js +115 -0
- package/dist/lakeflow-authoring.js.map +1 -0
- package/dist/lakeflow.js +75 -0
- package/dist/lakeflow.js.map +1 -0
- package/dist/managed-resource.js +197 -0
- package/dist/managed-resource.js.map +1 -0
- package/dist/mlflow-tracing.js +167 -0
- package/dist/mlflow-tracing.js.map +1 -0
- package/dist/mock-provider.js +66 -0
- package/dist/mock-provider.js.map +1 -0
- package/dist/model.js +173 -0
- package/dist/model.js.map +1 -0
- package/dist/persistence.js +82 -0
- package/dist/persistence.js.map +1 -0
- package/dist/rag-chain.d.ts.map +1 -1
- package/dist/rag-chain.js +212 -0
- package/dist/rag-chain.js.map +1 -0
- package/dist/rag-eval.js +151 -0
- package/dist/rag-eval.js.map +1 -0
- package/dist/release-evidence.d.ts +50 -0
- package/dist/release-evidence.d.ts.map +1 -0
- package/dist/secrets-authoring.js +78 -0
- package/dist/secrets-authoring.js.map +1 -0
- package/dist/secrets.js +25 -0
- package/dist/secrets.js.map +1 -0
- package/dist/serving-admin.js +255 -0
- package/dist/serving-admin.js.map +1 -0
- package/dist/serving-usage.js +100 -0
- package/dist/serving-usage.js.map +1 -0
- package/dist/sql-exec.js +36 -0
- package/dist/sql-exec.js.map +1 -0
- package/dist/sql-sandbox.d.ts +18 -0
- package/dist/sql-sandbox.d.ts.map +1 -1
- package/dist/sql-sandbox.js +119 -4
- package/dist/sql-sandbox.js.map +1 -1
- package/dist/telemetry-sink.js +180 -0
- package/dist/telemetry-sink.js.map +1 -0
- package/dist/tools.js +167 -0
- package/dist/tools.js.map +1 -0
- package/dist/unity-catalog-admin.js +166 -0
- package/dist/unity-catalog-admin.js.map +1 -0
- package/dist/vector-search.js +65 -0
- package/dist/vector-search.js.map +1 -0
- package/dist/volumes-attachment-store.js +172 -0
- package/dist/volumes-attachment-store.js.map +1 -0
- package/dist/workspace-authoring.js +78 -0
- package/dist/workspace-authoring.js.map +1 -0
- package/package.json +11 -11
package/dist/secrets.js
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { DatabricksRestClient } from './client.js';
|
|
2
|
+
/** Databricks Secret Management adapter. Secret values are decoded only at runtime. */
|
|
3
|
+
export function databricksSecretsProvider(options) {
|
|
4
|
+
const client = new DatabricksRestClient(options);
|
|
5
|
+
return {
|
|
6
|
+
name: 'databricks-secrets',
|
|
7
|
+
async resolve(ref, context) {
|
|
8
|
+
const scope = typeof options.scope === 'function' ? await options.scope(ref.name, context?.tenantId) : options.scope;
|
|
9
|
+
const key = options.keyForSecret?.(ref.name) ?? ref.name;
|
|
10
|
+
if (!scope || !key)
|
|
11
|
+
throw new Error('Databricks secret scope and key are required.');
|
|
12
|
+
try {
|
|
13
|
+
const response = await client.get('/api/2.0/secrets/get', { scope, key });
|
|
14
|
+
return response.value === undefined ? undefined : Buffer.from(response.value, 'base64').toString('utf8');
|
|
15
|
+
}
|
|
16
|
+
catch (error) {
|
|
17
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
18
|
+
if (/RESOURCE_DOES_NOT_EXIST|does not exist|404/iu.test(message))
|
|
19
|
+
return undefined;
|
|
20
|
+
throw error;
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=secrets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQnD,uFAAuF;AACvF,MAAM,UAAU,yBAAyB,CAAC,OAAyC;IACjF,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO;YACxB,MAAM,KAAK,GAAG,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;YACrH,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC;YACzD,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACrF,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAqB,sBAAsB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC9F,OAAO,QAAQ,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC3G,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACvE,IAAI,8CAA8C,CAAC,IAAI,CAAC,OAAO,CAAC;oBAAE,OAAO,SAAS,CAAC;gBACnF,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,255 @@
|
|
|
1
|
+
export class DatabricksServingAdmin {
|
|
2
|
+
client;
|
|
3
|
+
constructor(client) {
|
|
4
|
+
this.client = client;
|
|
5
|
+
}
|
|
6
|
+
createEndpoint(spec) {
|
|
7
|
+
validate(spec);
|
|
8
|
+
const path = spec.kind === "foundationModel"
|
|
9
|
+
? "/api/2.0/serving-endpoints/pt"
|
|
10
|
+
: "/api/2.0/serving-endpoints";
|
|
11
|
+
return this.client.post(path, serialize(spec), {}, { retry: "never" });
|
|
12
|
+
}
|
|
13
|
+
getEndpoint(name) {
|
|
14
|
+
return this.client.get(`/api/2.0/serving-endpoints/${encodeURIComponent(name)}`);
|
|
15
|
+
}
|
|
16
|
+
updateEndpoint(name, servedEntities) {
|
|
17
|
+
return this.client.put(`/api/2.0/serving-endpoints/${encodeURIComponent(name)}/config`, { served_entities: servedEntities.map(serializeEntity) }, {}, { retry: "never" });
|
|
18
|
+
}
|
|
19
|
+
updateAiGateway(name, update) {
|
|
20
|
+
return this.client.put(`/api/2.0/serving-endpoints/${encodeURIComponent(name)}/ai-gateway`, {
|
|
21
|
+
...(update.rateLimits ? { rate_limits: update.rateLimits } : {}),
|
|
22
|
+
...(update.guardrails ? { guardrails: update.guardrails } : {}),
|
|
23
|
+
...(update.usageTracking ? { inference_table_config: update.usageTracking } : {}),
|
|
24
|
+
...(update.fallbackEnabled !== undefined
|
|
25
|
+
? { fallback_config: { enabled: update.fallbackEnabled } }
|
|
26
|
+
: {}),
|
|
27
|
+
}, {}, { retry: "never" });
|
|
28
|
+
}
|
|
29
|
+
deleteEndpoint(name) {
|
|
30
|
+
return this.client.delete(`/api/2.0/serving-endpoints/${encodeURIComponent(name)}`, undefined, {}, { retry: "safe" });
|
|
31
|
+
}
|
|
32
|
+
async waitForEndpoint(name, options = {}) {
|
|
33
|
+
const deadline = Date.now() + (options.timeoutMs ?? 1_800_000);
|
|
34
|
+
while (true) {
|
|
35
|
+
if (options.signal?.aborted)
|
|
36
|
+
throw options.signal.reason ?? new DOMException("Aborted", "AbortError");
|
|
37
|
+
const endpoint = await this.getEndpoint(name);
|
|
38
|
+
const state = endpoint.state?.ready;
|
|
39
|
+
const config = endpoint.state?.config_update;
|
|
40
|
+
if (state === "READY" && config !== "IN_PROGRESS")
|
|
41
|
+
return endpoint;
|
|
42
|
+
if (state === "NOT_READY" && config === "UPDATE_FAILED")
|
|
43
|
+
throw new Error(`Databricks serving endpoint ${name} update failed.`);
|
|
44
|
+
if (Date.now() >= deadline)
|
|
45
|
+
throw new Error(`Databricks serving endpoint ${name} timed out.`);
|
|
46
|
+
await sleep(jitter(options.pollIntervalMs ?? 10_000), options.signal);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
export function databricksServingAdminTools(client) {
|
|
51
|
+
const api = new DatabricksServingAdmin(client);
|
|
52
|
+
return [
|
|
53
|
+
tool("databricks_create_serving_endpoint", "write", servingSchema(), [
|
|
54
|
+
{ kind: "endpoint", path: "/name" },
|
|
55
|
+
{
|
|
56
|
+
kind: "model",
|
|
57
|
+
path: "/servedEntities/*/entityName",
|
|
58
|
+
catalogQualified: true,
|
|
59
|
+
optional: true,
|
|
60
|
+
},
|
|
61
|
+
], (i) => {
|
|
62
|
+
assertModelSafeServingInput(i);
|
|
63
|
+
return api.createEndpoint(i);
|
|
64
|
+
}),
|
|
65
|
+
tool("databricks_update_serving_endpoint", "write", updateSchema(), [
|
|
66
|
+
{ kind: "endpoint", path: "/name" },
|
|
67
|
+
{
|
|
68
|
+
kind: "model",
|
|
69
|
+
path: "/servedEntities/*/entityName",
|
|
70
|
+
catalogQualified: true,
|
|
71
|
+
optional: true,
|
|
72
|
+
},
|
|
73
|
+
], (i) => {
|
|
74
|
+
assertModelSafeServingInput(i);
|
|
75
|
+
return api.updateEndpoint(i.name, i.servedEntities);
|
|
76
|
+
}),
|
|
77
|
+
tool("databricks_update_ai_gateway", "write", gatewaySchema(), [{ kind: "endpoint", path: "/name" }], (i) => api.updateAiGateway(i.name, i)),
|
|
78
|
+
tool("databricks_delete_serving_endpoint", "write", nameSchema(), [{ kind: "endpoint", path: "/name" }], (i) => api.deleteEndpoint(i.name)),
|
|
79
|
+
];
|
|
80
|
+
}
|
|
81
|
+
function validate(spec) {
|
|
82
|
+
if (!spec.name || !spec.servedEntities.length)
|
|
83
|
+
throw new Error("databricks serving: name and servedEntities are required.");
|
|
84
|
+
if (spec.kind === "foundationModel")
|
|
85
|
+
for (const entity of spec.servedEntities)
|
|
86
|
+
if (entity.minProvisionedThroughput < 0 ||
|
|
87
|
+
entity.maxProvisionedThroughput < entity.minProvisionedThroughput)
|
|
88
|
+
throw new Error("databricks serving: invalid provisioned throughput range.");
|
|
89
|
+
}
|
|
90
|
+
function serialize(spec) {
|
|
91
|
+
return {
|
|
92
|
+
name: spec.name,
|
|
93
|
+
config: { served_entities: spec.servedEntities.map(serializeEntity) },
|
|
94
|
+
...(spec.tags
|
|
95
|
+
? { tags: Object.entries(spec.tags).map(([key, value]) => ({ key, value })) }
|
|
96
|
+
: {}),
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
function serializeEntity(entity) {
|
|
100
|
+
if ("minProvisionedThroughput" in entity)
|
|
101
|
+
return {
|
|
102
|
+
name: entity.name,
|
|
103
|
+
entity_name: entity.entityName,
|
|
104
|
+
entity_version: entity.entityVersion,
|
|
105
|
+
min_provisioned_throughput: entity.minProvisionedThroughput,
|
|
106
|
+
max_provisioned_throughput: entity.maxProvisionedThroughput,
|
|
107
|
+
};
|
|
108
|
+
if ("modelName" in entity)
|
|
109
|
+
return {
|
|
110
|
+
name: entity.name,
|
|
111
|
+
external_model: { name: entity.modelName, provider: entity.provider, task: entity.task },
|
|
112
|
+
};
|
|
113
|
+
return {
|
|
114
|
+
name: entity.name,
|
|
115
|
+
entity_name: entity.entityName,
|
|
116
|
+
...("entityVersion" in entity && entity.entityVersion
|
|
117
|
+
? { entity_version: entity.entityVersion }
|
|
118
|
+
: {}),
|
|
119
|
+
...("workloadSize" in entity && entity.workloadSize
|
|
120
|
+
? { workload_size: entity.workloadSize }
|
|
121
|
+
: {}),
|
|
122
|
+
...("scaleToZeroEnabled" in entity && entity.scaleToZeroEnabled !== undefined
|
|
123
|
+
? { scale_to_zero_enabled: entity.scaleToZeroEnabled }
|
|
124
|
+
: {}),
|
|
125
|
+
...("environmentVars" in entity && entity.environmentVars
|
|
126
|
+
? { environment_vars: entity.environmentVars }
|
|
127
|
+
: {}),
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
function tool(name, effect, inputSchema, resources, execute) {
|
|
131
|
+
return {
|
|
132
|
+
name,
|
|
133
|
+
description: name.replaceAll("_", " "),
|
|
134
|
+
inputSchema,
|
|
135
|
+
metadata: {
|
|
136
|
+
effect,
|
|
137
|
+
provider: "databricks",
|
|
138
|
+
service: "serving",
|
|
139
|
+
governance: { resources },
|
|
140
|
+
},
|
|
141
|
+
execute,
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
function nameSchema() {
|
|
145
|
+
return {
|
|
146
|
+
type: "object",
|
|
147
|
+
additionalProperties: false,
|
|
148
|
+
properties: { name: { type: "string" } },
|
|
149
|
+
required: ["name"],
|
|
150
|
+
};
|
|
151
|
+
}
|
|
152
|
+
function entitySchema() {
|
|
153
|
+
return {
|
|
154
|
+
oneOf: [
|
|
155
|
+
{
|
|
156
|
+
type: "object",
|
|
157
|
+
properties: {
|
|
158
|
+
name: { type: "string" },
|
|
159
|
+
entityName: { type: "string" },
|
|
160
|
+
entityVersion: { type: "string" },
|
|
161
|
+
workloadSize: { type: "string" },
|
|
162
|
+
scaleToZeroEnabled: { type: "boolean" },
|
|
163
|
+
},
|
|
164
|
+
required: ["name", "entityName"],
|
|
165
|
+
},
|
|
166
|
+
{
|
|
167
|
+
type: "object",
|
|
168
|
+
properties: {
|
|
169
|
+
name: { type: "string" },
|
|
170
|
+
entityName: { type: "string" },
|
|
171
|
+
entityVersion: { type: "string" },
|
|
172
|
+
minProvisionedThroughput: { type: "number" },
|
|
173
|
+
maxProvisionedThroughput: { type: "number" },
|
|
174
|
+
},
|
|
175
|
+
required: [
|
|
176
|
+
"name",
|
|
177
|
+
"entityName",
|
|
178
|
+
"entityVersion",
|
|
179
|
+
"minProvisionedThroughput",
|
|
180
|
+
"maxProvisionedThroughput",
|
|
181
|
+
],
|
|
182
|
+
},
|
|
183
|
+
{
|
|
184
|
+
type: "object",
|
|
185
|
+
properties: {
|
|
186
|
+
name: { type: "string" },
|
|
187
|
+
modelName: { type: "string" },
|
|
188
|
+
provider: { type: "string" },
|
|
189
|
+
task: { type: "string" },
|
|
190
|
+
},
|
|
191
|
+
required: ["name", "modelName", "provider", "task"],
|
|
192
|
+
},
|
|
193
|
+
],
|
|
194
|
+
};
|
|
195
|
+
}
|
|
196
|
+
function assertModelSafeServingInput(input) {
|
|
197
|
+
const entities = Array.isArray(input.servedEntities) ? input.servedEntities : [];
|
|
198
|
+
if (entities.some((entity) => entity &&
|
|
199
|
+
typeof entity === "object" &&
|
|
200
|
+
!Array.isArray(entity) &&
|
|
201
|
+
"environmentVars" in entity)) {
|
|
202
|
+
throw new Error("databricks serving: raw environmentVars are available only on the typed client, not model-facing ToolDefs.");
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
function servingSchema() {
|
|
206
|
+
return {
|
|
207
|
+
type: "object",
|
|
208
|
+
additionalProperties: false,
|
|
209
|
+
properties: {
|
|
210
|
+
kind: { type: "string", enum: ["customModel", "foundationModel", "externalModel", "agent"] },
|
|
211
|
+
name: { type: "string" },
|
|
212
|
+
servedEntities: { type: "array", items: entitySchema() },
|
|
213
|
+
tags: { type: "object", additionalProperties: { type: "string" } },
|
|
214
|
+
},
|
|
215
|
+
required: ["kind", "name", "servedEntities"],
|
|
216
|
+
};
|
|
217
|
+
}
|
|
218
|
+
function updateSchema() {
|
|
219
|
+
return {
|
|
220
|
+
type: "object",
|
|
221
|
+
additionalProperties: false,
|
|
222
|
+
properties: {
|
|
223
|
+
name: { type: "string" },
|
|
224
|
+
servedEntities: { type: "array", items: entitySchema() },
|
|
225
|
+
},
|
|
226
|
+
required: ["name", "servedEntities"],
|
|
227
|
+
};
|
|
228
|
+
}
|
|
229
|
+
function gatewaySchema() {
|
|
230
|
+
return {
|
|
231
|
+
type: "object",
|
|
232
|
+
additionalProperties: false,
|
|
233
|
+
properties: {
|
|
234
|
+
name: { type: "string" },
|
|
235
|
+
rateLimits: { type: "array", items: { type: "object", additionalProperties: true } },
|
|
236
|
+
guardrails: { type: "object", additionalProperties: true },
|
|
237
|
+
usageTracking: { type: "object", additionalProperties: true },
|
|
238
|
+
fallbackEnabled: { type: "boolean" },
|
|
239
|
+
},
|
|
240
|
+
required: ["name"],
|
|
241
|
+
};
|
|
242
|
+
}
|
|
243
|
+
function sleep(ms, signal) {
|
|
244
|
+
return new Promise((resolve, reject) => {
|
|
245
|
+
const timer = setTimeout(resolve, ms);
|
|
246
|
+
signal?.addEventListener("abort", () => {
|
|
247
|
+
clearTimeout(timer);
|
|
248
|
+
reject(signal.reason ?? new DOMException("Aborted", "AbortError"));
|
|
249
|
+
}, { once: true });
|
|
250
|
+
});
|
|
251
|
+
}
|
|
252
|
+
function jitter(ms) {
|
|
253
|
+
return Math.max(1, Math.round(ms * (0.9 + Math.random() * 0.2)));
|
|
254
|
+
}
|
|
255
|
+
//# sourceMappingURL=serving-admin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serving-admin.js","sourceRoot":"","sources":["../src/serving-admin.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { currentSubmissionContext, emitSubmissionTelemetry } from '@fabric-harness/sdk';
|
|
2
|
+
/**
|
|
3
|
+
* Build an `onEvent` fan-in that turns model-usage events into
|
|
4
|
+
* `submission_usage` telemetry. For every {@link FabricEvent} carrying
|
|
5
|
+
* `data.usage` (`{ inputTokens?, outputTokens?, costUsd? }`, at least one
|
|
6
|
+
* numeric field) — and optionally `data.model` — while an ambient
|
|
7
|
+
* {@link currentSubmissionContext} is set, it emits one `submission_usage`
|
|
8
|
+
* event stamped with the submission correlation (submission/attempt ids,
|
|
9
|
+
* agent identity, tenant, actor).
|
|
10
|
+
*
|
|
11
|
+
* Events observed outside a submission context are dropped silently — not
|
|
12
|
+
* every session turn belongs to a submission. The submission context does not
|
|
13
|
+
* carry the submission kind, so emitted events use `kind: 'unknown'`.
|
|
14
|
+
*/
|
|
15
|
+
export function servingUsageCapture(options) {
|
|
16
|
+
return (event) => {
|
|
17
|
+
try {
|
|
18
|
+
const usage = usageOf(event);
|
|
19
|
+
if (!usage)
|
|
20
|
+
return;
|
|
21
|
+
const context = currentSubmissionContext();
|
|
22
|
+
if (!context)
|
|
23
|
+
return;
|
|
24
|
+
const model = typeof event.data?.model === 'string' ? event.data.model : undefined;
|
|
25
|
+
const at = Date.parse(event.timestamp);
|
|
26
|
+
emitSubmissionTelemetry(options.sink, {
|
|
27
|
+
type: 'submission_usage',
|
|
28
|
+
submissionId: context.submissionId,
|
|
29
|
+
attemptId: context.attemptId,
|
|
30
|
+
kind: 'unknown',
|
|
31
|
+
agent: context.agent,
|
|
32
|
+
instanceId: context.instanceId,
|
|
33
|
+
session: context.session,
|
|
34
|
+
at: Number.isFinite(at) ? at : Date.now(),
|
|
35
|
+
...(context.tenantId !== undefined ? { tenantId: context.tenantId } : {}),
|
|
36
|
+
...(context.actor !== undefined ? { actor: context.actor } : {}),
|
|
37
|
+
...(model !== undefined ? { model } : {}),
|
|
38
|
+
...(usage.inputTokens !== undefined ? { inputTokens: usage.inputTokens } : {}),
|
|
39
|
+
...(usage.outputTokens !== undefined ? { outputTokens: usage.outputTokens } : {}),
|
|
40
|
+
...(usage.costUsd !== undefined ? { costUsd: usage.costUsd } : {}),
|
|
41
|
+
}, options.onError);
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
options.onError?.(error);
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
/** `data.usage` with at least one numeric field, else `undefined`. */
|
|
49
|
+
function usageOf(event) {
|
|
50
|
+
const raw = event.data?.usage;
|
|
51
|
+
if (typeof raw !== 'object' || raw === null || Array.isArray(raw))
|
|
52
|
+
return undefined;
|
|
53
|
+
const usage = raw;
|
|
54
|
+
const fields = {
|
|
55
|
+
...(typeof usage.inputTokens === 'number' ? { inputTokens: usage.inputTokens } : {}),
|
|
56
|
+
...(typeof usage.outputTokens === 'number' ? { outputTokens: usage.outputTokens } : {}),
|
|
57
|
+
...(typeof usage.costUsd === 'number' ? { costUsd: usage.costUsd } : {}),
|
|
58
|
+
};
|
|
59
|
+
return Object.keys(fields).length > 0 ? fields : undefined;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* SQL aggregating a serving endpoint's inference/payload table by
|
|
63
|
+
* `client_request_id` — one row per submission with the request count and the
|
|
64
|
+
* first/last request timestamps — for offline joins against
|
|
65
|
+
* `fh_submission_telemetry.submission_id`.
|
|
66
|
+
*
|
|
67
|
+
* Join contract: callers MUST send the submission id as the serving request's
|
|
68
|
+
* `client_request_id` (e.g. the `client_request_id` field on the
|
|
69
|
+
* serving-endpoint invocation) — the inference table records it verbatim, and
|
|
70
|
+
* this query's `submission_id` column only joins when that convention holds.
|
|
71
|
+
* Rows without a `client_request_id` (traffic from other callers) are
|
|
72
|
+
* excluded. Assumes the AI Gateway payload-table schema (`request_time`
|
|
73
|
+
* timestamp column); adapt the projection for classic inference tables that
|
|
74
|
+
* use `timestamp_ms`.
|
|
75
|
+
*/
|
|
76
|
+
export function inferenceTableUsageQuery(options) {
|
|
77
|
+
if (!/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/.test(options.fullTableName)) {
|
|
78
|
+
throw new Error(`databricks serving-usage: fullTableName must be catalog.schema.table, got: ${options.fullTableName}`);
|
|
79
|
+
}
|
|
80
|
+
let since = '';
|
|
81
|
+
if (options.sinceIso !== undefined) {
|
|
82
|
+
// Strict shape check first — Date.parse alone is far too lenient to gate a SQL literal.
|
|
83
|
+
const isoShape = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,3})?(Z|[+-]\d{2}:\d{2})$/;
|
|
84
|
+
const parsed = Date.parse(options.sinceIso);
|
|
85
|
+
if (!isoShape.test(options.sinceIso) || !Number.isFinite(parsed)) {
|
|
86
|
+
throw new Error(`databricks serving-usage: sinceIso is not a valid ISO-8601 instant: ${options.sinceIso}`);
|
|
87
|
+
}
|
|
88
|
+
since = `\n AND request_time >= TIMESTAMP '${new Date(parsed).toISOString()}'`;
|
|
89
|
+
}
|
|
90
|
+
return `SELECT
|
|
91
|
+
client_request_id AS submission_id,
|
|
92
|
+
COUNT(*) AS request_count,
|
|
93
|
+
MIN(request_time) AS first_request_at,
|
|
94
|
+
MAX(request_time) AS last_request_at
|
|
95
|
+
FROM ${options.fullTableName}
|
|
96
|
+
WHERE client_request_id IS NOT NULL${since}
|
|
97
|
+
GROUP BY client_request_id
|
|
98
|
+
ORDER BY last_request_at DESC`;
|
|
99
|
+
}
|
|
100
|
+
//# sourceMappingURL=serving-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serving-usage.js","sourceRoot":"","sources":["../src/serving-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAcxF;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAmC;IACrE,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAC;YAC3C,IAAI,CAAC,OAAO;gBAAE,OAAO;YACrB,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YACnF,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACvC,uBAAuB,CACrB,OAAO,CAAC,IAAI,EACZ;gBACE,IAAI,EAAE,kBAAkB;gBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzE,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzC,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9E,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnE,EACD,OAAO,CAAC,OAAO,CAChB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAQD,sEAAsE;AACtE,SAAS,OAAO,CAAC,KAAkB;IACjC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;IAC9B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IACpF,MAAM,KAAK,GAAG,GAA8B,CAAC;IAC7C,MAAM,MAAM,GAAgB;QAC1B,GAAG,CAAC,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvF,GAAG,CAAC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzE,CAAC;IACF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAWD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAAwC;IAC/E,IAAI,CAAC,+CAA+C,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACjF,MAAM,IAAI,KAAK,CACb,8EAA8E,OAAO,CAAC,aAAa,EAAE,CACtG,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACnC,wFAAwF;QACxF,MAAM,QAAQ,GAAG,sEAAsE,CAAC;QACxF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,uEAAuE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7G,CAAC;QACD,KAAK,GAAG,sCAAsC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC;IAClF,CAAC;IACD,OAAO;;;;;OAKF,OAAO,CAAC,aAAa;qCACS,KAAK;;8BAEZ,CAAC;AAC/B,CAAC"}
|
package/dist/sql-exec.js
ADDED
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
const TERMINAL_STATES = new Set(['SUCCEEDED', 'FAILED', 'CANCELED', 'CLOSED']);
|
|
2
|
+
/** Submit a parameterized SQL statement and poll to a terminal state. Named parameters → injection-safe. */
|
|
3
|
+
export async function runStatement(client, warehouseId, statement, parameters, poll) {
|
|
4
|
+
const submit = await client.post('/api/2.0/sql/statements', {
|
|
5
|
+
warehouse_id: warehouseId,
|
|
6
|
+
statement,
|
|
7
|
+
wait_timeout: '30s',
|
|
8
|
+
disposition: 'INLINE',
|
|
9
|
+
...(parameters.length > 0 ? { parameters } : {}),
|
|
10
|
+
});
|
|
11
|
+
if (TERMINAL_STATES.has(submit.status?.state ?? ''))
|
|
12
|
+
return submit;
|
|
13
|
+
const id = submit.statement_id;
|
|
14
|
+
if (!id)
|
|
15
|
+
return submit;
|
|
16
|
+
const deadline = Date.now() + poll.timeoutMs;
|
|
17
|
+
let current = submit;
|
|
18
|
+
while (!TERMINAL_STATES.has(current.status?.state ?? '') && Date.now() < deadline) {
|
|
19
|
+
await new Promise((resolve) => setTimeout(resolve, poll.intervalMs));
|
|
20
|
+
current = await client.get(`/api/2.0/sql/statements/${encodeURIComponent(id)}`);
|
|
21
|
+
}
|
|
22
|
+
return current;
|
|
23
|
+
}
|
|
24
|
+
/** Map a statement response's columns + rows into objects keyed by column name. */
|
|
25
|
+
export function parseStatementRows(response) {
|
|
26
|
+
const res = response;
|
|
27
|
+
const columns = res.manifest?.schema?.columns ?? res.manifest?.columns ?? [];
|
|
28
|
+
const names = columns.map((c) => c.name);
|
|
29
|
+
const rows = res.result?.data_array ?? [];
|
|
30
|
+
return rows.map((row) => {
|
|
31
|
+
const record = {};
|
|
32
|
+
names.forEach((name, i) => { record[name] = row[i]; });
|
|
33
|
+
return record;
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=sql-exec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sql-exec.js","sourceRoot":"","sources":["../src/sql-exec.ts"],"names":[],"mappings":"AAsBA,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE/E,4GAA4G;AAC5G,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA4B,EAC5B,WAAmB,EACnB,SAAiB,EACjB,UAA0B,EAC1B,IAAmB;IAEnB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAoB,yBAAyB,EAAE;QAC7E,YAAY,EAAE,WAAW;QACzB,SAAS;QACT,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,QAAQ;QACrB,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC;IACH,IAAI,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC;QAAE,OAAO,MAAM,CAAC;IACnE,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC;IAC/B,IAAI,CAAC,EAAE;QAAE,OAAO,MAAM,CAAC;IAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;IAC7C,IAAI,OAAO,GAAsB,MAAM,CAAC;IACxC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAClF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QACrE,OAAO,GAAG,MAAM,MAAM,CAAC,GAAG,CAAoB,2BAA2B,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,kBAAkB,CAAC,QAAiB;IAClD,MAAM,GAAG,GAAG,QAA6B,CAAC;IAC1C,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAC;IAC7E,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;IAC1C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7E,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/sql-sandbox.d.ts
CHANGED
|
@@ -45,5 +45,23 @@ export interface DatabricksSqlSandboxOptions {
|
|
|
45
45
|
/** Inject a pre-built native Statement Execution client. */
|
|
46
46
|
client?: Pick<StatementExecutionClient, 'executeStatement'>;
|
|
47
47
|
}
|
|
48
|
+
export interface DatabricksSqlSandboxRefData {
|
|
49
|
+
host: string;
|
|
50
|
+
warehouseId: string;
|
|
51
|
+
catalog?: string;
|
|
52
|
+
schema?: string;
|
|
53
|
+
resultFormat?: 'jsonl' | 'csv';
|
|
54
|
+
waitTimeoutSeconds?: number;
|
|
55
|
+
}
|
|
56
|
+
export interface DatabricksSqlSandboxRegistrationOptions {
|
|
57
|
+
/** Resolve credentials at creation/attach time. Credentials are never stored in a sandbox ref. */
|
|
58
|
+
resolvePrincipal?: (env: Record<string, string | undefined>, target: DatabricksSqlSandboxRefData) => DatabricksPrincipal;
|
|
59
|
+
/** Inject a client for tests or a provider-owned transport. */
|
|
60
|
+
client?: Pick<StatementExecutionClient, 'executeStatement'>;
|
|
61
|
+
}
|
|
48
62
|
export declare function databricksSqlSandbox(options: DatabricksSqlSandboxOptions): SandboxEnv;
|
|
63
|
+
/** Register `sandbox: 'databricks'` and its credential-safe portable-ref decoder. */
|
|
64
|
+
export declare function registerDatabricksSqlSandboxBackend(registration?: DatabricksSqlSandboxRegistrationOptions): void;
|
|
65
|
+
/** Remove both process-local registrations, primarily for tests and controlled shutdown. */
|
|
66
|
+
export declare function unregisterDatabricksSqlSandboxBackend(): void;
|
|
49
67
|
//# sourceMappingURL=sql-sandbox.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-sandbox.d.ts","sourceRoot":"","sources":["../src/sql-sandbox.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,UAAU,
|
|
1
|
+
{"version":3,"file":"sql-sandbox.d.ts","sourceRoot":"","sources":["../src/sql-sandbox.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,UAAU,EAAyB,MAAM,qBAAqB,CAAC;AAC/F,OAAO,KAAK,EAAc,wBAAwB,EAAqB,MAAM,uCAAuC,CAAC;AACrH,OAAO,EAAyE,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGhI;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,mBAAmB,CAAC;IAC/B,2CAA2C;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,YAAY,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC/B,4EAA4E;IAC5E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,+DAA+D;IAC/D,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,IAAI,CAAC,wBAAwB,EAAE,kBAAkB,CAAC,CAAC;CAC7D;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,uCAAuC;IACtD,kGAAkG;IAClG,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,2BAA2B,KAAK,mBAAmB,CAAC;IACzH,+DAA+D;IAC/D,MAAM,CAAC,EAAE,IAAI,CAAC,wBAAwB,EAAE,kBAAkB,CAAC,CAAC;CAC7D;AAID,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,UAAU,CA4FrF;AAED,qFAAqF;AACrF,wBAAgB,mCAAmC,CAAC,YAAY,GAAE,uCAA4C,GAAG,IAAI,CAUpH;AAED,4FAA4F;AAC5F,wBAAgB,qCAAqC,IAAI,IAAI,CAG5D"}
|
package/dist/sql-sandbox.js
CHANGED
|
@@ -1793,7 +1793,7 @@ var require_json_bigint = __commonJS({
|
|
|
1793
1793
|
});
|
|
1794
1794
|
|
|
1795
1795
|
// src/sql-sandbox.ts
|
|
1796
|
-
import { createRemoteSandboxEnv } from "@fabric-harness/sdk";
|
|
1796
|
+
import { createRemoteSandboxEnv, registerSandboxBackendFactory, registerSandboxRefDecoder, unregisterSandboxBackendFactory, unregisterSandboxRefDecoder } from "@fabric-harness/sdk";
|
|
1797
1797
|
|
|
1798
1798
|
// ../../node_modules/.pnpm/@databricks+sdk-auth@0.21.0/node_modules/@databricks/sdk-auth/package.json
|
|
1799
1799
|
var package_default = {
|
|
@@ -17162,6 +17162,38 @@ function databricksIdentity(principal) {
|
|
|
17162
17162
|
if (principal.kind === "on-behalf-of") return async () => principal.userToken();
|
|
17163
17163
|
return tokenProviderFromCredentials(databricksCredentials(principal));
|
|
17164
17164
|
}
|
|
17165
|
+
function databricksPrincipalFromEnv(env2 = typeof process !== "undefined" ? process.env : {}, options = {}) {
|
|
17166
|
+
const tokenName = options.tokenEnv ?? "DATABRICKS_TOKEN";
|
|
17167
|
+
const clientIdName = options.clientIdEnv ?? "DATABRICKS_CLIENT_ID";
|
|
17168
|
+
const clientSecretName = options.clientSecretEnv ?? "DATABRICKS_CLIENT_SECRET";
|
|
17169
|
+
const hostName = options.hostEnv ?? "DATABRICKS_HOST";
|
|
17170
|
+
const profileName = options.profileEnv ?? "DATABRICKS_CONFIG_PROFILE";
|
|
17171
|
+
const token = env2.DATABRICKS_BEARER?.trim() || env2[tokenName]?.trim();
|
|
17172
|
+
if (token) return { kind: "pat", token };
|
|
17173
|
+
const clientId = env2[clientIdName]?.trim();
|
|
17174
|
+
const clientSecret = env2[clientSecretName]?.trim();
|
|
17175
|
+
const rawHost = env2[hostName]?.trim();
|
|
17176
|
+
if (clientId && clientSecret) {
|
|
17177
|
+
if (!rawHost) throw new Error(`Missing ${hostName} for Databricks OAuth M2M.`);
|
|
17178
|
+
return {
|
|
17179
|
+
kind: "service-principal",
|
|
17180
|
+
host: databricksWorkspaceOrigin(rawHost),
|
|
17181
|
+
clientId,
|
|
17182
|
+
clientSecret
|
|
17183
|
+
};
|
|
17184
|
+
}
|
|
17185
|
+
const profile = env2[profileName]?.trim() || env2.DATABRICKS_PROFILE?.trim();
|
|
17186
|
+
if (rawHost && (profile || env2.DATABRICKS_AUTH_MODE === "cli")) {
|
|
17187
|
+
return {
|
|
17188
|
+
kind: "cli-profile",
|
|
17189
|
+
host: databricksWorkspaceOrigin(rawHost),
|
|
17190
|
+
...profile ? { profile } : {}
|
|
17191
|
+
};
|
|
17192
|
+
}
|
|
17193
|
+
throw new Error(
|
|
17194
|
+
`Set DATABRICKS_BEARER/${tokenName}, ${clientIdName} + ${clientSecretName}, or ${hostName} + ${profileName}.`
|
|
17195
|
+
);
|
|
17196
|
+
}
|
|
17165
17197
|
function cliProfileCredentials(principal) {
|
|
17166
17198
|
let resolved;
|
|
17167
17199
|
return {
|
|
@@ -52766,7 +52798,11 @@ function fabricHttpClient(fetchImpl, extraHeaders) {
|
|
|
52766
52798
|
if (request.body instanceof ReadableStream) {
|
|
52767
52799
|
init.duplex = "half";
|
|
52768
52800
|
}
|
|
52769
|
-
const
|
|
52801
|
+
const url2 = new URL(request.url);
|
|
52802
|
+
if (/^\/api\/serving-endpoints\/[^/]+\/invocations$/u.test(url2.pathname)) {
|
|
52803
|
+
url2.pathname = url2.pathname.slice("/api".length);
|
|
52804
|
+
}
|
|
52805
|
+
const response = await fetchImpl(url2, init);
|
|
52770
52806
|
return {
|
|
52771
52807
|
statusCode: response.status,
|
|
52772
52808
|
headers: response.headers,
|
|
@@ -52777,6 +52813,7 @@ function fabricHttpClient(fetchImpl, extraHeaders) {
|
|
|
52777
52813
|
}
|
|
52778
52814
|
|
|
52779
52815
|
// src/sql-sandbox.ts
|
|
52816
|
+
var DATABRICKS_SQL_SANDBOX_REF_PROVIDER = "databricks-sql";
|
|
52780
52817
|
function databricksSqlSandbox(options) {
|
|
52781
52818
|
const identity = databricksIdentity(options.principal);
|
|
52782
52819
|
const client = options.client ?? createDatabricksNativeClients({
|
|
@@ -52863,9 +52900,85 @@ function databricksSqlSandbox(options) {
|
|
|
52863
52900
|
};
|
|
52864
52901
|
return createRemoteSandboxEnv(api, {
|
|
52865
52902
|
cwd: "/workspace",
|
|
52866
|
-
capabilities: { exec: true, filesystem: true, binaryFiles: true, snapshots: false, restore: false, network: "provider-managed", persistence: "session", isolation: "provider" }
|
|
52903
|
+
capabilities: { exec: true, filesystem: true, binaryFiles: true, snapshots: false, restore: false, reconnect: true, network: "provider-managed", persistence: "session", isolation: "provider" },
|
|
52904
|
+
encodeRef: () => ({
|
|
52905
|
+
provider: DATABRICKS_SQL_SANDBOX_REF_PROVIDER,
|
|
52906
|
+
providerData: databricksSqlSandboxRefData(options)
|
|
52907
|
+
})
|
|
52867
52908
|
});
|
|
52868
52909
|
}
|
|
52910
|
+
function registerDatabricksSqlSandboxBackend(registration = {}) {
|
|
52911
|
+
registerSandboxBackendFactory("databricks", (factoryOptions) => createRegisteredDatabricksSqlSandbox(factoryOptions, registration));
|
|
52912
|
+
registerSandboxRefDecoder(DATABRICKS_SQL_SANDBOX_REF_PROVIDER, (providerData) => {
|
|
52913
|
+
const target = assertDatabricksSqlSandboxRefData(providerData);
|
|
52914
|
+
return (factoryOptions) => databricksSqlSandbox({
|
|
52915
|
+
...target,
|
|
52916
|
+
principal: resolveRegisteredPrincipal(factoryOptions, target, registration),
|
|
52917
|
+
...registration.client ? { client: registration.client } : {}
|
|
52918
|
+
});
|
|
52919
|
+
});
|
|
52920
|
+
}
|
|
52921
|
+
function unregisterDatabricksSqlSandboxBackend() {
|
|
52922
|
+
unregisterSandboxBackendFactory("databricks");
|
|
52923
|
+
unregisterSandboxRefDecoder(DATABRICKS_SQL_SANDBOX_REF_PROVIDER);
|
|
52924
|
+
}
|
|
52925
|
+
function createRegisteredDatabricksSqlSandbox(options, registration) {
|
|
52926
|
+
const env2 = options.env ?? process.env;
|
|
52927
|
+
const metadata = options.metadata ?? {};
|
|
52928
|
+
const catalog = metadataString(metadata, "databricksCatalog") ?? env2.DATABRICKS_CATALOG;
|
|
52929
|
+
const schema = metadataString(metadata, "databricksSchema") ?? env2.DATABRICKS_SCHEMA;
|
|
52930
|
+
const resultFormat = metadataString(metadata, "databricksResultFormat");
|
|
52931
|
+
const target = {
|
|
52932
|
+
host: metadataString(metadata, "databricksHost") ?? env2.DATABRICKS_HOST ?? "",
|
|
52933
|
+
warehouseId: metadataString(metadata, "databricksWarehouseId") ?? env2.DATABRICKS_WAREHOUSE_ID ?? "",
|
|
52934
|
+
...catalog ? { catalog } : {},
|
|
52935
|
+
...schema ? { schema } : {},
|
|
52936
|
+
...resultFormat ? { resultFormat: assertResultFormat(resultFormat) } : {}
|
|
52937
|
+
};
|
|
52938
|
+
assertDatabricksSqlSandboxRefData(target);
|
|
52939
|
+
return databricksSqlSandbox({
|
|
52940
|
+
...target,
|
|
52941
|
+
principal: resolveRegisteredPrincipal(options, target, registration),
|
|
52942
|
+
...registration.client ? { client: registration.client } : {}
|
|
52943
|
+
});
|
|
52944
|
+
}
|
|
52945
|
+
function resolveRegisteredPrincipal(options, target, registration) {
|
|
52946
|
+
const env2 = options.env ?? process.env;
|
|
52947
|
+
return registration.resolvePrincipal?.(env2, target) ?? databricksPrincipalFromEnv(env2);
|
|
52948
|
+
}
|
|
52949
|
+
function databricksSqlSandboxRefData(options) {
|
|
52950
|
+
return {
|
|
52951
|
+
host: options.host,
|
|
52952
|
+
warehouseId: options.warehouseId,
|
|
52953
|
+
...options.catalog ? { catalog: options.catalog } : {},
|
|
52954
|
+
...options.schema ? { schema: options.schema } : {},
|
|
52955
|
+
...options.resultFormat ? { resultFormat: options.resultFormat } : {},
|
|
52956
|
+
...options.waitTimeoutSeconds !== void 0 ? { waitTimeoutSeconds: options.waitTimeoutSeconds } : {}
|
|
52957
|
+
};
|
|
52958
|
+
}
|
|
52959
|
+
function assertDatabricksSqlSandboxRefData(value) {
|
|
52960
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("Invalid Databricks SQL sandbox reference.");
|
|
52961
|
+
const data = value;
|
|
52962
|
+
if (typeof data.host !== "string" || data.host.trim().length === 0) throw new Error("Databricks SQL sandbox reference is missing host.");
|
|
52963
|
+
if (typeof data.warehouseId !== "string" || data.warehouseId.trim().length === 0) throw new Error("Databricks SQL sandbox reference is missing warehouseId.");
|
|
52964
|
+
const result = { host: data.host, warehouseId: data.warehouseId };
|
|
52965
|
+
if (typeof data.catalog === "string") result.catalog = data.catalog;
|
|
52966
|
+
if (typeof data.schema === "string") result.schema = data.schema;
|
|
52967
|
+
if (data.resultFormat !== void 0) result.resultFormat = assertResultFormat(data.resultFormat);
|
|
52968
|
+
if (data.waitTimeoutSeconds !== void 0) {
|
|
52969
|
+
if (typeof data.waitTimeoutSeconds !== "number" || !Number.isFinite(data.waitTimeoutSeconds)) throw new Error("Databricks SQL sandbox reference has an invalid waitTimeoutSeconds.");
|
|
52970
|
+
result.waitTimeoutSeconds = data.waitTimeoutSeconds;
|
|
52971
|
+
}
|
|
52972
|
+
return result;
|
|
52973
|
+
}
|
|
52974
|
+
function metadataString(metadata, key) {
|
|
52975
|
+
const value = metadata[key];
|
|
52976
|
+
return typeof value === "string" && value.trim().length > 0 ? value : void 0;
|
|
52977
|
+
}
|
|
52978
|
+
function assertResultFormat(value) {
|
|
52979
|
+
if (value === "jsonl" || value === "csv") return value;
|
|
52980
|
+
throw new Error("Databricks SQL sandbox result format must be jsonl or csv.");
|
|
52981
|
+
}
|
|
52869
52982
|
function serializeResult(response, format) {
|
|
52870
52983
|
const columns = response.manifest?.schema?.columns?.map((c2) => c2.name ?? "") ?? [];
|
|
52871
52984
|
const rows = response.result?.dataArray ?? [];
|
|
@@ -52886,6 +52999,8 @@ function formatCsvCell(value) {
|
|
|
52886
52999
|
return /[",\n]/.test(str) ? `"${str.replace(/"/g, '""')}"` : str;
|
|
52887
53000
|
}
|
|
52888
53001
|
export {
|
|
52889
|
-
databricksSqlSandbox
|
|
53002
|
+
databricksSqlSandbox,
|
|
53003
|
+
registerDatabricksSqlSandboxBackend,
|
|
53004
|
+
unregisterDatabricksSqlSandboxBackend
|
|
52890
53005
|
};
|
|
52891
53006
|
//# sourceMappingURL=sql-sandbox.js.map
|