Merge branch 'main' into feature_agent_filters

Author: crickman

dotnet/Directory.Packages.props

@@ -18,7 +18,7 @@
     <PackageVersion Include="JsonSchema.Net" Version="5.4.2" />
     <PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.20.1" />
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
-    <PackageVersion Include="Microsoft.Azure.Kusto.Data" Version="11.3.5" />
+    <PackageVersion Include="Microsoft.Azure.Kusto.Data" Version="12.2.2" />
     <PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.5.1" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />

dotnet/src/Connectors/Connectors.Memory.Kusto/KustoMemoryStore.cs

@@ -358,7 +358,7 @@ protected virtual void Dispose(bool disposing)
     /// <param name="collectionName">Kusto table name.</param>
     /// <param name="normalized">Boolean flag that indicates if table name normalization is needed.</param>
     private static string GetTableName(string collectionName, bool normalized = true)
-        => normalized ? CslSyntaxGenerator.NormalizeTableName(collectionName) : collectionName;
+        => normalized ? CslSyntaxGenerator.NormalizeName(collectionName) : collectionName;
 
     /// <summary>
     /// Converts Kusto table name to collection name.

dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs

@@ -693,7 +693,18 @@ internal async IAsyncEnumerable<OpenAIStreamingChatMessageContent> GetStreamingC
                             OpenAIFunctionToolCall.TrackStreamingToolingUpdate(update.ToolCallUpdate, ref toolCallIdsByIndex, ref functionNamesByIndex, ref functionArgumentBuildersByIndex);
                         }
 
-                        var openAIStreamingChatMessageContent = new OpenAIStreamingChatMessageContent(update, update.ChoiceIndex ?? 0, this.DeploymentOrModelName, metadata) { AuthorName = streamedName };
+                        AuthorRole? role = null;
+                        if (streamedRole.HasValue)
+                        {
+                            role = new AuthorRole(streamedRole.Value.ToString());
+                        }
+
+                        OpenAIStreamingChatMessageContent openAIStreamingChatMessageContent =
+                            new(update, update.ChoiceIndex ?? 0, this.DeploymentOrModelName, metadata)
+                            {
+                                AuthorName = streamedName,
+                                Role = role,
+                            };
 
                         if (update.ToolCallUpdate is StreamingFunctionToolCallUpdate functionCallUpdate)
                         {

dotnet/src/Connectors/Connectors.UnitTests/Memory/Kusto/KustoMemoryStoreTests.cs

@@ -25,6 +25,7 @@ public class KustoMemoryStoreTests
     private const string DatabaseName = "FakeDb";
     private readonly Mock<ICslQueryProvider> _cslQueryProviderMock;
     private readonly Mock<ICslAdminProvider> _cslAdminProviderMock;
+    private readonly string _normalisedCollectionName = CslSyntaxGenerator.NormalizeName(CollectionName);
 
     public KustoMemoryStoreTests()
     {
@@ -145,7 +146,7 @@ public async Task ItCanUpsertAsync()
         // Assert
         this._cslAdminProviderMock.Verify(client => client.ExecuteControlCommandAsync(
             DatabaseName,
-            It.Is<string>(s => s.StartsWith($".ingest inline into table {CollectionName}", StringComparison.Ordinal) && s.Contains(actualMemoryRecordKey, StringComparison.Ordinal)),
+            It.Is<string>(s => s.StartsWith($".ingest inline into table {this._normalisedCollectionName}", StringComparison.Ordinal) && s.Contains(actualMemoryRecordKey, StringComparison.Ordinal)),
             It.IsAny<ClientRequestProperties>()), Times.Once());
         Assert.Equal(expectedMemoryRecord.Key, actualMemoryRecordKey);
     }
@@ -171,7 +172,7 @@ public async Task ItCanUpsertBatchAsyncAsync()
             .Verify(client => client.ExecuteControlCommandAsync(
                 DatabaseName,
                 It.Is<string>(s =>
-                    s.StartsWith($".ingest inline into table {CollectionName}", StringComparison.Ordinal) &&
+                    s.StartsWith($".ingest inline into table {this._normalisedCollectionName}", StringComparison.Ordinal) &&
                     batchUpsertMemoryRecords.All(r => s.Contains(r.Key, StringComparison.Ordinal))),
                 It.IsAny<ClientRequestProperties>()
             ), Times.Once());
@@ -306,7 +307,7 @@ public async Task ItCanRemoveAsync()
         this._cslAdminProviderMock
             .Verify(client => client.ExecuteControlCommandAsync(
                 DatabaseName,
-                It.Is<string>(s => s.Replace("  ", " ").StartsWith($".delete table {CollectionName}") && s.Contains(MemoryRecordKey)), // Replace double spaces with single space to account for the fact that the query is formatted with double spaces and to be future proof
+                It.Is<string>(s => s.Replace("  ", " ").StartsWith($".delete table {this._normalisedCollectionName}") && s.Contains(MemoryRecordKey)), // Replace double spaces with single space to account for the fact that the query is formatted with double spaces and to be future proof
                 It.IsAny<ClientRequestProperties>()
             ), Times.Once());
     }
@@ -325,7 +326,7 @@ public async Task ItCanRemoveBatchAsync()
         this._cslAdminProviderMock
             .Verify(client => client.ExecuteControlCommandAsync(
                 DatabaseName,
-                It.Is<string>(s => s.Replace("  ", " ").StartsWith($".delete table {CollectionName}") && memoryRecordKeys.All(r => s.Contains(r, StringComparison.OrdinalIgnoreCase))),
+                It.Is<string>(s => s.Replace("  ", " ").StartsWith($".delete table {this._normalisedCollectionName}") && memoryRecordKeys.All(r => s.Contains(r, StringComparison.OrdinalIgnoreCase))),
                 It.IsAny<ClientRequestProperties>()
             ), Times.Once());
     }

dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAICompletionTests.cs

@@ -128,6 +128,11 @@ public async Task AzureOpenAIStreamingTestAsync(bool useChatModel, string prompt
         // Act
         await foreach (var content in target.InvokeStreamingAsync<StreamingKernelContent>(plugins["ChatPlugin"]["Chat"], new() { [InputParameterName] = prompt }))
         {
+            if (content is StreamingChatMessageContent messageContent)
+            {
+                Assert.NotNull(messageContent.Role);
+            }
+
             fullResult.Append(content);
         }