Merge branch 'main' into function-prompt-filtering

microsoft · Jan 18, 2024 · 4719195 · 4719195
2 parents cf8782b + b2bbd41
commit 4719195
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 211 deletions.
diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
@@ -65,7 +65,6 @@
     <PackageVersion Include="Grpc.Net.Client" Version="2.60.0" />
     <PackageVersion Include="protobuf-net" Version="3.2.30" />
     <PackageVersion Include="protobuf-net.Reflection" Version="3.2.12" />
-    <PackageVersion Include="CoreCLR-NCalc" Version="2.2.113" />
     <PackageVersion Include="YamlDotNet" Version="13.7.1" />
     <!-- Memory stores -->
     <PackageVersion Include="Pgvector" Version="0.2.0" />

diff --git a/dotnet/SK-dotnet.sln b/dotnet/SK-dotnet.sln
@@ -125,8 +125,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Type", "Type", "{E85EA4D0-B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugins.Core", "src\Plugins\Plugins.Core\Plugins.Core.csproj", "{0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCalcPlugins", "samples\NCalcPlugins\NCalcPlugins.csproj", "{E6EDAB8F-3406-4DBF-9AAB-DF40DC2CA0FA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelemetryExample", "samples\TelemetryExample\TelemetryExample.csproj", "{C754950A-E16C-4F96-9CC7-9328E361B5AF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connectors.Memory.Kusto", "src\Connectors\Connectors.Memory.Kusto\Connectors.Memory.Kusto.csproj", "{E07608CC-D710-4655-BB9E-D22CF3CDD193}"
@@ -358,11 +356,6 @@ Global
 		{0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Publish|Any CPU.Build.0 = Publish|Any CPU
 		{0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6EDAB8F-3406-4DBF-9AAB-DF40DC2CA0FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6EDAB8F-3406-4DBF-9AAB-DF40DC2CA0FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6EDAB8F-3406-4DBF-9AAB-DF40DC2CA0FA}.Publish|Any CPU.ActiveCfg = Release|Any CPU
-		{E6EDAB8F-3406-4DBF-9AAB-DF40DC2CA0FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6EDAB8F-3406-4DBF-9AAB-DF40DC2CA0FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C754950A-E16C-4F96-9CC7-9328E361B5AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C754950A-E16C-4F96-9CC7-9328E361B5AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C754950A-E16C-4F96-9CC7-9328E361B5AF}.Publish|Any CPU.ActiveCfg = Release|Any CPU
@@ -507,7 +500,6 @@ Global
 		{3CDE10B2-AE8F-4FC4-8D55-92D4AD32E144} = {958AD708-F048-4FAF-94ED-D2F2B92748B9}
 		{E85EA4D0-BB7E-4DFD-882F-A76EB8C0B8FF} = {958AD708-F048-4FAF-94ED-D2F2B92748B9}
 		{0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1} = {D6D598DF-C17C-46F4-B2B9-CDE82E2DE132}
-		{E6EDAB8F-3406-4DBF-9AAB-DF40DC2CA0FA} = {FA3720F1-C99A-49B2-9577-A940257098BF}
 		{C754950A-E16C-4F96-9CC7-9328E361B5AF} = {FA3720F1-C99A-49B2-9577-A940257098BF}
 		{E07608CC-D710-4655-BB9E-D22CF3CDD193} = {24503383-A8C4-4255-9998-28D70FE8E99A}
 		{D6D598DF-C17C-46F4-B2B9-CDE82E2DE132} = {831DDCA2-7D2C-4C31-80DB-6BDB3E1F7AE0}

diff --git a/dotnet/nuget/nuget-package.props b/dotnet/nuget/nuget-package.props
@@ -10,7 +10,7 @@
     <IsPackable>true</IsPackable>
 
     <!-- Package validation. Baseline Version should be lower than current version. -->
-    <PackageValidationBaselineVersion>1.0.1</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>1.1.0</PackageValidationBaselineVersion>
     <!-- Validate assembly attributes only for Publish builds -->
     <NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
     <!-- Do not validate reference assemblies -->

diff --git a/dotnet/samples/KernelSyntaxExamples/Example74_FlowOrchestrator.cs b/dotnet/samples/KernelSyntaxExamples/Example74_FlowOrchestrator.cs
@@ -17,7 +17,6 @@
 using Microsoft.SemanticKernel.Plugins.Core;
 using Microsoft.SemanticKernel.Plugins.Web;
 using Microsoft.SemanticKernel.Plugins.Web.Bing;
-using NCalcPlugins;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -60,9 +59,6 @@ public class Example74_FlowOrchestrator : BaseTest
     [Fact(Skip = "Can take more than 1 minute")]
     public Task RunAsync()
     {
-        // Load assemblies for external plugins
-        WriteLine($"Loading {typeof(SimpleCalculatorPlugin).AssemblyQualifiedName}");
-
         return RunExampleAsync();
         //return RunInteractiveAsync();
     }

diff --git a/dotnet/samples/KernelSyntaxExamples/KernelSyntaxExamples.csproj b/dotnet/samples/KernelSyntaxExamples/KernelSyntaxExamples.csproj
@@ -73,7 +73,6 @@
     <ProjectReference Include="..\..\src\Connectors\Connectors.Memory.Qdrant\Connectors.Memory.Qdrant.csproj" />
     <ProjectReference Include="..\..\src\Plugins\Plugins.Web\Plugins.Web.csproj" />
     <ProjectReference Include="..\..\src\SemanticKernel.Core\SemanticKernel.Core.csproj" />
-    <ProjectReference Include="..\NCalcPlugins\NCalcPlugins.csproj" />
     <PackageReference Include="System.Text.Json" />
   </ItemGroup>
   <ItemGroup>

diff --git a/dotnet/samples/NCalcPlugins/LanguageCalculatorPlugin.cs b/dotnet/samples/NCalcPlugins/LanguageCalculatorPlugin.cs
diff --git a/dotnet/samples/NCalcPlugins/NCalcPlugins.csproj b/dotnet/samples/NCalcPlugins/NCalcPlugins.csproj
diff --git a/dotnet/samples/NCalcPlugins/SimpleCalculatorPlugin.cs b/dotnet/samples/NCalcPlugins/SimpleCalculatorPlugin.cs
diff --git a/dotnet/samples/TelemetryExample/TelemetryExample.csproj b/dotnet/samples/TelemetryExample/TelemetryExample.csproj
@@ -25,7 +25,6 @@
     <ProjectReference Include="..\..\src\SemanticKernel.Core\SemanticKernel.Core.csproj" />
     <ProjectReference Include="..\..\src\Plugins\Plugins.Core\Plugins.Core.csproj" />
     <ProjectReference Include="..\..\src\Plugins\Plugins.Web\Plugins.Web.csproj" />
-    <ProjectReference Include="..\NCalcPlugins\NCalcPlugins.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/src/Connectors/Connectors.OpenAI/OpenAIMemoryBuilderExtensions.cs b/dotnet/src/Connectors/Connectors.OpenAI/OpenAIMemoryBuilderExtensions.cs
@@ -33,13 +33,13 @@ public static MemoryBuilder WithAzureOpenAITextEmbeddingGeneration(
         string? modelId = null,
         HttpClient? httpClient = null)
     {
-        return builder.WithTextEmbeddingGeneration((loggerFactory, httpClient) =>
+        return builder.WithTextEmbeddingGeneration((loggerFactory, builderHttpClient) =>
             new AzureOpenAITextEmbeddingGenerationService(
                 deploymentName,
                 endpoint,
                 apiKey,
                 modelId,
-                HttpClientProvider.GetHttpClient(httpClient),
+                HttpClientProvider.GetHttpClient(httpClient ?? builderHttpClient),
                 loggerFactory));
     }
 
@@ -63,13 +63,13 @@ public static MemoryBuilder WithAzureOpenAITextEmbeddingGeneration(
         string? modelId = null,
         HttpClient? httpClient = null)
     {
-        return builder.WithTextEmbeddingGeneration((loggerFactory, httpClient) =>
+        return builder.WithTextEmbeddingGeneration((loggerFactory, builderHttpClient) =>
             new AzureOpenAITextEmbeddingGenerationService(
                 deploymentName,
                 endpoint,
                 credential,
                 modelId,
-                HttpClientProvider.GetHttpClient(httpClient),
+                HttpClientProvider.GetHttpClient(httpClient ?? builderHttpClient),
                 loggerFactory));
     }
 
@@ -91,12 +91,12 @@ public static MemoryBuilder WithOpenAITextEmbeddingGeneration(
         string? orgId = null,
         HttpClient? httpClient = null)
     {
-        return builder.WithTextEmbeddingGeneration((loggerFactory, httpClient) =>
+        return builder.WithTextEmbeddingGeneration((loggerFactory, builderHttpClient) =>
             new OpenAITextEmbeddingGenerationService(
                 modelId,
                 apiKey,
                 orgId,
-                HttpClientProvider.GetHttpClient(httpClient),
+                HttpClientProvider.GetHttpClient(httpClient ?? builderHttpClient),
                 loggerFactory));
     }
 }
diff --git a/dotnet/src/IntegrationTests/Fakes/ThrowingEmailPluginFake.cs b/dotnet/src/IntegrationTests/Fakes/ThrowingEmailPluginFake.cs
@@ -3,7 +3,6 @@
 using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Microsoft.SemanticKernel;
 
 #pragma warning disable CA1812 // Uninstantiated internal types