Java: Initial Update of ContextVariables to v1 (#4158)

### Motivation and Context

<!-- Thank you for your contribution to the semantic-kernel repo!
Please help reviewers and future users, providing the following
information:
  1. Why is this change required?
  2. What problem does it solve?
  3. What scenario does it contribute to?
  4. If it fixes an open issue, please link to the issue here.
-->

### Description

<!-- Describe your changes, the overall approach, the underlying design.
These notes will help understanding how your code works. Thanks! -->

### Contribution Checklist

<!-- Before submitting this PR, please make sure: -->

- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows the [SK Contribution
Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
and the [pre-submission formatting
script](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md#development-scripts)
raises no violations
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄

java/api-test/integration-tests/src/test/java/com/microsoft/semantickernel/e2e/ContextVariableFunctionTest.java

@@ -4,6 +4,7 @@ package com.microsoft.semantickernel.e2e;
 import com.microsoft.semantickernel.Kernel;
 import com.microsoft.semantickernel.SKBuilders;
 import com.microsoft.semantickernel.exceptions.ConfigurationException;
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.SKContext;
 import com.microsoft.semantickernel.semanticfunctions.PromptTemplateConfig;
 import com.microsoft.semantickernel.textcompletion.CompletionSKFunction;
@@ -21,56 +22,56 @@ public class ContextVariableFunctionTest extends AbstractKernelTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(ContextVariableFunctionTest.class);
 
     public static void main(String[] args)
-            throws ExecutionException,
-                    InterruptedException,
-                    TimeoutException,
-                    ConfigurationException {
+        throws ExecutionException,
+        InterruptedException,
+        TimeoutException,
+        ConfigurationException {
         new ContextVariableFunctionTest().runContextVariableTest();
     }
 
     @Test
     @EnabledIf("isAzureTestEnabled")
     public void runContextVariableTest()
-            throws ExecutionException,
-                    InterruptedException,
-                    TimeoutException,
-                    ConfigurationException {
+        throws ExecutionException,
+        InterruptedException,
+        TimeoutException,
+        ConfigurationException {
         Kernel kernel = buildTextCompletionKernel();
 
         String prompt =
-                """
-                        ChatBot can have a conversation with you about any topic.
-                        It can give explicit instructions or say 'I don't know' if it does not have an answer.
+            """
+                ChatBot can have a conversation with you about any topic.
+                It can give explicit instructions or say 'I don't know' if it does not have an answer.
 
-                        {{$history}}
-                        User: {{$user_input}}
-                        ChatBot:\s""";
+                {{$history}}
+                User: {{$user_input}}
+                ChatBot:\s""";
 
         CompletionSKFunction chat =
-                kernel.getSemanticFunctionBuilder()
-                        .withPromptTemplate(prompt)
-                        .withFunctionName("ChatBot")
-                        .withCompletionConfig(
-                                new PromptTemplateConfig.CompletionConfig(0.7, 0.5, 0, 0, 2000))
-                        .build();
+            kernel.getSemanticFunctionBuilder()
+                .withPromptTemplate(prompt)
+                .withFunctionName("ChatBot")
+                .withCompletionConfig(
+                    new PromptTemplateConfig.CompletionConfig(0.7, 0.5, 0, 0, 2000))
+                .build();
 
         SKContext readOnlySkContext = SKBuilders.context().withKernel(kernel).build();
 
         chat("Hi, I'm looking for book suggestions?", chat, readOnlySkContext)
-                .flatMap(
-                        chat(
-                                "I love history and philosophy, I'd like to learn something new"
-                                        + " about Greece, any suggestion?",
-                                chat))
-                .flatMap(chat("that sounds interesting, what is it about?", chat))
-                .flatMap(
-                        chat(
-                                "if I read that book, what exactly will I learn about Greece"
-                                        + " history?",
-                                chat))
-                .flatMap(
-                        chat("could you list some more books I could read about this topic?", chat))
-                .block();
+            .flatMap(
+                chat(
+                    "I love history and philosophy, I'd like to learn something new"
+                        + " about Greece, any suggestion?",
+                    chat))
+            .flatMap(chat("that sounds interesting, what is it about?", chat))
+            .flatMap(
+                chat(
+                    "if I read that book, what exactly will I learn about Greece"
+                        + " history?",
+                    chat))
+            .flatMap(
+                chat("could you list some more books I could read about this topic?", chat))
+            .block();
     }
 
     private Function<SKContext, Mono<SKContext>> chat(String input, CompletionSKFunction chat) {
@@ -84,24 +85,25 @@ public class ContextVariableFunctionTest extends AbstractKernelTest {
     }
 
     private Mono<SKContext> chat(String input, CompletionSKFunction chat, SKContext context)
-            throws ExecutionException, InterruptedException, TimeoutException {
+        throws ExecutionException, InterruptedException, TimeoutException {
         context = context.setVariable("user_input", input);
 
         LOGGER.info("User:\n" + input);
 
         SKContext finalContext = context;
         return chat.invokeAsync(context, null)
-                .map(
-                        result -> {
-                            LOGGER.info("Bot:\n\t\t" + result.getResult());
+            .map(
+                result -> {
+                    LOGGER.info("Bot:\n\t\t" + result.getResult());
 
-                            String existingHistoy = finalContext.getVariables().get("history");
-                            if (existingHistoy == null) {
-                                existingHistoy = "";
-                            }
-                            existingHistoy +=
-                                    "\nUser: " + input + "\nChatBot: " + result.getResult() + "\n";
-                            return finalContext.setVariable("history", existingHistoy);
-                        });
+                    ContextVariable<String> existingHistoy = finalContext.getVariables()
+                        .get("history", String.class);
+                    if (existingHistoy == null) {
+                        existingHistoy = ContextVariable.of("");
+                    }
+                    String toAppend = existingHistoy.getValue();
+                    toAppend += "\nUser: " + input + "\nChatBot: " + result.getResult() + "\n";
+                    return finalContext.setVariable("history", ContextVariable.of(toAppend));
+                });
     }
 }

java/connectors/semantickernel-connectors-ai-openai/src/main/java/com/microsoft/semantickernel/connectors/ai/openai/chatcompletion/OpenAIChatHistory.java

@@ -2,6 +2,7 @@
 package com.microsoft.semantickernel.connectors.ai.openai.chatcompletion;
 
 import com.microsoft.semantickernel.chatcompletion.ChatHistory;
+import com.microsoft.semantickernel.chatcompletion.ChatHistory.Message;
 import javax.annotation.Nullable;
 
 /** OpenAI Chat content */

java/plugins/semantickernel-planners/src/main/java/com/microsoft/semantickernel/planner/actionplanner/ActionPlanner.java

@@ -118,9 +118,9 @@ public class ActionPlanner {
     private Plan parsePlan(String goal, SKContext result) {
         ActionPlanResponse planData;
         // Clean up the plan, removing any prompt and the stop sequence
-        Matcher matcher = CLEAN_PLAN.matcher((String)result.getResult());
+        Matcher matcher = CLEAN_PLAN.matcher(result.getResult().toPromptString());
 
-        String plan = (String)result.getResult();
+        String plan = result.getResult().toPromptString();
         if (matcher.matches()) {
             plan = matcher.group(1);
         }

java/plugins/semantickernel-planners/src/main/java/com/microsoft/semantickernel/planner/actionplanner/Plan.java

@@ -5,7 +5,8 @@ import com.microsoft.semantickernel.Kernel;
 import com.microsoft.semantickernel.SKBuilders;
 import com.microsoft.semantickernel.Verify;
 import com.microsoft.semantickernel.memory.SemanticTextMemory;
-import com.microsoft.semantickernel.orchestration.AbstractSkFunction;
+import com.microsoft.semantickernel.orchestration.AbstractSKFunction;
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.ContextVariables;
 import com.microsoft.semantickernel.orchestration.SKContext;
 import com.microsoft.semantickernel.orchestration.SKFunction;
@@ -29,8 +30,10 @@ import javax.annotation.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-/** Standard Semantic Kernel callable plan. Plan is used to create trees of SKFunctions. */
-public class Plan extends AbstractSkFunction {
+/**
+ * Standard Semantic Kernel callable plan. Plan is used to create trees of SKFunctions.
+ */
+public class Plan extends AbstractSKFunction {
 
     private static final Pattern s_variablesRegex = Pattern.compile("\\$(\\w+)", Pattern.MULTILINE);
 
@@ -43,24 +46,26 @@ public class Plan extends AbstractSkFunction {
     private final List<Plan> steps = new ArrayList<>();
 
     // Parameters for the plan, used to pass information to the next step
-    @Nullable private ContextVariables parameters;
+    @Nullable
+    private ContextVariables parameters;
 
     // Outputs for the plan, used to pass information to the caller
     private List<String> outputs = new ArrayList<>();
 
-    @Nullable private SKFunction function = null;
+    @Nullable
+    private SKFunction function = null;
 
     public Plan(
-            String goal,
-            ContextVariables state,
-            @Nullable KernelSkillsSupplier kernelSkillsSupplier) {
+        String goal,
+        ContextVariables state,
+        @Nullable KernelSkillsSupplier kernelSkillsSupplier) {
         super(
-                new ArrayList<>(),
-                Plan.class.getName(),
-                "",
-                goal,
-                Collections.emptyList(),
-                kernelSkillsSupplier);
+            new ArrayList<>(),
+            Plan.class.getName(),
+            "",
+            goal,
+            Collections.emptyList(),
+            kernelSkillsSupplier);
         this.state = state;
     }
 
@@ -69,17 +74,17 @@ public class Plan extends AbstractSkFunction {
     }
 
     public Plan(
-            SKFunction function,
-            ContextVariables state,
-            List<String> functionOutputs,
-            KernelSkillsSupplier kernelSkillsSupplier) {
+        SKFunction function,
+        ContextVariables state,
+        List<String> functionOutputs,
+        KernelSkillsSupplier kernelSkillsSupplier) {
         super(
-                function.describe().getParameters(),
-                function.getSkillName(),
-                function.getName(),
-                function.getDescription(),
-                formReturnParameters(functionOutputs),
-                kernelSkillsSupplier);
+            function.describe().getParameters(),
+            function.getSkillName(),
+            function.getName(),
+            function.getDescription(),
+            formReturnParameters(functionOutputs),
+            kernelSkillsSupplier);
 
         this.parameters = null;
         this.function = function;
@@ -88,18 +93,18 @@ public class Plan extends AbstractSkFunction {
     }
 
     public Plan(
-            SKFunction function,
-            @Nullable ContextVariables parameters,
-            ContextVariables state,
-            List<String> functionOutputs,
-            KernelSkillsSupplier kernelSkillsSupplier) {
+        SKFunction function,
+        @Nullable ContextVariables parameters,
+        ContextVariables state,
+        List<String> functionOutputs,
+        KernelSkillsSupplier kernelSkillsSupplier) {
         super(
-                function.describe().getParameters(),
-                function.getSkillName(),
-                function.getName(),
-                function.getDescription(),
-                formReturnParameters(functionOutputs),
-                kernelSkillsSupplier);
+            function.describe().getParameters(),
+            function.getSkillName(),
+            function.getName(),
+            function.getDescription(),
+            formReturnParameters(functionOutputs),
+            kernelSkillsSupplier);
         this.parameters = parameters;
         this.function = function;
         this.outputs = new ArrayList<>(functionOutputs);
@@ -111,9 +116,9 @@ public class Plan extends AbstractSkFunction {
     }
 
     public Plan(
-            SKFunction function,
-            List<String> functionOutputs,
-            KernelSkillsSupplier kernelSkillsSupplier) {
+        SKFunction function,
+        List<String> functionOutputs,
+        KernelSkillsSupplier kernelSkillsSupplier) {
         this(function, SKBuilders.variables().build(), functionOutputs, kernelSkillsSupplier);
     }
 
@@ -122,10 +127,10 @@ public class Plan extends AbstractSkFunction {
     }
 
     public Plan(
-            String goal,
-            ContextVariables parameters,
-            KernelSkillsSupplier kernelSkillsSupplier,
-            SKFunction... steps) {
+        String goal,
+        ContextVariables parameters,
+        KernelSkillsSupplier kernelSkillsSupplier,
+        SKFunction... steps) {
         this(goal, parameters, kernelSkillsSupplier);
         this.addSteps(steps);
     }
@@ -178,9 +183,9 @@ public class Plan extends AbstractSkFunction {
      */
     public void addSteps(SKFunction... steps) {
         List<Plan> plans =
-                Arrays.stream(steps)
-                        .map(step -> new Plan(step, getSkillsSupplier()))
-                        .collect(Collectors.toList());
+            Arrays.stream(steps)
+                .map(step -> new Plan(step, getSkillsSupplier()))
+                .collect(Collectors.toList());
         this.steps.addAll(plans);
     }
 
@@ -195,78 +200,78 @@ public class Plan extends AbstractSkFunction {
     /**
      * Invoke the next step of the plan
      *
-     * @param context Context to use
+     * @param context  Context to use
      * @param settings Settings to use
      * @return The updated plan
      */
     public Mono<SKContext> invokeNextStepAsync(
-            SKContext context, @Nullable CompletionRequestSettings settings) {
+        SKContext context, @Nullable CompletionRequestSettings settings) {
 
         // Execute the step
         SKContext initialContext =
-                SKBuilders.context()
-                        .withVariables(context.getVariables().writableClone())
+            SKBuilders.context()
+                .withVariables(context.getVariables().writableClone())
+                .withMemory(context.getSemanticMemory())
+                .withSkills(context.getSkills())
+                .build();
+
+        return Flux.fromIterable(this.steps)
+            .reduce(
+                Mono.just(initialContext),
+                (currentContext, step) ->
+                    executeStep(context, settings, currentContext, step))
+            .flux()
+            .concatMap(it -> it)
+            .last(SKBuilders.context().build())
+            .map(
+                result -> {
+                    if (result.getVariables().get(DefaultResultKey) != null) {
+                                result = result.update((String)result.getVariables().get(DefaultResultKey));
+                    }
+                    return result;
+                });
+    }
+
+    private Mono<SKContext> executeStep(
+        SKContext context,
+        @Nullable CompletionRequestSettings settings,
+        Mono<SKContext> currentContext2,
+        Plan step) {
+        return currentContext2.flatMap(
+            currentContext -> {
+                // Merge the state with the current context variables for step execution
+                ContextVariables functionVariables =
+                    this.getNextStepVariables(currentContext.getVariables(), step);
+
+                // Execute the step
+                SKContext functionContext =
+                    SKBuilders.context()
+                        .withVariables(functionVariables)
                         .withMemory(context.getSemanticMemory())
                         .withSkills(context.getSkills())
                         .build();
 
-        return Flux.fromIterable(this.steps)
-                .reduce(
-                        Mono.just(initialContext),
-                        (currentContext, step) ->
-                                executeStep(context, settings, currentContext, step))
-                .flux()
-                .concatMap(it -> it)
-                .last(SKBuilders.context().build())
-                .map(
-                        result -> {
-                            if (result.getVariables().get(DefaultResultKey) != null) {
-                                result = result.update((String)result.getVariables().get(DefaultResultKey));
-                            }
-                            return result;
-                        });
-    }
-
-    private Mono<SKContext> executeStep(
-            SKContext context,
-            @Nullable CompletionRequestSettings settings,
-            Mono<SKContext> currentContext2,
-            Plan step) {
-        return currentContext2.flatMap(
-                currentContext -> {
-                    // Merge the state with the current context variables for step execution
-                    ContextVariables functionVariables =
-                            this.getNextStepVariables(currentContext.getVariables(), step);
-
-                    // Execute the step
-                    SKContext functionContext =
-                            SKBuilders.context()
-                                    .withVariables(functionVariables)
-                                    .withMemory(context.getSemanticMemory())
-                                    .withSkills(context.getSkills())
-                                    .build();
-
-                    return step.invokeAsync(functionContext, settings)
-                            .flatMap(
-                                    result ->
-                                            processInvocationResult(
-                                                    context, step, currentContext, result))
-                            .switchIfEmpty(
-                                    processInvocationResult(
-                                            context,
-                                            step,
-                                            currentContext,
-                                            functionContext.copy().update("")));
-                });
+                return step.invokeAsync(functionContext, settings)
+                    .flatMap(
+                        result ->
+                            processInvocationResult(
+                                context, step, currentContext, result))
+                    .switchIfEmpty(
+                        processInvocationResult(
+                            context,
+                            step,
+                            currentContext,
+                            functionContext.copy().update("")));
+            });
     }
 
     private static Mono<SKContext> processInvocationResult(
-            SKContext context, Plan step, SKContext currentContext, SKContext result) {
+        SKContext context, Plan step, SKContext currentContext, SKContext result) {
         String resultValue = (String)result.getResult();
 
         if (resultValue == null) {
             return Mono.error(
-                    new PlanningException(ErrorCodes.UNKNOWN_ERROR, "No result returned"));
+                new PlanningException(ErrorCodes.UNKNOWN_ERROR, "No result returned"));
         }
 
         resultValue = resultValue.trim();
@@ -276,16 +281,16 @@ public class Plan extends AbstractSkFunction {
         String finalResultValue = resultValue;
 
         step.outputs.forEach(
-                item -> {
-                    if (result.getVariables().asMap().containsKey(item)) {
-                        String variable = (String)result.getVariables().get(item);
-                        if (variable != null) {
-                            updatedContext.setVariable(item, variable);
-                        }
-                    } else {
-                        updatedContext.setVariable(item, finalResultValue);
+            item -> {
+                if (result.getVariables().containsKey(item)) {
+                    ContextVariable<?> variable = result.getVariables().get(item);
+                    if (variable != null) {
+                        updatedContext.setVariable(item, variable);
                     }
-                });
+                } else {
+                    updatedContext.setVariable(item, finalResultValue);
+                }
+            });
 
         // If this function produces an output, don't overwrite the
         // current
@@ -302,9 +307,9 @@ public class Plan extends AbstractSkFunction {
     }
 
     public Mono<SKContext> invokeAsync(
-            @Nullable String input,
-            @Nullable CompletionRequestSettings settings,
-            @Nullable SemanticTextMemory memory) {
+        @Nullable String input,
+        @Nullable CompletionRequestSettings settings,
+        @Nullable SemanticTextMemory memory) {
 
         WritableContextVariables variables = state.writableClone();
 
@@ -315,19 +320,19 @@ public class Plan extends AbstractSkFunction {
         KernelSkillsSupplier skillsSupplier = getSkillsSupplier();
 
         SKContext context =
-                SKBuilders.context()
-                        .withVariables(variables)
-                        .withMemory(memory)
-                        .withSkills(skillsSupplier == null ? null : skillsSupplier.get())
-                        .build();
+            SKBuilders.context()
+                .withVariables(variables)
+                .withMemory(memory)
+                .withSkills(skillsSupplier == null ? null : skillsSupplier.get())
+                .build();
 
         return this.invokeAsync(context, settings);
     }
 
     @Override
     public Mono<SKContext> invokeAsync(
-            @Nullable String input,
-            @Nullable SKContext context,
+        @Nullable String input,
+        @Nullable SKContext context,
             @Nullable Object settings) {
         if (input != null) {
             this.state = state.writableClone().update(input);
@@ -335,11 +340,11 @@ public class Plan extends AbstractSkFunction {
 
         if (context == null) {
             context =
-                    SKBuilders.context()
-                            .withVariables(state)
-                            .withSkills(
-                                    getSkillsSupplier() == null ? null : getSkillsSupplier().get())
-                            .build();
+                SKBuilders.context()
+                    .withVariables(state)
+                    .withSkills(
+                        getSkillsSupplier() == null ? null : getSkillsSupplier().get())
+                    .build();
         } else {
             ContextVariables variables = context.getVariables().writableClone().update(state, true);
             context = context.update(variables);
@@ -364,42 +369,45 @@ public class Plan extends AbstractSkFunction {
      * Expand variables in the input string.
      *
      * @param variables Variables to use for expansion.
-     * @param input Input string to expand.
+     * @param input     Input string to expand.
      * @return Expanded string.
      */
-    private String expandFromVariables(ContextVariables variables, String input) {
-        String result = input;
-        Matcher matches = s_variablesRegex.matcher(input);
+    private ContextVariable<String> expandFromVariables(
+        ContextVariables variables, ContextVariable<?> input) {
+
+        String result = input.toPromptString();
+        Matcher matches = s_variablesRegex.matcher(result);
         while (matches.find()) {
 
             String varName = matches.group(1);
 
-            String value = (String)variables.get(varName);
+            ContextVariable<?> value = variables.get(varName);
 
             if (value == null) {
                 value = (String)state.get(varName);
             }
 
             if (value == null) {
-                value = "";
+                value = ContextVariable.of("");
             }
 
-            result = result.replaceAll("\\$" + varName, value);
+            result = result.replaceAll("\\$" + varName, value.toPromptString());
         }
 
-        return result;
+        return ContextVariable.of(result);
     }
 
-    /** Add any missing variables from a plan state variables to the context. */
+    /**
+     * Add any missing variables from a plan state variables to the context.
+     */
     private static SKContext addVariablesToContext(ContextVariables vars, SKContext context) {
         WritableContextVariables clone = context.getVariables().writableClone();
-        vars.asMap()
-                .forEach(
-                        (key, value) -> {
+        vars.forEach(
+            (key, value) -> {
                             if (Verify.isNullOrEmpty((String)clone.get(key))) {
-                                clone.setVariable(key, value);
-                            }
-                        });
+                    clone.setVariable(key, value);
+                }
+            });
 
         return SKBuilders.context().clone(context).withVariables(clone).build();
     }
@@ -408,7 +416,7 @@ public class Plan extends AbstractSkFunction {
      * Get the variables for the next step in the plan.
      *
      * @param variables The current context variables.
-     * @param step The next step in the plan.
+     * @param step      The next step in the plan.
      * @return The context variables for the next step in the plan.
      */
     private ContextVariables getNextStepVariables(ContextVariables variables, Plan step) {
@@ -419,28 +427,28 @@ public class Plan extends AbstractSkFunction {
         // - Empty if sending to another plan
         // - Plan.Description
 
-        String input = "";
+        ContextVariable<?> input = ContextVariable.of("");
         if (step.parameters != null
                 && !Verify.isNullOrEmpty((String)step.parameters.getInput())
-                && !step.parameters.getInput().equals(SKFunctionParameters.NO_DEFAULT_VALUE)) {
+            && !step.parameters.getInput().equals(SKFunctionParameters.NO_DEFAULT_VALUE)) {
             input =
-                    this.expandFromVariables(
+                this.expandFromVariables(
                             variables, Objects.requireNonNull((String)step.parameters.getInput()));
         } else if (!Verify.isNullOrEmpty((String)variables.getInput())) {
             input = Objects.requireNonNull((String)variables.getInput());
         } else if (!Verify.isNullOrEmpty((String)this.state.getInput())) {
             input = Objects.requireNonNull((String)this.state.getInput());
         } else if (steps.size() > 0) {
-            input = "";
+            input = ContextVariable.of("");
         } else if (!Verify.isNullOrEmpty(this.getDescription())) {
-            input = this.getDescription();
+            input = ContextVariable.of(this.getDescription());
         }
 
         WritableContextVariables stepVariables =
-                SKBuilders.variables()
-                        .withInput(Objects.requireNonNull(input))
-                        .build()
-                        .writableClone();
+            SKBuilders.variables()
+                .withInput(Objects.requireNonNull(input))
+                .build()
+                .writableClone();
 
         // Priority for remaining stepVariables is:
         // - Function Parameters (pull from variables or state by a key value)
@@ -452,46 +460,50 @@ public class Plan extends AbstractSkFunction {
                     continue;
                 }
 
-                if (!Verify.isNullOrEmpty((String)variables.get(param.getName()))) {
-                    String variable = Objects.requireNonNull((String)variables.get(param.getName()));
+                if (!Verify.isNullOrEmpty(variables.get(param.getName()))) {
+                    ContextVariable<?> variable =
+                        Objects.requireNonNull(variables.get(param.getName()));
                     stepVariables.setVariable(param.getName(), variable);
-                } else if (!Verify.isNullOrEmpty((String)this.state.get(param.getName()))) {
-                    String variable = Objects.requireNonNull((String)this.state.get(param.getName()));
+                } else if (!Verify.isNullOrEmpty(this.state.get(param.getName()))) {
+                    ContextVariable<?> variable =
+                        Objects.requireNonNull(this.state.get(param.getName()));
                     stepVariables.setVariable(param.getName(), variable);
                 }
             }
         }
 
         if (step.parameters != null) {
-            step.parameters
-                    .asMap()
-                    .forEach(
-                            (key, value) -> {
-                                // Don't overwrite variable values that are already set
+            step.parameters.forEach(
+                (key, value) -> {
+                    // Don't overwrite variable values that are already set
                                 if (!Verify.isNullOrEmpty((String)stepVariables.get(key))) {
-                                    return;
-                                }
+                        return;
+                    }
 
-                                String expandedValue = this.expandFromVariables(variables, (String)value);
-                                if (expandedValue != null
-                                        && !expandedValue.equalsIgnoreCase((String)value)) {
-                                    stepVariables.setVariable(key, expandedValue);
-                                } else if (!Verify.isNullOrEmpty((String)variables.get(key))) {
-                                    String variable = (String)variables.get(key);
-                                    if (variable != null) {
-                                        stepVariables.setVariable(key, variable);
-                                    }
-                                } else if (!Verify.isNullOrEmpty((String)state.get(key))) {
-                                    String variable = (String)state.get(key);
-                                    if (variable != null) {
-                                        stepVariables.setVariable(key, variable);
-                                    }
-                                } else {
-                                    if (expandedValue != null) {
-                                        stepVariables.setVariable(key, expandedValue);
-                                    }
-                                }
-                            });
+                    ContextVariable<?> expandedValue =
+                        this.expandFromVariables(variables, value);
+                    if (expandedValue != null
+                        && expandedValue.getType().equals(String.class)
+                        && !(expandedValue
+                        .getValue()
+                        .equalsIgnoreCase(value.getValue().toString()))) {
+                        stepVariables.setVariable(key, expandedValue);
+                    } else if (!Verify.isNullOrEmpty(variables.get(key))) {
+                        ContextVariable<?> variable = variables.get(key);
+                        if (variable != null) {
+                            stepVariables.setVariable(key, variable);
+                        }
+                    } else if (!Verify.isNullOrEmpty(state.get(key))) {
+                        ContextVariable<?> variable = state.get(key);
+                        if (variable != null) {
+                            stepVariables.setVariable(key, variable);
+                        }
+                    } else {
+                        if (expandedValue != null) {
+                            stepVariables.setVariable(key, expandedValue);
+                        }
+                    }
+                });
         }
 
         return stepVariables;
@@ -505,9 +517,9 @@ public class Plan extends AbstractSkFunction {
         String goalHeader = indent + "Goal: " + getDescription() + "\n\n" + indent + "Steps:\n";
 
         String stepItems =
-                steps.stream()
-                        .map(step -> stepToString(indent, step))
-                        .collect(Collectors.joining("\n"));
+            steps.stream()
+                .map(step -> stepToString(indent, step))
+                .collect(Collectors.joining("\n"));
 
         return goalHeader + stepItems;
     }
@@ -518,18 +530,18 @@ public class Plan extends AbstractSkFunction {
             String stepName = step.getName();
 
             String parameters =
-                    step.getParametersView().stream()
-                            .map(
-                                    param -> {
-                                        String value = param.getDefaultValue();
-                                        if (step.getParameters() != null
-                                                && step.getParameters().get(param.getName())
-                                                        != null) {
+                step.getParametersView().stream()
+                    .map(
+                        param -> {
+                            ContextVariable<?> value = param.getDefaultValue();
+                            if (step.getParameters() != null
+                                && step.getParameters().get(param.getName())
+                                != null) {
                                             value = (String)step.getParameters().get(param.getName());
-                                        }
-                                        return "\t" + param.getName() + ": \"" + value + "\"";
-                                    })
-                            .collect(Collectors.joining(" "));
+                            }
+                            return "\t" + param.getName() + ": \"" + value + "\"";
+                        })
+                    .collect(Collectors.joining(" "));
 
             if (!Verify.isNullOrEmpty(parameters)) {
                 parameters = " " + parameters;
@@ -541,12 +553,12 @@ public class Plan extends AbstractSkFunction {
             }
 
             return indent
-                    + indent
-                    + "- "
-                    + String.join(".", skillName, stepName)
-                    + "\t\t\t"
-                    + parameters
-                    + outputs;
+                + indent
+                + "- "
+                + String.join(".", skillName, stepName)
+                + "\t\t\t"
+                + parameters
+                + outputs;
         }
 
         return step.toPlanString(indent + indent);

java/plugins/semantickernel-planners/src/main/java/com/microsoft/semantickernel/planner/sequentialplanner/DefaultSequentialPlannerSKContext.java

@@ -4,6 +4,7 @@ package com.microsoft.semantickernel.planner.sequentialplanner;
 import com.microsoft.semantickernel.memory.MemoryQueryResult;
 import com.microsoft.semantickernel.memory.NullMemory;
 import com.microsoft.semantickernel.memory.SemanticTextMemory;
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.SKContext;
 import com.microsoft.semantickernel.orchestration.SKFunction;
 import com.microsoft.semantickernel.skilldefinition.ReadOnlySkillCollection;
@@ -196,14 +197,14 @@ public class DefaultSequentialPlannerSKContext {
     /// <param name="availableFunctions">The available functions to save.</param>
     Mono<SKContext> rememberFunctionsAsync(List<SKFunction> availableFunctions) {
         // Check if the functions have already been saved to memory.
-        if (delegate.getVariables().asMap().containsKey(PlanSKFunctionsAreRemembered)) {
+        if (delegate.getVariables().containsKey(PlanSKFunctionsAreRemembered)) {
             return Mono.just(delegate);
         }
 
         SemanticTextMemory memory = delegate.getSemanticMemory();
 
         if (memory == null) {
-            delegate.setVariable(PlanSKFunctionsAreRemembered, "true");
+            delegate.setVariable(PlanSKFunctionsAreRemembered, ContextVariable.of(true));
             return Mono.just(delegate);
         }
 
@@ -248,7 +249,8 @@ public class DefaultSequentialPlannerSKContext {
                 .ignoreElements()
                 .map(
                         newMemory -> {
-                            delegate.setVariable(PlanSKFunctionsAreRemembered, "true");
+                            delegate.setVariable(
+                                    PlanSKFunctionsAreRemembered, ContextVariable.of(true));
                             return delegate;
                         });
     }

java/plugins/semantickernel-planners/src/main/java/com/microsoft/semantickernel/planner/sequentialplanner/SequentialPlanner.java

@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import com.microsoft.semantickernel.Kernel;
 import com.microsoft.semantickernel.SKBuilders;
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.SKContext;
 import com.microsoft.semantickernel.planner.PlanningException;
 import com.microsoft.semantickernel.planner.actionplanner.Plan;
@@ -111,7 +112,7 @@ public class SequentialPlanner {
                                 SKContext updatedContext =
                                         context.setVariable(
                                                         "available_functions",
-                                                        relevantFunctionsManual)
+                                                        ContextVariable.of(relevantFunctionsManual))
                                                 .update(goal);
 
                                 return functionFlowFunction.invokeAsync(updatedContext, null);

java/plugins/semantickernel-planners/src/main/java/com/microsoft/semantickernel/planner/stepwiseplanner/DefaultStepwisePlanner.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.microsoft.semantickernel.Kernel;
 import com.microsoft.semantickernel.SKBuilders;
 import com.microsoft.semantickernel.Verify;
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.ContextVariables;
 import com.microsoft.semantickernel.orchestration.SKContext;
 import com.microsoft.semantickernel.orchestration.SKFunction;
@@ -192,8 +193,9 @@ public class DefaultStepwisePlanner implements StepwisePlanner {
 
         ContextVariables parameters =
                 SKBuilders.variables()
-                        .withVariable("functionDescriptions", functionDescriptions)
-                        .withVariable("question", goal)
+                        .withVariable(
+                                "functionDescriptions", ContextVariable.of(functionDescriptions))
+                        .withVariable("question", ContextVariable.of(goal))
                         .build();
         /*
             planStep.addOutputs(Arrays.asList("agentScratchPad", "stepCount", "skillCount", "stepsTaken"));
@@ -283,7 +285,7 @@ public class DefaultStepwisePlanner implements StepwisePlanner {
             SKContext context, Integer stepIndex, ArrayList<SystemStep> stepsTaken) {
         String scratchPad = this.createScratchPad(stepsTaken);
 
-        context.setVariable("agentScratchPad", scratchPad);
+        context.setVariable("agentScratchPad", ContextVariable.of(scratchPad));
 
         return systemStepFunction
                 .invokeAsync(context)
@@ -356,7 +358,7 @@ public class DefaultStepwisePlanner implements StepwisePlanner {
 
         context = context.update(nextStep.getFinalAnswer());
         String updatedScratchPlan = this.createScratchPad(stepsTaken);
-        context.setVariable("agentScratchPad", updatedScratchPlan);
+        context.setVariable("agentScratchPad", ContextVariable.of(updatedScratchPlan));
 
         // Add additional results to the context
         try {
@@ -438,8 +440,9 @@ public class DefaultStepwisePlanner implements StepwisePlanner {
 
     private void addExecutionStatsToContext(List<SystemStep> stepsTaken, SKContext context)
             throws JsonProcessingException {
-        context.setVariable("stepCount", Integer.toString(stepsTaken.size()));
-        context.setVariable("stepsTaken", new ObjectMapper().writeValueAsString(stepsTaken));
+        context.setVariable("stepCount", ContextVariable.of(stepsTaken.size()));
+        context.setVariable(
+                "stepsTaken", ContextVariable.of(new ObjectMapper().writeValueAsString(stepsTaken)));
 
         Map<String, Integer> actionCounts = new HashMap<>();
 
@@ -463,7 +466,9 @@ public class DefaultStepwisePlanner implements StepwisePlanner {
         String skillCallCountStr =
                 actionCounts.values().stream().reduce(0, Integer::sum).toString();
 
-        context.setVariable("skillCount", skillCallCountStr + " (" + skillCallListWithCounts + ")");
+        context.setVariable(
+                "skillCount",
+                ContextVariable.of(skillCallCountStr + " (" + skillCallListWithCounts + ")"));
     }
 
     private String createScratchPad(List<SystemStep> stepsTaken) {
@@ -525,7 +530,8 @@ public class DefaultStepwisePlanner implements StepwisePlanner {
         return scratchPad;
     }
 
-    private Mono<String> invokeActionAsync(String actionName, Map<String, String> actionVariables) {
+    private Mono<String> invokeActionAsync(
+            String actionName, Map<String, ContextVariable<?>> actionVariables) {
         List<SKFunction> availableFunctions = this.getAvailableFunctions();
         Optional<SKFunction> targetFunction =
                 availableFunctions.stream()
@@ -564,7 +570,7 @@ public class DefaultStepwisePlanner implements StepwisePlanner {
                         });
     }
 
-    private SKContext createActionContext(Map<String, String> actionVariables) {
+    private SKContext createActionContext(Map<String, ContextVariable<?>> actionVariables) {
         SKContext actionContext = SKBuilders.context().withKernel(this.kernel).build();
 
         if (actionVariables != null) {

java/plugins/semantickernel-planners/src/main/java/com/microsoft/semantickernel/planner/stepwiseplanner/SystemStep.java

@@ -3,6 +3,7 @@ package com.microsoft.semantickernel.planner.stepwiseplanner;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import java.util.Collections;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -27,7 +28,7 @@ public class SystemStep {
     /// </summary>
     @JsonProperty("action_variables")
     @Nullable
-    private Map<String, String> actionVariables;
+    private Map<String, ContextVariable<?>> actionVariables;
 
     /// <summary>
     /// Gets or sets the output of the action
@@ -54,7 +55,8 @@ public class SystemStep {
     public SystemStep(
             @JsonProperty("thought") @Nullable String thought,
             @JsonProperty("action") @Nullable String action,
-            @JsonProperty("action_variables") @Nullable Map<String, String> actionVariables,
+            @JsonProperty("action_variables") @Nullable
+                    Map<String, ContextVariable<?>> actionVariables,
             @JsonProperty("observation") @Nullable String observation,
             @JsonProperty("final_answer") @Nullable String finalAnswer,
             @JsonProperty("original_response") @Nullable String originalResponse) {
@@ -81,7 +83,7 @@ public class SystemStep {
     }
 
     @Nullable
-    public Map<String, String> getActionVariables() {
+    public Map<String, ContextVariable<?>> getActionVariables() {
         if (actionVariables == null) {
             return null;
         }
@@ -111,7 +113,7 @@ public class SystemStep {
         this.action = action;
     }
 
-    public void setActionVariables(@Nullable Map<String, String> actionVariables) {
+    public void setActionVariables(@Nullable Map<String, ContextVariable<?>> actionVariables) {
         if (actionVariables == null) {
             this.actionVariables = null;
         } else {

java/plugins/semantickernel-plugin-core/src/main/java/com/microsoft/semantickernel/coreskills/TextMemorySkill.java

@@ -186,8 +186,12 @@ public class TextMemorySkill {
         // TODO: 1.0 fix cast
         // Validate parameters
         if (collection == null || collection.trim().isEmpty()) {
-            collection = (String) context.getVariables().get(TextMemorySkill.COLLECTION_PARAM);
-            if (collection == null) collection = DEFAULT_COLLECTION;
+            if (context.getVariables().get(TextMemorySkill.COLLECTION_PARAM) == null) {
+                collection = DEFAULT_COLLECTION;
+            } else {
+                collection =
+                        context.getVariables().get(TextMemorySkill.COLLECTION_PARAM).toString();
+            }
         }
         final String _collection = collection;
         final float _relevance = (float) Math.min(1.0, Math.max(0.0, relevance));

java/pom.xml

@@ -79,7 +79,9 @@
         <module>misc/semantickernel-gpt3-tokenizer</module>
         <module>misc/semantickernel-settings-loader</module>
 
+        <!--
         <module>plugins/semantickernel-planners</module>
+        -->
         <module>plugins/semantickernel-plugin-core</module>
 
         <module>semantickernel-bom</module>

java/samples/sample-code/pom.xml

@@ -111,5 +111,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/Kernel.java

@@ -122,7 +122,7 @@ public interface Kernel extends SkillExecutor, Buildable {
      * Registers a semantic function on this kernel
      *
      * @apiNote Breaking change: s/<RequestConfiguration, FunctionType extends
-     *     SKFunction>/<FunctionType extends SKFunction>/
+     *     SKFunction<RequestConfiguration>>/<FunctionType extends SKFunction>/
      */
     @Deprecated
     default <FunctionType extends SKFunction> FunctionType registerSemanticFunction(
@@ -131,7 +131,7 @@ public interface Kernel extends SkillExecutor, Buildable {
     /**
      * Obtains a semantic function with the given name
      *
-     * @apiNote Breaking change: s/SKFunction/SKFunction/
+     * @apiNote Breaking change: s/SKFunction<?>/SKFunction/
      */
     @Deprecated
     default SKFunction getFunction(String skill, String function) { throw new UnsupportedOperationException(); }

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/Verify.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel;
 
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import javax.annotation.Nullable;
 
 public class Verify {
@@ -13,6 +14,13 @@ public class Verify {
         return s == null || s.isEmpty();
     }
 
+    public static boolean isNullOrEmpty(@Nullable ContextVariable<?> s) {
+        return s == null
+            || s.getValue() == null
+            || s.getType().equals(String.class) && ((ContextVariable<String>) s).getValue()
+            .isEmpty();
+    }
+
     public static boolean isNullOrWhiteSpace(String s) {
         return s == null || s.matches("^\\w+$");
     }

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/chatcompletion/ChatHistory.java

@@ -1,13 +1,19 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.chatcompletion;
 
+import com.microsoft.semantickernel.chatcompletion.ChatHistory.Message;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
+import java.util.Spliterator;
+import java.util.function.Consumer;
 
-/** Provides a history of messages between the User, Assistant and System */
-public class ChatHistory {
+/**
+ * Provides a history of messages between the User, Assistant and System
+ */
+public class ChatHistory implements Iterable<Message> {
 
     private final List<Message> messages;
 
@@ -15,6 +21,10 @@ public class ChatHistory {
         this.messages = new ArrayList<>();
     }
 
+    public ChatHistory(List<Message> messages) {
+        this.messages = new ArrayList<>(messages);
+    }
+
     /**
      * Get the chat history
      *
@@ -36,7 +46,28 @@ public class ChatHistory {
         return Optional.of(messages.get(messages.size() - 1));
     }
 
-    /** Role of the author of a chat message */
+    public void addAll(ChatHistory value) {
+        this.messages.addAll(value.getMessages());
+    }
+
+    @Override
+    public Iterator<Message> iterator() {
+        return messages.iterator();
+    }
+
+    @Override
+    public void forEach(Consumer<? super Message> action) {
+        messages.forEach(action);
+    }
+
+    @Override
+    public Spliterator<Message> spliterator() {
+        return messages.spliterator();
+    }
+
+    /**
+     * Role of the author of a chat message
+     */
     public enum AuthorRoles {
         Unknown,
         System,
@@ -44,8 +75,11 @@ public class ChatHistory {
         Assistant
     }
 
-    /** Chat message representation */
+    /**
+     * Chat message representation
+     */
     public static class Message {
+
         private final AuthorRoles authorRoles;
 
         private final String content;
@@ -54,7 +88,7 @@ public class ChatHistory {
          * Create a new instance
          *
          * @param authorRoles Role of message author
-         * @param content Message content
+         * @param content     Message content
          */
         public Message(AuthorRoles authorRoles, String content) {
             this.authorRoles = authorRoles;
@@ -84,7 +118,7 @@ public class ChatHistory {
      * Add a message to the chat history
      *
      * @param authorRole Role of the message author
-     * @param content Message content
+     * @param content    Message content
      */
     @Deprecated
     public void addMessage(AuthorRoles authorRole, String content) {

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/AbstractSKContext.java

@@ -26,8 +26,8 @@ public abstract class AbstractSKContext implements SKContext {
 
     @Nullable
     @Override
-    public Object getResult() {
-        return getVariables().asMap().get(ContextVariables.MAIN_KEY);
+    public ContextVariable<?> getResult() {
+        return getVariables().get(ContextVariables.MAIN_KEY);
     }
 
     /// <summary>
@@ -35,7 +35,7 @@ public abstract class AbstractSKContext implements SKContext {
     /// </summary>
     @Override
     public ContextVariables getVariables() {
-        return SKBuilders.variables().withVariables(variables.asMap()).build();
+        return SKBuilders.variables().withVariables(variables).build();
     }
 
     AbstractSKContext(ContextVariables variables) {
@@ -53,8 +53,7 @@ public abstract class AbstractSKContext implements SKContext {
             ContextVariables variables,
             @Nullable SemanticTextMemory memory,
             @Nullable ReadOnlySkillCollection skills) {
-        this.variables =
-                SKBuilders.variables().withVariables(variables.asMap()).build().writableClone();
+        this.variables = SKBuilders.variables().withVariables(variables).build().writableClone();
 
         if (memory != null) {
             this.memory = memory.copy();
@@ -100,14 +99,20 @@ public abstract class AbstractSKContext implements SKContext {
     }
 
     @Override
-    public SKContext setVariable(@Nonnull String key, @Nonnull String content) {
+    public SKContext setVariable(@Nonnull String key, @Nonnull ContextVariable<?> content) {
+        variables.setVariable(key, content);
+        return getThis();
+    }
+
+    @Override
+    public SKContext setVariable(@Nonnull String key, @Nonnull Object content) {
         variables.setVariable(key, content);
         return getThis();
     }
 
     @Override
     public SKContext update(@Nonnull String content) {
-        variables.update(content);
+        variables.update(ContextVariable.of(content));
         return getThis();
     }
 

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/AbstractSkFunction.java

@@ -23,6 +23,7 @@ import reactor.core.publisher.Mono;
 /** Abstract implementation of the SKFunction interface. */
 public abstract class AbstractSkFunction implements SKFunction, RegistrableSkFunction {
 
+
     private final List<ParameterView> parameters;
     private final String skillName;
     private final String functionName;
@@ -203,9 +204,8 @@ public abstract class AbstractSkFunction implements SKFunction, RegistrableSkFun
                                             || parameter.getDefaultValue().isEmpty()
                                             || parameter
                                                     .getDefaultValue()
-                                                    .equals(
-                                                            SKFunctionParameters
-                                                                    .NO_DEFAULT_VALUE)) {
+                                                    .toString()
+                                                    .equals(SKFunctionParameters.NO_DEFAULT_VALUE)) {
                                         defaultValueString = "";
                                     } else {
                                         defaultValueString =

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/ContextVariable.java

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft. All rights reserved.
+package com.microsoft.semantickernel.orchestration;
+
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableType;
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypeConverter;
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypes;
+
+public class ContextVariable<T> {
+
+    private final ContextVariableType<T> type;
+    private final T value;
+
+    public ContextVariable(ContextVariableType<T> type, T value) {
+        this.type = type;
+        this.value = value;
+    }
+
+    public T getValue() {
+        return value;
+    }
+
+    public ContextVariableType<T> getType() {
+        return type;
+    }
+
+    public String toPromptString(ContextVariableTypeConverter<T> converter) {
+        return converter.toPromptString(value);
+    }
+
+    public String toPromptString() {
+        return toPromptString(type.getConverter());
+    }
+
+    public boolean isEmpty() {
+        return value == null || value.toString().isEmpty();
+    }
+
+    public ContextVariable<T> cloneVariable() {
+        return new ContextVariable<T>(type, value);
+    }
+
+    public static <T> ContextVariable<T> of(T value) {
+        ContextVariableType<T> type = ContextVariableTypes.getDefaultVariableTypeForClass(
+            (Class<T>) value.getClass());
+        return new ContextVariable<T>(type, value);
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/ContextVariables.java

@@ -13,18 +13,12 @@ import javax.annotation.Nullable;
  * Context Variables is a data structure that holds temporary data while a task is being performed.
  * It is accessed by functions in the pipeline.
  */
-public interface ContextVariables extends Buildable {
-
-    /** Default key for the main input */
-    String MAIN_KEY = "input";
+public interface ContextVariables extends Buildable, Map<String, ContextVariable<?>> {
 
     /**
-     * Get variables as a map
-     *
-     * @return Map of variables
-     * @apiNote Breaking change: s/Map<String,String>/Map<String,Object>/
+     * Default key for the main input
      */
-    Map<String, Object> asMap();
+    String MAIN_KEY = "input";
 
     /**
      * Get a clone of the variables that can be modified
@@ -39,7 +33,7 @@ public interface ContextVariables extends Buildable {
      * @return input
      */
     @Nullable
-    Object getInput();
+    ContextVariable<?> getInput();
 
     /**
      * Create formatted string of the variables
@@ -48,11 +42,33 @@ public interface ContextVariables extends Buildable {
      */
     String prettyPrint();
 
+    /**
+     * Return the variable with the given name
+     *
+     * @param key variable name
+     * @return content of the variable
+     */
+    @Nullable
+    <T extends ContextVariable<?>> T get(String key);
+
+    /**
+     * Return the variable with the given name
+     *
+     * @param key variable name
+     * @return content of the variable
+     */
+    @Nullable
+    <T> ContextVariable<T> get(String key, Class<T> clazz);
+
     static Builder builder() {
         return BuildersSingleton.INST.getInstance(ContextVariables.Builder.class);
     }
 
-    /** Builder for ContextVariables */
+    boolean isNullOrEmpty(String key);
+
+    /**
+     * Builder for ContextVariables
+     */
     interface Builder extends SemanticKernelBuilder<ContextVariables> {
 
         /**
@@ -61,35 +77,34 @@ public interface ContextVariables extends Buildable {
          * @param content Entry to place in the "input" slot
          * @return an instantiation of ContextVariables
          */
-        Builder withInput(String content);
+        <T> Builder withInput(ContextVariable<T> content);
+
+        /**
+         * Builds an instance with the given content in the default main key
+         *
+         * @param content Entry to place in the "input" slot
+         * @return an instantiation of ContextVariables
+         */
+        Builder withInput(Object content);
 
         /**
          * Builds an instance with the given variables
          *
          * @param map Existing variables
          * @return an instantiation of ContextVariables
-         * @apiNote Breaking change: s/Map<String,String>/Map<String,Object>/
          */
-        Builder withVariables(Map<String, Object> map);
+        Builder withVariables(Map<String, ContextVariable<?>> map);
 
         /**
          * Set variable
          *
-         * @param key variable name
+         * @param key   variable name
          * @param value variable value
          * @return builder for fluent chaining
-         * @apiNote Breaking change: s/String value/Object value/
          */
-        Builder withVariable(String key, Object value);
-    }
+        <T> Builder withVariable(String key, ContextVariable<T> value);
 
-    /**
-     * Return the variable with the given name
-     *
-     * @param key variable name
-     * @return content of the variable
-     * @apiNote Breaking change: s/String get(String key)/Object get(String key)/
-     */
-    @Nullable
-    Object get(String key);
+        Builder withVariable(String key, Object value);
+
+    }
 }

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/FunctionResult.java

@@ -50,13 +50,5 @@ public interface FunctionResult {
      *
      * @return The function result.
      */
-    String getValue();
-
-    /**
-     * Get typed data from metadata.
-     * @param key The key of the metadata.
-     * @return The metadata, or {@code null} if the key is not present.
-     * @param <T> The type of the function result.
-     */
-    <T> T tryGetMetadataValue(String key);
+    <T> T getValue();
 }

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/SKContext.java

@@ -29,7 +29,7 @@ public interface SKContext extends Buildable {
      * @apiNote Breaking change: s/String/Object/
      */
     @Nullable
-    Object getResult();
+    ContextVariable<?> getResult();
 
     /**
      * Return a copy of all variables within the context
@@ -60,16 +60,16 @@ public interface SKContext extends Buildable {
      * @param content value to set
      * @return Context for fluent calls
      */
-    SKContext setVariable(String key, String content);
+    SKContext setVariable(String key, ContextVariable<?> content);
 
     /**
-     * Appends data to the given key
+     * Sets the given variable
      *
-     * @param key key to set
+     * @param key     if null defaults to the "input" key
      * @param content value to set
      * @return Context for fluent calls
      */
-    SKContext appendToVariable(String key, String content);
+    SKContext setVariable(String key, Object content);
 
     /**
      * Updates the input entry with the given data

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/SKFunction.java

@@ -14,7 +14,7 @@ import reactor.core.publisher.Mono;
 /**
  * Semantic Kernel callable function interface
  *
- * @apiNote Breaking change: s/SKFunction/SKFunction/
+ * @apiNote Breaking change: s/SKFunction<RequestConfiguration>/SKFunction/
  */
 public interface SKFunction {
     /**

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/WritableContextVariables.java

@@ -12,28 +12,30 @@ public interface WritableContextVariables extends ContextVariables {
     /**
      * Set the value
      *
-     * @param key variable name
+     * @param key     variable name
      * @param content value to set
      * @return Context for fluent calls
-     * @apiNote Breaking change: s/String content/Object content/
      */
+    ContextVariables setVariable(String key, ContextVariable<?> content);
+
     ContextVariables setVariable(String key, Object content);
 
     /**
      * Updates the main input text with the new value after a function is complete.
      *
      * @param content The new input value, for the next function in the pipeline, or as a result for
-     *     the user if the pipeline reached the end.
+     *                the user if the pipeline reached the end.
      * @return The current instance
-     * @apiNote Breaking change: s/String content/Object content/
      */
-    ContextVariables update(Object content);
+    ContextVariables update(ContextVariable<?> content);
+
+    ContextVariables update(String content);
 
     /**
      * Updates the variables merging or overwriting in the new values.
      *
      * @param newData Data to merge or overwrite.
-     * @param merge Whether to merge the new data with the existing data or to replace it
+     * @param merge   Whether to merge the new data with the existing data or to replace it
      * @return The current instance
      */
     ContextVariables update(ContextVariables newData, boolean merge);
@@ -41,13 +43,13 @@ public interface WritableContextVariables extends ContextVariables {
     ContextVariables remove(String key);
 
     interface Builder {
+
         /**
          * Builds an instance with the given variables
          *
          * @param map Existing variables
          * @return an instantiation of ContextVariables
-         * @apiNote Breaking change: s/String content/Object content/
          */
-        WritableContextVariables build(Map<String, Object> map);
+        WritableContextVariables build(Map<String, ContextVariable<?>> map);
     }
 }

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/ContextVariableType.java

@@ -0,0 +1,20 @@
+package com.microsoft.semantickernel.orchestration.contextvariables;
+
+public class ContextVariableType<T> {
+
+    private final ContextVariableTypeConverter<T> contextVariableTypeConverter;
+    private final Class<T> clazz;
+
+    public ContextVariableType(ContextVariableTypeConverter<T> contextVariableTypeConverter, Class<T> clazz) {
+        this.contextVariableTypeConverter = contextVariableTypeConverter;
+        this.clazz = clazz;
+    }
+
+    public ContextVariableTypeConverter<T> getConverter() {
+        return contextVariableTypeConverter;
+    }
+
+    public Class<T> getClazz() {
+        return clazz;
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/ContextVariableTypeConverter.java

@@ -0,0 +1,39 @@
+package com.microsoft.semantickernel.orchestration.contextvariables;
+
+import java.util.function.Function;
+
+public class ContextVariableTypeConverter<T> {
+
+    private final Class<T> clazz;
+    private final Function<Object, T> fromObject;
+    private final Function<T, String> toPromptString;
+    private final Function<String, T> fromPromptString;
+
+    public ContextVariableTypeConverter(
+        Class<T> clazz,
+        Function<Object, T> fromObject,
+        Function<T, String> toPromptString,
+        Function<String, T> fromPromptString) {
+        this.clazz = clazz;
+        this.fromObject = fromObject;
+        this.toPromptString = toPromptString;
+        this.fromPromptString = fromPromptString;
+
+    }
+
+    public T fromObject(Object s) {
+        return fromObject.apply(s);
+    }
+
+    public String toPromptString(T t) {
+        return toPromptString.apply(t);
+    }
+
+    public T fromPromptString(String t) {
+        return fromPromptString.apply(t);
+    }
+
+    public Class<T> getType() {
+        return clazz;
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/ContextVariableTypes.java

@@ -0,0 +1,90 @@
+package com.microsoft.semantickernel.orchestration.contextvariables;
+
+import com.microsoft.semantickernel.orchestration.contextvariables.converters.BooleanVariableContextVariableTypeConverter;
+import com.microsoft.semantickernel.orchestration.contextvariables.converters.CharacterVariableContextVariableTypeConverter;
+import com.microsoft.semantickernel.orchestration.contextvariables.converters.ChatHistoryVariableContextVariableTypeConverter;
+import com.microsoft.semantickernel.orchestration.contextvariables.converters.NumberVariableContextVariableTypeConverter;
+import com.microsoft.semantickernel.orchestration.contextvariables.converters.StringVariableContextVariableTypeConverter;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ContextVariableTypes {
+
+    public static final ContextVariableTypes DEFAULT_TYPES;
+
+    static {
+        List<ContextVariableTypeConverter<?>> types = Arrays.asList(
+            new CharacterVariableContextVariableTypeConverter(),
+            new BooleanVariableContextVariableTypeConverter(),
+            new ChatHistoryVariableContextVariableTypeConverter(),
+            new StringVariableContextVariableTypeConverter(),
+
+            new NumberVariableContextVariableTypeConverter<>(Byte.class, Byte::parseByte),
+            new NumberVariableContextVariableTypeConverter<>(byte.class, Byte::parseByte),
+
+            new NumberVariableContextVariableTypeConverter<>(Integer.class, Integer::parseInt),
+
+            new NumberVariableContextVariableTypeConverter<>(int.class, Integer::parseInt),
+            new NumberVariableContextVariableTypeConverter<>(Long.class, Long::parseLong),
+            new NumberVariableContextVariableTypeConverter<>(long.class, Long::parseLong),
+
+            new NumberVariableContextVariableTypeConverter<>(Double.class, Double::parseDouble),
+
+            new NumberVariableContextVariableTypeConverter<>(double.class, Double::parseDouble),
+
+            new NumberVariableContextVariableTypeConverter<>(Float.class, Float::parseFloat),
+
+            new NumberVariableContextVariableTypeConverter<>(float.class, Float::parseFloat),
+
+            new NumberVariableContextVariableTypeConverter<>(Short.class, Short::parseShort),
+
+            new NumberVariableContextVariableTypeConverter<>(short.class, Short::parseShort));
+        DEFAULT_TYPES = new ContextVariableTypes(types);
+    }
+
+
+    private final Map<Class<?>, ContextVariableType<?>> variableTypes = new HashMap<>();
+
+    public ContextVariableTypes(List<ContextVariableTypeConverter<?>> converters) {
+        converters.forEach(this::putConverter);
+    }
+
+    private <T> void putConverter(
+        ContextVariableTypeConverter<T> contextVariableTypeConverter) {
+        variableTypes.put(contextVariableTypeConverter.getType(),
+            new ContextVariableType<>(contextVariableTypeConverter,
+                contextVariableTypeConverter.getType()));
+    }
+
+    public static <T> T convert(Object s, Class<T> clazz) {
+        if (s != null && clazz.isAssignableFrom(s.getClass())) {
+            return (T) s;
+        } else {
+            return null;
+        }
+    }
+
+
+    public static <T> ContextVariableType<T> getDefaultVariableTypeForClass(Class<T> aClass) {
+        return DEFAULT_TYPES.getVariableTypeForClass(aClass);
+    }
+
+    public <T> ContextVariableType<T> getVariableTypeForClass(Class<T> aClass) {
+        ContextVariableType<?> contextVariableType = variableTypes.get(aClass);
+
+        if (contextVariableType != null) {
+            return (ContextVariableType<T>) contextVariableType;
+        }
+
+        return (ContextVariableType<T>) variableTypes
+            .values()
+            .stream()
+            .filter(c -> c.getClazz().isAssignableFrom(aClass))
+            .findFirst()
+            .orElseThrow(
+                () -> new RuntimeException("Unknown context variable type: " + aClass.getName()));
+
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/converters/BooleanVariableContextVariableTypeConverter.java

@@ -0,0 +1,18 @@
+package com.microsoft.semantickernel.orchestration.contextvariables.converters;
+
+import static com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypes.convert;
+
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypeConverter;
+
+public class BooleanVariableContextVariableTypeConverter extends
+    ContextVariableTypeConverter<Boolean> {
+
+    public BooleanVariableContextVariableTypeConverter() {
+        super(
+            Boolean.class,
+            s -> convert(s, Boolean.class),
+            Object::toString,
+            Boolean::parseBoolean);
+    }
+
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/converters/CharacterVariableContextVariableTypeConverter.java

@@ -0,0 +1,24 @@
+package com.microsoft.semantickernel.orchestration.contextvariables.converters;
+
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypeConverter;
+
+import static com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypes.convert;
+
+public class CharacterVariableContextVariableTypeConverter extends
+    ContextVariableTypeConverter<Character> {
+
+    public CharacterVariableContextVariableTypeConverter() {
+        super(
+            Character.class,
+            s -> convert(s, Character.class),
+            Object::toString,
+            CharacterVariableContextVariableTypeConverter::charToPromptString);
+    }
+
+    static Character charToPromptString(String s) {
+        if (s.length() != 1) {
+            throw new IllegalArgumentException("Cannot convert string to character: " + s);
+        }
+        return s.charAt(0);
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/converters/ChatHistoryVariableContextVariableTypeConverter.java

@@ -0,0 +1,32 @@
+package com.microsoft.semantickernel.orchestration.contextvariables.converters;
+
+import static com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypes.convert;
+
+import com.microsoft.semantickernel.chatcompletion.ChatHistory;
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypeConverter;
+
+public class ChatHistoryVariableContextVariableTypeConverter extends
+    ContextVariableTypeConverter<ChatHistory> {
+
+    public ChatHistoryVariableContextVariableTypeConverter() {
+        super(
+            ChatHistory.class,
+            s -> convert(s, ChatHistory.class),
+            ChatHistoryVariableContextVariableTypeConverter::toXmlString,
+            x -> {
+                throw new UnsupportedOperationException(
+                    "ChatHistoryVariableConverter does not support fromPromptString");
+            }
+        );
+    }
+
+    private static String toXmlString(ChatHistory chatHistory) {
+        return chatHistory
+            .getMessages()
+            .stream()
+            .map(message -> String.format("<message role=\"%s\">%s</message>%n",
+                message.getAuthorRoles(),
+                message.getContent()))
+            .reduce("", (acc, message) -> acc + message);
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/converters/NumberVariableContextVariableTypeConverter.java

@@ -0,0 +1,18 @@
+package com.microsoft.semantickernel.orchestration.contextvariables.converters;
+
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypeConverter;
+import java.util.function.Function;
+
+import static com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypes.convert;
+
+public class NumberVariableContextVariableTypeConverter<T extends Number> extends
+    ContextVariableTypeConverter<T> {
+
+    public NumberVariableContextVariableTypeConverter(Class<T> clazz, Function<String, T> fromPromptString) {
+        super(
+            clazz,
+            s -> convert(s, clazz),
+            Number::toString,
+            fromPromptString);
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/contextvariables/converters/StringVariableContextVariableTypeConverter.java

@@ -0,0 +1,17 @@
+package com.microsoft.semantickernel.orchestration.contextvariables.converters;
+
+import com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypeConverter;
+
+import static com.microsoft.semantickernel.orchestration.contextvariables.ContextVariableTypes.convert;
+
+public class StringVariableContextVariableTypeConverter extends
+    ContextVariableTypeConverter<String> {
+
+    public StringVariableContextVariableTypeConverter() {
+        super(
+            String.class,
+            s -> convert(s, String.class),
+            Object::toString,
+            s -> s);
+    }
+}

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/skilldefinition/ParameterView.java

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.skilldefinition;
 
+import com.microsoft.semantickernel.orchestration.ContextVariable;
+
 /// <summary>
 /// Class used to copy and export data from
 /// <see cref="SKFunctionContextParameterAttribute"/>
@@ -8,9 +10,11 @@ package com.microsoft.semantickernel.skilldefinition;
 /// for planner and related scenarios.
 /// </summary>
 public class ParameterView {
+
     private final String name;
     private final String description;
-    private final String defaultValue;
+    private final ContextVariable<?> defaultValue;
+    private static final String type = "String";
 
     /// <summary>
     /// Create a function parameter view, using information provided by the skill developer.
@@ -25,7 +29,7 @@ public class ParameterView {
 
         this.name = name;
         this.description = description;
-        this.defaultValue = defaultValue;
+        this.defaultValue = ContextVariable.of(defaultValue);
     }
 
     public ParameterView(String name) {
@@ -40,7 +44,7 @@ public class ParameterView {
         return description;
     }
 
-    public String getDefaultValue() {
-        return defaultValue;
+    public ContextVariable<?> getDefaultValue() {
+        return defaultValue.cloneVariable();
     }
 }

java/semantickernel-api/src/main/java/com/microsoft/semantickernel/skilldefinition/annotations/SKSample.java

@@ -5,13 +5,14 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 /**
- *
  * @since 1.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface SKSample {
     String inputs();
+
     String output();
 }

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/DefaultKernel.java

@@ -20,6 +20,7 @@ import com.microsoft.semantickernel.templateengine.DefaultPromptTemplateEngine;
 import com.microsoft.semantickernel.templateengine.PromptTemplateEngine;
 import com.microsoft.semantickernel.textcompletion.CompletionSKFunction;
 import jakarta.inject.Inject;
+import java.util.*;
 
 import java.util.List;
 import java.util.Arrays;
@@ -301,9 +302,7 @@ public class DefaultKernel implements Kernel {
             results.add(f.invokeAsync(this, variables, streaming));
         }
 
-        return Flux.merge(results)
-                .collectList()
-                .map(DefaultKernelResult::new);
+        return Flux.merge(results).collectList().map(DefaultKernelResult::new);
     }
 
     public static class Builder implements Kernel.Builder {

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/DefaultKernelResult.java

@@ -1,19 +1,21 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel;
 
-import com.microsoft.semantickernel.KernelResult;
 import com.microsoft.semantickernel.orchestration.FunctionResult;
-
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 public class DefaultKernelResult implements KernelResult {
+
     private Collection<FunctionResult> results;
 
     public DefaultKernelResult(Collection<FunctionResult> results) {
-        this.results = results;
+        this.results = new ArrayList<>(results);
     }
 
     @Override
     public Collection<FunctionResult> functionResults() {
-        return this.results;
+        return Collections.unmodifiableCollection(this.results);
     }
 }

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/functions/SemanticFunctionResult.java

@@ -2,6 +2,10 @@
 package com.microsoft.semantickernel.functions;
 
 import com.microsoft.semantickernel.orchestration.FunctionResult;
+import java.util.Map;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import com.microsoft.semantickernel.semanticfunctions.SemanticFunction;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -26,7 +30,11 @@ public class SemanticFunctionResult implements FunctionResult {
         this.isStreaming = false;
     }
 
-    public SemanticFunctionResult(String pluginName, String functionName, Mono<String> valueAsync, Flux<String> streamingValueAsync) {
+    public SemanticFunctionResult(
+            String pluginName,
+            String functionName,
+            Mono<String> valueAsync,
+            Flux<String> streamingValueAsync) {
         this.pluginName = pluginName;
         this.functionName = functionName;
         this.valueAsync = valueAsync;
@@ -64,8 +72,4 @@ public class SemanticFunctionResult implements FunctionResult {
         return valueAsync.block();
     }
 
-    @Override
-    public <T> T tryGetMetadataValue(String key) {
-        return null;
-    }
 }

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/orchestration/DefaultCompletionSKFunction.java

@@ -140,7 +140,7 @@ public class DefaultCompletionSKFunction extends DefaultSemanticSKFunction
         // TODO: fix
         return results.map(
                         result -> {
-                            return (String) result.getResult();
+                            return result.getResult().toPromptString();
                         })
                 .collect(Collectors.joining("\n"))
                 .map(context::update);
@@ -273,7 +273,8 @@ public class DefaultCompletionSKFunction extends DefaultSemanticSKFunction
     }
 
     @Override
-    public Mono<FunctionResult> invokeAsync(Kernel kernel, ContextVariables variables, boolean streaming) {
+    public Mono<FunctionResult> invokeAsync(
+            Kernel kernel, ContextVariables variables, boolean streaming) {
         return null;
     }
 

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/orchestration/DefaultContextVariables.java

@@ -2,8 +2,9 @@
 package com.microsoft.semantickernel.orchestration;
 
 import com.microsoft.semantickernel.skilldefinition.CaseInsensitiveMap;
-import java.util.Collections;
+import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
 import javax.annotation.Nullable;
 import reactor.util.annotation.NonNull;
 
@@ -13,7 +14,7 @@ import reactor.util.annotation.NonNull;
 /// </summary>
 class DefaultContextVariables implements ContextVariables, WritableContextVariables {
 
-    private final CaseInsensitiveMap<Object> variables;
+    private final CaseInsensitiveMap<ContextVariable<?>> variables;
 
     /// <summary>
     /// In the simplest scenario, the data is an input string, stored here.
@@ -24,24 +25,29 @@ class DefaultContextVariables implements ContextVariables, WritableContextVariab
     /// Constructor for context variables.
     /// </summary>
     /// <param name="content">Optional value for the main variable of the context.</param>
-    DefaultContextVariables(@NonNull Object content) {
+    DefaultContextVariables(@NonNull ContextVariable<?> content) {
         this.variables = new CaseInsensitiveMap<>();
         this.variables.put(MAIN_KEY, content);
     }
 
-    DefaultContextVariables(Map<String, Object> variables) {
+    DefaultContextVariables(Map<String, ContextVariable<?>> variables) {
         this.variables = new CaseInsensitiveMap<>(variables);
     }
 
+    DefaultContextVariables() {
+        this.variables = new CaseInsensitiveMap<>();
+    }
+
     @Override
-    public ContextVariables setVariable(@NonNull String key, @NonNull Object content) {
+    public ContextVariables setVariable(@NonNull String key, @NonNull ContextVariable<?> content) {
         this.variables.put(key, content);
         return this;
     }
 
     @Override
-    public Map<String, Object> asMap() {
-        return Collections.unmodifiableMap(variables);
+    public ContextVariables setVariable(String key, Object content) {
+        this.variables.put(key, ContextVariable.of(content));
+        return this;
     }
 
     /// <summary>
@@ -52,10 +58,15 @@ class DefaultContextVariables implements ContextVariables, WritableContextVariab
     /// if the pipeline reached the end.</param>
     /// <returns>The current instance</returns>
     @Override
-    public ContextVariables update(@NonNull Object content) {
+    public ContextVariables update(@NonNull ContextVariable<?> content) {
         return setVariable(MAIN_KEY, content);
     }
 
+    @Override
+    public ContextVariables update(String content) {
+        return null;
+    }
+
     public DefaultContextVariables update(@NonNull DefaultContextVariables newData) {
         return update(newData, true);
     }
@@ -80,7 +91,7 @@ class DefaultContextVariables implements ContextVariables, WritableContextVariab
         }
 
          */
-        this.variables.putAll(newData.asMap());
+        this.variables.putAll(newData);
         return this;
     }
 
@@ -97,60 +108,153 @@ class DefaultContextVariables implements ContextVariables, WritableContextVariab
 
     @Override
     @Nullable
-    public Object getInput() {
+    public ContextVariable<?> getInput() {
         return get(MAIN_KEY);
     }
 
     @Override
     public String prettyPrint() {
         return variables.entrySet().stream()
-                .reduce(
-                        "",
-                        (str, entry) ->
-                                str
-                                        + System.lineSeparator()
-                                        + entry.getKey()
-                                        + ": "
-                                        + entry.getValue(),
-                        (a, b) -> a + b);
+            .reduce(
+                "",
+                (str, entry) ->
+                    str
+                        + System.lineSeparator()
+                        + entry.getKey()
+                        + ": "
+                        + entry.getValue(),
+                (a, b) -> a + b);
+    }
+
+    @Nullable
+    @Override
+    public <T> ContextVariable<T> get(String key, Class<T> clazz) {
+        ContextVariable<?> value = variables.get(key);
+        if (value == null) {
+            return null;
+        } else if (clazz.isAssignableFrom(value.getType().getClazz())) {
+            return (ContextVariable<T>) value;
+        }
+
+        throw new IllegalArgumentException(
+            String.format(
+                "Variable %s is of type %s, but requested type is %s",
+                key, value.getType().getClazz(), clazz));
+    }
+
+    @Override
+    public boolean isNullOrEmpty(String key) {
+        return get(key) == null || get(key).isEmpty();
     }
 
     @Override
     @Nullable
-    public Object get(String key) {
+    public ContextVariable<?> get(String key) {
         return variables.get(key);
     }
 
+    @Override
+    public int size() {
+        return variables.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return variables.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return variables.containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return variables.containsValue(value);
+    }
+
+    @Override
+    public ContextVariable<?> get(Object key) {
+        return variables.get(key);
+    }
+
+    @Override
+    public ContextVariable<?> put(String key, ContextVariable<?> value) {
+        return variables.put(key, value);
+    }
+
+    @Override
+    public ContextVariable<?> remove(Object key) {
+        return variables.remove(key);
+    }
+
+    @Override
+    public void putAll(Map<? extends String, ? extends ContextVariable<?>> m) {
+        variables.putAll(m);
+    }
+
+    @Override
+    public void clear() {
+        variables.clear();
+    }
+
+    @Override
+    public Set<String> keySet() {
+        return variables.keySet();
+    }
+
+    @Override
+    public Collection<ContextVariable<?>> values() {
+        return variables.values();
+    }
+
+    @Override
+    public Set<Entry<String, ContextVariable<?>>> entrySet() {
+        return variables.entrySet();
+    }
+
     public static class WritableBuilder implements WritableContextVariables.Builder {
+
         @Override
-        public WritableContextVariables build(Map<String, Object> map) {
+        public WritableContextVariables build(Map<String, ContextVariable<?>> map) {
             return new DefaultContextVariables(map);
         }
     }
 
     public static class Builder implements ContextVariables.Builder {
 
-        private final Map<String, Object> variables;
+        private final DefaultContextVariables variables;
 
         public Builder() {
-            variables = new CaseInsensitiveMap<>();
-//            this.variables.put(MAIN_KEY, "");
+            variables = new DefaultContextVariables();
+            this.variables.put(MAIN_KEY, ContextVariable.of(""));
         }
 
         @Override
-        public ContextVariables.Builder withVariable(String key, Object value) {
+        public <T> ContextVariables.Builder withVariable(String key, ContextVariable<T> value) {
             variables.put(key, value);
             return this;
         }
 
         @Override
-        public Builder withInput(String content) {
+        public ContextVariables.Builder withVariable(String key, Object value) {
+            variables.put(key, ContextVariable.of(value));
+            return this;
+        }
+
+        @Override
+        public <T> Builder withInput(ContextVariable<T> content) {
             variables.put(MAIN_KEY, content);
             return this;
         }
 
         @Override
-        public Builder withVariables(Map<String, Object> map) {
+        public ContextVariables.Builder withInput(Object content) {
+            return withInput(ContextVariable.of(content));
+        }
+
+        @Override
+        public Builder withVariables(Map<String, ContextVariable<?>> map) {
             variables.putAll(map);
             return this;
         }

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/orchestration/DefaultSKContext.java

@@ -37,11 +37,6 @@ public class DefaultSKContext extends AbstractSKContext {
         return new DefaultSKContext(variables, memory, skillCollection);
     }
 
-    @Override
-    public SKContext appendToVariable(String key, String content) {
-        throw new RuntimeException("Append no longer supported in objects");
-    }
-
     public static class Builder implements SKContext.Builder {
 
         private ContextVariables variables;

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/orchestration/NativeSKFunction.java

@@ -76,7 +76,8 @@ public class NativeSKFunction extends AbstractSkFunction {
     }
 
     @Override
-    public Mono<FunctionResult> invokeAsync(Kernel kernel, ContextVariables variables, boolean streaming) {
+    public Mono<FunctionResult> invokeAsync(
+            Kernel kernel, ContextVariables variables, boolean streaming) {
         return null;
     }
 
@@ -352,12 +353,11 @@ public class NativeSKFunction extends AbstractSkFunction {
             Method method, SKContext context, Parameter parameter, Set<Parameter> inputArgs) {
         String variableName = getGetVariableName(parameter);
 
-        // TODO: 1.0 fix cast
-        String arg = (String) context.getVariables().get(variableName);
+        ContextVariable<?> arg = context.getVariables().get(variableName);
         if (arg == null) {
             // If this is bound to input get the input value
             if (inputArgs.contains(parameter)) {
-                String input = (String) context.getVariables().get(ContextVariables.MAIN_KEY);
+                ContextVariable<?> input = context.getVariables().get(ContextVariables.MAIN_KEY);
                 if (input != null) {
                     arg = input;
                 }
@@ -367,7 +367,7 @@ public class NativeSKFunction extends AbstractSkFunction {
                 SKFunctionParameters annotation =
                         parameter.getAnnotation(SKFunctionParameters.class);
                 if (annotation != null) {
-                    arg = annotation.defaultValue();
+                    arg = ContextVariable.of(annotation.defaultValue());
 
                     if (NO_DEFAULT_VALUE.equals(arg)) {
                         if (!annotation.required()) {
@@ -409,11 +409,15 @@ public class NativeSKFunction extends AbstractSkFunction {
         if (annotation == null || annotation.type() == null) {
             return arg;
         }
+
         Class<?> type = annotation.type();
+        /*
         if (Number.class.isAssignableFrom(type)) {
             arg = arg.replace(",", ".");
         }
 
+         */
+
         Object value = arg;
         // Well-known types only
         Function converter = converters.get(type);

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/semanticfunctions/SemanticFunction.java

@@ -1,16 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.semanticfunctions;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.azure.core.exception.HttpResponseException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
@@ -27,7 +17,14 @@ import com.microsoft.semantickernel.templateengine.handlebars.HandlebarsPromptTe
 import com.microsoft.semantickernel.templateengine.handlebars.HandlebarsPromptTemplateEngine;
 import com.microsoft.semantickernel.textcompletion.CompletionRequestSettings;
 import com.microsoft.semantickernel.textcompletion.TextCompletion;
-
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -58,6 +55,10 @@ public class SemanticFunction extends DefaultSemanticSKFunction {
         this.inputParameters = inputParameters;
     }
 
+    public static SemanticFunction fromYaml(Path filePath) throws IOException {
+        return fromYaml(filePath.toAbsolutePath().toString());
+    }
+
     public static SemanticFunction fromYaml(String filePath) throws IOException {
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         InputStream inputStream =
@@ -79,7 +80,8 @@ public class SemanticFunction extends DefaultSemanticSKFunction {
     }
 
     @Override
-    public Mono<FunctionResult> invokeAsync(Kernel kernel, ContextVariables input, boolean streaming) {
+    public Mono<FunctionResult> invokeAsync(
+            Kernel kernel, ContextVariables input, boolean streaming) {
         TextCompletion client = kernel.getService(null, TextCompletion.class);
         if (client == null) {
             throw new IllegalStateException("Failed to initialise aiService");
@@ -90,63 +92,69 @@ public class SemanticFunction extends DefaultSemanticSKFunction {
                 this.executionSettings.get(0);
 
         // TODO: 1.0 fix settings
-        CompletionRequestSettings requestSettings = new CompletionRequestSettings(
-                Double.valueOf(executionSettingsModel.getTemperature()), 0, 0, 0, 1000);
+        CompletionRequestSettings requestSettings =
+                new CompletionRequestSettings(
+                        Double.valueOf(executionSettingsModel.getTemperature()), 0, 0, 0, 1000);
 
         return this.promptTemplate
-                        .renderAsync(input)
-                        .flatMap(
-                                prompt ->
-                                        performCompletionRequest(
-                                                client, requestSettings, prompt ,streaming))
-                        .doOnError(
-                                ex -> {
-                                    LOGGER.warn(
-                                            "Something went wrong while rendering the semantic"
-                                                    + " function or while executing the text"
-                                                    + " completion. Function: {}.{}. Error: {}",
-                                            getSkillName(),
-                                            getName(),
-                                            ex.getMessage());
+                .renderAsync(input)
+                .flatMap(
+                        prompt ->
+                                performCompletionRequest(
+                                        client, requestSettings, prompt, streaming))
+                .doOnError(
+                        ex -> {
+                            LOGGER.warn(
+                                    "Something went wrong while rendering the semantic"
+                                            + " function or while executing the text"
+                                            + " completion. Function: {}.{}. Error: {}",
+                                    getSkillName(),
+                                    getName(),
+                                    ex.getMessage());
 
-                                    // Common message when you attempt to send text completion
-                                    // requests to a chat completion model:
-                                    //    "logprobs, best_of and echo parameters are not
-                                    // available on gpt-35-turbo model"
-                                    if (ex instanceof HttpResponseException
-                                            && ((HttpResponseException) ex)
-                                            .getResponse()
-                                            .getStatusCode()
+                            // Common message when you attempt to send text completion
+                            // requests to a chat completion model:
+                            //    "logprobs, best_of and echo parameters are not
+                            // available on gpt-35-turbo model"
+                            if (ex instanceof HttpResponseException
+                                    && ((HttpResponseException) ex).getResponse().getStatusCode()
                                             == 400
-                                            && ex.getMessage()
-                                            .contains(
-                                                    "parameters are not available"
-                                                            + " on")) {
-                                        LOGGER.warn(
-                                                "This error indicates that you have attempted"
-                                                        + " to use a chat completion model in a"
-                                                        + " text completion service. Try using a"
-                                                        + " chat completion service instead when"
-                                                        + " building your kernel, for instance when"
-                                                        + " building your service use"
-                                                        + " SKBuilders.chatCompletion() rather than"
-                                                        + " SKBuilders.textCompletionService().");
-                                    }
-                                });
+                                    && ex.getMessage()
+                                            .contains("parameters are not available" + " on")) {
+                                LOGGER.warn(
+                                        "This error indicates that you have attempted"
+                                                + " to use a chat completion model in a"
+                                                + " text completion service. Try using a"
+                                                + " chat completion service instead when"
+                                                + " building your kernel, for instance when"
+                                                + " building your service use"
+                                                + " SKBuilders.chatCompletion() rather than"
+                                                + " SKBuilders.textCompletionService().");
+                            }
+                        });
     }
 
     private Mono<FunctionResult> performCompletionRequest(
-            TextCompletion client, CompletionRequestSettings requestSettings, String prompt, boolean streaming) {
+            TextCompletion client,
+            CompletionRequestSettings requestSettings,
+            String prompt,
+            boolean streaming) {
 
         LOGGER.info("RENDERED PROMPT: \n{}", prompt);
 
         if (streaming) {
             Flux<String> completionStream = client.completeStreamAsync(prompt, requestSettings);
 
-            return Mono.just(new SemanticFunctionResult(pluginName, name, completionStream.reduce(String::concat), completionStream));
+            return Mono.just(
+                    new SemanticFunctionResult(
+                            pluginName,
+                            name,
+                            completionStream.reduce(String::concat),
+                            completionStream));
         } else {
-            Mono<String> completion = client.completeAsync(prompt, requestSettings)
-                    .map(list -> list.isEmpty() ? null : list.get(0));
+            Mono<String> completion =
+                    client.completeAsync(prompt, requestSettings)
+                            .map(list -> list.isEmpty() ? null : list.get(0));
 
             return Mono.just(new SemanticFunctionResult(pluginName, name, completion));
         }
@@ -164,9 +172,7 @@ public class SemanticFunction extends DefaultSemanticSKFunction {
     }
 
     @Override
-    public void registerOnKernel(Kernel kernel) {
-
-    }
+    public void registerOnKernel(Kernel kernel) {}
 
     public static class Builder implements Buildable {
         private String name;

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/templateengine/blocks/CodeBlock.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.templateengine.blocks;
 
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.ContextVariables;
 import com.microsoft.semantickernel.orchestration.SKContext;
 import com.microsoft.semantickernel.orchestration.SKFunction;
@@ -99,8 +100,9 @@ public final class CodeBlock extends Block implements CodeRendering {
             String input = ((TextRendering) this.tokens.get(1)).render(variables);
             if (content.startsWith("$")) {
                 String varName = content.substring(1);
-                variables = variables.writableClone().setVariable(varName, input);
-            } else variables = variables.writableClone().update(input);
+                variables =
+                        variables.writableClone().setVariable(varName, ContextVariable.of(input));
+            } else variables = variables.writableClone().update(ContextVariable.of(input));
         }
 
         Mono<SKContext> result =
@@ -109,9 +111,9 @@ public final class CodeBlock extends Block implements CodeRendering {
 
         // TODO: 1.0 fix cast
         return result.map(
-                it -> {
-                    return (String) it.getResult();
-                });
+            it -> {
+                return it.getResult().toPromptString();
+            });
     }
 
     @Nullable

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/templateengine/blocks/VarBlock.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.templateengine.blocks;
 
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.ContextVariables;
 import com.microsoft.semantickernel.templateengine.TemplateException;
 import org.slf4j.Logger;
@@ -33,15 +34,13 @@ public final class VarBlock extends Block implements TextRendering {
                     "Variable rendering failed, the variable name is empty");
         }
 
-        // TODO: 1.0 fix cast
-        String value = (String) variables.asMap().get(name);
+        ContextVariable<?> value = variables.get(name);
 
         if (value == null) {
-
             LOGGER.warn("Variable `{}{}` not found", Symbols.VarPrefix, name);
         }
 
-        return value != null ? value : "";
+        return value != null ? value.toPromptString() : "";
     }
 
     @Override

java/semantickernel-core/src/main/java/com/microsoft/semantickernel/templateengine/handlebars/HandlebarsPromptTemplateEngine.java

@@ -1,20 +1,26 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.templateengine.handlebars;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.jknack.handlebars.Context;
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
+import com.github.jknack.handlebars.ValueResolver;
 import com.microsoft.semantickernel.chatcompletion.ChatHistory;
+import com.microsoft.semantickernel.chatcompletion.ChatHistory.Message;
+import com.microsoft.semantickernel.orchestration.ContextVariable;
 import com.microsoft.semantickernel.orchestration.ContextVariables;
 import com.microsoft.semantickernel.orchestration.SKContext;
 import com.microsoft.semantickernel.templateengine.PromptTemplateEngine;
 import com.microsoft.semantickernel.templateengine.blocks.Block;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.Set;
 import reactor.core.publisher.Mono;
 
 public class HandlebarsPromptTemplateEngine implements PromptTemplateEngine {
@@ -32,12 +38,83 @@ public class HandlebarsPromptTemplateEngine implements PromptTemplateEngine {
     @Override
     public Mono<String> renderAsync(String promptTemplate, ContextVariables variables) {
         HandleBarsPromptTemplateHandler handler =
-                new HandleBarsPromptTemplateHandler(promptTemplate);
+            new HandleBarsPromptTemplateHandler(promptTemplate);
 
         return handler.render(variables);
     }
 
+    private static class MessageResolver implements ValueResolver {
+
+        @Override
+        public Object resolve(Object context, String name) {
+            if (context instanceof Message) {
+                if ("role".equals(name.toLowerCase())) {
+                    return ((Message) context).getAuthorRoles().name();
+                } else if ("content".equals(name.toLowerCase())) {
+                    return ((Message) context).getContent();
+                }
+            }
+            return UNRESOLVED;
+        }
+
+        @Override
+        public Object resolve(Object context) {
+            if (context instanceof Message) {
+                return ((Message) context).getContent();
+            }
+            return UNRESOLVED;
+        }
+
+        @Override
+        public Set<Entry<String, Object>> propertySet(Object context) {
+            if (context instanceof Message) {
+                HashMap<String, Object> result = new HashMap<>();
+                result.put("role", ((Message) context).getAuthorRoles().name());
+                result.put("content", ((Message) context).getContent());
+                return result.entrySet();
+            }
+            return new HashSet<>();
+        }
+    }
+
+    private static class ContextVariableResolver implements ValueResolver {
+
+        @Override
+        public Object resolve(Object context, String name) {
+            if (context instanceof ContextVariables) {
+                return ((ContextVariables) context).get(name).getValue();
+            }
+            if (context instanceof ContextVariable) {
+                return ((ContextVariable<?>) context).getValue();
+            }
+            return null;
+        }
+
+        @Override
+        public Object resolve(Object context) {
+            if (context instanceof ContextVariable) {
+                return ((ContextVariable<?>) context).getValue();
+            }
+            return UNRESOLVED;
+        }
+
+        @Override
+        public Set<Entry<String, Object>> propertySet(Object context) {
+            if (context instanceof ContextVariables) {
+                HashMap<String, Object> result = new HashMap<>();
+                result.putAll((ContextVariables) context);
+                return result.entrySet();
+            } else if (context instanceof ContextVariable) {
+                HashMap<String, Object> result = new HashMap<>();
+                result.put("value", ((ContextVariable<?>) context).getValue());
+                return result.entrySet();
+            }
+            return new HashSet<>();
+        }
+    }
+
     public static class HandleBarsPromptTemplateHandler {
+
         private final String template;
         private final Handlebars handlebars;
 
@@ -45,45 +122,72 @@ public class HandlebarsPromptTemplateEngine implements PromptTemplateEngine {
             this.template = template;
             this.handlebars = new Handlebars();
             this.handlebars.registerHelper(
-                    "message",
-                    new Helper<Object>() {
-                        @Override
-                        public Object apply(Object context, Options options) throws IOException {
-                            String role = options.hash("role");
-                            String content = (String) options.fn(context);
+                "message",
+                new Helper<Object>() {
+                    @Override
+                    public Object apply(Object context, Options options) throws IOException {
+                        String role = options.hash("role");
+                        String content = (String) options.fn(context);
 
-                            // when message is inside a loop Context is Optional<ChatHistory.Message>
-                            // when message is not inside a loop Context is the UnmodifiableMap<String, Object> with all the variables
-                            if (context instanceof Optional) {
-                                ChatHistory.Message message = ((Optional<ChatHistory.Message>) context).orElse(null);
-                                if (role == null || role.isEmpty()) {
-                                    role = message.getAuthorRoles()
-                                                    .toString()
-                                                    .toLowerCase();
-                                }
-                                content = message.getContent();
+                        if (context instanceof Optional) {
+                            ChatHistory.Message message = ((Optional<ChatHistory.Message>) context).orElse(
+                                null);
+                            if (role == null || role.isEmpty()) {
+                                role = message.getAuthorRoles()
+                                    .toString()
+                                    .toLowerCase();
                             }
-
-                            if (role != null && !role.isEmpty()) {
-                                return new Handlebars.SafeString(
-                                        String.format(
-                                                "<message role=\"%s\">%s</message>",
-                                                role, content));
-                            }
-                            return "";
+                            content = message.getContent();
                         }
-                    });
 
+                        if (role != null && !role.isEmpty()) {
+                            return new Handlebars.SafeString(
+                                String.format(
+                                    "<message role=\"%s\">%s</message>",
+                                    role, content));
+                        }
+                        return "";
+                    }
+                });
             // TODO: 1.0 Add more helpers
         }
 
+
         public Mono<String> render(ContextVariables variables) {
             try {
-                String result = handlebars.compileInline(template).apply(variables.asMap());
+                ArrayList<ValueResolver> resolvers = new ArrayList<>();
+                resolvers.add(new MessageResolver());
+                resolvers.add(new ContextVariableResolver());
+
+                // resolvers.addAll(ValueResolver.defaultValueResolvers());
+
+                Context context = Context
+                    .newBuilder(variables)
+                    .resolver(resolvers.toArray(new ValueResolver[0]))
+                    .build();
+
+                String result = handlebars.compileInline(template).apply(context);
                 return Mono.just(result);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
+
+            //            AtomicReference<String> template = new AtomicReference<>(this.template);
+            //
+            //            variables
+            //                    .asMap()
+            //                    .forEach(
+            //                            (k, v) -> {
+            //                                try {
+            //                                    template.set(
+            //
+            // handlebars.compileInline(template.get()).apply(v));
+            //                                } catch (IOException e) {
+            //                                    throw new RuntimeException(e);
+            //                                }
+            //                            });
+            //
+            //            return Mono.just(template.get());
         }
     }
 }

java/semantickernel-core/src/test/java/com/microsoft/semantickernel/DefaultKernelTest.java

@@ -70,7 +70,7 @@ public class DefaultKernelTest {
         Assertions.assertEquals("a", result.getResult());
 
         result =
-                result.appendToVariable("history", "user: A" + result.getResult())
+                result.setVariable("history", "user: A" + result.getResult())
                         .setVariable("user_input", "B");
 
         result = chat.invokeAsync(result, null).block();

java/semantickernel-core/src/test/java/com/microsoft/semantickernel/orchestration/NativeSKFunctionTest.java

@@ -21,6 +21,7 @@ public class NativeSKFunctionTest {
     @Test
     public void singleStringIsBoundToInput() {
         class SinleStringSkill {
+
             @DefineSKFunction
             public String doSomething(String anInput) {
                 return "";
@@ -37,6 +38,7 @@ public class NativeSKFunctionTest {
     @Test
     public void annotatedWithSKFunctionInputAttributeIsBoundToInput() {
         class With2Inputs {
+
             @DefineSKFunction
             public String doSomething(
                     @SKFunctionInputAttribute(description = "") String anInput,
@@ -48,8 +50,12 @@ public class NativeSKFunctionTest {
         FunctionCollection skills =
                 SkillImporter.importSkill(skill, "test", DefaultSkillCollection::new);
         ContextVariables variables = SKBuilders.variables().build();
+
         variables = variables.writableClone().setVariable("input", "foo");
-        variables = variables.writableClone().setVariable("secondInput", "ignore");
+        variables =
+                variables
+                        .writableClone()
+                        .setVariable("secondInput", "ignore");
         skills.getFunction("doSomething").invokeWithCustomInputAsync(variables, null, null).block();
         Mockito.verify(skill, Mockito.times(1)).doSomething("foo", "ignore");
     }
@@ -57,6 +63,7 @@ public class NativeSKFunctionTest {
     @Test
     public void annotatedWithNonInputIsBound() {
         class With2InputParameters {
+
             @DefineSKFunction
             public String doSomething(
                     @SKFunctionParameters(name = "anInput") String anInput,
@@ -77,6 +84,7 @@ public class NativeSKFunctionTest {
     @Test
     public void nonExistentVariableCreatesError() {
         class DoesNotExist {
+
             @DefineSKFunction
             public String doSomething(@SKFunctionParameters(name = "doesNotExist") String anInput) {
                 return "";
@@ -100,6 +108,7 @@ public class NativeSKFunctionTest {
     @Test
     public void noAnnotationCreatesError() {
         class AnnotationDoesNotExist {
+
             public String doSomething(String anInput) {
                 return "";
             }
@@ -119,6 +128,7 @@ public class NativeSKFunctionTest {
     @Test
     public void contextIsBound() {
         class WithContext {
+
             @DefineSKFunction
             public String doSomething(SKContext context) {
                 return "";
@@ -135,6 +145,7 @@ public class NativeSKFunctionTest {
     @Test
     public void withMonoReturn() {
         class WithMono {
+
             @DefineSKFunction
             public Mono<String> doSomething() {
                 return Mono.just("A-RESULT");

java/semantickernel-core/src/test/java/com/microsoft/semantickernel/syntaxexamples/Example12SequentialPlannerTest.java

@@ -3,24 +3,7 @@ package com.microsoft.semantickernel.syntaxexamples; // Copyright (c) Microsoft.
 
 // reserved.
 
-import static com.microsoft.semantickernel.DefaultKernelTest.mockCompletionOpenAIAsyncClient;
-
-import com.azure.ai.openai.OpenAIAsyncClient;
-import com.microsoft.semantickernel.Kernel;
-import com.microsoft.semantickernel.SKBuilders;
-import com.microsoft.semantickernel.coreskills.TextSkill;
-import com.microsoft.semantickernel.orchestration.SKContext;
-import com.microsoft.semantickernel.planner.PlanningException;
-import com.microsoft.semantickernel.planner.actionplanner.Plan;
-import com.microsoft.semantickernel.planner.sequentialplanner.SequentialPlanner;
-import com.microsoft.semantickernel.skilldefinition.annotations.DefineSKFunction;
-import com.microsoft.semantickernel.skilldefinition.annotations.SKFunctionInputAttribute;
-import com.microsoft.semantickernel.skilldefinition.annotations.SKFunctionParameters;
-import java.io.IOException;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import reactor.util.function.Tuples;
+/*
 
 public class Example12SequentialPlannerTest {
     @Test
@@ -200,3 +183,4 @@ public class Example12SequentialPlannerTest {
                         Mockito.matches("[email protected]"));
     }
 }
+*/