feat: use GoogleCompletionRequest.systemInstruction for system prompt (#989)

* feat: use GoogleCompletionRequest.systemInstruction for system prompt

* fix(test): req body assertion

---------

Co-authored-by: Carl-Robert Linnupuu <carlrobertoh@gmail.com>

Author: PhilKes

src/main/kotlin/ee/carlrobert/codegpt/completions/factory/GoogleRequestFactory.kt

@@ -31,6 +31,7 @@ class GoogleRequestFactory : BaseRequestFactory() {
                     .maxOutputTokens(configuration.maxTokens)
                     .temperature(configuration.temperature.toDouble()).build()
             )
+            .systemInstruction(buildSystemInstruction(params))
             .build()
     }
 
@@ -94,33 +95,6 @@ class GoogleRequestFactory : BaseRequestFactory() {
         val message = params.message
         val messages = mutableListOf<GoogleCompletionContent>()
 
-        when (params.conversationType) {
-            ConversationType.DEFAULT -> {
-                val selectedPersona = service<PromptsSettings>().state.personas.selectedPersona
-                if (!selectedPersona.disabled) {
-                    messages.add(
-                        GoogleCompletionContent(
-                            "user",
-                            listOf(PromptsSettings.getSelectedPersonaSystemPrompt())
-                        )
-                    )
-                    messages.add(GoogleCompletionContent("model", listOf("Understood.")))
-                }
-            }
-
-            ConversationType.FIX_COMPILE_ERRORS -> {
-                messages.add(
-                    GoogleCompletionContent(
-                        "user",
-                        listOf(service<PromptsSettings>().state.coreActions.fixCompileErrors.instructions)
-                    )
-                )
-                messages.add(GoogleCompletionContent("model", listOf("Understood.")))
-            }
-
-            else -> {}
-        }
-
         for (prevMessage in params.conversation.messages) {
             if (params.retry && prevMessage.id == message.id) {
                 break
@@ -207,4 +181,23 @@ class GoogleRequestFactory : BaseRequestFactory() {
 
         return updatedMessages.filterNotNull()
     }
+
+    private fun buildSystemInstruction(params: ChatCompletionParameters): String? {
+        return when (params.conversationType) {
+            ConversationType.DEFAULT -> {
+                val selectedPersona = service<PromptsSettings>().state.personas.selectedPersona
+                return if (!selectedPersona.disabled) {
+                    PromptsSettings.getSelectedPersonaSystemPrompt();
+                } else {
+                    null
+                }
+            }
+
+            ConversationType.FIX_COMPILE_ERRORS -> service<PromptsSettings>().state.coreActions.fixCompileErrors.instructions
+
+            ConversationType.REVIEW_CHANGES -> service<PromptsSettings>().state.coreActions.reviewChanges.instructions
+
+            else -> null
+        }
+    }
 }

src/test/kotlin/ee/carlrobert/codegpt/completions/DefaultToolwindowChatCompletionRequestHandlerTest.kt

@@ -5,7 +5,6 @@ import ee.carlrobert.codegpt.completions.llama.PromptTemplate.LLAMA
 import ee.carlrobert.codegpt.conversations.ConversationService
 import ee.carlrobert.codegpt.conversations.message.Message
 import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings
-import ee.carlrobert.codegpt.settings.persona.PersonaSettings
 import ee.carlrobert.codegpt.settings.prompts.PromptsSettings
 import ee.carlrobert.llm.client.http.RequestEntity
 import ee.carlrobert.llm.client.http.exchange.NdJsonStreamHttpExchange
@@ -19,7 +18,8 @@ class DefaultToolwindowChatCompletionRequestHandlerTest : IntegrationTest() {
 
     fun testOpenAIChatCompletionCall() {
         useOpenAIService()
-        service<PromptsSettings>().state.personas.selectedPersona.instructions = "TEST_SYSTEM_PROMPT"
+        service<PromptsSettings>().state.personas.selectedPersona.instructions =
+            "TEST_SYSTEM_PROMPT"
         val message = Message("TEST_PROMPT")
         val conversation = ConversationService.getInstance().startConversation()
         expectOpenAI(StreamHttpExchange { request: RequestEntity ->
@@ -58,7 +58,8 @@ class DefaultToolwindowChatCompletionRequestHandlerTest : IntegrationTest() {
 
     fun testAzureChatCompletionCall() {
         useAzureService()
-        service<PromptsSettings>().state.personas.selectedPersona.instructions = "TEST_SYSTEM_PROMPT"
+        service<PromptsSettings>().state.personas.selectedPersona.instructions =
+            "TEST_SYSTEM_PROMPT"
         val conversationService = ConversationService.getInstance()
         val prevMessage = Message("TEST_PREV_PROMPT")
         prevMessage.response = "TEST_PREV_RESPONSE"
@@ -104,7 +105,8 @@ class DefaultToolwindowChatCompletionRequestHandlerTest : IntegrationTest() {
     fun testLlamaChatCompletionCall() {
         useLlamaService()
         service<ConfigurationSettings>().state.maxTokens = 99
-        service<PromptsSettings>().state.personas.selectedPersona.instructions = "TEST_SYSTEM_PROMPT"
+        service<PromptsSettings>().state.personas.selectedPersona.instructions =
+            "TEST_SYSTEM_PROMPT"
         val message = Message("TEST_PROMPT")
         val conversation = ConversationService.getInstance().startConversation()
         conversation.addMessage(Message("Ping", "Pong"))
@@ -145,7 +147,8 @@ class DefaultToolwindowChatCompletionRequestHandlerTest : IntegrationTest() {
     fun testOllamaChatCompletionCall() {
         useOllamaService()
         service<ConfigurationSettings>().state.maxTokens = 99
-        service<PromptsSettings>().state.personas.selectedPersona.instructions = "TEST_SYSTEM_PROMPT"
+        service<PromptsSettings>().state.personas.selectedPersona.instructions =
+            "TEST_SYSTEM_PROMPT"
         val message = Message("TEST_PROMPT")
         val conversation = ConversationService.getInstance().startConversation()
         expectOllama(NdJsonStreamHttpExchange { request: RequestEntity ->
@@ -184,24 +187,21 @@ class DefaultToolwindowChatCompletionRequestHandlerTest : IntegrationTest() {
 
     fun testGoogleChatCompletionCall() {
         useGoogleService()
-        service<PromptsSettings>().state.personas.selectedPersona.instructions = "TEST_SYSTEM_PROMPT"
+        service<PromptsSettings>().state.personas.selectedPersona.instructions =
+            "TEST_SYSTEM_PROMPT"
         val message = Message("TEST_PROMPT")
         val conversation = ConversationService.getInstance().startConversation()
         expectGoogle(StreamHttpExchange { request: RequestEntity ->
             assertThat(request.uri.path).isEqualTo("/v1/models/gemini-pro:streamGenerateContent")
             assertThat(request.method).isEqualTo("POST")
             assertThat(request.uri.query).isEqualTo("key=TEST_API_KEY&alt=sse")
             assertThat(request.body)
-                .extracting("contents")
-                .isEqualTo(
+                .extracting("contents", "systemInstruction")
+                .containsExactly(
                     listOf(
-                        mapOf(
-                            "parts" to listOf(mapOf("text" to "TEST_SYSTEM_PROMPT")),
-                            "role" to "user"
-                        ),
-                        mapOf("parts" to listOf(mapOf("text" to "Understood.")), "role" to "model"),
                         mapOf("parts" to listOf(mapOf("text" to "TEST_PROMPT")), "role" to "user"),
-                    )
+                    ),
+                    mapOf("parts" to listOf(mapOf("text" to "TEST_SYSTEM_PROMPT")))
                 )
             listOf(
                 jsonMapResponse(
@@ -229,7 +229,8 @@ class DefaultToolwindowChatCompletionRequestHandlerTest : IntegrationTest() {
 
     fun testCodeGPTServiceChatCompletionCall() {
         useCodeGPTService()
-        service<PromptsSettings>().state.personas.selectedPersona.instructions = "TEST_SYSTEM_PROMPT"
+        service<PromptsSettings>().state.personas.selectedPersona.instructions =
+            "TEST_SYSTEM_PROMPT"
         val message = Message("TEST_PROMPT")
         val conversation = ConversationService.getInstance().startConversation()
         expectCodeGPT(StreamHttpExchange { request: RequestEntity ->