Skip to content

Commit ccf2bfd

Browse files
WhitWaldoWhitWaldo
authored
Conversation builder consistency changes (#1423)
* Corrected several unit tests Signed-off-by: Whit Waldo <[email protected]> * Updated extension name for consistency Signed-off-by: Whit Waldo <[email protected]> * Updated registration name for consistency Signed-off-by: Whit Waldo <[email protected]> --------- Signed-off-by: Whit Waldo <[email protected]>
1 parent 8bc0318 commit ccf2bfd

File tree

4 files changed

+121
-14
lines changed

4 files changed

+121
-14
lines changed

‎examples/AI/ConversationalAI/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
var builder = WebApplication.CreateBuilder(args);
55

6-
builder.Services.AddDaprAiConversation();
6+
builder.Services.AddDaprConversationClient();
77

88
var app = builder.Build();
99

‎src/Dapr.AI/Conversation/Extensions/DaprAiConversationBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static class DaprAiConversationBuilderExtensions
2626
/// Registers the necessary functionality for the Dapr AI conversation functionality.
2727
/// </summary>
2828
/// <returns></returns>
29-
public static IDaprAiConversationBuilder AddDaprAiConversation(this IServiceCollection services, Action<IServiceProvider, DaprConversationClientBuilder>? configure = null, ServiceLifetime lifetime = ServiceLifetime.Singleton)
29+
public static IDaprAiConversationBuilder AddDaprConversationClient(this IServiceCollection services, Action<IServiceProvider, DaprConversationClientBuilder>? configure = null, ServiceLifetime lifetime = ServiceLifetime.Singleton)
3030
{
3131
ArgumentNullException.ThrowIfNull(services, nameof(services));
3232

‎test/Dapr.AI.Test/Conversation/Extensions/DaprAiConversationBuilderExtensionsTest.cs‎

Lines changed: 114 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313

1414
using System;
1515
using System.Collections.Generic;
16+
using System.Linq;
1617
using System.Net.Http;
18+
using System.Threading.Tasks;
1719
using Dapr.AI.Conversation;
1820
using Dapr.AI.Conversation.Extensions;
1921
using Microsoft.Extensions.Configuration;
@@ -34,7 +36,7 @@ public void AddDaprConversationClient_FromIConfiguration()
3436
var services = new ServiceCollection();
3537
services.AddSingleton<IConfiguration>(configuration);
3638

37-
services.AddDaprAiConversation();
39+
services.AddDaprConversationClient();
3840

3941
var app = services.BuildServiceProvider();
4042

@@ -45,18 +47,66 @@ public void AddDaprConversationClient_FromIConfiguration()
4547
}
4648

4749
[Fact]
48-
public void AddDaprAiConversation_WithoutConfigure_ShouldAddServices()
50+
public void AddDaprConversationClient_RegistersDaprClientOnlyOnce()
4951
{
5052
var services = new ServiceCollection();
51-
var builder = services.AddDaprAiConversation();
53+
54+
var clientBuilder = new Action<IServiceProvider, DaprConversationClientBuilder>((sp, builder) =>
55+
{
56+
builder.UseDaprApiToken("abc");
57+
});
58+
59+
services.AddDaprConversationClient(); //Sets a default API token value of an empty string
60+
services.AddDaprConversationClient(clientBuilder); //Sets the API token value
61+
62+
var serviceProvider = services.BuildServiceProvider();
63+
var daprConversationClient = serviceProvider.GetService<DaprConversationClient>();
64+
65+
Assert.NotNull(daprConversationClient!.HttpClient);
66+
Assert.False(daprConversationClient.HttpClient.DefaultRequestHeaders.TryGetValues("dapr-api-token", out var _));
67+
}
68+
69+
[Fact]
70+
public void AddDaprConversationClient_RegistersUsingDependencyFromIServiceProvider()
71+
{
72+
var services = new ServiceCollection();
73+
services.AddSingleton<TestSecretRetriever>();
74+
services.AddDaprConversationClient((provider, builder) =>
75+
{
76+
var configProvider = provider.GetRequiredService<TestSecretRetriever>();
77+
var apiToken = configProvider.GetApiTokenValue();
78+
builder.UseDaprApiToken(apiToken);
79+
});
80+
81+
var serviceProvider = services.BuildServiceProvider();
82+
var client = serviceProvider.GetRequiredService<DaprConversationClient>();
83+
84+
//Validate it's set on the GrpcClient - note that it doesn't get set on the HttpClient
85+
Assert.NotNull(client);
86+
Assert.NotNull(client.DaprApiToken);
87+
Assert.Equal("abcdef", client.DaprApiToken);
88+
Assert.NotNull(client.HttpClient);
89+
90+
if (!client.HttpClient.DefaultRequestHeaders.TryGetValues("dapr-api-token", out var daprApiToken))
91+
{
92+
Assert.Fail();
93+
}
94+
Assert.Equal("abcdef", daprApiToken.FirstOrDefault());
95+
}
96+
97+
[Fact]
98+
public void AddDaprConversationClient_WithoutConfigure_ShouldAddServices()
99+
{
100+
var services = new ServiceCollection();
101+
var builder = services.AddDaprConversationClient();
52102
Assert.NotNull(builder);
53103
}
54104

55105
[Fact]
56-
public void AddDaprAiConversation_RegistersIHttpClientFactory()
106+
public void AddDaprConversationClient_RegistersIHttpClientFactory()
57107
{
58108
var services = new ServiceCollection();
59-
services.AddDaprAiConversation();
109+
services.AddDaprConversationClient();
60110
var serviceProvider = services.BuildServiceProvider();
61111

62112
var httpClientFactory = serviceProvider.GetService<IHttpClientFactory>();
@@ -67,9 +117,66 @@ public void AddDaprAiConversation_RegistersIHttpClientFactory()
67117
}
68118

69119
[Fact]
70-
public void AddDaprAiConversation_NullServices_ShouldThrowException()
120+
public void AddDaprConversationClient_NullServices_ShouldThrowException()
71121
{
72122
IServiceCollection services = null;
73-
Assert.Throws<ArgumentNullException>(() => services.AddDaprAiConversation());
123+
Assert.Throws<ArgumentNullException>(() => services.AddDaprConversationClient());
124+
}
125+
126+
[Fact]
127+
public void AddDaprConversationClient_ShouldRegisterSingleton_WhenLifetimeIsSingleton()
128+
{
129+
var services = new ServiceCollection();
130+
131+
services.AddDaprConversationClient((_, _) => { }, ServiceLifetime.Singleton);
132+
var serviceProvider = services.BuildServiceProvider();
133+
134+
var daprConversationClient1 = serviceProvider.GetService<DaprConversationClient>();
135+
var daprConversationClient2 = serviceProvider.GetService<DaprConversationClient>();
136+
137+
Assert.NotNull(daprConversationClient1);
138+
Assert.NotNull(daprConversationClient2);
139+
140+
Assert.Same(daprConversationClient1, daprConversationClient2);
141+
}
142+
143+
[Fact]
144+
public async Task AddDaprConversationClient_ShouldRegisterScoped_WhenLifetimeIsScoped()
145+
{
146+
var services = new ServiceCollection();
147+
148+
services.AddDaprConversationClient((_, _) => { }, ServiceLifetime.Scoped);
149+
var serviceProvider = services.BuildServiceProvider();
150+
151+
await using var scope1 = serviceProvider.CreateAsyncScope();
152+
var daprConversationClient1 = scope1.ServiceProvider.GetService<DaprConversationClient>();
153+
154+
await using var scope2 = serviceProvider.CreateAsyncScope();
155+
var daprConversationClient2 = scope2.ServiceProvider.GetService<DaprConversationClient>();
156+
157+
Assert.NotNull(daprConversationClient1);
158+
Assert.NotNull(daprConversationClient2);
159+
Assert.NotSame(daprConversationClient1, daprConversationClient2);
160+
}
161+
162+
[Fact]
163+
public void AddDaprConversationClient_ShouldRegisterTransient_WhenLifetimeIsTransient()
164+
{
165+
var services = new ServiceCollection();
166+
167+
services.AddDaprConversationClient((_, _) => { }, ServiceLifetime.Transient);
168+
var serviceProvider = services.BuildServiceProvider();
169+
170+
var daprConversationClient1 = serviceProvider.GetService<DaprConversationClient>();
171+
var daprConversationClient2 = serviceProvider.GetService<DaprConversationClient>();
172+
173+
Assert.NotNull(daprConversationClient1);
174+
Assert.NotNull(daprConversationClient2);
175+
Assert.NotSame(daprConversationClient1, daprConversationClient2);
176+
}
177+
178+
private class TestSecretRetriever
179+
{
180+
public string GetApiTokenValue() => "abcdef";
74181
}
75182
}

‎test/Dapr.Jobs.Test/Extensions/DaprJobsServiceCollectionExtensionsTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void AddDaprJobsClient_RegistersUsingDependencyFromIServiceProvider()
8989
services.AddDaprJobsClient((provider, builder) =>
9090
{
9191
var configProvider = provider.GetRequiredService<TestSecretRetriever>();
92-
var apiToken = TestSecretRetriever.GetApiTokenValue();
92+
var apiToken = configProvider.GetApiTokenValue();
9393
builder.UseDaprApiToken(apiToken);
9494
});
9595

@@ -114,7 +114,7 @@ public void RegisterJobsClient_ShouldRegisterSingleton_WhenLifetimeIsSingleton()
114114
{
115115
var services = new ServiceCollection();
116116

117-
services.AddDaprJobsClient((serviceProvider, options) => { }, ServiceLifetime.Singleton);
117+
services.AddDaprJobsClient((_, _) => { }, ServiceLifetime.Singleton);
118118
var serviceProvider = services.BuildServiceProvider();
119119

120120
var daprJobsClient1 = serviceProvider.GetService<DaprJobsClient>();
@@ -131,7 +131,7 @@ public async Task RegisterJobsClient_ShouldRegisterScoped_WhenLifetimeIsScoped()
131131
{
132132
var services = new ServiceCollection();
133133

134-
services.AddDaprJobsClient((serviceProvider, options) => { }, ServiceLifetime.Scoped);
134+
services.AddDaprJobsClient((_, _) => { }, ServiceLifetime.Scoped);
135135
var serviceProvider = services.BuildServiceProvider();
136136

137137
await using var scope1 = serviceProvider.CreateAsyncScope();
@@ -150,7 +150,7 @@ public void RegisterJobsClient_ShouldRegisterTransient_WhenLifetimeIsTransient()
150150
{
151151
var services = new ServiceCollection();
152152

153-
services.AddDaprJobsClient((serviceProvider, options) => { }, ServiceLifetime.Transient);
153+
services.AddDaprJobsClient((_, _) => { }, ServiceLifetime.Transient);
154154
var serviceProvider = services.BuildServiceProvider();
155155

156156
var daprJobsClient1 = serviceProvider.GetService<DaprJobsClient>();
@@ -163,6 +163,6 @@ public void RegisterJobsClient_ShouldRegisterTransient_WhenLifetimeIsTransient()
163163

164164
private class TestSecretRetriever
165165
{
166-
public static string GetApiTokenValue() => "abcdef";
166+
public string GetApiTokenValue() => "abcdef";
167167
}
168168
}

0 commit comments

Comments
 (0)