From 8791461451e7cbccb2d45a6f280074c4b5be940c Mon Sep 17 00:00:00 2001 From: John Oliver <1615532+johnoliver@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:52:53 +0000 Subject: [PATCH] Remove unused files --- .../samples/Example11_UseMultipleModels.java | 140 ------------------ .../orchestration/AIFunction.java | 47 ------ 2 files changed, 187 deletions(-) delete mode 100755 java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/Example11_UseMultipleModels.java delete mode 100644 java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/AIFunction.java diff --git a/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/Example11_UseMultipleModels.java b/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/Example11_UseMultipleModels.java deleted file mode 100755 index e7b1a57109..0000000000 --- a/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/Example11_UseMultipleModels.java +++ /dev/null @@ -1,140 +0,0 @@ -///usr/bin/env jbang "$0" "$@" ; exit $? -//DEPS com.microsoft.semantic-kernel:semantickernel-core:0.2.6-alpha -//DEPS com.microsoft.semantic-kernel:semantickernel-core-skills:0.2.6-alpha -//DEPS com.microsoft.semantic-kernel.connectors:semantickernel-connectors:0.2.6-alpha -//DEPS org.slf4j:slf4j-jdk14:2.0.7 -//SOURCES syntaxexamples/SampleSkillsUtil.java,Config.java -package com.microsoft.semantickernel.samples; - -import com.azure.ai.openai.OpenAIAsyncClient; -import com.microsoft.semantickernel.Kernel; -import com.microsoft.semantickernel.SKBuilders; -import com.microsoft.semantickernel.connectors.ai.openai.textcompletion.OpenAITextCompletion; -import com.microsoft.semantickernel.connectors.ai.openai.util.OpenAIClientProvider; -import com.microsoft.semantickernel.exceptions.ConfigurationException; -import com.microsoft.semantickernel.orchestration.SKContext; -import com.microsoft.semantickernel.orchestration.SKFunction; -import com.microsoft.semantickernel.samples.syntaxexamples.SampleSkillsUtil; -import com.microsoft.semantickernel.skilldefinition.ReadOnlyFunctionCollection; -import com.microsoft.semantickernel.textcompletion.CompletionSKFunction; -import java.io.IOException; -import reactor.core.publisher.Mono; - -/** - * Getting started - *

- * Create a conf.properties file based on the examples files at the root of this module. - *

- * Get - * started with Azure OpenAI - * Get started with OpenAI - */ -public class Example11_UseMultipleModels { - - /** - * Returns a Semantic Kernel with Text Completion. - * - * @param client Client that will handle requests to AzureOpenAI or OpenAI. - * @return Kernel. - */ - public static Kernel getKernel(OpenAIAsyncClient client) { - OpenAITextCompletion davinciTextCompletion = new OpenAITextCompletion(client, - "text-davinci-003"); - OpenAITextCompletion adaTextCompletion = new OpenAITextCompletion(client, "text-ada-001"); - - Kernel kernel = SKBuilders.kernel() - // Add one of this serviceId to config.json in FunSkill to test difference models - .withAIService("text-davinci-003", davinciTextCompletion, false, OpenAITextCompletion.class) - .withAIService("text-ada-001", adaTextCompletion, false, OpenAITextCompletion.class) - .build(); - - return kernel; - } - - /** - * Imports 'FunSkill' from directory examples and runs the 'Joke' function within it. - * - * @param kernel Kernel with Text Completion. - */ - public static void runWithServiceDefinedAtInvocation(Kernel kernel) { - ReadOnlyFunctionCollection skill = kernel - .importSkillFromDirectory("FunSkill", SampleSkillsUtil.detectSkillDirLocation(), - "FunSkill"); - - CompletionSKFunction function = skill.getFunction("Joke", - CompletionSKFunction.class); - - Mono result = function.invokeAsync("time travel to dinosaur age", - SKBuilders - .completionRequestSettings() - .serviceId("text-davinci-003") - .build()); - - String davinci = result.block().getResult(); - - result = function.invokeAsync("time travel to dinosaur age", - SKBuilders - .completionRequestSettings() - .serviceId("text-ada-001") - .build()); - - String ada = result.block().getResult(); - - System.out.println("=== RESULT FROM text-davinci-003 ==="); - System.out.println(davinci); - System.out.println("===================================="); - - System.out.println("===== RESULT FROM text-ada-001 ====="); - System.out.println(ada); - System.out.println("===================================="); - } - - - public static void runWithServiceDefinedByInlineFunction(Kernel kernel) { - // Create function via kernel - var function = kernel. - getSemanticFunctionBuilder() - .withPromptTemplate("tell a joke about {{$input}}") - .withRequestSettings( - SKBuilders.completionRequestSettings() - .temperature(0.4) - .topP(1) - .maxTokens(100) - .serviceId("text-davinci-003") - .build()) - .build(); - - String davinci = function.invokeAsync("time travel to dinosaur age").block().getResult(); - - System.out.println("=== RESULT FROM text-davinci-003 ==="); - System.out.println(davinci); - System.out.println("===================================="); - } - - - public static void runWithServiceDefinedInFile(Kernel kernel) { - ReadOnlyFunctionCollection skills = kernel.importSkillFromResources( - "Plugins", - "ExamplePlugins", - "ExampleFunctionWithService" - ); - - SKFunction function = skills.getFunction("ExampleFunctionWithService"); - - System.out.println("=== RESULT FROM text-davinci-003 ==="); - System.out.println(function.invokeAsync().block().getResult()); - System.out.println("===================================="); - } - - - public static void run(OpenAIAsyncClient client) { - Kernel kernel = getKernel(client); - runWithServiceDefinedInFile(kernel); - runWithServiceDefinedAtInvocation(kernel); - runWithServiceDefinedByInlineFunction(kernel); - } - - public static void main(String args[]) throws ConfigurationException, IOException { - run(OpenAIClientProvider.getClient()); - } -} diff --git a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/AIFunction.java b/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/AIFunction.java deleted file mode 100644 index 67abbde425..0000000000 --- a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/orchestration/AIFunction.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -package com.microsoft.semantickernel.orchestration; - -import com.microsoft.semantickernel.ai.AIRequestSettings; -import com.microsoft.semantickernel.services.AIServiceSupplier; -import com.microsoft.semantickernel.skilldefinition.KernelSkillsSupplier; -import com.microsoft.semantickernel.skilldefinition.ParameterView; -import java.util.List; -import javax.annotation.Nullable; - -public abstract class AIFunction - extends AbstractSkFunction - implements SKFunction { - - @Nullable private AIServiceSupplier aiServiceSupplier; - - /** - * Constructor. - * - * @param parameters The parameters of the function. - * @param skillName The name of the skill. - * @param functionName The name of the function. - * @param description The description of the function. - * @param returnParameters - * @param skillsSupplier The skill supplier. - */ - public AIFunction( - List parameters, - String skillName, - String functionName, - String description, - List returnParameters, - @Nullable KernelSkillsSupplier skillsSupplier, - @Nullable AIServiceSupplier aiServiceSupplier) { - super(parameters, skillName, functionName, description, returnParameters, skillsSupplier); - this.aiServiceSupplier = aiServiceSupplier; - } - - protected void setServiceSupplier(@Nullable AIServiceSupplier aiServiceSupplier) { - this.aiServiceSupplier = aiServiceSupplier; - } - - @Nullable - protected AIServiceSupplier getAiServiceSupplier() { - return aiServiceSupplier; - } -}