Skip to content

Commit 585875d

Browse files
committed
feat: Use latest tryAGI.OpenAI package.
1 parent 6f039b6 commit 585875d

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
6767
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
6868
<PackageVersion Include="Tiktoken" Version="2.2.0" />
69-
<PackageVersion Include="tryAGI.OpenAI" Version="3.9.2-dev.7" />
69+
<PackageVersion Include="tryAGI.OpenAI" Version="3.9.3-dev.36" />
7070
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
7171
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
7272
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />

src/OpenAI/src/Chat/OpenAiChatModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public override async IAsyncEnumerable<ChatResponse> GenerateAsync(
205205
ChatResponseFinishReason? finishReason = null;
206206
if (usedSettings.UseStreaming == true)
207207
{
208-
var enumerable = provider.Api.Chat.CreateChatCompletionAsStreamAsync(
208+
var enumerable = provider.Client.Chat.CreateChatCompletionAsStreamAsync(
209209
chatRequest,
210210
cancellationToken).ConfigureAwait(false);
211211

@@ -257,7 +257,7 @@ public override async IAsyncEnumerable<ChatResponse> GenerateAsync(
257257
}
258258
else
259259
{
260-
var response = await provider.Api.Chat.CreateChatCompletionAsync(
260+
var response = await provider.Client.Chat.CreateChatCompletionAsync(
261261
chatRequest,
262262
cancellationToken).ConfigureAwait(false);
263263
var message = response.Choices.First().Message;

src/OpenAI/src/Embedding/OpenAiEmbeddingModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public async Task<EmbeddingResponse> CreateEmbeddingsAsync(
6262
providerSettings: provider.EmbeddingSettings);
6363
var results = await Task.WhenAll(batches.Select(async batch =>
6464
{
65-
var response = await provider.Api.Embeddings.CreateEmbeddingAsync(
65+
var response = await provider.Client.Embeddings.CreateEmbeddingAsync(
6666
input: batch,
6767
model: Id,
6868
encodingFormat: CreateEmbeddingRequestEncodingFormat.Float,

src/OpenAI/src/LangChain.Providers.OpenAI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup Label="Usings">
14-
<Using Include="OpenAI" />
14+
<Using Include="tryAGI.OpenAI" />
1515
<Using Include="System.Net.Http" />
1616
</ItemGroup>
1717

src/OpenAI/src/Moderation/OpenAiModerationModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task<ModerationResponse> CheckViolationAsync(
2424
{
2525
request = request ?? throw new ArgumentNullException(nameof(request));
2626

27-
var response = await provider.Api.Moderations.CreateModerationAsync(
27+
var response = await provider.Client.Moderations.CreateModerationAsync(
2828
input: request.Prompt,
2929
model: Id,
3030
cancellationToken).ConfigureAwait(false);

src/OpenAI/src/OpenAiProvider.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ public class OpenAiProvider : Provider
1010
/// <summary>
1111
///
1212
/// </summary>
13-
public OpenAiApi Api { get; private set; }
13+
public OpenAiClient Client { get; private set; }
1414

1515
#endregion
1616

1717
#region Constructors
1818

19-
public OpenAiProvider(OpenAiApi openAiApi)
19+
public OpenAiProvider(OpenAiClient client)
2020
: base(id: OpenAiConfiguration.SectionName)
2121
{
22-
Api = openAiApi ?? throw new ArgumentNullException(nameof(openAiApi));
22+
Client = client ?? throw new ArgumentNullException(nameof(client));
2323
}
2424

2525
public OpenAiProvider(OpenAiConfiguration configuration)
@@ -28,11 +28,11 @@ public OpenAiProvider(OpenAiConfiguration configuration)
2828
configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
2929
var apiKey = configuration.ApiKey ?? throw new ArgumentException("ApiKey is not defined", nameof(configuration));
3030

31-
Api = configuration.Endpoint != null &&
32-
!string.IsNullOrWhiteSpace(configuration.Endpoint)
33-
? new OpenAiApi(baseUri: new Uri(configuration.Endpoint))
34-
: new OpenAiApi();
35-
Api.AuthorizeUsingBearer(apiKey);
31+
Client = configuration.Endpoint != null &&
32+
!string.IsNullOrWhiteSpace(configuration.Endpoint)
33+
? new OpenAiClient(baseUri: new Uri(configuration.Endpoint))
34+
: new OpenAiClient();
35+
Client.AuthorizeUsingBearer(apiKey);
3636
ChatSettings = configuration.ChatSettings;
3737
EmbeddingSettings = configuration.EmbeddingSettings;
3838
TextToImageSettings = configuration.TextToImageSettings;
@@ -49,10 +49,10 @@ public OpenAiProvider(
4949
{
5050
apiKey = apiKey ?? throw new ArgumentNullException(nameof(apiKey));
5151

52-
Api = customEndpoint != null
53-
? new OpenAiApi(baseUri: new Uri(customEndpoint))
54-
: new OpenAiApi();
55-
Api.AuthorizeUsingBearer(apiKey);
52+
Client = customEndpoint != null
53+
? new OpenAiClient(baseUri: new Uri(customEndpoint))
54+
: new OpenAiClient();
55+
Client.AuthorizeUsingBearer(apiKey);
5656
}
5757

5858
#endregion

src/OpenAI/src/SpeechToText/OpenAiSpeechToTextModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task<SpeechToTextResponse> TranscribeAsync(
3737
await request.Stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
3838
memoryStream.Position = 0;
3939

40-
var response = await provider.Api.Audio.CreateTranscriptionAsync(
40+
var response = await provider.Client.Audio.CreateTranscriptionAsync(
4141
file: memoryStream.ToArray(),
4242
filename: request.Filename ?? "file.wav",
4343
//audioName: usedSettings.AudioName!,

src/OpenAI/src/TextToImage/OpenAiImageGenerationModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task<TextToImageResponse> GenerateImageAsync(
3434
providerSettings: provider.TextToImageSettings,
3535
defaultSettings: OpenAiTextToImageSettings.GetDefaultSettings(Id));
3636

37-
var response = await provider.Api.Images.CreateImageAsync(
37+
var response = await provider.Client.Images.CreateImageAsync(
3838
prompt: request.Prompt,
3939
model: Id,
4040
n: usedSettings.NumberOfResults!.Value,

src/OpenAI/src/TextToSpeech/OpenAiTextToSpeechModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task<TextToSpeechResponse> GenerateSpeechAsync(
3030
requestSettings: settings,
3131
modelSettings: Settings,
3232
providerSettings: provider.TextToSpeechSettings);
33-
var response = await provider.Api.Audio.CreateSpeechAsync(
33+
var response = await provider.Client.Audio.CreateSpeechAsync(
3434
input: request.Prompt,
3535
model: usedSettings.Model ?? CreateSpeechRequestModel.Tts1,
3636
voice: usedSettings.Voice!.Value,

0 commit comments

Comments
 (0)