@modelprofile.com/flexharness-providers 17.0.0 → 18.0.0
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_ts_providers/anthropic/index.js +10 -3
- package/dist_ts_providers/anthropic/plugins.d.ts +3 -3
- package/dist_ts_providers/anthropic/plugins.js +3 -3
- package/dist_ts_providers/anthropic/smartai.terminal.anthropic.d.ts +6 -0
- package/dist_ts_providers/anthropic/smartai.terminal.anthropic.js +19 -0
- package/dist_ts_providers/ollama/plugins.d.ts +1 -0
- package/dist_ts_providers/ollama/plugins.js +2 -2
- package/dist_ts_providers/ollama/smartai.provider.ollama.js +9 -7
- package/dist_ts_providers/openai/index.d.ts +7 -0
- package/dist_ts_providers/openai/index.js +34 -3
- package/dist_ts_providers/openai/plugins.d.ts +3 -3
- package/dist_ts_providers/openai/plugins.js +3 -3
- package/dist_ts_providers/openai/smartai.terminal.openai.d.ts +12 -0
- package/dist_ts_providers/openai/smartai.terminal.openai.js +39 -0
- package/package.json +2 -2
- package/readme.md +12 -0
- package/ts_providers/anthropic/index.ts +12 -2
- package/ts_providers/anthropic/plugins.ts +3 -0
- package/ts_providers/anthropic/smartai.terminal.anthropic.ts +20 -0
- package/ts_providers/ollama/plugins.ts +1 -0
- package/ts_providers/ollama/smartai.provider.ollama.ts +9 -6
- package/ts_providers/openai/index.ts +44 -2
- package/ts_providers/openai/plugins.ts +3 -0
- package/ts_providers/openai/readme.md +7 -0
- package/ts_providers/openai/smartai.terminal.openai.ts +40 -0
- package/ts_providers/readme.md +12 -0
|
@@ -3,6 +3,7 @@ import { classifyAnthropicLimit } from './smartai.limits.anthropic.js';
|
|
|
3
3
|
import { createAnthropicCachingMiddleware } from './smartai.middleware.anthropic.js';
|
|
4
4
|
import { ANTHROPIC_API_BASE_URL } from './smartai.oauth.anthropic.js';
|
|
5
5
|
import { isAnthropicCacheTransparentTransport, readAnthropicEffectiveCachePolicy } from './smartai.cache.anthropic.js';
|
|
6
|
+
import { anthropicMessagesTerminal } from './smartai.terminal.anthropic.js';
|
|
6
7
|
export { ANTHROPIC_API_BASE_URL, ANTHROPIC_API_VERSION, ANTHROPIC_EFFORTS, ANTHROPIC_OAUTH_BETA, AnthropicOAuthAuthError, AnthropicOAuthModelListError, createAnthropicOAuthHeaders, createAnthropicOAuthResolvingConnection, listAnthropicOAuthModels, mergeAnthropicOAuthBeta, } from './smartai.oauth.anthropic.js';
|
|
7
8
|
export { AnthropicApiKeyAuthError, createAnthropicApiKeyConnection, createAnthropicApiKeyHeaders, listAnthropicApiKeyModels, } from './smartai.apikey.anthropic.js';
|
|
8
9
|
export { ANTHROPIC_MODEL_PRICES, ANTHROPIC_SERVER_TOOL_PRICES, getAnthropicModelPrice, getAnthropicRequestPrice, getAnthropicServerToolPrice, readAnthropicMessagesUsage, } from './smartai.pricing.anthropic.js';
|
|
@@ -27,7 +28,9 @@ export const createAnthropicModelProvider = () => ({
|
|
|
27
28
|
});
|
|
28
29
|
return (settings.fetch ?? globalThis.fetch)(input, init);
|
|
29
30
|
};
|
|
30
|
-
|
|
31
|
+
// An answer ends at its terminal event, not at the end of the connection (AGL-1130).
|
|
32
|
+
const answers = plugins.endModelStreamsAtTerminalEvent(anthropicMessagesTerminal, observer ? fetchWithObservation : (input, init) => (settings.fetch ?? globalThis.fetch)(input, init));
|
|
33
|
+
const model = plugins.createAnthropic({ ...settings, fetch: answers.fetch })(options.model);
|
|
31
34
|
const limits = plugins.createModelLimitMiddleware({
|
|
32
35
|
provider: 'anthropic',
|
|
33
36
|
classify: (failure) => connection?.classifyLimit?.(failure) ?? classifyAnthropicLimit(failure),
|
|
@@ -35,7 +38,11 @@ export const createAnthropicModelProvider = () => ({
|
|
|
35
38
|
const middleware = options.promptCaching === false
|
|
36
39
|
? [limits]
|
|
37
40
|
: [limits, createAnthropicCachingMiddleware(typeof options.promptCaching === 'object' ? options.promptCaching : undefined)];
|
|
38
|
-
|
|
41
|
+
// The answers' middleware innermost, next to the model whose fetch it pairs with.
|
|
42
|
+
return plugins.wrapLanguageModel({
|
|
43
|
+
model,
|
|
44
|
+
middleware: [...middleware, ...(connection?.middleware ? [connection.middleware] : []), answers.middleware],
|
|
45
|
+
});
|
|
39
46
|
};
|
|
40
47
|
// Rebuild the owning pipeline with a request-local observer. An outer SDK wrapper
|
|
41
48
|
// does not receive this capability, and simultaneous users never share a callback.
|
|
@@ -43,4 +50,4 @@ export const createAnthropicModelProvider = () => ({
|
|
|
43
50
|
},
|
|
44
51
|
});
|
|
45
52
|
export { classifyAnthropicLimit, createAnthropicCachingMiddleware };
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19wcm92aWRlcnMvYW50aHJvcGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JGLE9BQU8sRUFBRSxzQkFBc0IsRUFBa0MsTUFBTSw4QkFBOEIsQ0FBQztBQUN0RyxPQUFPLEVBQUUsb0NBQW9DLEVBQUUsaUNBQWlDLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN2SCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU1RSxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLHFCQUFxQixFQUNyQixpQkFBaUIsRUFDakIsb0JBQW9CLEVBQ3BCLHVCQUF1QixFQUN2Qiw0QkFBNEIsRUFDNUIsMkJBQTJCLEVBQzNCLHVDQUF1QyxFQUN2Qyx3QkFBd0IsRUFDeEIsdUJBQXVCLEdBWXhCLE1BQU0sOEJBQThCLENBQUM7QUFDdEMsT0FBTyxFQUNMLHdCQUF3QixFQUN4QiwrQkFBK0IsRUFDL0IsNEJBQTRCLEVBQzVCLHlCQUF5QixHQUcxQixNQUFNLCtCQUErQixDQUFDO0FBQ3ZDLE9BQU8sRUFDTCxzQkFBc0IsRUFDdEIsNEJBQTRCLEVBQzVCLHNCQUFzQixFQUN0Qix3QkFBd0IsRUFDeEIsMkJBQTJCLEVBQzNCLDBCQUEwQixHQUUzQixNQUFNLGdDQUFnQyxDQUFDO0FBU3hDLE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLEdBQTRFLEVBQUUsQ0FBQyxDQUFDO0lBQzFILEVBQUUsRUFBRSxXQUFXO0lBQ2YsUUFBUSxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDcEIsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUs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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createAnthropic } from '@ai-sdk/anthropic';
|
|
2
2
|
import { wrapLanguageModel } from 'ai';
|
|
3
|
-
import { createModelLimitMiddleware, createSmartAiCachingMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver } from '@modelprofile.com/flexharness-models';
|
|
4
|
-
export { createAnthropic, createModelLimitMiddleware, createSmartAiCachingMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, wrapLanguageModel, };
|
|
3
|
+
import { createModelLimitMiddleware, createSmartAiCachingMiddleware, endModelStreamsAtTerminalEvent, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver } from '@modelprofile.com/flexharness-models';
|
|
4
|
+
export { createAnthropic, createModelLimitMiddleware, createSmartAiCachingMiddleware, endModelStreamsAtTerminalEvent, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, wrapLanguageModel, };
|
|
5
5
|
export type { AnthropicLanguageModelOptions, AnthropicProviderSettings } from '@ai-sdk/anthropic';
|
|
6
6
|
export type { LanguageModelV4Middleware } from '@ai-sdk/provider';
|
|
7
|
-
export type { IModelCallFailure, IModelPrice, IModelPricedUsage, IModelServicePrice, IModelSource, IModelTokenRates, IModelProvider, ISmartAiCacheOptions, ISmartAiEffectiveCachePolicy, TSmartAiCachePolicyObserver, ISmartAiOptions, LanguageModelV4, TModelLimitClassifier, } from '@modelprofile.com/flexharness-models';
|
|
7
|
+
export type { IModelCallFailure, IModelPrice, IModelPricedUsage, IModelServicePrice, IModelSource, IModelTokenRates, IModelProvider, ISmartAiCacheOptions, ISmartAiEffectiveCachePolicy, IModelStreamTerminal, TSmartAiCachePolicyObserver, ISmartAiOptions, LanguageModelV4, TModelLimitClassifier, } from '@modelprofile.com/flexharness-models';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createAnthropic } from '@ai-sdk/anthropic';
|
|
2
2
|
import { wrapLanguageModel } from 'ai';
|
|
3
|
-
import { createModelLimitMiddleware, createSmartAiCachingMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, } from '@modelprofile.com/flexharness-models';
|
|
4
|
-
export { createAnthropic, createModelLimitMiddleware, createSmartAiCachingMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, wrapLanguageModel, };
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
import { createModelLimitMiddleware, createSmartAiCachingMiddleware, endModelStreamsAtTerminalEvent, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, } from '@modelprofile.com/flexharness-models';
|
|
4
|
+
export { createAnthropic, createModelLimitMiddleware, createSmartAiCachingMiddleware, endModelStreamsAtTerminalEvent, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, wrapLanguageModel, };
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX3Byb3ZpZGVycy9hbnRocm9waWMvcGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3ZDLE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIsOEJBQThCLEVBQzlCLDhCQUE4QixFQUM5QixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLG1CQUFtQixFQUNuQixrQ0FBa0MsR0FDbkMsTUFBTSxzQ0FBc0MsQ0FBQztBQUM5QyxPQUFPLEVBQ0wsZUFBZSxFQUNmLDBCQUEwQixFQUMxQiw4QkFBOEIsRUFDOUIsOEJBQThCLEVBQzlCLGdCQUFnQixFQUNoQixjQUFjLEVBQ2QsbUJBQW1CLEVBQ25CLGtDQUFrQyxFQUNsQyxpQkFBaUIsR0FDbEIsQ0FBQyJ9
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type * as plugins from './plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* Where a Messages stream ends: `message_stop` ends the answer, and an `error` event, which
|
|
4
|
+
* Anthropic sends in place of the rest of a failed answer, ends it too (AGL-1130).
|
|
5
|
+
*/
|
|
6
|
+
export declare const anthropicMessagesTerminal: plugins.IModelStreamTerminal;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/** An event's `type`, from its data. */
|
|
2
|
+
const eventType = (data) => {
|
|
3
|
+
try {
|
|
4
|
+
return JSON.parse(data)?.type;
|
|
5
|
+
}
|
|
6
|
+
catch {
|
|
7
|
+
return undefined;
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
/**
|
|
11
|
+
* Where a Messages stream ends: `message_stop` ends the answer, and an `error` event, which
|
|
12
|
+
* Anthropic sends in place of the rest of a failed answer, ends it too (AGL-1130).
|
|
13
|
+
*/
|
|
14
|
+
export const anthropicMessagesTerminal = {
|
|
15
|
+
event: 'message_stop',
|
|
16
|
+
ends: (data) => (data.includes('"message_stop"') || data.includes('"error"'))
|
|
17
|
+
&& ['message_stop', 'error'].includes(eventType(data)),
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhaS50ZXJtaW5hbC5hbnRocm9waWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19wcm92aWRlcnMvYW50aHJvcGljL3NtYXJ0YWkudGVybWluYWwuYW50aHJvcGljLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLHdDQUF3QztBQUN4QyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBVyxFQUFFO0lBQzFDLElBQUksQ0FBQztRQUNILE9BQVEsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQStCLEVBQUUsSUFBSSxDQUFDO0lBQy9ELENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUY7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQWlDO0lBQ3JFLEtBQUssRUFBRSxjQUFjO0lBQ3JCLElBQUksRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztXQUN4RSxDQUFDLGNBQWMsRUFBRSxPQUFPLENBQUMsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBVyxDQUFDO0NBQ25FLENBQUMifQ==
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export type { LanguageModelV3, LanguageModelV3CallOptions, LanguageModelV3Content, LanguageModelV3FinishReason, LanguageModelV3GenerateResult, LanguageModelV3Prompt, LanguageModelV3StreamPart, LanguageModelV3StreamResult, LanguageModelV3Usage, } from '@ai-sdk/provider';
|
|
2
2
|
export type { IModelProvider, ISmartAiOptions } from '@modelprofile.com/flexharness-models';
|
|
3
|
+
export { ModelStreamIncompleteError } from '@modelprofile.com/flexharness-models';
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
export { ModelStreamIncompleteError } from '@modelprofile.com/flexharness-models';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX3Byb3ZpZGVycy9vbGxhbWEvcGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFZQSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQyJ9
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ModelStreamIncompleteError } from './plugins.js';
|
|
1
2
|
/**
|
|
2
3
|
* Convert AI SDK V3 prompt messages to Ollama's message format.
|
|
3
4
|
*/
|
|
@@ -336,11 +337,9 @@ export function createOllamaModel(options) {
|
|
|
336
337
|
if (buffer.trim())
|
|
337
338
|
processLine(buffer);
|
|
338
339
|
if (!closed) {
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
usage: makeUsage(undefined, undefined),
|
|
343
|
-
});
|
|
340
|
+
// The answer ends with its `done` object, not with the connection (AGL-1130): a
|
|
341
|
+
// stream without it fails, after the parts it carried.
|
|
342
|
+
controller.enqueue({ type: 'error', error: new ModelStreamIncompleteError('done') });
|
|
344
343
|
closed = true;
|
|
345
344
|
controller.close();
|
|
346
345
|
}
|
|
@@ -351,8 +350,11 @@ export function createOllamaModel(options) {
|
|
|
351
350
|
buffer = lines.pop() || '';
|
|
352
351
|
for (const line of lines) {
|
|
353
352
|
processLine(line);
|
|
354
|
-
if (closed)
|
|
353
|
+
if (closed) {
|
|
354
|
+
// Nothing after the `done` object is read: a connection kept open is let go now.
|
|
355
|
+
await reader.cancel().catch(() => undefined);
|
|
355
356
|
return;
|
|
357
|
+
}
|
|
356
358
|
}
|
|
357
359
|
}
|
|
358
360
|
}
|
|
@@ -375,4 +377,4 @@ export function createOllamaModel(options) {
|
|
|
375
377
|
};
|
|
376
378
|
return model;
|
|
377
379
|
}
|
|
378
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartai.provider.ollama.js","sourceRoot":"","sources":["../../ts_providers/ollama/smartai.provider.ollama.ts"],"names":[],"mappings":"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"}
|
|
380
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartai.provider.ollama.js","sourceRoot":"","sources":["../../ts_providers/ollama/smartai.provider.ollama.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,5 +36,12 @@ export interface IOpenAiModelOptions extends plugins.ISmartAiOptions {
|
|
|
36
36
|
connection?: IOpenAiModelConnection;
|
|
37
37
|
/** The API the model calls. Defaults to `responses`. */
|
|
38
38
|
api?: TOpenAiApi;
|
|
39
|
+
/**
|
|
40
|
+
* With `api: 'chat'`: whether the server takes OpenAI's fields of response storage and the prompt
|
|
41
|
+
* cache, `store`, `prompt_cache_key`, `prompt_cache_retention` and `prompt_cache_options`. OpenAI's
|
|
42
|
+
* own API always gets them; another server gets them only with `true`, since an OpenAI-compatible
|
|
43
|
+
* server may refuse a field it does not know.
|
|
44
|
+
*/
|
|
45
|
+
openAiFields?: boolean;
|
|
39
46
|
}
|
|
40
47
|
export declare const createOpenAiModelProvider: () => plugins.IModelProvider<IOpenAiModelOptions, plugins.LanguageModelV4>;
|
|
@@ -2,6 +2,7 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { isOpenAiCacheTransparentTransport, readOpenAiEffectiveCachePolicy } from './smartai.cache.openai.js';
|
|
3
3
|
import { classifyOpenAiLimit } from './smartai.limits.openai.js';
|
|
4
4
|
import { OPENAI_API_BASE_URL } from './smartai.apikey.openai.js';
|
|
5
|
+
import { openAiChatTerminal, openAiResponsesTerminal } from './smartai.terminal.openai.js';
|
|
5
6
|
export { classifyOpenAiLimit, readOpenAiError } from './smartai.limits.openai.js';
|
|
6
7
|
export { classifyOpenAiChatGptLimit } from './smartai.chatgpt.limits.js';
|
|
7
8
|
export { createOpenAiChatGptInstructionsMiddleware, normalizeOpenAiChatGptResponsesRequest } from './smartai.chatgpt.middleware.js';
|
|
@@ -10,6 +11,29 @@ export { createOpenAiChatGptAccessHeaders, createOpenAiChatGptAccessModelConnect
|
|
|
10
11
|
export { listOpenAiChatGptModels, OPENAI_CHATGPT_CATALOG_CLIENT_VERSION, OpenAiChatGptModelListError, } from './smartai.chatgpt.catalog.js';
|
|
11
12
|
export { createOpenAiApiKeyConnection, createOpenAiApiKeyHeaders, isOpenAiApiRequestUrl, listOpenAiApiKeyModels, OPENAI_API_BASE_URL, OpenAiApiKeyAuthError, OpenAiApiModelListError, } from './smartai.apikey.openai.js';
|
|
12
13
|
export { getOpenAiApiModel, getOpenAiModelPrice, OPENAI_API_MODELS, OPENAI_MODEL_PRICES, readOpenAiResponsesUsage, } from './smartai.models.openai.js';
|
|
14
|
+
/** The provider options behind those fields, as the AI SDK's chat model reads them. */
|
|
15
|
+
const openAiChatFields = ['store', 'promptCacheKey', 'promptCacheRetention', 'promptCacheOptions'];
|
|
16
|
+
/**
|
|
17
|
+
* Whether a base URL is OpenAI's own API: `api.openai.com`, or a data residency host such as
|
|
18
|
+
* `eu.api.openai.com`. A relative base URL, which a browser resolves against its page, is not.
|
|
19
|
+
*/
|
|
20
|
+
const isOpenAiApiBaseUrl = (baseUrl) => {
|
|
21
|
+
const url = URL.canParse(baseUrl) ? new URL(baseUrl) : undefined;
|
|
22
|
+
return url?.protocol === 'https:' && (url.hostname === 'api.openai.com' || url.hostname.endsWith('.api.openai.com'));
|
|
23
|
+
};
|
|
24
|
+
/** Leaves OpenAI's own fields out of a Chat Completions call to another server, whoever set them. */
|
|
25
|
+
const withoutOpenAiChatFields = {
|
|
26
|
+
specificationVersion: 'v4',
|
|
27
|
+
transformParams: async ({ params }) => {
|
|
28
|
+
const openAiOptions = params.providerOptions?.openai;
|
|
29
|
+
if (!openAiOptions || !openAiChatFields.some((field) => field in openAiOptions))
|
|
30
|
+
return params;
|
|
31
|
+
const kept = { ...openAiOptions };
|
|
32
|
+
for (const field of openAiChatFields)
|
|
33
|
+
delete kept[field];
|
|
34
|
+
return { ...params, providerOptions: { ...params.providerOptions, openai: kept } };
|
|
35
|
+
},
|
|
36
|
+
};
|
|
13
37
|
export const createOpenAiModelProvider = () => ({
|
|
14
38
|
id: 'openai',
|
|
15
39
|
getModel: (options) => {
|
|
@@ -37,7 +61,9 @@ export const createOpenAiModelProvider = () => ({
|
|
|
37
61
|
});
|
|
38
62
|
return (settings.fetch ?? globalThis.fetch)(input, init);
|
|
39
63
|
};
|
|
40
|
-
|
|
64
|
+
// An answer ends at its terminal event, not at the end of the connection (AGL-1130).
|
|
65
|
+
const answers = plugins.endModelStreamsAtTerminalEvent(api === 'chat' ? openAiChatTerminal : openAiResponsesTerminal, observer ? fetchWithObservation : (input, init) => (settings.fetch ?? globalThis.fetch)(input, init));
|
|
66
|
+
const openai = plugins.createOpenAI({ ...settings, fetch: answers.fetch });
|
|
41
67
|
const model = api === 'chat' ? openai.chat(options.model) : openai(options.model);
|
|
42
68
|
const limits = plugins.createModelLimitMiddleware({
|
|
43
69
|
provider: 'openai',
|
|
@@ -45,13 +71,18 @@ export const createOpenAiModelProvider = () => ({
|
|
|
45
71
|
});
|
|
46
72
|
// OpenAI reads only images and PDFs as files, on either API; a text file goes as text
|
|
47
73
|
const textFiles = plugins.createTextFilePartMiddleware();
|
|
74
|
+
// Before the connection's own middleware: a field the connection adds is the connection's to send
|
|
75
|
+
const ownFields = api === 'chat' && options.openAiFields !== true && !isOpenAiApiBaseUrl(settings.baseURL)
|
|
76
|
+
? [withoutOpenAiChatFields]
|
|
77
|
+
: [];
|
|
78
|
+
// The answers' middleware innermost, next to the model whose fetch it pairs with.
|
|
48
79
|
return plugins.wrapLanguageModel({
|
|
49
80
|
model,
|
|
50
|
-
middleware:
|
|
81
|
+
middleware: [limits, textFiles, ...ownFields, ...(connection?.middleware ? [connection.middleware] : []), answers.middleware],
|
|
51
82
|
});
|
|
52
83
|
};
|
|
53
84
|
// Rebuild the owning pipeline with a request-local observer, as the Anthropic provider does.
|
|
54
85
|
return plugins.registerSmartAiCachePolicyObserver(createModel(), createModel);
|
|
55
86
|
},
|
|
56
87
|
});
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19wcm92aWRlcnMvb3BlbmFpL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSw4QkFBOEIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlHLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxlQUFlLEVBQTRCLE1BQU0sNEJBQTRCLENBQUM7QUFDNUcsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDekUsT0FBTyxFQUFFLHlDQUF5QyxFQUFFLHNDQUFzQyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDcEksT0FBTyxFQUFFLHlCQUF5QixFQUFvQyxNQUFNLCtCQUErQixDQUFDO0FBQzVHLE9BQU8sRUFDTCxnQ0FBZ0MsRUFDaEMsd0NBQXdDLEVBQ3hDLDJDQUEyQyxFQUMzQyw2QkFBNkIsRUFDN0IsaUNBQWlDLEVBQ2pDLHNCQUFzQixHQVN2QixNQUFNLDZCQUE2QixDQUFDO0FBQ3JDLE9BQU8sRUFDTCx1QkFBdUIsRUFDdkIscUNBQXFDLEVBQ3JDLDJCQUEyQixHQU81QixNQUFNLDhCQUE4QixDQUFDO0FBQ3RDLE9BQU8sRUFDTCw0QkFBNEIsRUFDNUIseUJBQXlCLEVBQ3pCLHFCQUFxQixFQUNyQixzQkFBc0IsRUFDdEIsbUJBQW1CLEVBQ25CLHFCQUFxQixFQUNyQix1QkFBdUIsR0FLeEIsTUFBTSw0QkFBNEIsQ0FBQztBQUNwQyxPQUFPLEVBQ0wsaUJBQWlCLEVBQ2pCLG1C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
|
|
@@ -4,6 +4,6 @@ export { createOpenAI, openai, wrapLanguageModel };
|
|
|
4
4
|
export type { Tool } from 'ai';
|
|
5
5
|
export type { OpenAIChatLanguageModelOptions as OpenAIChatProviderOptions, OpenAIProviderSettings, OpenAIResponsesProviderOptions, } from '@ai-sdk/openai';
|
|
6
6
|
export type { LanguageModelV4CallOptions, LanguageModelV4Middleware } from '@ai-sdk/provider';
|
|
7
|
-
import { createModelLimitMiddleware, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver } from '@modelprofile.com/flexharness-models';
|
|
8
|
-
export { createModelLimitMiddleware, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, };
|
|
9
|
-
export type { IModelCallFailure, IModelPrice, IModelPricedUsage, IModelServicePrice, IModelSource, IModelTokenRates, IModelProvider, ISmartAiOpenAiEffectiveCachePolicy, ISmartAiOptions, JSONObject, LanguageModelV4, TModelLimitClassifier, TSmartAiCachePolicyObserver, } from '@modelprofile.com/flexharness-models';
|
|
7
|
+
import { createModelLimitMiddleware, endModelStreamsAtTerminalEvent, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver } from '@modelprofile.com/flexharness-models';
|
|
8
|
+
export { createModelLimitMiddleware, endModelStreamsAtTerminalEvent, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, };
|
|
9
|
+
export type { IModelCallFailure, IModelPrice, IModelPricedUsage, IModelServicePrice, IModelSource, IModelTokenRates, IModelProvider, IModelStreamTerminal, ISmartAiOpenAiEffectiveCachePolicy, ISmartAiOptions, JSONObject, LanguageModelV4, TModelLimitClassifier, TSmartAiCachePolicyObserver, } from '@modelprofile.com/flexharness-models';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createOpenAI, openai } from '@ai-sdk/openai';
|
|
2
2
|
import { wrapLanguageModel } from 'ai';
|
|
3
3
|
export { createOpenAI, openai, wrapLanguageModel };
|
|
4
|
-
import { createModelLimitMiddleware, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, } from '@modelprofile.com/flexharness-models';
|
|
5
|
-
export { createModelLimitMiddleware, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, };
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
import { createModelLimitMiddleware, endModelStreamsAtTerminalEvent, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, } from '@modelprofile.com/flexharness-models';
|
|
5
|
+
export { createModelLimitMiddleware, endModelStreamsAtTerminalEvent, createTextFilePartMiddleware, readEpochSeconds, readJsonRecord, ModelUsageReadError, registerSmartAiCachePolicyObserver, };
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX3Byb3ZpZGVycy9vcGVuYWkvcGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLElBQUksQ0FBQztBQUN2QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxpQkFBaUIsRUFBRSxDQUFDO0FBUW5ELE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIsOEJBQThCLEVBQzlCLDRCQUE0QixFQUM1QixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLG1CQUFtQixFQUNuQixrQ0FBa0MsR0FDbkMsTUFBTSxzQ0FBc0MsQ0FBQztBQUM5QyxPQUFPLEVBQ0wsMEJBQTBCLEVBQzFCLDhCQUE4QixFQUM5Qiw0QkFBNEIsRUFDNUIsZ0JBQWdCLEVBQ2hCLGNBQWMsRUFDZCxtQkFBbUIsRUFDbkIsa0NBQWtDLEdBQ25DLENBQUMifQ==
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type * as plugins from './plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* Where a Responses stream ends: `response.completed` or `response.incomplete` ends the answer,
|
|
4
|
+
* `response.failed` and an `error` event end a failed one (AGL-1130).
|
|
5
|
+
*/
|
|
6
|
+
export declare const openAiResponsesTerminal: plugins.IModelStreamTerminal;
|
|
7
|
+
/**
|
|
8
|
+
* Where a Chat Completions stream ends: `[DONE]` ends the answer, and an error chunk, which a
|
|
9
|
+
* server sends in place of the rest of a failed answer and without `[DONE]`, ends it too: a chunk
|
|
10
|
+
* with an `error` object and no `choices`, as the AI SDK reads one (AGL-1130).
|
|
11
|
+
*/
|
|
12
|
+
export declare const openAiChatTerminal: plugins.IModelStreamTerminal;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/** An event's data as a JSON object, or `undefined`. */
|
|
2
|
+
const eventRecord = (data) => {
|
|
3
|
+
try {
|
|
4
|
+
const value = JSON.parse(data);
|
|
5
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : undefined;
|
|
6
|
+
}
|
|
7
|
+
catch {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
/** The Responses events that end a stream: a finished answer, a failed one, and an error event. */
|
|
12
|
+
const responsesTerminalTypes = new Set(['response.completed', 'response.incomplete', 'response.failed', 'error']);
|
|
13
|
+
/**
|
|
14
|
+
* Where a Responses stream ends: `response.completed` or `response.incomplete` ends the answer,
|
|
15
|
+
* `response.failed` and an `error` event end a failed one (AGL-1130).
|
|
16
|
+
*/
|
|
17
|
+
export const openAiResponsesTerminal = {
|
|
18
|
+
event: 'response.completed',
|
|
19
|
+
ends: (data) => (data.includes('"response.completed"') || data.includes('"response.incomplete"')
|
|
20
|
+
|| data.includes('"response.failed"') || data.includes('"error"'))
|
|
21
|
+
&& responsesTerminalTypes.has(eventRecord(data)?.type),
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
* Where a Chat Completions stream ends: `[DONE]` ends the answer, and an error chunk, which a
|
|
25
|
+
* server sends in place of the rest of a failed answer and without `[DONE]`, ends it too: a chunk
|
|
26
|
+
* with an `error` object and no `choices`, as the AI SDK reads one (AGL-1130).
|
|
27
|
+
*/
|
|
28
|
+
export const openAiChatTerminal = {
|
|
29
|
+
event: '[DONE]',
|
|
30
|
+
ends: (data) => {
|
|
31
|
+
if (data === '[DONE]')
|
|
32
|
+
return true;
|
|
33
|
+
if (!data.includes('"error"'))
|
|
34
|
+
return false;
|
|
35
|
+
const chunk = eventRecord(data);
|
|
36
|
+
return typeof chunk?.error === 'object' && chunk.error !== null && !Array.isArray(chunk.choices);
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhaS50ZXJtaW5hbC5vcGVuYWkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19wcm92aWRlcnMvb3BlbmFpL3NtYXJ0YWkudGVybWluYWwub3BlbmFpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLHdEQUF3RDtBQUN4RCxNQUFNLFdBQVcsR0FBRyxDQUFDLElBQVksRUFBdUMsRUFBRTtJQUN4RSxJQUFJLENBQUM7UUFDSCxNQUFNLEtBQUssR0FBWSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hDLE9BQU8sT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssS0FBSyxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFnQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDN0gsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7QUFDSCxDQUFDLENBQUM7QUFFRixtR0FBbUc7QUFDbkcsTUFBTSxzQkFBc0IsR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7QUFFbEg7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQWlDO0lBQ25FLEtBQUssRUFBRSxvQkFBb0I7SUFDM0IsSUFBSSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsc0JBQXNCLENBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLHVCQUF1QixDQUFDO1dBQzNGLElBQUksQ0FBQyxRQUFRLENBQUMsbUJBQW1CLENBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1dBQy9ELHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBYyxDQUFDO0NBQ25FLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQWlDO0lBQzlELEtBQUssRUFBRSxRQUFRO0lBQ2YsSUFBSSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDYixJQUFJLElBQUksS0FBSyxRQUFRO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDbkMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDO1lBQUUsT0FBTyxLQUFLLENBQUM7UUFDNUMsTUFBTSxLQUFLLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hDLE9BQU8sT0FBTyxLQUFLLEVBQUUsS0FBSyxLQUFLLFFBQVEsSUFBSSxLQUFLLENBQUMsS0FBSyxLQUFLLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ25HLENBQUM7Q0FDRixDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness-providers",
|
|
5
|
-
"version": "
|
|
5
|
+
"version": "18.0.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Model providers, authentication, account management, media and research integrations in one package.",
|
|
8
8
|
"main": "./dist_ts_providers/index.js",
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"@ai-sdk/provider": "^4.0.17",
|
|
84
84
|
"@ai-sdk/xai": "^5.0.5",
|
|
85
85
|
"@anthropic-ai/sdk": "0.128.0",
|
|
86
|
-
"@modelprofile.com/flexharness-models": "
|
|
86
|
+
"@modelprofile.com/flexharness-models": "18.0.0",
|
|
87
87
|
"ai": "^7.0.111",
|
|
88
88
|
"openai": "^7.22.0",
|
|
89
89
|
"proper-lockfile": "^4.1.2"
|
package/readme.md
CHANGED
|
@@ -39,6 +39,18 @@ takes one, brings its own address instead. `/research` and the OpenAI audio and
|
|
|
39
39
|
helpers of `/media` always call the vendor's API. None of them takes an address from the
|
|
40
40
|
environment: a set `ANTHROPIC_BASE_URL` or `OPENAI_BASE_URL` changes nothing.
|
|
41
41
|
|
|
42
|
+
A streamed answer ends at its stream's terminal event, not at the end of the connection
|
|
43
|
+
(AGL-1130). `/anthropic` ends it at `message_stop` and `/openai` at the Responses API's
|
|
44
|
+
`response.completed` or `response.incomplete` or Chat Completions' `data: [DONE]`; each ends a
|
|
45
|
+
failed answer at its dialect's failure frame (Anthropic's `error` event, Responses'
|
|
46
|
+
`response.failed` or `error` event, a Chat Completions error chunk). Nothing after the terminal
|
|
47
|
+
event is read: a connection that breaks or a proxy that keeps it open afterwards changes nothing.
|
|
48
|
+
A stream that ends before it fails the call, after what it streamed, with `ModelStreamIncompleteError`
|
|
49
|
+
from `flexharness-models`, so an OpenAI-compatible server that never sends `[DONE]` fails every
|
|
50
|
+
streamed call. `/ollama` ends an answer at its `done` object the same way. `/google`, `/groq`,
|
|
51
|
+
`/mistral`, `/xai` and `/perplexity` leave the stream to their AI SDK models, which read it to the
|
|
52
|
+
end of the connection.
|
|
53
|
+
|
|
42
54
|
Explicit settings win completely. A model adapter given no key takes the vendor's key
|
|
43
55
|
variable, such as `ANTHROPIC_API_KEY` or `OPENAI_API_KEY`, and nothing else from the
|
|
44
56
|
environment. A model adapter given a key, a `baseUrl` or a `connection` uses it as given: no
|
|
@@ -3,6 +3,7 @@ import { classifyAnthropicLimit } from './smartai.limits.anthropic.js';
|
|
|
3
3
|
import { createAnthropicCachingMiddleware } from './smartai.middleware.anthropic.js';
|
|
4
4
|
import { ANTHROPIC_API_BASE_URL, type IAnthropicModelConnection } from './smartai.oauth.anthropic.js';
|
|
5
5
|
import { isAnthropicCacheTransparentTransport, readAnthropicEffectiveCachePolicy } from './smartai.cache.anthropic.js';
|
|
6
|
+
import { anthropicMessagesTerminal } from './smartai.terminal.anthropic.js';
|
|
6
7
|
|
|
7
8
|
export {
|
|
8
9
|
ANTHROPIC_API_BASE_URL,
|
|
@@ -73,7 +74,12 @@ export const createAnthropicModelProvider = (): plugins.IModelProvider<IAnthropi
|
|
|
73
74
|
});
|
|
74
75
|
return (settings.fetch ?? globalThis.fetch)(input, init);
|
|
75
76
|
};
|
|
76
|
-
|
|
77
|
+
// An answer ends at its terminal event, not at the end of the connection (AGL-1130).
|
|
78
|
+
const answers = plugins.endModelStreamsAtTerminalEvent(
|
|
79
|
+
anthropicMessagesTerminal,
|
|
80
|
+
observer ? fetchWithObservation : (input, init) => (settings.fetch ?? globalThis.fetch)(input, init),
|
|
81
|
+
);
|
|
82
|
+
const model = plugins.createAnthropic({ ...settings, fetch: answers.fetch })(options.model);
|
|
77
83
|
const limits = plugins.createModelLimitMiddleware({
|
|
78
84
|
provider: 'anthropic',
|
|
79
85
|
classify: (failure) => connection?.classifyLimit?.(failure) ?? classifyAnthropicLimit(failure),
|
|
@@ -83,7 +89,11 @@ export const createAnthropicModelProvider = (): plugins.IModelProvider<IAnthropi
|
|
|
83
89
|
: [limits, createAnthropicCachingMiddleware(
|
|
84
90
|
typeof options.promptCaching === 'object' ? options.promptCaching : undefined,
|
|
85
91
|
)];
|
|
86
|
-
|
|
92
|
+
// The answers' middleware innermost, next to the model whose fetch it pairs with.
|
|
93
|
+
return plugins.wrapLanguageModel({
|
|
94
|
+
model,
|
|
95
|
+
middleware: [...middleware, ...(connection?.middleware ? [connection.middleware] : []), answers.middleware],
|
|
96
|
+
});
|
|
87
97
|
};
|
|
88
98
|
// Rebuild the owning pipeline with a request-local observer. An outer SDK wrapper
|
|
89
99
|
// does not receive this capability, and simultaneous users never share a callback.
|
|
@@ -3,6 +3,7 @@ import { wrapLanguageModel } from 'ai';
|
|
|
3
3
|
import {
|
|
4
4
|
createModelLimitMiddleware,
|
|
5
5
|
createSmartAiCachingMiddleware,
|
|
6
|
+
endModelStreamsAtTerminalEvent,
|
|
6
7
|
readEpochSeconds,
|
|
7
8
|
readJsonRecord,
|
|
8
9
|
ModelUsageReadError,
|
|
@@ -12,6 +13,7 @@ export {
|
|
|
12
13
|
createAnthropic,
|
|
13
14
|
createModelLimitMiddleware,
|
|
14
15
|
createSmartAiCachingMiddleware,
|
|
16
|
+
endModelStreamsAtTerminalEvent,
|
|
15
17
|
readEpochSeconds,
|
|
16
18
|
readJsonRecord,
|
|
17
19
|
ModelUsageReadError,
|
|
@@ -30,6 +32,7 @@ export type {
|
|
|
30
32
|
IModelProvider,
|
|
31
33
|
ISmartAiCacheOptions,
|
|
32
34
|
ISmartAiEffectiveCachePolicy,
|
|
35
|
+
IModelStreamTerminal,
|
|
33
36
|
TSmartAiCachePolicyObserver,
|
|
34
37
|
ISmartAiOptions,
|
|
35
38
|
LanguageModelV4,
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type * as plugins from './plugins.js';
|
|
2
|
+
|
|
3
|
+
/** An event's `type`, from its data. */
|
|
4
|
+
const eventType = (data: string): unknown => {
|
|
5
|
+
try {
|
|
6
|
+
return (JSON.parse(data) as { type?: unknown } | null)?.type;
|
|
7
|
+
} catch {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Where a Messages stream ends: `message_stop` ends the answer, and an `error` event, which
|
|
14
|
+
* Anthropic sends in place of the rest of a failed answer, ends it too (AGL-1130).
|
|
15
|
+
*/
|
|
16
|
+
export const anthropicMessagesTerminal: plugins.IModelStreamTerminal = {
|
|
17
|
+
event: 'message_stop',
|
|
18
|
+
ends: (data) => (data.includes('"message_stop"') || data.includes('"error"'))
|
|
19
|
+
&& ['message_stop', 'error'].includes(eventType(data) as string),
|
|
20
|
+
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type * as plugins from './plugins.js';
|
|
2
|
+
import { ModelStreamIncompleteError } from './plugins.js';
|
|
2
3
|
import type { IOllamaModelRequest, IOllamaModelOptions } from './interfaces.js';
|
|
3
4
|
|
|
4
5
|
interface IOllamaMessage {
|
|
@@ -375,11 +376,9 @@ export function createOllamaModel(options: IOllamaModelRequest): plugins.Languag
|
|
|
375
376
|
if (done) {
|
|
376
377
|
if (buffer.trim()) processLine(buffer);
|
|
377
378
|
if (!closed) {
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
usage: makeUsage(undefined, undefined),
|
|
382
|
-
});
|
|
379
|
+
// The answer ends with its `done` object, not with the connection (AGL-1130): a
|
|
380
|
+
// stream without it fails, after the parts it carried.
|
|
381
|
+
controller.enqueue({ type: 'error', error: new ModelStreamIncompleteError('done') });
|
|
383
382
|
closed = true;
|
|
384
383
|
controller.close();
|
|
385
384
|
}
|
|
@@ -391,7 +390,11 @@ export function createOllamaModel(options: IOllamaModelRequest): plugins.Languag
|
|
|
391
390
|
buffer = lines.pop() || '';
|
|
392
391
|
for (const line of lines) {
|
|
393
392
|
processLine(line);
|
|
394
|
-
if (closed)
|
|
393
|
+
if (closed) {
|
|
394
|
+
// Nothing after the `done` object is read: a connection kept open is let go now.
|
|
395
|
+
await reader.cancel().catch(() => undefined);
|
|
396
|
+
return;
|
|
397
|
+
}
|
|
395
398
|
}
|
|
396
399
|
}
|
|
397
400
|
} catch (error) {
|
|
@@ -2,6 +2,7 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { isOpenAiCacheTransparentTransport, readOpenAiEffectiveCachePolicy } from './smartai.cache.openai.js';
|
|
3
3
|
import { classifyOpenAiLimit } from './smartai.limits.openai.js';
|
|
4
4
|
import { OPENAI_API_BASE_URL } from './smartai.apikey.openai.js';
|
|
5
|
+
import { openAiChatTerminal, openAiResponsesTerminal } from './smartai.terminal.openai.js';
|
|
5
6
|
|
|
6
7
|
export { classifyOpenAiLimit, readOpenAiError, type IOpenAiErrorDetails } from './smartai.limits.openai.js';
|
|
7
8
|
export { classifyOpenAiChatGptLimit } from './smartai.chatgpt.limits.js';
|
|
@@ -85,8 +86,39 @@ export interface IOpenAiModelOptions extends plugins.ISmartAiOptions {
|
|
|
85
86
|
connection?: IOpenAiModelConnection;
|
|
86
87
|
/** The API the model calls. Defaults to `responses`. */
|
|
87
88
|
api?: TOpenAiApi;
|
|
89
|
+
/**
|
|
90
|
+
* With `api: 'chat'`: whether the server takes OpenAI's fields of response storage and the prompt
|
|
91
|
+
* cache, `store`, `prompt_cache_key`, `prompt_cache_retention` and `prompt_cache_options`. OpenAI's
|
|
92
|
+
* own API always gets them; another server gets them only with `true`, since an OpenAI-compatible
|
|
93
|
+
* server may refuse a field it does not know.
|
|
94
|
+
*/
|
|
95
|
+
openAiFields?: boolean;
|
|
88
96
|
}
|
|
89
97
|
|
|
98
|
+
/** The provider options behind those fields, as the AI SDK's chat model reads them. */
|
|
99
|
+
const openAiChatFields = ['store', 'promptCacheKey', 'promptCacheRetention', 'promptCacheOptions'];
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* Whether a base URL is OpenAI's own API: `api.openai.com`, or a data residency host such as
|
|
103
|
+
* `eu.api.openai.com`. A relative base URL, which a browser resolves against its page, is not.
|
|
104
|
+
*/
|
|
105
|
+
const isOpenAiApiBaseUrl = (baseUrl: string): boolean => {
|
|
106
|
+
const url = URL.canParse(baseUrl) ? new URL(baseUrl) : undefined;
|
|
107
|
+
return url?.protocol === 'https:' && (url.hostname === 'api.openai.com' || url.hostname.endsWith('.api.openai.com'));
|
|
108
|
+
};
|
|
109
|
+
|
|
110
|
+
/** Leaves OpenAI's own fields out of a Chat Completions call to another server, whoever set them. */
|
|
111
|
+
const withoutOpenAiChatFields: plugins.LanguageModelV4Middleware = {
|
|
112
|
+
specificationVersion: 'v4',
|
|
113
|
+
transformParams: async ({ params }) => {
|
|
114
|
+
const openAiOptions = params.providerOptions?.openai;
|
|
115
|
+
if (!openAiOptions || !openAiChatFields.some((field) => field in openAiOptions)) return params;
|
|
116
|
+
const kept = { ...openAiOptions };
|
|
117
|
+
for (const field of openAiChatFields) delete kept[field];
|
|
118
|
+
return { ...params, providerOptions: { ...params.providerOptions, openai: kept } };
|
|
119
|
+
},
|
|
120
|
+
};
|
|
121
|
+
|
|
90
122
|
export const createOpenAiModelProvider = (): plugins.IModelProvider<IOpenAiModelOptions, plugins.LanguageModelV4> => ({
|
|
91
123
|
id: 'openai',
|
|
92
124
|
getModel: (options) => {
|
|
@@ -118,7 +150,12 @@ export const createOpenAiModelProvider = (): plugins.IModelProvider<IOpenAiModel
|
|
|
118
150
|
});
|
|
119
151
|
return (settings.fetch ?? globalThis.fetch)(input, init);
|
|
120
152
|
};
|
|
121
|
-
|
|
153
|
+
// An answer ends at its terminal event, not at the end of the connection (AGL-1130).
|
|
154
|
+
const answers = plugins.endModelStreamsAtTerminalEvent(
|
|
155
|
+
api === 'chat' ? openAiChatTerminal : openAiResponsesTerminal,
|
|
156
|
+
observer ? fetchWithObservation : (input, init) => (settings.fetch ?? globalThis.fetch)(input, init),
|
|
157
|
+
);
|
|
158
|
+
const openai = plugins.createOpenAI({ ...settings, fetch: answers.fetch });
|
|
122
159
|
const model = api === 'chat' ? openai.chat(options.model) : openai(options.model);
|
|
123
160
|
const limits = plugins.createModelLimitMiddleware({
|
|
124
161
|
provider: 'openai',
|
|
@@ -126,9 +163,14 @@ export const createOpenAiModelProvider = (): plugins.IModelProvider<IOpenAiModel
|
|
|
126
163
|
});
|
|
127
164
|
// OpenAI reads only images and PDFs as files, on either API; a text file goes as text
|
|
128
165
|
const textFiles = plugins.createTextFilePartMiddleware();
|
|
166
|
+
// Before the connection's own middleware: a field the connection adds is the connection's to send
|
|
167
|
+
const ownFields = api === 'chat' && options.openAiFields !== true && !isOpenAiApiBaseUrl(settings.baseURL!)
|
|
168
|
+
? [withoutOpenAiChatFields]
|
|
169
|
+
: [];
|
|
170
|
+
// The answers' middleware innermost, next to the model whose fetch it pairs with.
|
|
129
171
|
return plugins.wrapLanguageModel({
|
|
130
172
|
model,
|
|
131
|
-
middleware:
|
|
173
|
+
middleware: [limits, textFiles, ...ownFields, ...(connection?.middleware ? [connection.middleware] : []), answers.middleware],
|
|
132
174
|
});
|
|
133
175
|
};
|
|
134
176
|
// Rebuild the owning pipeline with a request-local observer, as the Anthropic provider does.
|
|
@@ -10,6 +10,7 @@ export type {
|
|
|
10
10
|
export type { LanguageModelV4CallOptions, LanguageModelV4Middleware } from '@ai-sdk/provider';
|
|
11
11
|
import {
|
|
12
12
|
createModelLimitMiddleware,
|
|
13
|
+
endModelStreamsAtTerminalEvent,
|
|
13
14
|
createTextFilePartMiddleware,
|
|
14
15
|
readEpochSeconds,
|
|
15
16
|
readJsonRecord,
|
|
@@ -18,6 +19,7 @@ import {
|
|
|
18
19
|
} from '@modelprofile.com/flexharness-models';
|
|
19
20
|
export {
|
|
20
21
|
createModelLimitMiddleware,
|
|
22
|
+
endModelStreamsAtTerminalEvent,
|
|
21
23
|
createTextFilePartMiddleware,
|
|
22
24
|
readEpochSeconds,
|
|
23
25
|
readJsonRecord,
|
|
@@ -32,6 +34,7 @@ export type {
|
|
|
32
34
|
IModelSource,
|
|
33
35
|
IModelTokenRates,
|
|
34
36
|
IModelProvider,
|
|
37
|
+
IModelStreamTerminal,
|
|
35
38
|
ISmartAiOpenAiEffectiveCachePolicy,
|
|
36
39
|
ISmartAiOptions,
|
|
37
40
|
JSONObject,
|
|
@@ -26,6 +26,13 @@ Provider options differ per API. `IOpenAiProviderOptions` types the Responses op
|
|
|
26
26
|
`reasoningSummary`, `previousResponseId`, `include`, `instructions` and `truncation` do not apply
|
|
27
27
|
to `chat`: the chat model ignores them.
|
|
28
28
|
|
|
29
|
+
On `chat`, OpenAI's fields of response storage and the prompt cache (`store`, `prompt_cache_key`,
|
|
30
|
+
`prompt_cache_retention` and `prompt_cache_options`) go only to OpenAI's own API: `api.openai.com`
|
|
31
|
+
and its data residency hosts such as `eu.api.openai.com`. FlexHarness sends every OpenAI call with
|
|
32
|
+
`store: false` and a derived `prompt_cache_key`, and an OpenAI-compatible server may refuse a field
|
|
33
|
+
it does not know, so a call to another server leaves them out, whoever set them. A server that takes
|
|
34
|
+
them gets them with `openAiFields: true`. The Responses API sends them to any base URL.
|
|
35
|
+
|
|
29
36
|
```typescript
|
|
30
37
|
import { ModelRegistry } from '@modelprofile.com/flexharness-models';
|
|
31
38
|
import { createOpenAiModelProvider } from '@modelprofile.com/flexharness-providers/openai';
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import type * as plugins from './plugins.js';
|
|
2
|
+
|
|
3
|
+
/** An event's data as a JSON object, or `undefined`. */
|
|
4
|
+
const eventRecord = (data: string): Record<string, unknown> | undefined => {
|
|
5
|
+
try {
|
|
6
|
+
const value: unknown = JSON.parse(data);
|
|
7
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value) ? value as Record<string, unknown> : undefined;
|
|
8
|
+
} catch {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
/** The Responses events that end a stream: a finished answer, a failed one, and an error event. */
|
|
14
|
+
const responsesTerminalTypes = new Set(['response.completed', 'response.incomplete', 'response.failed', 'error']);
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Where a Responses stream ends: `response.completed` or `response.incomplete` ends the answer,
|
|
18
|
+
* `response.failed` and an `error` event end a failed one (AGL-1130).
|
|
19
|
+
*/
|
|
20
|
+
export const openAiResponsesTerminal: plugins.IModelStreamTerminal = {
|
|
21
|
+
event: 'response.completed',
|
|
22
|
+
ends: (data) => (data.includes('"response.completed"') || data.includes('"response.incomplete"')
|
|
23
|
+
|| data.includes('"response.failed"') || data.includes('"error"'))
|
|
24
|
+
&& responsesTerminalTypes.has(eventRecord(data)?.type as string),
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* Where a Chat Completions stream ends: `[DONE]` ends the answer, and an error chunk, which a
|
|
29
|
+
* server sends in place of the rest of a failed answer and without `[DONE]`, ends it too: a chunk
|
|
30
|
+
* with an `error` object and no `choices`, as the AI SDK reads one (AGL-1130).
|
|
31
|
+
*/
|
|
32
|
+
export const openAiChatTerminal: plugins.IModelStreamTerminal = {
|
|
33
|
+
event: '[DONE]',
|
|
34
|
+
ends: (data) => {
|
|
35
|
+
if (data === '[DONE]') return true;
|
|
36
|
+
if (!data.includes('"error"')) return false;
|
|
37
|
+
const chunk = eventRecord(data);
|
|
38
|
+
return typeof chunk?.error === 'object' && chunk.error !== null && !Array.isArray(chunk.choices);
|
|
39
|
+
},
|
|
40
|
+
};
|
package/ts_providers/readme.md
CHANGED
|
@@ -39,6 +39,18 @@ takes one, brings its own address instead. `/research` and the OpenAI audio and
|
|
|
39
39
|
helpers of `/media` always call the vendor's API. None of them takes an address from the
|
|
40
40
|
environment: a set `ANTHROPIC_BASE_URL` or `OPENAI_BASE_URL` changes nothing.
|
|
41
41
|
|
|
42
|
+
A streamed answer ends at its stream's terminal event, not at the end of the connection
|
|
43
|
+
(AGL-1130). `/anthropic` ends it at `message_stop` and `/openai` at the Responses API's
|
|
44
|
+
`response.completed` or `response.incomplete` or Chat Completions' `data: [DONE]`; each ends a
|
|
45
|
+
failed answer at its dialect's failure frame (Anthropic's `error` event, Responses'
|
|
46
|
+
`response.failed` or `error` event, a Chat Completions error chunk). Nothing after the terminal
|
|
47
|
+
event is read: a connection that breaks or a proxy that keeps it open afterwards changes nothing.
|
|
48
|
+
A stream that ends before it fails the call, after what it streamed, with `ModelStreamIncompleteError`
|
|
49
|
+
from `flexharness-models`, so an OpenAI-compatible server that never sends `[DONE]` fails every
|
|
50
|
+
streamed call. `/ollama` ends an answer at its `done` object the same way. `/google`, `/groq`,
|
|
51
|
+
`/mistral`, `/xai` and `/perplexity` leave the stream to their AI SDK models, which read it to the
|
|
52
|
+
end of the connection.
|
|
53
|
+
|
|
42
54
|
Explicit settings win completely. A model adapter given no key takes the vendor's key
|
|
43
55
|
variable, such as `ANTHROPIC_API_KEY` or `OPENAI_API_KEY`, and nothing else from the
|
|
44
56
|
environment. A model adapter given a key, a `baseUrl` or a `connection` uses it as given: no
|