@dbx-tools/model 0.9.99 → 0.9.105
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 +16 -6
- package/index.ts +2 -4
- package/lib/index.d.ts +2 -4
- package/lib/index.js +3 -4
- package/lib/package.json +1 -6
- package/lib/src/invoke.d.ts +8 -0
- package/lib/src/invoke.js +18 -6
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +6 -14
- package/src/invoke.ts +21 -5
- package/lib/src/serving-wire.d.ts +0 -37
- package/lib/src/serving-wire.js +0 -211
- package/src/serving-wire.ts +0 -231
package/README.md
CHANGED
|
@@ -2,12 +2,22 @@
|
|
|
2
2
|
|
|
3
3
|
Workspace-aware Databricks Model Serving selection.
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
Turn a loose model request such as `"claude sonnet"` or `"chat-fast"` into a
|
|
6
|
+
concrete serving endpoint in the current workspace. The client lists
|
|
7
|
+
`/serving-endpoints`, caches and enriches the
|
|
8
8
|
catalogue, classifies endpoints by capability, fuzzy-matches names, and falls
|
|
9
9
|
back to a small static floor when the live catalogue is unavailable.
|
|
10
10
|
|
|
11
|
+
## Quick Start
|
|
12
|
+
|
|
13
|
+
```ts
|
|
14
|
+
import { createModelClient } from "@dbx-tools/model";
|
|
15
|
+
|
|
16
|
+
const models = await createModelClient();
|
|
17
|
+
const selected = await models.resolveModel({ explicit: "sonnet" });
|
|
18
|
+
console.log(selected.modelId);
|
|
19
|
+
```
|
|
20
|
+
|
|
11
21
|
Browser-safe request/result schemas and endpoint classification types live in
|
|
12
22
|
[`@dbx-tools/shared-model`](../../shared/model).
|
|
13
23
|
|
|
@@ -33,7 +43,7 @@ Key features:
|
|
|
33
43
|
- Provides a small static fallback floor for local tools and degraded workspace
|
|
34
44
|
access.
|
|
35
45
|
|
|
36
|
-
##
|
|
46
|
+
## Use With AppKit Model Serving
|
|
37
47
|
|
|
38
48
|
Native AppKit's Model Serving plugin is the right choice when you already know
|
|
39
49
|
the endpoint alias you want. It gives you authenticated invoke/stream routes,
|
|
@@ -53,7 +63,7 @@ endpoint:
|
|
|
53
63
|
- keep local agents and CLIs working with a static fallback when catalogue
|
|
54
64
|
access is unavailable.
|
|
55
65
|
|
|
56
|
-
##
|
|
66
|
+
## Route Requests
|
|
57
67
|
|
|
58
68
|
```ts
|
|
59
69
|
import { createModelClient } from "@dbx-tools/model";
|
|
@@ -243,7 +253,7 @@ a property of the model (see `isResponsesOnly()` and `responsesUpstreamUrl()`),
|
|
|
243
253
|
so a hard-coded string in one package silently diverges when that routing
|
|
244
254
|
changes. `isResponsesOnly()` covers Codex and GPT 5.4+ endpoints, which reject
|
|
245
255
|
tool-bearing Chat Completions, while keeping GPT-OSS on its supported Chat path.
|
|
246
|
-
The TypeScript helper
|
|
256
|
+
The TypeScript helper applies this policy so every Node consumer shares one version
|
|
247
257
|
threshold without loading a native library.
|
|
248
258
|
|
|
249
259
|
## Read Published Model Metadata
|
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/model";
|
|
6
|
-
export const PACKAGE_VERSION = "0.9.
|
|
6
|
+
export const PACKAGE_VERSION = "0.9.105";
|
|
7
7
|
export * as bindings from "./src/bindings.ts";
|
|
8
8
|
export * as classes from "./src/classes.ts";
|
|
9
9
|
export * as classify from "./src/classify.ts";
|
|
@@ -16,10 +16,9 @@ export * as modelClient from "./src/model-client.ts";
|
|
|
16
16
|
export * as policy from "./src/policy.ts";
|
|
17
17
|
export * as reasoningTranslation from "./src/reasoning-translation.ts";
|
|
18
18
|
export * as resolve from "./src/resolve.ts";
|
|
19
|
-
export * as servingWire from "./src/serving-wire.ts";
|
|
20
19
|
export { CHAT_CLASS_ORDER, MODEL_CLASS_ORDER } from "./src/classes.ts";
|
|
21
20
|
export { FALLBACK_MODEL_IDS } from "./src/fallback.ts";
|
|
22
|
-
export { INVOCATIONS_SUFFIX, RESPONSES_PATH, OPEN_RESPONSES_PATH, CHAT_COMPLETIONS_PATH, AI_GATEWAY_CODEX_RESPONSES_PATH, ANTHROPIC_MESSAGES_PATH } from "./src/invoke.ts";
|
|
21
|
+
export { INVOCATIONS_SUFFIX, SERVING_ENDPOINTS_PATH, RESPONSES_PATH, OPEN_RESPONSES_PATH, CHAT_COMPLETIONS_PATH, AI_GATEWAY_CODEX_RESPONSES_PATH, ANTHROPIC_BASE_PATH, ANTHROPIC_MESSAGES_PATH } from "./src/invoke.ts";
|
|
23
22
|
export type { AuthenticatingClientLike } from "./src/invoke.ts";
|
|
24
23
|
export { MODEL_METADATA_TTL_MS, MODEL_RATE_LIMITS_URL, OPENAI_RESPONSES_MODELS_URL, QUERY_REASON_MODELS_URL, RETIRED_MODELS_URL, WEB_SEARCH_MODELS_URL } from "./src/metadata.ts";
|
|
25
24
|
export type { MetadataCacheRecord, MetadataCacheOptions, MetadataCacheMergeInput, MetadataCache } from "./src/metadata-cache.ts";
|
|
@@ -31,5 +30,4 @@ export { ModelFamily } from "./src/policy.ts";
|
|
|
31
30
|
export { REASONING_LEVELS } from "./src/reasoning-translation.ts";
|
|
32
31
|
export type { ReasoningLevel, ReasoningModelCatalogue, AdaptedRequestReasoning } from "./src/reasoning-translation.ts";
|
|
33
32
|
export type { SelectModelInput, SearchModelsInput } from "./src/resolve.ts";
|
|
34
|
-
export type { ServingChatMessage, RewrittenServingRequest } from "./src/serving-wire.ts";
|
|
35
33
|
export * from "./exports.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/model";
|
|
2
|
-
export declare const PACKAGE_VERSION = "0.9.
|
|
2
|
+
export declare const PACKAGE_VERSION = "0.9.105";
|
|
3
3
|
export * as bindings from "./src/bindings.ts";
|
|
4
4
|
export * as classes from "./src/classes.ts";
|
|
5
5
|
export * as classify from "./src/classify.ts";
|
|
@@ -12,10 +12,9 @@ export * as modelClient from "./src/model-client.ts";
|
|
|
12
12
|
export * as policy from "./src/policy.ts";
|
|
13
13
|
export * as reasoningTranslation from "./src/reasoning-translation.ts";
|
|
14
14
|
export * as resolve from "./src/resolve.ts";
|
|
15
|
-
export * as servingWire from "./src/serving-wire.ts";
|
|
16
15
|
export { CHAT_CLASS_ORDER, MODEL_CLASS_ORDER } from "./src/classes.ts";
|
|
17
16
|
export { FALLBACK_MODEL_IDS } from "./src/fallback.ts";
|
|
18
|
-
export { INVOCATIONS_SUFFIX, RESPONSES_PATH, OPEN_RESPONSES_PATH, CHAT_COMPLETIONS_PATH, AI_GATEWAY_CODEX_RESPONSES_PATH, ANTHROPIC_MESSAGES_PATH } from "./src/invoke.ts";
|
|
17
|
+
export { INVOCATIONS_SUFFIX, SERVING_ENDPOINTS_PATH, RESPONSES_PATH, OPEN_RESPONSES_PATH, CHAT_COMPLETIONS_PATH, AI_GATEWAY_CODEX_RESPONSES_PATH, ANTHROPIC_BASE_PATH, ANTHROPIC_MESSAGES_PATH } from "./src/invoke.ts";
|
|
19
18
|
export type { AuthenticatingClientLike } from "./src/invoke.ts";
|
|
20
19
|
export { MODEL_METADATA_TTL_MS, MODEL_RATE_LIMITS_URL, OPENAI_RESPONSES_MODELS_URL, QUERY_REASON_MODELS_URL, RETIRED_MODELS_URL, WEB_SEARCH_MODELS_URL } from "./src/metadata.ts";
|
|
21
20
|
export type { MetadataCacheRecord, MetadataCacheOptions, MetadataCacheMergeInput, MetadataCache } from "./src/metadata-cache.ts";
|
|
@@ -27,5 +26,4 @@ export { ModelFamily } from "./src/policy.ts";
|
|
|
27
26
|
export { REASONING_LEVELS } from "./src/reasoning-translation.ts";
|
|
28
27
|
export type { ReasoningLevel, ReasoningModelCatalogue, AdaptedRequestReasoning } from "./src/reasoning-translation.ts";
|
|
29
28
|
export type { SelectModelInput, SearchModelsInput } from "./src/resolve.ts";
|
|
30
|
-
export type { ServingChatMessage, RewrittenServingRequest } from "./src/serving-wire.ts";
|
|
31
29
|
export * from "./exports.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/model";
|
|
5
|
-
export const PACKAGE_VERSION = "0.9.
|
|
5
|
+
export const PACKAGE_VERSION = "0.9.105";
|
|
6
6
|
export * as bindings from "./src/bindings.js";
|
|
7
7
|
export * as classes from "./src/classes.js";
|
|
8
8
|
export * as classify from "./src/classify.js";
|
|
@@ -15,14 +15,13 @@ export * as modelClient from "./src/model-client.js";
|
|
|
15
15
|
export * as policy from "./src/policy.js";
|
|
16
16
|
export * as reasoningTranslation from "./src/reasoning-translation.js";
|
|
17
17
|
export * as resolve from "./src/resolve.js";
|
|
18
|
-
export * as servingWire from "./src/serving-wire.js";
|
|
19
18
|
export { CHAT_CLASS_ORDER, MODEL_CLASS_ORDER } from "./src/classes.js";
|
|
20
19
|
export { FALLBACK_MODEL_IDS } from "./src/fallback.js";
|
|
21
|
-
export { INVOCATIONS_SUFFIX, RESPONSES_PATH, OPEN_RESPONSES_PATH, CHAT_COMPLETIONS_PATH, AI_GATEWAY_CODEX_RESPONSES_PATH, ANTHROPIC_MESSAGES_PATH } from "./src/invoke.js";
|
|
20
|
+
export { INVOCATIONS_SUFFIX, SERVING_ENDPOINTS_PATH, RESPONSES_PATH, OPEN_RESPONSES_PATH, CHAT_COMPLETIONS_PATH, AI_GATEWAY_CODEX_RESPONSES_PATH, ANTHROPIC_BASE_PATH, ANTHROPIC_MESSAGES_PATH } from "./src/invoke.js";
|
|
22
21
|
export { MODEL_METADATA_TTL_MS, MODEL_RATE_LIMITS_URL, OPENAI_RESPONSES_MODELS_URL, QUERY_REASON_MODELS_URL, RETIRED_MODELS_URL, WEB_SEARCH_MODELS_URL } from "./src/metadata.js";
|
|
23
22
|
export { DEFAULT_MODEL_CACHE_TTL_MS, DEFAULT_FUZZY_THRESHOLD } from "./src/model-catalog.js";
|
|
24
23
|
export { DEFAULT_MODEL_CLIENT_CACHE_TTL_MS } from "./src/model-client.js";
|
|
25
24
|
export { ModelFamily } from "./src/policy.js";
|
|
26
25
|
export { REASONING_LEVELS } from "./src/reasoning-translation.js";
|
|
27
26
|
export * from "./exports.js";
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztBQUNyRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssUUFBUSxNQUFNLG1CQUFtQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssUUFBUSxNQUFNLG1CQUFtQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxhQUFhLE1BQU0seUJBQXlCLENBQUM7QUFDekQsT0FBTyxLQUFLLFlBQVksTUFBTSx3QkFBd0IsQ0FBQztBQUN2RCxPQUFPLEtBQUssV0FBVyxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLG9CQUFvQixNQUFNLGdDQUFnQyxDQUFDO0FBQ3ZFLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDdkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdkQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLHNCQUFzQixFQUFFLGNBQWMsRUFBRSxtQkFBbUIsRUFBRSxxQkFBcUIsRUFBRSwrQkFBK0IsRUFBRSxtQkFBbUIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXhOLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxxQkFBcUIsRUFBRSwyQkFBMkIsRUFBRSx1QkFBdUIsRUFBRSxrQkFBa0IsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWxMLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTdGLE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdsRSxjQUFjLGNBQWMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIEdFTkVSQVRFRCBieSBwcm9qZW4gd2F0Y2ggLSBETyBOT1QgRURJVC5cbi8vIFJlZ2VuZXJhdGVkIGZyb20gdGhlIGV4cG9ydGluZyBtb2R1bGVzIGluIC4vc3JjLlxuLy8gSGFuZCBlZGl0cyBhcmUgb3ZlcndyaXR0ZW4gb24gdGhlIG5leHQgd2F0Y2g7IHRoaXMgZmlsZSBpcyByZWFkLW9ubHkuXG5cbmV4cG9ydCBjb25zdCBQQUNLQUdFX0lERU5USUZJRVIgPSBcIkBkYngtdG9vbHMvbW9kZWxcIjtcbmV4cG9ydCBjb25zdCBQQUNLQUdFX1ZFUlNJT04gPSBcIjAuOS4xMDVcIjtcbmV4cG9ydCAqIGFzIGJpbmRpbmdzIGZyb20gXCIuL3NyYy9iaW5kaW5ncy50c1wiO1xuZXhwb3J0ICogYXMgY2xhc3NlcyBmcm9tIFwiLi9zcmMvY2xhc3Nlcy50c1wiO1xuZXhwb3J0ICogYXMgY2xhc3NpZnkgZnJvbSBcIi4vc3JjL2NsYXNzaWZ5LnRzXCI7XG5leHBvcnQgKiBhcyBmYWxsYmFjayBmcm9tIFwiLi9zcmMvZmFsbGJhY2sudHNcIjtcbmV4cG9ydCAqIGFzIGludm9rZSBmcm9tIFwiLi9zcmMvaW52b2tlLnRzXCI7XG5leHBvcnQgKiBhcyBtZXRhZGF0YSBmcm9tIFwiLi9zcmMvbWV0YWRhdGEudHNcIjtcbmV4cG9ydCAqIGFzIG1ldGFkYXRhQ2FjaGUgZnJvbSBcIi4vc3JjL21ldGFkYXRhLWNhY2hlLnRzXCI7XG5leHBvcnQgKiBhcyBtb2RlbENhdGFsb2cgZnJvbSBcIi4vc3JjL21vZGVsLWNhdGFsb2cudHNcIjtcbmV4cG9ydCAqIGFzIG1vZGVsQ2xpZW50IGZyb20gXCIuL3NyYy9tb2RlbC1jbGllbnQudHNcIjtcbmV4cG9ydCAqIGFzIHBvbGljeSBmcm9tIFwiLi9zcmMvcG9saWN5LnRzXCI7XG5leHBvcnQgKiBhcyByZWFzb25pbmdUcmFuc2xhdGlvbiBmcm9tIFwiLi9zcmMvcmVhc29uaW5nLXRyYW5zbGF0aW9uLnRzXCI7XG5leHBvcnQgKiBhcyByZXNvbHZlIGZyb20gXCIuL3NyYy9yZXNvbHZlLnRzXCI7XG5leHBvcnQgeyBDSEFUX0NMQVNTX09SREVSLCBNT0RFTF9DTEFTU19PUkRFUiB9IGZyb20gXCIuL3NyYy9jbGFzc2VzLnRzXCI7XG5leHBvcnQgeyBGQUxMQkFDS19NT0RFTF9JRFMgfSBmcm9tIFwiLi9zcmMvZmFsbGJhY2sudHNcIjtcbmV4cG9ydCB7IElOVk9DQVRJT05TX1NVRkZJWCwgU0VSVklOR19FTkRQT0lOVFNfUEFUSCwgUkVTUE9OU0VTX1BBVEgsIE9QRU5fUkVTUE9OU0VTX1BBVEgsIENIQVRfQ09NUExFVElPTlNfUEFUSCwgQUlfR0FURVdBWV9DT0RFWF9SRVNQT05TRVNfUEFUSCwgQU5USFJPUElDX0JBU0VfUEFUSCwgQU5USFJPUElDX01FU1NBR0VTX1BBVEggfSBmcm9tIFwiLi9zcmMvaW52b2tlLnRzXCI7XG5leHBvcnQgdHlwZSB7IEF1dGhlbnRpY2F0aW5nQ2xpZW50TGlrZSB9IGZyb20gXCIuL3NyYy9pbnZva2UudHNcIjtcbmV4cG9ydCB7IE1PREVMX01FVEFEQVRBX1RUTF9NUywgTU9ERUxfUkFURV9MSU1JVFNfVVJMLCBPUEVOQUlfUkVTUE9OU0VTX01PREVMU19VUkwsIFFVRVJZX1JFQVNPTl9NT0RFTFNfVVJMLCBSRVRJUkVEX01PREVMU19VUkwsIFdFQl9TRUFSQ0hfTU9ERUxTX1VSTCB9IGZyb20gXCIuL3NyYy9tZXRhZGF0YS50c1wiO1xuZXhwb3J0IHR5cGUgeyBNZXRhZGF0YUNhY2hlUmVjb3JkLCBNZXRhZGF0YUNhY2hlT3B0aW9ucywgTWV0YWRhdGFDYWNoZU1lcmdlSW5wdXQsIE1ldGFkYXRhQ2FjaGUgfSBmcm9tIFwiLi9zcmMvbWV0YWRhdGEtY2FjaGUudHNcIjtcbmV4cG9ydCB7IERFRkFVTFRfTU9ERUxfQ0FDSEVfVFRMX01TLCBERUZBVUxUX0ZVWlpZX1RIUkVTSE9MRCB9IGZyb20gXCIuL3NyYy9tb2RlbC1jYXRhbG9nLnRzXCI7XG5leHBvcnQgdHlwZSB7IFdvcmtzcGFjZUNsaWVudExpa2UsIExpc3RTZXJ2aW5nRW5kcG9pbnRzT3B0aW9ucyB9IGZyb20gXCIuL3NyYy9tb2RlbC1jYXRhbG9nLnRzXCI7XG5leHBvcnQgeyBERUZBVUxUX01PREVMX0NMSUVOVF9DQUNIRV9UVExfTVMgfSBmcm9tIFwiLi9zcmMvbW9kZWwtY2xpZW50LnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsQXV0aE9wdGlvbnMsIE1vZGVsQ2xpZW50T3B0aW9ucywgTW9kZWxDbGllbnRTdGF0dXMsIE1vZGVsUHJvdG9jb2wsIE1vZGVsUm91dGVJbnB1dCwgTW9kZWxSb3V0ZSwgTW9kZWxDbGllbnQgfSBmcm9tIFwiLi9zcmMvbW9kZWwtY2xpZW50LnRzXCI7XG5leHBvcnQgeyBNb2RlbEZhbWlseSB9IGZyb20gXCIuL3NyYy9wb2xpY3kudHNcIjtcbmV4cG9ydCB7IFJFQVNPTklOR19MRVZFTFMgfSBmcm9tIFwiLi9zcmMvcmVhc29uaW5nLXRyYW5zbGF0aW9uLnRzXCI7XG5leHBvcnQgdHlwZSB7IFJlYXNvbmluZ0xldmVsLCBSZWFzb25pbmdNb2RlbENhdGFsb2d1ZSwgQWRhcHRlZFJlcXVlc3RSZWFzb25pbmcgfSBmcm9tIFwiLi9zcmMvcmVhc29uaW5nLXRyYW5zbGF0aW9uLnRzXCI7XG5leHBvcnQgdHlwZSB7IFNlbGVjdE1vZGVsSW5wdXQsIFNlYXJjaE1vZGVsc0lucHV0IH0gZnJvbSBcIi4vc3JjL3Jlc29sdmUudHNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2V4cG9ydHMudHNcIjtcbiJdfQ==
|
package/lib/package.json
CHANGED
|
@@ -95,14 +95,10 @@
|
|
|
95
95
|
"types": "./lib/src/resolve.d.ts",
|
|
96
96
|
"default": "./lib/src/resolve.js"
|
|
97
97
|
},
|
|
98
|
-
"./serving-wire": {
|
|
99
|
-
"types": "./lib/src/serving-wire.d.ts",
|
|
100
|
-
"default": "./lib/src/serving-wire.js"
|
|
101
|
-
},
|
|
102
98
|
"./package.json": "./package.json"
|
|
103
99
|
}
|
|
104
100
|
},
|
|
105
|
-
"version": "0.9.
|
|
101
|
+
"version": "0.9.105",
|
|
106
102
|
"types": "index.ts",
|
|
107
103
|
"dbxToolsConfig": {
|
|
108
104
|
"tags": [
|
|
@@ -124,7 +120,6 @@
|
|
|
124
120
|
"./policy": "./src/policy.ts",
|
|
125
121
|
"./reasoning-translation": "./src/reasoning-translation.ts",
|
|
126
122
|
"./resolve": "./src/resolve.ts",
|
|
127
|
-
"./serving-wire": "./src/serving-wire.ts",
|
|
128
123
|
"./package.json": "./package.json"
|
|
129
124
|
},
|
|
130
125
|
"files": [
|
package/lib/src/invoke.d.ts
CHANGED
|
@@ -24,6 +24,8 @@
|
|
|
24
24
|
* models (notably Codex) reject this path and require {@link responsesUrl}.
|
|
25
25
|
*/
|
|
26
26
|
export declare const INVOCATIONS_SUFFIX = "invocations";
|
|
27
|
+
/** Workspace Model Serving root path used by provider base URLs. */
|
|
28
|
+
export declare const SERVING_ENDPOINTS_PATH = "serving-endpoints";
|
|
27
29
|
/**
|
|
28
30
|
* Workspace-level OpenAI Responses API path. Body carries `model` (endpoint
|
|
29
31
|
* id); used by GPT / Codex models that speak Responses natively.
|
|
@@ -43,8 +45,12 @@ export declare const OPEN_RESPONSES_PATH = "serving-endpoints/open-responses";
|
|
|
43
45
|
export declare const CHAT_COMPLETIONS_PATH = "serving-endpoints/chat/completions";
|
|
44
46
|
/** Unity Gateway OpenAI Responses path used by Codex-compatible model services. */
|
|
45
47
|
export declare const AI_GATEWAY_CODEX_RESPONSES_PATH = "ai-gateway/codex/v1/responses";
|
|
48
|
+
/** Workspace Anthropic provider root path. */
|
|
49
|
+
export declare const ANTHROPIC_BASE_PATH = "serving-endpoints/anthropic/v1";
|
|
46
50
|
/** Workspace Anthropic Messages path for native Claude requests. */
|
|
47
51
|
export declare const ANTHROPIC_MESSAGES_PATH = "serving-endpoints/anthropic/v1/messages";
|
|
52
|
+
/** Workspace Model Serving root URL used by OpenAI-compatible providers. */
|
|
53
|
+
export declare function servingEndpointsUrl(host: string): string;
|
|
48
54
|
/**
|
|
49
55
|
* The OpenAI-compatible chat-completions invocations URL for an endpoint id.
|
|
50
56
|
*
|
|
@@ -63,6 +69,8 @@ export declare function chatCompletionsUrl(host: string): string;
|
|
|
63
69
|
export declare function aiGatewayCodexResponsesUrl(host: string): string;
|
|
64
70
|
/** Workspace Anthropic Messages URL (`POST`, model in the body). */
|
|
65
71
|
export declare function anthropicMessagesUrl(host: string): string;
|
|
72
|
+
/** Workspace Anthropic provider base URL used by AI SDK providers. */
|
|
73
|
+
export declare function anthropicBaseUrl(host: string): string;
|
|
66
74
|
/**
|
|
67
75
|
* True when the endpoint is known to reject Chat Completions `/invocations`
|
|
68
76
|
* and require the Responses API (Codex models today). Callers should route
|
package/lib/src/invoke.js
CHANGED
|
@@ -25,27 +25,35 @@ import { isResponsesOnly as isResponsesOnlyByPolicy } from "./policy.js";
|
|
|
25
25
|
* models (notably Codex) reject this path and require {@link responsesUrl}.
|
|
26
26
|
*/
|
|
27
27
|
export const INVOCATIONS_SUFFIX = "invocations";
|
|
28
|
+
/** Workspace Model Serving root path used by provider base URLs. */
|
|
29
|
+
export const SERVING_ENDPOINTS_PATH = "serving-endpoints";
|
|
28
30
|
/**
|
|
29
31
|
* Workspace-level OpenAI Responses API path. Body carries `model` (endpoint
|
|
30
32
|
* id); used by GPT / Codex models that speak Responses natively.
|
|
31
33
|
*/
|
|
32
|
-
export const RESPONSES_PATH =
|
|
34
|
+
export const RESPONSES_PATH = `${SERVING_ENDPOINTS_PATH}/responses`;
|
|
33
35
|
/**
|
|
34
36
|
* Workspace-level Open Responses API path - the cross-provider Responses
|
|
35
37
|
* surface (Claude, Gemini, …) that OpenAI `/responses` does not cover.
|
|
36
38
|
*/
|
|
37
|
-
export const OPEN_RESPONSES_PATH =
|
|
39
|
+
export const OPEN_RESPONSES_PATH = `${SERVING_ENDPOINTS_PATH}/open-responses`;
|
|
38
40
|
/**
|
|
39
41
|
* Workspace-level OpenAI Chat Completions path. Body carries `model` (endpoint
|
|
40
42
|
* id), unlike {@link invocationsUrl} which names the endpoint in the URL. Use
|
|
41
43
|
* this when the caller has a model id rather than a per-endpoint route - e.g.
|
|
42
44
|
* attaching a provider tool spec to whichever endpoint was resolved.
|
|
43
45
|
*/
|
|
44
|
-
export const CHAT_COMPLETIONS_PATH =
|
|
46
|
+
export const CHAT_COMPLETIONS_PATH = `${SERVING_ENDPOINTS_PATH}/chat/completions`;
|
|
45
47
|
/** Unity Gateway OpenAI Responses path used by Codex-compatible model services. */
|
|
46
48
|
export const AI_GATEWAY_CODEX_RESPONSES_PATH = "ai-gateway/codex/v1/responses";
|
|
49
|
+
/** Workspace Anthropic provider root path. */
|
|
50
|
+
export const ANTHROPIC_BASE_PATH = `${SERVING_ENDPOINTS_PATH}/anthropic/v1`;
|
|
47
51
|
/** Workspace Anthropic Messages path for native Claude requests. */
|
|
48
|
-
export const ANTHROPIC_MESSAGES_PATH =
|
|
52
|
+
export const ANTHROPIC_MESSAGES_PATH = `${ANTHROPIC_BASE_PATH}/messages`;
|
|
53
|
+
/** Workspace Model Serving root URL used by OpenAI-compatible providers. */
|
|
54
|
+
export function servingEndpointsUrl(host) {
|
|
55
|
+
return new URL(SERVING_ENDPOINTS_PATH, host).toString().replace(/\/$/, "");
|
|
56
|
+
}
|
|
49
57
|
/**
|
|
50
58
|
* The OpenAI-compatible chat-completions invocations URL for an endpoint id.
|
|
51
59
|
*
|
|
@@ -54,7 +62,7 @@ export const ANTHROPIC_MESSAGES_PATH = "serving-endpoints/anthropic/v1/messages"
|
|
|
54
62
|
* @param endpoint - Endpoint id (already resolved; not fuzzy-matched here).
|
|
55
63
|
*/
|
|
56
64
|
export function invocationsUrl(host, endpoint) {
|
|
57
|
-
return new URL(
|
|
65
|
+
return new URL(`${SERVING_ENDPOINTS_PATH}/${encodeURIComponent(endpoint)}/${INVOCATIONS_SUFFIX}`, host).toString();
|
|
58
66
|
}
|
|
59
67
|
/** Workspace OpenAI Responses API URL (`POST`, model in the body). */
|
|
60
68
|
export function responsesUrl(host) {
|
|
@@ -76,6 +84,10 @@ export function aiGatewayCodexResponsesUrl(host) {
|
|
|
76
84
|
export function anthropicMessagesUrl(host) {
|
|
77
85
|
return new URL(ANTHROPIC_MESSAGES_PATH, host).toString();
|
|
78
86
|
}
|
|
87
|
+
/** Workspace Anthropic provider base URL used by AI SDK providers. */
|
|
88
|
+
export function anthropicBaseUrl(host) {
|
|
89
|
+
return new URL(ANTHROPIC_BASE_PATH, host).toString().replace(/\/$/, "");
|
|
90
|
+
}
|
|
79
91
|
/**
|
|
80
92
|
* True when the endpoint is known to reject Chat Completions `/invocations`
|
|
81
93
|
* and require the Responses API (Codex models today). Callers should route
|
|
@@ -114,4 +126,4 @@ export async function authHeaders(client) {
|
|
|
114
126
|
});
|
|
115
127
|
return out;
|
|
116
128
|
}
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"invoke.js","sourceRoot":"","sources":["../../src/invoke.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Calling a Model Serving endpoint directly over HTTP.\n *\n * The SDK's `servingEndpoints.query` covers the typed request shapes, but an\n * OpenAI-compatible caller (a proxy, a passthrough route, a streaming client)\n * needs to issue its own `fetch` against Databricks' OpenAI-shaped URLs with\n * an OpenAI body. That needs exactly two things the SDK doesn't hand out\n * directly: the URL ({@link invocationsUrl} / {@link responsesUrl} /\n * {@link openResponsesUrl}) and a currently-valid set of auth headers\n * ({@link authHeaders}).\n *\n * Auth is delegated entirely to the Databricks SDK: `config.authenticate`\n * re-runs the configured credential provider on every call and refreshes the\n * underlying OAuth / PAT token when it is close to expiry, so a caller never\n * manages token lifetimes itself - mint headers per request and each one is\n * signed with a valid bearer token.\n *\n * @module\n */\n\nimport { isResponsesOnly as isResponsesOnlyByPolicy } from \"./policy.ts\";\n\n/**\n * Path segment appended to a serving endpoint for OpenAI-compatible chat\n * requests. Databricks routes `/serving-endpoints/<name>/invocations` to the\n * endpoint's Chat Completions surface (`messages` in, `choices` out). Some\n * models (notably Codex) reject this path and require {@link responsesUrl}.\n */\nexport const INVOCATIONS_SUFFIX = \"invocations\";\n\n/**\n * Workspace-level OpenAI Responses API path. Body carries `model` (endpoint\n * id); used by GPT / Codex models that speak Responses natively.\n */\nexport const RESPONSES_PATH = \"serving-endpoints/responses\";\n\n/**\n * Workspace-level Open Responses API path - the cross-provider Responses\n * surface (Claude, Gemini, …) that OpenAI `/responses` does not cover.\n */\nexport const OPEN_RESPONSES_PATH = \"serving-endpoints/open-responses\";\n\n/**\n * Workspace-level OpenAI Chat Completions path. Body carries `model` (endpoint\n * id), unlike {@link invocationsUrl} which names the endpoint in the URL. Use\n * this when the caller has a model id rather than a per-endpoint route - e.g.\n * attaching a provider tool spec to whichever endpoint was resolved.\n */\nexport const CHAT_COMPLETIONS_PATH = \"serving-endpoints/chat/completions\";\n\n/** Unity Gateway OpenAI Responses path used by Codex-compatible model services. */\nexport const AI_GATEWAY_CODEX_RESPONSES_PATH = \"ai-gateway/codex/v1/responses\";\n\n/** Workspace Anthropic Messages path for native Claude requests. */\nexport const ANTHROPIC_MESSAGES_PATH = \"serving-endpoints/anthropic/v1/messages\";\n\n/**\n * The OpenAI-compatible chat-completions invocations URL for an endpoint id.\n *\n * @param host - Workspace host, e.g. `https://my-workspace.cloud.databricks.com/`.\n *   Pass the value resolved from `client.config.getHost()`.\n * @param endpoint - Endpoint id (already resolved; not fuzzy-matched here).\n */\nexport function invocationsUrl(host: string, endpoint: string): string {\n  return new URL(\n    `serving-endpoints/${encodeURIComponent(endpoint)}/${INVOCATIONS_SUFFIX}`,\n    host,\n  ).toString();\n}\n\n/** Workspace OpenAI Responses API URL (`POST`, model in the body). */\nexport function responsesUrl(host: string): string {\n  return new URL(RESPONSES_PATH, host).toString();\n}\n\n/** Workspace Open Responses API URL (`POST`, model in the body). */\nexport function openResponsesUrl(host: string): string {\n  return new URL(OPEN_RESPONSES_PATH, host).toString();\n}\n\n/** Workspace OpenAI Chat Completions URL (`POST`, model in the body). */\nexport function chatCompletionsUrl(host: string): string {\n  return new URL(CHAT_COMPLETIONS_PATH, host).toString();\n}\n\n/** Unity Gateway Codex Responses URL (`POST`, model service in the body). */\nexport function aiGatewayCodexResponsesUrl(host: string): string {\n  return new URL(AI_GATEWAY_CODEX_RESPONSES_PATH, host).toString();\n}\n\n/** Workspace Anthropic Messages URL (`POST`, model in the body). */\nexport function anthropicMessagesUrl(host: string): string {\n  return new URL(ANTHROPIC_MESSAGES_PATH, host).toString();\n}\n\n/**\n * True when the endpoint is known to reject Chat Completions `/invocations`\n * and require the Responses API (Codex models today). Callers should route\n * those to {@link responsesUrl} instead of {@link invocationsUrl}.\n */\nexport function isResponsesOnly(endpoint: string): boolean {\n  return isResponsesOnlyByPolicy(endpoint);\n}\n\n/**\n * Pick the Databricks Responses upstream for an endpoint id: OpenAI-family\n * models use `/serving-endpoints/responses`; everything else uses the\n * cross-provider `/serving-endpoints/open-responses`.\n */\nexport function responsesUpstreamUrl(host: string, endpoint: string): string {\n  return isOpenAiFamily(endpoint) ? responsesUrl(host) : openResponsesUrl(host);\n}\n\n/** GPT / Codex / o-series style endpoint names that speak OpenAI Responses. */\nfunction isOpenAiFamily(endpoint: string): boolean {\n  const n = endpoint.toLowerCase();\n  return (\n    n.includes(\"gpt\") ||\n    n.includes(\"codex\") ||\n    /(^|[^a-z])o[1-9]([^a-z]|$)/.test(n) ||\n    n.includes(\"openai\")\n  );\n}\n\n/**\n * Minimal structural shape {@link authHeaders} needs. Declared narrowly rather\n * than as a full `WorkspaceClientLike` so a caller holding its own\n * `@databricks/sdk-experimental` `WorkspaceClient` satisfies it regardless of\n * which SDK version resolved in its tree.\n */\nexport interface AuthenticatingClientLike {\n  config: {\n    authenticate(headers: Headers): Promise<void>;\n  };\n}\n\n/**\n * Mint auth headers for one upstream request as a plain object, ready to spread\n * into a `fetch` init. Call it per request: the SDK refreshes the underlying\n * token when needed, so a long-lived process never has to track expiry itself.\n */\nexport async function authHeaders(\n  client: AuthenticatingClientLike,\n): Promise<Record<string, string>> {\n  const headers = new Headers();\n  await client.config.authenticate(headers);\n  const out: Record<string, string> = {};\n  headers.forEach((value, key) => {\n    out[key] = value;\n  });\n  return out;\n}\n"]}
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"invoke.js","sourceRoot":"","sources":["../../src/invoke.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Calling a Model Serving endpoint directly over HTTP.\n *\n * The SDK's `servingEndpoints.query` covers the typed request shapes, but an\n * OpenAI-compatible caller (a proxy, a passthrough route, a streaming client)\n * needs to issue its own `fetch` against Databricks' OpenAI-shaped URLs with\n * an OpenAI body. That needs exactly two things the SDK doesn't hand out\n * directly: the URL ({@link invocationsUrl} / {@link responsesUrl} /\n * {@link openResponsesUrl}) and a currently-valid set of auth headers\n * ({@link authHeaders}).\n *\n * Auth is delegated entirely to the Databricks SDK: `config.authenticate`\n * re-runs the configured credential provider on every call and refreshes the\n * underlying OAuth / PAT token when it is close to expiry, so a caller never\n * manages token lifetimes itself - mint headers per request and each one is\n * signed with a valid bearer token.\n *\n * @module\n */\n\nimport { isResponsesOnly as isResponsesOnlyByPolicy } from \"./policy.ts\";\n\n/**\n * Path segment appended to a serving endpoint for OpenAI-compatible chat\n * requests. Databricks routes `/serving-endpoints/<name>/invocations` to the\n * endpoint's Chat Completions surface (`messages` in, `choices` out). Some\n * models (notably Codex) reject this path and require {@link responsesUrl}.\n */\nexport const INVOCATIONS_SUFFIX = \"invocations\";\n\n/** Workspace Model Serving root path used by provider base URLs. */\nexport const SERVING_ENDPOINTS_PATH = \"serving-endpoints\";\n\n/**\n * Workspace-level OpenAI Responses API path. Body carries `model` (endpoint\n * id); used by GPT / Codex models that speak Responses natively.\n */\nexport const RESPONSES_PATH = `${SERVING_ENDPOINTS_PATH}/responses`;\n\n/**\n * Workspace-level Open Responses API path - the cross-provider Responses\n * surface (Claude, Gemini, …) that OpenAI `/responses` does not cover.\n */\nexport const OPEN_RESPONSES_PATH = `${SERVING_ENDPOINTS_PATH}/open-responses`;\n\n/**\n * Workspace-level OpenAI Chat Completions path. Body carries `model` (endpoint\n * id), unlike {@link invocationsUrl} which names the endpoint in the URL. Use\n * this when the caller has a model id rather than a per-endpoint route - e.g.\n * attaching a provider tool spec to whichever endpoint was resolved.\n */\nexport const CHAT_COMPLETIONS_PATH = `${SERVING_ENDPOINTS_PATH}/chat/completions`;\n\n/** Unity Gateway OpenAI Responses path used by Codex-compatible model services. */\nexport const AI_GATEWAY_CODEX_RESPONSES_PATH = \"ai-gateway/codex/v1/responses\";\n\n/** Workspace Anthropic provider root path. */\nexport const ANTHROPIC_BASE_PATH = `${SERVING_ENDPOINTS_PATH}/anthropic/v1`;\n\n/** Workspace Anthropic Messages path for native Claude requests. */\nexport const ANTHROPIC_MESSAGES_PATH = `${ANTHROPIC_BASE_PATH}/messages`;\n\n/** Workspace Model Serving root URL used by OpenAI-compatible providers. */\nexport function servingEndpointsUrl(host: string): string {\n  return new URL(SERVING_ENDPOINTS_PATH, host).toString().replace(/\\/$/, \"\");\n}\n\n/**\n * The OpenAI-compatible chat-completions invocations URL for an endpoint id.\n *\n * @param host - Workspace host, e.g. `https://my-workspace.cloud.databricks.com/`.\n *   Pass the value resolved from `client.config.getHost()`.\n * @param endpoint - Endpoint id (already resolved; not fuzzy-matched here).\n */\nexport function invocationsUrl(host: string, endpoint: string): string {\n  return new URL(\n    `${SERVING_ENDPOINTS_PATH}/${encodeURIComponent(endpoint)}/${INVOCATIONS_SUFFIX}`,\n    host,\n  ).toString();\n}\n\n/** Workspace OpenAI Responses API URL (`POST`, model in the body). */\nexport function responsesUrl(host: string): string {\n  return new URL(RESPONSES_PATH, host).toString();\n}\n\n/** Workspace Open Responses API URL (`POST`, model in the body). */\nexport function openResponsesUrl(host: string): string {\n  return new URL(OPEN_RESPONSES_PATH, host).toString();\n}\n\n/** Workspace OpenAI Chat Completions URL (`POST`, model in the body). */\nexport function chatCompletionsUrl(host: string): string {\n  return new URL(CHAT_COMPLETIONS_PATH, host).toString();\n}\n\n/** Unity Gateway Codex Responses URL (`POST`, model service in the body). */\nexport function aiGatewayCodexResponsesUrl(host: string): string {\n  return new URL(AI_GATEWAY_CODEX_RESPONSES_PATH, host).toString();\n}\n\n/** Workspace Anthropic Messages URL (`POST`, model in the body). */\nexport function anthropicMessagesUrl(host: string): string {\n  return new URL(ANTHROPIC_MESSAGES_PATH, host).toString();\n}\n\n/** Workspace Anthropic provider base URL used by AI SDK providers. */\nexport function anthropicBaseUrl(host: string): string {\n  return new URL(ANTHROPIC_BASE_PATH, host).toString().replace(/\\/$/, \"\");\n}\n\n/**\n * True when the endpoint is known to reject Chat Completions `/invocations`\n * and require the Responses API (Codex models today). Callers should route\n * those to {@link responsesUrl} instead of {@link invocationsUrl}.\n */\nexport function isResponsesOnly(endpoint: string): boolean {\n  return isResponsesOnlyByPolicy(endpoint);\n}\n\n/**\n * Pick the Databricks Responses upstream for an endpoint id: OpenAI-family\n * models use `/serving-endpoints/responses`; everything else uses the\n * cross-provider `/serving-endpoints/open-responses`.\n */\nexport function responsesUpstreamUrl(host: string, endpoint: string): string {\n  return isOpenAiFamily(endpoint) ? responsesUrl(host) : openResponsesUrl(host);\n}\n\n/** GPT / Codex / o-series style endpoint names that speak OpenAI Responses. */\nfunction isOpenAiFamily(endpoint: string): boolean {\n  const n = endpoint.toLowerCase();\n  return (\n    n.includes(\"gpt\") ||\n    n.includes(\"codex\") ||\n    /(^|[^a-z])o[1-9]([^a-z]|$)/.test(n) ||\n    n.includes(\"openai\")\n  );\n}\n\n/**\n * Minimal structural shape {@link authHeaders} needs. Declared narrowly rather\n * than as a full `WorkspaceClientLike` so a caller holding its own\n * `@databricks/sdk-experimental` `WorkspaceClient` satisfies it regardless of\n * which SDK version resolved in its tree.\n */\nexport interface AuthenticatingClientLike {\n  config: {\n    authenticate(headers: Headers): Promise<void>;\n  };\n}\n\n/**\n * Mint auth headers for one upstream request as a plain object, ready to spread\n * into a `fetch` init. Call it per request: the SDK refreshes the underlying\n * token when needed, so a long-lived process never has to track expiry itself.\n */\nexport async function authHeaders(\n  client: AuthenticatingClientLike,\n): Promise<Record<string, string>> {\n  const headers = new Headers();\n  await client.config.authenticate(headers);\n  const out: Record<string, string> = {};\n  headers.forEach((value, key) => {\n    out[key] = value;\n  });\n  return out;\n}\n"]}
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/_metadata-contract.ts","../src/_metadata-generator.ts","../src/_ranking.ts","../src/_retirement.ts","../src/_selection.ts","../src/bindings.ts","../src/classes.ts","../src/classify.ts","../src/fallback.ts","../src/invoke.ts","../src/metadata-cache.ts","../src/metadata.ts","../src/model-catalog.ts","../src/model-client.ts","../src/policy.ts","../src/reasoning-translation.ts","../src/resolve.ts","../
|
|
1
|
+
{"root":["../src/_metadata-contract.ts","../src/_metadata-generator.ts","../src/_ranking.ts","../src/_retirement.ts","../src/_selection.ts","../src/bindings.ts","../src/classes.ts","../src/classify.ts","../src/fallback.ts","../src/invoke.ts","../src/metadata-cache.ts","../src/metadata.ts","../src/model-catalog.ts","../src/model-client.ts","../src/policy.ts","../src/reasoning-translation.ts","../src/resolve.ts","../scripts/generate-metadata.ts","../index.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -26,11 +26,11 @@
|
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@databricks/appkit": "0.81.0",
|
|
29
|
-
"@dbx-tools/appkit": "^0.9.
|
|
30
|
-
"@dbx-tools/auth": "^0.9.
|
|
31
|
-
"@dbx-tools/shared-auth": "^0.9.
|
|
32
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
33
|
-
"@dbx-tools/shared-model": "^0.9.
|
|
29
|
+
"@dbx-tools/appkit": "^0.9.105",
|
|
30
|
+
"@dbx-tools/auth": "^0.9.105",
|
|
31
|
+
"@dbx-tools/shared-auth": "^0.9.105",
|
|
32
|
+
"@dbx-tools/shared-core": "^0.9.105",
|
|
33
|
+
"@dbx-tools/shared-model": "^0.9.105",
|
|
34
34
|
"cacache": "^21.0.1",
|
|
35
35
|
"cheerio": "^1.2.0",
|
|
36
36
|
"env-paths": "^4.0.0",
|
|
@@ -95,14 +95,10 @@
|
|
|
95
95
|
"types": "./lib/src/resolve.d.ts",
|
|
96
96
|
"default": "./lib/src/resolve.js"
|
|
97
97
|
},
|
|
98
|
-
"./serving-wire": {
|
|
99
|
-
"types": "./lib/src/serving-wire.d.ts",
|
|
100
|
-
"default": "./lib/src/serving-wire.js"
|
|
101
|
-
},
|
|
102
98
|
"./package.json": "./package.json"
|
|
103
99
|
}
|
|
104
100
|
},
|
|
105
|
-
"version": "0.9.
|
|
101
|
+
"version": "0.9.105",
|
|
106
102
|
"types": "./lib/index.d.ts",
|
|
107
103
|
"dbxToolsConfig": {
|
|
108
104
|
"tags": [
|
|
@@ -163,10 +159,6 @@
|
|
|
163
159
|
"types": "./lib/src/resolve.d.ts",
|
|
164
160
|
"default": "./lib/src/resolve.js"
|
|
165
161
|
},
|
|
166
|
-
"./serving-wire": {
|
|
167
|
-
"types": "./lib/src/serving-wire.d.ts",
|
|
168
|
-
"default": "./lib/src/serving-wire.js"
|
|
169
|
-
},
|
|
170
162
|
"./package.json": "./package.json"
|
|
171
163
|
},
|
|
172
164
|
"files": [
|
package/src/invoke.ts
CHANGED
|
@@ -28,17 +28,20 @@ import { isResponsesOnly as isResponsesOnlyByPolicy } from "./policy.ts";
|
|
|
28
28
|
*/
|
|
29
29
|
export const INVOCATIONS_SUFFIX = "invocations";
|
|
30
30
|
|
|
31
|
+
/** Workspace Model Serving root path used by provider base URLs. */
|
|
32
|
+
export const SERVING_ENDPOINTS_PATH = "serving-endpoints";
|
|
33
|
+
|
|
31
34
|
/**
|
|
32
35
|
* Workspace-level OpenAI Responses API path. Body carries `model` (endpoint
|
|
33
36
|
* id); used by GPT / Codex models that speak Responses natively.
|
|
34
37
|
*/
|
|
35
|
-
export const RESPONSES_PATH =
|
|
38
|
+
export const RESPONSES_PATH = `${SERVING_ENDPOINTS_PATH}/responses`;
|
|
36
39
|
|
|
37
40
|
/**
|
|
38
41
|
* Workspace-level Open Responses API path - the cross-provider Responses
|
|
39
42
|
* surface (Claude, Gemini, …) that OpenAI `/responses` does not cover.
|
|
40
43
|
*/
|
|
41
|
-
export const OPEN_RESPONSES_PATH =
|
|
44
|
+
export const OPEN_RESPONSES_PATH = `${SERVING_ENDPOINTS_PATH}/open-responses`;
|
|
42
45
|
|
|
43
46
|
/**
|
|
44
47
|
* Workspace-level OpenAI Chat Completions path. Body carries `model` (endpoint
|
|
@@ -46,13 +49,21 @@ export const OPEN_RESPONSES_PATH = "serving-endpoints/open-responses";
|
|
|
46
49
|
* this when the caller has a model id rather than a per-endpoint route - e.g.
|
|
47
50
|
* attaching a provider tool spec to whichever endpoint was resolved.
|
|
48
51
|
*/
|
|
49
|
-
export const CHAT_COMPLETIONS_PATH =
|
|
52
|
+
export const CHAT_COMPLETIONS_PATH = `${SERVING_ENDPOINTS_PATH}/chat/completions`;
|
|
50
53
|
|
|
51
54
|
/** Unity Gateway OpenAI Responses path used by Codex-compatible model services. */
|
|
52
55
|
export const AI_GATEWAY_CODEX_RESPONSES_PATH = "ai-gateway/codex/v1/responses";
|
|
53
56
|
|
|
57
|
+
/** Workspace Anthropic provider root path. */
|
|
58
|
+
export const ANTHROPIC_BASE_PATH = `${SERVING_ENDPOINTS_PATH}/anthropic/v1`;
|
|
59
|
+
|
|
54
60
|
/** Workspace Anthropic Messages path for native Claude requests. */
|
|
55
|
-
export const ANTHROPIC_MESSAGES_PATH =
|
|
61
|
+
export const ANTHROPIC_MESSAGES_PATH = `${ANTHROPIC_BASE_PATH}/messages`;
|
|
62
|
+
|
|
63
|
+
/** Workspace Model Serving root URL used by OpenAI-compatible providers. */
|
|
64
|
+
export function servingEndpointsUrl(host: string): string {
|
|
65
|
+
return new URL(SERVING_ENDPOINTS_PATH, host).toString().replace(/\/$/, "");
|
|
66
|
+
}
|
|
56
67
|
|
|
57
68
|
/**
|
|
58
69
|
* The OpenAI-compatible chat-completions invocations URL for an endpoint id.
|
|
@@ -63,7 +74,7 @@ export const ANTHROPIC_MESSAGES_PATH = "serving-endpoints/anthropic/v1/messages"
|
|
|
63
74
|
*/
|
|
64
75
|
export function invocationsUrl(host: string, endpoint: string): string {
|
|
65
76
|
return new URL(
|
|
66
|
-
|
|
77
|
+
`${SERVING_ENDPOINTS_PATH}/${encodeURIComponent(endpoint)}/${INVOCATIONS_SUFFIX}`,
|
|
67
78
|
host,
|
|
68
79
|
).toString();
|
|
69
80
|
}
|
|
@@ -93,6 +104,11 @@ export function anthropicMessagesUrl(host: string): string {
|
|
|
93
104
|
return new URL(ANTHROPIC_MESSAGES_PATH, host).toString();
|
|
94
105
|
}
|
|
95
106
|
|
|
107
|
+
/** Workspace Anthropic provider base URL used by AI SDK providers. */
|
|
108
|
+
export function anthropicBaseUrl(host: string): string {
|
|
109
|
+
return new URL(ANTHROPIC_BASE_PATH, host).toString().replace(/\/$/, "");
|
|
110
|
+
}
|
|
111
|
+
|
|
96
112
|
/**
|
|
97
113
|
* True when the endpoint is known to reject Chat Completions `/invocations`
|
|
98
114
|
* and require the Responses API (Codex models today). Callers should route
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Framework-neutral repairs for OpenAI Chat traffic sent through Databricks
|
|
3
|
-
* Model Serving.
|
|
4
|
-
*
|
|
5
|
-
* @module
|
|
6
|
-
*/
|
|
7
|
-
import { type ChatMessage, type ChatRole } from "@dbx-tools/shared-model";
|
|
8
|
-
/** Chat message plus provider reasoning fields emitted by Databricks models. */
|
|
9
|
-
export interface ServingChatMessage extends ChatMessage {
|
|
10
|
-
role: ChatRole | "reasoning";
|
|
11
|
-
reasoning?: unknown;
|
|
12
|
-
reasoning_content?: unknown;
|
|
13
|
-
}
|
|
14
|
-
/** Prepared fetch arguments and the sanitized request body. */
|
|
15
|
-
export interface RewrittenServingRequest {
|
|
16
|
-
input: Parameters<typeof fetch>[0];
|
|
17
|
-
init: Parameters<typeof fetch>[1];
|
|
18
|
-
body: string;
|
|
19
|
-
}
|
|
20
|
-
/** Sanitize a serialized Chat Completions request when provider quirks require it. */
|
|
21
|
-
export declare function rewriteServingBody(body: string): string;
|
|
22
|
-
/** Read and sanitize a Chat Completions request without retaining stale byte headers. */
|
|
23
|
-
export declare function rewriteServingRequest(input: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]): Promise<RewrittenServingRequest>;
|
|
24
|
-
/** Normalize Chat Completions reasoning for GPT tool calls. */
|
|
25
|
-
export declare function applyToolReasoningCompatibility(body: Record<string, unknown>): boolean;
|
|
26
|
-
/** Remove provider reasoning blocks that cannot be replayed safely. */
|
|
27
|
-
export declare function stripReasoningFromServingMessages(messages: ServingChatMessage[]): boolean;
|
|
28
|
-
/** Fold a trailing assistant prefill back into its preceding tool-call turn. */
|
|
29
|
-
export declare function repairAssistantPrefill(messages: ServingChatMessage[]): boolean;
|
|
30
|
-
/** Normalize array-valued content in a non-streaming Chat Completions response. */
|
|
31
|
-
export declare function rewriteServingResponseBody(body: string): string;
|
|
32
|
-
/** Normalize array-valued content in an SSE stream without buffering the stream. */
|
|
33
|
-
export declare function rewriteServingResponseStream(body: ReadableStream<Uint8Array>): ReadableStream<Uint8Array>;
|
|
34
|
-
/** Flatten Chat Completions `choices[].message.content` arrays to strings. */
|
|
35
|
-
export declare function flattenChoiceMessageContent(payload: Record<string, unknown>): boolean;
|
|
36
|
-
/** Flatten Chat Completions `choices[].delta.content` arrays to strings. */
|
|
37
|
-
export declare function flattenChoiceDeltaContent(payload: Record<string, unknown>): boolean;
|
package/lib/src/serving-wire.js
DELETED
|
@@ -1,211 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Framework-neutral repairs for OpenAI Chat traffic sent through Databricks
|
|
3
|
-
* Model Serving.
|
|
4
|
-
*
|
|
5
|
-
* @module
|
|
6
|
-
*/
|
|
7
|
-
import { json, stringUtils } from "@dbx-tools/shared-core";
|
|
8
|
-
import { openaiChat } from "@dbx-tools/shared-model";
|
|
9
|
-
import { chatToolReasoningEffort } from "./policy.js";
|
|
10
|
-
const REASONING_PART_TYPES = new Set([
|
|
11
|
-
"reasoning",
|
|
12
|
-
"thinking",
|
|
13
|
-
"redacted_thinking",
|
|
14
|
-
]);
|
|
15
|
-
/** Sanitize a serialized Chat Completions request when provider quirks require it. */
|
|
16
|
-
export function rewriteServingBody(body) {
|
|
17
|
-
const parsed = json.parseRecord(body);
|
|
18
|
-
if (!parsed)
|
|
19
|
-
return body;
|
|
20
|
-
let changed = openaiChat.stripUnsupportedChatFields(parsed).length > 0 ||
|
|
21
|
-
applyToolReasoningCompatibility(parsed);
|
|
22
|
-
if (Array.isArray(parsed.messages)) {
|
|
23
|
-
const messages = parsed.messages;
|
|
24
|
-
const stripped = stripReasoningFromServingMessages(messages);
|
|
25
|
-
const repaired = repairAssistantPrefill(messages);
|
|
26
|
-
changed = changed || stripped || repaired;
|
|
27
|
-
}
|
|
28
|
-
return changed ? JSON.stringify(parsed) : body;
|
|
29
|
-
}
|
|
30
|
-
/** Read and sanitize a Chat Completions request without retaining stale byte headers. */
|
|
31
|
-
export async function rewriteServingRequest(input, init) {
|
|
32
|
-
const request = new Request(input, init);
|
|
33
|
-
const body = await request.clone().text();
|
|
34
|
-
const rewritten = rewriteServingBody(body);
|
|
35
|
-
if (rewritten === body)
|
|
36
|
-
return { input, init, body };
|
|
37
|
-
const headers = new Headers(request.headers);
|
|
38
|
-
headers.delete("content-length");
|
|
39
|
-
headers.delete("content-encoding");
|
|
40
|
-
return {
|
|
41
|
-
input: new Request(request, { body: rewritten, headers }),
|
|
42
|
-
init: undefined,
|
|
43
|
-
body: rewritten,
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
/** Normalize Chat Completions reasoning for GPT tool calls. */
|
|
47
|
-
export function applyToolReasoningCompatibility(body) {
|
|
48
|
-
if (!Array.isArray(body.tools) || body.tools.length === 0)
|
|
49
|
-
return false;
|
|
50
|
-
const model = stringUtils.trimToNull(body.model);
|
|
51
|
-
if (!model || chatToolReasoningEffort(model) !== "none")
|
|
52
|
-
return false;
|
|
53
|
-
if (body.reasoning_effort === "none")
|
|
54
|
-
return false;
|
|
55
|
-
body.reasoning_effort = "none";
|
|
56
|
-
return true;
|
|
57
|
-
}
|
|
58
|
-
/** Remove provider reasoning blocks that cannot be replayed safely. */
|
|
59
|
-
export function stripReasoningFromServingMessages(messages) {
|
|
60
|
-
let changed = false;
|
|
61
|
-
for (let index = messages.length - 1; index >= 0; index--) {
|
|
62
|
-
const message = messages[index];
|
|
63
|
-
if (!message)
|
|
64
|
-
continue;
|
|
65
|
-
if (message.role === "reasoning") {
|
|
66
|
-
messages.splice(index, 1);
|
|
67
|
-
changed = true;
|
|
68
|
-
continue;
|
|
69
|
-
}
|
|
70
|
-
if (message.reasoning !== undefined) {
|
|
71
|
-
delete message.reasoning;
|
|
72
|
-
changed = true;
|
|
73
|
-
}
|
|
74
|
-
if (message.reasoning_content !== undefined) {
|
|
75
|
-
delete message.reasoning_content;
|
|
76
|
-
changed = true;
|
|
77
|
-
}
|
|
78
|
-
const parts = openaiChat.chatContentParts(message.content);
|
|
79
|
-
if (!parts)
|
|
80
|
-
continue;
|
|
81
|
-
const filtered = parts.filter((part) => {
|
|
82
|
-
const type = part?.type;
|
|
83
|
-
if (typeof type !== "string" || !REASONING_PART_TYPES.has(type))
|
|
84
|
-
return true;
|
|
85
|
-
changed = true;
|
|
86
|
-
return false;
|
|
87
|
-
});
|
|
88
|
-
if (filtered.length !== parts.length)
|
|
89
|
-
message.content = filtered;
|
|
90
|
-
const hasToolCalls = Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
|
|
91
|
-
if (message.role === "assistant" && !hasToolCalls && isEmptyServingContent(message.content)) {
|
|
92
|
-
messages.splice(index, 1);
|
|
93
|
-
changed = true;
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
return changed;
|
|
97
|
-
}
|
|
98
|
-
/** Fold a trailing assistant prefill back into its preceding tool-call turn. */
|
|
99
|
-
export function repairAssistantPrefill(messages) {
|
|
100
|
-
if (messages.length < 2)
|
|
101
|
-
return false;
|
|
102
|
-
const last = messages[messages.length - 1];
|
|
103
|
-
if (!last || last.role !== "assistant" || (last.tool_calls && last.tool_calls.length > 0)) {
|
|
104
|
-
return false;
|
|
105
|
-
}
|
|
106
|
-
let index = messages.length - 2;
|
|
107
|
-
while (index >= 0 && messages[index]?.role === "tool")
|
|
108
|
-
index--;
|
|
109
|
-
const opener = messages[index];
|
|
110
|
-
if (!opener ||
|
|
111
|
-
opener.role !== "assistant" ||
|
|
112
|
-
!opener.tool_calls ||
|
|
113
|
-
opener.tool_calls.length === 0) {
|
|
114
|
-
return false;
|
|
115
|
-
}
|
|
116
|
-
opener.content = [
|
|
117
|
-
stringUtils.trimToNull(textFromServingContent(opener.content)),
|
|
118
|
-
stringUtils.trimToNull(textFromServingContent(last.content)),
|
|
119
|
-
]
|
|
120
|
-
.filter((value) => value !== null)
|
|
121
|
-
.join("\n\n");
|
|
122
|
-
messages.pop();
|
|
123
|
-
return true;
|
|
124
|
-
}
|
|
125
|
-
/** Normalize array-valued content in a non-streaming Chat Completions response. */
|
|
126
|
-
export function rewriteServingResponseBody(body) {
|
|
127
|
-
const parsed = json.parseRecord(body);
|
|
128
|
-
if (!parsed)
|
|
129
|
-
return body;
|
|
130
|
-
return flattenChoiceMessageContent(parsed) ? JSON.stringify(parsed) : body;
|
|
131
|
-
}
|
|
132
|
-
/** Normalize array-valued content in an SSE stream without buffering the stream. */
|
|
133
|
-
export function rewriteServingResponseStream(body) {
|
|
134
|
-
const decoder = new TextDecoder();
|
|
135
|
-
const encoder = new TextEncoder();
|
|
136
|
-
let buffer = "";
|
|
137
|
-
return body.pipeThrough(new TransformStream({
|
|
138
|
-
transform(chunk, controller) {
|
|
139
|
-
buffer += decoder.decode(chunk, { stream: true });
|
|
140
|
-
let newline = buffer.indexOf("\n");
|
|
141
|
-
while (newline >= 0) {
|
|
142
|
-
const line = buffer.slice(0, newline + 1);
|
|
143
|
-
buffer = buffer.slice(newline + 1);
|
|
144
|
-
controller.enqueue(encoder.encode(rewriteServingResponseStreamLine(line)));
|
|
145
|
-
newline = buffer.indexOf("\n");
|
|
146
|
-
}
|
|
147
|
-
},
|
|
148
|
-
flush(controller) {
|
|
149
|
-
buffer += decoder.decode();
|
|
150
|
-
if (buffer)
|
|
151
|
-
controller.enqueue(encoder.encode(rewriteServingResponseStreamLine(buffer)));
|
|
152
|
-
},
|
|
153
|
-
}));
|
|
154
|
-
}
|
|
155
|
-
/** Flatten Chat Completions `choices[].message.content` arrays to strings. */
|
|
156
|
-
export function flattenChoiceMessageContent(payload) {
|
|
157
|
-
return flattenChoiceContent(payload, "message");
|
|
158
|
-
}
|
|
159
|
-
/** Flatten Chat Completions `choices[].delta.content` arrays to strings. */
|
|
160
|
-
export function flattenChoiceDeltaContent(payload) {
|
|
161
|
-
return flattenChoiceContent(payload, "delta");
|
|
162
|
-
}
|
|
163
|
-
function rewriteServingResponseStreamLine(line) {
|
|
164
|
-
const lineEnding = line.endsWith("\r\n") ? "\r\n" : line.endsWith("\n") ? "\n" : "";
|
|
165
|
-
const content = lineEnding ? line.slice(0, -lineEnding.length) : line;
|
|
166
|
-
const match = /^(data:\s*)(.*)$/.exec(content);
|
|
167
|
-
if (!match || match[2] === "[DONE]")
|
|
168
|
-
return line;
|
|
169
|
-
const parsed = json.parseRecord(match[2]);
|
|
170
|
-
if (!parsed || !flattenChoiceDeltaContent(parsed))
|
|
171
|
-
return line;
|
|
172
|
-
return `${match[1]}${JSON.stringify(parsed)}${lineEnding}`;
|
|
173
|
-
}
|
|
174
|
-
function flattenChoiceContent(payload, field) {
|
|
175
|
-
if (!Array.isArray(payload.choices))
|
|
176
|
-
return false;
|
|
177
|
-
let changed = false;
|
|
178
|
-
for (const choice of payload.choices) {
|
|
179
|
-
if (!choice || typeof choice !== "object")
|
|
180
|
-
continue;
|
|
181
|
-
const container = choice[field];
|
|
182
|
-
if (!container || typeof container !== "object")
|
|
183
|
-
continue;
|
|
184
|
-
const target = container;
|
|
185
|
-
const parts = openaiChat.chatContentParts(target.content);
|
|
186
|
-
if (!parts)
|
|
187
|
-
continue;
|
|
188
|
-
target.content = openaiChat.chatContentToText(parts, { types: ["text"] });
|
|
189
|
-
changed = true;
|
|
190
|
-
}
|
|
191
|
-
return changed;
|
|
192
|
-
}
|
|
193
|
-
function textFromServingContent(content) {
|
|
194
|
-
return openaiChat.chatContentToText(content, { separator: "\n\n", types: ["text"] });
|
|
195
|
-
}
|
|
196
|
-
function isEmptyServingContent(content) {
|
|
197
|
-
if (content === undefined)
|
|
198
|
-
return true;
|
|
199
|
-
if (typeof content === "string")
|
|
200
|
-
return content.trim().length === 0;
|
|
201
|
-
const parts = openaiChat.chatContentParts(content);
|
|
202
|
-
if (!parts)
|
|
203
|
-
return true;
|
|
204
|
-
return parts.every((part) => {
|
|
205
|
-
if (part?.type === "text") {
|
|
206
|
-
return typeof part.text !== "string" || part.text.trim().length === 0;
|
|
207
|
-
}
|
|
208
|
-
return false;
|
|
209
|
-
});
|
|
210
|
-
}
|
|
211
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"serving-wire.js","sourceRoot":"","sources":["../../src/serving-wire.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Framework-neutral repairs for OpenAI Chat traffic sent through Databricks\n * Model Serving.\n *\n * @module\n */\n\nimport { json, stringUtils } from \"@dbx-tools/shared-core\";\nimport { type ChatMessage, type ChatRole, openaiChat } from \"@dbx-tools/shared-model\";\n\nimport { chatToolReasoningEffort } from \"./policy.ts\";\n\n/** Chat message plus provider reasoning fields emitted by Databricks models. */\nexport interface ServingChatMessage extends ChatMessage {\n  role: ChatRole | \"reasoning\";\n  reasoning?: unknown;\n  reasoning_content?: unknown;\n}\n\n/** Prepared fetch arguments and the sanitized request body. */\nexport interface RewrittenServingRequest {\n  input: Parameters<typeof fetch>[0];\n  init: Parameters<typeof fetch>[1];\n  body: string;\n}\n\nconst REASONING_PART_TYPES: ReadonlySet<string> = new Set([\n  \"reasoning\",\n  \"thinking\",\n  \"redacted_thinking\",\n]);\n\n/** Sanitize a serialized Chat Completions request when provider quirks require it. */\nexport function rewriteServingBody(body: string): string {\n  const parsed = json.parseRecord(body);\n  if (!parsed) return body;\n  let changed =\n    openaiChat.stripUnsupportedChatFields(parsed).length > 0 ||\n    applyToolReasoningCompatibility(parsed);\n  if (Array.isArray(parsed.messages)) {\n    const messages = parsed.messages as ServingChatMessage[];\n    const stripped = stripReasoningFromServingMessages(messages);\n    const repaired = repairAssistantPrefill(messages);\n    changed = changed || stripped || repaired;\n  }\n  return changed ? JSON.stringify(parsed) : body;\n}\n\n/** Read and sanitize a Chat Completions request without retaining stale byte headers. */\nexport async function rewriteServingRequest(\n  input: Parameters<typeof fetch>[0],\n  init?: Parameters<typeof fetch>[1],\n): Promise<RewrittenServingRequest> {\n  const request = new Request(input, init);\n  const body = await request.clone().text();\n  const rewritten = rewriteServingBody(body);\n  if (rewritten === body) return { input, init, body };\n  const headers = new Headers(request.headers);\n  headers.delete(\"content-length\");\n  headers.delete(\"content-encoding\");\n  return {\n    input: new Request(request, { body: rewritten, headers }),\n    init: undefined,\n    body: rewritten,\n  };\n}\n\n/** Normalize Chat Completions reasoning for GPT tool calls. */\nexport function applyToolReasoningCompatibility(body: Record<string, unknown>): boolean {\n  if (!Array.isArray(body.tools) || body.tools.length === 0) return false;\n  const model = stringUtils.trimToNull(body.model);\n  if (!model || chatToolReasoningEffort(model) !== \"none\") return false;\n  if (body.reasoning_effort === \"none\") return false;\n  body.reasoning_effort = \"none\";\n  return true;\n}\n\n/** Remove provider reasoning blocks that cannot be replayed safely. */\nexport function stripReasoningFromServingMessages(messages: ServingChatMessage[]): boolean {\n  let changed = false;\n  for (let index = messages.length - 1; index >= 0; index--) {\n    const message = messages[index];\n    if (!message) continue;\n    if (message.role === \"reasoning\") {\n      messages.splice(index, 1);\n      changed = true;\n      continue;\n    }\n    if (message.reasoning !== undefined) {\n      delete message.reasoning;\n      changed = true;\n    }\n    if (message.reasoning_content !== undefined) {\n      delete message.reasoning_content;\n      changed = true;\n    }\n    const parts = openaiChat.chatContentParts(message.content);\n    if (!parts) continue;\n    const filtered = parts.filter((part) => {\n      const type = part?.type;\n      if (typeof type !== \"string\" || !REASONING_PART_TYPES.has(type)) return true;\n      changed = true;\n      return false;\n    });\n    if (filtered.length !== parts.length) message.content = filtered;\n    const hasToolCalls = Array.isArray(message.tool_calls) && message.tool_calls.length > 0;\n    if (message.role === \"assistant\" && !hasToolCalls && isEmptyServingContent(message.content)) {\n      messages.splice(index, 1);\n      changed = true;\n    }\n  }\n  return changed;\n}\n\n/** Fold a trailing assistant prefill back into its preceding tool-call turn. */\nexport function repairAssistantPrefill(messages: ServingChatMessage[]): boolean {\n  if (messages.length < 2) return false;\n  const last = messages[messages.length - 1];\n  if (!last || last.role !== \"assistant\" || (last.tool_calls && last.tool_calls.length > 0)) {\n    return false;\n  }\n  let index = messages.length - 2;\n  while (index >= 0 && messages[index]?.role === \"tool\") index--;\n  const opener = messages[index];\n  if (\n    !opener ||\n    opener.role !== \"assistant\" ||\n    !opener.tool_calls ||\n    opener.tool_calls.length === 0\n  ) {\n    return false;\n  }\n  opener.content = [\n    stringUtils.trimToNull(textFromServingContent(opener.content)),\n    stringUtils.trimToNull(textFromServingContent(last.content)),\n  ]\n    .filter((value): value is string => value !== null)\n    .join(\"\\n\\n\");\n  messages.pop();\n  return true;\n}\n\n/** Normalize array-valued content in a non-streaming Chat Completions response. */\nexport function rewriteServingResponseBody(body: string): string {\n  const parsed = json.parseRecord(body);\n  if (!parsed) return body;\n  return flattenChoiceMessageContent(parsed) ? JSON.stringify(parsed) : body;\n}\n\n/** Normalize array-valued content in an SSE stream without buffering the stream. */\nexport function rewriteServingResponseStream(\n  body: ReadableStream<Uint8Array>,\n): ReadableStream<Uint8Array> {\n  const decoder = new TextDecoder();\n  const encoder = new TextEncoder();\n  let buffer = \"\";\n  return body.pipeThrough(\n    new TransformStream<Uint8Array, Uint8Array>({\n      transform(chunk, controller) {\n        buffer += decoder.decode(chunk, { stream: true });\n        let newline = buffer.indexOf(\"\\n\");\n        while (newline >= 0) {\n          const line = buffer.slice(0, newline + 1);\n          buffer = buffer.slice(newline + 1);\n          controller.enqueue(encoder.encode(rewriteServingResponseStreamLine(line)));\n          newline = buffer.indexOf(\"\\n\");\n        }\n      },\n      flush(controller) {\n        buffer += decoder.decode();\n        if (buffer) controller.enqueue(encoder.encode(rewriteServingResponseStreamLine(buffer)));\n      },\n    }),\n  );\n}\n\n/** Flatten Chat Completions `choices[].message.content` arrays to strings. */\nexport function flattenChoiceMessageContent(payload: Record<string, unknown>): boolean {\n  return flattenChoiceContent(payload, \"message\");\n}\n\n/** Flatten Chat Completions `choices[].delta.content` arrays to strings. */\nexport function flattenChoiceDeltaContent(payload: Record<string, unknown>): boolean {\n  return flattenChoiceContent(payload, \"delta\");\n}\n\nfunction rewriteServingResponseStreamLine(line: string): string {\n  const lineEnding = line.endsWith(\"\\r\\n\") ? \"\\r\\n\" : line.endsWith(\"\\n\") ? \"\\n\" : \"\";\n  const content = lineEnding ? line.slice(0, -lineEnding.length) : line;\n  const match = /^(data:\\s*)(.*)$/.exec(content);\n  if (!match || match[2] === \"[DONE]\") return line;\n  const parsed = json.parseRecord(match[2]);\n  if (!parsed || !flattenChoiceDeltaContent(parsed)) return line;\n  return `${match[1]}${JSON.stringify(parsed)}${lineEnding}`;\n}\n\nfunction flattenChoiceContent(\n  payload: Record<string, unknown>,\n  field: \"message\" | \"delta\",\n): boolean {\n  if (!Array.isArray(payload.choices)) return false;\n  let changed = false;\n  for (const choice of payload.choices) {\n    if (!choice || typeof choice !== \"object\") continue;\n    const container = (choice as Record<string, unknown>)[field];\n    if (!container || typeof container !== \"object\") continue;\n    const target = container as { content?: unknown };\n    const parts = openaiChat.chatContentParts(target.content);\n    if (!parts) continue;\n    target.content = openaiChat.chatContentToText(parts, { types: [\"text\"] });\n    changed = true;\n  }\n  return changed;\n}\n\nfunction textFromServingContent(content: ServingChatMessage[\"content\"]): string {\n  return openaiChat.chatContentToText(content, { separator: \"\\n\\n\", types: [\"text\"] });\n}\n\nfunction isEmptyServingContent(content: ServingChatMessage[\"content\"]): boolean {\n  if (content === undefined) return true;\n  if (typeof content === \"string\") return content.trim().length === 0;\n  const parts = openaiChat.chatContentParts(content);\n  if (!parts) return true;\n  return parts.every((part) => {\n    if (part?.type === \"text\") {\n      return typeof part.text !== \"string\" || part.text.trim().length === 0;\n    }\n    return false;\n  });\n}\n"]}
|
package/src/serving-wire.ts
DELETED
|
@@ -1,231 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Framework-neutral repairs for OpenAI Chat traffic sent through Databricks
|
|
3
|
-
* Model Serving.
|
|
4
|
-
*
|
|
5
|
-
* @module
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
import { json, stringUtils } from "@dbx-tools/shared-core";
|
|
9
|
-
import { type ChatMessage, type ChatRole, openaiChat } from "@dbx-tools/shared-model";
|
|
10
|
-
|
|
11
|
-
import { chatToolReasoningEffort } from "./policy.ts";
|
|
12
|
-
|
|
13
|
-
/** Chat message plus provider reasoning fields emitted by Databricks models. */
|
|
14
|
-
export interface ServingChatMessage extends ChatMessage {
|
|
15
|
-
role: ChatRole | "reasoning";
|
|
16
|
-
reasoning?: unknown;
|
|
17
|
-
reasoning_content?: unknown;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
/** Prepared fetch arguments and the sanitized request body. */
|
|
21
|
-
export interface RewrittenServingRequest {
|
|
22
|
-
input: Parameters<typeof fetch>[0];
|
|
23
|
-
init: Parameters<typeof fetch>[1];
|
|
24
|
-
body: string;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
const REASONING_PART_TYPES: ReadonlySet<string> = new Set([
|
|
28
|
-
"reasoning",
|
|
29
|
-
"thinking",
|
|
30
|
-
"redacted_thinking",
|
|
31
|
-
]);
|
|
32
|
-
|
|
33
|
-
/** Sanitize a serialized Chat Completions request when provider quirks require it. */
|
|
34
|
-
export function rewriteServingBody(body: string): string {
|
|
35
|
-
const parsed = json.parseRecord(body);
|
|
36
|
-
if (!parsed) return body;
|
|
37
|
-
let changed =
|
|
38
|
-
openaiChat.stripUnsupportedChatFields(parsed).length > 0 ||
|
|
39
|
-
applyToolReasoningCompatibility(parsed);
|
|
40
|
-
if (Array.isArray(parsed.messages)) {
|
|
41
|
-
const messages = parsed.messages as ServingChatMessage[];
|
|
42
|
-
const stripped = stripReasoningFromServingMessages(messages);
|
|
43
|
-
const repaired = repairAssistantPrefill(messages);
|
|
44
|
-
changed = changed || stripped || repaired;
|
|
45
|
-
}
|
|
46
|
-
return changed ? JSON.stringify(parsed) : body;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
/** Read and sanitize a Chat Completions request without retaining stale byte headers. */
|
|
50
|
-
export async function rewriteServingRequest(
|
|
51
|
-
input: Parameters<typeof fetch>[0],
|
|
52
|
-
init?: Parameters<typeof fetch>[1],
|
|
53
|
-
): Promise<RewrittenServingRequest> {
|
|
54
|
-
const request = new Request(input, init);
|
|
55
|
-
const body = await request.clone().text();
|
|
56
|
-
const rewritten = rewriteServingBody(body);
|
|
57
|
-
if (rewritten === body) return { input, init, body };
|
|
58
|
-
const headers = new Headers(request.headers);
|
|
59
|
-
headers.delete("content-length");
|
|
60
|
-
headers.delete("content-encoding");
|
|
61
|
-
return {
|
|
62
|
-
input: new Request(request, { body: rewritten, headers }),
|
|
63
|
-
init: undefined,
|
|
64
|
-
body: rewritten,
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
/** Normalize Chat Completions reasoning for GPT tool calls. */
|
|
69
|
-
export function applyToolReasoningCompatibility(body: Record<string, unknown>): boolean {
|
|
70
|
-
if (!Array.isArray(body.tools) || body.tools.length === 0) return false;
|
|
71
|
-
const model = stringUtils.trimToNull(body.model);
|
|
72
|
-
if (!model || chatToolReasoningEffort(model) !== "none") return false;
|
|
73
|
-
if (body.reasoning_effort === "none") return false;
|
|
74
|
-
body.reasoning_effort = "none";
|
|
75
|
-
return true;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
/** Remove provider reasoning blocks that cannot be replayed safely. */
|
|
79
|
-
export function stripReasoningFromServingMessages(messages: ServingChatMessage[]): boolean {
|
|
80
|
-
let changed = false;
|
|
81
|
-
for (let index = messages.length - 1; index >= 0; index--) {
|
|
82
|
-
const message = messages[index];
|
|
83
|
-
if (!message) continue;
|
|
84
|
-
if (message.role === "reasoning") {
|
|
85
|
-
messages.splice(index, 1);
|
|
86
|
-
changed = true;
|
|
87
|
-
continue;
|
|
88
|
-
}
|
|
89
|
-
if (message.reasoning !== undefined) {
|
|
90
|
-
delete message.reasoning;
|
|
91
|
-
changed = true;
|
|
92
|
-
}
|
|
93
|
-
if (message.reasoning_content !== undefined) {
|
|
94
|
-
delete message.reasoning_content;
|
|
95
|
-
changed = true;
|
|
96
|
-
}
|
|
97
|
-
const parts = openaiChat.chatContentParts(message.content);
|
|
98
|
-
if (!parts) continue;
|
|
99
|
-
const filtered = parts.filter((part) => {
|
|
100
|
-
const type = part?.type;
|
|
101
|
-
if (typeof type !== "string" || !REASONING_PART_TYPES.has(type)) return true;
|
|
102
|
-
changed = true;
|
|
103
|
-
return false;
|
|
104
|
-
});
|
|
105
|
-
if (filtered.length !== parts.length) message.content = filtered;
|
|
106
|
-
const hasToolCalls = Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
|
|
107
|
-
if (message.role === "assistant" && !hasToolCalls && isEmptyServingContent(message.content)) {
|
|
108
|
-
messages.splice(index, 1);
|
|
109
|
-
changed = true;
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
return changed;
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
/** Fold a trailing assistant prefill back into its preceding tool-call turn. */
|
|
116
|
-
export function repairAssistantPrefill(messages: ServingChatMessage[]): boolean {
|
|
117
|
-
if (messages.length < 2) return false;
|
|
118
|
-
const last = messages[messages.length - 1];
|
|
119
|
-
if (!last || last.role !== "assistant" || (last.tool_calls && last.tool_calls.length > 0)) {
|
|
120
|
-
return false;
|
|
121
|
-
}
|
|
122
|
-
let index = messages.length - 2;
|
|
123
|
-
while (index >= 0 && messages[index]?.role === "tool") index--;
|
|
124
|
-
const opener = messages[index];
|
|
125
|
-
if (
|
|
126
|
-
!opener ||
|
|
127
|
-
opener.role !== "assistant" ||
|
|
128
|
-
!opener.tool_calls ||
|
|
129
|
-
opener.tool_calls.length === 0
|
|
130
|
-
) {
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
opener.content = [
|
|
134
|
-
stringUtils.trimToNull(textFromServingContent(opener.content)),
|
|
135
|
-
stringUtils.trimToNull(textFromServingContent(last.content)),
|
|
136
|
-
]
|
|
137
|
-
.filter((value): value is string => value !== null)
|
|
138
|
-
.join("\n\n");
|
|
139
|
-
messages.pop();
|
|
140
|
-
return true;
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
/** Normalize array-valued content in a non-streaming Chat Completions response. */
|
|
144
|
-
export function rewriteServingResponseBody(body: string): string {
|
|
145
|
-
const parsed = json.parseRecord(body);
|
|
146
|
-
if (!parsed) return body;
|
|
147
|
-
return flattenChoiceMessageContent(parsed) ? JSON.stringify(parsed) : body;
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
/** Normalize array-valued content in an SSE stream without buffering the stream. */
|
|
151
|
-
export function rewriteServingResponseStream(
|
|
152
|
-
body: ReadableStream<Uint8Array>,
|
|
153
|
-
): ReadableStream<Uint8Array> {
|
|
154
|
-
const decoder = new TextDecoder();
|
|
155
|
-
const encoder = new TextEncoder();
|
|
156
|
-
let buffer = "";
|
|
157
|
-
return body.pipeThrough(
|
|
158
|
-
new TransformStream<Uint8Array, Uint8Array>({
|
|
159
|
-
transform(chunk, controller) {
|
|
160
|
-
buffer += decoder.decode(chunk, { stream: true });
|
|
161
|
-
let newline = buffer.indexOf("\n");
|
|
162
|
-
while (newline >= 0) {
|
|
163
|
-
const line = buffer.slice(0, newline + 1);
|
|
164
|
-
buffer = buffer.slice(newline + 1);
|
|
165
|
-
controller.enqueue(encoder.encode(rewriteServingResponseStreamLine(line)));
|
|
166
|
-
newline = buffer.indexOf("\n");
|
|
167
|
-
}
|
|
168
|
-
},
|
|
169
|
-
flush(controller) {
|
|
170
|
-
buffer += decoder.decode();
|
|
171
|
-
if (buffer) controller.enqueue(encoder.encode(rewriteServingResponseStreamLine(buffer)));
|
|
172
|
-
},
|
|
173
|
-
}),
|
|
174
|
-
);
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
/** Flatten Chat Completions `choices[].message.content` arrays to strings. */
|
|
178
|
-
export function flattenChoiceMessageContent(payload: Record<string, unknown>): boolean {
|
|
179
|
-
return flattenChoiceContent(payload, "message");
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
/** Flatten Chat Completions `choices[].delta.content` arrays to strings. */
|
|
183
|
-
export function flattenChoiceDeltaContent(payload: Record<string, unknown>): boolean {
|
|
184
|
-
return flattenChoiceContent(payload, "delta");
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
function rewriteServingResponseStreamLine(line: string): string {
|
|
188
|
-
const lineEnding = line.endsWith("\r\n") ? "\r\n" : line.endsWith("\n") ? "\n" : "";
|
|
189
|
-
const content = lineEnding ? line.slice(0, -lineEnding.length) : line;
|
|
190
|
-
const match = /^(data:\s*)(.*)$/.exec(content);
|
|
191
|
-
if (!match || match[2] === "[DONE]") return line;
|
|
192
|
-
const parsed = json.parseRecord(match[2]);
|
|
193
|
-
if (!parsed || !flattenChoiceDeltaContent(parsed)) return line;
|
|
194
|
-
return `${match[1]}${JSON.stringify(parsed)}${lineEnding}`;
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
function flattenChoiceContent(
|
|
198
|
-
payload: Record<string, unknown>,
|
|
199
|
-
field: "message" | "delta",
|
|
200
|
-
): boolean {
|
|
201
|
-
if (!Array.isArray(payload.choices)) return false;
|
|
202
|
-
let changed = false;
|
|
203
|
-
for (const choice of payload.choices) {
|
|
204
|
-
if (!choice || typeof choice !== "object") continue;
|
|
205
|
-
const container = (choice as Record<string, unknown>)[field];
|
|
206
|
-
if (!container || typeof container !== "object") continue;
|
|
207
|
-
const target = container as { content?: unknown };
|
|
208
|
-
const parts = openaiChat.chatContentParts(target.content);
|
|
209
|
-
if (!parts) continue;
|
|
210
|
-
target.content = openaiChat.chatContentToText(parts, { types: ["text"] });
|
|
211
|
-
changed = true;
|
|
212
|
-
}
|
|
213
|
-
return changed;
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
function textFromServingContent(content: ServingChatMessage["content"]): string {
|
|
217
|
-
return openaiChat.chatContentToText(content, { separator: "\n\n", types: ["text"] });
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
function isEmptyServingContent(content: ServingChatMessage["content"]): boolean {
|
|
221
|
-
if (content === undefined) return true;
|
|
222
|
-
if (typeof content === "string") return content.trim().length === 0;
|
|
223
|
-
const parts = openaiChat.chatContentParts(content);
|
|
224
|
-
if (!parts) return true;
|
|
225
|
-
return parts.every((part) => {
|
|
226
|
-
if (part?.type === "text") {
|
|
227
|
-
return typeof part.text !== "string" || part.text.trim().length === 0;
|
|
228
|
-
}
|
|
229
|
-
return false;
|
|
230
|
-
});
|
|
231
|
-
}
|