From 45a8116e9ac1d76cff3b356c19dd6bdeff133559 Mon Sep 17 00:00:00 2001 From: Tolga Kayhan Date: Wed, 13 Nov 2024 14:48:49 +0000 Subject: [PATCH 1/2] added missing System.ComponentModel.Annotations that was casuing issue on VB --- OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj b/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj index 3fda3adf..8511edbd 100644 --- a/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj +++ b/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj @@ -77,5 +77,6 @@ + \ No newline at end of file From 0abaf1f62a06674c16b38b4841e8bda233209d5b Mon Sep 17 00:00:00 2001 From: Tolga Kayhan Date: Mon, 18 Nov 2024 14:08:08 +0000 Subject: [PATCH 2/2] .NET 9 support added. Support for .NET 6 and .NET 7 has ended. Fixed utility library issues. --- OpenAI.Playground/OpenAI.Playground.csproj | 39 +++++-------------- OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj | 34 +++++++--------- .../FunctionCallingHelperTests.cs | 2 +- .../OpenAI.Utilities.Tests.csproj | 3 +- .../Betalgo.OpenAI.Utilities.csproj | 6 +-- OpenAI.Utilities/Embedding/EmbeddingTools.cs | 8 ++-- .../FunctionCalling/FunctionCallingHelper.cs | 6 +-- .../PropertyDefinitionGenerator.cs | 2 +- .../OpenAI.UtilitiesPlayground.csproj | 20 +++++----- OpenAI.UtilitiesPlayground/Program.cs | 6 +-- .../TestHelpers/EmbeddingTestHelpers.cs | 6 +-- .../TestHelpers/FunctionCallingTestHelpers.cs | 6 +-- .../JsonSchemaResponseTypeTestHelpers.cs | 6 +-- 13 files changed, 59 insertions(+), 85 deletions(-) diff --git a/OpenAI.Playground/OpenAI.Playground.csproj b/OpenAI.Playground/OpenAI.Playground.csproj index 858170ab..be13fc39 100644 --- a/OpenAI.Playground/OpenAI.Playground.csproj +++ b/OpenAI.Playground/OpenAI.Playground.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net7.0;net6.0;netstandard2.0 + net9.0;net8.0;netstandard2.0 true PackageReference enable @@ -23,36 +23,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj b/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj index 15896ff1..c3cf8d0d 100644 --- a/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj +++ b/OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netstandard2.0 + net8.0;net9;netstandard2.0 enable enable Latest @@ -52,31 +52,25 @@ \ + + + + + + + - - - - - - - - - - - - + - - + + + + + - - - - - \ No newline at end of file diff --git a/OpenAI.Utilities.Tests/FunctionCallingHelperTests.cs b/OpenAI.Utilities.Tests/FunctionCallingHelperTests.cs index b4c1fb5e..e336bf1c 100644 --- a/OpenAI.Utilities.Tests/FunctionCallingHelperTests.cs +++ b/OpenAI.Utilities.Tests/FunctionCallingHelperTests.cs @@ -1,5 +1,5 @@ using Betalgo.OpenAI.Utilities.FunctionCalling; -using OpenAI.ObjectModels.RequestModels; +using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels; namespace OpenAI.Utilities.Tests; diff --git a/OpenAI.Utilities.Tests/OpenAI.Utilities.Tests.csproj b/OpenAI.Utilities.Tests/OpenAI.Utilities.Tests.csproj index 4e8a1b3b..e28ff6de 100644 --- a/OpenAI.Utilities.Tests/OpenAI.Utilities.Tests.csproj +++ b/OpenAI.Utilities.Tests/OpenAI.Utilities.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable Latest @@ -25,7 +25,6 @@ - \ No newline at end of file diff --git a/OpenAI.Utilities/Betalgo.OpenAI.Utilities.csproj b/OpenAI.Utilities/Betalgo.OpenAI.Utilities.csproj index 736519c4..a96f0a38 100644 --- a/OpenAI.Utilities/Betalgo.OpenAI.Utilities.csproj +++ b/OpenAI.Utilities/Betalgo.OpenAI.Utilities.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable Latest @@ -40,9 +40,9 @@ - + - + \ No newline at end of file diff --git a/OpenAI.Utilities/Embedding/EmbeddingTools.cs b/OpenAI.Utilities/Embedding/EmbeddingTools.cs index 96c9b57f..25652387 100644 --- a/OpenAI.Utilities/Embedding/EmbeddingTools.cs +++ b/OpenAI.Utilities/Embedding/EmbeddingTools.cs @@ -4,10 +4,10 @@ using Betalgo.OpenAI.Utilities.Extensions; using CsvHelper; using MathNet.Numerics; -using Microsoft.Data.Analysis; -using OpenAI.Interfaces; -using OpenAI.ObjectModels.ResponseModels; -using OpenAI.Tokenizer.GPT3; +using Microsoft.Data.Analysis; +using Betalgo.Ranul.OpenAI.Interfaces; +using Betalgo.Ranul.OpenAI.ObjectModels.ResponseModels; +using Betalgo.Ranul.OpenAI.Tokenizer.GPT3; namespace Betalgo.OpenAI.Utilities.Embedding; diff --git a/OpenAI.Utilities/FunctionCalling/FunctionCallingHelper.cs b/OpenAI.Utilities/FunctionCalling/FunctionCallingHelper.cs index 4fd88670..dae600c0 100644 --- a/OpenAI.Utilities/FunctionCalling/FunctionCallingHelper.cs +++ b/OpenAI.Utilities/FunctionCalling/FunctionCallingHelper.cs @@ -1,8 +1,8 @@ using System.Reflection; using System.Text.Json; -using OpenAI.Builders; -using OpenAI.ObjectModels.RequestModels; -using OpenAI.ObjectModels.SharedModels; +using Betalgo.Ranul.OpenAI.Builders; +using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels; +using Betalgo.Ranul.OpenAI.ObjectModels.SharedModels; namespace Betalgo.OpenAI.Utilities.FunctionCalling; diff --git a/OpenAI.Utilities/FunctionCalling/PropertyDefinitionGenerator.cs b/OpenAI.Utilities/FunctionCalling/PropertyDefinitionGenerator.cs index 6bab4715..5c68d1c4 100644 --- a/OpenAI.Utilities/FunctionCalling/PropertyDefinitionGenerator.cs +++ b/OpenAI.Utilities/FunctionCalling/PropertyDefinitionGenerator.cs @@ -1,6 +1,6 @@ using System.Reflection; using System.Text.Json.Serialization; -using OpenAI.ObjectModels.SharedModels; +using Betalgo.Ranul.OpenAI.ObjectModels.SharedModels; namespace Betalgo.OpenAI.Utilities.FunctionCalling; diff --git a/OpenAI.UtilitiesPlayground/OpenAI.UtilitiesPlayground.csproj b/OpenAI.UtilitiesPlayground/OpenAI.UtilitiesPlayground.csproj index 488bebec..ab6dc1b8 100644 --- a/OpenAI.UtilitiesPlayground/OpenAI.UtilitiesPlayground.csproj +++ b/OpenAI.UtilitiesPlayground/OpenAI.UtilitiesPlayground.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable acb2421b-1517-4212-93a4-e4eb182b4626 @@ -10,15 +10,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/OpenAI.UtilitiesPlayground/Program.cs b/OpenAI.UtilitiesPlayground/Program.cs index e096b2b4..e50d97da 100644 --- a/OpenAI.UtilitiesPlayground/Program.cs +++ b/OpenAI.UtilitiesPlayground/Program.cs @@ -1,8 +1,8 @@ -using LaserCatEyes.HttpClientListener; +using Betalgo.Ranul.OpenAI.Extensions; +using Betalgo.Ranul.OpenAI.Interfaces; +using LaserCatEyes.HttpClientListener; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using OpenAI.Extensions; -using OpenAI.Interfaces; using OpenAI.UtilitiesPlayground.TestHelpers; var builder = new ConfigurationBuilder().AddUserSecrets(); diff --git a/OpenAI.UtilitiesPlayground/TestHelpers/EmbeddingTestHelpers.cs b/OpenAI.UtilitiesPlayground/TestHelpers/EmbeddingTestHelpers.cs index edac6f24..b30504f4 100644 --- a/OpenAI.UtilitiesPlayground/TestHelpers/EmbeddingTestHelpers.cs +++ b/OpenAI.UtilitiesPlayground/TestHelpers/EmbeddingTestHelpers.cs @@ -1,7 +1,7 @@ using Betalgo.OpenAI.Utilities.Embedding; -using OpenAI.Interfaces; -using OpenAI.ObjectModels; -using OpenAI.ObjectModels.RequestModels; +using Betalgo.Ranul.OpenAI.Interfaces; +using Betalgo.Ranul.OpenAI.ObjectModels; +using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels; namespace OpenAI.UtilitiesPlayground.TestHelpers; diff --git a/OpenAI.UtilitiesPlayground/TestHelpers/FunctionCallingTestHelpers.cs b/OpenAI.UtilitiesPlayground/TestHelpers/FunctionCallingTestHelpers.cs index d784aedb..d76688d6 100644 --- a/OpenAI.UtilitiesPlayground/TestHelpers/FunctionCallingTestHelpers.cs +++ b/OpenAI.UtilitiesPlayground/TestHelpers/FunctionCallingTestHelpers.cs @@ -1,8 +1,8 @@ using System.Globalization; using Betalgo.OpenAI.Utilities.FunctionCalling; -using OpenAI.Interfaces; -using OpenAI.ObjectModels; -using OpenAI.ObjectModels.RequestModels; +using Betalgo.Ranul.OpenAI.Interfaces; +using Betalgo.Ranul.OpenAI.ObjectModels; +using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels; namespace OpenAI.UtilitiesPlayground.TestHelpers; diff --git a/OpenAI.UtilitiesPlayground/TestHelpers/JsonSchemaResponseTypeTestHelpers.cs b/OpenAI.UtilitiesPlayground/TestHelpers/JsonSchemaResponseTypeTestHelpers.cs index 28a37c96..625bf5b4 100644 --- a/OpenAI.UtilitiesPlayground/TestHelpers/JsonSchemaResponseTypeTestHelpers.cs +++ b/OpenAI.UtilitiesPlayground/TestHelpers/JsonSchemaResponseTypeTestHelpers.cs @@ -1,9 +1,9 @@ using System.Text.Json; using System.Text.Json.Serialization; using Betalgo.OpenAI.Utilities.FunctionCalling; -using OpenAI.Interfaces; -using OpenAI.ObjectModels; -using OpenAI.ObjectModels.RequestModels; +using Betalgo.Ranul.OpenAI.Interfaces; +using Betalgo.Ranul.OpenAI.ObjectModels; +using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels; namespace OpenAI.UtilitiesPlayground.TestHelpers;