Updating to latest MEAI (#500)

Fixes #492
CommunityToolkit · Feb 25, 2025 · 3cda817 · 3cda817
1 parent 79ef0a1
commit 3cda817
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 30 deletions.
diff --git 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"
+  }
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,7 +20,7 @@
     <DotNetExtensionsVersion>9.0.0</DotNetExtensionsVersion>
     <OpenTelemetryVersion>1.11.0</OpenTelemetryVersion>
     <TestContainersVersion>4.2.0</TestContainersVersion>
-    <MEAIVersion>9.1.0-preview.1.25064.3</MEAIVersion>
+    <MEAIVersion>9.3.0-preview.1.25114.11</MEAIVersion>
     <IsPackable>false</IsPackable>
     <UsePublicApiAnalyzers>true</UsePublicApiAnalyzers>
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -62,7 +62,7 @@
     <!-- External packages -->
     <PackageVersion Include="Azure.Provisioning.AppContainers" Version="1.0.0" />
     <PackageVersion Include="JsonSchema.Net" Version="7.3.3" />
-    <PackageVersion Include="OllamaSharp" Version="5.0.6" />
+    <PackageVersion Include="OllamaSharp" Version="5.1.2" />
     <PackageVersion Include="OpenFeature.Contrib.GOFeatureFlag" Version="0.2.0" />
     <PackageVersion Include="MassTransit" Version="8.3.6" />
     <PackageVersion Include="MassTransit.ActiveMQ" Version="8.3.1" />

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
@@ -14,13 +14,13 @@
         <div>
             <label>
                 <InputRadio Value="ServiceKeys.Phi3" />
-                @OllamaClient1.Metadata.ModelId
+                @(OllamaClient1.GetService<ChatClientMetadata>()?.ModelId)
             </label>
         </div>
         <div>
             <label>
                 <InputRadio Value="ServiceKeys.Llama" />
-                @OllamaClient2.Metadata.ModelId
+                @(OllamaClient2.GetService<ChatClientMetadata>()?.ModelId)
             </label>
         </div>
     </InputRadioGroup>
@@ -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
@@ -140,8 +140,8 @@ public void RegisteringChatClientAndEmbeddingGeneratorReturnsCorrectModelForServ
         var chatClient = host.Services.GetRequiredService<IChatClient>();
         var embeddingGenerator = host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();
 
-        Assert.Equal("Chat", chatClient.Metadata.ModelId);
-        Assert.Equal("Embedding", embeddingGenerator.Metadata.ModelId);
+        Assert.Equal("Chat", chatClient.GetService<ChatClientMetadata>()?.ModelId);
+        Assert.Equal("Embedding", embeddingGenerator.GetService<EmbeddingGeneratorMetadata>()?.ModelId);
     }
 
     [Fact]

diff --git 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<IChatClient>("Ollama") :
             host.Services.GetRequiredService<IChatClient>();
 
-        Assert.NotNull(client.Metadata.ProviderUri);
-        Assert.Equal(Endpoint, client.Metadata.ProviderUri);
+        Assert.NotNull(client.GetService<ChatClientMetadata>()?.ProviderUri);
+        Assert.Equal(Endpoint, client.GetService<ChatClientMetadata>()?.ProviderUri);
     }
 
     [Theory]
@@ -61,9 +61,9 @@ public void CanSetConnectionStringInCode(bool useKeyed)
             host.Services.GetRequiredKeyedService<IChatClient>("Ollama") :
             host.Services.GetRequiredService<IChatClient>();
 
-        Assert.NotNull(client.Metadata.ProviderUri);
-        Assert.Equal(Endpoint, client.Metadata.ProviderUri);
-        Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString());
+        Assert.NotNull(client.GetService<ChatClientMetadata>()?.ProviderUri);
+        Assert.Equal(Endpoint, client.GetService<ChatClientMetadata>()?.ProviderUri);
+        Assert.DoesNotContain("http://not-used", client.GetService<ChatClientMetadata>()?.ProviderUri?.ToString());
     }
 
     [Theory]
@@ -91,9 +91,9 @@ public void ConnectionStringWinsOverConfigSection(bool useKeyed)
             host.Services.GetRequiredKeyedService<IChatClient>("Ollama") :
             host.Services.GetRequiredService<IChatClient>();
 
-        Assert.NotNull(client.Metadata.ProviderUri);
-        Assert.Equal(Endpoint, client.Metadata.ProviderUri);
-        Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString());
+        Assert.NotNull(client.GetService<ChatClientMetadata>()?.ProviderUri);
+        Assert.Equal(Endpoint, client.GetService<ChatClientMetadata>()?.ProviderUri);
+        Assert.DoesNotContain("http://not-used", client.GetService<ChatClientMetadata>()?.ProviderUri?.ToString());
     }
 
     [Fact]
@@ -115,9 +115,9 @@ public void CanSetMultipleKeyedClients()
         var client2 = host.Services.GetRequiredKeyedService<IChatClient>("Ollama2");
         var client3 = host.Services.GetRequiredKeyedService<IChatClient>("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<ChatClientMetadata>()?.ProviderUri);
+        Assert.Equal("https://localhost:5002/", client2.GetService<ChatClientMetadata>()?.ProviderUri?.ToString());
+        Assert.Equal("https://localhost:5003/", client3.GetService<ChatClientMetadata>()?.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
@@ -33,8 +33,8 @@ public void ReadsFromConnectionStringCorrectly(bool useKeyed)
             host.Services.GetRequiredKeyedService<IEmbeddingGenerator<string, Embedding<float>>>("Ollama") :
             host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();
 
-        Assert.NotNull(client.Metadata.ProviderUri);
-        Assert.Equal(Endpoint, client.Metadata.ProviderUri);
+        Assert.NotNull(client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri);
+        Assert.Equal(Endpoint, client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri);
     }
 
     [Theory]
@@ -61,9 +61,9 @@ public void CanSetConnectionStringInCode(bool useKeyed)
             host.Services.GetRequiredKeyedService<IEmbeddingGenerator<string, Embedding<float>>>("Ollama") :
             host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();
 
-        Assert.NotNull(client.Metadata.ProviderUri);
-        Assert.Equal(Endpoint, client.Metadata.ProviderUri);
-        Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString());
+        Assert.NotNull(client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri);
+        Assert.Equal(Endpoint, client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri);
+        Assert.DoesNotContain("http://not-used", client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri?.ToString());
     }
 
     [Theory]
@@ -91,9 +91,9 @@ public void ConnectionStringWinsOverConfigSection(bool useKeyed)
             host.Services.GetRequiredKeyedService<IEmbeddingGenerator<string, Embedding<float>>>("Ollama") :
             host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();
 
-        Assert.NotNull(client.Metadata.ProviderUri);
-        Assert.Equal(Endpoint, client.Metadata.ProviderUri);
-        Assert.DoesNotContain("http://not-used", client.Metadata.ProviderUri.ToString());
+        Assert.NotNull(client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri);
+        Assert.Equal(Endpoint, client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri);
+        Assert.DoesNotContain("http://not-used", client.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri?.ToString());
     }
 
     [Fact]
@@ -115,9 +115,9 @@ public void CanSetMultipleKeyedClients()
         var client2 = host.Services.GetRequiredKeyedService<IEmbeddingGenerator<string, Embedding<float>>>("Ollama2");
         var client3 = host.Services.GetRequiredKeyedService<IEmbeddingGenerator<string, Embedding<float>>>("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<EmbeddingGeneratorMetadata>()?.ProviderUri);
+        Assert.Equal("https://localhost:5002/", client2.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri?.ToString());
+        Assert.Equal("https://localhost:5003/", client3.GetService<EmbeddingGeneratorMetadata>()?.ProviderUri?.ToString());
 
         Assert.NotEqual(client, client2);
         Assert.NotEqual(client, client3);