Skip to content

Commit 957b739

Browse files
lgrammellgrammel
authored
chore (provider-utils): rename TestServerCall.requestBody to requestBodyJson (#6106)
## Background There are different `requestBody*` methods in `TestServerCall` that indicate their type in the suffix. The JSON one was the initial method and is inconsistent. ## Summary Rename `TestServerCall.requestBody` to `requestBodyJson`.
1 parent 92cb0a2 commit 957b739

File tree

44 files changed

+206
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+206
-205
lines changed

‎.changeset/nervous-maps-fix.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@ai-sdk/provider-utils': major
3+
---
4+
5+
chore (provider-utils): rename TestServerCall.requestBody to requestBodyJson

‎packages/ai/core/tool/mcp/mcp-sse-transport.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ describe('SseMCPTransport', () => {
156156
expect(server.calls).toHaveLength(2);
157157
expect(server.calls[1].requestMethod).toBe('POST');
158158
expect(server.calls[1].requestUrl).toBe('http://localhost:3000/messages');
159-
expect(await server.calls[1].requestBody).toEqual(message);
159+
expect(await server.calls[1].requestBodyJson).toEqual(message);
160160

161161
await transport.close();
162162
});

‎packages/amazon-bedrock/src/bedrock-chat-language-model.test.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ describe('doStream', () => {
672672
prompt: TEST_PROMPT,
673673
});
674674

675-
expect(await server.calls[0].requestBody).toStrictEqual({
675+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
676676
messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
677677
system: [{ text: 'System Prompt' }],
678678
});
@@ -699,7 +699,7 @@ describe('doStream', () => {
699699
},
700700
});
701701

702-
expect(await server.calls[0].requestBody).toMatchObject({
702+
expect(await server.calls[0].requestBodyJson).toMatchObject({
703703
messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
704704
system: [{ text: 'System Prompt' }],
705705
guardrailConfig: {
@@ -938,7 +938,7 @@ describe('doStream', () => {
938938
});
939939

940940
// Verify the outgoing request body includes "foo" at the top level.
941-
const body = await server.calls[0].requestBody;
941+
const body = await server.calls[0].requestBodyJson;
942942
expect(body).toMatchObject({ foo: 'bar' });
943943
});
944944

@@ -1036,8 +1036,7 @@ describe('doStream', () => {
10361036
],
10371037
});
10381038

1039-
const requestBody = await server.calls[0].requestBody;
1040-
expect(requestBody).toMatchObject({
1039+
expect(await server.calls[0].requestBodyJson).toMatchObject({
10411040
system: [{ text: 'System Prompt' }, { cachePoint: { type: 'default' } }],
10421041
messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
10431042
});
@@ -1314,7 +1313,7 @@ describe('doGenerate', () => {
13141313
prompt: TEST_PROMPT,
13151314
});
13161315

1317-
expect(await server.calls[0].requestBody).toStrictEqual({
1316+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
13181317
messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
13191318
system: [{ text: 'System Prompt' }],
13201319
});
@@ -1330,7 +1329,7 @@ describe('doGenerate', () => {
13301329
topP: 0.5,
13311330
});
13321331

1333-
expect(await server.calls[0].requestBody).toMatchObject({
1332+
expect(await server.calls[0].requestBodyJson).toMatchObject({
13341333
inferenceConfig: {
13351334
maxOutputTokens: 100,
13361335
temperature: 0.5,
@@ -1355,7 +1354,7 @@ describe('doGenerate', () => {
13551354
},
13561355
});
13571356

1358-
expect(await server.calls[0].requestBody).toMatchObject({
1357+
expect(await server.calls[0].requestBodyJson).toMatchObject({
13591358
guardrailConfig: {
13601359
guardrailIdentifier: '-1',
13611360
guardrailVersion: '1',
@@ -1433,7 +1432,7 @@ describe('doGenerate', () => {
14331432
prompt: TEST_PROMPT,
14341433
});
14351434

1436-
expect(await server.calls[0].requestBody).toMatchObject({
1435+
expect(await server.calls[0].requestBodyJson).toMatchObject({
14371436
toolConfig: {
14381437
tools: [
14391438
{
@@ -1536,7 +1535,7 @@ describe('doGenerate', () => {
15361535
});
15371536

15381537
// Verify that the outgoing request body includes "foo" at its top level.
1539-
const body = await server.calls[0].requestBody;
1538+
const body = await server.calls[0].requestBodyJson;
15401539
expect(body).toMatchObject({ foo: 'bar' });
15411540
});
15421541

@@ -1584,8 +1583,7 @@ describe('doGenerate', () => {
15841583
],
15851584
});
15861585

1587-
const requestBody = await server.calls[0].requestBody;
1588-
expect(requestBody).toMatchObject({
1586+
expect(await server.calls[0].requestBodyJson).toMatchObject({
15891587
system: [{ text: 'System Prompt' }, { cachePoint: { type: 'default' } }],
15901588
messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
15911589
});

‎packages/amazon-bedrock/src/bedrock-embedding-model.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('doEmbed', () => {
7070
expect(embeddings.length).toBe(1);
7171
expect(embeddings[0]).toStrictEqual(mockEmbeddings[0]);
7272

73-
const body = await server.calls[0].requestBody;
73+
const body = await server.calls[0].requestBodyJson;
7474
expect(body).toEqual({
7575
inputText: testValues[0],
7676
dimensions: undefined,

‎packages/amazon-bedrock/src/bedrock-image-model.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ describe('doGenerate', () => {
6060
},
6161
});
6262

63-
const body = await server.calls[0].requestBody;
64-
expect(body).toStrictEqual({
63+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
6564
taskType: 'TEXT_IMAGE',
6665
textToImageParams: {
6766
text: prompt,

‎packages/anthropic/src/anthropic-messages-language-model.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe('AnthropicMessagesLanguageModel', () => {
8080
},
8181
});
8282

83-
expect(await server.calls[0].requestBody).toStrictEqual({
83+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
8484
model: 'claude-3-haiku-20240307',
8585
messages: [
8686
{
@@ -303,7 +303,7 @@ describe('AnthropicMessagesLanguageModel', () => {
303303
frequencyPenalty: 0.15,
304304
});
305305

306-
expect(await server.calls[0].requestBody).toStrictEqual({
306+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
307307
model: 'claude-3-haiku-20240307',
308308
max_tokens: 100,
309309
stop_sequences: ['abc', 'def'],
@@ -340,7 +340,7 @@ describe('AnthropicMessagesLanguageModel', () => {
340340
prompt: TEST_PROMPT,
341341
});
342342

343-
expect(await server.calls[0].requestBody).toStrictEqual({
343+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
344344
model: 'claude-3-haiku-20240307',
345345
messages: [
346346
{ role: 'user', content: [{ type: 'text', text: 'Hello' }] },
@@ -417,7 +417,7 @@ describe('AnthropicMessagesLanguageModel', () => {
417417
],
418418
});
419419

420-
expect(await server.calls[0].requestBody).toStrictEqual({
420+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
421421
model: 'claude-3-haiku-20240307',
422422
messages: [
423423
{
@@ -940,7 +940,7 @@ describe('AnthropicMessagesLanguageModel', () => {
940940
prompt: TEST_PROMPT,
941941
});
942942

943-
expect(await server.calls[0].requestBody).toStrictEqual({
943+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
944944
stream: true,
945945
model: 'claude-3-haiku-20240307',
946946
max_tokens: 4096, // default value

‎packages/assemblyai/src/assemblyai-transcription-model.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ describe('doGenerate', () => {
249249
mediaType: 'audio/wav',
250250
});
251251

252-
expect(await server.calls[1].requestBody).toMatchObject({
252+
expect(await server.calls[1].requestBodyJson).toMatchObject({
253253
audio_url: 'https://storage.assemblyai.com/mock-upload-url',
254254
speech_model: 'best',
255255
});

‎packages/azure/src/azure-openai-provider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ describe('image', () => {
423423
providerOptions: { openai: { style: 'natural' } },
424424
});
425425

426-
expect(await server.calls[0].requestBody).toStrictEqual({
426+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
427427
model: 'dalle-deployment',
428428
prompt,
429429
n: 2,

‎packages/cohere/src/cohere-chat-language-model.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ describe('doGenerate', () => {
226226
prompt: TEST_PROMPT,
227227
});
228228

229-
expect(await server.calls[0].requestBody).toStrictEqual({
229+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
230230
model: 'command-r-plus',
231231
messages: [
232232
{ role: 'system', content: 'you are a friendly bot!' },
@@ -259,7 +259,7 @@ describe('doGenerate', () => {
259259
prompt: TEST_PROMPT,
260260
});
261261

262-
expect(await server.calls[0].requestBody).toStrictEqual({
262+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
263263
model: 'command-r-plus',
264264
messages: [
265265
{
@@ -332,7 +332,7 @@ describe('doGenerate', () => {
332332
},
333333
});
334334

335-
expect(await server.calls[0].requestBody).toStrictEqual({
335+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
336336
model: 'command-r-plus',
337337
messages: [
338338
{ role: 'system', content: 'you are a friendly bot!' },
@@ -743,7 +743,7 @@ describe('doStream', () => {
743743
prompt: TEST_PROMPT,
744744
});
745745

746-
expect(await server.calls[0].requestBody).toStrictEqual({
746+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
747747
stream: true,
748748
model: 'command-r-plus',
749749
messages: [

‎packages/cohere/src/cohere-embedding-model.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('doEmbed', () => {
7878

7979
await model.doEmbed({ values: testValues });
8080

81-
expect(await server.calls[0].requestBody).toStrictEqual({
81+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
8282
model: 'embed-english-v3.0',
8383
embedding_types: ['float'],
8484
texts: testValues,
@@ -98,7 +98,7 @@ describe('doEmbed', () => {
9898
},
9999
});
100100

101-
expect(await server.calls[0].requestBody).toStrictEqual({
101+
expect(await server.calls[0].requestBodyJson).toStrictEqual({
102102
model: 'embed-english-v3.0',
103103
embedding_types: ['float'],
104104
texts: testValues,

0 commit comments

Comments
 (0)