feat: Added Enums. Fixed some bugs.

tryAGI · May 31, 2024 · f9e1a1b · f9e1a1b
1 parent ec027e7
commit f9e1a1b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 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.0</Version>
+    <Version>1.2.1</Version>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>tryAGI and contributors</Authors>

diff --git a/src/libs/Ollama.Models/Message.Constructors.cs b/src/libs/Ollama.Models/Message.Constructors.cs
@@ -17,7 +17,7 @@ public Message()
 	/// <param name="role"></param>
 	/// <param name="content"></param>
 	[SetsRequiredMembers]
-	public Message(string role, string content)
+	public Message(MessageRole role, string content)
 	{
 		Role = role;
 		Content = content;

diff --git a/src/libs/Ollama.Models/Ollama.Models.csproj b/src/libs/Ollama.Models/Ollama.Models.csproj
@@ -14,7 +14,7 @@
     <OpenApiGenerator_Namespace>Ollama</OpenApiGenerator_Namespace>
     <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
     <OpenApiGenerator_GenerateModels>true</OpenApiGenerator_GenerateModels>
-    <OpenApiGenerator_GenerateSuperTypeForJsonSerializerContext>true</OpenApiGenerator_GenerateSuperTypeForJsonSerializerContext>
+    <OpenApiGenerator_GenerateJsonSerializerContextTypes>true</OpenApiGenerator_GenerateJsonSerializerContextTypes>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,7 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenApiGenerator" Version="0.8.6">
+    <PackageReference Include="OpenApiGenerator" Version="0.9.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/libs/Ollama/Chat.cs b/src/libs/Ollama/Chat.cs
@@ -65,7 +65,7 @@ public Task<Message> SendAsync(
 	/// <param name="message">The message to send</param>
 	/// <param name="cancellationToken">The token to cancel the operation with</param>
 	public Task<Message> SendAsAsync(
-		string role,
+		MessageRole role,
 		string message,
 		CancellationToken cancellationToken = default)
 	{
@@ -80,7 +80,7 @@ public Task<Message> SendAsAsync(
 	/// <param name="imagesAsBase64">Base64 encoded images to send to the model</param>
 	/// <param name="cancellationToken">The token to cancel the operation with</param>
 	public async Task<Message> SendAsAsync(
-		string role,
+		MessageRole role,
 		string message,
 		IEnumerable<string?>? imagesAsBase64,
 		CancellationToken cancellationToken = default)

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.8.6">
+    <PackageReference Include="OpenApiGenerator" Version="0.9.5">
       <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,7 +67,7 @@ public static void EnsureSuccess(
 	{
 		response = response ?? throw new ArgumentNullException(nameof(response));
 
-		if (response.Status != "success")
+		if (response.Status != PullModelResponseStatus.Success)
 		{
 			throw new InvalidOperationException($"Failed to pull model with status {response.Status}");
 		}
@@ -106,7 +106,7 @@ public static async Task<GenerateChatCompletionResponse> WaitAsync(
 	{
 		enumerable = enumerable ?? throw new ArgumentNullException(nameof(enumerable));
 
-		string? responseRole = null;
+		MessageRole? responseRole = null;
 		var responseContent = new StringBuilder();
 
 		var currentResponse = new GenerateChatCompletionResponse();

diff --git a/src/libs/Ollama/SourceGenerationContext.cs b/src/libs/Ollama/SourceGenerationContext.cs
@@ -3,5 +3,5 @@
 namespace Ollama;
 
 [JsonSourceGenerationOptions(DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
-[JsonSerializable(typeof(OpenApiGeneratorTrimmableSupport))]
+[JsonSerializable(typeof(JsonSerializerContextTypes))]
 internal sealed partial class SourceGenerationContext : JsonSerializerContext;