Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/itchy-houses-act.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@ai-sdk/provider-utils': patch
'ai': patch
---

move DelayedPromise into provider utils
5 changes: 5 additions & 0 deletions .changeset/perfect-dodos-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ai-sdk/anthropic': patch
---

throw 500 error when the first stream chunk is an error
2 changes: 1 addition & 1 deletion packages/ai/src/generate-object/stream-object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from '@ai-sdk/provider';
import {
createIdGenerator,
DelayedPromise,
FlexibleSchema,
ProviderOptions,
type InferSchema,
Expand Down Expand Up @@ -45,7 +46,6 @@ import {
createAsyncIterableStream,
} from '../util/async-iterable-stream';
import { createStitchableStream } from '../util/create-stitchable-stream';
import { DelayedPromise } from '../util/delayed-promise';
import { DownloadFunction } from '../util/download/download-function';
import { now as originalNow } from '../util/now';
import { prepareRetries } from '../util/prepare-retries';
Expand Down
2 changes: 1 addition & 1 deletion packages/ai/src/generate-text/stream-text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from '@ai-sdk/provider';
import {
createIdGenerator,
DelayedPromise,
IdGenerator,
isAbortError,
ProviderOptions,
Expand Down Expand Up @@ -58,7 +59,6 @@ import {
} from '../util/async-iterable-stream';
import { consumeStream } from '../util/consume-stream';
import { createStitchableStream } from '../util/create-stitchable-stream';
import { DelayedPromise } from '../util/delayed-promise';
import { DownloadFunction } from '../util/download/download-function';
import { now as originalNow } from '../util/now';
import { prepareRetries } from '../util/prepare-retries';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { delay } from '@ai-sdk/provider-utils';
import { delay, DelayedPromise } from '@ai-sdk/provider-utils';
import { convertReadableStreamToArray } from '@ai-sdk/provider-utils/test';
import { DelayedPromise } from '../util/delayed-promise';
import { describe, expect, it } from 'vitest';
import { UIMessage } from '../ui/ui-messages';
import { consumeStream } from '../util/consume-stream';
import { createUIMessageStream } from './create-ui-message-stream';
import { UIMessageChunk } from './ui-message-chunks';
import { UIMessageStreamWriter } from './ui-message-stream-writer';
import { consumeStream } from '../util/consume-stream';
import { UIMessage } from '../ui/ui-messages';
import { describe, it, expect } from 'vitest';

describe('createUIMessageStream', () => {
it('should send data stream part and close the stream', async () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/ai/src/util/serial-job-executor.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, describe, it } from 'vitest';
import { DelayedPromise } from '@ai-sdk/provider-utils';
import { describe, expect, it } from 'vitest';
import { SerialJobExecutor } from './serial-job-executor';
import { DelayedPromise } from './delayed-promise';

describe('SerialJobExecutor', () => {
it('should execute a single job successfully', async () => {
Expand Down
138 changes: 130 additions & 8 deletions packages/anthropic/src/anthropic-messages-language-model.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
APICallError,
JSONObject,
LanguageModelV3,
LanguageModelV3Prompt,
Expand Down Expand Up @@ -2867,18 +2868,27 @@ describe('AnthropicMessagesLanguageModel', () => {
});
});

it('should throw an api error when the server is overloaded', async () => {
it('should throw an api error when the server is returning a 529 overloaded error', async () => {
server.urls['https://api.anthropic.com/v1/messages'].response = {
type: 'error',
status: 529,
body: '{"type":"error","error":{"details":null,"type":"overloaded_error","message":"Overloaded"}}',
};

await expect(
model.doGenerate({
prompt: TEST_PROMPT,
model.doGenerate({ prompt: TEST_PROMPT }),
).rejects.toThrowError(
new APICallError({
message: 'Overloaded',
url: 'https://api.anthropic.com/v1/messages',
requestBodyValues: {},
statusCode: 529,
responseHeaders: {},
responseBody:
'{"type":"error","error":{"details":null,"type":"overloaded_error","message":"Overloaded"}}',
isRetryable: true,
}),
).rejects.toThrow('Overloaded');
);
});

describe('temperature clamping', () => {
Expand Down Expand Up @@ -4845,16 +4855,128 @@ describe('AnthropicMessagesLanguageModel', () => {
});
});

it('should throw an api error when the server is overloaded', async () => {
it('should throw an api error when the server is returning a 529 overloaded error', async () => {
server.urls['https://api.anthropic.com/v1/messages'].response = {
type: 'error',
status: 529,
body: '{"type":"error","error":{"details":null,"type":"overloaded_error","message":"Overloaded"}}',
};

await expect(model.doStream({ prompt: TEST_PROMPT })).rejects.toThrow(
'Overloaded',
);
try {
await model.doStream({ prompt: TEST_PROMPT });
expect.fail('Expected an error to be thrown');
} catch (error) {
expect(error).toBeInstanceOf(APICallError);
const apiCallError = error as APICallError;
expect({
message: apiCallError.message,
url: apiCallError.url,
requestBodyValues: apiCallError.requestBodyValues,
statusCode: apiCallError.statusCode,
responseHeaders: apiCallError.responseHeaders,
responseBody: apiCallError.responseBody,
isRetryable: apiCallError.isRetryable,
}).toMatchInlineSnapshot(`
{
"isRetryable": true,
"message": "Overloaded",
"requestBodyValues": {
"max_tokens": 4096,
"messages": [
{
"content": [
{
"cache_control": undefined,
"text": "Hello",
"type": "text",
},
],
"role": "user",
},
],
"model": "claude-3-haiku-20240307",
"stop_sequences": undefined,
"stream": true,
"system": undefined,
"temperature": undefined,
"tool_choice": undefined,
"tools": undefined,
"top_k": undefined,
"top_p": undefined,
},
"responseBody": "{"type":"error","error":{"details":null,"type":"overloaded_error","message":"Overloaded"}}",
"responseHeaders": {
"content-length": "90",
"content-type": "text/plain",
},
"statusCode": 529,
"url": "https://api.anthropic.com/v1/messages",
}
`);
}
});

it('should throw an api error when the first stream chunk is an overloaded error', async () => {
server.urls['https://api.anthropic.com/v1/messages'].response = {
type: 'stream-chunks',
chunks: [
`data: {"type":"error","error":{"details":null,"type":"overloaded_error","message":"Overloaded"}}\n\n`,
],
};

try {
await model.doStream({ prompt: TEST_PROMPT });
expect.fail('Expected an error to be thrown');
} catch (error) {
expect(error).toBeInstanceOf(APICallError);
const apiCallError = error as APICallError;
expect({
message: apiCallError.message,
url: apiCallError.url,
requestBodyValues: apiCallError.requestBodyValues,
statusCode: apiCallError.statusCode,
responseHeaders: apiCallError.responseHeaders,
responseBody: apiCallError.responseBody,
isRetryable: apiCallError.isRetryable,
}).toMatchInlineSnapshot(`
{
"isRetryable": true,
"message": "Overloaded",
"requestBodyValues": {
"max_tokens": 4096,
"messages": [
{
"content": [
{
"cache_control": undefined,
"text": "Hello",
"type": "text",
},
],
"role": "user",
},
],
"model": "claude-3-haiku-20240307",
"stop_sequences": undefined,
"stream": true,
"system": undefined,
"temperature": undefined,
"tool_choice": undefined,
"tools": undefined,
"top_k": undefined,
"top_p": undefined,
},
"responseBody": "{"type":"overloaded_error","message":"Overloaded"}",
"responseHeaders": {
"cache-control": "no-cache",
"connection": "keep-alive",
"content-type": "text/event-stream",
},
"statusCode": 529,
"url": "https://api.anthropic.com/v1/messages",
}
`);
}
});

it('should forward overloaded error during streaming', async () => {
Expand Down
Loading
Loading