Skip to content

Commit 0ca4054

Browse files
kayhantolgakayhantolga
authored
Merge pull request #524 from betalgo/dev
v8.0.0
2 parents 465d2a6 + 531f401 commit 0ca4054

19 files changed

+76
-61
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: 7.0.x
17+
dotnet-version: 8.0.x
1818
- name: Clean
1919
run: dotnet clean
2020
- name: Restore dependencies

‎.github/workflows/BuildAndDeployBetalgoOpenAIUtilities.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14+
- name: Sleep for 15 minutes
15+
run: sleep 15m
16+
1417
- name: Setup .NET
1518
uses: actions/setup-dotnet@v1
1619
with:
17-
dotnet-version: 7.0.x
20+
dotnet-version: 8.0.x
1821
- name: Clean
1922
run: dotnet clean
2023
- 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: '7.0.*'
56+
dotnet-version: '8.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: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
88
<ImplicitUsings>enable</ImplicitUsings>
@@ -21,28 +21,34 @@
2121
</Content>
2222
</ItemGroup>
2323

24-
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
25-
<PackageReference Include="LaserCatEyes.HttpClientListener" Version="6.0.0" />
24+
<ItemGroup>
25+
<PackageReference Include="LaserCatEyes.HttpClientListener" Version="8.0.0" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
29+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
2633
</ItemGroup>
2734

2835
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
29-
<PackageReference Include="LaserCatEyes.HttpClientListener" Version="6.0.0" />
3036
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
3137
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
3238
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
3339
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
3440
</ItemGroup>
3541

36-
<ItemGroup Condition="'$(TargetFramework)' != 'net7.0'">
42+
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net7.0'">
3743
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
3844
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
3945
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
4046
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
4147
</ItemGroup>
4248

4349
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
44-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
45-
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
50+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
51+
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
4652
</ItemGroup>
4753

4854
<ItemGroup>

‎OpenAI.Playground/Program.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
using OpenAI.Extensions;
44
using OpenAI.Interfaces;
55
using OpenAI.Playground.TestHelpers;
6-
#if NET6_0_OR_GREATER
76
using LaserCatEyes.HttpClientListener;
8-
#endif
97

108
var builder = new ConfigurationBuilder()
119
.AddJsonFile("ApiSettings.json")
@@ -15,12 +13,11 @@
1513
var serviceCollection = new ServiceCollection();
1614
serviceCollection.AddScoped(_ => configuration);
1715

18-
#if NET6_0_OR_GREATER
1916
// Laser cat eyes is a tool that shows your requests and responses between OpenAI server and your client.
2017
// Get your app key from https://lasercateyes.com for FREE and put it under ApiSettings.json or secrets.json.
2118
// It is in Beta version, if you don't want to use it just comment out below line.
2219
serviceCollection.AddLaserCatEyesHttpClientListener();
23-
#endif
20+
2421

2522
serviceCollection.AddOpenAIService();
2623
//// DeploymentId and ResourceName are only for Azure OpenAI. If you want to use Azure OpenAI services you have to set Provider type To Azure.

‎OpenAI.SDK/ObjectModels/Models.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Diagnostics.CodeAnalysis;
1+
using System.Diagnostics.CodeAnalysis;
22

33
#pragma warning disable CS1591
44
namespace OpenAI.ObjectModels;
@@ -468,4 +468,4 @@ public static string EnumToString(this Subject subject, string? baseModel)
468468
_ => throw new ArgumentOutOfRangeException(nameof(subject), subject, null)
469469
}, baseModel);
470470
}
471-
}
471+
}

‎OpenAI.SDK/OpenAI.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>Latest</LangVersion>
8-
98
<Copyright>Betalgo Up Ltd.</Copyright>
109
<PackageProjectUrl>https://openai.com/</PackageProjectUrl>
1110
<PackageIcon>OpenAI-Betalgo.png</PackageIcon>
1211
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1312
<Title>OpenAI SDK by Betalgo</Title>
14-
<Version>7.4.7</Version>
13+
<Version>8.0.0</Version>
1514
<Authors>Tolga Kayhan, Betalgo</Authors>
1615
<Company>Betalgo Up Ltd.</Company>
1716
<Product>OpenAI ChatGPT, Whisper, GPT-4 and DALL·E dotnet SDK</Product>
@@ -53,18 +52,22 @@
5352
<PackagePath>\</PackagePath>
5453
</None>
5554
</ItemGroup>
55+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
56+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
57+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
58+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
59+
</ItemGroup>
5660
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
5761
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
5862
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
5963
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6064
</ItemGroup>
61-
<ItemGroup Condition="'$(TargetFramework)' != 'net7.0'">
65+
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net7.0'">
6266
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
6367
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
6468
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6569
</ItemGroup>
6670
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
67-
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
68-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
71+
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
6972
</ItemGroup>
7073
</Project>

‎OpenAI.Utilities.Tests/FunctionCallingHelperTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void VerifyGetFunctionDefinition()
3131
stringParameter.Description.ShouldBe("String Parameter");
3232
stringParameter.Type.ShouldBe("string");
3333

34-
var enumValues = new List<string> {"Value1", "Value2", "Value3"};
34+
var enumValues = new List<string> { "Value1", "Value2", "Value3" };
3535

3636
var enumParameter = functionDefinition.Parameters.Properties["enumParameter"];
3737
enumParameter.Description.ShouldBe("Enum Parameter");
@@ -301,4 +301,4 @@ public enum TestEnum
301301
Value1,
302302
Value2,
303303
Value3
304-
}
304+
}

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

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
7+
<LangVersion>Latest</LangVersion>
88
<IsPackable>false</IsPackable>
99
<IsTestProject>true</IsTestProject>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1414
<PackageReference Include="Shouldly" Version="4.2.1" />
15-
<PackageReference Include="xunit" Version="2.4.2" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
15+
<PackageReference Include="xunit" Version="2.7.0" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="3.2.0">
20+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

‎OpenAI.Utilities/Embedding/EmbeddingTools.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public EmbeddingTools(IOpenAIService sdk, int maxToken, string embeddingModel)
109109

110110
public async Task<DataFrame> ReadFilesAndCreateEmbeddingDataAsCsv(string pathToDirectoryOrFile, string outputFileName)
111111
{
112-
return await ReadFilesAndCreateEmbeddingDataAsCsv(new[] {pathToDirectoryOrFile}, outputFileName);
112+
return await ReadFilesAndCreateEmbeddingDataAsCsv(new[] { pathToDirectoryOrFile }, outputFileName);
113113
}
114114

115115
public async Task<DataFrame> ReadFilesAndCreateEmbeddingDataAsCsv(IEnumerable<string> pathsToDirectoriesOrFiles, string outputFileName)
@@ -180,7 +180,7 @@ public string CreateContext(string question, DataFrame df, int maxLen = 1800)
180180
}
181181

182182
// Else add it to the text that is being returned
183-
returns.Add((string) row[textIndex]);
183+
returns.Add((string)row[textIndex]);
184184
}
185185

186186
// Return the context
@@ -214,7 +214,7 @@ public async Task WriteToTempCsv(IEnumerable<TextEmbeddingData> textEmbeddingDat
214214
Directory.CreateDirectory(Path.GetDirectoryName(outputFilePath) ?? string.Empty);
215215
await using var writer = new StreamWriter(outputFilePath);
216216
await using var csv = new CsvWriter(writer, CultureInfo.InvariantCulture);
217-
await csv.WriteRecordsAsync((IEnumerable) textEmbeddingData);
217+
await csv.WriteRecordsAsync((IEnumerable)textEmbeddingData);
218218
await csv.DisposeAsync();
219219
}
220220

@@ -394,7 +394,7 @@ public PrimitiveDataFrameColumn<double> DistancesFromEmbeddings(List<double> qEm
394394
var distances = new PrimitiveDataFrameColumn<double>(EmbedStaticValues.Distances, embeddingsColumn.Length);
395395
for (var i = 0; i < embeddingsColumn.Length; i++)
396396
{
397-
var rowEmbeddings = embeddingsColumn[i].ToString()!.Split(",").Select(Convert.ToDouble);
397+
var rowEmbeddings = embeddingsColumn[i].ToString()!.Split(',').Select(Convert.ToDouble);
398398
distances[i] = Distance.Cosine(qEmbeddings.Select(x => x).ToArray(), Array.ConvertAll(rowEmbeddings.ToArray(), x => x));
399399
}
400400

@@ -439,4 +439,4 @@ public async Task<DataFrame> ReadAllDataInFolderAndCreateEmbeddingData(string pa
439439
var files = LoadFilesFromDirectory(pathToDirectory);
440440
return await PerformTextEmbedding(files, outputFileName);
441441
}
442-
}
442+
}

0 commit comments

Comments
 (0)