-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
428316c
commit d881c5a
Showing
10 changed files
with
308 additions
and
216 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,4 +14,4 @@ class ModelUriAdapterBuilder { | |
| } | ||
|
|
||
| internal fun build(): ModelUriAdapter = ModelUriAdapter(pathMap) | ||
| } | ||
| } | ||
146 changes: 85 additions & 61 deletions
146
.../src/main/kotlin/com/xebia/functional/xef/server/http/client/mlflow/MLflowModelAdapter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,113 @@ | ||
| package com.xebia.functional.xef.server.http.client.mlflow | ||
|
|
||
| import com.xebia.functional.xef.server.http.client.ModelUriAdapter | ||
| import com.xebia.functional.xef.server.http.client.OpenAIPathType | ||
| import io.github.oshai.kotlinlogging.KotlinLogging | ||
| import io.ktor.client.* | ||
| import io.ktor.client.call.* | ||
| import io.ktor.client.plugins.* | ||
| import io.ktor.client.request.* | ||
| import io.ktor.client.statement.* | ||
| import io.ktor.http.* | ||
| import io.ktor.http.content.* | ||
| import io.ktor.util.* | ||
| import io.ktor.util.pipeline.* | ||
| import io.ktor.util.reflect.* | ||
| import io.ktor.utils.io.core.* | ||
| import kotlinx.serialization.ExperimentalSerializationApi | ||
| import kotlinx.serialization.encodeToString | ||
| import kotlinx.serialization.json.Json | ||
|
|
||
| class MLflowModelAdapter internal constructor(private val mappedRequests: Map<String, OpenAIPathType>) { | ||
| class MLflowModelAdapter | ||
| internal constructor(private val mappedRequests: Map<String, OpenAIPathType>) { | ||
|
|
||
| val logger = KotlinLogging.logger {} | ||
| val logger = KotlinLogging.logger {} | ||
|
|
||
| fun mappedType(path: String): OpenAIPathType? = mappedRequests[path] | ||
| fun mappedType(path: String): OpenAIPathType? = mappedRequests[path] | ||
|
|
||
| companion object : HttpClientPlugin<MLflowModelAdapterBuilder, MLflowModelAdapter> { | ||
| companion object : HttpClientPlugin<MLflowModelAdapterBuilder, MLflowModelAdapter> { | ||
|
|
||
| @OptIn(ExperimentalSerializationApi::class) | ||
| private val json = Json { | ||
| explicitNulls = false | ||
| ignoreUnknownKeys = true | ||
| } | ||
| @OptIn(ExperimentalSerializationApi::class) | ||
| private val json = Json { | ||
| explicitNulls = false | ||
| ignoreUnknownKeys = true | ||
| } | ||
|
|
||
| override val key: AttributeKey<MLflowModelAdapter> = AttributeKey("MLflowAdapter") | ||
| override val key: AttributeKey<MLflowModelAdapter> = AttributeKey("MLflowAdapter") | ||
|
|
||
| override fun prepare(block: MLflowModelAdapterBuilder.() -> Unit): MLflowModelAdapter = | ||
| MLflowModelAdapterBuilder().apply(block).build() | ||
| override fun prepare(block: MLflowModelAdapterBuilder.() -> Unit): MLflowModelAdapter = | ||
| MLflowModelAdapterBuilder().apply(block).build() | ||
|
|
||
| override fun install(plugin: MLflowModelAdapter, scope: HttpClient) { | ||
| installMLflowRequestAdapter(plugin, scope) | ||
| installMLflowResponseAdapter(plugin, scope) | ||
| } | ||
| override fun install(plugin: MLflowModelAdapter, scope: HttpClient) { | ||
| installMLflowRequestAdapter(plugin, scope) | ||
| installMLflowResponseAdapter(plugin, scope) | ||
| } | ||
|
|
||
| private fun installMLflowRequestAdapter(plugin: MLflowModelAdapter, scope: HttpClient) { | ||
| scope.requestPipeline.intercept(HttpRequestPipeline.Transform) { content -> | ||
| val originalPath = plugin.mappedType(context.url.buildString()) ?: return@intercept | ||
| val originalRequest = when (content) { | ||
| is OutgoingContent.ByteArrayContent -> content.bytes() | ||
| is ByteArray -> content | ||
| else -> return@intercept | ||
| } | ||
| when (originalPath) { | ||
| OpenAIPathType.CHAT -> TODO() | ||
| OpenAIPathType.EMBEDDINGS -> { | ||
| plugin.logger.info { "Intercepting request for path $originalPath" } | ||
| val stringRequestBody = originalRequest.toString(Charsets.UTF_8) | ||
| val requestData = json.decodeFromString<XefEmbeddingsRequest>(stringRequestBody) | ||
| val newRequest = TextContent(json.encodeToString(requestData.toMLflow()), ContentType.Application.Json) | ||
| proceedWith(newRequest) | ||
| } | ||
| else -> { | ||
| plugin.logger.warn { "$originalPath not supported" } | ||
| return@intercept | ||
| } | ||
| } | ||
| } | ||
| } | ||
| private suspend inline fun <reified R1, reified R2> PipelineContext<Any, HttpRequestBuilder> | ||
| .update(originalRequest: ByteArray, toMLflow: R1.() -> R2) { | ||
| val stringRequestBody = originalRequest.toString(Charsets.UTF_8) | ||
| val requestData = json.decodeFromString<R1>(stringRequestBody) | ||
| val newRequest = | ||
| TextContent(json.encodeToString(requestData.toMLflow()), ContentType.Application.Json) | ||
| proceedWith(newRequest) | ||
| } | ||
|
|
||
| private suspend inline fun <reified R1, reified R2> PipelineContext< | ||
| HttpResponseContainer, HttpClientCall | ||
| > | ||
| .update(typeInfo: TypeInfo, contentResponse: ByteReadPacket, toXef: R1.() -> R2) { | ||
| val stringResponseBody = contentResponse.readText() | ||
| val responseData = json.decodeFromString<R1>(stringResponseBody) | ||
| val newResponse = | ||
| ByteReadPacket(json.encodeToString(responseData.toXef()).toByteArray(Charsets.UTF_8)) | ||
| val response = HttpResponseContainer(typeInfo, newResponse) | ||
| proceedWith(response) | ||
| } | ||
|
|
||
| private fun installMLflowResponseAdapter(plugin: MLflowModelAdapter, scope: HttpClient) { | ||
| scope.responsePipeline.intercept(HttpResponsePipeline.Transform) { content -> | ||
| val originalPath = plugin.mappedType(context.request.url.toString()) ?: return@intercept | ||
| val contentResponse = content.response as? ByteReadPacket ?: return@intercept | ||
| when (originalPath) { | ||
| OpenAIPathType.CHAT -> TODO() | ||
| OpenAIPathType.EMBEDDINGS -> { | ||
| val stringResponseBody = contentResponse.readText() | ||
| val responseData = json.decodeFromString<MLflowEmbeddingsResponse>(stringResponseBody) | ||
| val newResponse = ByteReadPacket(json.encodeToString(responseData.toXef()).toByteArray(Charsets.UTF_8)) | ||
| val response = HttpResponseContainer(content.expectedType, newResponse) | ||
| proceedWith(response) | ||
| } | ||
| else -> { | ||
| plugin.logger.warn { "$originalPath not supported" } | ||
| return@intercept | ||
| } | ||
| } | ||
| } | ||
| private fun installMLflowRequestAdapter(plugin: MLflowModelAdapter, scope: HttpClient) { | ||
| scope.requestPipeline.intercept(HttpRequestPipeline.Transform) { content -> | ||
| val originalPath = plugin.mappedType(context.url.buildString()) ?: return@intercept | ||
| val originalRequest = | ||
| when (content) { | ||
| is OutgoingContent.ByteArrayContent -> content.bytes() | ||
| is ByteArray -> content | ||
| else -> return@intercept | ||
| } | ||
| when (originalPath) { | ||
| OpenAIPathType.CHAT -> { | ||
| plugin.logger.info { "Intercepting chat request for path $originalPath" } | ||
| update(originalRequest, XefChatRequest::toMLflow) | ||
| } | ||
| OpenAIPathType.EMBEDDINGS -> { | ||
| plugin.logger.info { "Intercepting embeddings request for path $originalPath" } | ||
| update(originalRequest, XefEmbeddingsRequest::toMLflow) | ||
| } | ||
| else -> { | ||
| plugin.logger.warn { "$originalPath not supported" } | ||
| return@intercept | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
| private fun installMLflowResponseAdapter(plugin: MLflowModelAdapter, scope: HttpClient) { | ||
| scope.responsePipeline.intercept(HttpResponsePipeline.Transform) { content -> | ||
| val originalPath = plugin.mappedType(context.request.url.toString()) ?: return@intercept | ||
| val contentResponse = content.response as? ByteReadPacket ?: return@intercept | ||
| when (originalPath) { | ||
| OpenAIPathType.CHAT -> { | ||
| plugin.logger.info { "Intercepting chat response for path $originalPath" } | ||
| update(content.expectedType, contentResponse, MLflowChatResponse::toXef) | ||
| } | ||
| OpenAIPathType.EMBEDDINGS -> { | ||
| plugin.logger.info { "Intercepting embeddings response for path $originalPath" } | ||
| update(content.expectedType, contentResponse, MLflowEmbeddingsResponse::toXef) | ||
| } | ||
| else -> { | ||
| plugin.logger.warn { "$originalPath not supported" } | ||
| return@intercept | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.