Skip to content
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

Fix - GenericIOException: Failed to parse HTTP response: unexpected EOF #490

Merged
merged 3 commits into from
Oct 11, 2023
Merged

Fix - GenericIOException: Failed to parse HTTP response: unexpected EOF #490

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e75310
Fix problem with EOF using aallam.openai client
tomascayuelas Oct 11, 2023
8ee39ac
Update request_timeout to 60 seconds by default
tomascayuelas Oct 11, 2023
7bc9da5
Allows the user to build Timeout depending on the use case
tomascayuelas Oct 11, 2023
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
4 changes: 4 additions & 0 deletions openai/src/commonMain/kotlin/com/xebia/functional/xef/conversation/llm/openai/Conversions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.aallam.openai.api.chat.ChatCompletionChunk as OAIChatCompletionChunk
import com.aallam.openai.api.chat.ChatDelta as OAIChatDelta
import com.aallam.openai.api.chat.ChatRole
import com.aallam.openai.api.core.Usage as OAIUsage
import com.aallam.openai.api.http.Timeout as OAITimeout
import com.xebia.functional.xef.llm.models.chat.ChatChunk
import com.xebia.functional.xef.llm.models.chat.ChatCompletionChunk
import com.xebia.functional.xef.llm.models.chat.ChatDelta
Expand Down Expand Up @@ -61,3 +62,6 @@ internal fun OAIChatDelta.toInternal() =
else FunctionCall(it.name, it.arguments)
}
)

internal fun OpenAI.Timeout.toOAITimeout() =
OAITimeout(this.request, this.connect, this.socket)
45 changes: 33 additions & 12 deletions openai/src/commonMain/kotlin/com/xebia/functional/xef/conversation/llm/openai/OpenAI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,32 @@ import kotlin.jvm.JvmField
import kotlin.jvm.JvmOverloads
import kotlin.jvm.JvmStatic
import kotlin.jvm.JvmSynthetic
import kotlin.time.Duration
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds

private const val KEY_ENV_VAR = "OPENAI_TOKEN"
private const val HOST_ENV_VAR = "OPENAI_HOST"

class OpenAI(internal var token: String? = null, internal var host: String? = null) :
AutoCloseable, AutoClose by autoClose() {
class OpenAI(
internal var token: String? = null,
internal var host: String? = null,
internal var timeout: Timeout = Timeout.default()
) : AutoCloseable, AutoClose by autoClose() {

class Timeout private constructor(
raulraja marked this conversation as resolved.
Show resolved Hide resolved
val request: Duration,
val connect: Duration,
val socket: Duration,
) {
companion object {
private val REQUEST_TIMEOUT = 60.seconds
private val CONNECT_TIMEOUT = 10.minutes
private val SOCKET_TIMEOUT = 10.minutes

fun default(): Timeout = Timeout(REQUEST_TIMEOUT, CONNECT_TIMEOUT, SOCKET_TIMEOUT)
}
}

private fun openAITokenFromEnv(): String {
return getenv(KEY_ENV_VAR)
Expand Down Expand Up @@ -65,6 +85,7 @@ class OpenAI(internal var token: String? = null, internal var host: String? = nu
token = getToken(),
logging = LoggingConfig(LogLevel.None),
headers = mapOf("Authorization" to " Bearer ${getToken()}"),
timeout = this.timeout.toOAITimeout()
)
.let { autoClose(it) }

Expand Down Expand Up @@ -132,7 +153,16 @@ class OpenAI(internal var token: String? = null, internal var host: String? = nu
DALLE_2,
)

suspend fun findModel(modelId: String): Any? { // TODO: impl of abstract provider function
suspend fun <T : LLM> spawnModel(
modelId: String,
baseModel: T
): T { // TODO: impl of abstract provider function
if (findModel(modelId) == null) error("model not found")
return baseModel.copy(ModelType.FineTunedModel(modelId, baseModel = baseModel.modelType)) as? T
?: error("${baseModel::class} does not follow contract to return the most specific type")
}

private suspend fun findModel(modelId: String): Any? { // TODO: impl of abstract provider function
val model =
try {
defaultClient.model(ModelId(modelId))
Expand All @@ -145,15 +175,6 @@ class OpenAI(internal var token: String? = null, internal var host: String? = nu
return ModelType.TODO(model.id.id)
}

suspend fun <T : LLM> spawnModel(
modelId: String,
baseModel: T
): T { // TODO: impl of abstract provider function
if (findModel(modelId) == null) error("model not found")
return baseModel.copy(ModelType.FineTunedModel(modelId, baseModel = baseModel.modelType)) as? T
?: error("${baseModel::class} does not follow contract to return the most specific type")
}

companion object {

@JvmField val FromEnvironment: OpenAI = OpenAI()
Expand Down