@truefoundry/ai-gateway-sdk 0.0.15 → 0.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/autogen/models.d.ts +14 -1
- package/dist/autogen/schema.json +9 -1
- package/dist/errors.d.ts +2 -1
- package/dist/errors.js +3 -1
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/parity/transformCapturedProviderResponse.js +13 -5
- package/dist/parity/transformCapturedProviderResponse.js.map +1 -1
- package/dist/providers/azure-ai-inference/api.js +8 -9
- package/dist/providers/azure-ai-inference/api.js.map +1 -1
- package/dist/providers/azure-openai/api.js +3 -0
- package/dist/providers/azure-openai/api.js.map +1 -1
- package/dist/providers/azure-openai/utils.js +1 -1
- package/dist/providers/azure-openai/utils.js.map +1 -1
- package/dist/providers/bedrock/api.js +44 -9
- package/dist/providers/bedrock/api.js.map +1 -1
- package/dist/providers/bedrock/chatComplete.js +5 -0
- package/dist/providers/bedrock/chatComplete.js.map +1 -1
- package/dist/providers/bedrock/index.d.ts +50 -0
- package/dist/providers/bedrock/index.js +29 -1
- package/dist/providers/bedrock/index.js.map +1 -1
- package/dist/providers/bedrock/modelFamily.d.ts +6 -1
- package/dist/providers/bedrock/modelFamily.js +10 -1
- package/dist/providers/bedrock/modelFamily.js.map +1 -1
- package/dist/providers/bedrock/utils.d.ts +1 -1
- package/dist/providers/bedrock/utils.js +9 -1
- package/dist/providers/bedrock/utils.js.map +1 -1
- package/dist/providers/google-vertex-ai/api.d.ts +1 -0
- package/dist/providers/google-vertex-ai/api.js +6 -4
- package/dist/providers/google-vertex-ai/api.js.map +1 -1
- package/dist/providers/microsoft-foundry/api.js +36 -8
- package/dist/providers/microsoft-foundry/api.js.map +1 -1
- package/dist/services/buildFetchInit.js +6 -1
- package/dist/services/buildFetchInit.js.map +1 -1
- package/dist/services/createProviderRequest.js +126 -21
- package/dist/services/createProviderRequest.js.map +1 -1
- package/dist/services/execute.js +77 -63
- package/dist/services/execute.js.map +1 -1
- package/dist/services/handleProviderResponse.d.ts +0 -8
- package/dist/services/handleProviderResponse.js +226 -41
- package/dist/services/handleProviderResponse.js.map +1 -1
- package/dist/stream/pumpProviderAwsEventStream.js +4 -3
- package/dist/stream/pumpProviderAwsEventStream.js.map +1 -1
- package/dist/stream/pumpProviderSseStream.js +18 -16
- package/dist/stream/pumpProviderSseStream.js.map +1 -1
- package/dist/stream/shouldReadAwsEventStream.js +5 -2
- package/dist/stream/shouldReadAwsEventStream.js.map +1 -1
- package/dist/stream/types.d.ts +5 -1
- package/dist/types/contracts.d.ts +26 -0
- package/dist/types/executionReport.d.ts +3 -1
- package/dist/utils/isStreamingEnabled.d.ts +5 -3
- package/dist/utils/isStreamingEnabled.js +17 -4
- package/dist/utils/isStreamingEnabled.js.map +1 -1
- package/dist/utils/sdkRequestUrl.d.ts +3 -0
- package/dist/utils/sdkRequestUrl.js +3 -0
- package/dist/utils/sdkRequestUrl.js.map +1 -1
- package/dist/utils/sseUtils.d.ts +9 -0
- package/dist/utils/sseUtils.js +65 -0
- package/dist/utils/sseUtils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleProviderResponse.js","sourceRoot":"","sources":["../../src/services/handleProviderResponse.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handleProviderResponse.js","sourceRoot":"","sources":["../../src/services/handleProviderResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,10 +39,9 @@ import { isStreamingTerminatedError } from './resolveStreamEndReason.js';
|
|
|
39
39
|
* `frames` (live `errResponse` vs `chunks` split).
|
|
40
40
|
*/
|
|
41
41
|
export async function* pumpProviderAwsEventStream(options) {
|
|
42
|
-
const { reader, transformFunction, fallbackChunkId, strictOpenAiCompliance, gatewayRequest, yieldRawBytes = false, abortSignal, } = options;
|
|
42
|
+
const { reader, transformFunction, fallbackChunkId, strictOpenAiCompliance, gatewayRequest, yieldRawBytes = false, abortSignal, onStreamEventKey, eventCounts = {}, } = options;
|
|
43
43
|
const streamState = options.forwardPings ? { forwardPings: true } : {};
|
|
44
44
|
const frames = [];
|
|
45
|
-
const eventCounts = {};
|
|
46
45
|
let truncated = false;
|
|
47
46
|
let error;
|
|
48
47
|
const frameGen = readAwsEventFrames({ reader, abortSignal });
|
|
@@ -56,8 +55,10 @@ export async function* pumpProviderAwsEventStream(options) {
|
|
|
56
55
|
const { frame, payload } = iter.value;
|
|
57
56
|
// Count before a transform drop. Live labels the raw frame; the decoded payload has no header.
|
|
58
57
|
const eventKey = classifyAwsStreamEventKey(frame, payload);
|
|
59
|
-
if (eventKey)
|
|
58
|
+
if (eventKey) {
|
|
60
59
|
eventCounts[eventKey] = (eventCounts[eventKey] ?? 0) + 1;
|
|
60
|
+
onStreamEventKey?.(eventKey);
|
|
61
|
+
}
|
|
61
62
|
if (!transformFunction) {
|
|
62
63
|
frames.push(payload);
|
|
63
64
|
yield frame;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pumpProviderAwsEventStream.js","sourceRoot":"","sources":["../../src/stream/pumpProviderAwsEventStream.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAGtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,0BAA0B,CAC/C,OAA0C;IAE1C,MAAM,EACJ,MAAM,EACN,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,aAAa,GAAG,KAAK,EACrB,WAAW,
|
|
1
|
+
{"version":3,"file":"pumpProviderAwsEventStream.js","sourceRoot":"","sources":["../../src/stream/pumpProviderAwsEventStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { isAbortError } from '../utils/abortUtils.js';
|
|
6
6
|
import { ignoreWithLog } from '../utils/ignoreWithLog.js';
|
|
7
|
-
import { stripSseComments } from '../utils/sseUtils.js';
|
|
7
|
+
import { recordStreamEventCount, stripSseComments } from '../utils/sseUtils.js';
|
|
8
8
|
import { readSseFrames } from './readSseFrames.js';
|
|
9
9
|
import { isStreamingTerminatedError } from './resolveStreamEndReason.js';
|
|
10
10
|
const FIRST_CHUNK_SLEEP_MS = 25;
|
|
@@ -24,14 +24,14 @@ function* processFrame(args) {
|
|
|
24
24
|
const { part, appendDelimiter, splitPattern, forwardSseComments, transformFunction, fallbackChunkId, streamState, strictOpenAiCompliance, gatewayRequest, frames, } = args;
|
|
25
25
|
const cleaned = stripSseComments(part);
|
|
26
26
|
const suffix = appendDelimiter ? splitPattern : '';
|
|
27
|
-
if (
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
yield part + suffix;
|
|
32
|
-
}
|
|
33
|
-
return;
|
|
27
|
+
if (cleaned === null) {
|
|
28
|
+
// Same as live readStream: a bare `\r` is the rest of a CRLF delimiter when the split is `\n`, not a comment.
|
|
29
|
+
if (forwardSseComments || part.trim() === '') {
|
|
30
|
+
yield part + suffix;
|
|
34
31
|
}
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
if (transformFunction) {
|
|
35
35
|
const transformed = transformFunction(cleaned, fallbackChunkId, streamState, strictOpenAiCompliance, gatewayRequest);
|
|
36
36
|
if (Array.isArray(transformed)) {
|
|
37
37
|
for (const item of transformed) {
|
|
@@ -43,13 +43,6 @@ function* processFrame(args) {
|
|
|
43
43
|
}
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
if (cleaned === null) {
|
|
47
|
-
// Live yields keepalives to the client but does not chunks.push them.
|
|
48
|
-
if (forwardSseComments) {
|
|
49
|
-
yield part + suffix;
|
|
50
|
-
}
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
46
|
const relayed = (forwardSseComments ? part : cleaned) + suffix;
|
|
54
47
|
yield* emitFrame(frames, relayed);
|
|
55
48
|
}
|
|
@@ -63,7 +56,7 @@ function* processFrame(args) {
|
|
|
63
56
|
* `errResponse` vs `chunks` split).
|
|
64
57
|
*/
|
|
65
58
|
export async function* pumpProviderSseStream(options) {
|
|
66
|
-
const { reader, splitPattern, transformFunction, fallbackChunkId, strictOpenAiCompliance, gatewayRequest, sseCommentMode, isSleepTimeRequired = false, abortSignal, } = options;
|
|
59
|
+
const { reader, splitPattern, transformFunction, fallbackChunkId, strictOpenAiCompliance, gatewayRequest, sseCommentMode, isSleepTimeRequired = false, abortSignal, onStreamEventKey, eventCounts = {}, } = options;
|
|
67
60
|
const forwardSseComments = sseCommentMode === 'forward';
|
|
68
61
|
const streamState = options.forwardPings ? { forwardPings: true } : {};
|
|
69
62
|
const frames = [];
|
|
@@ -84,6 +77,9 @@ export async function* pumpProviderSseStream(options) {
|
|
|
84
77
|
const remainder = iter.value.remainder;
|
|
85
78
|
// Live does not flush leftover buffer on abort; skip incomplete remainder.
|
|
86
79
|
if (!truncated && remainder.length > 0) {
|
|
80
|
+
const key = recordStreamEventCount(eventCounts, remainder);
|
|
81
|
+
if (key)
|
|
82
|
+
onStreamEventKey?.(key);
|
|
87
83
|
yield* processFrame({
|
|
88
84
|
part: remainder,
|
|
89
85
|
appendDelimiter: false,
|
|
@@ -100,6 +96,11 @@ export async function* pumpProviderSseStream(options) {
|
|
|
100
96
|
break;
|
|
101
97
|
}
|
|
102
98
|
const part = iter.value;
|
|
99
|
+
if (part.length > 0) {
|
|
100
|
+
const key = recordStreamEventCount(eventCounts, part);
|
|
101
|
+
if (key)
|
|
102
|
+
onStreamEventKey?.(key);
|
|
103
|
+
}
|
|
103
104
|
if (isFirstChunk) {
|
|
104
105
|
isFirstChunk = false;
|
|
105
106
|
await sleep(FIRST_CHUNK_SLEEP_MS);
|
|
@@ -152,6 +153,7 @@ export async function* pumpProviderSseStream(options) {
|
|
|
152
153
|
return {
|
|
153
154
|
streamState,
|
|
154
155
|
frames,
|
|
156
|
+
eventCounts,
|
|
155
157
|
truncated: truncated || !!abortSignal?.aborted,
|
|
156
158
|
error,
|
|
157
159
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pumpProviderSseStream.js","sourceRoot":"","sources":["../../src/stream/pumpProviderSseStream.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"pumpProviderSseStream.js","sourceRoot":"","sources":["../../src/stream/pumpProviderSseStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* `model.manifest.model_id`). Without it the OpenAI Responses check cannot run
|
|
11
11
|
* and OpenAI Responses would be mis-routed onto the AWS pump.
|
|
12
12
|
*/
|
|
13
|
-
import { isOpenAIModel } from '../providers/bedrock/modelFamily.js';
|
|
13
|
+
import { isKimiK3Model, isOpenAIModel } from '../providers/bedrock/modelFamily.js';
|
|
14
14
|
const BEDROCK_INTEGRATION_TYPE = 'integration/model/bedrock';
|
|
15
15
|
/**
|
|
16
16
|
* True when the provider body should be pumped with
|
|
@@ -20,7 +20,10 @@ export function shouldReadAwsEventStream({ modelManifestType, modelId, requestTy
|
|
|
20
20
|
if (modelManifestType !== BEDROCK_INTEGRATION_TYPE) {
|
|
21
21
|
return false;
|
|
22
22
|
}
|
|
23
|
-
// Live: usesBedrockOpenAIResponsesSse
|
|
23
|
+
// Live: usesBedrockOpenAIResponsesSse. Kimi chat is OpenAI SSE, not Converse eventstream.
|
|
24
|
+
if (requestType === 'chatComplete' && isKimiK3Model(modelId)) {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
24
27
|
if (requestType === 'createModelResponse' && isOpenAIModel(modelId)) {
|
|
25
28
|
return false;
|
|
26
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shouldReadAwsEventStream.js","sourceRoot":"","sources":["../../src/stream/shouldReadAwsEventStream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"shouldReadAwsEventStream.js","sourceRoot":"","sources":["../../src/stream/shouldReadAwsEventStream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEhF,MAAM,wBAAwB,GAAG,2BAA2B,CAAC;AAe7D;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,EACvC,iBAAiB,EACjB,OAAO,EACP,WAAW,GACmB;IAC9B,IAAI,iBAAiB,KAAK,wBAAwB,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,0FAA0F;IAC1F,IAAI,WAAW,KAAK,cAAc,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,WAAW,KAAK,qBAAqB,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QACpE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/stream/types.d.ts
CHANGED
|
@@ -21,6 +21,10 @@ export interface PumpProviderBaseOptions {
|
|
|
21
21
|
strictOpenAiCompliance: boolean;
|
|
22
22
|
gatewayRequest: Params | FormData;
|
|
23
23
|
abortSignal?: AbortSignal;
|
|
24
|
+
/** One classified raw upstream event. Gateway appends it to the debug timeline. */
|
|
25
|
+
onStreamEventKey?: (key: string) => void;
|
|
26
|
+
/** Pump writes counts here. Cancel drops the generator return value, not this object. */
|
|
27
|
+
eventCounts?: Record<string, number>;
|
|
24
28
|
}
|
|
25
29
|
export interface ReadSseFramesOptions {
|
|
26
30
|
reader: ReadableStreamDefaultReader<Uint8Array>;
|
|
@@ -63,7 +67,7 @@ export interface PumpResult {
|
|
|
63
67
|
status?: string | number;
|
|
64
68
|
cause?: unknown;
|
|
65
69
|
};
|
|
66
|
-
/**
|
|
70
|
+
/** Counts of raw upstream frames. Empty when none classified. */
|
|
67
71
|
eventCounts?: Record<string, number>;
|
|
68
72
|
}
|
|
69
73
|
export interface ReadSseFramesResult {
|
|
@@ -52,9 +52,13 @@ export interface SdkRequest {
|
|
|
52
52
|
}
|
|
53
53
|
export interface SdkExecutionConfig {
|
|
54
54
|
forwardPings?: boolean;
|
|
55
|
+
sseCommentMode?: 'forward' | 'strip';
|
|
55
56
|
retry?: RetryConfig;
|
|
56
57
|
requestTimeoutMs?: number;
|
|
57
58
|
ttftTimeoutMs?: number;
|
|
59
|
+
/** Live routing timer (`TTFT_TIMER`). The first-chunk gate clears it; absent means the pump arms its own. */
|
|
60
|
+
ttftTimer?: ReturnType<typeof setTimeout>;
|
|
61
|
+
ttftAbortSignal?: AbortSignal;
|
|
58
62
|
abortSignal?: AbortSignal;
|
|
59
63
|
/**
|
|
60
64
|
* Live sync: `shouldCompleteRequestOnClientCancel` / `COMPLETE_REQUEST_ON_CLIENT_CANCEL`
|
|
@@ -77,6 +81,16 @@ export interface SdkExecutionConfig {
|
|
|
77
81
|
* Context-computed values). Merged last onto ExecutionReport.usage.
|
|
78
82
|
*/
|
|
79
83
|
billedUsage?: BilledUsageOverlay;
|
|
84
|
+
/** One classified raw upstream event. Gateway appends it to the debug timeline. */
|
|
85
|
+
onStreamEventKey?: (key: string) => void;
|
|
86
|
+
/** Pump writes counts here. Cancel drops the generator return value, not this object. */
|
|
87
|
+
streamEventCounts?: Record<string, number>;
|
|
88
|
+
/** Fires when the provider pump starts, matching when live readStream creates its timeline. */
|
|
89
|
+
onStreamPumpStart?: () => void;
|
|
90
|
+
/** Same as live handleProxyPassthroughWithTTFT: first non-empty write. */
|
|
91
|
+
onFirstToken?: (atMs: number) => void;
|
|
92
|
+
/** Same as live handleProxyPassthroughWithTTFT: a written chunk contained `data: [DONE]`. */
|
|
93
|
+
markStreamCompleted?: () => void;
|
|
80
94
|
}
|
|
81
95
|
export interface ProviderCallConfig {
|
|
82
96
|
/**
|
|
@@ -93,6 +107,8 @@ export interface ProviderCallConfig {
|
|
|
93
107
|
* `providerOptions` still names the selected leaf target.
|
|
94
108
|
*/
|
|
95
109
|
rejectNonNativeResponsesThroughAdapter?: boolean;
|
|
110
|
+
/** Live `providerOption.anthropicBetaOverride` from a target `x-tfy-anthropic-beta` header override. */
|
|
111
|
+
anthropicBetaOverride?: string;
|
|
96
112
|
anthropicBetaSuppressed?: boolean;
|
|
97
113
|
forwardHeaders?: string[];
|
|
98
114
|
/**
|
|
@@ -101,6 +117,8 @@ export interface ProviderCallConfig {
|
|
|
101
117
|
*/
|
|
102
118
|
strictOpenAiCompliance?: boolean;
|
|
103
119
|
headersOverride?: HeadersOverride;
|
|
120
|
+
/** Bedrock InvokeModel writes this. The gateway copies it onto the Model span. */
|
|
121
|
+
providerRequestFormat?: string;
|
|
104
122
|
/**
|
|
105
123
|
* Provider-native response id for pinned GET/DELETE /responses paths.
|
|
106
124
|
* Origin pinning stays in the gateway; P7 sets this before execute.
|
|
@@ -114,11 +132,17 @@ export interface ProviderCallConfig {
|
|
|
114
132
|
isGeminiRouter?: boolean;
|
|
115
133
|
/** NEW: live CONTEXT_KEYS.IS_BEDROCK_ROUTER — routes proxy usage to CLONE Bedrock parsers. */
|
|
116
134
|
isBedrockRouter?: boolean;
|
|
135
|
+
/** Live `CONTEXT_KEYS.IS_VERTEX_AI_ROUTER`. Proxy bodies stay unchanged; the model is in the URL. */
|
|
136
|
+
isVertexAiRouter?: boolean;
|
|
117
137
|
/**
|
|
118
138
|
* Live `c.get('passThrough')`. When true, requestHandlers must not rewrite
|
|
119
139
|
* the inbound body (e.g. transcription `model` field).
|
|
120
140
|
*/
|
|
121
141
|
passThrough?: boolean;
|
|
142
|
+
/** Live `CONTEXT_KEYS.DECISION_REQUEST_DIALECT`: the route the caller used. */
|
|
143
|
+
decisionRequestDialect?: 'systemOne' | 'openai';
|
|
144
|
+
/** Set when the request was translated; the response is translated back to it. */
|
|
145
|
+
decisionResponseDialect?: 'systemOne' | 'openai';
|
|
122
146
|
}
|
|
123
147
|
/**
|
|
124
148
|
* Process-level SDK config. Catalog maps match V2 `MODEL_CONFIG` /
|
|
@@ -165,4 +189,6 @@ export interface SdkExecuteResult {
|
|
|
165
189
|
requestUrl?: string;
|
|
166
190
|
/** Body after transformToProviderRequest. Absent for requestHandlers. */
|
|
167
191
|
providerRequestBody?: SdkRequestBody;
|
|
192
|
+
/** Outbound headers after merge. Absent for requestHandlers. */
|
|
193
|
+
providerRequestHeaders?: Record<string, string>;
|
|
168
194
|
}
|
|
@@ -207,6 +207,8 @@ export interface GatewayFailure {
|
|
|
207
207
|
export interface ExecutionReport {
|
|
208
208
|
/** Final HTTP status of the response returned to the caller (last attempt). */
|
|
209
209
|
status: number;
|
|
210
|
+
/** Provider HTTP status before a 200 error body is rewritten. Absent means `status` is that code. */
|
|
211
|
+
providerStatus?: number;
|
|
210
212
|
/**
|
|
211
213
|
* Same-target retry attempts from `retryRequest` (`undefined`/`0` on the
|
|
212
214
|
* first try when no retries fired — same semantics as live `lastAttempt`).
|
|
@@ -239,6 +241,6 @@ export interface ExecutionReport {
|
|
|
239
241
|
providerReportedCostInUsd?: number;
|
|
240
242
|
/** NEW: pump frames (live chunks[]); gateway may assemble Model output later. */
|
|
241
243
|
streamFrames?: string[];
|
|
242
|
-
/**
|
|
244
|
+
/** Counts of raw upstream frames, taken while pumping. */
|
|
243
245
|
streamEventCounts?: Record<string, number>;
|
|
244
246
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Context-free streaming detection for SDK execute (P7.1).
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* Proxy matches live `isStreamingEnabled`: a body with `model` uses `stream` /
|
|
5
|
+
* `stream_format`; otherwise Gemini-router `streamGenerateContent`, or proxy URL
|
|
6
|
+
* suffixes (`streamRawPredict`, `converse-stream`, `invoke-with-response-stream`).
|
|
6
7
|
*/
|
|
7
8
|
import type { Endpoint } from '../providers/types.js';
|
|
8
9
|
import type { SdkRequestBody } from '../types/contracts.js';
|
|
@@ -10,5 +11,6 @@ export interface IsStreamingEnabledInput {
|
|
|
10
11
|
body: SdkRequestBody;
|
|
11
12
|
endpoint: Endpoint;
|
|
12
13
|
path: string;
|
|
14
|
+
isGeminiRouter?: boolean;
|
|
13
15
|
}
|
|
14
|
-
export declare function isStreamingEnabledSdk({ body, endpoint, path }: IsStreamingEnabledInput): boolean;
|
|
16
|
+
export declare function isStreamingEnabledSdk({ body, endpoint, path, isGeminiRouter }: IsStreamingEnabledInput): boolean;
|
|
@@ -1,14 +1,27 @@
|
|
|
1
1
|
const STREAM_PATH_PATTERNS = ['streamGenerateContent', 'converse-stream', 'invoke-with-response-stream'];
|
|
2
|
-
|
|
2
|
+
const PROXY_URL_STREAM_PATTERNS = ['streamRawPredict', 'invoke-with-response-stream', 'converse-stream'];
|
|
3
|
+
const PROXY_ENDPOINTS = new Set(['proxy', 'tts-proxy', 'stt-proxy', 'video-proxy']);
|
|
4
|
+
export function isStreamingEnabledSdk({ body, endpoint, path, isGeminiRouter }) {
|
|
3
5
|
if (endpoint === 'embed')
|
|
4
6
|
return false;
|
|
5
7
|
if (body instanceof ReadableStream || body instanceof FormData)
|
|
6
8
|
return false;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
9
|
+
const params = body && typeof body === 'object' && !ArrayBuffer.isView(body) && !(body instanceof ArrayBuffer)
|
|
10
|
+
? body
|
|
11
|
+
: undefined;
|
|
12
|
+
// Same as live isStreamingEnabled: model uses stream; else the Gemini-router or proxy URL.
|
|
13
|
+
if (PROXY_ENDPOINTS.has(endpoint)) {
|
|
14
|
+
if (params && params.model !== undefined) {
|
|
15
|
+
return Boolean(params.stream) || params.stream_format === 'sse';
|
|
16
|
+
}
|
|
17
|
+
if (isGeminiRouter && path.includes('streamGenerateContent'))
|
|
10
18
|
return true;
|
|
19
|
+
if (endpoint === 'proxy')
|
|
20
|
+
return PROXY_URL_STREAM_PATTERNS.some(pattern => path.includes(pattern));
|
|
21
|
+
return false;
|
|
11
22
|
}
|
|
23
|
+
if (params && (Boolean(params.stream) || params.stream_format === 'sse'))
|
|
24
|
+
return true;
|
|
12
25
|
return STREAM_PATH_PATTERNS.some(pattern => path.includes(pattern));
|
|
13
26
|
}
|
|
14
27
|
//# sourceMappingURL=isStreamingEnabled.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isStreamingEnabled.js","sourceRoot":"","sources":["../../src/utils/isStreamingEnabled.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"isStreamingEnabled.js","sourceRoot":"","sources":["../../src/utils/isStreamingEnabled.ts"],"names":[],"mappings":"AAUA,MAAM,oBAAoB,GAAG,CAAC,uBAAuB,EAAE,iBAAiB,EAAE,6BAA6B,CAAU,CAAC;AAClH,MAAM,yBAAyB,GAAG,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,iBAAiB,CAAU,CAAC;AAClH,MAAM,eAAe,GAAG,IAAI,GAAG,CAAW,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;AAS9F,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAA2B;IACrG,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,IAAI,YAAY,cAAc,IAAI,IAAI,YAAY,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE7E,MAAM,MAAM,GACV,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,YAAY,WAAW,CAAC;QAC7F,CAAC,CAAE,IAAgC;QACnC,CAAC,CAAC,SAAS,CAAC;IAChB,2FAA2F;IAC3F,IAAI,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClC,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,KAAK,KAAK,CAAC;QAClE,CAAC;QACD,IAAI,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1E,IAAI,QAAQ,KAAK,OAAO;YAAE,OAAO,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACnG,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,KAAK,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACtF,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AACtE,CAAC"}
|
|
@@ -2,6 +2,9 @@ import type { SdkRequest } from '../types/contracts.js';
|
|
|
2
2
|
/** Stamped onto errors thrown after the outbound URL exists, so the gateway can still fill the Model span. */
|
|
3
3
|
export declare const EXECUTE_TRACING_URL = "tracingRequestUrl";
|
|
4
4
|
export declare const EXECUTE_TRACING_BODY = "tracingProviderBody";
|
|
5
|
+
export declare const EXECUTE_TRACING_HEADERS = "tracingProviderHeaders";
|
|
6
|
+
/** performance.now() at outbound fetch start. Live tryPost stores this before retryRequest. */
|
|
7
|
+
export declare const EXECUTE_TRACING_FETCH_START = "tracingFetchStartMs";
|
|
5
8
|
/**
|
|
6
9
|
* Reconstruct a URL string from `SdkRequest.path` + `SdkRequest.search` for
|
|
7
10
|
* providers that still split path segments / query the way they did with
|
|
@@ -2,6 +2,9 @@ const REDACTED_QUERY_VALUE = '***REDACTED***';
|
|
|
2
2
|
/** Stamped onto errors thrown after the outbound URL exists, so the gateway can still fill the Model span. */
|
|
3
3
|
export const EXECUTE_TRACING_URL = 'tracingRequestUrl';
|
|
4
4
|
export const EXECUTE_TRACING_BODY = 'tracingProviderBody';
|
|
5
|
+
export const EXECUTE_TRACING_HEADERS = 'tracingProviderHeaders';
|
|
6
|
+
/** performance.now() at outbound fetch start. Live tryPost stores this before retryRequest. */
|
|
7
|
+
export const EXECUTE_TRACING_FETCH_START = 'tracingFetchStartMs';
|
|
5
8
|
/**
|
|
6
9
|
* Reconstruct a URL string from `SdkRequest.path` + `SdkRequest.search` for
|
|
7
10
|
* providers that still split path segments / query the way they did with
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdkRequestUrl.js","sourceRoot":"","sources":["../../src/utils/sdkRequestUrl.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAE9C,8GAA8G;AAC9G,MAAM,CAAC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AACvD,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"sdkRequestUrl.js","sourceRoot":"","sources":["../../src/utils/sdkRequestUrl.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAE9C,8GAA8G;AAC9G,MAAM,CAAC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AACvD,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC;AAC1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,wBAAwB,CAAC;AAChE,+FAA+F;AAC/F,MAAM,CAAC,MAAM,2BAA2B,GAAG,qBAAqB,CAAC;AAEjE;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,OAA4C;IACxE,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,QAAQ,EAAE,CAAC;AACtF,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAW;IACvC,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAC5B,OAAO,CACL,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QACjB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACnB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACpB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;QACtB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CACzB,CAAC;AACJ,CAAC;AAED,sHAAsH;AACtH,MAAM,UAAU,uBAAuB,CAAC,GAAW;IACjD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,QAAQ,GAAG,oBAAoB,CAAC;YACvC,MAAM,CAAC,QAAQ,GAAG,oBAAoB,CAAC;YACvC,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC1C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;YACpD,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,OAAO,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC"}
|
package/dist/utils/sseUtils.d.ts
CHANGED
|
@@ -33,6 +33,15 @@ export declare function getSseDataLines(frame: string): string[];
|
|
|
33
33
|
* 'event: ping' -> null // nothing to read
|
|
34
34
|
*/
|
|
35
35
|
export declare function getSseDataPayload(frame: string): string | null;
|
|
36
|
+
/** The `event:` value from one SSE frame, or null when the frame has no event name. */
|
|
37
|
+
export declare function getSseEventName(frame: string): string | null;
|
|
38
|
+
/**
|
|
39
|
+
* Key used in `tfy.model.stream.event_counts` for one raw upstream frame.
|
|
40
|
+
* Named SSE events use the `event:` value; bare OpenAI `data:` chunks use the delta shape.
|
|
41
|
+
*/
|
|
42
|
+
export declare function classifyStreamEventKey(frame: string): string | null;
|
|
43
|
+
/** Increment the counter for this frame when it has a classifiable key. Returns that key. */
|
|
44
|
+
export declare function recordStreamEventCount(counts: Record<string, number>, frame: string): string | null;
|
|
36
45
|
/**
|
|
37
46
|
* The frame's payload parsed as JSON, or undefined when there is nothing to act on.
|
|
38
47
|
*
|
package/dist/utils/sseUtils.js
CHANGED
|
@@ -91,6 +91,8 @@ export function stripSseComments(frame) {
|
|
|
91
91
|
*/
|
|
92
92
|
/** Length of `data:` itself. The space that usually follows it is optional, so it is trimmed. */
|
|
93
93
|
const DATA_FIELD_PREFIX_LENGTH = 'data:'.length;
|
|
94
|
+
/** Length of `event:` itself. The space that usually follows it is optional, so it is trimmed. */
|
|
95
|
+
const EVENT_FIELD_PREFIX_LENGTH = 'event:'.length;
|
|
94
96
|
/** What `data: [DONE]` leaves behind once the label is removed. Marks the end of a stream. */
|
|
95
97
|
const SSE_DONE_PAYLOAD = '[DONE]';
|
|
96
98
|
/**
|
|
@@ -125,6 +127,69 @@ export function getSseDataPayload(frame) {
|
|
|
125
127
|
const dataLines = getSseDataLines(frame);
|
|
126
128
|
return dataLines.length ? dataLines.join('\n').trim() : null;
|
|
127
129
|
}
|
|
130
|
+
/** The `event:` value from one SSE frame, or null when the frame has no event name. */
|
|
131
|
+
export function getSseEventName(frame) {
|
|
132
|
+
for (const line of frame.split(LINE_TERMINATOR)) {
|
|
133
|
+
if (line.startsWith('event:')) {
|
|
134
|
+
const name = line.slice(EVENT_FIELD_PREFIX_LENGTH).trim();
|
|
135
|
+
return name || null;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
return null;
|
|
139
|
+
}
|
|
140
|
+
/** Classify an OpenAI-shaped chat chunk (no `event:` line) by delta shape. */
|
|
141
|
+
function classifyOpenAiShapedChunk(payload) {
|
|
142
|
+
const choices = payload.choices;
|
|
143
|
+
if (!Array.isArray(choices)) {
|
|
144
|
+
return payload.usage ? 'usage_only' : null;
|
|
145
|
+
}
|
|
146
|
+
if (choices.length === 0) {
|
|
147
|
+
return payload.usage ? 'usage_only' : 'empty';
|
|
148
|
+
}
|
|
149
|
+
const delta = choices[0]?.delta;
|
|
150
|
+
if (!delta || typeof delta !== 'object') {
|
|
151
|
+
return payload.usage ? 'usage_only' : 'empty';
|
|
152
|
+
}
|
|
153
|
+
if (delta.tool_calls)
|
|
154
|
+
return 'tool_calls';
|
|
155
|
+
if (delta.reasoning != null || delta.reasoning_content != null)
|
|
156
|
+
return 'reasoning';
|
|
157
|
+
if ('content' in delta)
|
|
158
|
+
return 'content';
|
|
159
|
+
if (payload.usage)
|
|
160
|
+
return 'usage_only';
|
|
161
|
+
return 'empty';
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Key used in `tfy.model.stream.event_counts` for one raw upstream frame.
|
|
165
|
+
* Named SSE events use the `event:` value; bare OpenAI `data:` chunks use the delta shape.
|
|
166
|
+
*/
|
|
167
|
+
export function classifyStreamEventKey(frame) {
|
|
168
|
+
const eventName = getSseEventName(frame);
|
|
169
|
+
if (eventName)
|
|
170
|
+
return eventName;
|
|
171
|
+
const payloadText = getSseDataPayload(frame);
|
|
172
|
+
if (!payloadText || payloadText === SSE_DONE_PAYLOAD)
|
|
173
|
+
return null;
|
|
174
|
+
let parsed;
|
|
175
|
+
try {
|
|
176
|
+
parsed = JSON.parse(payloadText);
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
return null;
|
|
180
|
+
}
|
|
181
|
+
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
|
|
182
|
+
return null;
|
|
183
|
+
return classifyOpenAiShapedChunk(parsed);
|
|
184
|
+
}
|
|
185
|
+
/** Increment the counter for this frame when it has a classifiable key. Returns that key. */
|
|
186
|
+
export function recordStreamEventCount(counts, frame) {
|
|
187
|
+
const key = classifyStreamEventKey(frame);
|
|
188
|
+
if (!key)
|
|
189
|
+
return null;
|
|
190
|
+
counts[key] = (counts[key] ?? 0) + 1;
|
|
191
|
+
return key;
|
|
192
|
+
}
|
|
128
193
|
/**
|
|
129
194
|
* The frame's payload parsed as JSON, or undefined when there is nothing to act on.
|
|
130
195
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sseUtils.js","sourceRoot":"","sources":["../../src/utils/sseUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,eAAe,GAAG,YAAY,CAAC;AAErC;;;;;;;;GAQG;AACH,MAAM,UAAU,GAAG,cAAc,CAAC;AAElC,oFAAoF;AACpF,MAAM,gBAAgB,GAAG,WAAW,CAAC;AAErC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wFAAwF;IACxF,mFAAmF;IACnF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1C,SAAS;QACX,CAAC;QACD,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AACnC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,iGAAiG;AACjG,MAAM,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;AAEhD,8FAA8F;AAC9F,MAAM,gBAAgB,GAAG,QAAQ,CAAC;AAElC;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;QAChD,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACzC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/D,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAAc,KAAa;IACzD,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;QAC7C,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAM,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"sseUtils.js","sourceRoot":"","sources":["../../src/utils/sseUtils.ts"],"names":[],"mappings":"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"}
|