feat: Added AnyOf/Enum support, added new endpoints.

tryAGI · Jun 5, 2024 · 9f12c6d · 9f12c6d
1 parent 522f9cd
commit 9f12c6d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 7 deletions.
diff --git a/src/libs/Directory.Build.props b/src/libs/Directory.Build.props
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <PropertyGroup Label="Nuget">
-    <Version>1.2.1</Version>
+    <Version>1.3.0</Version>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>tryAGI and contributors</Authors>

diff --git a/src/libs/Ollama.Models/Ollama.Models.csproj b/src/libs/Ollama.Models/Ollama.Models.csproj
@@ -26,7 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenApiGenerator" Version="0.9.7">
+    <PackageReference Include="OpenApiGenerator" Version="0.9.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/libs/Ollama/Ollama.csproj b/src/libs/Ollama/Ollama.csproj
@@ -33,7 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenApiGenerator" Version="0.9.7">
+    <PackageReference Include="OpenApiGenerator" Version="0.9.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/libs/Ollama/OllamaApiClientExtensions.cs b/src/libs/Ollama/OllamaApiClientExtensions.cs
@@ -67,9 +67,9 @@ public static void EnsureSuccess(
 	{
 		response = response ?? throw new ArgumentNullException(nameof(response));
 
-		if (response.Status != PullModelResponseStatus.Success)
+		if (response.Status.Value2 != PullModelResponseStatus.Success)
 		{
-			throw new InvalidOperationException($"Failed to pull model with status {response.Status}");
+			throw new InvalidOperationException($"Failed to pull model with status {response.Status.Object}");
 		}
 	}
 

diff --git a/src/libs/Ollama/SourceGenerationContext.cs b/src/libs/Ollama/SourceGenerationContext.cs
@@ -1,7 +1,19 @@
 using System.Text.Json.Serialization;
+using OpenApiGenerator.JsonConverters;
 
 namespace Ollama;
 
-[JsonSourceGenerationOptions(DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSourceGenerationOptions(
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+    Converters =
+    [
+        // We need specify explicitly all converters for enums inside AnyOf/OneOf/AllOf to make them work
+        typeof(CreateModelResponseStatusJsonConverter),
+        typeof(CreateModelResponseStatusNullableJsonConverter),
+        typeof(PullModelResponseStatusJsonConverter),
+        typeof(PullModelResponseStatusNullableJsonConverter),
+        typeof(PushModelResponseStatusJsonConverter),
+        typeof(PushModelResponseStatusNullableJsonConverter),
+    ])]
 [JsonSerializable(typeof(JsonSerializerContextTypes))]
 internal sealed partial class SourceGenerationContext : JsonSerializerContext;
diff --git a/src/tests/Ollama.IntegrationTests/Environment.cs b/src/tests/Ollama.IntegrationTests/Environment.cs
@@ -4,6 +4,7 @@ namespace Ollama.IntegrationTests;
 
 public sealed class Environment : IAsyncDisposable
 {
+    public required EnvironmentType Type { get; init; }
     public IContainer? Container { get; init; }
     public required OllamaApiClient ApiClient { get; init; }
 

diff --git a/src/tests/Ollama.IntegrationTests/Tests.Integration.cs b/src/tests/Ollama.IntegrationTests/Tests.Integration.cs
@@ -21,6 +21,7 @@ private static async Task<Environment> PrepareEnvironmentAsync(EnvironmentType e
 
                 return new Environment
                 {
+                    Type = environmentType,
                     ApiClient = apiClient,
                 };
             }
@@ -42,6 +43,7 @@ private static async Task<Environment> PrepareEnvironmentAsync(EnvironmentType e
 
                 return new Environment
                 {
+                    Type = environmentType,
                     Container = container,
                     ApiClient = apiClient,
                 };
@@ -74,7 +76,7 @@ public async Task PullModel()
 
         await foreach (var response in container.ApiClient.Models.PullModelAsync("all-minilm", stream: true))
         {
-            Console.WriteLine($"{response.Status}. Progress: {response.Completed}/{response.Total}");
+            Console.WriteLine($"{response.Status.Object}. Progress: {response.Completed}/{response.Total}");
         }
 
         var response2 = await container.ApiClient.Models.PullModelAsync("all-minilm").WaitAsync();
@@ -88,13 +90,26 @@ public async Task Embeddings()
     {
         await using var container = await PrepareEnvironmentAsync(EnvironmentType.Container);
 
+        if (container.Type == EnvironmentType.Local)
+        {
+            var models = await container.ApiClient.Models.ListRunningModelsAsync();
+            models.Models.Should().BeNullOrEmpty();
+        }
+
         await container.ApiClient.Models.PullModelAndEnsureSuccessAsync("all-minilm");
 
         var embeddingResponse = await container.ApiClient.Embeddings.GenerateEmbeddingAsync(
             model:"all-minilm",
             prompt: "hello");
 
         embeddingResponse.Embedding.Should().NotBeNullOrEmpty();
+
+        if (container.Type == EnvironmentType.Local)
+        {
+            var models2 = await container.ApiClient.Models.ListRunningModelsAsync();
+            models2.Models.Should().NotBeNullOrEmpty();
+        }
+
     }
 
     [TestMethod]