diff --git a/java/pom.xml b/java/pom.xml index 3eec3c99dc..28fd1d9a2a 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -68,8 +68,6 @@ semantickernel-bom - connectors/semantickernel-connectors-web-bing - aiservices/openai semantickernel-api @@ -140,11 +138,6 @@ semantickernel-actionplanner-extension ${project.version} - - com.microsoft.semantic-kernel - semantickernel-connectors-web-bing - ${project.version} - com.github.spotbugs diff --git a/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/plugins/web/WebSearchEnginePlugin.java b/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/plugins/web/WebSearchEnginePlugin.java index 3be5beb461..060c7b3431 100644 --- a/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/plugins/web/WebSearchEnginePlugin.java +++ b/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/plugins/web/WebSearchEnginePlugin.java @@ -46,7 +46,7 @@ public class WebSearchEnginePlugin { /// This method is marked as "unsafe." The usage of JavaScriptEncoder.UnsafeRelaxedJsonEscaping may introduce security risks. /// Only use this method if you are aware of the potential risks and have validated the input to prevent security vulnerabilities. /// - @DefineKernelFunction(name = "search", description = "Searches the web for the given query", returnType="java.lang.String") + @DefineKernelFunction(name = "search", description = "Searches the web for the given query", returnType = "java.lang.String") public Mono searchAsync( @KernelFunctionParameter(description = "The search query", name = "query", type = String.class) String query, @KernelFunctionParameter(description = "The number of results to return", name = "count", defaultValue = "1", type = int.class) int count, diff --git a/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example59_OpenAIFunctionCalling.java b/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example59_OpenAIFunctionCalling.java index 2513e10c32..5c5a2c68e9 100644 --- a/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example59_OpenAIFunctionCalling.java +++ b/java/samples/sample-code/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/Example59_OpenAIFunctionCalling.java @@ -96,9 +96,9 @@ public class Example59_OpenAIFunctionCalling { // Based on coordinates var toolCallBehavior = ToolCallBehavior.allowOnlyKernelFunctions(true, - plugin.get("getLatitudeOfCity"), - plugin.get("getLongitudeOfCity"), - plugin.get("getsTheWeatherAtAGivenLocation")); + plugin.get("getLatitudeOfCity"), + plugin.get("getLongitudeOfCity"), + plugin.get("getsTheWeatherAtAGivenLocation")); var result = kernel .invokeAsync(function) @@ -113,7 +113,8 @@ public class Example59_OpenAIFunctionCalling { KernelFunction function) { System.out.println("======== Require a function ========"); - var toolCallBehavior = ToolCallBehavior.requireKernelFunction(plugin.get("getsTheWeatherForCity")); + var toolCallBehavior = ToolCallBehavior + .requireKernelFunction(plugin.get("getsTheWeatherForCity")); var result = kernel .invokeAsync(function) diff --git a/java/samples/sample-code/src/main/resources/log4j2.xml b/java/samples/sample-code/src/main/resources/log4j2.xml index efd15412f8..2774f660d5 100644 --- a/java/samples/sample-code/src/main/resources/log4j2.xml +++ b/java/samples/sample-code/src/main/resources/log4j2.xml @@ -16,6 +16,9 @@ + + + diff --git a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/Kernel.java b/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/Kernel.java index 4c4889974a..54c771dfd9 100644 --- a/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/Kernel.java +++ b/java/semantickernel-api/src/main/java/com/microsoft/semantickernel/Kernel.java @@ -39,6 +39,7 @@ public class Kernel implements Buildable { // Only present so we can create a builder in copy method private final AIServiceCollection services; + @Nullable private final Function serviceSelectorProvider; /** @@ -54,7 +55,7 @@ public class Kernel implements Buildable { */ public Kernel( AIServiceCollection services, - Function serviceSelectorProvider, + @Nullable Function serviceSelectorProvider, @Nullable List plugins, @Nullable KernelHooks globalKernelHooks) { diff --git a/java/semantickernel-bom/pom.xml b/java/semantickernel-bom/pom.xml index 46861867f7..8cb6374220 100644 --- a/java/semantickernel-bom/pom.xml +++ b/java/semantickernel-bom/pom.xml @@ -59,11 +59,6 @@ semantickernel-plugin-core ${project.version} - - com.microsoft.semantic-kernel - semantickernel-connectors-web-bing - ${project.version} - com.microsoft.semantic-kernel aiservices-azureopenai