Merge pull request #992 from stephentoub/updatemeai1245705

Update M.E.AI to 9.0.1-preview.1.24570.5
SciSharp · Nov 22, 2024 · 9aff11c · 9aff11c
2 parents 21aac64 + 972e5ae
commit 9aff11c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/LLama/Extensions/LLamaExecutorExtensions.cs b/LLama/Extensions/LLamaExecutorExtensions.cs
@@ -54,9 +54,11 @@ private sealed class LLamaExecutorChatClient(
         public void Dispose() { }
 
         /// <inheritdoc/>
-        public TService? GetService<TService>(object? key = null) where TService : class =>
-            typeof(TService) == typeof(ILLamaExecutor) ? (TService)_executor :
-            this as TService;
+        public object? GetService(Type serviceType, object? key = null) =>
+            key is not null ? null :
+            serviceType?.IsInstanceOfType(_executor) is true ? _executor :
+            serviceType?.IsInstanceOfType(this) is true ? this :
+            null;
 
         /// <inheritdoc/>
         public async Task<ChatCompletion> CompleteAsync(

diff --git a/LLama/LLamaEmbedder.EmbeddingGenerator.cs b/LLama/LLamaEmbedder.EmbeddingGenerator.cs
@@ -21,9 +21,11 @@ public partial class LLamaEmbedder
             dimensions: EmbeddingSize);
 
     /// <inheritdoc />
-    TService? IEmbeddingGenerator<string, Embedding<float>>.GetService<TService>(object? key) where TService : class =>
-        typeof(TService) == typeof(LLamaContext) ? (TService)(object)Context :
-        this as TService;
+    object? IEmbeddingGenerator<string, Embedding<float>>.GetService(Type serviceType, object? key) =>
+        key is not null ? null :
+        serviceType?.IsInstanceOfType(Context) is true ? Context :
+        serviceType?.IsInstanceOfType(this) is true ? this :
+        null;
 
     /// <inheritdoc />
     async Task<GeneratedEmbeddings<Embedding<float>>> IEmbeddingGenerator<string, Embedding<float>>.GenerateAsync(IEnumerable<string> values, EmbeddingGenerationOptions? options, CancellationToken cancellationToken)

diff --git a/LLama/LLamaSharp.csproj b/LLama/LLamaSharp.csproj
@@ -50,7 +50,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.0-preview.9.24556.5" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.1-preview.1.24570.5" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
     <PackageReference Include="System.Numerics.Tensors" Version="9.0.0" />
   </ItemGroup>