Merge remote-tracking branch 'origin/endgame-202401' into develop.next

Author: wangmingliang-ms

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.85.0-SNAPSHOT</version>
+    <version>3.85.0</version>
   </parent>
   <groupId>com.microsoft.azuretools</groupId>
   <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,9 +39,9 @@
   </organization>
 
   <properties>
-    <azuretool.version>3.85.0-SNAPSHOT</azuretool.version>
+    <azuretool.version>3.85.0</azuretool.version>
     <azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
-    <azure.toolkit-lib.version>0.41.0-SNAPSHOT</azure.toolkit-lib.version>
+    <azure.toolkit-lib.version>0.41.0</azure.toolkit-lib.version>
   </properties>
   <dependencyManagement>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF

@@ -43,4 +43,4 @@ Export-Package: com.microsoft.azuretools.appservice,
  com.microsoft.azuretools.appservice.handlers,
  com.microsoft.azuretools.appservice.ui
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-appservice-lib-0.41.0-SNAPSHOT.jar
+ target/lib/azure-toolkit-ide-appservice-lib-0.41.0.jar

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-appservice-lib</artifactId>
-      <version>0.41.0-SNAPSHOT</version>
+      <version>0.41.0</version>
     </dependency>
   </dependencies>
   <repositories>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-springcloud-lib-0.41.0-SNAPSHOT.jar
+ target/lib/azure-toolkit-ide-springcloud-lib-0.41.0.jar
 Import-Package: com.microsoft.azuretools.core.actions,
  org.eclipse.core.expressions,
  org.eclipse.jface.text.hyperlink,

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
-      <version>0.41.0-SNAPSHOT</version>
+      <version>0.41.0</version>
     </dependency>
   </dependencies>
   <build>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/build.gradle

@@ -42,8 +42,8 @@ allprojects {
     }
 
     ext {
-        azureToolkitLibsVersion = "0.41.0-SNAPSHOT"
-        azureToolkitIdeLibsVersion = "0.41.0-SNAPSHOT"
+        azureToolkitLibsVersion = "0.41.0"
+        azureToolkitIdeLibsVersion = "0.41.0"
     }
 
     dependencyManagement {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/gradle.properties

@@ -1,4 +1,4 @@
-pluginVersion=3.85.0-SNAPSHOT
+pluginVersion=3.85.0
 intellijDisplayVersion=2023.3
 intellij_version=IU-2023.3.2
 dep_plugins=org.intellij.scala:2023.3.3

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/src/main/resources/META-INF/plugin.xml

@@ -2,7 +2,7 @@
              xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.microsoft.tooling.msservices.intellij.azure</id>
   <name>Azure Toolkit</name>
-  <version>3.85.0-SNAPSHOT</version>
+  <version>3.85.0</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cognitiveservices/src/main/java/com/azure/ai/openai/models/ChatMessage.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
+package com.azure.ai.openai.models;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.annotation.Nullable;
+
+@Getter
+@RequiredArgsConstructor
+@Slf4j
+public class ChatMessage {
+    private final ChatRole role;
+    private final String content;
+
+    public static ChatMessage fromResponse(ChatResponseMessage response) {
+        return new ChatMessage(response.getRole(), response.getContent());
+    }
+
+    @Nullable
+    public ChatRequestMessage toRequest() {
+        if (this.role == ChatRole.SYSTEM) return new ChatRequestSystemMessage(this.content);
+        if (this.role == ChatRole.USER) return new ChatRequestUserMessage(this.content);
+        if (this.role == ChatRole.ASSISTANT) return new ChatRequestAssistantMessage(this.content);
+        log.warn("Unknown role: {}", this.role);
+        return null;
+    }
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cognitiveservices/src/main/java/com/microsoft/azure/toolkit/intellij/cognitiveservices/chatbox/ChatBot.java

@@ -2,11 +2,7 @@
 
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.OpenAIClientBuilder;
-import com.azure.ai.openai.models.ChatChoice;
-import com.azure.ai.openai.models.ChatCompletions;
-import com.azure.ai.openai.models.ChatCompletionsOptions;
-import com.azure.ai.openai.models.ChatMessage;
-import com.azure.ai.openai.models.ChatRole;
+import com.azure.ai.openai.models.*;
 import com.azure.core.credential.AzureKeyCredential;
 import com.microsoft.azure.toolkit.intellij.cognitiveservices.model.Configuration;
 import com.microsoft.azure.toolkit.intellij.cognitiveservices.model.SystemMessage;
@@ -18,6 +14,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 public class ChatBot {
     @Getter
@@ -71,12 +68,12 @@ public ChatChoice send(String message) {
         final String deploymentName = this.deployment.getName();
         final ChatCompletions chatCompletions = this.client.getChatCompletions(deploymentName, buildChatOptions());
         final ChatChoice chatChoice = chatCompletions.getChoices().get(0);
-        this.chatMessages.push(chatChoice.getMessage());
+        this.chatMessages.push(ChatMessage.fromResponse(chatChoice.getMessage()));
         return chatChoice;
     }
 
     private ChatCompletionsOptions buildChatOptions() {
-        final ChatCompletionsOptions result = new ChatCompletionsOptions(this.chatMessages);
+        final ChatCompletionsOptions result = new ChatCompletionsOptions(this.chatMessages.stream().map(ChatMessage::toRequest).filter(Objects::nonNull).collect(Collectors.toList()));
         Optional.ofNullable(configuration).ifPresent(c -> {
             result.setFrequencyPenalty(c.getFrequencyPenalty());
             result.setPresencePenalty(c.getPresencePenalty());