Java: Convert PromptTemplateConfig and ChatMessageContent to immutable

java/aiservices/openai/pom.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
         <artifactId>semantickernel-parent</artifactId>
-        <version>1.0.0-rc1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

java/aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/OpenAIRequestSettings.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai;
 
 import com.azure.core.http.HttpHeaderName;

java/aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIChatCompletion.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai.chatcompletion;
 
 import com.azure.ai.openai.OpenAIAsyncClient;
@@ -110,7 +111,7 @@ private Mono<List<ChatMessageContent<?>>> internalChatMessageContentsAsync(
         if (kernel != null) {
             kernel.getPlugins()
                 .forEach(plugin -> plugin.getFunctions().forEach((name, function) -> functions
-                    .add(new OpenAIFunction(function.getMetadata(), plugin.getName()))));
+                    .add(OpenAIFunction.build(function.getMetadata(), plugin.getName()))));
         }
 
         // Create copy to avoid reactor exceptions when updating request messages internally

java/aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIChatResponse.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai.chatcompletion;
 
 import java.util.List;

java/aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIFunction.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai.chatcompletion;
 
 import com.azure.ai.openai.models.FunctionDefinition;
@@ -9,20 +10,32 @@
 import com.microsoft.semantickernel.semanticfunctions.KernelFunctionMetadata;
 import com.microsoft.semantickernel.semanticfunctions.KernelParameterMetadata;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 class OpenAIFunction {
+
     private final String pluginName;
     private final String name;
     private final FunctionDefinition functionDefinition;
 
-    public OpenAIFunction(KernelFunctionMetadata<?> metadata, String pluginName) {
-        this.name = metadata.getName();
+    protected OpenAIFunction(
+        @Nonnull String name,
+        @Nonnull String pluginName,
+        @Nonnull FunctionDefinition functionDefinition) {
+        this.name = name;
         this.pluginName = pluginName;
-        this.functionDefinition = toFunctionDefinition(metadata, pluginName);
+        this.functionDefinition = functionDefinition;
+    }
+
+    public static OpenAIFunction build(KernelFunctionMetadata<?> metadata, String pluginName) {
+        String name = metadata.getName();
+        FunctionDefinition functionDefinition = toFunctionDefinition(metadata, pluginName);
+        return new OpenAIFunction(name, pluginName, functionDefinition);
     }
 
     public String getName() {
@@ -38,7 +51,8 @@ public FunctionDefinition getFunctionDefinition() {
     }
 
     /**
-     * Gets the separator used between the plugin name and the function name, if a plugin name is present.
+     * Gets the separator used between the plugin name and the function name, if a plugin name is
+     * present.
      *
      * @return The separator used between the plugin name and the function name.
      */
@@ -58,7 +72,8 @@ private static String getFullyQualifiedName(
     }
 
     /**
-     * Converts a KernelFunctionMetadata representation to the SDK's FunctionDefinition representation.
+     * Converts a KernelFunctionMetadata representation to the SDK's FunctionDefinition
+     * representation.
      *
      * @return A FunctionDefinition containing all the function information.
      */
@@ -97,24 +112,40 @@ public static FunctionDefinition toFunctionDefinition(KernelFunctionMetadata<?>
     }
 
     private static class OpenAIFunctionParameter {
+
         @JsonProperty("type")
         private String type;
         @JsonProperty("required")
         private List<String> required;
         @JsonProperty("properties")
         private Map<String, JsonNode> properties;
 
-        public OpenAIFunctionParameter(String type, List<String> required,
+        public OpenAIFunctionParameter(
+            String type,
+            List<String> required,
             Map<String, JsonNode> properties) {
             this.type = type;
-            this.required = required;
-            this.properties = properties;
+            this.required = Collections.unmodifiableList(required);
+            this.properties = Collections.unmodifiableMap(properties);
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public List<String> getRequired() {
+            return required;
+        }
+
+        public Map<String, JsonNode> getProperties() {
+            return properties;
         }
     }
 
     private static String getSchemaForFunctionParameter(@Nullable String description) {
-        if (description == null)
+        if (description == null) {
             return "{\"type\":\"string\"}";
+        }
         return String.format("{\"type\":\"string\", \"description\":\"%s\"}", description);
     }
 }

java/aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/ParsedPrompt.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai.chatcompletion;
 
 import com.azure.ai.openai.models.ChatRequestMessage;

java/aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/XMLPromptParser.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai.chatcompletion;
 
 import com.azure.ai.openai.models.ChatRequestMessage;

java/aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/textcompletion/OpenAITextGenerationService.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai.textcompletion;
 
 import com.azure.ai.openai.OpenAIAsyncClient;

java/api-test/integration-tests/pom.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
         <artifactId>api-test</artifactId>
-        <version>1.0.0-rc1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

java/api-test/integration-tests/src/test/java/com/microsoft/semantickernel/syntaxexamples/Example01NativeFunctionsTest.java

@@ -1,5 +1,4 @@
 // Copyright (c) Microsoft. All rights reserved.
-
 package com.microsoft.semantickernel.syntaxexamples;
 
 import com.microsoft.semantickernel.plugins.text.TextPlugin;

java/api-test/integration-tests/src/test/java/com/microsoft/semantickernel/syntaxexamples/WireMockUtil.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.syntaxexamples;
 
 import com.github.tomakehurst.wiremock.client.WireMock;

java/api-test/integration-tests/src/test/java/com/microsoft/semantickernel/syntaxexamples/WiremockExamplesIT.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.syntaxexamples;
 
 import com.github.tomakehurst.wiremock.WireMockServer;

java/api-test/integration-tests/src/test/java/com/microsoft/semantickernel/syntaxexamples/WiremockRecord.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.syntaxexamples;
 
 import com.fasterxml.jackson.databind.JsonNode;

java/api-test/pom.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
         <artifactId>semantickernel-parent</artifactId>
-        <version>1.0.0-rc1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

java/connectors/semantickernel-connectors-web-bing/pom.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
         <artifactId>semantickernel-parent</artifactId>
-        <version>1.0.0-rc1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

java/connectors/semantickernel-connectors-web-bing/src/main/java/com/microsoft/semantickernel/connectors/web/bing/BingConnector.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.connectors.web.bing;
 
 import com.azure.core.http.HttpClient;

java/plugins/semantickernel-plugin-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
         <artifactId>semantickernel-parent</artifactId>
-        <version>1.0.0-rc1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

java/plugins/semantickernel-plugin-core/src/main/java/com/microsoft/semantickernel/plugins/web/SearchUrlPlugin.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.plugins.web;
 
 import com.microsoft.semantickernel.semanticfunctions.annotations.DefineKernelFunction;

java/pom.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.microsoft.semantic-kernel</groupId>
     <artifactId>semantickernel-parent</artifactId>
-    <version>1.0.0-rc1-SNAPSHOT</version>
+    <version>1.0.0-rc2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <url>https://www.github.com/microsoft/semantic-kernel</url>
@@ -663,11 +662,11 @@
                                     <style>AOSP</style>
                                     <reflowLongStrings>true</reflowLongStrings>
                                 </googleJavaFormat>
+                                -->
                                 <licenseHeader>
                                     <content>// Copyright (c) Microsoft. All rights reserved.</content>
                                 </licenseHeader>
                                 <toggleOffOn />
-                                -->
                             </java>
                         </configuration>
                     </plugin>

java/samples/pom.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
         <artifactId>semantickernel-parent</artifactId>
-        <version>1.0.0-rc1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>semantickernel-samples-parent</artifactId>
-    <version>1.0.0-rc1-SNAPSHOT</version>
+    <version>1.0.0-rc2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Semantic Kernel Samples Parent</name>
     <description>Parent pom for sample code for using the Semantic Kernel project</description>
@@ -131,8 +130,8 @@
                             <encoding>${project.build.sourceEncoding}</encoding>
                             <showWarnings>true</showWarnings>
                             <compilerArgs>
-                                <arg></arg>
-                                <compilerArg></compilerArg>
+                                <arg />
+                                <compilerArg />
                             </compilerArgs>
                         </configuration>
                     </plugin>

java/samples/sample-code/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
         <artifactId>semantickernel-samples-parent</artifactId>
-        <version>1.0.0-rc1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/plugins/ConversationSummaryPlugin.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.plugins;
 
 import com.microsoft.semantickernel.Kernel;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/plugins/PromptFunctionConstants.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.plugins;
 
 public class PromptFunctionConstants {

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example01_NativeFunctions.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.microsoft.semantickernel.plugins.text.TextPlugin;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example06_TemplateLanguage.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example08_RetryHandler.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;
@@ -41,7 +42,9 @@ public static void main(String[] args) throws ConfigurationException {
 
         String question = "How popular is the Polly library?";
 
-        KernelFunction<String> fuction = KernelFunctionFromPrompt.create(question);
+        KernelFunction<String> fuction = KernelFunctionFromPrompt.<String>builder()
+            .withTemplate(question)
+            .build();
 
         try {
             // Will retry 3 times with exponential backoff

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example09_FunctionTypes.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import static com.microsoft.semantickernel.contextvariables.ContextVariableTypes.convert;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example10_DescribeAllPluginsAndFunctions.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example11_WebSearchQueries.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.microsoft.semantickernel.Kernel;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example17_ChatGPT.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example26_AADAuth.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example27_PromptFunctionsUsingChatGPT.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example30_ChatWithPrompts.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;

java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example33_Chat.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.samples.syntaxexamples;
 
 import com.azure.ai.openai.OpenAIAsyncClient;