@dbx-tools/cli 0.9.60 → 0.9.61
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 +64 -17
- package/bin/dbx-genie.ts +13 -0
- package/index.ts +13 -1
- package/lib/bin/dbx-genie.d.ts +2 -0
- package/lib/bin/dbx-genie.js +10 -0
- package/lib/index.d.ts +13 -1
- package/lib/index.js +10 -2
- package/lib/src/auth/cli.js +13 -2
- package/lib/src/auth/options.d.ts +4 -0
- package/lib/src/auth/options.js +5 -1
- package/lib/src/cli.js +8 -4
- package/lib/src/genie-code/cli.d.ts +19 -0
- package/lib/src/genie-code/cli.js +36 -0
- package/lib/src/genie-code/config.d.ts +38 -0
- package/lib/src/genie-code/config.js +111 -0
- package/lib/src/genie-code/install.d.ts +21 -0
- package/lib/src/genie-code/install.js +69 -0
- package/lib/src/genie-code/options.d.ts +7 -0
- package/lib/src/genie-code/options.js +7 -0
- package/lib/src/genie-code/runner.d.ts +21 -0
- package/lib/src/genie-code/runner.js +90 -0
- package/lib/src/genie-code/runtime.d.ts +48 -0
- package/lib/src/genie-code/runtime.js +162 -0
- package/lib/src/model-gateway/cli.js +3 -3
- package/lib/src/model-gateway/server.d.ts +3 -0
- package/lib/src/model-gateway/server.js +36 -6
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +40 -18
- package/src/auth/cli.ts +11 -1
- package/src/auth/options.ts +4 -0
- package/src/cli.ts +13 -2
- package/src/genie-code/cli.ts +58 -0
- package/src/genie-code/config.ts +161 -0
- package/src/genie-code/install.ts +103 -0
- package/src/genie-code/options.ts +14 -0
- package/src/genie-code/runner.ts +106 -0
- package/src/genie-code/runtime.ts +212 -0
- package/src/model-gateway/cli.ts +6 -2
- package/src/model-gateway/server.ts +37 -5
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Supervise Genie Code and its authenticated local model gateway.
|
|
3
|
+
*
|
|
4
|
+
* @module
|
|
5
|
+
*/
|
|
6
|
+
import { randomBytes } from "node:crypto";
|
|
7
|
+
import { rm } from "node:fs/promises";
|
|
8
|
+
import { delimiter, dirname } from "node:path";
|
|
9
|
+
import { DatabricksModelRegistry, models } from "@dbx-tools/appkit-model-gateway";
|
|
10
|
+
import * as auth from "@dbx-tools/auth";
|
|
11
|
+
import { resolveServicePackageBin } from "@dbx-tools/cli-service/definition";
|
|
12
|
+
import { workspaceClient } from "@dbx-tools/databricks";
|
|
13
|
+
import { log } from "@dbx-tools/shared-core";
|
|
14
|
+
import { resolveGenieCodeOptions, } from "@dbx-tools/shared-genie-code/options";
|
|
15
|
+
import concurrently from "concurrently";
|
|
16
|
+
import getPort from "get-port";
|
|
17
|
+
import { writeGenieCodeConfig } from "./config.js";
|
|
18
|
+
import { installGenieCode } from "./install.js";
|
|
19
|
+
import { RUNNER_OPTIONS_ENV } from "./runner.js";
|
|
20
|
+
const logger = log.logger("genie-code");
|
|
21
|
+
const DEFAULT_DEPENDENCIES = {
|
|
22
|
+
createAuthClient: auth.client.createAuthClient,
|
|
23
|
+
install: installGenieCode,
|
|
24
|
+
port: ({ host, port }) => getPort({ host, ...(port ? { port } : {}) }),
|
|
25
|
+
resolveBin: resolveServicePackageBin,
|
|
26
|
+
resolveCodexModel,
|
|
27
|
+
supervise: concurrently,
|
|
28
|
+
token: () => randomBytes(32).toString("base64url"),
|
|
29
|
+
writeConfig: writeGenieCodeConfig,
|
|
30
|
+
};
|
|
31
|
+
/** Resolve a Genie `--model` value to the Codex catalogue slug the gateway publishes. */
|
|
32
|
+
async function resolveCodexModel(model, profile) {
|
|
33
|
+
const client = await workspaceClient.createWorkspaceClient({ profile });
|
|
34
|
+
const target = await new DatabricksModelRegistry({ client }).resolve(model, {
|
|
35
|
+
requiresTools: true,
|
|
36
|
+
});
|
|
37
|
+
if (!target)
|
|
38
|
+
throw new Error(`Genie Code model not found: ${model}`);
|
|
39
|
+
return models.codexModelSlug(target);
|
|
40
|
+
}
|
|
41
|
+
/** Resolve auth, installation, listener, and configuration before spawning children. */
|
|
42
|
+
export async function prepareGenieCodeRuntime(input = {}) {
|
|
43
|
+
const dependencies = { ...DEFAULT_DEPENDENCIES, ...input.dependencies };
|
|
44
|
+
const options = resolveGenieCodeOptions(input.options);
|
|
45
|
+
logger.info("resolving Databricks authentication", {
|
|
46
|
+
requestedProfile: options.profile,
|
|
47
|
+
});
|
|
48
|
+
const authClient = await dependencies.createAuthClient(options.profile ? { profile: options.profile } : {});
|
|
49
|
+
const profile = authClient.profile;
|
|
50
|
+
if (!profile) {
|
|
51
|
+
throw new Error("Genie Code requires a configured Databricks profile");
|
|
52
|
+
}
|
|
53
|
+
logger.info("preparing Genie Code runtime", {
|
|
54
|
+
profile,
|
|
55
|
+
model: options.model,
|
|
56
|
+
});
|
|
57
|
+
const installation = await dependencies.install();
|
|
58
|
+
const host = options.gatewayListen.host;
|
|
59
|
+
const requestedPort = options.gatewayListen.port;
|
|
60
|
+
const gatewayPort = await dependencies.port({
|
|
61
|
+
host,
|
|
62
|
+
...(requestedPort > 0 ? { port: requestedPort } : {}),
|
|
63
|
+
});
|
|
64
|
+
if (requestedPort > 0 && gatewayPort !== requestedPort) {
|
|
65
|
+
throw new Error(`Genie Code gateway port ${requestedPort} is already in use`);
|
|
66
|
+
}
|
|
67
|
+
const model = await dependencies.resolveCodexModel(options.model, profile);
|
|
68
|
+
logger.info("resolved Genie Code model", { requested: options.model, model });
|
|
69
|
+
const urlHost = host.includes(":") ? `[${host}]` : host;
|
|
70
|
+
const gatewayBaseUrl = `http://${urlHost}:${gatewayPort}/v1`;
|
|
71
|
+
const gatewayHealthUrl = `http://${urlHost}:${gatewayPort}/api/healthz`;
|
|
72
|
+
const gatewayListen = `tcp://${urlHost}:${gatewayPort}`;
|
|
73
|
+
const bearerToken = dependencies.token();
|
|
74
|
+
const home = await dependencies.writeConfig({
|
|
75
|
+
bearerToken,
|
|
76
|
+
gatewayBaseUrl,
|
|
77
|
+
model,
|
|
78
|
+
profile,
|
|
79
|
+
projectDirectory: input.cwd ?? process.cwd(),
|
|
80
|
+
});
|
|
81
|
+
return {
|
|
82
|
+
bearerToken,
|
|
83
|
+
gatewayBaseUrl,
|
|
84
|
+
gatewayHealthUrl,
|
|
85
|
+
gatewayListen,
|
|
86
|
+
gatewayPort,
|
|
87
|
+
home,
|
|
88
|
+
installation,
|
|
89
|
+
model,
|
|
90
|
+
profile,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
function shellExecutable(path) {
|
|
94
|
+
if (process.platform === "win32")
|
|
95
|
+
return `"${path.replaceAll('"', '""')}"`;
|
|
96
|
+
return `'${path.replaceAll("'", "'\\''")}'`;
|
|
97
|
+
}
|
|
98
|
+
function childPath(...paths) {
|
|
99
|
+
return [...new Set([...paths.map(dirname), process.env.PATH].filter(Boolean))].join(delimiter);
|
|
100
|
+
}
|
|
101
|
+
/** Run Genie Code and the model gateway until either process exits. */
|
|
102
|
+
export async function runGenieCode(input = {}) {
|
|
103
|
+
const dependencies = { ...DEFAULT_DEPENDENCIES, ...input.dependencies };
|
|
104
|
+
const prepared = await prepareGenieCodeRuntime({
|
|
105
|
+
...input,
|
|
106
|
+
dependencies,
|
|
107
|
+
});
|
|
108
|
+
const gatewayBin = dependencies.resolveBin(import.meta.url, "dbx-model-gateway");
|
|
109
|
+
const runnerBin = dependencies.resolveBin(import.meta.url, "dbx-genie");
|
|
110
|
+
const path = childPath(gatewayBin, runnerBin);
|
|
111
|
+
const runnerOptions = {
|
|
112
|
+
executable: prepared.installation.path,
|
|
113
|
+
arguments: ["-p", prepared.home.overlayName, ...(input.genieArgs ?? [])],
|
|
114
|
+
home: prepared.home.home,
|
|
115
|
+
gatewayHealthUrl: prepared.gatewayHealthUrl,
|
|
116
|
+
bearerToken: prepared.bearerToken,
|
|
117
|
+
startupTimeoutMs: 60_000,
|
|
118
|
+
};
|
|
119
|
+
const { result } = dependencies.supervise([
|
|
120
|
+
{
|
|
121
|
+
command: shellExecutable(gatewayBin),
|
|
122
|
+
name: "gateway",
|
|
123
|
+
env: {
|
|
124
|
+
...process.env,
|
|
125
|
+
PATH: path,
|
|
126
|
+
LISTEN: prepared.gatewayListen,
|
|
127
|
+
DATABRICKS_CONFIG_PROFILE: prepared.profile,
|
|
128
|
+
DBX_TOOLS_MODEL_GATEWAY_BEARER_TOKEN: prepared.bearerToken,
|
|
129
|
+
},
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
command: shellExecutable(runnerBin),
|
|
133
|
+
name: "genie",
|
|
134
|
+
env: {
|
|
135
|
+
...process.env,
|
|
136
|
+
PATH: path,
|
|
137
|
+
DATABRICKS_CONFIG_PROFILE: prepared.profile,
|
|
138
|
+
[RUNNER_OPTIONS_ENV]: JSON.stringify(runnerOptions),
|
|
139
|
+
},
|
|
140
|
+
},
|
|
141
|
+
], {
|
|
142
|
+
cwd: input.cwd ?? process.cwd(),
|
|
143
|
+
raw: true,
|
|
144
|
+
killOthersOn: ["failure", "success"],
|
|
145
|
+
killSignal: "SIGTERM",
|
|
146
|
+
killTimeout: 17_000,
|
|
147
|
+
successCondition: "command-genie",
|
|
148
|
+
});
|
|
149
|
+
logger.info("started Genie Code and model gateway", {
|
|
150
|
+
profile: prepared.profile,
|
|
151
|
+
model: prepared.model,
|
|
152
|
+
gateway: prepared.gatewayBaseUrl,
|
|
153
|
+
home: prepared.home.home,
|
|
154
|
+
});
|
|
155
|
+
try {
|
|
156
|
+
await result;
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
await rm(prepared.home.overlayPath, { force: true });
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/genie-code/runtime.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Supervise Genie Code and its authenticated local model gateway.\n *\n * @module\n */\n\nimport { randomBytes } from \"node:crypto\";\nimport { rm } from \"node:fs/promises\";\nimport { delimiter, dirname } from \"node:path\";\nimport { DatabricksModelRegistry, models } from \"@dbx-tools/appkit-model-gateway\";\nimport * as auth from \"@dbx-tools/auth\";\nimport { resolveServicePackageBin } from \"@dbx-tools/cli-service/definition\";\nimport type { BinContext } from \"@dbx-tools/core/bin\";\nimport { workspaceClient } from \"@dbx-tools/databricks\";\nimport { log } from \"@dbx-tools/shared-core\";\nimport {\n  resolveGenieCodeOptions,\n  type GenieCodeOptions,\n  type GenieCodeRunnerOptions,\n} from \"@dbx-tools/shared-genie-code/options\";\nimport concurrently from \"concurrently\";\nimport getPort from \"get-port\";\n\nimport { writeGenieCodeConfig, type GenieCodeHome } from \"./config.ts\";\nimport { installGenieCode } from \"./install.ts\";\nimport { RUNNER_OPTIONS_ENV } from \"./runner.ts\";\n\nconst logger = log.logger(\"genie-code\");\n\n/** Injectable owners used to prepare and supervise managed Genie Code. */\nexport interface GenieCodeRuntimeDependencies {\n  createAuthClient: typeof auth.client.createAuthClient;\n  install: typeof installGenieCode;\n  port(options: { host: string; port?: number }): Promise<number>;\n  resolveBin(packageReference: string, binName: string): string;\n  resolveCodexModel(model: string, profile: string): Promise<string>;\n  supervise: typeof concurrently;\n  token(): string;\n  writeConfig: typeof writeGenieCodeConfig;\n}\n\nconst DEFAULT_DEPENDENCIES: GenieCodeRuntimeDependencies = {\n  createAuthClient: auth.client.createAuthClient,\n  install: installGenieCode,\n  port: ({ host, port }) => getPort({ host, ...(port ? { port } : {}) }),\n  resolveBin: resolveServicePackageBin,\n  resolveCodexModel,\n  supervise: concurrently,\n  token: () => randomBytes(32).toString(\"base64url\"),\n  writeConfig: writeGenieCodeConfig,\n};\n\n/** Resolve a Genie `--model` value to the Codex catalogue slug the gateway publishes. */\nasync function resolveCodexModel(model: string, profile: string): Promise<string> {\n  const client = await workspaceClient.createWorkspaceClient({ profile });\n  const target = await new DatabricksModelRegistry({ client }).resolve(model, {\n    requiresTools: true,\n  });\n  if (!target) throw new Error(`Genie Code model not found: ${model}`);\n  return models.codexModelSlug(target);\n}\n\n/** Inputs accepted by managed Genie Code preparation and execution. */\nexport interface RunGenieCodeOptions {\n  cwd?: string;\n  dependencies?: Partial<GenieCodeRuntimeDependencies>;\n  genieArgs?: readonly string[];\n  options?: GenieCodeOptions;\n}\n\n/** Resolved installation, auth, listener, and home for one invocation. */\nexport interface PreparedGenieCodeRuntime {\n  bearerToken: string;\n  gatewayBaseUrl: string;\n  gatewayHealthUrl: string;\n  gatewayListen: string;\n  gatewayPort: number;\n  home: GenieCodeHome;\n  installation: BinContext;\n  model: string;\n  profile: string;\n}\n\n/** Resolve auth, installation, listener, and configuration before spawning children. */\nexport async function prepareGenieCodeRuntime(\n  input: RunGenieCodeOptions = {},\n): Promise<PreparedGenieCodeRuntime> {\n  const dependencies = { ...DEFAULT_DEPENDENCIES, ...input.dependencies };\n  const options = resolveGenieCodeOptions(input.options);\n  logger.info(\"resolving Databricks authentication\", {\n    requestedProfile: options.profile,\n  });\n  const authClient = await dependencies.createAuthClient(\n    options.profile ? { profile: options.profile } : {},\n  );\n  const profile = authClient.profile;\n  if (!profile) {\n    throw new Error(\"Genie Code requires a configured Databricks profile\");\n  }\n  logger.info(\"preparing Genie Code runtime\", {\n    profile,\n    model: options.model,\n  });\n  const installation = await dependencies.install();\n  const host = options.gatewayListen.host;\n  const requestedPort = options.gatewayListen.port;\n  const gatewayPort = await dependencies.port({\n    host,\n    ...(requestedPort > 0 ? { port: requestedPort } : {}),\n  });\n  if (requestedPort > 0 && gatewayPort !== requestedPort) {\n    throw new Error(`Genie Code gateway port ${requestedPort} is already in use`);\n  }\n  const model = await dependencies.resolveCodexModel(options.model, profile);\n  logger.info(\"resolved Genie Code model\", { requested: options.model, model });\n  const urlHost = host.includes(\":\") ? `[${host}]` : host;\n  const gatewayBaseUrl = `http://${urlHost}:${gatewayPort}/v1`;\n  const gatewayHealthUrl = `http://${urlHost}:${gatewayPort}/api/healthz`;\n  const gatewayListen = `tcp://${urlHost}:${gatewayPort}`;\n  const bearerToken = dependencies.token();\n  const home = await dependencies.writeConfig({\n    bearerToken,\n    gatewayBaseUrl,\n    model,\n    profile,\n    projectDirectory: input.cwd ?? process.cwd(),\n  });\n  return {\n    bearerToken,\n    gatewayBaseUrl,\n    gatewayHealthUrl,\n    gatewayListen,\n    gatewayPort,\n    home,\n    installation,\n    model,\n    profile,\n  };\n}\n\nfunction shellExecutable(path: string): string {\n  if (process.platform === \"win32\") return `\"${path.replaceAll('\"', '\"\"')}\"`;\n  return `'${path.replaceAll(\"'\", \"'\\\\''\")}'`;\n}\n\nfunction childPath(...paths: string[]): string {\n  return [...new Set([...paths.map(dirname), process.env.PATH].filter(Boolean))].join(delimiter);\n}\n\n/** Run Genie Code and the model gateway until either process exits. */\nexport async function runGenieCode(input: RunGenieCodeOptions = {}): Promise<void> {\n  const dependencies = { ...DEFAULT_DEPENDENCIES, ...input.dependencies };\n  const prepared = await prepareGenieCodeRuntime({\n    ...input,\n    dependencies,\n  });\n  const gatewayBin = dependencies.resolveBin(import.meta.url, \"dbx-model-gateway\");\n  const runnerBin = dependencies.resolveBin(import.meta.url, \"dbx-genie\");\n  const path = childPath(gatewayBin, runnerBin);\n  const runnerOptions: GenieCodeRunnerOptions = {\n    executable: prepared.installation.path,\n    arguments: [\"-p\", prepared.home.overlayName, ...(input.genieArgs ?? [])],\n    home: prepared.home.home,\n    gatewayHealthUrl: prepared.gatewayHealthUrl,\n    bearerToken: prepared.bearerToken,\n    startupTimeoutMs: 60_000,\n  };\n  const { result } = dependencies.supervise(\n    [\n      {\n        command: shellExecutable(gatewayBin),\n        name: \"gateway\",\n        env: {\n          ...process.env,\n          PATH: path,\n          LISTEN: prepared.gatewayListen,\n          DATABRICKS_CONFIG_PROFILE: prepared.profile,\n          DBX_TOOLS_MODEL_GATEWAY_BEARER_TOKEN: prepared.bearerToken,\n        },\n      },\n      {\n        command: shellExecutable(runnerBin),\n        name: \"genie\",\n        env: {\n          ...process.env,\n          PATH: path,\n          DATABRICKS_CONFIG_PROFILE: prepared.profile,\n          [RUNNER_OPTIONS_ENV]: JSON.stringify(runnerOptions),\n        },\n      },\n    ],\n    {\n      cwd: input.cwd ?? process.cwd(),\n      raw: true,\n      killOthersOn: [\"failure\", \"success\"],\n      killSignal: \"SIGTERM\",\n      killTimeout: 17_000,\n      successCondition: \"command-genie\",\n    },\n  );\n  logger.info(\"started Genie Code and model gateway\", {\n    profile: prepared.profile,\n    model: prepared.model,\n    gateway: prepared.gatewayBaseUrl,\n    home: prepared.home.home,\n  });\n  try {\n    await result;\n  } finally {\n    await rm(prepared.home.overlayPath, { force: true });\n  }\n}\n"]}
|
|
@@ -8,14 +8,14 @@ import { buildServiceCommand } from "@dbx-tools/cli-service/cli";
|
|
|
8
8
|
import { defineService } from "@dbx-tools/cli-service/definition";
|
|
9
9
|
import { ModelGatewayCliOptionsSchema, resolveModelGatewayCliOptions, } from "@dbx-tools/shared-model-gateway/options";
|
|
10
10
|
import { Command } from "commander";
|
|
11
|
-
import { PACKAGE_VERSION } from "../../index.js";
|
|
12
11
|
import { startModelGateway } from "./server.js";
|
|
12
|
+
import { PACKAGE_VERSION } from "../../index.js";
|
|
13
13
|
const DEFAULT_DEPENDENCIES = {
|
|
14
14
|
start: startModelGateway,
|
|
15
15
|
};
|
|
16
16
|
/** Build the tray-only model-gateway service definition. */
|
|
17
17
|
export function modelGatewayServiceDefinition(options = {}) {
|
|
18
|
-
const { runtimeInfo: _, ...resolved } = resolveModelGatewayCliOptions(options);
|
|
18
|
+
const { runtimeInfo: _, bearerToken: _bearerToken, ...resolved } = resolveModelGatewayCliOptions(options);
|
|
19
19
|
const host = urlHost(resolved.listen.host);
|
|
20
20
|
return defineService(import.meta.url, {
|
|
21
21
|
id: "dbx-tools.cli-model-gateway",
|
|
@@ -60,4 +60,4 @@ function modelGatewayOptions(command) {
|
|
|
60
60
|
function urlHost(host) {
|
|
61
61
|
return host.includes(":") ? `[${host}]` : host;
|
|
62
62
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZGVsLWdhdGV3YXkvY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFFSCxPQUFPLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN4RSxPQUFPLEVBQUUsbUJBQW1CLEVBQWtDLE1BQU0sNEJBQTRCLENBQUM7QUFDakcsT0FBTyxFQUFFLGFBQWEsRUFBNkIsTUFBTSxtQ0FBbUMsQ0FBQztBQUM3RixPQUFPLEVBQ0wsNEJBQTRCLEVBQzVCLDZCQUE2QixHQUc5QixNQUFNLHlDQUF5QyxDQUFDO0FBQ2pELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFcEMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2hELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQVNqRCxNQUFNLG9CQUFvQixHQUFnQztJQUN4RCxLQUFLLEVBQUUsaUJBQWlCO0NBQ3pCLENBQUM7QUFFRiw0REFBNEQ7QUFDNUQsTUFBTSxVQUFVLDZCQUE2QixDQUMzQyxVQUErQixFQUFFO0lBRWpDLE1BQU0sRUFDSixXQUFXLEVBQUUsQ0FBQyxFQUNkLFdBQVcsRUFBRSxZQUFZLEVBQ3pCLEdBQUcsUUFBUSxFQUNaLEdBQUcsNkJBQTZCLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDM0MsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0MsT0FBTyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDcEMsRUFBRSxFQUFFLDZCQUE2QjtRQUNqQyxJQUFJLEVBQUUsbUJBQW1CO1FBQ3pCLE9BQU8sRUFBRTtZQUNQLE9BQU8sRUFBRSxtQkFBbUI7WUFDNUIsU0FBUyxFQUFFLGFBQWEsQ0FBQyxRQUFRLENBQUM7U0FDbkM7UUFDRCxJQUFJLEVBQUU7WUFDSjtnQkFDRSxJQUFJLEVBQUUsS0FBSztnQkFDWCxLQUFLLEVBQUUsUUFBUTtnQkFDZixHQUFHLEVBQUUsVUFBVSxJQUFJLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLFlBQVk7YUFDeEQ7U0FDRjtLQUNGLENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRCxxRkFBcUY7QUFDckYsTUFBTSxVQUFVLFlBQVksQ0FDMUIsSUFBSSxHQUFHLG1CQUFtQixFQUMxQixlQUE0QyxvQkFBb0I7SUFFaEUsTUFBTSxPQUFPLEdBQUcsZUFBZSxDQUFDO0lBQ2hDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FDckIsSUFBSSxPQUFPLEVBQUU7U0FDVixJQUFJLENBQUMsSUFBSSxDQUFDO1NBQ1YsV0FBVyxDQUFDLG1EQUFtRCxDQUFDO1NBQ2hFLE9BQU8sQ0FBQyxPQUFPLEVBQUUsZUFBZSxDQUFDLEVBQ3BDLDRCQUE0QixDQUM3QixDQUFDLE1BQU0sQ0FBQyxLQUFLLElBQUksRUFBRTtRQUNsQixNQUFNLE9BQU8sR0FBRyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM3QyxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxjQUFjLEVBQUUsbUJBQW1CLEVBQUUsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDOUYsT0FBTztRQUNULENBQUM7UUFDRCxNQUFNLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxHQUFHLGFBQWEsRUFBRSxHQUFHLE9BQU8sQ0FBQztRQUNyRCxNQUFNLFlBQVksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDMUMsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLGNBQWMsR0FBRyxtQkFBbUIsQ0FBQyxHQUFHLEVBQUU7UUFDOUMsT0FBTyw2QkFBNkIsQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLENBQUMsRUFBRSxZQUFZLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekIsT0FBTyxDQUFDLFVBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUNuQyxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDO0FBRUQsU0FBUyxtQkFBbUIsQ0FBQyxPQUFnQjtJQUMzQyxPQUFPLFNBQVMsQ0FBQyxPQUFPLEVBQUUsNEJBQTRCLENBQUMsQ0FBQztBQUMxRCxDQUFDO0FBRUQsU0FBUyxPQUFPLENBQUMsSUFBWTtJQUMzQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztBQUNqRCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBGb3JlZ3JvdW5kIGBkYnggbW9kZWwtZ2F0ZXdheWAgY29tbWFuZC5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cblxuaW1wb3J0IHsgYWRkQXJncywgcGFyc2VBcmdzLCBzZXJpYWxpemVBcmdzIH0gZnJvbSBcIkBkYngtdG9vbHMvY2xpLWFyZ3NcIjtcbmltcG9ydCB7IGJ1aWxkU2VydmljZUNvbW1hbmQsIHR5cGUgQ2xpU2VydmljZUNsaURlcGVuZGVuY2llcyB9IGZyb20gXCJAZGJ4LXRvb2xzL2NsaS1zZXJ2aWNlL2NsaVwiO1xuaW1wb3J0IHsgZGVmaW5lU2VydmljZSwgdHlwZSBDbGlTZXJ2aWNlRGVmaW5pdGlvbiB9IGZyb20gXCJAZGJ4LXRvb2xzL2NsaS1zZXJ2aWNlL2RlZmluaXRpb25cIjtcbmltcG9ydCB7XG4gIE1vZGVsR2F0ZXdheUNsaU9wdGlvbnNTY2hlbWEsXG4gIHJlc29sdmVNb2RlbEdhdGV3YXlDbGlPcHRpb25zLFxuICB0eXBlIE1vZGVsR2F0ZXdheUNsaU9wdGlvbnMsXG4gIHR5cGUgTW9kZWxHYXRld2F5T3B0aW9ucyxcbn0gZnJvbSBcIkBkYngtdG9vbHMvc2hhcmVkLW1vZGVsLWdhdGV3YXkvb3B0aW9uc1wiO1xuaW1wb3J0IHsgQ29tbWFuZCB9IGZyb20gXCJjb21tYW5kZXJcIjtcblxuaW1wb3J0IHsgc3RhcnRNb2RlbEdhdGV3YXkgfSBmcm9tIFwiLi9zZXJ2ZXIudHNcIjtcbmltcG9ydCB7IFBBQ0tBR0VfVkVSU0lPTiB9IGZyb20gXCIuLi8uLi9pbmRleC50c1wiO1xuXG4vKiogSW5qZWN0YWJsZSBmb3JlZ3JvdW5kIGdhdGV3YXkgYm91bmRhcnkgZm9yIENMSSB0ZXN0cy4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgTW9kZWxHYXRld2F5Q2xpRGVwZW5kZW5jaWVzIHtcbiAgc3RhcnQob3B0aW9uczogTW9kZWxHYXRld2F5T3B0aW9ucyk6IFByb21pc2U8dm9pZD47XG4gIC8qKiBPcHRpb25hbCBzZXJ2aWNlIENMSSBib3VuZGFyeSBmb3IgdGVzdHMgYW5kIGVtYmVkZGluZy4gKi9cbiAgcmVhZG9ubHkgc2VydmljZT86IENsaVNlcnZpY2VDbGlEZXBlbmRlbmNpZXM7XG59XG5cbmNvbnN0IERFRkFVTFRfREVQRU5ERU5DSUVTOiBNb2RlbEdhdGV3YXlDbGlEZXBlbmRlbmNpZXMgPSB7XG4gIHN0YXJ0OiBzdGFydE1vZGVsR2F0ZXdheSxcbn07XG5cbi8qKiBCdWlsZCB0aGUgdHJheS1vbmx5IG1vZGVsLWdhdGV3YXkgc2VydmljZSBkZWZpbml0aW9uLiAqL1xuZXhwb3J0IGZ1bmN0aW9uIG1vZGVsR2F0ZXdheVNlcnZpY2VEZWZpbml0aW9uKFxuICBvcHRpb25zOiBNb2RlbEdhdGV3YXlPcHRpb25zID0ge30sXG4pOiBDbGlTZXJ2aWNlRGVmaW5pdGlvbiB7XG4gIGNvbnN0IHtcbiAgICBydW50aW1lSW5mbzogXyxcbiAgICBiZWFyZXJUb2tlbjogX2JlYXJlclRva2VuLFxuICAgIC4uLnJlc29sdmVkXG4gIH0gPSByZXNvbHZlTW9kZWxHYXRld2F5Q2xpT3B0aW9ucyhvcHRpb25zKTtcbiAgY29uc3QgaG9zdCA9IHVybEhvc3QocmVzb2x2ZWQubGlzdGVuLmhvc3QpO1xuICByZXR1cm4gZGVmaW5lU2VydmljZShpbXBvcnQubWV0YS51cmwsIHtcbiAgICBpZDogXCJkYngtdG9vbHMuY2xpLW1vZGVsLWdhdGV3YXlcIixcbiAgICBuYW1lOiBcImRieCBtb2RlbCBnYXRld2F5XCIsXG4gICAgY29tbWFuZDoge1xuICAgICAgYmluTmFtZTogXCJkYngtbW9kZWwtZ2F0ZXdheVwiLFxuICAgICAgYXJndW1lbnRzOiBzZXJpYWxpemVBcmdzKHJlc29sdmVkKSxcbiAgICB9LFxuICAgIG1lbnU6IFtcbiAgICAgIHtcbiAgICAgICAgdHlwZTogXCJ1cmxcIixcbiAgICAgICAgbGFiZWw6IFwiTW9kZWxzXCIsXG4gICAgICAgIHVybDogYGh0dHA6Ly8ke2hvc3R9OiR7cmVzb2x2ZWQubGlzdGVuLnBvcnR9L3YxL21vZGVsc2AsXG4gICAgICB9LFxuICAgIF0sXG4gIH0pO1xufVxuXG4vKiogQnVpbGQgZm9yZWdyb3VuZCBhbmQgc2VydmljZSBtb2RlbC1nYXRld2F5IGNvbW1hbmRzIHdpdGhvdXQgc3RhcnRpbmcgYSBzZXJ2ZXIuICovXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRQcm9ncmFtKFxuICBuYW1lID0gXCJkYnggbW9kZWwtZ2F0ZXdheVwiLFxuICBkZXBlbmRlbmNpZXM6IE1vZGVsR2F0ZXdheUNsaURlcGVuZGVuY2llcyA9IERFRkFVTFRfREVQRU5ERU5DSUVTLFxuKTogQ29tbWFuZCB7XG4gIGNvbnN0IHZlcnNpb24gPSBQQUNLQUdFX1ZFUlNJT047XG4gIGNvbnN0IHByb2dyYW0gPSBhZGRBcmdzKFxuICAgIG5ldyBDb21tYW5kKClcbiAgICAgIC5uYW1lKG5hbWUpXG4gICAgICAuZGVzY3JpcHRpb24oXCJSdW4gb3IgbWFuYWdlIHRoZSBBcHBLaXQgRGF0YWJyaWNrcyBtb2RlbCBnYXRld2F5XCIpXG4gICAgICAudmVyc2lvbih2ZXJzaW9uLCBcIi12LCAtLXZlcnNpb25cIiksXG4gICAgTW9kZWxHYXRld2F5Q2xpT3B0aW9uc1NjaGVtYSxcbiAgKS5hY3Rpb24oYXN5bmMgKCkgPT4ge1xuICAgIGNvbnN0IG9wdGlvbnMgPSBtb2RlbEdhdGV3YXlPcHRpb25zKHByb2dyYW0pO1xuICAgIGlmIChvcHRpb25zLnJ1bnRpbWVJbmZvKSB7XG4gICAgICBwcm9jZXNzLnN0ZG91dC53cml0ZShgJHtKU09OLnN0cmluZ2lmeSh7IGltcGxlbWVudGF0aW9uOiBcInR5cGVzY3JpcHQtYXBwa2l0XCIsIHZlcnNpb24gfSl9XFxuYCk7XG4gICAgICByZXR1cm47XG4gICAgfVxuICAgIGNvbnN0IHsgcnVudGltZUluZm86IF8sIC4uLnNlcnZlck9wdGlvbnMgfSA9IG9wdGlvbnM7XG4gICAgYXdhaXQgZGVwZW5kZW5jaWVzLnN0YXJ0KHNlcnZlck9wdGlvbnMpO1xuICB9KTtcbiAgY29uc3Qgc2VydmljZUNvbW1hbmQgPSBidWlsZFNlcnZpY2VDb21tYW5kKCgpID0+IHtcbiAgICByZXR1cm4gbW9kZWxHYXRld2F5U2VydmljZURlZmluaXRpb24obW9kZWxHYXRld2F5T3B0aW9ucyhwcm9ncmFtKSk7XG4gIH0sIGRlcGVuZGVuY2llcy5zZXJ2aWNlKTtcbiAgcHJvZ3JhbS5hZGRDb21tYW5kKHNlcnZpY2VDb21tYW5kKTtcbiAgcmV0dXJuIHByb2dyYW07XG59XG5cbmZ1bmN0aW9uIG1vZGVsR2F0ZXdheU9wdGlvbnMoY29tbWFuZDogQ29tbWFuZCk6IE1vZGVsR2F0ZXdheUNsaU9wdGlvbnMge1xuICByZXR1cm4gcGFyc2VBcmdzKGNvbW1hbmQsIE1vZGVsR2F0ZXdheUNsaU9wdGlvbnNTY2hlbWEpO1xufVxuXG5mdW5jdGlvbiB1cmxIb3N0KGhvc3Q6IHN0cmluZyk6IHN0cmluZyB7XG4gIHJldHVybiBob3N0LmluY2x1ZGVzKFwiOlwiKSA/IGBbJHtob3N0fV1gIDogaG9zdDtcbn1cbiJdfQ==
|
|
@@ -5,9 +5,12 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { server } from "@databricks/appkit";
|
|
7
7
|
import { type ModelGatewayOptions } from "@dbx-tools/shared-model-gateway/options";
|
|
8
|
+
import type express from "express";
|
|
8
9
|
type AppKitServerOptions = NonNullable<Parameters<typeof server>[0]>;
|
|
9
10
|
/** Resolve AppKit server settings for the loopback model gateway. */
|
|
10
11
|
export declare function modelGatewayServerOptions(options?: ModelGatewayOptions): AppKitServerOptions;
|
|
12
|
+
/** Require one bearer token without retaining or logging request credentials. */
|
|
13
|
+
export declare function gatewayBearerMiddleware(token: string): express.RequestHandler;
|
|
11
14
|
/** Start the foreground model gateway and keep its AppKit server active. */
|
|
12
15
|
export declare function startModelGateway(options?: ModelGatewayOptions): Promise<void>;
|
|
13
16
|
export {};
|
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
|
+
import { createHash, timingSafeEqual } from "node:crypto";
|
|
6
7
|
import { createApp, server } from "@databricks/appkit";
|
|
7
|
-
import {
|
|
8
|
-
import { sendHealth } from "@dbx-tools/appkit-model-gateway/routes";
|
|
8
|
+
import { ModelGateway } from "@dbx-tools/appkit-model-gateway";
|
|
9
|
+
import { sendHealth, sendInference, sendModels } from "@dbx-tools/appkit-model-gateway/routes";
|
|
9
10
|
import { workspaceClient } from "@dbx-tools/databricks";
|
|
10
11
|
import { resolveModelGatewayOptions, } from "@dbx-tools/shared-model-gateway/options";
|
|
11
12
|
/** Resolve AppKit server settings for the loopback model gateway. */
|
|
@@ -19,22 +20,51 @@ function appKitServerOptions(options) {
|
|
|
19
20
|
port: options.listen.port,
|
|
20
21
|
};
|
|
21
22
|
}
|
|
23
|
+
/** Require one bearer token without retaining or logging request credentials. */
|
|
24
|
+
export function gatewayBearerMiddleware(token) {
|
|
25
|
+
const expected = createHash("sha256").update(token).digest();
|
|
26
|
+
return (request, response, next) => {
|
|
27
|
+
const authorization = request.header("authorization");
|
|
28
|
+
const match = /^Bearer\s+(.+)$/i.exec(authorization ?? "");
|
|
29
|
+
const actual = createHash("sha256")
|
|
30
|
+
.update(match?.[1] ?? "")
|
|
31
|
+
.digest();
|
|
32
|
+
if (match && timingSafeEqual(actual, expected)) {
|
|
33
|
+
next();
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
response
|
|
37
|
+
.status(401)
|
|
38
|
+
.setHeader("www-authenticate", "Bearer")
|
|
39
|
+
.json({
|
|
40
|
+
error: {
|
|
41
|
+
message: "Invalid or missing model-gateway bearer token.",
|
|
42
|
+
type: "authentication_error",
|
|
43
|
+
code: "invalid_bearer_token",
|
|
44
|
+
},
|
|
45
|
+
});
|
|
46
|
+
};
|
|
47
|
+
}
|
|
22
48
|
/** Start the foreground model gateway and keep its AppKit server active. */
|
|
23
49
|
export async function startModelGateway(options = {}) {
|
|
24
50
|
const resolved = resolveModelGatewayOptions(options);
|
|
51
|
+
const gateway = new ModelGateway();
|
|
25
52
|
const client = await workspaceClient.createWorkspaceClient({
|
|
26
53
|
...(resolved.profile ? { profile: resolved.profile } : {}),
|
|
27
54
|
});
|
|
28
55
|
await createApp({
|
|
29
56
|
client,
|
|
30
|
-
plugins: [
|
|
57
|
+
plugins: [server(appKitServerOptions(resolved))],
|
|
31
58
|
onPluginsReady(appkit) {
|
|
32
59
|
appkit.server.extend((application) => {
|
|
60
|
+
if (resolved.bearerToken) {
|
|
61
|
+
application.use(gatewayBearerMiddleware(resolved.bearerToken));
|
|
62
|
+
}
|
|
33
63
|
application.get("/api/healthz", (_request, response) => {
|
|
34
64
|
sendHealth(response);
|
|
35
65
|
});
|
|
36
66
|
application.get("/v1/models", (request, response) => {
|
|
37
|
-
void
|
|
67
|
+
void sendModels(gateway, request, response);
|
|
38
68
|
});
|
|
39
69
|
for (const [path, protocol] of [
|
|
40
70
|
["/v1/chat/completions", "openai-chat"],
|
|
@@ -43,11 +73,11 @@ export async function startModelGateway(options = {}) {
|
|
|
43
73
|
["/v1/embeddings", "openai-embeddings"],
|
|
44
74
|
]) {
|
|
45
75
|
application.post(path, (request, response) => {
|
|
46
|
-
void
|
|
76
|
+
void sendInference(gateway, protocol, request, response);
|
|
47
77
|
});
|
|
48
78
|
}
|
|
49
79
|
});
|
|
50
80
|
},
|
|
51
81
|
});
|
|
52
82
|
}
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/model-gateway/server.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Foreground model-gateway server owned by the CLI package.\n *\n * @module\n */\n\nimport { createHash, timingSafeEqual } from \"node:crypto\";\nimport { createApp, server } from \"@databricks/appkit\";\nimport { ModelGateway } from \"@dbx-tools/appkit-model-gateway\";\nimport { sendHealth, sendInference, sendModels } from \"@dbx-tools/appkit-model-gateway/routes\";\nimport { workspaceClient } from \"@dbx-tools/databricks\";\nimport {\n  resolveModelGatewayOptions,\n  type ModelGatewayOptions,\n  type ResolvedModelGatewayOptions,\n} from \"@dbx-tools/shared-model-gateway/options\";\nimport type express from \"express\";\n\ntype AppKitServerOptions = NonNullable<Parameters<typeof server>[0]>;\n\n/** Resolve AppKit server settings for the loopback model gateway. */\nexport function modelGatewayServerOptions(options: ModelGatewayOptions = {}): AppKitServerOptions {\n  return appKitServerOptions(resolveModelGatewayOptions(options));\n}\n\nfunction appKitServerOptions(options: ResolvedModelGatewayOptions): AppKitServerOptions {\n  return {\n    bodyLimit: options.bodyLimit,\n    host: options.listen.host,\n    port: options.listen.port,\n  };\n}\n\n/** Require one bearer token without retaining or logging request credentials. */\nexport function gatewayBearerMiddleware(token: string): express.RequestHandler {\n  const expected = createHash(\"sha256\").update(token).digest();\n  return (request, response, next) => {\n    const authorization = request.header(\"authorization\");\n    const match = /^Bearer\\s+(.+)$/i.exec(authorization ?? \"\");\n    const actual = createHash(\"sha256\")\n      .update(match?.[1] ?? \"\")\n      .digest();\n    if (match && timingSafeEqual(actual, expected)) {\n      next();\n      return;\n    }\n    response\n      .status(401)\n      .setHeader(\"www-authenticate\", \"Bearer\")\n      .json({\n        error: {\n          message: \"Invalid or missing model-gateway bearer token.\",\n          type: \"authentication_error\",\n          code: \"invalid_bearer_token\",\n        },\n      });\n  };\n}\n\n/** Start the foreground model gateway and keep its AppKit server active. */\nexport async function startModelGateway(options: ModelGatewayOptions = {}): Promise<void> {\n  const resolved = resolveModelGatewayOptions(options);\n  const gateway = new ModelGateway();\n  const client = await workspaceClient.createWorkspaceClient({\n    ...(resolved.profile ? { profile: resolved.profile } : {}),\n  });\n  await createApp({\n    client,\n    plugins: [server(appKitServerOptions(resolved))],\n    onPluginsReady(appkit) {\n      appkit.server.extend((application) => {\n        if (resolved.bearerToken) {\n          application.use(gatewayBearerMiddleware(resolved.bearerToken));\n        }\n        application.get(\"/api/healthz\", (_request, response) => {\n          sendHealth(response);\n        });\n        application.get(\"/v1/models\", (request, response) => {\n          void sendModels(gateway, request, response);\n        });\n        for (const [path, protocol] of [\n          [\"/v1/chat/completions\", \"openai-chat\"],\n          [\"/v1/responses\", \"openai-responses\"],\n          [\"/v1/messages\", \"anthropic-messages\"],\n          [\"/v1/embeddings\", \"openai-embeddings\"],\n        ] as const) {\n          application.post(path, (request, response) => {\n            void sendInference(gateway, protocol, request, response);\n          });\n        }\n      });\n    },\n  });\n}\n"]}
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/bootstrap.ts","../src/bun.ts","../src/cli.ts","../src/root.ts","../src/appkit/cli.ts","../src/appkit/env-export.ts","../src/auth/cli.ts","../src/auth/options.ts","../src/graphiti/cli.ts","../src/graphiti/options.ts","../src/lakebase-proxy/cancellation.ts","../src/lakebase-proxy/cli.ts","../src/lakebase-proxy/options.ts","../src/lakebase-proxy/protocol.ts","../src/lakebase-proxy/proxy.ts","../src/model-gateway/cli.ts","../src/model-gateway/server.ts","../src/tunnel/app.ts","../src/tunnel/cli.ts","../src/tunnel/options.ts","../src/tunnel/proxy.ts","../index.ts","../bin/dbx-graphiti.ts","../bin/dbx-lakebase-proxy.ts","../bin/dbx-model-gateway.ts","../bin/dbx-tools.ts"],"version":"5.9.3"}
|
|
1
|
+
{"root":["../src/bootstrap.ts","../src/bun.ts","../src/cli.ts","../src/root.ts","../src/appkit/cli.ts","../src/appkit/env-export.ts","../src/auth/cli.ts","../src/auth/options.ts","../src/genie-code/cli.ts","../src/genie-code/config.ts","../src/genie-code/install.ts","../src/genie-code/options.ts","../src/genie-code/runner.ts","../src/genie-code/runtime.ts","../src/graphiti/cli.ts","../src/graphiti/options.ts","../src/lakebase-proxy/cancellation.ts","../src/lakebase-proxy/cli.ts","../src/lakebase-proxy/options.ts","../src/lakebase-proxy/protocol.ts","../src/lakebase-proxy/proxy.ts","../src/model-gateway/cli.ts","../src/model-gateway/server.ts","../src/tunnel/app.ts","../src/tunnel/cli.ts","../src/tunnel/options.ts","../src/tunnel/proxy.ts","../index.ts","../bin/dbx-genie.ts","../bin/dbx-graphiti.ts","../bin/dbx-lakebase-proxy.ts","../bin/dbx-model-gateway.ts","../bin/dbx-tools.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
},
|
|
9
9
|
"bin": {
|
|
10
10
|
"dbx": "./lib/bin/dbx-tools.js",
|
|
11
|
+
"dbx-genie": "./lib/bin/dbx-genie.js",
|
|
11
12
|
"dbx-graphiti": "./lib/bin/dbx-graphiti.js",
|
|
12
13
|
"dbx-lakebase-proxy": "./lib/bin/dbx-lakebase-proxy.js",
|
|
13
14
|
"dbx-model-gateway": "./lib/bin/dbx-model-gateway.js",
|
|
@@ -33,26 +34,30 @@
|
|
|
33
34
|
"dependencies": {
|
|
34
35
|
"@clack/prompts": "^1.7.0",
|
|
35
36
|
"@databricks/appkit": "0.81.0",
|
|
36
|
-
"@dbx-tools/appkit": "^0.9.
|
|
37
|
-
"@dbx-tools/appkit-model-gateway": "^0.9.
|
|
38
|
-
"@dbx-tools/auth": "^0.9.
|
|
39
|
-
"@dbx-tools/auth-gate": "^0.9.
|
|
40
|
-
"@dbx-tools/cli-args": "^0.9.
|
|
41
|
-
"@dbx-tools/cli-service": "^0.9.
|
|
42
|
-
"@dbx-tools/core": "^0.9.
|
|
43
|
-
"@dbx-tools/databricks": "^0.9.
|
|
44
|
-
"@dbx-tools/email": "^0.9.
|
|
45
|
-
"@dbx-tools/graphiti": "^0.9.
|
|
46
|
-
"@dbx-tools/lakebase": "^0.9.
|
|
47
|
-
"@dbx-tools/postgres": "^0.9.
|
|
48
|
-
"@dbx-tools/shared-auth": "^0.9.
|
|
49
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
50
|
-
"@dbx-tools/shared-email": "^0.9.
|
|
51
|
-
"@dbx-tools/shared-
|
|
52
|
-
"@dbx-tools/
|
|
37
|
+
"@dbx-tools/appkit": "^0.9.61",
|
|
38
|
+
"@dbx-tools/appkit-model-gateway": "^0.9.61",
|
|
39
|
+
"@dbx-tools/auth": "^0.9.61",
|
|
40
|
+
"@dbx-tools/auth-gate": "^0.9.61",
|
|
41
|
+
"@dbx-tools/cli-args": "^0.9.61",
|
|
42
|
+
"@dbx-tools/cli-service": "^0.9.61",
|
|
43
|
+
"@dbx-tools/core": "^0.9.61",
|
|
44
|
+
"@dbx-tools/databricks": "^0.9.61",
|
|
45
|
+
"@dbx-tools/email": "^0.9.61",
|
|
46
|
+
"@dbx-tools/graphiti": "^0.9.61",
|
|
47
|
+
"@dbx-tools/lakebase": "^0.9.61",
|
|
48
|
+
"@dbx-tools/postgres": "^0.9.61",
|
|
49
|
+
"@dbx-tools/shared-auth": "^0.9.61",
|
|
50
|
+
"@dbx-tools/shared-core": "^0.9.61",
|
|
51
|
+
"@dbx-tools/shared-email": "^0.9.61",
|
|
52
|
+
"@dbx-tools/shared-genie-code": "^0.9.61",
|
|
53
|
+
"@dbx-tools/shared-model-gateway": "^0.9.61",
|
|
54
|
+
"@dbx-tools/tunnel": "^0.9.61",
|
|
53
55
|
"commander": "^15.0.0",
|
|
56
|
+
"concurrently": "^10.0.3",
|
|
57
|
+
"get-port": "^7.1.0",
|
|
54
58
|
"http-proxy-3": "^1.23.1",
|
|
55
59
|
"pg": "^8.22.0",
|
|
60
|
+
"smol-toml": "1.8.0",
|
|
56
61
|
"zod": "4.3.6"
|
|
57
62
|
},
|
|
58
63
|
"main": "./lib/index.js",
|
|
@@ -63,6 +68,7 @@
|
|
|
63
68
|
"types": "./lib/index.d.ts",
|
|
64
69
|
"bin": {
|
|
65
70
|
"dbx": "./lib/bin/dbx-tools.js",
|
|
71
|
+
"dbx-genie": "./lib/bin/dbx-genie.js",
|
|
66
72
|
"dbx-graphiti": "./lib/bin/dbx-graphiti.js",
|
|
67
73
|
"dbx-lakebase-proxy": "./lib/bin/dbx-lakebase-proxy.js",
|
|
68
74
|
"dbx-model-gateway": "./lib/bin/dbx-model-gateway.js",
|
|
@@ -113,6 +119,14 @@
|
|
|
113
119
|
"types": "./lib/src/graphiti/options.d.ts",
|
|
114
120
|
"default": "./lib/src/graphiti/options.js"
|
|
115
121
|
},
|
|
122
|
+
"./genie": {
|
|
123
|
+
"types": "./lib/src/genie-code/cli.d.ts",
|
|
124
|
+
"default": "./lib/src/genie-code/cli.js"
|
|
125
|
+
},
|
|
126
|
+
"./genie/options": {
|
|
127
|
+
"types": "./lib/src/genie-code/options.d.ts",
|
|
128
|
+
"default": "./lib/src/genie-code/options.js"
|
|
129
|
+
},
|
|
116
130
|
"./lakebase-proxy": {
|
|
117
131
|
"types": "./lib/src/lakebase-proxy/cli.d.ts",
|
|
118
132
|
"default": "./lib/src/lakebase-proxy/cli.js"
|
|
@@ -140,7 +154,7 @@
|
|
|
140
154
|
"./package.json": "./package.json"
|
|
141
155
|
}
|
|
142
156
|
},
|
|
143
|
-
"version": "0.9.
|
|
157
|
+
"version": "0.9.61",
|
|
144
158
|
"types": "./lib/index.d.ts",
|
|
145
159
|
"dbxToolsConfig": {
|
|
146
160
|
"tags": [
|
|
@@ -193,6 +207,14 @@
|
|
|
193
207
|
"types": "./lib/src/graphiti/options.d.ts",
|
|
194
208
|
"default": "./lib/src/graphiti/options.js"
|
|
195
209
|
},
|
|
210
|
+
"./genie": {
|
|
211
|
+
"types": "./lib/src/genie-code/cli.d.ts",
|
|
212
|
+
"default": "./lib/src/genie-code/cli.js"
|
|
213
|
+
},
|
|
214
|
+
"./genie/options": {
|
|
215
|
+
"types": "./lib/src/genie-code/options.d.ts",
|
|
216
|
+
"default": "./lib/src/genie-code/options.js"
|
|
217
|
+
},
|
|
196
218
|
"./lakebase-proxy": {
|
|
197
219
|
"types": "./lib/src/lakebase-proxy/cli.d.ts",
|
|
198
220
|
"default": "./lib/src/lakebase-proxy/cli.js"
|
package/src/auth/cli.ts
CHANGED
|
@@ -123,10 +123,20 @@ export function buildProgram(
|
|
|
123
123
|
...(tokenOptions.login ? {} : { login: false }),
|
|
124
124
|
...(tokenOptions.forceRefresh ? { refresh: true } : {}),
|
|
125
125
|
});
|
|
126
|
-
dependencies.
|
|
126
|
+
if (tokenOptions.format === "text") dependencies.writeText(token.accessToken);
|
|
127
|
+
else dependencies.writeJson(tokenJson(token));
|
|
127
128
|
});
|
|
128
129
|
});
|
|
129
130
|
|
|
131
|
+
program
|
|
132
|
+
.command("headers")
|
|
133
|
+
.description("Return current Databricks authentication headers")
|
|
134
|
+
.action(async () => {
|
|
135
|
+
await withAuth(options(), dependencies, async ({ auth }) => {
|
|
136
|
+
dependencies.writeJson(await auth.headers());
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
|
|
130
140
|
program
|
|
131
141
|
.command("profile")
|
|
132
142
|
.description("Print the configured or automatically detected profile")
|
package/src/auth/options.ts
CHANGED
|
@@ -48,6 +48,10 @@ export const TokenCommandOptionsSchema = z
|
|
|
48
48
|
.object({
|
|
49
49
|
forceRefresh: z.boolean().default(false).describe("Refresh the token before returning it."),
|
|
50
50
|
login: z.boolean().default(true).describe("Log in when credentials are missing or invalid."),
|
|
51
|
+
format: z
|
|
52
|
+
.enum(["json", "text"])
|
|
53
|
+
.default("json")
|
|
54
|
+
.describe("Output structured token metadata or only the access token."),
|
|
51
55
|
})
|
|
52
56
|
.strict()
|
|
53
57
|
.describe("Options for returning a Databricks access token.");
|
package/src/cli.ts
CHANGED
|
@@ -59,8 +59,9 @@ export async function prepareAndRunProjen(projenArgs: string[], startDir?: strin
|
|
|
59
59
|
/**
|
|
60
60
|
* Mount `name` as a command that captures every following token verbatim and
|
|
61
61
|
* hands it to the program `load()` resolves. `helpOption(false)` is what lets
|
|
62
|
-
* `--help` through to the child instead of being answered here, and
|
|
63
|
-
*
|
|
62
|
+
* `--help` through to the child instead of being answered here, and
|
|
63
|
+
* `passThroughOptions()` keeps unknown flags in that token list so the child
|
|
64
|
+
* program owns them.
|
|
64
65
|
*/
|
|
65
66
|
function addForwardedCommand(
|
|
66
67
|
program: Command,
|
|
@@ -73,6 +74,7 @@ function addForwardedCommand(
|
|
|
73
74
|
.description(description)
|
|
74
75
|
.argument("[args...]", `arguments forwarded to ${name}`)
|
|
75
76
|
.allowUnknownOption()
|
|
77
|
+
.passThroughOptions()
|
|
76
78
|
.allowExcessArguments()
|
|
77
79
|
.helpOption(false)
|
|
78
80
|
.action(async (args: string[]) => {
|
|
@@ -88,6 +90,7 @@ export function buildProgram(name: string = PROGRAM_NAMES[0]): Command {
|
|
|
88
90
|
.description(
|
|
89
91
|
"Databricks developer tools: workspace lifecycle, AppKit env, auth, tunnels, and local proxies",
|
|
90
92
|
)
|
|
93
|
+
.enablePositionalOptions()
|
|
91
94
|
.showHelpAfterError()
|
|
92
95
|
.helpOption("-h, --help", `Show ${name} help`);
|
|
93
96
|
|
|
@@ -137,6 +140,13 @@ export function buildProgram(name: string = PROGRAM_NAMES[0]): Command {
|
|
|
137
140
|
async () => (await import("./model-gateway/cli.ts")).buildProgram,
|
|
138
141
|
);
|
|
139
142
|
|
|
143
|
+
addForwardedCommand(
|
|
144
|
+
program,
|
|
145
|
+
"genie",
|
|
146
|
+
"Run managed Genie Code through a local Databricks model gateway",
|
|
147
|
+
async () => (await import("./genie-code/cli.ts")).buildProgram,
|
|
148
|
+
);
|
|
149
|
+
|
|
140
150
|
addForwardedCommand(
|
|
141
151
|
program,
|
|
142
152
|
"graphiti",
|
|
@@ -158,6 +168,7 @@ export async function buildDocumentationProgram(name: string = PROGRAM_NAMES[0])
|
|
|
158
168
|
(await import("./tunnel/cli.ts")).buildProgram("tunnel"),
|
|
159
169
|
(await import("./lakebase-proxy/cli.ts")).buildProgram("lakebase-proxy"),
|
|
160
170
|
(await import("./model-gateway/cli.ts")).buildProgram("model-gateway"),
|
|
171
|
+
(await import("./genie-code/cli.ts")).buildProgram("genie"),
|
|
161
172
|
(await import("./graphiti/cli.ts")).buildProgram("graphiti"),
|
|
162
173
|
);
|
|
163
174
|
return program;
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Managed `dbx genie` command.
|
|
3
|
+
*
|
|
4
|
+
* @module
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import { addArgs, parseArgs } from "@dbx-tools/cli-args";
|
|
8
|
+
import { Command } from "commander";
|
|
9
|
+
|
|
10
|
+
import { GenieCodeCliOptionsSchema, type GenieCodeCliOptions } from "./options.ts";
|
|
11
|
+
import { runGenieCode } from "./runtime.ts";
|
|
12
|
+
|
|
13
|
+
/** Injectable managed Genie execution boundary for parser tests and embedding. */
|
|
14
|
+
export interface GenieCodeCliDependencies {
|
|
15
|
+
run(input: {
|
|
16
|
+
cwd: string;
|
|
17
|
+
genieArgs: readonly string[];
|
|
18
|
+
options: GenieCodeCliOptions;
|
|
19
|
+
}): Promise<void>;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const DEFAULT_DEPENDENCIES: GenieCodeCliDependencies = {
|
|
23
|
+
run: runGenieCode,
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
/** Build the managed Genie Code command without executing it. */
|
|
27
|
+
export function buildProgram(
|
|
28
|
+
name = "dbx genie",
|
|
29
|
+
dependencies: GenieCodeCliDependencies = DEFAULT_DEPENDENCIES,
|
|
30
|
+
): Command {
|
|
31
|
+
const program = addArgs(
|
|
32
|
+
new Command()
|
|
33
|
+
.name(name)
|
|
34
|
+
.description("Run Genie Code through an authenticated local Databricks model gateway")
|
|
35
|
+
.argument(
|
|
36
|
+
"[genieArgs...]",
|
|
37
|
+
"arguments and unknown flags forwarded to Genie Code; wrapper options may be separated with --",
|
|
38
|
+
)
|
|
39
|
+
.allowUnknownOption()
|
|
40
|
+
.passThroughOptions()
|
|
41
|
+
.allowExcessArguments()
|
|
42
|
+
.showHelpAfterError(),
|
|
43
|
+
GenieCodeCliOptionsSchema,
|
|
44
|
+
);
|
|
45
|
+
program.action(async (genieArgs: string[]) => {
|
|
46
|
+
await dependencies.run({
|
|
47
|
+
cwd: process.cwd(),
|
|
48
|
+
genieArgs,
|
|
49
|
+
options: parseArgs(program, GenieCodeCliOptionsSchema),
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
return program;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** Parse argv and run managed Genie Code. */
|
|
56
|
+
export async function runCli(argv: string[]): Promise<void> {
|
|
57
|
+
await buildProgram().parseAsync(argv);
|
|
58
|
+
}
|