From 0cc275256f25ac5a80c3143fbdf175fe681292f7 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 25 Feb 2025 03:24:56 +0000 Subject: [PATCH] Updating to latest MEAI Fixes #492 --- .vscode/settings.json | 5 ++++- Directory.Build.props | 2 +- Directory.Packages.props | 2 +- .../Components/Pages/Home.razor | 6 ++--- .../OllamaApiClientTests.cs | 4 ++-- .../OllamaSharpIChatClientTests.cs | 22 +++++++++---------- .../OllamaSharpIEmbeddingGeneratorTests.cs | 22 +++++++++---------- 7 files changed, 33 insertions(+), 30 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7ec7ca6a..3db427d7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,8 @@ }, "rust-analyzer.linkedProjects": [ "examples/rust/actix_api/Cargo.toml", - ] + ], + "[aspnetcorerazor]": { + "editor.defaultFormatter": "ms-dotnettools.csharp" + } } \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 0f87bd55..ddf27787 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ 9.0.0 1.11.0 4.2.0 - 9.1.0-preview.1.25064.3 + 9.3.0-preview.1.25114.11 false true diff --git a/Directory.Packages.props b/Directory.Packages.props index c3d32520..4c9126fc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -62,7 +62,7 @@ - + diff --git a/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.Web/Components/Pages/Home.razor b/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.Web/Components/Pages/Home.razor index f8ded68b..8df34379 100644 --- a/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.Web/Components/Pages/Home.razor +++ b/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.Web/Components/Pages/Home.razor @@ -14,13 +14,13 @@
@@ -61,7 +61,7 @@ bool gotResponse = false; _response = "Asking Ollama..."; - var stream = client.CompleteStreamingAsync(_prompt); + var stream = client.GetStreamingResponseAsync(_prompt); await foreach (var answerToken in stream) { diff --git a/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaApiClientTests.cs b/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaApiClientTests.cs index 7738d09e..77594566 100644 --- a/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaApiClientTests.cs +++ b/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaApiClientTests.cs @@ -140,8 +140,8 @@ public void RegisteringChatClientAndEmbeddingGeneratorReturnsCorrectModelForServ var chatClient = host.Services.GetRequiredService(); var embeddingGenerator = host.Services.GetRequiredService>>(); - Assert.Equal("Chat", chatClient.Metadata.ModelId); - Assert.Equal("Embedding", embeddingGenerator.Metadata.ModelId); + Assert.Equal("Chat", chatClient.GetService()?.ModelId); + Assert.Equal("Embedding", embeddingGenerator.GetService()?.ModelId); } [Fact] diff --git a/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIChatClientTests.cs b/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIChatClientTests.cs index 8aef20c3..e0ab200c 100644 --- a/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIChatClientTests.cs +++ b/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIChatClientTests.cs @@ -33,8 +33,8 @@ public void ReadsFromConnectionStringCorrectly(bool useKeyed) host.Services.GetRequiredKeyedService("Ollama") : host.Services.GetRequiredService(); - Assert.NotNull(client.Metadata.ProviderUri); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); + Assert.NotNull(client.GetService()?.ProviderUri); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); } [Theory] @@ -61,9 +61,9 @@ public void CanSetConnectionStringInCode(bool useKeyed) host.Services.GetRequiredKeyedService("Ollama") : host.Services.GetRequiredService(); - Assert.NotNull(client.Metadata.ProviderUri); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); - Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString()); + Assert.NotNull(client.GetService()?.ProviderUri); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); + Assert.DoesNotContain("http://not-used", client.GetService()?.ProviderUri?.ToString()); } [Theory] @@ -91,9 +91,9 @@ public void ConnectionStringWinsOverConfigSection(bool useKeyed) host.Services.GetRequiredKeyedService("Ollama") : host.Services.GetRequiredService(); - Assert.NotNull(client.Metadata.ProviderUri); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); - Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString()); + Assert.NotNull(client.GetService()?.ProviderUri); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); + Assert.DoesNotContain("http://not-used", client.GetService()?.ProviderUri?.ToString()); } [Fact] @@ -115,9 +115,9 @@ public void CanSetMultipleKeyedClients() var client2 = host.Services.GetRequiredKeyedService("Ollama2"); var client3 = host.Services.GetRequiredKeyedService("Ollama3"); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); - Assert.Equal("https://localhost:5002/", client2.Metadata.ProviderUri?.ToString()); - Assert.Equal("https://localhost:5003/", client3.Metadata.ProviderUri?.ToString()); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); + Assert.Equal("https://localhost:5002/", client2.GetService()?.ProviderUri?.ToString()); + Assert.Equal("https://localhost:5003/", client3.GetService()?.ProviderUri?.ToString()); Assert.NotEqual(client, client2); Assert.NotEqual(client, client3); diff --git a/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIEmbeddingGeneratorTests.cs b/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIEmbeddingGeneratorTests.cs index 21e47525..d0c8bf8e 100644 --- a/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIEmbeddingGeneratorTests.cs +++ b/tests/CommunityToolkit.Aspire.OllamaSharp.Tests/OllamaSharpIEmbeddingGeneratorTests.cs @@ -33,8 +33,8 @@ public void ReadsFromConnectionStringCorrectly(bool useKeyed) host.Services.GetRequiredKeyedService>>("Ollama") : host.Services.GetRequiredService>>(); - Assert.NotNull(client.Metadata.ProviderUri); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); + Assert.NotNull(client.GetService()?.ProviderUri); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); } [Theory] @@ -61,9 +61,9 @@ public void CanSetConnectionStringInCode(bool useKeyed) host.Services.GetRequiredKeyedService>>("Ollama") : host.Services.GetRequiredService>>(); - Assert.NotNull(client.Metadata.ProviderUri); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); - Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString()); + Assert.NotNull(client.GetService()?.ProviderUri); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); + Assert.DoesNotContain("http://not-used", client.GetService()?.ProviderUri?.ToString()); } [Theory] @@ -91,9 +91,9 @@ public void ConnectionStringWinsOverConfigSection(bool useKeyed) host.Services.GetRequiredKeyedService>>("Ollama") : host.Services.GetRequiredService>>(); - Assert.NotNull(client.Metadata.ProviderUri); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); - Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString()); + Assert.NotNull(client.GetService()?.ProviderUri); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); + Assert.DoesNotContain("http://not-used", client.GetService()?.ProviderUri?.ToString()); } [Fact] @@ -115,9 +115,9 @@ public void CanSetMultipleKeyedClients() var client2 = host.Services.GetRequiredKeyedService>>("Ollama2"); var client3 = host.Services.GetRequiredKeyedService>>("Ollama3"); - Assert.Equal(Endpoint, client.Metadata.ProviderUri); - Assert.Equal("https://localhost:5002/", client2.Metadata.ProviderUri?.ToString()); - Assert.Equal("https://localhost:5003/", client3.Metadata.ProviderUri?.ToString()); + Assert.Equal(Endpoint, client.GetService()?.ProviderUri); + Assert.Equal("https://localhost:5002/", client2.GetService()?.ProviderUri?.ToString()); + Assert.Equal("https://localhost:5003/", client3.GetService()?.ProviderUri?.ToString()); Assert.NotEqual(client, client2); Assert.NotEqual(client, client3);