Skip to content

Commit de947e2

Browse files
author
Milder Hernandez
authored
Merge pull request #297 from milderhc/kernel-arguments
Add KernelArguments and deprecate KernelFunctionArguments
2 parents bf4e93d + 7620749 commit de947e2

File tree

72 files changed

+745
-413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+745
-413
lines changed

‎aiservices/google/src/main/java/com/microsoft/semantickernel/aiservices/google/chatcompletion/GeminiChatCompletion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.microsoft.semantickernel.plugin.KernelPlugin;
3333
import com.microsoft.semantickernel.semanticfunctions.InputVariable;
3434
import com.microsoft.semantickernel.semanticfunctions.KernelFunction;
35-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
35+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
3636
import com.microsoft.semantickernel.services.chatcompletion.AuthorRole;
3737
import com.microsoft.semantickernel.services.chatcompletion.ChatCompletionService;
3838
import com.microsoft.semantickernel.services.chatcompletion.ChatHistory;
@@ -436,7 +436,7 @@ public Mono<GeminiFunctionCall> performFunctionCall(@Nullable Kernel kernel,
436436
? new ContextVariableTypes()
437437
: invocationContext.getContextVariableTypes();
438438

439-
KernelFunctionArguments.Builder arguments = KernelFunctionArguments.builder();
439+
KernelArguments.Builder arguments = KernelArguments.builder();
440440
geminiFunction.getFunctionCall().getArgs().getFieldsMap().forEach((key, value) -> {
441441
arguments.withVariable(key, value.getStringValue());
442442
});

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
import com.microsoft.semantickernel.orchestration.responseformat.JsonResponseSchema;
6262
import com.microsoft.semantickernel.orchestration.responseformat.JsonSchemaResponseFormat;
6363
import com.microsoft.semantickernel.semanticfunctions.KernelFunction;
64-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
64+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
6565
import com.microsoft.semantickernel.services.chatcompletion.AuthorRole;
6666
import com.microsoft.semantickernel.services.chatcompletion.ChatCompletionService;
6767
import com.microsoft.semantickernel.services.chatcompletion.ChatHistory;
@@ -629,7 +629,7 @@ private Mono<FunctionResult<String>> invokeFunctionTool(
629629
contextVariableTypes));
630630

631631
function = hookResult.getFunction();
632-
KernelFunctionArguments arguments = hookResult.getArguments();
632+
KernelArguments arguments = hookResult.getArguments();
633633

634634
return function
635635
.invokeAsync(kernel)
@@ -673,7 +673,7 @@ private OpenAIFunctionToolCall extractOpenAIFunctionToolCall(
673673
String pluginName = parts.length > 1 ? parts[0] : "";
674674
String fnName = parts.length > 1 ? parts[1] : parts[0];
675675

676-
KernelFunctionArguments arguments = KernelFunctionArguments.builder().build();
676+
KernelArguments arguments = KernelArguments.builder().build();
677677

678678
ObjectMapper mapper = new ObjectMapper();
679679
JsonNode jsonToolCallArguments = mapper.readTree(toolCall.getFunction().getArguments());
@@ -1144,7 +1144,7 @@ private static ChatRequestAssistantMessage formAssistantMessage(
11441144
asstMessage.setToolCalls(
11451145
toolCalls.stream()
11461146
.map(toolCall -> {
1147-
KernelFunctionArguments arguments = toolCall.getArguments();
1147+
KernelArguments arguments = toolCall.getArguments();
11481148

11491149
String args = arguments != null && !arguments.isEmpty()
11501150
? arguments.entrySet().stream()

‎aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIFunctionToolCall.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft. All rights reserved.
22
package com.microsoft.semantickernel.aiservices.openai.chatcompletion;
33

4-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
4+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
55
import javax.annotation.Nullable;
66

77
/**
@@ -23,7 +23,7 @@ public class OpenAIFunctionToolCall {
2323

2424
/// <summary>Gets a name/value collection of the arguments to the function, if any.</summary>
2525
@Nullable
26-
private final KernelFunctionArguments arguments;
26+
private final KernelArguments arguments;
2727

2828
/**
2929
* Creates a new instance of the {@link OpenAIFunctionToolCall} class.
@@ -37,7 +37,7 @@ public OpenAIFunctionToolCall(
3737
@Nullable String id,
3838
@Nullable String pluginName,
3939
String functionName,
40-
@Nullable KernelFunctionArguments arguments) {
40+
@Nullable KernelArguments arguments) {
4141
this.id = id;
4242
this.pluginName = pluginName;
4343
this.functionName = functionName;
@@ -83,7 +83,7 @@ public String getFunctionName() {
8383
* @return A name/value collection of the arguments to the function, if any.
8484
*/
8585
@Nullable
86-
public KernelFunctionArguments getArguments() {
86+
public KernelArguments getArguments() {
8787
if (arguments == null) {
8888
return null;
8989
}

‎aiservices/openai/src/test/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAiChatCompletionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.azure.json.implementation.DefaultJsonReader;
1414
import com.microsoft.semantickernel.implementation.EmbeddedResourceLoader;
1515
import com.microsoft.semantickernel.orchestration.FunctionResultMetadata;
16-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
16+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
1717
import com.microsoft.semantickernel.services.chatcompletion.AuthorRole;
1818
import com.microsoft.semantickernel.services.chatcompletion.ChatHistory;
1919
import java.nio.charset.Charset;
@@ -46,7 +46,7 @@ public void serializesToolCallsCorrectly() {
4646
"a-tool-id",
4747
"pluginName",
4848
"funcName",
49-
KernelFunctionArguments.builder()
49+
KernelArguments.builder()
5050
.withVariable("id", "ca2fc6bc-1307-4da6-a009-d7bf88dec37b")
5151
.build()))));
5252
chatHistory.addMessage(new OpenAIChatMessageContent(

‎api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/Example03_ArgumentsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.microsoft.semantickernel.plugin.KernelPlugin;
77
import com.microsoft.semantickernel.plugin.KernelPluginFactory;
88
import com.microsoft.semantickernel.samples.syntaxexamples.functions.Example03_Arguments.StaticTextPlugin;
9-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
9+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
1010
import org.junit.jupiter.api.Assertions;
1111
import org.junit.jupiter.api.Test;
1212

@@ -24,7 +24,7 @@ public void main() {
2424
KernelPlugin functionCollection = KernelPluginFactory
2525
.createFromObject(new StaticTextPlugin(), "text");
2626

27-
KernelFunctionArguments arguments = KernelFunctionArguments.builder()
27+
KernelArguments arguments = KernelArguments.builder()
2828
.withInput("Today is: ")
2929
.withVariable("day", "Monday")
3030
.build();

‎api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/Example05_InlineFunctionDefinitionTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import com.microsoft.semantickernel.orchestration.FunctionResult;
1111
import com.microsoft.semantickernel.orchestration.PromptExecutionSettings;
1212
import com.microsoft.semantickernel.semanticfunctions.KernelFunction;
13-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
13+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
1414
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionFromPrompt;
15-
import com.microsoft.semantickernel.services.textcompletion.TextGenerationService;
15+
1616
import java.time.Instant;
1717
import java.time.ZoneOffset;
1818
import java.time.format.DateTimeFormatter;
@@ -68,7 +68,7 @@ public void main(WireMockRuntimeInfo wmRuntimeInfo) {
6868

6969
var result = kernel.invokeAsync(excuseFunction)
7070
.withArguments(
71-
KernelFunctionArguments.builder()
71+
KernelArguments.builder()
7272
.withInput("I missed the F1 final race")
7373
.build())
7474
.block();
@@ -79,7 +79,7 @@ public void main(WireMockRuntimeInfo wmRuntimeInfo) {
7979

8080
result = kernel.invokeAsync(excuseFunction)
8181
.withArguments(
82-
KernelFunctionArguments.builder()
82+
KernelArguments.builder()
8383
.withInput("sorry I forgot your birthday")
8484
.build())
8585
.block();

‎api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/KernelHooksTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.microsoft.semantickernel.hooks.KernelHook.FunctionInvokingHook;
1313
import com.microsoft.semantickernel.orchestration.PromptExecutionSettings;
1414
import com.microsoft.semantickernel.semanticfunctions.KernelFunction;
15-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
15+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
1616
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionFromPrompt;
1717
import com.microsoft.semantickernel.semanticfunctions.OutputVariable;
1818
import com.microsoft.semantickernel.services.chatcompletion.ChatCompletionService;
@@ -90,7 +90,7 @@ public void getUsageAsync(WireMockRuntimeInfo wmRuntimeInfo) {
9090
kernel.invokeAsync(
9191
excuseFunction)
9292
.withArguments(
93-
KernelFunctionArguments
93+
KernelArguments
9494
.builder()
9595
.withVariable("input", "I missed the F1 final race")
9696
.build())

‎api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/RenderingTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.microsoft.semantickernel.aiservices.openai.textcompletion.OpenAITextGenerationService;
1313
import com.microsoft.semantickernel.plugin.KernelPluginFactory;
1414
import com.microsoft.semantickernel.semanticfunctions.KernelFunction;
15-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
15+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
1616
import com.microsoft.semantickernel.semanticfunctions.PromptTemplateConfig;
1717
import com.microsoft.semantickernel.semanticfunctions.annotations.DefineKernelFunction;
1818
import com.microsoft.semantickernel.services.chatcompletion.ChatCompletionService;
@@ -49,7 +49,7 @@ public void textSemanticKernelTemplateXml() {
4949
""")
5050
.withTemplateFormat(PromptTemplateConfig.SEMANTIC_KERNEL_TEMPLATE_FORMAT)
5151
.build())
52-
.withArguments(KernelFunctionArguments
52+
.withArguments(KernelArguments
5353
.builder()
5454
.withVariable("value", "<message role=\"user\">\"hello world\"</message>")
5555
.build())
@@ -71,7 +71,7 @@ public void textSemanticKernelTemplate() {
7171
""")
7272
.withTemplateFormat(PromptTemplateConfig.SEMANTIC_KERNEL_TEMPLATE_FORMAT)
7373
.build())
74-
.withArguments(KernelFunctionArguments
74+
.withArguments(KernelArguments
7575
.builder()
7676
.withVariable("value", "{{$ignore}}")
7777
.withVariable("ignore", "dont show")
@@ -94,7 +94,7 @@ public void textHandleBarsTemplate() {
9494
""")
9595
.withTemplateFormat("handlebars")
9696
.build())
97-
.withArguments(KernelFunctionArguments
97+
.withArguments(KernelArguments
9898
.builder()
9999
.withVariable("value", "{{ignore}}")
100100
.withVariable("ignore", "dont show")
@@ -117,7 +117,7 @@ public void chatSemanticKernelTemplateXml() {
117117
""")
118118
.withTemplateFormat(PromptTemplateConfig.SEMANTIC_KERNEL_TEMPLATE_FORMAT)
119119
.build())
120-
.withArguments(KernelFunctionArguments
120+
.withArguments(KernelArguments
121121
.builder()
122122
.withVariable("value", "<message role=\"user\">\"hello world\"</message>")
123123
.build())
@@ -139,7 +139,7 @@ public void chatSemanticKernelTemplate() {
139139
""")
140140
.withTemplateFormat(PromptTemplateConfig.SEMANTIC_KERNEL_TEMPLATE_FORMAT)
141141
.build())
142-
.withArguments(KernelFunctionArguments
142+
.withArguments(KernelArguments
143143
.builder()
144144
.withVariable("value", "{{$ignore}}")
145145
.withVariable("ignore", "dont show")
@@ -162,7 +162,7 @@ public void chatHandleBarsTemplate() {
162162
""")
163163
.withTemplateFormat("handlebars")
164164
.build())
165-
.withArguments(KernelFunctionArguments
165+
.withArguments(KernelArguments
166166
.builder()
167167
.withVariable("value", "{{ignore}}")
168168
.withVariable("ignore", "dont show")
@@ -185,7 +185,7 @@ public void chatSemanticKernelTemplate2() {
185185
""")
186186
.withTemplateFormat(PromptTemplateConfig.SEMANTIC_KERNEL_TEMPLATE_FORMAT)
187187
.build())
188-
.withArguments(KernelFunctionArguments
188+
.withArguments(KernelArguments
189189
.builder()
190190
.withVariable("value", "{{$ignore}}")
191191
.withVariable("ignore", "dont show")

‎samples/semantickernel-concepts/semantickernel-syntax-examples/src/main/java/com/microsoft/semantickernel/samples/plugins/ConversationSummaryPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.microsoft.semantickernel.contextvariables.ContextVariableTypes;
66
import com.microsoft.semantickernel.orchestration.PromptExecutionSettings;
77
import com.microsoft.semantickernel.semanticfunctions.KernelFunction;
8-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
8+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
99
import com.microsoft.semantickernel.semanticfunctions.annotations.DefineKernelFunction;
1010
import com.microsoft.semantickernel.semanticfunctions.annotations.KernelFunctionParameter;
1111
import com.microsoft.semantickernel.text.TextChunker;
@@ -71,7 +71,7 @@ private static Mono<String> processAsync(KernelFunction<String> func, String inp
7171
// The first parameter is the input text.
7272
return func.invokeAsync(kernel)
7373
.withArguments(
74-
new KernelFunctionArguments.Builder()
74+
KernelArguments.builder()
7575
.withInput(paragraph)
7676
.build())
7777
.withResultType(

‎samples/semantickernel-concepts/semantickernel-syntax-examples/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example11_WebSearchQueries.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.microsoft.semantickernel.Kernel;
55
import com.microsoft.semantickernel.plugin.KernelPluginFactory;
66
import com.microsoft.semantickernel.samples.plugins.web.SearchUrlPlugin;
7-
import com.microsoft.semantickernel.semanticfunctions.KernelFunctionArguments;
7+
import com.microsoft.semantickernel.semanticfunctions.KernelArguments;
88

99
public class Example11_WebSearchQueries {
1010

@@ -19,7 +19,7 @@ public static void main(String[] args) {
1919

2020
// Run
2121
var ask = "What's the largest building in Europe?";
22-
var kernelArguments = KernelFunctionArguments.builder()
22+
var kernelArguments = KernelArguments.builder()
2323
.withVariable("query", ask)
2424
.build();
2525

0 commit comments

Comments
 (0)