Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d3dab21

Browse files
authoredJan 29, 2025··
Merge branch 'main' into feature/python-postgres-search
2 parents 575e436 + c311183 commit d3dab21

File tree

90 files changed

+2012
-960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2012
-960
lines changed
 

‎dotnet/Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<!-- Plugins -->
105105
<PackageVersion Include="DocumentFormat.OpenXml" Version="3.2.0" />
106106
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0" />
107-
<PackageVersion Include="DuckDB.NET.Data.Full" Version="1.1.2.1" />
107+
<PackageVersion Include="DuckDB.NET.Data.Full" Version="1.1.3" />
108108
<PackageVersion Include="DuckDB.NET.Data" Version="1.1.2.1" />
109109
<PackageVersion Include="MongoDB.Driver" Version="2.30.0" />
110110
<PackageVersion Include="Microsoft.Graph" Version="4.51.0" />

‎dotnet/src/Agents/Abstractions/AgentChat.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ protected async IAsyncEnumerable<ChatMessageContent> InvokeAgentAsync(
213213
{
214214
this.SetActivityOrThrow(); // Disallow concurrent access to chat history
215215

216-
this.Logger.LogAgentChatInvokingAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id);
216+
this.Logger.LogAgentChatInvokingAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName());
217217

218218
try
219219
{
@@ -226,7 +226,7 @@ protected async IAsyncEnumerable<ChatMessageContent> InvokeAgentAsync(
226226

227227
await foreach ((bool isVisible, ChatMessageContent message) in channel.InvokeAsync(agent, cancellationToken).ConfigureAwait(false))
228228
{
229-
this.Logger.LogAgentChatInvokedAgentMessage(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, message);
229+
this.Logger.LogAgentChatInvokedAgentMessage(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName(), message);
230230

231231
messages.Add(message);
232232

@@ -248,7 +248,7 @@ protected async IAsyncEnumerable<ChatMessageContent> InvokeAgentAsync(
248248
.Select(kvp => new ChannelReference(kvp.Value, kvp.Key));
249249
this._broadcastQueue.Enqueue(channelRefs, messages);
250250

251-
this.Logger.LogAgentChatInvokedAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id);
251+
this.Logger.LogAgentChatInvokedAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName());
252252
}
253253
finally
254254
{
@@ -272,7 +272,7 @@ protected async IAsyncEnumerable<StreamingChatMessageContent> InvokeStreamingAge
272272
{
273273
this.SetActivityOrThrow(); // Disallow concurrent access to chat history
274274

275-
this.Logger.LogAgentChatInvokingAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id);
275+
this.Logger.LogAgentChatInvokingAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName());
276276

277277
try
278278
{
@@ -290,7 +290,7 @@ protected async IAsyncEnumerable<StreamingChatMessageContent> InvokeStreamingAge
290290

291291
this.History.AddRange(messages);
292292

293-
this.Logger.LogAgentChatInvokedStreamingAgentMessages(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, messages);
293+
this.Logger.LogAgentChatInvokedStreamingAgentMessages(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName(), messages);
294294

295295
// Broadcast message to other channels (in parallel)
296296
// Note: Able to queue messages without synchronizing channels.
@@ -300,7 +300,7 @@ protected async IAsyncEnumerable<StreamingChatMessageContent> InvokeStreamingAge
300300
.Select(kvp => new ChannelReference(kvp.Value, kvp.Key));
301301
this._broadcastQueue.Enqueue(channelRefs, messages);
302302

303-
this.Logger.LogAgentChatInvokedAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id);
303+
this.Logger.LogAgentChatInvokedAgent(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName());
304304
}
305305
finally
306306
{
@@ -433,7 +433,7 @@ private async Task<AgentChannel> GetOrCreateChannelAsync(Agent agent, Cancellati
433433
AgentChannel? channel = await this.SynchronizeChannelAsync(channelKey, cancellationToken).ConfigureAwait(false);
434434
if (channel is null)
435435
{
436-
this.Logger.LogAgentChatCreatingChannel(nameof(InvokeAgentAsync), agent.GetType(), agent.Id);
436+
this.Logger.LogAgentChatCreatingChannel(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName());
437437

438438
channel = await agent.CreateChannelAsync(cancellationToken).ConfigureAwait(false);
439439

@@ -445,7 +445,7 @@ private async Task<AgentChannel> GetOrCreateChannelAsync(Agent agent, Cancellati
445445
await channel.ReceiveAsync(this.History, cancellationToken).ConfigureAwait(false);
446446
}
447447

448-
this.Logger.LogAgentChatCreatedChannel(nameof(InvokeAgentAsync), agent.GetType(), agent.Id);
448+
this.Logger.LogAgentChatCreatedChannel(nameof(InvokeAgentAsync), agent.GetType(), agent.Id, agent.GetDisplayName());
449449
}
450450

451451
return channel;

0 commit comments

Comments
 (0)
Please sign in to comment.