Merge branch 'main' into dev_marc

# Conflicts:
#	gradle.properties
#	src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitAction.kt
#	src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/OpenAIService.kt
#	src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/notifications/Notification.kt
#	src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettings.kt
#	src/main/resources/messages/MyBundle.properties

Author: Marc-R2

CHANGELOG.md

@@ -1,9 +1,21 @@
 # Changelog
 
 ## [Unreleased]
+
+## [0.5.0] - 2023-04-04
+
 ### Added
 - Add button for verifying Open AI token in settings.
+- Check if prompt is too large for Open AI API.
+- Welcome and star notification.
+
+### Changed
+- Set default Locale to English.
+- Target latest intellij version (2023.1).
+- Improve error handling.
 
+### Fixed
+- Properly serialize Locale when saving settings.
 
 ## [0.4.0] - 2023-03-29
 
@@ -26,7 +38,8 @@
 - Settings for locale and OpenAI token.
 - Create commit message only for selected files.
 
-[Unreleased]: https://github.com/Blarc/ai-commits-intellij-plugin/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/Blarc/ai-commits-intellij-plugin/compare/v0.5.0...HEAD
+[0.5.0]: https://github.com/Blarc/ai-commits-intellij-plugin/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/Blarc/ai-commits-intellij-plugin/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/Blarc/ai-commits-intellij-plugin/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/Blarc/ai-commits-intellij-plugin/commits/v0.2.0

build.gradle.kts

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.8.10"
+    id("org.jetbrains.kotlin.jvm") version "1.8.20"
     id("org.jetbrains.intellij") version "1.13.3"
 
     // Gradle Changelog Plugin
@@ -114,4 +114,6 @@ dependencies {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk7")
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }
+    
+    implementation("com.knuddels:jtokkit:0.1.0")
 }

gradle.properties

@@ -3,10 +3,10 @@ pluginGroup = com.github.blarc
 pluginName = AICommits
 pluginRepositoryUrl = https://github.com/Blarc/ai-commits-intellij-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.5.1
+pluginVersion = 0.5.2
 
 # https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 223
+pluginSinceBuild = 231
 # pluginUntilBuild = 222.*
 
 # https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
@@ -29,4 +29,7 @@ gradleVersion = 8.0.2
 kotlin.stdlib.default.dependency = false
 
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
-org.gradle.unsafe.configuration-cache = true
+org.gradle.unsafe.configuration-cache = true
+
+# Prevent OOM: https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#incremental-compilation
+kotlin.incremental.useClasspathSnapshot=false

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

@@ -3,6 +3,7 @@ package com.github.blarc.ai.commits.intellij.plugin
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.notifications.Notification
 import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotification
+import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.diff.impl.patch.IdeaTextPatchBuilder
@@ -14,6 +15,8 @@ import com.intellij.openapi.vcs.VcsDataKeys
 import com.intellij.openapi.vcs.changes.Change
 import com.intellij.openapi.vcs.ui.CommitMessage
 import com.intellij.vcs.commit.AbstractCommitWorkflowHandler
+import com.knuddels.jtokkit.Encodings
+import com.knuddels.jtokkit.api.EncodingType
 import git4idea.repo.GitRepositoryManager
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -60,6 +63,7 @@ class AICommitAction : AnAction(), DumbAware {
                 try {
                     val generatedCommitMessage = openAIService.generateCommitMessage(diff, hint, 1)
                     commitMessageField.setCommitMessage(generatedCommitMessage)
+                    AppSettings.instance.recordHit()
                 } catch (e: Exception) {
                     commitMessageField.setCommitMessage("Error generating commit message")
                     sendNotification(Notification.unsuccessfulRequest(e.message ?: "Unknown error"))
@@ -105,4 +109,10 @@ class AICommitAction : AnAction(), DumbAware {
             }
             .joinToString("\n")
     }
+
+    private fun isPromptTooLarge(prompt: String): Boolean {
+        val registry = Encodings.newDefaultEncodingRegistry()
+        val encoding = registry.getEncoding(EncodingType.CL100K_BASE)
+        return encoding.countTokens(prompt) > 4000
+    }
 }

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

@@ -0,0 +1,30 @@
+package com.github.blarc.ai.commits.intellij.plugin.listeners
+
+import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle
+import com.github.blarc.ai.commits.intellij.plugin.notifications.Notification
+import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotification
+import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.startup.ProjectActivity
+
+class ApplicationStartupListener : ProjectActivity {
+
+    private var firstTime = true
+    override suspend fun execute(project: Project) {
+        showVersionNotification(project)
+    }
+    private fun showVersionNotification(project: Project) {
+        val settings = AppSettings.instance
+        val version = AICommitsBundle.plugin()?.version
+
+        if (version == settings.lastVersion) {
+            return
+        }
+
+        settings.lastVersion = version
+        if (firstTime && version != null) {
+            sendNotification(Notification.welcome(version), project)
+        }
+        firstTime = false
+    }
+}

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

@@ -23,11 +23,11 @@ data class Notification(
     companion object {
         private val DEFAULT_TITLE = message("notifications.title")
 
-        fun welcome(version: String) = Notification(message = message("notifications.welcome", version))
+        fun welcome(version: String) = Notification(message = message("notifications.welcome", version), type = Type.TRANSIENT)
 
         fun star() = Notification(
             message = """
-                Finding Gitlab Template Lint useful? Show your support 💖 and ⭐ the repository 🙏.
+                Finding Commit-GPT useful? Show your support 💖 and ⭐ the repository 🙏.
             """.trimIndent(),
             actions = setOf(
                 NotificationAction.openRepository() {
@@ -43,7 +43,13 @@ data class Notification(
 
         fun emptyDiff() = Notification(DEFAULT_TITLE, message = message("notifications.empty-diff"))
 
-        fun unsuccessfulRequest(message: String) = Notification(message = message("notifications.unsuccessful-request", message))
+        fun promptTooLarge() = Notification(DEFAULT_TITLE, message = message("notifications.prompt-too-large"))
+
+        fun unsuccessfulRequest(message: String) = Notification(
+            message = message("notifications.unsuccessful-request", message)
+        )
+
+        fun noCommitMessage(): Notification = Notification(message = message("notifications.no-commit-message"))
 
         fun unableToSaveToken() = Notification(message = message("notifications.unable-to-save-token"))
 

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

@@ -10,8 +10,10 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
+import com.intellij.util.xmlb.Converter
 import com.intellij.util.xmlb.XmlSerializerUtil
-import java.util.Locale
+import com.intellij.util.xmlb.annotations.OptionTag
+import java.util.*
 
 @State(
     name = AppSettings.SERVICE_NAME,
@@ -22,6 +24,8 @@ class AppSettings : PersistentStateComponent<AppSettings> {
     private val openAITokenTitle = "OpenAIToken"
     private val openAIPromptTitle = "OpenAIPrompt"
 
+    private var hits = 0
+
     private var defaultPrompt = "Write a git commit message. " +
             "Use the conventional commit convention and follow best practices to maintain clear and concise commit messages. " +
             "The format have to be 'type(scope): short' and should not exceed 74 characters.\n" +
@@ -40,7 +44,6 @@ class AppSettings : PersistentStateComponent<AppSettings> {
     }
 
     fun saveOpenAIToken(token: String) {
-        println("Saving token: $token")
         try {
             PasswordSafe.instance.setPassword(getCredentialAttributes(openAITokenTitle), token)
         } catch (e: Exception) {
@@ -79,4 +82,11 @@ class AppSettings : PersistentStateComponent<AppSettings> {
     }
 
 
+    fun recordHit() {
+        hits++
+        return
+        if (requestSupport && (hits == 50 || hits % 100 == 0)) {
+            sendNotification(Notification.star())
+        }
+    }
 }

src/main/resources/META-INF/plugin.xml

@@ -63,6 +63,9 @@
                 displayType="STICKY_BALLOON"
                 key="notification.group.important.name"
         />
+        <postStartupActivity
+                implementation="com.github.blarc.ai.commits.intellij.plugin.listeners.ApplicationStartupListener"/>
+
     </extensions>
 
     <actions>

src/main/resources/messages/MyBundle.properties

@@ -14,6 +14,8 @@ settings.verify.running=Verifying Open AI token...
 settings.verify.token-is-empty=Open AI token is empty.
 
 action.background=Generating commit message
+action.error=Commit message could not be generated.
+action.unknown-error=Unknown error has occurred.
 
 notifications.title=AI Commits
 notifications.welcome=Thanks for installing AI Commits <strong>{0}</strong>
@@ -29,6 +31,8 @@ notifications.unable-to-save-token=Unable to save token
 actions.do-not-ask-again = Do not ask me again.
 actions.take-me-there = Take me there.
 actions.sure-take-me-there=Sure, take me there.
+notifications.prompt-too-large=The diff is too large for the OpenAI API. Try reducing the number of staged changes, or write your own commit message.
+notifications.no-commit-message=Commit field has not been initialized correctly.
 settings.promptValidation=Need to include: {diffs}
 notifications.uses-prompt=Prompt:\n{0}