Skip to content

Commit 5e66153

Browse files
feat(api): manual updates
1 parent 41267b1 commit 5e66153

File tree

256 files changed

+96222
-72
lines changed

Some content is hidden

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

256 files changed

+96222
-72
lines changed

.stats.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
configured_endpoints: 88
2-
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-b2a451656ca64d30d174391ebfd94806b4de3ab76dc55b92843cfb7f1a54ecb6.yml
3-
openapi_spec_hash: 27d9691b400f28c17ef063a1374048b0
4-
config_hash: e822d0c9082c8b312264403949243179
1+
configured_endpoints: 111
2+
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-721e6ccaa72205ee14c71f8163129920464fb814b95d3df9567a9476bbd9b7fb.yml
3+
openapi_spec_hash: 2115413a21df8b5bf9e4552a74df4312
4+
config_hash: 9606bb315a193bfd8da0459040143242

openai-java-core/src/main/kotlin/com/openai/core/handlers/SseHandler.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,10 @@ private class SseState(
134134
}
135135

136136
@JvmSynthetic
137-
internal inline fun <reified T> Handler<StreamResponse<SseMessage>>.mapJson():
138-
Handler<StreamResponse<T>> =
137+
internal inline fun <reified T> Handler<StreamResponse<SseMessage>>.mapJson(
138+
includeEventAndData: Boolean = false
139+
): Handler<StreamResponse<T>> =
139140
object : Handler<StreamResponse<T>> {
140141
override fun handle(response: HttpResponse): StreamResponse<T> =
141-
this@mapJson.handle(response).map { it.json<T>() }
142+
this@mapJson.handle(response).map { it.json<T>(includeEventAndData) }
142143
}

openai-java-core/src/main/kotlin/com/openai/core/http/SseMessage.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,21 @@ private constructor(
4141
fun build(): SseMessage = SseMessage(jsonMapper!!, event, data, id, retry)
4242
}
4343

44-
inline fun <reified T> json(): T =
44+
inline fun <reified T> json(includeEventAndData: Boolean = false): T {
45+
var jsonNode = jsonNode
46+
if (includeEventAndData) {
47+
val newJsonNode = jsonMapper.createObjectNode()
48+
event?.let { newJsonNode.put("event", event) }
49+
newJsonNode.replace("data", jsonNode)
50+
jsonNode = newJsonNode
51+
}
52+
4553
try {
46-
jsonMapper.readerFor(jacksonTypeRef<T>()).readValue(jsonNode)
54+
return jsonMapper.readerFor(jacksonTypeRef<T>()).readValue(jsonNode)
4755
} catch (e: Exception) {
4856
throw OpenAIInvalidDataException("Error reading response", e)
4957
}
58+
}
5059

5160
private val jsonNode by lazy {
5261
try {

0 commit comments

Comments
 (0)