feat(openAi): add organizationId field

Author: Blarc

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientConfiguration.kt

@@ -2,11 +2,13 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients.openAi
 
 import com.github.blarc.ai.commits.intellij.plugin.Icons
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
-import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientSharedState
 import com.intellij.openapi.vcs.ui.CommitMessage
 import javax.swing.Icon
 
-class OpenAiClientConfiguration(displayName: String = "OpenAI") : LLMClientConfiguration(
+class OpenAiClientConfiguration(
+    displayName: String = "OpenAI",
+    var organizationId: String? = null
+) : LLMClientConfiguration(
     displayName,
     "https://api.openai.com/v1",
     null,
@@ -18,7 +20,7 @@ class OpenAiClientConfiguration(displayName: String = "OpenAI") : LLMClientConfi
         return Icons.OPEN_AI
     }
 
-    override fun getSharedState(): LLMClientSharedState {
+    override fun getSharedState(): OpenAiClientSharedState {
         return OpenAiClientSharedState.getInstance()
     }
 
@@ -35,6 +37,7 @@ class OpenAiClientConfiguration(displayName: String = "OpenAI") : LLMClientConfi
         copy.proxyUrl = proxyUrl
         copy.timeout = timeout
         copy.modelId = modelId
+        copy.organizationId = organizationId
         copy.temperature = temperature
         return copy
     }

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientPanel.kt

@@ -7,8 +7,9 @@ import com.intellij.ui.components.JBPasswordField
 import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.dsl.builder.toNonNullableProperty
 
-class OpenAiClientPanel(private val client: OpenAiClientConfiguration) : LLMClientPanel(client) {
+class OpenAiClientPanel(private val clientConfiguration: OpenAiClientConfiguration) : LLMClientPanel(clientConfiguration) {
 
     private val tokenPasswordField = JBPasswordField()
 
@@ -21,7 +22,7 @@ class OpenAiClientPanel(private val client: OpenAiClientConfiguration) : LLMClie
             label(message("settings.llmClient.token"))
                 .widthGroup("label")
             cell(tokenPasswordField)
-                .bindText(client::token)
+                .bindText(clientConfiguration::token)
                 .emptyText(message("settings.openAI.token.example"))
                 .resizableColumn()
                 .focused()
@@ -33,6 +34,15 @@ class OpenAiClientPanel(private val client: OpenAiClientConfiguration) : LLMClie
         }
 
         modelIdRow()
+
+        row {
+            label(message("settings.openAi.organizationId"))
+                .widthGroup("label")
+            textField()
+                .bindText(clientConfiguration::organizationId.toNonNullableProperty(""))
+                .widthGroup("input")
+        }
+
         temperatureRow()
         verifyRow()
 

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/openAi/OpenAiClientService.kt

@@ -20,7 +20,6 @@ class OpenAiClientService(cs: CoroutineScope) : LLMClientService<OpenAiClientCon
     }
 
     override fun buildChatModel(client: OpenAiClientConfiguration): ChatLanguageModel {
-        // TODO @Blarc: Add OPENAI_ORG
         val builder = OpenAiChatModel.builder()
             .apiKey(client.token)
             .modelName(client.modelId)
@@ -32,6 +31,11 @@ class OpenAiClientService(cs: CoroutineScope) : LLMClientService<OpenAiClientCon
             val uri = URI(it)
             builder.proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress(uri.host, uri.port)))
         }
+
+        client.organizationId?.takeIf { it.isNotBlank() }?.let {
+            builder.organizationId(it)
+        }
+
         return builder.build()
     }
 

src/main/resources/messages/MyBundle.properties

@@ -74,3 +74,4 @@ settings.llmClient.temperature.comment=What sampling temperature to use, between
 settings.openAI.token.example=sk-ABCdefgHIjKlxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 settings.openAi.token.comment=\
   <p>You can get your token <a href="https://platform.openai.com/account/api-keys">here.</a/></p>
+settings.openAi.organizationId=Organization ID