feat: merge message by role to generate correctly with deepseek

Author: Stream29

src/main/kotlin/io/github/stream29/proxy/client/MergeMessage.kt

@@ -0,0 +1,20 @@
+package io.github.stream29.proxy.client
+
+fun <T> List<T>.mergeBy(
+    selector: (T) -> String,
+    merger: (T, T) -> T,
+): List<T> {
+    val result = mutableListOf<T>()
+    var lastItem: T? = null
+    for (item in this) {
+        result.add(
+            if (lastItem != null && selector(lastItem) == selector(item)) {
+                merger(lastItem, item).also { lastItem = it }
+            } else {
+                lastItem = item
+                item
+            }
+        )
+    }
+    return result
+}

src/main/kotlin/io/github/stream29/proxy/client/OpenAiBased.kt

@@ -1,5 +1,7 @@
 package io.github.stream29.proxy.client
 
+import io.github.stream29.proxy.server.*
+import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -9,7 +11,7 @@ import kotlinx.serialization.Serializable
 data class DashScopeConfig(
     val apiKey: String,
     val modelList: List<String> = listOf("qwen-max", "qwen-plus", "qwen-turbo", "qwen-long"),
-): ApiProvider by OpenAiConfig(
+) : ApiProvider by OpenAiConfig(
     baseUrl = "https://dashscope.aliyuncs.com/compatible-mode/v1/",
     apiKey = apiKey,
     modelList = modelList
@@ -21,19 +23,50 @@ data class DashScopeConfig(
 data class DeepSeekConfig(
     val apiKey: String,
     val modelList: List<String> = listOf("deepseek-chat", "deepseek-reasoner"),
-): ApiProvider by OpenAiConfig(
-    baseUrl = "https://api.deepseek.com/",
-    apiKey = apiKey,
-    modelList = modelList
-)
+) : ApiProvider {
+    val delegate = OpenAiConfig(
+        baseUrl = "https://api.deepseek.com/",
+        apiKey = apiKey,
+        modelList = modelList
+    )
+
+    override suspend fun getModelNameList(): List<String> = modelList
+
+    override suspend fun generateLStream(request: LChatCompletionRequest): Flow<LChatCompletionResponseChunk> {
+        return delegate.generateLStream(
+            request.copy(
+                messages = request.messages.mergeBy(
+                    selector = { it.role },
+                    merger = { a, b -> a.copy(content = a.content + b.content) }
+                )
+            )
+        )
+    }
+
+    override suspend fun generateOStream(request: OChatRequest): Flow<OChatResponseChunk> {
+        return delegate.generateOStream(
+            request.copy(
+                messages = request.messages.mergeBy(
+                    selector = { it.role },
+                    merger = { a, b -> a.copy(content = a.content + b.content) }
+                )
+            )
+        )
+    }
+
+    override fun close() {
+        delegate.close()
+    }
+
+}
 
 @Suppress("unused")
 @Serializable
 @SerialName("Mistral")
 data class MistralConfig(
     val apiKey: String,
     val modelList: List<String> = listOf("codestral", "mistral-large"),
-): ApiProvider by OpenAiConfig(
+) : ApiProvider by OpenAiConfig(
     baseUrl = "https://api.mistral.ai/v1/",
     apiKey = apiKey,
     modelList = modelList
@@ -45,7 +78,7 @@ data class MistralConfig(
 data class SiliconFlowConfig(
     val apiKey: String,
     val modelList: List<String>,
-): ApiProvider by OpenAiConfig(
+) : ApiProvider by OpenAiConfig(
     baseUrl = "https://api.siliconflow.cn/v1/",
     apiKey = apiKey,
     modelList = modelList
@@ -57,7 +90,7 @@ data class SiliconFlowConfig(
 data class GeminiConfig(
     val apiKey: String,
     val modelList: List<String>,
-): ApiProvider by OpenAiConfig(
+) : ApiProvider by OpenAiConfig(
     baseUrl = "https://generativelanguage.googleapis.com/v1beta/openai",
     apiKey = apiKey,
     modelList = modelList
@@ -69,7 +102,7 @@ data class GeminiConfig(
 data class ClaudeConfig(
     val apiKey: String,
     val modelList: List<String>,
-): ApiProvider by OpenAiConfig(
+) : ApiProvider by OpenAiConfig(
     baseUrl = "https://api.anthropic.com/v1/",
     apiKey = apiKey,
     modelList = modelList
@@ -81,7 +114,7 @@ data class ClaudeConfig(
 data class OpenRouterConfig(
     val apiKey: String,
     val modelList: List<String>,
-): ApiProvider by OpenAiConfig(
+) : ApiProvider by OpenAiConfig(
     baseUrl = "https://openrouter.ai/api/v1",
     apiKey = apiKey,
     modelList = modelList