@dbx-tools/cli 0.9.175 → 0.9.176
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 +19 -12
- package/index.model-gateway.ts +1 -1
- package/index.ts +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/index.model-gateway.d.ts +1 -1
- package/lib/index.model-gateway.js +2 -2
- package/lib/src/model-gateway/cli.d.ts +1 -0
- package/lib/src/model-gateway/cli.js +31 -4
- package/lib/src/model-gateway/server.d.ts +2 -0
- package/lib/src/model-gateway/server.js +40 -2
- package/package.json +23 -23
- package/src/model-gateway/cli.ts +30 -2
- package/src/model-gateway/server.ts +48 -0
package/README.md
CHANGED
|
@@ -653,18 +653,25 @@ dbx model-gateway [options] [command]
|
|
|
653
653
|
|
|
654
654
|
#### Options
|
|
655
655
|
|
|
656
|
-
| Option
|
|
657
|
-
|
|
|
658
|
-
| `-v, --version`
|
|
659
|
-
| `--model <value>`
|
|
660
|
-
| `--model-class <value>`
|
|
661
|
-
| `--
|
|
662
|
-
| `--
|
|
663
|
-
|
|
|
664
|
-
| `--
|
|
665
|
-
| `--
|
|
666
|
-
|
|
|
667
|
-
| `--
|
|
656
|
+
| Option | Description |
|
|
657
|
+
| -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
658
|
+
| `-v, --version` | output the version number |
|
|
659
|
+
| `--model <value>` | Optional fuzzy or exact model name. (env: MODEL) |
|
|
660
|
+
| `--model-class <value>` | Optional model capability class used when selecting a default model. (choices: "chat-thinking", "chat-balanced", "chat-fast", "embedding", env: MODEL_CLASS) |
|
|
661
|
+
| `--smart-router <value>` | Smart Router mode: auto advertises it only when available, true requires it, and false disables it. (choices: "auto", "true", "false", default: "auto", env: SMART_ROUTER) |
|
|
662
|
+
| `--smart-router-timeout-ms <value>` | Maximum milliseconds allowed for one Databricks Smart Router request. (default: 10000, env: SMART_ROUTER_TIMEOUT_MS) |
|
|
663
|
+
| `--smart-router-context-token-budget <value>` | o200k_base token budget used to build Smart Router task context. (default: 4096, env: SMART_ROUTER_CONTEXT_TOKEN_BUDGET) |
|
|
664
|
+
| `--smart-router-probe-ttl-ms <value>` | Milliseconds a successful memoized Smart Router capability probe remains valid. (default: 300000, env: SMART_ROUTER_PROBE_TTL_MS) |
|
|
665
|
+
| `--smart-router-probe-refresh-interval-ms <value>` | Milliseconds between unref'd background refreshes of cached Smart Router probes. (default: 3600000, env: SMART_ROUTER_PROBE_REFRESH_INTERVAL_MS) |
|
|
666
|
+
| `--smart-router-route-ttl-seconds <value>` | Seconds a logical turn remains pinned to its Smart Router-selected model. (default: 21600, env: SMART_ROUTER_ROUTE_TTL_SECONDS) |
|
|
667
|
+
| `--prefer-system-models` | Prefer system.ai services over serving endpoints for non-exact model selection. (default: false, env: PREFER_SYSTEM_MODELS) |
|
|
668
|
+
| `--no-prefer-system-models` | Disable prefer system.ai services over serving endpoints for non-exact model selection. |
|
|
669
|
+
| `-l, --listen <value>` | Loopback listener address. (default: tcp://localhost:4000, env: LISTEN) |
|
|
670
|
+
| `--profile <value>` | Databricks profile used for model discovery and requests. (env: DATABRICKS_CONFIG_PROFILE) |
|
|
671
|
+
| `--body-limit <value>` | Maximum JSON request body size. (default: "100mb", env: BODY_LIMIT) |
|
|
672
|
+
| `-r, --runtime-info` | Print runtime implementation metadata. (default: false, env: RUNTIME_INFO) |
|
|
673
|
+
| `--no-runtime-info` | Disable print runtime implementation metadata. |
|
|
674
|
+
| `--select-model-from <value>` | Select a Smart Router model from a JSON or text file; use - for standard input. (env: SELECT_MODEL_FROM) |
|
|
668
675
|
|
|
669
676
|
#### Commands
|
|
670
677
|
|
package/index.model-gateway.ts
CHANGED
|
@@ -6,4 +6,4 @@ export * as cli from "./src/model-gateway/cli.ts";
|
|
|
6
6
|
export * as server from "./src/model-gateway/server.ts";
|
|
7
7
|
export { modelGatewayServiceDefinition, buildProgram } from "./src/model-gateway/cli.ts";
|
|
8
8
|
export type { ModelGatewayCliDependencies } from "./src/model-gateway/cli.ts";
|
|
9
|
-
export { modelGatewayServerOptions, gatewayBearerMiddleware, startModelGateway } from "./src/model-gateway/server.ts";
|
|
9
|
+
export { modelGatewayServerOptions, gatewayBearerMiddleware, startModelGateway, selectSmartRouterModel } from "./src/model-gateway/server.ts";
|
package/index.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
|
|
5
5
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/cli";
|
|
6
|
-
export const PACKAGE_VERSION = "0.9.
|
|
6
|
+
export const PACKAGE_VERSION = "0.9.176";
|
|
7
7
|
export * as bootstrap from "./src/bootstrap.ts";
|
|
8
8
|
export * as bun from "./src/bun.ts";
|
|
9
9
|
export * as cli from "./src/cli.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/cli";
|
|
2
|
-
export declare const PACKAGE_VERSION = "0.9.
|
|
2
|
+
export declare const PACKAGE_VERSION = "0.9.176";
|
|
3
3
|
export * as bootstrap from "./src/bootstrap.ts";
|
|
4
4
|
export * as bun from "./src/bun.ts";
|
|
5
5
|
export * as cli from "./src/cli.ts";
|
package/lib/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Regenerated from the exporting modules in ./src.
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/cli";
|
|
5
|
-
export const PACKAGE_VERSION = "0.9.
|
|
5
|
+
export const PACKAGE_VERSION = "0.9.176";
|
|
6
6
|
export * as bootstrap from "./src/bootstrap.js";
|
|
7
7
|
export * as bun from "./src/bun.js";
|
|
8
8
|
export * as cli from "./src/cli.js";
|
|
@@ -11,4 +11,4 @@ export { ensureEngineCurrent, bootstrapWorkspace, seedToolchain, runInitialSynth
|
|
|
11
11
|
export { bunRegistryArgs, bunUsesRegistry, childEnv, resolveBunArgv, runBun, ensureWorkspaceReady, runProjen } from "./src/bun.js";
|
|
12
12
|
export { prepareAndRunProjen, buildProgram, buildDocumentationProgram, runCli } from "./src/cli.js";
|
|
13
13
|
export { findWorkspaceRoot, needsBootstrap, needsInstall, needsToolchain, workspaceRoot, rootLabel } from "./src/root.js";
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxnQkFBZ0IsQ0FBQztBQUNuRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxTQUFTLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxLQUFLLEdBQUcsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxLQUFLLEdBQUcsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxLQUFLLElBQUksTUFBTSxlQUFlLENBQUM7QUFDdEMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLGFBQWEsRUFBRSxlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RyxPQUFPLEVBQUUsZUFBZSxFQUFFLGVBQWUsRUFBRSxRQUFRLEVBQUUsY0FBYyxFQUFFLE1BQU0sRUFBRSxvQkFBb0IsRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbkksT0FBTyxFQUFFLG1CQUFtQixFQUFFLFlBQVksRUFBRSx5QkFBeUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEcsT0FBTyxFQUFFLGlCQUFpQixFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsY0FBYyxFQUFFLGFBQWEsRUFBRSxTQUFTLEVBQUUsTUFBTSxlQUFlLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBHRU5FUkFURUQgYnkgcHJvamVuIHdhdGNoIC0gRE8gTk9UIEVESVQuXG4vLyBSZWdlbmVyYXRlZCBmcm9tIHRoZSBleHBvcnRpbmcgbW9kdWxlcyBpbiAuL3NyYy5cbi8vIEhhbmQgZWRpdHMgYXJlIG92ZXJ3cml0dGVuIG9uIHRoZSBuZXh0IHdhdGNoOyB0aGlzIGZpbGUgaXMgcmVhZC1vbmx5LlxuXG5leHBvcnQgY29uc3QgUEFDS0FHRV9JREVOVElGSUVSID0gXCJAZGJ4LXRvb2xzL2NsaVwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjE3NlwiO1xuZXhwb3J0ICogYXMgYm9vdHN0cmFwIGZyb20gXCIuL3NyYy9ib290c3RyYXAudHNcIjtcbmV4cG9ydCAqIGFzIGJ1biBmcm9tIFwiLi9zcmMvYnVuLnRzXCI7XG5leHBvcnQgKiBhcyBjbGkgZnJvbSBcIi4vc3JjL2NsaS50c1wiO1xuZXhwb3J0ICogYXMgcm9vdCBmcm9tIFwiLi9zcmMvcm9vdC50c1wiO1xuZXhwb3J0IHsgZW5zdXJlRW5naW5lQ3VycmVudCwgYm9vdHN0cmFwV29ya3NwYWNlLCBzZWVkVG9vbGNoYWluLCBydW5Jbml0aWFsU3ludGggfSBmcm9tIFwiLi9zcmMvYm9vdHN0cmFwLnRzXCI7XG5leHBvcnQgeyBidW5SZWdpc3RyeUFyZ3MsIGJ1blVzZXNSZWdpc3RyeSwgY2hpbGRFbnYsIHJlc29sdmVCdW5Bcmd2LCBydW5CdW4sIGVuc3VyZVdvcmtzcGFjZVJlYWR5LCBydW5Qcm9qZW4gfSBmcm9tIFwiLi9zcmMvYnVuLnRzXCI7XG5leHBvcnQgeyBwcmVwYXJlQW5kUnVuUHJvamVuLCBidWlsZFByb2dyYW0sIGJ1aWxkRG9jdW1lbnRhdGlvblByb2dyYW0sIHJ1bkNsaSB9IGZyb20gXCIuL3NyYy9jbGkudHNcIjtcbmV4cG9ydCB7IGZpbmRXb3Jrc3BhY2VSb290LCBuZWVkc0Jvb3RzdHJhcCwgbmVlZHNJbnN0YWxsLCBuZWVkc1Rvb2xjaGFpbiwgd29ya3NwYWNlUm9vdCwgcm9vdExhYmVsIH0gZnJvbSBcIi4vc3JjL3Jvb3QudHNcIjtcbiJdfQ==
|
|
@@ -2,4 +2,4 @@ export * as cli from "./src/model-gateway/cli.ts";
|
|
|
2
2
|
export * as server from "./src/model-gateway/server.ts";
|
|
3
3
|
export { modelGatewayServiceDefinition, buildProgram } from "./src/model-gateway/cli.ts";
|
|
4
4
|
export type { ModelGatewayCliDependencies } from "./src/model-gateway/cli.ts";
|
|
5
|
-
export { modelGatewayServerOptions, gatewayBearerMiddleware, startModelGateway } from "./src/model-gateway/server.ts";
|
|
5
|
+
export { modelGatewayServerOptions, gatewayBearerMiddleware, startModelGateway, selectSmartRouterModel } from "./src/model-gateway/server.ts";
|
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
export * as cli from "./src/model-gateway/cli.js";
|
|
5
5
|
export * as server from "./src/model-gateway/server.js";
|
|
6
6
|
export { modelGatewayServiceDefinition, buildProgram } from "./src/model-gateway/cli.js";
|
|
7
|
-
export { modelGatewayServerOptions, gatewayBearerMiddleware, startModelGateway } from "./src/model-gateway/server.js";
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
7
|
+
export { modelGatewayServerOptions, gatewayBearerMiddleware, startModelGateway, selectSmartRouterModel } from "./src/model-gateway/server.js";
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXgubW9kZWwtZ2F0ZXdheS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL2luZGV4Lm1vZGVsLWdhdGV3YXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsMkNBQTJDO0FBQzNDLG1EQUFtRDtBQUNuRCx3RUFBd0U7QUFFeEUsT0FBTyxLQUFLLEdBQUcsTUFBTSw0QkFBNEIsQ0FBQztBQUNsRCxPQUFPLEtBQUssTUFBTSxNQUFNLCtCQUErQixDQUFDO0FBQ3hELE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxZQUFZLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUV6RixPQUFPLEVBQUUseUJBQXlCLEVBQUUsdUJBQXVCLEVBQUUsaUJBQWlCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIEdFTkVSQVRFRCBieSBwcm9qZW4gd2F0Y2ggLSBETyBOT1QgRURJVC5cbi8vIFJlZ2VuZXJhdGVkIGZyb20gdGhlIGV4cG9ydGluZyBtb2R1bGVzIGluIC4vc3JjLlxuLy8gSGFuZCBlZGl0cyBhcmUgb3ZlcndyaXR0ZW4gb24gdGhlIG5leHQgd2F0Y2g7IHRoaXMgZmlsZSBpcyByZWFkLW9ubHkuXG5cbmV4cG9ydCAqIGFzIGNsaSBmcm9tIFwiLi9zcmMvbW9kZWwtZ2F0ZXdheS9jbGkudHNcIjtcbmV4cG9ydCAqIGFzIHNlcnZlciBmcm9tIFwiLi9zcmMvbW9kZWwtZ2F0ZXdheS9zZXJ2ZXIudHNcIjtcbmV4cG9ydCB7IG1vZGVsR2F0ZXdheVNlcnZpY2VEZWZpbml0aW9uLCBidWlsZFByb2dyYW0gfSBmcm9tIFwiLi9zcmMvbW9kZWwtZ2F0ZXdheS9jbGkudHNcIjtcbmV4cG9ydCB0eXBlIHsgTW9kZWxHYXRld2F5Q2xpRGVwZW5kZW5jaWVzIH0gZnJvbSBcIi4vc3JjL21vZGVsLWdhdGV3YXkvY2xpLnRzXCI7XG5leHBvcnQgeyBtb2RlbEdhdGV3YXlTZXJ2ZXJPcHRpb25zLCBnYXRld2F5QmVhcmVyTWlkZGxld2FyZSwgc3RhcnRNb2RlbEdhdGV3YXksIHNlbGVjdFNtYXJ0Um91dGVyTW9kZWwgfSBmcm9tIFwiLi9zcmMvbW9kZWwtZ2F0ZXdheS9zZXJ2ZXIudHNcIjtcbiJdfQ==
|
|
@@ -9,6 +9,7 @@ import { Command } from "commander";
|
|
|
9
9
|
/** Injectable foreground gateway boundary for CLI tests. */
|
|
10
10
|
export interface ModelGatewayCliDependencies {
|
|
11
11
|
start(options: ModelGatewayOptions): Promise<void>;
|
|
12
|
+
select?(options: ModelGatewayOptions, input: unknown): Promise<Readonly<Record<string, unknown>>>;
|
|
12
13
|
/** Optional service CLI boundary for tests and embedding. */
|
|
13
14
|
readonly service?: CliServiceCliDependencies;
|
|
14
15
|
}
|
|
@@ -3,18 +3,20 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
|
+
import { readFile } from "node:fs/promises";
|
|
6
7
|
import { addArgs, parseArgs, serializeArgs } from "@dbx-tools/cli-args";
|
|
7
8
|
import { buildServiceCommand, defineService, } from "@dbx-tools/cli-service";
|
|
8
9
|
import { ModelGatewayCliOptionsSchema, resolveModelGatewayCliOptions, } from "@dbx-tools/shared-model-gateway";
|
|
9
10
|
import { Command } from "commander";
|
|
10
|
-
import { startModelGateway } from "./server.js";
|
|
11
|
+
import { selectSmartRouterModel, startModelGateway } from "./server.js";
|
|
11
12
|
import { PACKAGE_VERSION } from "../../index.js";
|
|
12
13
|
const DEFAULT_DEPENDENCIES = {
|
|
13
14
|
start: startModelGateway,
|
|
15
|
+
select: selectSmartRouterModel,
|
|
14
16
|
};
|
|
15
17
|
/** Build the tray-only model-gateway service definition. */
|
|
16
18
|
export function modelGatewayServiceDefinition(options = {}) {
|
|
17
|
-
const { runtimeInfo: _, bearerToken: _bearerToken, ...resolved } = resolveModelGatewayCliOptions(options);
|
|
19
|
+
const { runtimeInfo: _, bearerToken: _bearerToken, selectModelFrom: _selectModelFrom, ...resolved } = resolveModelGatewayCliOptions(options);
|
|
18
20
|
const host = urlHost(resolved.listen.host);
|
|
19
21
|
return defineService(import.meta.url, {
|
|
20
22
|
id: "dbx-tools.cli-model-gateway",
|
|
@@ -44,7 +46,13 @@ export function buildProgram(name = "dbx model-gateway", dependencies = DEFAULT_
|
|
|
44
46
|
process.stdout.write(`${JSON.stringify({ implementation: "typescript-appkit", version })}\n`);
|
|
45
47
|
return;
|
|
46
48
|
}
|
|
47
|
-
const { runtimeInfo: _, ...serverOptions } = options;
|
|
49
|
+
const { runtimeInfo: _, selectModelFrom, ...serverOptions } = options;
|
|
50
|
+
if (selectModelFrom) {
|
|
51
|
+
const input = await readSelectionInput(selectModelFrom);
|
|
52
|
+
const selected = await (dependencies.select ?? selectSmartRouterModel)(serverOptions, input);
|
|
53
|
+
process.stdout.write(`${JSON.stringify(selected, null, 2)}\n`);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
48
56
|
await dependencies.start(serverOptions);
|
|
49
57
|
});
|
|
50
58
|
const serviceCommand = buildServiceCommand(() => {
|
|
@@ -59,4 +67,23 @@ function modelGatewayOptions(command) {
|
|
|
59
67
|
function urlHost(host) {
|
|
60
68
|
return host.includes(":") ? `[${host}]` : host;
|
|
61
69
|
}
|
|
62
|
-
|
|
70
|
+
async function readSelectionInput(path) {
|
|
71
|
+
const text = path === "-" ? await readStandardInput() : await readFile(path, "utf8");
|
|
72
|
+
const trimmed = text.trim();
|
|
73
|
+
if (!trimmed)
|
|
74
|
+
throw new Error("Smart Router selection input is empty");
|
|
75
|
+
try {
|
|
76
|
+
return JSON.parse(trimmed);
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
return text;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
async function readStandardInput() {
|
|
83
|
+
process.stdin.setEncoding("utf8");
|
|
84
|
+
let text = "";
|
|
85
|
+
for await (const chunk of process.stdin)
|
|
86
|
+
text += chunk;
|
|
87
|
+
return text;
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/model-gateway/cli.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EACL,mBAAmB,EAEnB,aAAa,GAEd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,GAG9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAUjD,MAAM,oBAAoB,GAAgC;IACxD,KAAK,EAAE,iBAAiB;IACxB,MAAM,EAAE,sBAAsB;CAC/B,CAAC;AAEF,4DAA4D;AAC5D,MAAM,UAAU,6BAA6B,CAC3C,UAA+B,EAAE;IAEjC,MAAM,EACJ,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,YAAY,EACzB,eAAe,EAAE,gBAAgB,EACjC,GAAG,QAAQ,EACZ,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QACpC,EAAE,EAAE,6BAA6B;QACjC,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE;YACP,OAAO,EAAE,mBAAmB;YAC5B,SAAS,EAAE,aAAa,CAAC,QAAQ,CAAC;SACnC;QACD,IAAI,EAAE;YACJ;gBACE,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,QAAQ;gBACf,GAAG,EAAE,UAAU,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,YAAY;aACxD;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,YAAY,CAC1B,IAAI,GAAG,mBAAmB,EAC1B,eAA4C,oBAAoB;IAEhE,MAAM,OAAO,GAAG,eAAe,CAAC;IAChC,MAAM,OAAO,GAAG,OAAO,CACrB,IAAI,OAAO,EAAE;SACV,IAAI,CAAC,IAAI,CAAC;SACV,WAAW,CAAC,mDAAmD,CAAC;SAChE,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,EACpC,4BAA4B,CAC7B,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;QAClB,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,mBAAmB,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;YAC9F,OAAO;QACT,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC;QACtE,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;YACxD,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,IAAI,sBAAsB,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAC7F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QACD,MAAM,YAAY,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,mBAAmB,CAAC,GAAG,EAAE;QAC9C,OAAO,6BAA6B,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IACzB,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB;IAC3C,OAAO,SAAS,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,OAAO,CAAC,IAAY;IAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,IAAY;IAC5C,MAAM,IAAI,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,iBAAiB,EAAE,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACvE,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB;IAC9B,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK;QAAE,IAAI,IAAI,KAAK,CAAC;IACvD,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["/**\n * Foreground `dbx model-gateway` command.\n *\n * @module\n */\n\nimport { readFile } from \"node:fs/promises\";\nimport { addArgs, parseArgs, serializeArgs } from \"@dbx-tools/cli-args\";\nimport {\n  buildServiceCommand,\n  type CliServiceCliDependencies,\n  defineService,\n  type CliServiceDefinition,\n} from \"@dbx-tools/cli-service\";\nimport {\n  ModelGatewayCliOptionsSchema,\n  resolveModelGatewayCliOptions,\n  type ModelGatewayCliOptions,\n  type ModelGatewayOptions,\n} from \"@dbx-tools/shared-model-gateway\";\nimport { Command } from \"commander\";\n\nimport { selectSmartRouterModel, startModelGateway } from \"./server.ts\";\nimport { PACKAGE_VERSION } from \"../../index.ts\";\n\n/** Injectable foreground gateway boundary for CLI tests. */\nexport interface ModelGatewayCliDependencies {\n  start(options: ModelGatewayOptions): Promise<void>;\n  select?(options: ModelGatewayOptions, input: unknown): Promise<Readonly<Record<string, unknown>>>;\n  /** Optional service CLI boundary for tests and embedding. */\n  readonly service?: CliServiceCliDependencies;\n}\n\nconst DEFAULT_DEPENDENCIES: ModelGatewayCliDependencies = {\n  start: startModelGateway,\n  select: selectSmartRouterModel,\n};\n\n/** Build the tray-only model-gateway service definition. */\nexport function modelGatewayServiceDefinition(\n  options: ModelGatewayOptions = {},\n): CliServiceDefinition {\n  const {\n    runtimeInfo: _,\n    bearerToken: _bearerToken,\n    selectModelFrom: _selectModelFrom,\n    ...resolved\n  } = resolveModelGatewayCliOptions(options);\n  const host = urlHost(resolved.listen.host);\n  return defineService(import.meta.url, {\n    id: \"dbx-tools.cli-model-gateway\",\n    name: \"dbx model gateway\",\n    command: {\n      binName: \"dbx-model-gateway\",\n      arguments: serializeArgs(resolved),\n    },\n    menu: [\n      {\n        type: \"url\",\n        label: \"Models\",\n        url: `http://${host}:${resolved.listen.port}/v1/models`,\n      },\n    ],\n  });\n}\n\n/** Build foreground and service model-gateway commands without starting a server. */\nexport function buildProgram(\n  name = \"dbx model-gateway\",\n  dependencies: ModelGatewayCliDependencies = DEFAULT_DEPENDENCIES,\n): Command {\n  const version = PACKAGE_VERSION;\n  const program = addArgs(\n    new Command()\n      .name(name)\n      .description(\"Run or manage the AppKit Databricks model gateway\")\n      .version(version, \"-v, --version\"),\n    ModelGatewayCliOptionsSchema,\n  ).action(async () => {\n    const options = modelGatewayOptions(program);\n    if (options.runtimeInfo) {\n      process.stdout.write(`${JSON.stringify({ implementation: \"typescript-appkit\", version })}\\n`);\n      return;\n    }\n    const { runtimeInfo: _, selectModelFrom, ...serverOptions } = options;\n    if (selectModelFrom) {\n      const input = await readSelectionInput(selectModelFrom);\n      const selected = await (dependencies.select ?? selectSmartRouterModel)(serverOptions, input);\n      process.stdout.write(`${JSON.stringify(selected, null, 2)}\\n`);\n      return;\n    }\n    await dependencies.start(serverOptions);\n  });\n  const serviceCommand = buildServiceCommand(() => {\n    return modelGatewayServiceDefinition(modelGatewayOptions(program));\n  }, dependencies.service);\n  program.addCommand(serviceCommand);\n  return program;\n}\n\nfunction modelGatewayOptions(command: Command): ModelGatewayCliOptions {\n  return parseArgs(command, ModelGatewayCliOptionsSchema);\n}\n\nfunction urlHost(host: string): string {\n  return host.includes(\":\") ? `[${host}]` : host;\n}\n\nasync function readSelectionInput(path: string): Promise<unknown> {\n  const text = path === \"-\" ? await readStandardInput() : await readFile(path, \"utf8\");\n  const trimmed = text.trim();\n  if (!trimmed) throw new Error(\"Smart Router selection input is empty\");\n  try {\n    return JSON.parse(trimmed) as unknown;\n  } catch {\n    return text;\n  }\n}\n\nasync function readStandardInput(): Promise<string> {\n  process.stdin.setEncoding(\"utf8\");\n  let text = \"\";\n  for await (const chunk of process.stdin) text += chunk;\n  return text;\n}\n"]}
|
|
@@ -13,4 +13,6 @@ export declare function modelGatewayServerOptions(options?: ModelGatewayOptions)
|
|
|
13
13
|
export declare function gatewayBearerMiddleware(token: string): express.RequestHandler;
|
|
14
14
|
/** Start the foreground model gateway and keep its AppKit server active. */
|
|
15
15
|
export declare function startModelGateway(options?: ModelGatewayOptions): Promise<void>;
|
|
16
|
+
/** Select one concrete model from arbitrary file/stdin content and exit. */
|
|
17
|
+
export declare function selectSmartRouterModel(options: ModelGatewayOptions, input: unknown): Promise<Readonly<Record<string, unknown>>>;
|
|
16
18
|
export {};
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { createHash, timingSafeEqual } from "node:crypto";
|
|
7
7
|
import { createApp, server } from "@databricks/appkit";
|
|
8
|
-
import { ModelGateway, sendHealth, sendInference, sendModels, } from "@dbx-tools/appkit-model-gateway";
|
|
8
|
+
import { ModelGateway, SmartRouterService, SMART_ROUTER_DEFAULT_SETTINGS, DatabricksModelRegistry, sendHealth, sendInference, sendModels, smartRouterCandidates, } from "@dbx-tools/appkit-model-gateway";
|
|
9
9
|
import { createWorkspaceClient } from "@dbx-tools/databricks";
|
|
10
10
|
import { resolveModelGatewayOptions, } from "@dbx-tools/shared-model-gateway";
|
|
11
11
|
/** Resolve AppKit server settings for the loopback model gateway. */
|
|
@@ -48,6 +48,12 @@ export function gatewayBearerMiddleware(token) {
|
|
|
48
48
|
export async function startModelGateway(options = {}) {
|
|
49
49
|
const resolved = resolveModelGatewayOptions(options);
|
|
50
50
|
const gateway = new ModelGateway({
|
|
51
|
+
smartRouter: resolved.smartRouter,
|
|
52
|
+
smartRouterContextTokenBudget: resolved.smartRouterContextTokenBudget,
|
|
53
|
+
smartRouterProbeRefreshIntervalMs: resolved.smartRouterProbeRefreshIntervalMs,
|
|
54
|
+
smartRouterProbeTtlMs: resolved.smartRouterProbeTtlMs,
|
|
55
|
+
smartRouterRouteTtlSeconds: resolved.smartRouterRouteTtlSeconds,
|
|
56
|
+
smartRouterTimeoutMs: resolved.smartRouterTimeoutMs,
|
|
51
57
|
...(resolved.model ? { model: resolved.model } : {}),
|
|
52
58
|
...(resolved.modelClass ? { modelClass: resolved.modelClass } : {}),
|
|
53
59
|
preferSystemModels: resolved.preferSystemModels,
|
|
@@ -83,4 +89,36 @@ export async function startModelGateway(options = {}) {
|
|
|
83
89
|
},
|
|
84
90
|
});
|
|
85
91
|
}
|
|
86
|
-
|
|
92
|
+
/** Select one concrete model from arbitrary file/stdin content and exit. */
|
|
93
|
+
export async function selectSmartRouterModel(options, input) {
|
|
94
|
+
const resolved = resolveModelGatewayOptions(options);
|
|
95
|
+
const client = await createWorkspaceClient({
|
|
96
|
+
...(resolved.profile ? { profile: resolved.profile } : {}),
|
|
97
|
+
});
|
|
98
|
+
const registry = new DatabricksModelRegistry({
|
|
99
|
+
client,
|
|
100
|
+
preferSystemModels: resolved.preferSystemModels,
|
|
101
|
+
});
|
|
102
|
+
const targets = (await registry.list()).filter((target) => target.capabilities.chat && target.capabilities.aiGatewayCodex);
|
|
103
|
+
const candidates = smartRouterCandidates(targets, "codex");
|
|
104
|
+
const service = new SmartRouterService({
|
|
105
|
+
...SMART_ROUTER_DEFAULT_SETTINGS,
|
|
106
|
+
contextTokenBudget: resolved.smartRouterContextTokenBudget,
|
|
107
|
+
probeRefreshIntervalMs: resolved.smartRouterProbeRefreshIntervalMs,
|
|
108
|
+
probeTtlMs: resolved.smartRouterProbeTtlMs,
|
|
109
|
+
routeTtlSeconds: resolved.smartRouterRouteTtlSeconds,
|
|
110
|
+
timeoutMs: resolved.smartRouterTimeoutMs,
|
|
111
|
+
});
|
|
112
|
+
const selected = await service.select(input, candidates, { client });
|
|
113
|
+
return {
|
|
114
|
+
model: selected.value.id,
|
|
115
|
+
modelServiceName: selected.value.modelServiceName,
|
|
116
|
+
routeModel: selected.routeModel,
|
|
117
|
+
harness: selected.harness,
|
|
118
|
+
routerName: selected.routerName,
|
|
119
|
+
latencyMs: selected.latencyMs,
|
|
120
|
+
...(selected.rationale ? { rationale: selected.rationale } : {}),
|
|
121
|
+
...(selected.params ? { params: selected.params } : {}),
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/model-gateway/server.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,6BAA6B,EAC7B,uBAAuB,EACvB,UAAU,EACV,aAAa,EACb,UAAU,EACV,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EACL,0BAA0B,GAG3B,MAAM,iCAAiC,CAAC;AAKzC,qEAAqE;AACrE,MAAM,UAAU,yBAAyB,CAAC,UAA+B,EAAE;IACzE,OAAO,mBAAmB,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAoC;IAC/D,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI;QACzB,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI;KAC1B,CAAC;AACJ,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,uBAAuB,CAAC,KAAa;IACnD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7D,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACjC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;aAChC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACxB,MAAM,EAAE,CAAC;QACZ,IAAI,KAAK,IAAI,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC/C,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QACD,QAAQ;aACL,MAAM,CAAC,GAAG,CAAC;aACX,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC;aACvC,IAAI,CAAC;YACJ,KAAK,EAAE;gBACL,OAAO,EAAE,gDAAgD;gBACzD,IAAI,EAAE,sBAAsB;gBAC5B,IAAI,EAAE,sBAAsB;aAC7B;SACF,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,UAA+B,EAAE;IACvE,MAAM,QAAQ,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC;QAC/B,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,6BAA6B,EAAE,QAAQ,CAAC,6BAA6B;QACrE,iCAAiC,EAAE,QAAQ,CAAC,iCAAiC;QAC7E,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB;QACrD,0BAA0B,EAAE,QAAQ,CAAC,0BAA0B;QAC/D,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;QACnD,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;KAChD,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC;QACzC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3D,CAAC,CAAC;IACH,MAAM,SAAS,CAAC;QACd,MAAM;QACN,OAAO,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,cAAc,CAAC,MAAM;YACnB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE;gBACnC,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;oBACzB,WAAW,CAAC,GAAG,CAAC,uBAAuB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;gBACjE,CAAC;gBACD,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;oBACrD,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;gBACH,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;oBAClD,KAAK,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;gBACH,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI;oBAC7B,CAAC,sBAAsB,EAAE,aAAa,CAAC;oBACvC,CAAC,eAAe,EAAE,kBAAkB,CAAC;oBACrC,CAAC,cAAc,EAAE,oBAAoB,CAAC;oBACtC,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;iBAC/B,EAAE,CAAC;oBACX,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;wBAC3C,KAAK,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;oBAC3D,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAA4B,EAC5B,KAAc;IAEd,MAAM,QAAQ,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC;QACzC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3D,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC;QAC3C,MAAM;QACN,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;KAChD,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAC5C,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,IAAI,MAAM,CAAC,YAAY,CAAC,cAAc,CAC3E,CAAC;IACF,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC;QACrC,GAAG,6BAA6B;QAChC,kBAAkB,EAAE,QAAQ,CAAC,6BAA6B;QAC1D,sBAAsB,EAAE,QAAQ,CAAC,iCAAiC;QAClE,UAAU,EAAE,QAAQ,CAAC,qBAAqB;QAC1C,eAAe,EAAE,QAAQ,CAAC,0BAA0B;QACpD,SAAS,EAAE,QAAQ,CAAC,oBAAoB;KACzC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,OAAO;QACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE;QACxB,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,gBAAgB;QACjD,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC;AACJ,CAAC","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 {\n  ModelGateway,\n  SmartRouterService,\n  SMART_ROUTER_DEFAULT_SETTINGS,\n  DatabricksModelRegistry,\n  sendHealth,\n  sendInference,\n  sendModels,\n  smartRouterCandidates,\n} from \"@dbx-tools/appkit-model-gateway\";\nimport { createWorkspaceClient } from \"@dbx-tools/databricks\";\nimport {\n  resolveModelGatewayOptions,\n  type ModelGatewayOptions,\n  type ResolvedModelGatewayOptions,\n} from \"@dbx-tools/shared-model-gateway\";\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    smartRouter: resolved.smartRouter,\n    smartRouterContextTokenBudget: resolved.smartRouterContextTokenBudget,\n    smartRouterProbeRefreshIntervalMs: resolved.smartRouterProbeRefreshIntervalMs,\n    smartRouterProbeTtlMs: resolved.smartRouterProbeTtlMs,\n    smartRouterRouteTtlSeconds: resolved.smartRouterRouteTtlSeconds,\n    smartRouterTimeoutMs: resolved.smartRouterTimeoutMs,\n    ...(resolved.model ? { model: resolved.model } : {}),\n    ...(resolved.modelClass ? { modelClass: resolved.modelClass } : {}),\n    preferSystemModels: resolved.preferSystemModels,\n  });\n  const client = await 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\n/** Select one concrete model from arbitrary file/stdin content and exit. */\nexport async function selectSmartRouterModel(\n  options: ModelGatewayOptions,\n  input: unknown,\n): Promise<Readonly<Record<string, unknown>>> {\n  const resolved = resolveModelGatewayOptions(options);\n  const client = await createWorkspaceClient({\n    ...(resolved.profile ? { profile: resolved.profile } : {}),\n  });\n  const registry = new DatabricksModelRegistry({\n    client,\n    preferSystemModels: resolved.preferSystemModels,\n  });\n  const targets = (await registry.list()).filter(\n    (target) => target.capabilities.chat && target.capabilities.aiGatewayCodex,\n  );\n  const candidates = smartRouterCandidates(targets, \"codex\");\n  const service = new SmartRouterService({\n    ...SMART_ROUTER_DEFAULT_SETTINGS,\n    contextTokenBudget: resolved.smartRouterContextTokenBudget,\n    probeRefreshIntervalMs: resolved.smartRouterProbeRefreshIntervalMs,\n    probeTtlMs: resolved.smartRouterProbeTtlMs,\n    routeTtlSeconds: resolved.smartRouterRouteTtlSeconds,\n    timeoutMs: resolved.smartRouterTimeoutMs,\n  });\n  const selected = await service.select(input, candidates, { client });\n  return {\n    model: selected.value.id,\n    modelServiceName: selected.value.modelServiceName,\n    routeModel: selected.routeModel,\n    harness: selected.harness,\n    routerName: selected.routerName,\n    latencyMs: selected.latencyMs,\n    ...(selected.rationale ? { rationale: selected.rationale } : {}),\n    ...(selected.params ? { params: selected.params } : {}),\n  };\n}\n"]}
|
package/package.json
CHANGED
|
@@ -34,28 +34,28 @@
|
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@clack/prompts": "^1.7.0",
|
|
36
36
|
"@databricks/appkit": "0.81.0",
|
|
37
|
-
"@dbx-tools/appkit": "^0.9.
|
|
38
|
-
"@dbx-tools/appkit-generator": "^0.9.
|
|
39
|
-
"@dbx-tools/appkit-memory": "^0.9.
|
|
40
|
-
"@dbx-tools/appkit-model-gateway": "^0.9.
|
|
41
|
-
"@dbx-tools/appkit-web-search": "^0.9.
|
|
42
|
-
"@dbx-tools/auth": "^0.9.
|
|
43
|
-
"@dbx-tools/auth-gate": "^0.9.
|
|
44
|
-
"@dbx-tools/cli-args": "^0.9.
|
|
45
|
-
"@dbx-tools/cli-service": "^0.9.
|
|
46
|
-
"@dbx-tools/core": "^0.9.
|
|
47
|
-
"@dbx-tools/databricks": "^0.9.
|
|
48
|
-
"@dbx-tools/email": "^0.9.
|
|
49
|
-
"@dbx-tools/lakebase": "^0.9.
|
|
50
|
-
"@dbx-tools/postgres": "^0.9.
|
|
51
|
-
"@dbx-tools/shared-auth": "^0.9.
|
|
52
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
53
|
-
"@dbx-tools/shared-email": "^0.9.
|
|
54
|
-
"@dbx-tools/shared-generator": "^0.9.
|
|
55
|
-
"@dbx-tools/shared-genie-code": "^0.9.
|
|
56
|
-
"@dbx-tools/shared-graphiti": "^0.9.
|
|
57
|
-
"@dbx-tools/shared-model-gateway": "^0.9.
|
|
58
|
-
"@dbx-tools/tunnel": "^0.9.
|
|
37
|
+
"@dbx-tools/appkit": "^0.9.176",
|
|
38
|
+
"@dbx-tools/appkit-generator": "^0.9.176",
|
|
39
|
+
"@dbx-tools/appkit-memory": "^0.9.176",
|
|
40
|
+
"@dbx-tools/appkit-model-gateway": "^0.9.176",
|
|
41
|
+
"@dbx-tools/appkit-web-search": "^0.9.176",
|
|
42
|
+
"@dbx-tools/auth": "^0.9.176",
|
|
43
|
+
"@dbx-tools/auth-gate": "^0.9.176",
|
|
44
|
+
"@dbx-tools/cli-args": "^0.9.176",
|
|
45
|
+
"@dbx-tools/cli-service": "^0.9.176",
|
|
46
|
+
"@dbx-tools/core": "^0.9.176",
|
|
47
|
+
"@dbx-tools/databricks": "^0.9.176",
|
|
48
|
+
"@dbx-tools/email": "^0.9.176",
|
|
49
|
+
"@dbx-tools/lakebase": "^0.9.176",
|
|
50
|
+
"@dbx-tools/postgres": "^0.9.176",
|
|
51
|
+
"@dbx-tools/shared-auth": "^0.9.176",
|
|
52
|
+
"@dbx-tools/shared-core": "^0.9.176",
|
|
53
|
+
"@dbx-tools/shared-email": "^0.9.176",
|
|
54
|
+
"@dbx-tools/shared-generator": "^0.9.176",
|
|
55
|
+
"@dbx-tools/shared-genie-code": "^0.9.176",
|
|
56
|
+
"@dbx-tools/shared-graphiti": "^0.9.176",
|
|
57
|
+
"@dbx-tools/shared-model-gateway": "^0.9.176",
|
|
58
|
+
"@dbx-tools/tunnel": "^0.9.176",
|
|
59
59
|
"commander": "^15.0.0",
|
|
60
60
|
"concurrently": "^10.0.3",
|
|
61
61
|
"get-port": "^7.1.0",
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
"./package.json": "./package.json"
|
|
120
120
|
}
|
|
121
121
|
},
|
|
122
|
-
"version": "0.9.
|
|
122
|
+
"version": "0.9.176",
|
|
123
123
|
"types": "./lib/index.d.ts",
|
|
124
124
|
"dbxToolsConfig": {
|
|
125
125
|
"tags": [
|
package/src/model-gateway/cli.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
+
import { readFile } from "node:fs/promises";
|
|
7
8
|
import { addArgs, parseArgs, serializeArgs } from "@dbx-tools/cli-args";
|
|
8
9
|
import {
|
|
9
10
|
buildServiceCommand,
|
|
@@ -19,18 +20,20 @@ import {
|
|
|
19
20
|
} from "@dbx-tools/shared-model-gateway";
|
|
20
21
|
import { Command } from "commander";
|
|
21
22
|
|
|
22
|
-
import { startModelGateway } from "./server.ts";
|
|
23
|
+
import { selectSmartRouterModel, startModelGateway } from "./server.ts";
|
|
23
24
|
import { PACKAGE_VERSION } from "../../index.ts";
|
|
24
25
|
|
|
25
26
|
/** Injectable foreground gateway boundary for CLI tests. */
|
|
26
27
|
export interface ModelGatewayCliDependencies {
|
|
27
28
|
start(options: ModelGatewayOptions): Promise<void>;
|
|
29
|
+
select?(options: ModelGatewayOptions, input: unknown): Promise<Readonly<Record<string, unknown>>>;
|
|
28
30
|
/** Optional service CLI boundary for tests and embedding. */
|
|
29
31
|
readonly service?: CliServiceCliDependencies;
|
|
30
32
|
}
|
|
31
33
|
|
|
32
34
|
const DEFAULT_DEPENDENCIES: ModelGatewayCliDependencies = {
|
|
33
35
|
start: startModelGateway,
|
|
36
|
+
select: selectSmartRouterModel,
|
|
34
37
|
};
|
|
35
38
|
|
|
36
39
|
/** Build the tray-only model-gateway service definition. */
|
|
@@ -40,6 +43,7 @@ export function modelGatewayServiceDefinition(
|
|
|
40
43
|
const {
|
|
41
44
|
runtimeInfo: _,
|
|
42
45
|
bearerToken: _bearerToken,
|
|
46
|
+
selectModelFrom: _selectModelFrom,
|
|
43
47
|
...resolved
|
|
44
48
|
} = resolveModelGatewayCliOptions(options);
|
|
45
49
|
const host = urlHost(resolved.listen.host);
|
|
@@ -78,7 +82,13 @@ export function buildProgram(
|
|
|
78
82
|
process.stdout.write(`${JSON.stringify({ implementation: "typescript-appkit", version })}\n`);
|
|
79
83
|
return;
|
|
80
84
|
}
|
|
81
|
-
const { runtimeInfo: _, ...serverOptions } = options;
|
|
85
|
+
const { runtimeInfo: _, selectModelFrom, ...serverOptions } = options;
|
|
86
|
+
if (selectModelFrom) {
|
|
87
|
+
const input = await readSelectionInput(selectModelFrom);
|
|
88
|
+
const selected = await (dependencies.select ?? selectSmartRouterModel)(serverOptions, input);
|
|
89
|
+
process.stdout.write(`${JSON.stringify(selected, null, 2)}\n`);
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
82
92
|
await dependencies.start(serverOptions);
|
|
83
93
|
});
|
|
84
94
|
const serviceCommand = buildServiceCommand(() => {
|
|
@@ -95,3 +105,21 @@ function modelGatewayOptions(command: Command): ModelGatewayCliOptions {
|
|
|
95
105
|
function urlHost(host: string): string {
|
|
96
106
|
return host.includes(":") ? `[${host}]` : host;
|
|
97
107
|
}
|
|
108
|
+
|
|
109
|
+
async function readSelectionInput(path: string): Promise<unknown> {
|
|
110
|
+
const text = path === "-" ? await readStandardInput() : await readFile(path, "utf8");
|
|
111
|
+
const trimmed = text.trim();
|
|
112
|
+
if (!trimmed) throw new Error("Smart Router selection input is empty");
|
|
113
|
+
try {
|
|
114
|
+
return JSON.parse(trimmed) as unknown;
|
|
115
|
+
} catch {
|
|
116
|
+
return text;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
async function readStandardInput(): Promise<string> {
|
|
121
|
+
process.stdin.setEncoding("utf8");
|
|
122
|
+
let text = "";
|
|
123
|
+
for await (const chunk of process.stdin) text += chunk;
|
|
124
|
+
return text;
|
|
125
|
+
}
|
|
@@ -8,9 +8,13 @@ import { createHash, timingSafeEqual } from "node:crypto";
|
|
|
8
8
|
import { createApp, server } from "@databricks/appkit";
|
|
9
9
|
import {
|
|
10
10
|
ModelGateway,
|
|
11
|
+
SmartRouterService,
|
|
12
|
+
SMART_ROUTER_DEFAULT_SETTINGS,
|
|
13
|
+
DatabricksModelRegistry,
|
|
11
14
|
sendHealth,
|
|
12
15
|
sendInference,
|
|
13
16
|
sendModels,
|
|
17
|
+
smartRouterCandidates,
|
|
14
18
|
} from "@dbx-tools/appkit-model-gateway";
|
|
15
19
|
import { createWorkspaceClient } from "@dbx-tools/databricks";
|
|
16
20
|
import {
|
|
@@ -65,6 +69,12 @@ export function gatewayBearerMiddleware(token: string): express.RequestHandler {
|
|
|
65
69
|
export async function startModelGateway(options: ModelGatewayOptions = {}): Promise<void> {
|
|
66
70
|
const resolved = resolveModelGatewayOptions(options);
|
|
67
71
|
const gateway = new ModelGateway({
|
|
72
|
+
smartRouter: resolved.smartRouter,
|
|
73
|
+
smartRouterContextTokenBudget: resolved.smartRouterContextTokenBudget,
|
|
74
|
+
smartRouterProbeRefreshIntervalMs: resolved.smartRouterProbeRefreshIntervalMs,
|
|
75
|
+
smartRouterProbeTtlMs: resolved.smartRouterProbeTtlMs,
|
|
76
|
+
smartRouterRouteTtlSeconds: resolved.smartRouterRouteTtlSeconds,
|
|
77
|
+
smartRouterTimeoutMs: resolved.smartRouterTimeoutMs,
|
|
68
78
|
...(resolved.model ? { model: resolved.model } : {}),
|
|
69
79
|
...(resolved.modelClass ? { modelClass: resolved.modelClass } : {}),
|
|
70
80
|
preferSystemModels: resolved.preferSystemModels,
|
|
@@ -100,3 +110,41 @@ export async function startModelGateway(options: ModelGatewayOptions = {}): Prom
|
|
|
100
110
|
},
|
|
101
111
|
});
|
|
102
112
|
}
|
|
113
|
+
|
|
114
|
+
/** Select one concrete model from arbitrary file/stdin content and exit. */
|
|
115
|
+
export async function selectSmartRouterModel(
|
|
116
|
+
options: ModelGatewayOptions,
|
|
117
|
+
input: unknown,
|
|
118
|
+
): Promise<Readonly<Record<string, unknown>>> {
|
|
119
|
+
const resolved = resolveModelGatewayOptions(options);
|
|
120
|
+
const client = await createWorkspaceClient({
|
|
121
|
+
...(resolved.profile ? { profile: resolved.profile } : {}),
|
|
122
|
+
});
|
|
123
|
+
const registry = new DatabricksModelRegistry({
|
|
124
|
+
client,
|
|
125
|
+
preferSystemModels: resolved.preferSystemModels,
|
|
126
|
+
});
|
|
127
|
+
const targets = (await registry.list()).filter(
|
|
128
|
+
(target) => target.capabilities.chat && target.capabilities.aiGatewayCodex,
|
|
129
|
+
);
|
|
130
|
+
const candidates = smartRouterCandidates(targets, "codex");
|
|
131
|
+
const service = new SmartRouterService({
|
|
132
|
+
...SMART_ROUTER_DEFAULT_SETTINGS,
|
|
133
|
+
contextTokenBudget: resolved.smartRouterContextTokenBudget,
|
|
134
|
+
probeRefreshIntervalMs: resolved.smartRouterProbeRefreshIntervalMs,
|
|
135
|
+
probeTtlMs: resolved.smartRouterProbeTtlMs,
|
|
136
|
+
routeTtlSeconds: resolved.smartRouterRouteTtlSeconds,
|
|
137
|
+
timeoutMs: resolved.smartRouterTimeoutMs,
|
|
138
|
+
});
|
|
139
|
+
const selected = await service.select(input, candidates, { client });
|
|
140
|
+
return {
|
|
141
|
+
model: selected.value.id,
|
|
142
|
+
modelServiceName: selected.value.modelServiceName,
|
|
143
|
+
routeModel: selected.routeModel,
|
|
144
|
+
harness: selected.harness,
|
|
145
|
+
routerName: selected.routerName,
|
|
146
|
+
latencyMs: selected.latencyMs,
|
|
147
|
+
...(selected.rationale ? { rationale: selected.rationale } : {}),
|
|
148
|
+
...(selected.params ? { params: selected.params } : {}),
|
|
149
|
+
};
|
|
150
|
+
}
|