Merge pull request #31 from devchat-ai/bug-fix

Bug fix

Author: pplam

.idea/vcs.xml

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "ai.devchat"
-version = "0.0.1"
+version = "0.0.2"
 
 repositories {
     mavenCentral()

build.gradle.kts

@@ -4,66 +4,22 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import java.io.File
 
-/*
-* default_model: gpt-3.5-turbo
-* models:
-*   gpt-3.5-turbo:
-*     provider: devchat.ai
-*     stream: true
-*/
-class DevChatConfig {
-    private var configPath: String
-
-    // Getters and Setters
+data class ModelConfig(val provider: String?, val isStream: Boolean)
+class DevChatConfig(private val configPath: String) {
     var default_model: String? = null
     var models: Map<String, ModelConfig>? = null
 
-    constructor() {
-        // default config path
-        configPath = System.getProperty("user.home") + "/.chat/config.yml"
-    }
-
-    constructor(configPath: String) {
-        this.configPath = configPath
-    }
-
-    open class ModelConfig {
-        // getters and setters
-        var provider: String? = null
-        var isStream = false
-    }
-
     fun writeDefaultConfig() {
         default_model = "gpt-3.5-turbo"
-        models = java.util.Map.of(
-            "gpt-3.5-turbo",
-            object : ModelConfig() {
-                init {
-                    provider = "devchat.ai"
-                    isStream = true
-                }
-            },
-            "gpt-3.5-turbo-16k",
-            object : ModelConfig() {
-                init {
-                    provider = "devchat.ai"
-                    isStream = true
-                }
-            },
-            "gpt-4",
-            object : ModelConfig() {
-                init {
-                    provider = "devchat.ai"
-                    isStream = true
-                }
-            },
-            "claude-2",
-            object : ModelConfig() {
-                init {
-                    provider = "general"
-                    isStream = true
-                }
-            })
+        models = mapOf(
+            "gpt-3.5-turbo" to ModelConfig(provider = "devchat.ai", isStream = true),
+            "gpt-3.5-turbo-16k" to ModelConfig(provider = "devchat.ai", isStream = true),
+            "gpt-4" to ModelConfig(provider = "devchat.ai", isStream = true),
+            "claude-2" to ModelConfig(provider = "general", isStream = true),
+            "xinghuo-2" to ModelConfig(provider = "general", isStream = true),
+            "chatglm_pro" to ModelConfig(provider = "general", isStream = true),
+            "ERNIE-Bot" to ModelConfig(provider = "general", isStream = true),
+        )
         save()
     }
 

src/main/kotlin/ai/devchat/cli/DevChatConfig.kt

@@ -3,6 +3,7 @@ package ai.devchat.cli
 import ai.devchat.common.DevChatPathUtil
 import ai.devchat.common.Log
 import ai.devchat.common.Settings
+import ai.devchat.idea.balloon.DevChatNotifier
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONArray
 import com.intellij.util.alsoIfNull
@@ -111,6 +112,11 @@ class DevChatWrapper(
 
     val prompt: (MutableList<Pair<String, String?>>, String, ((String) -> Unit)?) -> Unit get() = {
         flags: MutableList<Pair<String, String?>>, message: String, callback: ((String) -> Unit)? ->
+            if (apiKey.isNullOrEmpty()) {
+                DevChatNotifier.stickyError("DevChat Error", "Please config your API key first.")
+            } else if (!apiKey!!.startsWith("DC.")) {
+                DevChatNotifier.stickyError("DevChat Error", "Invalid API key format.")
+            }
             flags
                 .find { it.first == "model" && !it.second.isNullOrEmpty() }
                 .alsoIfNull { flags.add("model" to defaultModel) }

src/main/kotlin/ai/devchat/cli/DevChatWrapper.kt

@@ -29,7 +29,7 @@ class DevChatSetupThread(private val project: Project) : Thread() {
                     workflowEnv.installRequirements(it)
                 }
 
-            val config = DevChatConfig()
+            val config = DevChatConfig("$workPath/config.yml")
             config.writeDefaultConfig()
             notifyInfo(project, "DevChat initialization has completed successfully.")
         } catch (e: Exception) {

src/main/kotlin/ai/devchat/idea/DevChatSetupThread.kt

@@ -3,6 +3,9 @@ package ai.devchat.idea.balloon
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.project.Project
+import com.intellij.notification.Notification
+import com.intellij.notification.Notifications
+import com.intellij.notification.NotificationDisplayType
 
 object DevChatNotifier {
     @JvmStatic
@@ -20,4 +23,11 @@ object DevChatNotifier {
             .createNotification(content!!, NotificationType.ERROR)
             .notify(project)
     }
+
+    fun stickyError(title: String, content: String) {
+        val notification = Notification(
+            "stickyBalloon", title, content, NotificationType.ERROR
+        )
+        Notifications.Bus.notify(notification)
+    }
 }

src/main/kotlin/ai/devchat/idea/balloon/DevChatNotifier.kt

@@ -36,6 +36,7 @@
         <applicationService serviceImplementation="ai.devchat.idea.settings.DevChatSettingsState"/>
         <notificationGroup id="Custom Notification Group"
                            displayType="BALLOON"/>
+        <notificationGroup id="stickyBalloon" displayType="STICKY_BALLOON" isLogByDefault="true"/>
     </extensions>
     <actions>
         <action id="ai.devchat.idea.action.AddToDevChatEditorAction"