Skip to content

fix(api): preserve stream IDs for factory-created response errors #926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apcha-oai merged 1 commit into from
Aug 21, 2026
Merged

fix(api): preserve stream IDs for factory-created response errors #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .castiron.stats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
schema_version: 1
generation_id: d8a1420b-a1ed-40ae-8675-e79d0e6fe5ce
generation_id: 9ddc7bd7-7dde-4ca0-9796-b799d1856183
openapi_spec_hash: 92700e1a33a4f6174a01b46648c8186a
openapi_transformed_spec_hash: e37bbe0f04caa6093f1cb5d65d23ad03
config_hash: d13c582815d0db08c374985806be7352
codegen_sha: 48b2b7ead2af6d92c34149aa44744f7e2ae4367a
codegen_hash: f7d9f64ad58ebcf8291c4168c4322d6cc0c5ef1fe934f58dd7f785338920a919
public_codegen_sha: ad61fb7c99fae3ed2d764fc4eb31db395ea44b33
config_hash: beab4f058e80bab30085bb6c8467b65f
codegen_sha: eb5e25357e53704e2f933c553955a272266a1c04
codegen_hash: eba4178634b1f9b13d20cce4648c21f0009e610a7434e11e4b363c03f7058563
public_codegen_sha: f2bbcb54a3442935e643fd86befd04a969fbcb60
247 changes: 177 additions & 70 deletions ...ai-java-core/src/main/kotlin/com/openai/models/beta/responses/BetaResponsesServerEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ import java.util.Objects
import java.util.Optional
import kotlin.jvm.optionals.getOrNull

private fun Map<String, JsonValue>.streamId(): JsonField<String> =
get("stream_id") ?: JsonMissing.of()

private fun JsonField<String>.asStreamId(): Optional<String> =
if (isMissing() || isNull()) Optional.empty() else Optional.of(asStringOrThrow())

/** Server events emitted by the Responses WebSocket server. */
@JsonDeserialize(using = BetaResponsesServerEvent.Deserializer::class)
@JsonSerialize(using = BetaResponsesServerEvent.Serializer::class)
Expand Down Expand Up @@ -382,120 +376,233 @@ private constructor(
* The WebSocket lane that emitted this event. This field is present when the originating
* `response.create` event supplied a `stream_id`.
*/
fun streamId(): Optional<String> = streamIdField().asStreamId()
fun streamId(): Optional<String> {
val value = streamIdField()
return if (value.isMissing() || value.isNull()) Optional.empty()
else Optional.of(value.asStringOrThrow())
}

private fun streamIdField(): JsonField<String> =
_json?.asObject()?.getOrNull()?.get("stream_id")
?: when {
responseAudioDelta != null -> responseAudioDelta._additionalProperties().streamId()
responseAudioDone != null -> responseAudioDone._additionalProperties().streamId()
responseAudioDelta != null ->
responseAudioDelta._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseAudioDone != null ->
responseAudioDone._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseAudioTranscriptDelta != null ->
responseAudioTranscriptDelta._additionalProperties().streamId()
responseAudioTranscriptDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseAudioTranscriptDone != null ->
responseAudioTranscriptDone._additionalProperties().streamId()
responseAudioTranscriptDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseCodeInterpreterCallCodeDelta != null ->
responseCodeInterpreterCallCodeDelta._additionalProperties().streamId()
responseCodeInterpreterCallCodeDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseCodeInterpreterCallCodeDone != null ->
responseCodeInterpreterCallCodeDone._additionalProperties().streamId()
responseCodeInterpreterCallCodeDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseCodeInterpreterCallCompleted != null ->
responseCodeInterpreterCallCompleted._additionalProperties().streamId()
responseCodeInterpreterCallCompleted._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseCodeInterpreterCallInProgress != null ->
responseCodeInterpreterCallInProgress._additionalProperties().streamId()
responseCodeInterpreterCallInProgress._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseCodeInterpreterCallInterpreting != null ->
responseCodeInterpreterCallInterpreting._additionalProperties().streamId()
responseCompleted != null -> responseCompleted._additionalProperties().streamId()
responseCodeInterpreterCallInterpreting._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseCompleted != null ->
responseCompleted._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseContentPartAdded != null ->
responseContentPartAdded._additionalProperties().streamId()
responseContentPartAdded._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseContentPartDone != null ->
responseContentPartDone._additionalProperties().streamId()
responseCreated != null -> responseCreated._additionalProperties().streamId()
error != null -> error._additionalProperties().streamId()
responseContentPartDone._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseCreated != null ->
responseCreated._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseFileSearchCallCompleted != null ->
responseFileSearchCallCompleted._additionalProperties().streamId()
responseFileSearchCallCompleted._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseFileSearchCallInProgress != null ->
responseFileSearchCallInProgress._additionalProperties().streamId()
responseFileSearchCallInProgress._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseFileSearchCallSearching != null ->
responseFileSearchCallSearching._additionalProperties().streamId()
responseFileSearchCallSearching._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseFunctionCallArgumentsDelta != null ->
responseFunctionCallArgumentsDelta._additionalProperties().streamId()
responseFunctionCallArgumentsDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseFunctionCallArgumentsDone != null ->
responseFunctionCallArgumentsDone._additionalProperties().streamId()
responseInProgress != null -> responseInProgress._additionalProperties().streamId()
responseFailed != null -> responseFailed._additionalProperties().streamId()
responseIncomplete != null -> responseIncomplete._additionalProperties().streamId()
responseFunctionCallArgumentsDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseShellCallCommandAdded != null ->
responseShellCallCommandAdded._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseShellCallCommandDelta != null ->
responseShellCallCommandDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseShellCallCommandDone != null ->
responseShellCallCommandDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseShellCallOutputContentDelta != null ->
responseShellCallOutputContentDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseShellCallOutputContentDone != null ->
responseShellCallOutputContentDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseInProgress != null ->
responseInProgress._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseFailed != null ->
responseFailed._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseIncomplete != null ->
responseIncomplete._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseOutputItemAdded != null ->
responseOutputItemAdded._additionalProperties().streamId()
responseOutputItemAdded._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseOutputItemDone != null ->
responseOutputItemDone._additionalProperties().streamId()
responseOutputItemDone._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseReasoningSummaryPartAdded != null ->
responseReasoningSummaryPartAdded._additionalProperties().streamId()
responseReasoningSummaryPartAdded._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseReasoningSummaryPartDone != null ->
responseReasoningSummaryPartDone._additionalProperties().streamId()
responseReasoningSummaryPartDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseReasoningSummaryTextDelta != null ->
responseReasoningSummaryTextDelta._additionalProperties().streamId()
responseReasoningSummaryTextDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseReasoningSummaryTextDone != null ->
responseReasoningSummaryTextDone._additionalProperties().streamId()
responseReasoningSummaryTextDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseReasoningTextDelta != null ->
responseReasoningTextDelta._additionalProperties().streamId()
responseReasoningTextDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseReasoningTextDone != null ->
responseReasoningTextDone._additionalProperties().streamId()
responseReasoningTextDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseRefusalDelta != null ->
responseRefusalDelta._additionalProperties().streamId()
responseRefusalDelta._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseRefusalDone != null ->
responseRefusalDone._additionalProperties().streamId()
responseRefusalDone._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseOutputTextDelta != null ->
responseOutputTextDelta._additionalProperties().streamId()
responseOutputTextDelta._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseOutputTextDone != null ->
responseOutputTextDone._additionalProperties().streamId()
responseOutputTextDone._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseWebSearchCallCompleted != null ->
responseWebSearchCallCompleted._additionalProperties().streamId()
responseWebSearchCallCompleted._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseWebSearchCallInProgress != null ->
responseWebSearchCallInProgress._additionalProperties().streamId()
responseWebSearchCallInProgress._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseWebSearchCallSearching != null ->
responseWebSearchCallSearching._additionalProperties().streamId()
responseWebSearchCallSearching._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseImageGenerationCallCompleted != null ->
responseImageGenerationCallCompleted._additionalProperties().streamId()
responseImageGenerationCallCompleted._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseImageGenerationCallGenerating != null ->
responseImageGenerationCallGenerating._additionalProperties().streamId()
responseImageGenerationCallGenerating._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseImageGenerationCallInProgress != null ->
responseImageGenerationCallInProgress._additionalProperties().streamId()
responseImageGenerationCallInProgress._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseImageGenerationCallPartialImage != null ->
responseImageGenerationCallPartialImage._additionalProperties().streamId()
responseImageGenerationCallPartialImage._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseMcpCallArgumentsDelta != null ->
responseMcpCallArgumentsDelta._additionalProperties().streamId()
responseMcpCallArgumentsDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseMcpCallArgumentsDone != null ->
responseMcpCallArgumentsDone._additionalProperties().streamId()
responseMcpCallArgumentsDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseMcpCallCompleted != null ->
responseMcpCallCompleted._additionalProperties().streamId()
responseMcpCallCompleted._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseMcpCallFailed != null ->
responseMcpCallFailed._additionalProperties().streamId()
responseMcpCallFailed._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseMcpCallInProgress != null ->
responseMcpCallInProgress._additionalProperties().streamId()
responseMcpCallInProgress._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseMcpListToolsCompleted != null ->
responseMcpListToolsCompleted._additionalProperties().streamId()
responseMcpListToolsCompleted._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseMcpListToolsFailed != null ->
responseMcpListToolsFailed._additionalProperties().streamId()
responseMcpListToolsFailed._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseMcpListToolsInProgress != null ->
responseMcpListToolsInProgress._additionalProperties().streamId()
responseMcpListToolsInProgress._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseOutputTextAnnotationAdded != null ->
responseOutputTextAnnotationAdded._additionalProperties().streamId()
responseQueued != null -> responseQueued._additionalProperties().streamId()
responseOutputTextAnnotationAdded._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseQueued != null ->
responseQueued._additionalProperties()["stream_id"] ?: JsonMissing.of()

responseCustomToolCallInputDelta != null ->
responseCustomToolCallInputDelta._additionalProperties().streamId()
responseCustomToolCallInputDelta._additionalProperties()["stream_id"]
?: JsonMissing.of()

responseCustomToolCallInputDone != null ->
responseCustomToolCallInputDone._additionalProperties().streamId()
responseCustomToolCallInputDone._additionalProperties()["stream_id"]
?: JsonMissing.of()

error != null -> error._streamId()

responseInjectCreated != null -> responseInjectCreated._streamId()

responseInjectFailed != null -> responseInjectFailed._streamId()
responseShellCallCommandAdded != null ->
responseShellCallCommandAdded._additionalProperties().streamId()
responseShellCallCommandDelta != null ->
responseShellCallCommandDelta._additionalProperties().streamId()
responseShellCallCommandDone != null ->
responseShellCallCommandDone._additionalProperties().streamId()
responseShellCallOutputContentDelta != null ->
responseShellCallOutputContentDelta._additionalProperties().streamId()
responseShellCallOutputContentDone != null ->
responseShellCallOutputContentDone._additionalProperties().streamId()

else -> JsonMissing.of()
}

Expand Down
Loading
Loading