Skip to content

Close error responses before throwing #765

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

Open
fallintoplace wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Close error responses before throwing #765

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
84 changes: 50 additions & 34 deletions openai-java-core/src/main/kotlin/com/openai/core/handlers/ErrorHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,46 +48,62 @@ internal fun errorHandler(
when (val statusCode = response.statusCode()) {
in 200..299 -> response
400 ->
throw BadRequestException.builder()
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw BadRequestException.builder()
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
401 ->
throw UnauthorizedException.builder()
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw UnauthorizedException.builder()
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
403 ->
throw PermissionDeniedException.builder()
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw PermissionDeniedException.builder()
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
404 ->
throw NotFoundException.builder()
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw NotFoundException.builder()
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
422 ->
throw UnprocessableEntityException.builder()
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw UnprocessableEntityException.builder()
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
429 ->
throw RateLimitException.builder()
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw RateLimitException.builder()
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
in 500..599 ->
throw InternalServerException.builder()
.statusCode(statusCode)
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw InternalServerException.builder()
.statusCode(statusCode)
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
else ->
throw UnexpectedStatusCodeException.builder()
.statusCode(statusCode)
.headers(response.headers())
.error(errorBodyHandler.handle(response))
.build()
response.use {
throw UnexpectedStatusCodeException.builder()
.statusCode(statusCode)
.headers(it.headers())
.error(errorBodyHandler.handle(it))
.build()
}
}
}
85 changes: 85 additions & 0 deletions openai-java-core/src/test/kotlin/com/openai/core/handlers/ErrorHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package com.openai.core.handlers

import com.openai.core.JsonMissing
import com.openai.core.JsonValue
import com.openai.core.http.Headers
import com.openai.core.http.HttpResponse
import com.openai.core.jsonMapper
import com.openai.errors.BadRequestException
import java.io.InputStream
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows

internal class ErrorHandlerTest {

@Test
fun handle_whenSuccessful_doesNotCloseResponse() {
val response = TestHttpResponse(statusCode = 200, body = "")

val handledResponse = errorHandler(errorBodyHandler(jsonMapper())).handle(response)

assertThat(handledResponse).isSameAs(response)
assertThat(response.closed).isFalse()
}

@Test
fun handle_whenStatus400_closesResponseAndThrowsBadRequestException() {
val response =
TestHttpResponse(
statusCode = 400,
body =
"""
{"error":{"code":"code","message":"message","param":"param","type":"type"}}
"""
.trimIndent(),
)

val e =
assertThrows<BadRequestException> {
errorHandler(errorBodyHandler(jsonMapper())).handle(response)
}

assertThat(response.closed).isTrue()
assertThat(e.body())
.isEqualTo(
JsonValue.from(
mapOf(
"code" to "code",
"message" to "message",
"param" to "param",
"type" to "type",
)
)
)
}

@Test
fun handle_whenStatus400WithUnreadableBody_closesResponseAndThrowsBadRequestException() {
val response = TestHttpResponse(statusCode = 400, body = "{not-json")

val e =
assertThrows<BadRequestException> {
errorHandler(errorBodyHandler(jsonMapper())).handle(response)
}

assertThat(response.closed).isTrue()
assertThat(e.body()).isEqualTo(JsonMissing.of())
}
}

private class TestHttpResponse(private val statusCode: Int, private val body: String) :
HttpResponse {

var closed: Boolean = false

override fun statusCode(): Int = statusCode

override fun headers(): Headers = Headers.builder().build()

override fun body(): InputStream = body.byteInputStream()

override fun close() {
closed = true
}
}