Merge pull request #120 from iptton/master

fix openAI custom model issue && add notice for wrong custom response format && updata documents

Author: phodal

docs/customize/custom-llm-server.md

@@ -98,11 +98,12 @@ And the request body will be:
 - Custom Engine Server：https://api.moonshot.cn/v1/chat/completions 
 - Request body format
 ```json
-{ "customFields": {"model": "moonshot-v1-8k"},   "messageKeys": {"role": "role", "content": "content"} }
+{ "customFields": {"model": "moonshot-v1-8k", "stream": true },   "messageKeys": {"role": "role", "content": 
+"content"} }
 ```
 - Response format:
 ```
-$.choices[0].delta.content 
+$.choices[0].delta.content
 ```
 
 ### DeepSeek AI examples

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

@@ -80,28 +80,34 @@ open class CustomSSEProcessor(private val project: Project) {
                     sseFlowable
                         .doOnError {
                             it.printStackTrace()
+                            trySend(it.message ?: "Error occurs")
                             close()
                         }
                         .blockingForEach { sse ->
                             if (responseFormat.isNotEmpty()) {
                                 // {"id":"cmpl-a22a0d78fcf845be98660628fe5d995b","object":"chat.completion.chunk","created":822330,"model":"moonshot-v1-8k","choices":[{"index":0,"delta":{},"finish_reason":"stop","usage":{"prompt_tokens":434,"completion_tokens":68,"total_tokens":502}}]}
                                 // in some case, the response maybe not equal to our response format, so we need to ignore it
-//                                logger.info("SSE: ${sse.data}")
-                                val chunk: String = try {
-                                    JsonPath.parse(sse!!.data)?.read(responseFormat) ?: ""
-                                } catch (e: Exception) {
-                                    if (hasSuccessRequest) {
-                                        logger.info("Failed to parse response", e)
+                                val chunk: String? = JsonPath.parse(sse!!.data)?.read(responseFormat)
+
+                                // new JsonPath lib caught the exception, so we need to handle when it is null
+                                if (chunk == null) {
+                                    // if first chunk parse failed, notice user to check response format
+                                    if(hasSuccessRequest) {
+                                        val errorMsg = """
+                                        **Failed** to parse response.origin response is: 
+                                        <code>${sse.data}</code>
+                                         please check your response format: 
+                                        **$responseFormat**\n""".trimIndent()
+
+                                        // TODO add refresh feature
+                                        trySend(errorMsg)
+                                        close()
                                     } else {
-                                        logger.error("Failed to parse response", e)
+                                        logger.info("Failed to parse response.origin response is: ${sse.data}")
                                     }
                                     return@blockingForEach
                                 }
 
-                                if (chunk.isEmpty()) {
-                                    return@blockingForEach
-                                }
-
                                 hasSuccessRequest = true
 
                                 output += chunk
@@ -201,4 +207,4 @@ fun CustomRequest.updateCustomFormat(format: String): String {
     val requestContentOri = Json.encodeToString<CustomRequest>(this)
     return Json.parseToJsonElement(requestContentOri)
         .jsonObject.updateCustomBody(format).toString()
-}
+}

src/main/kotlin/cc/unitmesh/devti/llms/openai/OpenAIProvider.kt

@@ -35,11 +35,11 @@ class OpenAIProvider(val project: Project) : LLMProvider {
     private val timeout = Duration.ofSeconds(defaultTimeout)
     private val openAiVersion: String
         get() {
-            val customModel = AutoDevSettingsState.getInstance().customModel
-            if(AutoDevSettingsState.getInstance().openAiModel == SELECT_CUSTOM_MODEL) {
-                AutoDevSettingsState.getInstance().openAiModel = customModel
+            val model = AutoDevSettingsState.getInstance().openAiModel
+            if(model == SELECT_CUSTOM_MODEL) {
+                return AutoDevSettingsState.getInstance().customModel
             }
-            return  AutoDevSettingsState.getInstance().openAiModel
+            return model
         }
     private val openAiKey: String
         get() = AutoDevSettingsState.getInstance().openAiKey