Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit 9aedd64

Browse files
KSemenenkoKSemenenko
committed
code style
1 parent b8d65de commit 9aedd64

File tree

122 files changed

+1879
-1945
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+1879
-1945
lines changed

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<RepositoryUrl>https://github.com/managedcode/OpenAI</RepositoryUrl>
1818
<PackageProjectUrl>https://github.com/managedcode/OpenAI</PackageProjectUrl>
1919
<Product>Managed Code - OpenAI</Product>
20-
<Version>0.0.2</Version>
21-
<PackageVersion>0.0.2</PackageVersion>
20+
<Version>0.0.3</Version>
21+
<PackageVersion>0.0.3</PackageVersion>
2222

2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎ManagedCode.OpenAI.Tests/ChatTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ namespace ManagedCode.OpenAI.Tests;
99
public class ChatTests
1010
{
1111
private const string SKIP = $"Class {nameof(ChatTests)} disabled";
12-
private readonly ITestOutputHelper _output;
1312
private readonly IGptClient _client = Mocks.Client();
13+
private readonly ITestOutputHelper _output;
1414

1515
public ChatTests(ITestOutputHelper output)
1616
{
@@ -75,6 +75,4 @@ private void Log(string message)
7575
{
7676
_output.WriteLine(message);
7777
}
78-
79-
8078
}

‎ManagedCode.OpenAI.Tests/FileTest.cs

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@
22
using ManagedCode.OpenAI.Files;
33
using Xunit;
44
using Xunit.Abstractions;
5-
using Xunit.Sdk;
65

76
namespace ManagedCode.OpenAI.Tests;
87

9-
10-
118
public class FileTest
129
{
1310
private const string SKIP = $"Class {nameof(FileTest)} disabled";
1411

1512

16-
private readonly ITestOutputHelper _output;
13+
private const string fileContent =
14+
@"{""prompt"":""This is a test"", ""completion"":""This is a test""}";
15+
1716
private readonly IGptClient _client = Mocks.Client();
1817
private readonly IFileClient _fileClient;
19-
20-
21-
private const string fileContent =
22-
@"{""prompt"":""This is a test"", ""completion"":""This is a test""}";
23-
24-
18+
19+
20+
private readonly ITestOutputHelper _output;
21+
22+
2523
public FileTest(ITestOutputHelper output)
2624
{
2725
_output = output;
@@ -32,10 +30,10 @@ public FileTest(ITestOutputHelper output)
3230
public async Task UploadFile_Success()
3331
{
3432
const string fileName = "test.txt";
35-
36-
33+
34+
3735
var file = await _fileClient.CreateFileAsync(fileContent, fileName);
38-
36+
3937
Log($"File id: {file.Id}");
4038

4139
Assert.False(string.IsNullOrWhiteSpace(file.Id));
@@ -48,33 +46,30 @@ public async Task UploadFile_Success()
4846
[Fact(Skip = SKIP)]
4947
public async Task ContentFile_Success()
5048
{
51-
string fileId = await _fileClient.FileListAsync()
49+
var fileId = await _fileClient.FileListAsync()
5250
.ContinueWith(t => t.Result[0].Id);
53-
51+
5452
var content = await _fileClient.FileContentAsync(fileId);
55-
53+
5654
Log($"File content: {content}");
57-
55+
5856
Assert.Equal(fileContent, content);
5957
}
6058

6159
[Fact(Skip = SKIP)]
6260
public async Task FileList_Success()
6361
{
6462
const string fileName = "test.txt";
65-
63+
6664
var newFile = await _fileClient.CreateFileAsync(fileContent, fileName);
6765
Assert.NotNull(newFile);
68-
66+
6967
var files = await _fileClient.FileListAsync();
7068
Assert.NotEmpty(files);
71-
72-
73-
foreach (var file in files)
74-
{
75-
Log($"File: {file.Id} - {file.Filename}");
76-
}
77-
69+
70+
71+
foreach (var file in files) Log($"File: {file.Id} - {file.Filename}");
72+
7873
var lastFiles = files.First(e => e.Id == newFile.Id);
7974

8075
Assert.Equal(newFile.Id, lastFiles.Id);
@@ -86,17 +81,17 @@ public async Task FileList_Success()
8681
public async Task DeleteFile_Success()
8782
{
8883
const string fileName = "test.txt";
89-
84+
9085
var newFile = await _fileClient.CreateFileAsync(fileContent, fileName);
9186
Assert.NotNull(newFile);
92-
87+
9388
//Waiting for file to be deleted
9489
Thread.Sleep(5000);
9590

9691
var deleted = await _fileClient.DeleteFileAsync(newFile);
9792
Log(deleted.ToString());
9893
Assert.True(deleted);
99-
94+
10095
var files = await _fileClient.FileListAsync();
10196
Assert.NotEqual(newFile.Id, files.Last().Id);
10297
}
@@ -105,21 +100,20 @@ public async Task DeleteFile_Success()
105100
public async Task FileInfo_Success()
106101
{
107102
const string fileName = "test.txt";
108-
103+
109104
var newFile = await _fileClient.CreateFileAsync(fileContent, fileName);
110105
Assert.NotNull(newFile);
111106

112107
var fileInfo = await _fileClient.FileInfoAsync(newFile.Id);
113108
Assert.NotNull(fileInfo);
114-
109+
115110
Assert.Equal(newFile.Id, fileInfo.Id);
116111
Assert.Equal(newFile.Filename, fileInfo.Filename);
117112
Assert.Equal(newFile.Bytes, fileInfo.Bytes);
118113
}
119114

120115

121-
122-
void Log(string log)
116+
private void Log(string log)
123117
{
124118
_output.WriteLine(log);
125119
}

‎ManagedCode.OpenAI.Tests/ImageTests.cs

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
using ManagedCode.OpenAI.Client;
22
using ManagedCode.OpenAI.Image;
3+
using ManagedCode.OpenAI.Tests.Properties;
34
using Xunit;
45
using Xunit.Abstractions;
56

6-
namespace ManagedCode.OpenAI.Tests
7+
namespace ManagedCode.OpenAI.Tests;
8+
9+
public class ImageTests
710
{
8-
public class ImageTests
11+
private const string SKIP = $"Class {nameof(ImageTests)} disabled";
12+
private readonly IGptClient _client = Mocks.Client();
13+
private readonly ITestOutputHelper _output;
14+
15+
public ImageTests(ITestOutputHelper output)
16+
{
17+
_output = output;
18+
}
19+
20+
[Fact(Skip = SKIP)]
21+
public async Task GenerateImage_Success()
22+
{
23+
var image = await _client.ImageClient.GenerateImage("Red dragon")
24+
.SetImageResolution(ImageResolution._512x512).ExecuteAsync();
25+
26+
Log($"Image url: {image.Content}");
27+
Assert.False(string.IsNullOrWhiteSpace(image.Content));
28+
}
29+
30+
[Fact(Skip = SKIP)]
31+
public async Task EditImage_Success()
32+
{
33+
var edited = await _client
34+
.ImageClient.EditImage("change color to blue",
35+
x => x.FromBytes(Resources.Dog))
36+
.AsUrl()
37+
.ExecuteAsync();
38+
39+
Log($"Edited dog: {edited}");
40+
Assert.False(string.IsNullOrWhiteSpace(edited.Content));
41+
}
42+
43+
private void Log(string message)
944
{
10-
private const string SKIP = $"Class {nameof(ImageTests)} disabled";
11-
private readonly ITestOutputHelper _output;
12-
private readonly IGptClient _client = Mocks.Client();
13-
14-
public ImageTests(ITestOutputHelper output)
15-
{
16-
_output = output;
17-
}
18-
19-
[Fact(Skip = SKIP)]
20-
public async Task GenerateImage_Success()
21-
{
22-
var image = await _client.ImageClient.GenerateImage("Red dragon")
23-
.SetImageResolution(ImageResolution._512x512).ExecuteAsync();
24-
25-
Log($"Image url: {image.Content}");
26-
Assert.False(string.IsNullOrWhiteSpace(image.Content));
27-
}
28-
29-
[Fact(Skip = SKIP)]
30-
public async Task EditImage_Success()
31-
{
32-
var edited = await _client
33-
.ImageClient.EditImage("change color to blue",
34-
x=> x.FromBytes(Properties.Resources.Dog))
35-
.AsUrl()
36-
.ExecuteAsync();
37-
38-
Log($"Edited dog: {edited}");
39-
Assert.False(string.IsNullOrWhiteSpace(edited.Content));
40-
}
41-
42-
private void Log(string message)
43-
{
44-
_output.WriteLine(message);
45-
}
45+
_output.WriteLine(message);
4646
}
47-
}
47+
}

‎ManagedCode.OpenAI.Tests/ManagedCode.OpenAI.Tests.csproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="FluentAssertions" Version="6.8.0" />
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
19-
<PackageReference Include="Moq" Version="4.18.3" />
20-
<PackageReference Include="xunit" Version="2.4.2" />
15+
<PackageReference Include="FluentAssertions" Version="6.8.0"/>
16+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"/>
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0"/>
19+
<PackageReference Include="Moq" Version="4.18.3"/>
20+
<PackageReference Include="xunit" Version="2.4.2"/>
2121
<PackageReference Include="xunit.runner.console" Version="2.4.2">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -33,22 +33,22 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<ProjectReference Include="..\ManagedCode.OpenAI\ManagedCode.OpenAI.csproj" />
36+
<ProjectReference Include="..\ManagedCode.OpenAI\ManagedCode.OpenAI.csproj"/>
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<Compile Update="Properties\Resources.Designer.cs">
41-
<DesignTime>True</DesignTime>
42-
<AutoGen>True</AutoGen>
43-
<DependentUpon>Resources.resx</DependentUpon>
44-
</Compile>
40+
<Compile Update="Properties\Resources.Designer.cs">
41+
<DesignTime>True</DesignTime>
42+
<AutoGen>True</AutoGen>
43+
<DependentUpon>Resources.resx</DependentUpon>
44+
</Compile>
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<EmbeddedResource Update="Properties\Resources.resx">
49-
<Generator>ResXFileCodeGenerator</Generator>
50-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
51-
</EmbeddedResource>
48+
<EmbeddedResource Update="Properties\Resources.resx">
49+
<Generator>ResXFileCodeGenerator</Generator>
50+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
51+
</EmbeddedResource>
5252
</ItemGroup>
5353

5454

‎ManagedCode.OpenAI.Tests/Mocks.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
using ManagedCode.OpenAI.Client;
22

3-
namespace ManagedCode.OpenAI.Tests
3+
namespace ManagedCode.OpenAI.Tests;
4+
5+
internal static class Mocks
46
{
5-
internal static class Mocks
6-
{
7-
private const string API_KEY = "#YOUR_GPT_API_KEY#";
7+
private const string API_KEY = "#YOUR_GPT_API_KEY#";
88

9-
public static IGptClient Client()
10-
{
11-
return new GptClient(API_KEY);
12-
}
9+
public static IGptClient Client()
10+
{
11+
return new GptClient(API_KEY);
1312
}
14-
}
13+
}

‎ManagedCode.OpenAI.Tests/ModerationTests.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
using ManagedCode.OpenAI.Chat;
21
using ManagedCode.OpenAI.Client;
32
using ManagedCode.OpenAI.Moderation;
43
using Newtonsoft.Json;
54
using Xunit;
65
using Xunit.Abstractions;
7-
using ManagedCode.OpenAI.Image;
86

97
namespace ManagedCode.OpenAI.Tests;
108

119
public class ModerationTests
1210
{
1311
private const string SKIP = $"Class {nameof(ImageTests)} disabled";
14-
private readonly ITestOutputHelper _output;
1512
private readonly IGptClient _client = Mocks.Client();
16-
private IModerationBuilder ModerationBuilder => _client.Moderation();
13+
private readonly ITestOutputHelper _output;
1714

1815
public ModerationTests(ITestOutputHelper output)
1916
{
2017
_output = output;
2118
}
2219

20+
private IModerationBuilder ModerationBuilder => _client.Moderation();
21+
2322
[Fact(Skip = SKIP)]
2423
public async Task CreateModeration_Success()
2524
{
@@ -44,14 +43,23 @@ public async Task CreateMultipleModeration_Success()
4443
Assert.NotNull(moderation);
4544

4645
Assert.Equal(2, moderation.Length);
47-
46+
4847
Log("Moderations have next content:");
4948
Log(ToJson(moderation));
5049
}
5150

52-
void Log(object obj) => Log(obj.ToString());
51+
private void Log(object obj)
52+
{
53+
Log(obj.ToString());
54+
}
5355

54-
void Log(string str) => _output.WriteLine(str);
56+
private void Log(string str)
57+
{
58+
_output.WriteLine(str);
59+
}
5560

56-
string ToJson(object obj) => JsonConvert.SerializeObject(obj, Formatting.Indented);
61+
private string ToJson(object obj)
62+
{
63+
return JsonConvert.SerializeObject(obj, Formatting.Indented);
64+
}
5765
}

0 commit comments

Comments
 (0)