Skip to content

Commit e5efa47

Browse files
kayhantolgakayhantolga
authored
Merge pull request #681 from betalgo/dev
9.0.0
2 parents 0dd10fd + 60d2686 commit e5efa47

17 files changed

+69
-89
lines changed

‎.github/workflows/BuildAndDeployBetalgoOpenAI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v1
1616
with:
17-
dotnet-version: 8.0.x
17+
dotnet-version: 9.0.x
1818
- name: Clean
1919
run: dotnet clean
2020
- name: Restore dependencies

‎.github/workflows/BuildAndDeployBetalgoOpenAIUtilities.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v1
1919
with:
20-
dotnet-version: 8.0.x
20+
dotnet-version: 9.0.x
2121
- name: Clean
2222
run: dotnet clean
2323
- name: Restore dependencies

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Set up dotnet
5454
uses: actions/setup-dotnet@v1
5555
with:
56-
dotnet-version: '8.0.*'
56+
dotnet-version: '9.0.*'
5757

5858
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5959
# If this step fails, then you should remove it and run the build manually (see below)

‎OpenAI.Playground/OpenAI.Playground.csproj

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
88
<ImplicitUsings>enable</ImplicitUsings>
@@ -23,36 +23,17 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="LaserCatEyes.HttpClientListener" Version="8.0.1" />
26-
<PackageReference Include="NAudio" Version="2.2.1" />
27-
</ItemGroup>
28-
29-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
30-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
34-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
38-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
4326
</ItemGroup>
4427

45-
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net7.0'">
46-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
47-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
48-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
49-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
50-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
51-
</ItemGroup>
52-
53-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
54-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
55-
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
34+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
35+
<PackageReference Include="NAudio" Version="2.2.1" />
36+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
5637
</ItemGroup>
5738

5839
<ItemGroup>

‎OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9;netstandard2.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>Latest</LangVersion>
@@ -10,7 +10,7 @@
1010
<PackageIcon>Betalgo-Ranul-OpenAI-icon.png</PackageIcon>
1111
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1212
<Title>OpenAI SDK by Betalgo</Title>
13-
<Version>8.10.1</Version>
13+
<Version>9.0.0</Version>
1414
<Authors>Tolga Kayhan, Betalgo</Authors>
1515
<Company>Betalgo Up Ltd.</Company>
1616
<Product>OpenAI .NET library by Betalgo Ranul</Product>
@@ -52,30 +52,25 @@
5252
<PackagePath>\</PackagePath>
5353
</None>
5454
</ItemGroup>
55+
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
56+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
57+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
58+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
59+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
60+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
61+
</ItemGroup>
5562
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
5663
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
5764
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
5865
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
59-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
60-
</ItemGroup>
61-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
62-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
63-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
64-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
65-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
66-
</ItemGroup>
67-
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net7.0'">
68-
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
69-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
70-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
7166
<PackageReference Include="System.Text.Json" Version="8.0.5" />
67+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
7268
</ItemGroup>
7369
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
74-
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
75-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
70+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
71+
</ItemGroup>
72+
<ItemGroup>
73+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.0-preview.9.24525.1" />
74+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
7675
</ItemGroup>
77-
<ItemGroup>
78-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.0-preview.9.24525.1" />
79-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
80-
</ItemGroup>
8176
</Project>

‎OpenAI.Utilities.Tests/FunctionCallingHelperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Betalgo.OpenAI.Utilities.FunctionCalling;
2-
using OpenAI.ObjectModels.RequestModels;
2+
using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels;
33

44
namespace OpenAI.Utilities.Tests;
55

‎OpenAI.Utilities.Tests/OpenAI.Utilities.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>Latest</LangVersion>
@@ -25,7 +25,6 @@
2525

2626
<ItemGroup>
2727
<ProjectReference Include="..\OpenAI.Utilities\Betalgo.OpenAI.Utilities.csproj" />
28-
<ProjectReference Include="..\OpenAI.Utilities\OpenAI.Utilities.csproj" />
2928
</ItemGroup>
3029

3130
</Project>

‎OpenAI.Utilities/Betalgo.OpenAI.Utilities.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>Latest</LangVersion>
88
<Copyright>Betalgo Up Ltd.</Copyright>
99
<PackageProjectUrl>https://openai.com/</PackageProjectUrl>
1010
<PackageIcon>OpenAI-Betalgo.png</PackageIcon>
1111
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
12-
<Version>8.1.0</Version>
12+
<Version>9.0.0</Version>
1313
<Authors>Tolga Kayhan, Betalgo</Authors>
1414
<Company>Betalgo Up Ltd.</Company>
1515
<Product>Utility tools for Betalgo.OpenAI</Product>
@@ -40,9 +40,9 @@
4040
</ItemGroup>
4141

4242
<ItemGroup>
43-
<PackageReference Include="Betalgo.OpenAI" Version="8.6.2" />
43+
<PackageReference Include="Betalgo.Ranul.OpenAI" Version="8.10.1" />
4444
<PackageReference Include="CsvHelper" Version="33.0.1" />
4545
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
46-
<PackageReference Include="Microsoft.Data.Analysis" Version="0.21.1" />
46+
<PackageReference Include="Microsoft.Data.Analysis" Version="0.22.0" />
4747
</ItemGroup>
4848
</Project>

‎OpenAI.Utilities/Embedding/EmbeddingTools.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using Betalgo.OpenAI.Utilities.Extensions;
55
using CsvHelper;
66
using MathNet.Numerics;
7-
using Microsoft.Data.Analysis;
8-
using OpenAI.Interfaces;
9-
using OpenAI.ObjectModels.ResponseModels;
10-
using OpenAI.Tokenizer.GPT3;
7+
using Microsoft.Data.Analysis;
8+
using Betalgo.Ranul.OpenAI.Interfaces;
9+
using Betalgo.Ranul.OpenAI.ObjectModels.ResponseModels;
10+
using Betalgo.Ranul.OpenAI.Tokenizer.GPT3;
1111

1212
namespace Betalgo.OpenAI.Utilities.Embedding;
1313

‎OpenAI.Utilities/FunctionCalling/FunctionCallingHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Reflection;
22
using System.Text.Json;
3-
using OpenAI.Builders;
4-
using OpenAI.ObjectModels.RequestModels;
5-
using OpenAI.ObjectModels.SharedModels;
3+
using Betalgo.Ranul.OpenAI.Builders;
4+
using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels;
5+
using Betalgo.Ranul.OpenAI.ObjectModels.SharedModels;
66

77
namespace Betalgo.OpenAI.Utilities.FunctionCalling;
88

0 commit comments

Comments
 (0)