@dbx-tools/appkit-model-gateway 0.9.37 → 0.9.38
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 +44 -26
- package/index.ts +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/src/models.js +35 -11
- package/package.json +6 -6
- package/src/models.ts +30 -12
package/README.md
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
# @dbx-tools/appkit-model-gateway
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
Give OpenAI-, Anthropic-, and Codex-compatible clients one endpoint for the
|
|
4
|
+
models available in a Databricks workspace. The AppKit plugin discovers the
|
|
5
|
+
workspace catalogue, exposes familiar model APIs, and chooses a compatible
|
|
6
|
+
Databricks route for each request.
|
|
5
7
|
|
|
6
|
-
|
|
7
|
-
`@dbx-tools/model`. AppKit supplies the service-context Databricks client and
|
|
8
|
-
`@dbx-tools/auth` resolves its standard workspace profile and token lifecycle.
|
|
9
|
-
|
|
10
|
-
## AppKit plugin
|
|
8
|
+
## Register The AppKit Plugin
|
|
11
9
|
|
|
12
10
|
```ts
|
|
13
11
|
import { createApp, server } from "@databricks/appkit";
|
|
@@ -22,34 +20,49 @@ AppKit mounts the plugin routes under `/api/model-gateway/v1/*`. The
|
|
|
22
20
|
`@dbx-tools/cli-model-gateway` package owns foreground server construction and
|
|
23
21
|
standard root compatibility paths.
|
|
24
22
|
|
|
25
|
-
##
|
|
23
|
+
## Connect A Client
|
|
24
|
+
|
|
25
|
+
Use the standalone CLI when a tool expects an OpenAI-compatible base URL:
|
|
26
|
+
|
|
27
|
+
```sh
|
|
28
|
+
dbx model-gateway --profile PROFILE --port 4000
|
|
29
|
+
```
|
|
30
|
+
|
|
31
|
+
Configure the client with `http://127.0.0.1:4000/v1`. For an embedded AppKit
|
|
32
|
+
route, use the app origin plus `/api/model-gateway/v1`.
|
|
33
|
+
|
|
34
|
+
The gateway supports:
|
|
26
35
|
|
|
27
|
-
|
|
36
|
+
- OpenAI Responses and Chat Completions;
|
|
37
|
+
- Anthropic Messages;
|
|
38
|
+
- OpenAI-compatible embeddings;
|
|
39
|
+
- Codex model discovery and Responses traffic.
|
|
28
40
|
|
|
29
|
-
|
|
30
|
-
2. `/ai-gateway/codex/v1/responses` for compatible model services such as Grok.
|
|
31
|
-
3. `/serving-endpoints/open-responses` for remaining cross-provider models.
|
|
32
|
-
4. Vercel AI SDK ProviderV4 translation when the caller and model protocols do
|
|
33
|
-
not match.
|
|
41
|
+
## Discover Models
|
|
34
42
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
43
|
+
```ts
|
|
44
|
+
import { createModelGatewayClient } from "@dbx-tools/shared-model-gateway";
|
|
45
|
+
|
|
46
|
+
const client = createModelGatewayClient({ baseUrl: "http://127.0.0.1:4000/" });
|
|
47
|
+
const models = await client.listModels({ search: "sonnet" });
|
|
48
|
+
```
|
|
38
49
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
50
|
+
Use `{ codex: true }` when a Codex client needs its native catalogue shape.
|
|
51
|
+
|
|
52
|
+
## Request Compatibility
|
|
53
|
+
|
|
54
|
+
Requests stay on a native streaming path when the selected model supports the
|
|
55
|
+
client protocol. When protocols differ, the gateway translates the request and
|
|
56
|
+
response while preserving streaming and cancellation behavior.
|
|
44
57
|
|
|
45
58
|
The gateway rejects stateful Responses options it cannot preserve, including
|
|
46
59
|
`previous_response_id`, `store: true`, and `background: true`.
|
|
47
60
|
|
|
48
|
-
## Codex
|
|
61
|
+
## Configure Codex
|
|
49
62
|
|
|
50
63
|
`GET /v1/models` includes Codex metadata when the request carries
|
|
51
64
|
`Originator: codex`. Codex slugs prefer fully qualified Databricks model service
|
|
52
|
-
names
|
|
65
|
+
names.
|
|
53
66
|
|
|
54
67
|
Point a Codex provider at:
|
|
55
68
|
|
|
@@ -59,5 +72,10 @@ http://127.0.0.1:4000/v1
|
|
|
59
72
|
|
|
60
73
|
Use `wire_api = "responses"` and `supports_websockets = false`.
|
|
61
74
|
|
|
62
|
-
|
|
63
|
-
|
|
75
|
+
## Package API
|
|
76
|
+
|
|
77
|
+
- `modelGateway()` registers the AppKit plugin.
|
|
78
|
+
- `gateway` handles protocol-neutral gateway requests.
|
|
79
|
+
- `registry` discovers and resolves workspace models.
|
|
80
|
+
- `router` selects a compatible route from model capabilities.
|
|
81
|
+
- `transport` sends requests to Databricks model APIs.
|
package/index.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
|
|
5
5
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-model-gateway";
|
|
6
|
-
export const PACKAGE_VERSION = "0.9.
|
|
6
|
+
export const PACKAGE_VERSION = "0.9.38";
|
|
7
7
|
export * as gateway from "./src/gateway.ts";
|
|
8
8
|
export * as models from "./src/models.ts";
|
|
9
9
|
export * as plugin from "./src/plugin.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-model-gateway";
|
|
2
|
-
export declare const PACKAGE_VERSION = "0.9.
|
|
2
|
+
export declare const PACKAGE_VERSION = "0.9.38";
|
|
3
3
|
export * as gateway from "./src/gateway.ts";
|
|
4
4
|
export * as models from "./src/models.ts";
|
|
5
5
|
export * as plugin from "./src/plugin.ts";
|
package/lib/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Regenerated from the exporting modules in ./src.
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-model-gateway";
|
|
5
|
-
export const PACKAGE_VERSION = "0.9.
|
|
5
|
+
export const PACKAGE_VERSION = "0.9.38";
|
|
6
6
|
export * as gateway from "./src/gateway.js";
|
|
7
7
|
export * as models from "./src/models.js";
|
|
8
8
|
export * as plugin from "./src/plugin.js";
|
|
@@ -18,4 +18,4 @@ export { ModelGatewayError, ModelGateway } from "./src/gateway.js";
|
|
|
18
18
|
export { ModelGatewayPlugin, modelGateway } from "./src/plugin.js";
|
|
19
19
|
export { DatabricksModelRegistry } from "./src/registry.js";
|
|
20
20
|
export { UnsupportedGatewayFeatureError } from "./src/router.js";
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxpQ0FBaUMsQ0FBQztBQUNwRSxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxlQUFlLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxLQUFLLGVBQWUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEtBQUssY0FBYyxNQUFNLDBCQUEwQixDQUFDO0FBQzNELE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxXQUFXLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFNBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBS25FLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTVELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9hcHBraXQtbW9kZWwtZ2F0ZXdheVwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjM4XCI7XG5leHBvcnQgKiBhcyBnYXRld2F5IGZyb20gXCIuL3NyYy9nYXRld2F5LnRzXCI7XG5leHBvcnQgKiBhcyBtb2RlbHMgZnJvbSBcIi4vc3JjL21vZGVscy50c1wiO1xuZXhwb3J0ICogYXMgcGx1Z2luIGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCAqIGFzIHByb3RvY29sc0RlY29kZSBmcm9tIFwiLi9zcmMvcHJvdG9jb2xzL2RlY29kZS50c1wiO1xuZXhwb3J0ICogYXMgcHJvdG9jb2xzRW5jb2RlIGZyb20gXCIuL3NyYy9wcm90b2NvbHMvZW5jb2RlLnRzXCI7XG5leHBvcnQgKiBhcyByZWFzb25pbmdBZGFwdCBmcm9tIFwiLi9zcmMvcmVhc29uaW5nLWFkYXB0LnRzXCI7XG5leHBvcnQgKiBhcyByZWdpc3RyeSBmcm9tIFwiLi9zcmMvcmVnaXN0cnkudHNcIjtcbmV4cG9ydCAqIGFzIHJvdXRlciBmcm9tIFwiLi9zcmMvcm91dGVyLnRzXCI7XG5leHBvcnQgKiBhcyByb3V0ZXMgZnJvbSBcIi4vc3JjL3JvdXRlcy50c1wiO1xuZXhwb3J0ICogYXMgdHJhbnNsYXRpb24gZnJvbSBcIi4vc3JjL3RyYW5zbGF0aW9uLnRzXCI7XG5leHBvcnQgKiBhcyB0cmFuc3BvcnQgZnJvbSBcIi4vc3JjL3RyYW5zcG9ydC50c1wiO1xuZXhwb3J0IHsgTW9kZWxHYXRld2F5RXJyb3IsIE1vZGVsR2F0ZXdheSB9IGZyb20gXCIuL3NyYy9nYXRld2F5LnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsR2F0ZXdheU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZ2F0ZXdheS50c1wiO1xuZXhwb3J0IHsgTW9kZWxHYXRld2F5UGx1Z2luLCBtb2RlbEdhdGV3YXkgfSBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsR2F0ZXdheVBsdWdpbkNvbmZpZyB9IGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCB0eXBlIHsgRGVjb2RlZEdhdGV3YXlSZXF1ZXN0IH0gZnJvbSBcIi4vc3JjL3Byb3RvY29scy9kZWNvZGUudHNcIjtcbmV4cG9ydCB0eXBlIHsgQ29tcGxldGVkR2VuZXJhdGlvbiB9IGZyb20gXCIuL3NyYy9wcm90b2NvbHMvZW5jb2RlLnRzXCI7XG5leHBvcnQgdHlwZSB7IEFkYXB0ZWRJbmZlcmVuY2VCb2R5IH0gZnJvbSBcIi4vc3JjL3JlYXNvbmluZy1hZGFwdC50c1wiO1xuZXhwb3J0IHsgRGF0YWJyaWNrc01vZGVsUmVnaXN0cnkgfSBmcm9tIFwiLi9zcmMvcmVnaXN0cnkudHNcIjtcbmV4cG9ydCB0eXBlIHsgTW9kZWxSZWdpc3RyeVJlc29sdmVPcHRpb25zLCBNb2RlbFJlZ2lzdHJ5LCBNb2RlbFJlZ2lzdHJ5T3B0aW9ucyB9IGZyb20gXCIuL3NyYy9yZWdpc3RyeS50c1wiO1xuZXhwb3J0IHsgVW5zdXBwb3J0ZWRHYXRld2F5RmVhdHVyZUVycm9yIH0gZnJvbSBcIi4vc3JjL3JvdXRlci50c1wiO1xuZXhwb3J0IHR5cGUgeyBEYXRhYnJpY2tzVHJhbnNwb3J0UmVxdWVzdCB9IGZyb20gXCIuL3NyYy90cmFuc3BvcnQudHNcIjtcbiJdfQ==
|
package/lib/src/models.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
6
|
import { isChatClass } from "@dbx-tools/model/classes";
|
|
7
|
-
import { modelFamily } from "@dbx-tools/model/policy";
|
|
7
|
+
import { modelFamily, modelFamilyRank } from "@dbx-tools/model/policy";
|
|
8
8
|
const CODEX_BASE_INSTRUCTIONS = "You are a coding agent. Follow the user's instructions and use the available tools to work in the current repository.";
|
|
9
9
|
const REASONING_DESCRIPTIONS = {
|
|
10
10
|
none: "Disable explicit reasoning",
|
|
@@ -89,15 +89,23 @@ function codexModel(target, priority) {
|
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
91
|
/**
|
|
92
|
-
* Order listed models in three groups:
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
92
|
+
* Order listed models in three groups: major-provider chat families, the
|
|
93
|
+
* remaining chat models, then embeddings. Families keep a fixed provider
|
|
94
|
+
* order; each family and the later groups sort by the published label
|
|
95
|
+
* (`display_name` for Codex, `name` otherwise). Numeric segments sort
|
|
96
|
+
* naturally so "Veo 3.1" precedes "Veo 3.10".
|
|
96
97
|
*/
|
|
97
98
|
function compareCatalogueTargets(left, right, label) {
|
|
98
99
|
const group = catalogueGroup(left) - catalogueGroup(right);
|
|
99
100
|
if (group !== 0)
|
|
100
101
|
return group;
|
|
102
|
+
const leftFamily = catalogueFamily(left);
|
|
103
|
+
const rightFamily = catalogueFamily(right);
|
|
104
|
+
if (leftFamily && rightFamily) {
|
|
105
|
+
const familyOrder = modelFamilyRank(leftFamily) - modelFamilyRank(rightFamily);
|
|
106
|
+
if (familyOrder !== 0)
|
|
107
|
+
return familyOrder;
|
|
108
|
+
}
|
|
101
109
|
return compareCatalogueLabel(label(left), label(right));
|
|
102
110
|
}
|
|
103
111
|
function catalogueGroup(target) {
|
|
@@ -105,12 +113,28 @@ function catalogueGroup(target) {
|
|
|
105
113
|
return 2;
|
|
106
114
|
return catalogueFamily(target) ? 0 : 1;
|
|
107
115
|
}
|
|
116
|
+
const IDENTITY_PREFIXES = new Set(["databricks", "system", "ai", "meta", "google", "openai", "anthropic"]);
|
|
108
117
|
function catalogueFamily(target) {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
118
|
+
if (isEmbeddingTarget(target))
|
|
119
|
+
return undefined;
|
|
120
|
+
for (const identity of [target.displayName, target.id, target.endpoint?.name]) {
|
|
121
|
+
if (!identity)
|
|
122
|
+
continue;
|
|
123
|
+
const family = catalogueFamilyFromIdentity(identity);
|
|
124
|
+
if (family)
|
|
125
|
+
return family;
|
|
126
|
+
}
|
|
127
|
+
return undefined;
|
|
128
|
+
}
|
|
129
|
+
function catalogueFamilyFromIdentity(identity) {
|
|
130
|
+
const tokens = identity.toLowerCase().match(/[a-z0-9]+/g) ?? [];
|
|
131
|
+
const start = tokens.find((token) => !IDENTITY_PREFIXES.has(token));
|
|
132
|
+
if (!start)
|
|
133
|
+
return undefined;
|
|
134
|
+
if (start === "veo")
|
|
135
|
+
return "gemini";
|
|
136
|
+
const family = modelFamily(identity);
|
|
137
|
+
return family && start === family ? family : undefined;
|
|
114
138
|
}
|
|
115
139
|
function isEmbeddingTarget(target) {
|
|
116
140
|
return (target.capabilities.embeddings === true || target.endpoint?.task === "llm/v1/embeddings");
|
|
@@ -122,4 +146,4 @@ function hasChatClass(target) {
|
|
|
122
146
|
const modelClass = target.endpoint?.class;
|
|
123
147
|
return modelClass !== undefined && isChatClass(modelClass);
|
|
124
148
|
}
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/models.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAUtD,MAAM,uBAAuB,GAC3B,uHAAuH,CAAC;AAE1H,MAAM,sBAAsB,GAAqC;IAC/D,IAAI,EAAE,4BAA4B;IAClC,OAAO,EAAE,6CAA6C;IACtD,GAAG,EAAE,4BAA4B;IACjC,MAAM,EAAE,+BAA+B;IACvC,IAAI,EAAE,6BAA6B;IACnC,KAAK,EAAE,oCAAoC;IAC3C,GAAG,EAAE,4CAA4C;CAClD,CAAC;AAeF,MAAM,UAAU,iBAAiB,CAC/B,OAA+B,EAC/B,YAAqB;IAErB,MAAM,SAAS,GAAG,OAAO;SACtB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;SAChE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;SACzD,KAAK,EAAE;SACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACpB,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CACrE,CAAC;IACJ,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;SACxE,CAAC;IACJ,CAAC;IACD,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,MAAmB;IACtC,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,MAAM,CAAC,WAAW;QACxB,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI;QAC3B,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QACxD,YAAY,EAAE;YACZ,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;YAChC,SAAS,EAAE,MAAM,CAAC,gBAAgB;YAClC,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;YACxC,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,aAAa;YACjD,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;YACxC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;YAC1C,gBAAgB,EAAE,MAAM,CAAC,YAAY,CAAC,cAAc;YACpD,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;SACzC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,MAAmB,EAAE,QAAgB;IACvD,MAAM,KAAK,GACT,MAAM,CAAC,YAAY,CAAC,cAAc,IAAI,MAAM,CAAC,gBAAgB;QAC3D,CAAC,CAAC,MAAM,CAAC,gBAAgB;QACzB,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAChB,MAAM,OAAO,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACxC,OAAO;QACL,IAAI,EAAE,cAAc,KAAK,EAAE;QAC3B,YAAY,EAAE,MAAM,CAAC,WAAW;QAChC,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,0BAA0B;QACvE,iBAAiB,EAAE,uBAAuB;QAC1C,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QACxD,0BAA0B,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM;YACN,WAAW,EAAE,sBAAsB,CAAC,MAAM,CAAC,IAAI,WAAW,MAAM,mBAAmB;SACpF,CAAC,CAAC;QACH,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,CAAC,CAAC,EAAE,uBAAuB,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjF,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE,MAAM;QAClB,gBAAgB,EAAE,IAAI;QACtB,QAAQ;QACR,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,IAAI;QACb,iBAAiB,EAAE,KAAK;QACxB,iBAAiB,EAAE,IAAI;QACvB,qBAAqB,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;QAC1E,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE;QACrD,cAAc,EAAE,IAAI;QACpB,4BAA4B,EAAE,EAAE;QAChC,gBAAgB,EAAE,CAAC,MAAM,CAAC;QAC1B,oBAAoB,EAAE,MAAM;QAC5B,oBAAoB,EAAE,KAAK;QAC3B,8BAA8B,EAAE,KAAK;KACtC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAC9B,IAAiB,EACjB,KAAkB,EAClB,KAAsC;IAEtC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9B,OAAO,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,cAAc,CAAC,MAAmB;IACzC,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,CAAC;IACxC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,MAAmB;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACzE,OAAO,CACL,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QACtB,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvE,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAmB;IAC5C,OAAO,CACL,MAAM,CAAC,YAAY,CAAC,UAAU,KAAK,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK,mBAAmB,CACzF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAY,EAAE,KAAa;IACxD,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,YAAY,CAAC,MAAmB;IACvC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC;IAC1C,OAAO,UAAU,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC","sourcesContent":["/**\n * OpenAI and Codex model-list payloads derived from the live registry.\n *\n * @module\n */\n\nimport { isChatClass } from \"@dbx-tools/model/classes\";\nimport { modelFamily } from \"@dbx-tools/model/policy\";\nimport type {\n  CodexModel,\n  CodexModelListResponse,\n  ModelListResponse,\n  ModelTarget,\n  OpenAIModel,\n  OpenAIModelListResponse,\n} from \"@dbx-tools/shared-model-gateway\";\n\nconst CODEX_BASE_INSTRUCTIONS =\n  \"You are a coding agent. Follow the user's instructions and use the available tools to work in the current repository.\";\n\nconst REASONING_DESCRIPTIONS: Readonly<Record<string, string>> = {\n  none: \"Disable explicit reasoning\",\n  minimal: \"Use the smallest available reasoning budget\",\n  low: \"Use a low reasoning budget\",\n  medium: \"Use a medium reasoning budget\",\n  high: \"Use a high reasoning budget\",\n  xhigh: \"Use an extra-high reasoning budget\",\n  max: \"Use the largest available reasoning budget\",\n};\n\n/** Build the combined OpenAI and optional Codex model catalogue. */\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: true,\n): CodexModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: false,\n): OpenAIModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse {\n  const available = targets\n    .filter((target) => target.endpoint?.status?.deprecated !== true)\n    .filter((target) => !includeCodex || hasChatClass(target))\n    .slice()\n    .sort((left, right) =>\n      compareCatalogueTargets(left, right, (target) => target.displayName),\n    );\n  if (includeCodex) {\n    return {\n      models: available.map((target, index) => codexModel(target, index + 1)),\n    };\n  }\n  return {\n    object: \"list\",\n    data: available.map(openAiModel),\n  };\n}\n\nfunction openAiModel(target: ModelTarget): OpenAIModel {\n  return {\n    id: target.id,\n    object: \"model\",\n    created: 0,\n    owned_by: \"databricks\",\n    name: target.displayName,\n    task: target.endpoint?.task,\n    status: target.endpoint?.status ?? { deprecated: false },\n    capabilities: {\n      tools: target.capabilities.tools,\n      reasoning: target.reasoningEfforts,\n      responses: target.capabilities.responses,\n      open_responses: target.capabilities.openResponses,\n      anthropic: target.capabilities.anthropic,\n      embeddings: target.capabilities.embeddings,\n      ai_gateway_codex: target.capabilities.aiGatewayCodex,\n      streaming: target.capabilities.streaming,\n    },\n  };\n}\n\nfunction codexModel(target: ModelTarget, priority: number): CodexModel {\n  const model =\n    target.capabilities.aiGatewayCodex && target.modelServiceName\n      ? target.modelServiceName\n      : target.id;\n  const efforts = target.reasoningEfforts;\n  return {\n    slug: `databricks/${model}`,\n    display_name: target.displayName,\n    description: target.endpoint?.description ?? \"Databricks model service\",\n    base_instructions: CODEX_BASE_INSTRUCTIONS,\n    status: target.endpoint?.status ?? { deprecated: false },\n    supported_reasoning_levels: efforts.map((effort) => ({\n      effort,\n      description: REASONING_DESCRIPTIONS[effort] ?? `Use the ${effort} reasoning budget`,\n    })),\n    ...(efforts.length > 0\n      ? { default_reasoning_level: efforts.includes(\"medium\") ? \"medium\" : efforts[0] }\n      : {}),\n    shell_type: \"unified_exec\",\n    visibility: \"list\",\n    supported_in_api: true,\n    priority,\n    availability_nux: null,\n    upgrade: null,\n    support_verbosity: false,\n    default_verbosity: null,\n    apply_patch_tool_type: target.capabilities.customTools ? \"freeform\" : null,\n    truncation_policy: { mode: \"tokens\", limit: 128_000 },\n    context_window: null,\n    experimental_supported_tools: [],\n    input_modalities: [\"text\"],\n    web_search_tool_type: \"text\",\n    supports_search_tool: false,\n    supports_image_detail_original: false,\n  };\n}\n\n/**\n * Order listed models in three groups: non-embedding models with a detected\n * family, the remaining non-embedding models, then embeddings. Each group is\n * sorted by the published label (`display_name` for Codex, `name` otherwise)\n * with numeric segments ordered naturally so \"Veo 3.1\" precedes \"Veo 3.10\".\n */\nfunction compareCatalogueTargets(\n  left: ModelTarget,\n  right: ModelTarget,\n  label: (target: ModelTarget) => string,\n): number {\n  const group = catalogueGroup(left) - catalogueGroup(right);\n  if (group !== 0) return group;\n  return compareCatalogueLabel(label(left), label(right));\n}\n\nfunction catalogueGroup(target: ModelTarget): number {\n  if (isEmbeddingTarget(target)) return 2;\n  return catalogueFamily(target) ? 0 : 1;\n}\n\nfunction catalogueFamily(target: ModelTarget): string | undefined {\n  const stamped = target.family?.trim() || target.endpoint?.family?.trim();\n  return (\n    modelFamily(target.displayName) ??\n    modelFamily(target.id) ??\n    (target.endpoint?.name ? modelFamily(target.endpoint.name) : undefined) ??\n    (stamped ? modelFamily(stamped) : undefined)\n  );\n}\n\nfunction isEmbeddingTarget(target: ModelTarget): boolean {\n  return (\n    target.capabilities.embeddings === true || target.endpoint?.task === \"llm/v1/embeddings\"\n  );\n}\n\nfunction compareCatalogueLabel(left: string, right: string): number {\n  return left.localeCompare(right, undefined, { numeric: true, sensitivity: \"base\" });\n}\n\nfunction hasChatClass(target: ModelTarget): boolean {\n  const modelClass = target.endpoint?.class;\n  return modelClass !== undefined && isChatClass(modelClass);\n}\n"]}
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/models.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * OpenAI and Codex model-list payloads derived from the live registry.\n *\n * @module\n */\n\nimport { isChatClass } from \"@dbx-tools/model/classes\";\nimport { modelFamily, modelFamilyRank } from \"@dbx-tools/model/policy\";\nimport type {\n  CodexModel,\n  CodexModelListResponse,\n  ModelListResponse,\n  ModelTarget,\n  OpenAIModel,\n  OpenAIModelListResponse,\n} from \"@dbx-tools/shared-model-gateway\";\n\nconst CODEX_BASE_INSTRUCTIONS =\n  \"You are a coding agent. Follow the user's instructions and use the available tools to work in the current repository.\";\n\nconst REASONING_DESCRIPTIONS: Readonly<Record<string, string>> = {\n  none: \"Disable explicit reasoning\",\n  minimal: \"Use the smallest available reasoning budget\",\n  low: \"Use a low reasoning budget\",\n  medium: \"Use a medium reasoning budget\",\n  high: \"Use a high reasoning budget\",\n  xhigh: \"Use an extra-high reasoning budget\",\n  max: \"Use the largest available reasoning budget\",\n};\n\n/** Build the combined OpenAI and optional Codex model catalogue. */\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: true,\n): CodexModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: false,\n): OpenAIModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse {\n  const available = targets\n    .filter((target) => target.endpoint?.status?.deprecated !== true)\n    .filter((target) => !includeCodex || hasChatClass(target))\n    .slice()\n    .sort((left, right) =>\n      compareCatalogueTargets(left, right, (target) => target.displayName),\n    );\n  if (includeCodex) {\n    return {\n      models: available.map((target, index) => codexModel(target, index + 1)),\n    };\n  }\n  return {\n    object: \"list\",\n    data: available.map(openAiModel),\n  };\n}\n\nfunction openAiModel(target: ModelTarget): OpenAIModel {\n  return {\n    id: target.id,\n    object: \"model\",\n    created: 0,\n    owned_by: \"databricks\",\n    name: target.displayName,\n    task: target.endpoint?.task,\n    status: target.endpoint?.status ?? { deprecated: false },\n    capabilities: {\n      tools: target.capabilities.tools,\n      reasoning: target.reasoningEfforts,\n      responses: target.capabilities.responses,\n      open_responses: target.capabilities.openResponses,\n      anthropic: target.capabilities.anthropic,\n      embeddings: target.capabilities.embeddings,\n      ai_gateway_codex: target.capabilities.aiGatewayCodex,\n      streaming: target.capabilities.streaming,\n    },\n  };\n}\n\nfunction codexModel(target: ModelTarget, priority: number): CodexModel {\n  const model =\n    target.capabilities.aiGatewayCodex && target.modelServiceName\n      ? target.modelServiceName\n      : target.id;\n  const efforts = target.reasoningEfforts;\n  return {\n    slug: `databricks/${model}`,\n    display_name: target.displayName,\n    description: target.endpoint?.description ?? \"Databricks model service\",\n    base_instructions: CODEX_BASE_INSTRUCTIONS,\n    status: target.endpoint?.status ?? { deprecated: false },\n    supported_reasoning_levels: efforts.map((effort) => ({\n      effort,\n      description: REASONING_DESCRIPTIONS[effort] ?? `Use the ${effort} reasoning budget`,\n    })),\n    ...(efforts.length > 0\n      ? { default_reasoning_level: efforts.includes(\"medium\") ? \"medium\" : efforts[0] }\n      : {}),\n    shell_type: \"unified_exec\",\n    visibility: \"list\",\n    supported_in_api: true,\n    priority,\n    availability_nux: null,\n    upgrade: null,\n    support_verbosity: false,\n    default_verbosity: null,\n    apply_patch_tool_type: target.capabilities.customTools ? \"freeform\" : null,\n    truncation_policy: { mode: \"tokens\", limit: 128_000 },\n    context_window: null,\n    experimental_supported_tools: [],\n    input_modalities: [\"text\"],\n    web_search_tool_type: \"text\",\n    supports_search_tool: false,\n    supports_image_detail_original: false,\n  };\n}\n\n/**\n * Order listed models in three groups: major-provider chat families, the\n * remaining chat models, then embeddings. Families keep a fixed provider\n * order; each family and the later groups sort by the published label\n * (`display_name` for Codex, `name` otherwise). Numeric segments sort\n * naturally so \"Veo 3.1\" precedes \"Veo 3.10\".\n */\nfunction compareCatalogueTargets(\n  left: ModelTarget,\n  right: ModelTarget,\n  label: (target: ModelTarget) => string,\n): number {\n  const group = catalogueGroup(left) - catalogueGroup(right);\n  if (group !== 0) return group;\n  const leftFamily = catalogueFamily(left);\n  const rightFamily = catalogueFamily(right);\n  if (leftFamily && rightFamily) {\n    const familyOrder = modelFamilyRank(leftFamily) - modelFamilyRank(rightFamily);\n    if (familyOrder !== 0) return familyOrder;\n  }\n  return compareCatalogueLabel(label(left), label(right));\n}\n\nfunction catalogueGroup(target: ModelTarget): number {\n  if (isEmbeddingTarget(target)) return 2;\n  return catalogueFamily(target) ? 0 : 1;\n}\n\nconst IDENTITY_PREFIXES = new Set([\"databricks\", \"system\", \"ai\", \"meta\", \"google\", \"openai\", \"anthropic\"]);\n\nfunction catalogueFamily(target: ModelTarget): string | undefined {\n  if (isEmbeddingTarget(target)) return undefined;\n  for (const identity of [target.displayName, target.id, target.endpoint?.name]) {\n    if (!identity) continue;\n    const family = catalogueFamilyFromIdentity(identity);\n    if (family) return family;\n  }\n  return undefined;\n}\n\nfunction catalogueFamilyFromIdentity(identity: string): string | undefined {\n  const tokens = identity.toLowerCase().match(/[a-z0-9]+/g) ?? [];\n  const start = tokens.find((token) => !IDENTITY_PREFIXES.has(token));\n  if (!start) return undefined;\n  if (start === \"veo\") return \"gemini\";\n  const family = modelFamily(identity);\n  return family && start === family ? family : undefined;\n}\n\nfunction isEmbeddingTarget(target: ModelTarget): boolean {\n  return (\n    target.capabilities.embeddings === true || target.endpoint?.task === \"llm/v1/embeddings\"\n  );\n}\n\nfunction compareCatalogueLabel(left: string, right: string): number {\n  return left.localeCompare(right, undefined, { numeric: true, sensitivity: \"base\" });\n}\n\nfunction hasChatClass(target: ModelTarget): boolean {\n  const modelClass = target.endpoint?.class;\n  return modelClass !== undefined && isChatClass(modelClass);\n}\n"]}
|
package/package.json
CHANGED
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
"@ai-sdk/open-responses": "^2.0.58",
|
|
32
32
|
"@ai-sdk/openai-compatible": "^3.0.62",
|
|
33
33
|
"@databricks/appkit": "0.81.0",
|
|
34
|
-
"@dbx-tools/databricks": "^0.9.
|
|
35
|
-
"@dbx-tools/model": "^0.9.
|
|
36
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
37
|
-
"@dbx-tools/shared-model": "^0.9.
|
|
38
|
-
"@dbx-tools/shared-model-gateway": "^0.9.
|
|
34
|
+
"@dbx-tools/databricks": "^0.9.38",
|
|
35
|
+
"@dbx-tools/model": "^0.9.38",
|
|
36
|
+
"@dbx-tools/shared-core": "^0.9.38",
|
|
37
|
+
"@dbx-tools/shared-model": "^0.9.38",
|
|
38
|
+
"@dbx-tools/shared-model-gateway": "^0.9.38",
|
|
39
39
|
"ai": "^7.0.0",
|
|
40
40
|
"zod": "4.3.6"
|
|
41
41
|
},
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
"./package.json": "./package.json"
|
|
90
90
|
}
|
|
91
91
|
},
|
|
92
|
-
"version": "0.9.
|
|
92
|
+
"version": "0.9.38",
|
|
93
93
|
"types": "./lib/index.d.ts",
|
|
94
94
|
"dbxToolsConfig": {
|
|
95
95
|
"tags": [
|
package/src/models.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { isChatClass } from "@dbx-tools/model/classes";
|
|
8
|
-
import { modelFamily } from "@dbx-tools/model/policy";
|
|
8
|
+
import { modelFamily, modelFamilyRank } from "@dbx-tools/model/policy";
|
|
9
9
|
import type {
|
|
10
10
|
CodexModel,
|
|
11
11
|
CodexModelListResponse,
|
|
@@ -124,10 +124,11 @@ function codexModel(target: ModelTarget, priority: number): CodexModel {
|
|
|
124
124
|
}
|
|
125
125
|
|
|
126
126
|
/**
|
|
127
|
-
* Order listed models in three groups:
|
|
128
|
-
*
|
|
129
|
-
*
|
|
130
|
-
*
|
|
127
|
+
* Order listed models in three groups: major-provider chat families, the
|
|
128
|
+
* remaining chat models, then embeddings. Families keep a fixed provider
|
|
129
|
+
* order; each family and the later groups sort by the published label
|
|
130
|
+
* (`display_name` for Codex, `name` otherwise). Numeric segments sort
|
|
131
|
+
* naturally so "Veo 3.1" precedes "Veo 3.10".
|
|
131
132
|
*/
|
|
132
133
|
function compareCatalogueTargets(
|
|
133
134
|
left: ModelTarget,
|
|
@@ -136,6 +137,12 @@ function compareCatalogueTargets(
|
|
|
136
137
|
): number {
|
|
137
138
|
const group = catalogueGroup(left) - catalogueGroup(right);
|
|
138
139
|
if (group !== 0) return group;
|
|
140
|
+
const leftFamily = catalogueFamily(left);
|
|
141
|
+
const rightFamily = catalogueFamily(right);
|
|
142
|
+
if (leftFamily && rightFamily) {
|
|
143
|
+
const familyOrder = modelFamilyRank(leftFamily) - modelFamilyRank(rightFamily);
|
|
144
|
+
if (familyOrder !== 0) return familyOrder;
|
|
145
|
+
}
|
|
139
146
|
return compareCatalogueLabel(label(left), label(right));
|
|
140
147
|
}
|
|
141
148
|
|
|
@@ -144,14 +151,25 @@ function catalogueGroup(target: ModelTarget): number {
|
|
|
144
151
|
return catalogueFamily(target) ? 0 : 1;
|
|
145
152
|
}
|
|
146
153
|
|
|
154
|
+
const IDENTITY_PREFIXES = new Set(["databricks", "system", "ai", "meta", "google", "openai", "anthropic"]);
|
|
155
|
+
|
|
147
156
|
function catalogueFamily(target: ModelTarget): string | undefined {
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
157
|
+
if (isEmbeddingTarget(target)) return undefined;
|
|
158
|
+
for (const identity of [target.displayName, target.id, target.endpoint?.name]) {
|
|
159
|
+
if (!identity) continue;
|
|
160
|
+
const family = catalogueFamilyFromIdentity(identity);
|
|
161
|
+
if (family) return family;
|
|
162
|
+
}
|
|
163
|
+
return undefined;
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
function catalogueFamilyFromIdentity(identity: string): string | undefined {
|
|
167
|
+
const tokens = identity.toLowerCase().match(/[a-z0-9]+/g) ?? [];
|
|
168
|
+
const start = tokens.find((token) => !IDENTITY_PREFIXES.has(token));
|
|
169
|
+
if (!start) return undefined;
|
|
170
|
+
if (start === "veo") return "gemini";
|
|
171
|
+
const family = modelFamily(identity);
|
|
172
|
+
return family && start === family ? family : undefined;
|
|
155
173
|
}
|
|
156
174
|
|
|
157
175
|
function isEmbeddingTarget(target: ModelTarget): boolean {
|