OpenAI-DotNet 5.1.2 (RageAgainstThePixel#42)

- Fixed an issue when deleting personal account fine tuned models
SlimeNull · Mar 10, 2023 · 6b876d5 · 6b876d5
1 parent 2cef872
commit 6b876d5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 12 deletions.
diff --git a/.github/workflows/Publish-Nuget.yml b/.github/workflows/Publish-Nuget.yml
@@ -36,7 +36,8 @@ jobs:
  - name: Test Package ${{ matrix.configuration }}
  run: dotnet test --configuration ${{ matrix.configuration }}
  env:
- TEST_OPENAI_SECRET_KEY: ${{ secrets.TEST_OPENAI_SECRET_KEY }}
+ OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+ OPENAI_ORGANIZATION_ID: ${{ secrets.OPENAI_ORGANIZATION_ID }}
 
  - name: Publish Nuget Package
  run: |

diff --git a/OpenAI-DotNet-Tests/TestFixture_09_FineTuning.cs b/OpenAI-DotNet-Tests/TestFixture_09_FineTuning.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -201,17 +202,28 @@ public async Task Test_08_DeleteFineTunedModel()
  Assert.IsNotNull(models);
  Assert.IsNotEmpty(models);
 
- foreach (var model in models)
+ try
  {
- if (model.OwnedBy == api.OpenAIAuthentication.OrganizationId)
+ foreach (var model in models)
  {
+ if (model.OwnedBy.Contains("openai") ||
+ model.OwnedBy.Contains("system"))
+ {
+ continue;
+ }
+
  Console.WriteLine(model);
  var result = await api.ModelsEndpoint.DeleteFineTuneModelAsync(model);
  Assert.IsNotNull(result);
  Assert.IsTrue(result);
  Console.WriteLine($"{model.Id} -> deleted");
+ break;
  }
  }
+ catch (UnauthorizedAccessException)
+ {
+ Console.WriteLine("Your account does not have permissions to delete models.");
+ }
  }
  }
 }
diff --git a/OpenAI-DotNet/Models/ModelsEndpoint.cs b/OpenAI-DotNet/Models/ModelsEndpoint.cs
@@ -87,14 +87,21 @@ public async Task<bool> DeleteFineTuneModelAsync(string modelId)
  throw new Exception($"Failed to get {modelId} info!");
  }
 
- if (model.OwnedBy != Api.OpenAIAuthentication.OrganizationId)
+ try
  {
- throw new UnauthorizedAccessException($"{model.Id} is not owned by your organization.");
+ var response = await Api.Client.DeleteAsync($"{GetEndpoint()}/{model.Id}").ConfigureAwait(false);
+ var responseAsString = await response.ReadAsStringAsync().ConfigureAwait(false);
+ return JsonSerializer.Deserialize<DeleteModelResponse>(responseAsString, Api.JsonSerializationOptions)?.Deleted ?? false;
  }
+ catch (Exception e)
+ {
+ if (e.Message.Contains("api.delete"))
+ {
+ throw new UnauthorizedAccessException($"You do not have permissions to delete models for this organization.\n{e}");
+ }
 
- var response = await Api.Client.DeleteAsync($"{GetEndpoint()}/{model.Id}").ConfigureAwait(false);
- var responseAsString = await response.ReadAsStringAsync().ConfigureAwait(false);
- return JsonSerializer.Deserialize<DeleteModelResponse>(responseAsString, Api.JsonSerializationOptions)?.Deleted ?? false;
+ throw;
+ }
  }
  }
 }
diff --git a/OpenAI-DotNet/OpenAI-DotNet.csproj b/OpenAI-DotNet/OpenAI-DotNet.csproj
@@ -15,7 +15,9 @@ Based on OpenAI-API by OKGoDoIt (Roger Pincombe)</Description>
  <RepositoryUrl>https://github.com/RageAgainstThePixel/OpenAI-DotNet</RepositoryUrl>
  <PackageTags>OpenAI, AI, ML, API, gpt, gpt-3, chatGPT</PackageTags>
  <Title>OpenAI API</Title>
- <PackageReleaseNotes>Bump version to 5.1.1
+ <PackageReleaseNotes>Bump version to 5.1.2
+- Fixed an issue when deleting personal account fine tuned models
+Bump version to 5.1.1
 - Refactored Model validation
 - Added additional default models
 - Deprecate OpenAIClient.DefaultModel
@@ -59,9 +61,9 @@ Bump version to 4.4.0
  <AssemblyOriginatorKeyFile>OpenAI-DotNet.pfx</AssemblyOriginatorKeyFile>
  <DelaySign>true</DelaySign>
  <PackageId>OpenAI-DotNet</PackageId>
- <Version>5.1.1</Version>
- <AssemblyVersion>5.1.1.0</AssemblyVersion>
- <FileVersion>5.1.1.0</FileVersion>
+ <Version>5.1.2</Version>
+ <AssemblyVersion>5.1.2.0</AssemblyVersion>
+ <FileVersion>5.1.2.0</FileVersion>
  <Company>RageAgainstThePixel</Company>
  <PackageReadmeFile>README.md</PackageReadmeFile>
  </PropertyGroup>