Skip to content

[WIP] fix: make OpenAiProxyFactory closable #26

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
mscheong01 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] fix: make OpenAiProxyFactory closable #26

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
16 changes: 15 additions & 1 deletion core/src/main/kotlin/io/github/mscheong01/interfaice/openai/DefaultOkHttpOpenAiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,32 @@ class DefaultOkHttpOpenAiClient : OpenAiApiAdapter {
override fun onResponse(response: com.squareup.okhttp.Response) {
try {
if (!response.isSuccessful) {
throw IOException("Error: ${response.code()} ${response.message()}")
sink.error(IOException("Error: ${response.code()} ${response.message()}"))
} else {
sink.success(mapper.readValue(response.body().string()))
}
} catch (e: Exception) {
sink.error(e)
} finally {
try {
if (response.body() != null) {
response.body().close()
}
} catch (e: java.lang.Exception) {
// logger.warn("Failed to quietly close Response", e)

@davin111 davin111 Jun 13, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this line needed?

}
}
}
})
}
}

override fun close() {
client.dispatcher?.executorService?.shutdown()
client.connectionPool?.evictAll()
client.cache?.close()
}

companion object {
val mapper = jacksonObjectMapper()
}
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/kotlin/io/github/mscheong01/interfaice/openai/OpenAiApiAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ interface OpenAiApiAdapter {
fun getProperties(): OpenAiProperties
fun setProperties(properties: OpenAiProperties)
fun chat(request: ChatRequest): Publisher<ChatResponse>

fun close() {}
}
7 changes: 6 additions & 1 deletion core/src/main/kotlin/io/github/mscheong01/interfaice/openai/OpenAiProxyFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ package io.github.mscheong01.interfaice.openai

import io.github.mscheong01.interfaice.AiProxyFactory
import io.github.mscheong01.interfaice.TranscodingRules
import java.io.Closeable
import java.lang.reflect.Proxy
import java.util.ServiceLoader

class OpenAiProxyFactory(
private val openAiApiAdapter: OpenAiApiAdapter
) : AiProxyFactory {
) : AiProxyFactory, Closeable {
val customTranscodingRules = mutableListOf<TranscodingRules.CustomRule<*>>()

constructor(
Expand All @@ -39,6 +40,10 @@ class OpenAiProxyFactory(
this.customTranscodingRules.addAll(customTranscodingRules)
}

override fun close() {
openAiApiAdapter.close()
}

companion object {
private fun getOpenAiApiAdapter(properties: OpenAiProperties): OpenAiApiAdapter {
val adapters = ServiceLoader.load(OpenAiApiAdapter::class.java)
Expand Down