etc models

SimiaCryptus · Feb 16, 2024 · a62baff · a62baff
1 parent 3897a16
commit a62baff
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 130 deletions.
diff --git a/SkyeNet/core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/TextToSpeechActor.kt b/SkyeNet/core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/TextToSpeechActor.kt
diff --git a/path/to/storybooks/storybook_08b7482a-b5b9-4d56-8930-18a06cef1080.html b/path/to/storybooks/storybook_08b7482a-b5b9-4d56-8930-18a06cef1080.html
diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/config/AppSettingsComponent.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/config/AppSettingsComponent.kt
@@ -126,6 +126,7 @@ class AppSettingsComponent : com.intellij.openapi.Disposable {
     this.modelName.addItem(ChatModels.GPT35Turbo.modelName)
     this.modelName.addItem(ChatModels.GPT4.modelName)
     this.modelName.addItem(ChatModels.GPT4Turbo.modelName)
+   this.modelName.isEditable = true
   }
 
   companion object {

diff --git a/src/main/kotlin/com/github/simiacryptus/aicoder/ui/ModelSelectionWidgetFactory.kt b/src/main/kotlin/com/github/simiacryptus/aicoder/ui/ModelSelectionWidgetFactory.kt
@@ -3,17 +3,17 @@
 import com.github.simiacryptus.aicoder.config.AppSettingsState
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopup
+import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.wm.StatusBar
 import com.intellij.openapi.wm.StatusBarWidget
 import com.intellij.openapi.wm.StatusBarWidgetFactory
 import com.intellij.ui.CollectionListModel
 import com.intellij.ui.SimpleListCellRenderer
-import com.intellij.ui.popup.list.ComboBoxPopup
+import com.intellij.ui.components.JBList
 import com.simiacryptus.jopenai.models.ChatModels
 import kotlinx.coroutines.CoroutineScope
-import javax.swing.JList
-import javax.swing.ListCellRenderer
-import javax.swing.ListModel
+import java.awt.BorderLayout
+import javax.swing.*
 
 class ModelSelectionWidgetFactory : StatusBarWidgetFactory {
     companion object {
@@ -54,34 +54,45 @@ class ModelSelectionWidgetFactory : StatusBarWidgetFactory {
             return activeModel
         }
 
+        private fun getRenderer(): ListCellRenderer<in String> = object : SimpleListCellRenderer<String>() {
+            override fun customize(list: JList<out String>, value: String?, index: Int, selected: Boolean, hasFocus: Boolean) {
+                text = value // Here you can add more customization if needed
+            }
+        }
         override fun getPopup(): JBPopup {
-            val context = object : ComboBoxPopup.Context<String> {
-                override fun getProject(): Project? {
-                    return null
-                }
+            val inputField = JTextField()
+            val listModel = CollectionListModel(models.map { it.modelName })
+            val list = JBList(listModel)
+            list.cellRenderer = getRenderer()
+
+            val panel = JPanel(BorderLayout())
+            panel.add(inputField, BorderLayout.NORTH)
+            panel.add(JScrollPane(list), BorderLayout.CENTER)
+
+            val popup = JBPopupFactory.getInstance().createComponentPopupBuilder(panel, inputField)
+                .setRequestFocus(true)
+                .setCancelOnClickOutside(true)
+                .createPopup()
+
+            list.addListSelectionListener {
+                val selectedValue = list.selectedValue
+                activeModel = selectedValue
+                AppSettingsState.instance.modelName = selectedValue
+                statusBar?.updateWidget(ID())
+                popup.closeOk(null)
+            }
 
-                override fun getModel(): ListModel<String> = CollectionListModel(models.map { it.modelName })
-
-                override fun getRenderer(): ListCellRenderer<in String> {
-                    return object : SimpleListCellRenderer<String>() {
-                        override fun customize(
-                            list: JList<out String>,
-                            value: String?,
-                            index: Int,
-                            selected: Boolean,
-                            hasFocus: Boolean
-                        ) {
-                            text = value
-                        }
-
-                    }
+            inputField.addActionListener {
+                val inputValue = inputField.text
+                if (inputValue.isNotEmpty()) {
+                    activeModel = inputValue
+                    AppSettingsState.instance.modelName = inputValue
+                    statusBar?.updateWidget(ID())
+                    popup.closeOk(null)
                 }
             }
-            return ComboBoxPopup(context, activeModel, { str ->
-                activeModel = str
-                AppSettingsState.instance.modelName = str
-                statusBar?.updateWidget(ID())
-            })
+
+            return popup
         }
     }