feat: Added generated methods.

tryAGI · May 20, 2024 · 942036d · 942036d
1 parent cda3940
commit 942036d
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 588 deletions.
diff --git a/docs/openapi.yaml b/docs/openapi.yaml
@@ -171,7 +171,7 @@ paths:
         '200':
           description: Successful operation.
           content:
-            application/json:
+            application/x-ndjson:
               schema:
                 $ref: '#/components/schemas/PullModelResponse'
   /push:
@@ -190,7 +190,7 @@ paths:
         '200':
           description: Successful operation.
           content:
-            application/json:
+            application/x-ndjson:
               schema:
                 $ref: '#/components/schemas/PushModelResponse'
   /blobs/{digest}:
@@ -200,8 +200,8 @@ paths:
         - Models
       summary: Check to see if a blob exists on the Ollama server which is useful when creating models.
       parameters:
-        - in: query
-          name: name
+        - in: path
+          name: digest
           schema:
             type: string
           required: true
@@ -218,8 +218,8 @@ paths:
         - Models
       summary: Create a blob from a file. Returns the server file path.
       parameters:
-        - in: query
-          name: name
+        - in: path
+          name: digest
           schema:
             type: string
           required: true

diff --git a/src/libs/Ollama.Models/Ollama.Models.csproj b/src/libs/Ollama.Models/Ollama.Models.csproj
@@ -12,9 +12,9 @@
 
   <PropertyGroup Label="OpenApiGenerator">
     <OpenApiGenerator_Namespace>Ollama</OpenApiGenerator_Namespace>
-    <OpenApiGenerator_ClassName>OllamaApi</OpenApiGenerator_ClassName>
-    <OpenApiGenerator_GenerateModels>true</OpenApiGenerator_GenerateModels>
     <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
+    <OpenApiGenerator_GenerateModels>true</OpenApiGenerator_GenerateModels>
+    <OpenApiGenerator_GenerateSuperTypeForJsonSerializerContext>true</OpenApiGenerator_GenerateSuperTypeForJsonSerializerContext>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,7 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenApiGenerator" Version="0.3.2">
+    <PackageReference Include="OpenApiGenerator" Version="0.6.6">
       <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
@@ -99,7 +99,7 @@ public async Task<Message> SendAsAsync(
 			Stream = true,
 		};
 
-		var answer = await Client.SendChatAsync(request, cancellationToken).WaitAsync().ConfigureAwait(false);
+		var answer = await Client.GenerateChatCompletionAsync(request, cancellationToken).WaitAsync().ConfigureAwait(false);
 		if (answer.Message == null)
 		{
 			throw new InvalidOperationException("Response message was null.");

diff --git a/src/libs/Ollama/Ollama.csproj b/src/libs/Ollama/Ollama.csproj
@@ -14,12 +14,29 @@
     <Description>Generated C# SDK based on Ollama OpenAPI specification.</Description>
     <PackageTags>api;client;sdk;dotnet;swagger;openapi;specification;ollama;generated</PackageTags>
   </PropertyGroup>
+
+  <PropertyGroup Label="OpenApiGenerator">
+    <OpenApiGenerator_Namespace>Ollama</OpenApiGenerator_Namespace>
+    <OpenApiGenerator_ClassName>OllamaApiClient</OpenApiGenerator_ClassName>
+    <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
+    <OpenApiGenerator_GenerateMethods>true</OpenApiGenerator_GenerateMethods>
+    <OpenApiGenerator_GenerateConstructors>true</OpenApiGenerator_GenerateConstructors>
+    <OpenApiGenerator_JsonSerializerContext>Ollama.SourceGenerationContext</OpenApiGenerator_JsonSerializerContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)../../../docs/openapi.yaml" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="PolySharp" Version="1.14.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="OpenApiGenerator" Version="0.6.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>