Skip to content

Commit e912137

Browse files
committed
refactor(devti): remove unused stream parameter from custom request and closed #361
- Remove stream parameter from updateCustomFormat function - Remove stream handling logic from updateCustomBody function - This change simplifies the custom request process by removing unnecessary stream-related code
1 parent 3b9f7e4 commit e912137

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

core/src/main/kotlin/cc/unitmesh/devti/llm2/LLMProvider2.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private class DefaultLLMTextProvider(
178178
val cm = it.chatMessage
179179
Message(cm.role, cm.content ?: "")
180180
})
181-
val requestBodyText = customRequest.updateCustomFormat(requestCustomize, stream)
181+
val requestBodyText = customRequest.updateCustomFormat(requestCustomize)
182182
val requestBody = RequestBody.create("application/json".toMediaTypeOrNull(), requestBodyText.toByteArray())
183183
println("requestUrl: $requestUrl")
184184
val request: Request = requestBuilder.url(requestUrl).post(requestBody).build()

core/src/main/kotlin/cc/unitmesh/devti/llms/custom/CustomSSEProcessor.kt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,8 @@ fun Request.Builder.appendCustomHeaders(customRequestHeader: String): Request.Bu
200200
}
201201
}
202202

203-
204-
/**
205-
* [stream] 值优先于 [fields] 中的 customFileds.stream 字段
206-
*/
207203
@VisibleForTesting
208-
fun JsonObject.updateCustomBody(customRequest: String, stream: Boolean? = null): JsonObject {
204+
fun JsonObject.updateCustomBody(customRequest: String): JsonObject {
209205
return runCatching {
210206
buildJsonObject {
211207
// copy origin object
@@ -241,11 +237,6 @@ fun JsonObject.updateCustomBody(customRequest: String, stream: Boolean? = null):
241237
customFields.jsonObject.forEach { (key, value) ->
242238
put(key, value)
243239
}
244-
245-
// stream 参数优先级高于 customFields.stream
246-
if (stream != null) {
247-
put("stream", stream)
248-
}
249240
}
250241

251242
// TODO clean code with magic literals
@@ -274,11 +265,11 @@ fun JsonObject.updateCustomBody(customRequest: String, stream: Boolean? = null):
274265
}
275266
}
276267

277-
fun CustomRequest.updateCustomFormat(format: String, stream: Boolean? = null): String {
268+
fun CustomRequest.updateCustomFormat(format: String): String {
278269
val requestContentOri = Json.encodeToString<CustomRequest>(this)
279270
val updateCustomBody = kotlin.runCatching {
280271
Json.parseToJsonElement(requestContentOri)
281-
.jsonObject.updateCustomBody(format, stream)
272+
.jsonObject.updateCustomBody(format)
282273
}.getOrElse {
283274
logger<CustomLLMProvider>().error("Failed to update custom request body: ${format}", it)
284275
requestContentOri

0 commit comments

Comments
 (0)