Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsConfigurable.kt
#	src/main/resources/messages/MyBundle.properties

Author: Marc-R2

.gitignore

@@ -40,4 +40,4 @@ bin/
 
 ### Mac OS ###
 .DS_Store
-/.idea/
+/.idea/

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- Add button for verifying Open AI token in settings.
+
 
 ## [0.4.0] - 2023-03-29
 

README.md

@@ -76,7 +76,8 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ## Acknowledgements
 
-Inspired by Nutlope's [AICommits](https://github.com/Nutlope/aicommits).
+- Inspired by Nutlope's [AICommits](https://github.com/Nutlope/aicommits).
+- [openai-kotlin](https://github.com/aallam/openai-kotlin) for OpenAI API client.
 
 ## License
 

gradle.properties

@@ -15,16 +15,18 @@ platformVersion = 2023.1
 
 # https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = org.jetbrains.kotlin, org.jetbrains.plugins.github
+platformPlugins = org.jetbrains.kotlin, org.jetbrains.plugins.github, Git4Idea
 
 # If targeting 2022.3+, Java 17 is required.
 javaVersion = 17
 
 # https://github.com/gradle/gradle/releases
-gradleVersion = 7.6
+gradleVersion = 8.0.2
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
 # suppress inspection "UnusedProperty"
-# kotlin.stdlib.default.dependency = false
-kotlin.stdlib.default.dependency = false
+kotlin.stdlib.default.dependency = false
+
+# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.unsafe.configuration-cache = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -2,6 +2,7 @@ package com.github.blarc.ai.commits.intellij.plugin
 
 import com.aallam.openai.api.BetaOpenAI
 import com.aallam.openai.api.chat.*
+import com.aallam.openai.api.completion.CompletionRequest
 import com.aallam.openai.api.model.ModelId
 import com.aallam.openai.client.OpenAI
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings
@@ -43,4 +44,8 @@ class OpenAIService {
         val completion: ChatCompletion = openAI.chatCompletion(chatCompletionRequest)
         return completion.choices[0].message!!.content
     }
+    @Throws(Exception::class)
+    suspend fun verifyToken(token: String){
+        OpenAI(token).models()
+    }
 }

gradlew.bat

@@ -1,29 +1,47 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings
 
+import com.aallam.openai.api.exception.OpenAIAPIException
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
+import com.github.blarc.ai.commits.intellij.plugin.OpenAIService
+import com.intellij.icons.AllIcons
 import com.intellij.ide.starters.shared.withValidation
 import com.intellij.openapi.options.BoundConfigurable
+import com.intellij.openapi.progress.runBackgroundableTask
+import com.intellij.ui.components.JBLabel
 import com.intellij.ui.dsl.builder.*
-import java.awt.Component
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import java.util.*
-import javax.swing.DefaultListCellRenderer
-import javax.swing.JList
+import javax.swing.JPasswordField
 
 class AppSettingsConfigurable : BoundConfigurable(message("settings.general.group.title")) {
+
+    private val tokenPasswordField = JPasswordField()
+    private val verifyLabel = JBLabel()
     override fun createPanel() = panel {
         // OpenAI Token
         row {
-            passwordField()
+            cell(tokenPasswordField)
                 .label(message("settings.openAIToken"))
                 .bindText(
                     { AppSettings.instance.getOpenAIToken().orEmpty() },
                     { AppSettings.instance.saveOpenAIToken(it) }
                 )
                 .align(Align.FILL)
+                .resizableColumn()
+                .focused()
+            button(message("settings.verifyToken")) {
+                verifyToken()
+            }.align(AlignX.RIGHT)
         }
         // Get OpenAI Token
         row {
             comment(message("settings.openAITokenComment"))
+                .align(AlignX.LEFT)
+            cell(verifyLabel)
+                .align(AlignX.RIGHT)
         }
 
         // Prompt to use with OpenAI
@@ -36,7 +54,36 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
                 )
                 .align(Align.FILL)
         }
+    }
 
+    @OptIn(DelicateCoroutinesApi::class)
+    private fun verifyToken() {
+        runBackgroundableTask(message("settings.verify.running")) {
+            if (tokenPasswordField.password.isEmpty()) {
+                verifyLabel.icon = AllIcons.General.InspectionsError
+                verifyLabel.text = message("settings.verify.token-is-empty")
+            } else {
+                verifyLabel.icon = AllIcons.General.InlineRefreshHover
+                verifyLabel.text = message("settings.verify.running")
+
+                GlobalScope.launch(Dispatchers.IO) {
+                    try {
+                        println(String(tokenPasswordField.password))
+                        OpenAIService.instance.verifyToken(String(tokenPasswordField.password))
+                        verifyLabel.text = message("settings.verify.valid")
+                        verifyLabel.icon = AllIcons.General.InspectionsOK
+                    }
+                    catch (e: OpenAIAPIException) {
+                        verifyLabel.text = message("settings.verify.invalid", e.statusCode)
+                        verifyLabel.icon = AllIcons.General.InspectionsError
+                    }
+                    catch (e: Exception) {
+                        verifyLabel.text = message("settings.verify.invalid", "Unknown")
+                        verifyLabel.icon = AllIcons.General.InspectionsError
+                    }
+                }
+            }
+        }
 
     }
 }

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/OpenAIService.kt

@@ -27,7 +27,6 @@
     <!-- Product and plugin compatibility requirements.
          Read more: https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html -->
     <depends>com.intellij.modules.platform</depends>
-    <depends>org.jetbrains.plugins.yaml</depends>
     <depends>Git4Idea</depends>
 
     <applicationListeners>