Skip to content

Commit 744db42

Browse files
committed
Fixed issues OkGoDoIt#204.
1. Improved ImageGenerationEndpointTests by introducing ImageSize construction helper method in orther to retain access level of ImageSize constructor. 2. Corrected EndpointBase constructor access level (changed to 'protected') in order to support HttpClientResolutionTests
1 parent 5f7c23a commit 744db42

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

OpenAI_API/EndpointBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public abstract class EndpointBase
2727
/// Constructor of the api endpoint base, to be called from the contructor of any devived classes. Rather than instantiating any endpoint yourself, access it through an instance of <see cref="OpenAIAPI"/>.
2828
/// </summary>
2929
/// <param name="api"></param>
30-
internal EndpointBase(OpenAIAPI api)
30+
protected EndpointBase(OpenAIAPI api)
3131
{
3232
this._Api = api;
3333
}

OpenAI_Tests/ImageGenerationEndpointTests.cs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public void CreateDALLE2ImageWithUrl(string size)
5151
var api = new OpenAI_API.OpenAIAPI();
5252

5353
Assert.IsNotNull(api.ImageGenerations);
54-
55-
var results = api.ImageGenerations.CreateImageAsync(new ImageGenerationRequest("A cyberpunk monkey hacker dreaming of a beautiful bunch of bananas, digital art", 2, new ImageSize(size))).Result;
54+
55+
var results = api.ImageGenerations.CreateImageAsync(new ImageGenerationRequest("A cyberpunk monkey hacker dreaming of a beautiful bunch of bananas, digital art", 2, ConstructImageSize(size))).Result;
5656
Assert.IsNotNull(results);
5757
if (results.CreatedUnixTime.HasValue)
5858
{
@@ -108,9 +108,9 @@ public void CreateDALLE3ImageWithUrl(string quality, string size)
108108
{
109109
var api = new OpenAI_API.OpenAIAPI();
110110

111-
Assert.IsNotNull(api.ImageGenerations);
111+
Assert.IsNotNull(api.ImageGenerations);
112112

113-
var results = api.ImageGenerations.CreateImageAsync(new ImageGenerationRequest("A cyberpunk monkey hacker dreaming of a beautiful bunch of bananas, digital art", OpenAI_API.Models.Model.DALLE3, new ImageSize(size), quality)).Result;
113+
var results = api.ImageGenerations.CreateImageAsync(new ImageGenerationRequest("A cyberpunk monkey hacker dreaming of a beautiful bunch of bananas, digital art", OpenAI_API.Models.Model.DALLE3, ConstructImageSize(size), quality)).Result;
114114
Assert.IsNotNull(results);
115115
if (results.CreatedUnixTime.HasValue)
116116
{
@@ -139,9 +139,9 @@ public void BadParameterCombosShouldFail(string model, string quality, string si
139139
{
140140
var api = new OpenAI_API.OpenAIAPI();
141141

142-
Assert.IsNotNull(api.ImageGenerations);
142+
Assert.IsNotNull(api.ImageGenerations);
143143

144-
Assert.ThrowsAsync<ArgumentException>(async () => await api.ImageGenerations.CreateImageAsync(new ImageGenerationRequest("A cyberpunk monkey hacker dreaming of a beautiful bunch of bananas, digital art", model, new ImageSize(size), quality)));
144+
Assert.ThrowsAsync<ArgumentException>(async () => await api.ImageGenerations.CreateImageAsync(new ImageGenerationRequest("A cyberpunk monkey hacker dreaming of a beautiful bunch of bananas, digital art", model, ConstructImageSize(size), quality)));
145145
}
146146

147147
[Test]
@@ -157,6 +157,17 @@ public void BadNumImagesWithDalle3ShouldFail()
157157
Assert.ThrowsAsync<Newtonsoft.Json.JsonSerializationException>(async () => await api.ImageGenerations.CreateImageAsync(req));
158158
}
159159

160+
private ImageSize ConstructImageSize(string size)
161+
=> size switch
162+
{
163+
"256x256" => ImageSize._256,
164+
"512x512" => ImageSize._512,
165+
"1024x1024" => ImageSize._1024,
166+
"1024x1792" => ImageSize._1024x1792,
167+
"1792x1024" => ImageSize._1792x1024,
168+
_ => ImageSize._256
169+
};
170+
160171

161172
}
162173
}

0 commit comments

Comments
 (0)