Skip to content

Commit 003be10

Browse files
lgrammelvercel-ai-sdk[bot]
authored andcommitted
Backport conflicts for PR #10586 to release-v5.0
1 parent a2c893b commit 003be10

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

.changeset/odd-cows-taste.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@ai-sdk/openai': patch
3+
---
4+
5+
refactoring(provider/openai): simplify code

packages/openai/src/responses/openai-responses-language-model.ts

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -880,11 +880,21 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 {
880880
},
881881
});
882882
}
883-
} else if (
884-
isResponseOutputItemDoneChunk(value) &&
885-
value.item.type !== 'message'
886-
) {
887-
if (value.item.type === 'function_call') {
883+
} else if (isResponseOutputItemDoneChunk(value)) {
884+
if (value.item.type === 'message') {
885+
controller.enqueue({
886+
type: 'text-end',
887+
id: value.item.id,
888+
providerMetadata: {
889+
[providerKey]: {
890+
itemId: value.item.id,
891+
...(ongoingAnnotations.length > 0 && {
892+
annotations: ongoingAnnotations,
893+
}),
894+
},
895+
},
896+
});
897+
} else if (value.item.type === 'function_call') {
888898
ongoingToolCalls[value.output_index] = undefined;
889899
hasFunctionCall = true;
890900

@@ -1231,6 +1241,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 {
12311241
: {}),
12321242
});
12331243
}
1244+
<<<<<<< HEAD
12341245
} else if (
12351246
isResponseOutputItemDoneChunk(value) &&
12361247
value.item.type === 'message'
@@ -1247,6 +1258,8 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 {
12471258
},
12481259
},
12491260
});
1261+
=======
1262+
>>>>>>> 1d0de66fb (refactoring(provider/openai): simplify code (#10586))
12501263
} else if (isErrorChunk(value)) {
12511264
controller.enqueue({ type: 'error', error: value });
12521265
}

0 commit comments

Comments
 (0)