feat: Use latest tryAGI.OpenAI package.

tryAGI · Jan 7, 2025 · 585875d · 585875d
1 parent 6f039b6
commit 585875d
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -66,7 +66,7 @@
     <PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <PackageVersion Include="Tiktoken" Version="2.2.0" />
-    <PackageVersion Include="tryAGI.OpenAI" Version="3.9.2-dev.7" />
+    <PackageVersion Include="tryAGI.OpenAI" Version="3.9.3-dev.36" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />

diff --git a/src/OpenAI/src/Chat/OpenAiChatModel.cs b/src/OpenAI/src/Chat/OpenAiChatModel.cs
@@ -205,7 +205,7 @@ public override async IAsyncEnumerable<ChatResponse> GenerateAsync(
             ChatResponseFinishReason? finishReason = null;
             if (usedSettings.UseStreaming == true)
             {
-                var enumerable = provider.Api.Chat.CreateChatCompletionAsStreamAsync(
+                var enumerable = provider.Client.Chat.CreateChatCompletionAsStreamAsync(
                     chatRequest,
                     cancellationToken).ConfigureAwait(false);
 
@@ -257,7 +257,7 @@ public override async IAsyncEnumerable<ChatResponse> GenerateAsync(
             }
             else
             {
-                var response = await provider.Api.Chat.CreateChatCompletionAsync(
+                var response = await provider.Client.Chat.CreateChatCompletionAsync(
                     chatRequest,
                     cancellationToken).ConfigureAwait(false);
                 var message = response.Choices.First().Message;

diff --git a/src/OpenAI/src/Embedding/OpenAiEmbeddingModel.cs b/src/OpenAI/src/Embedding/OpenAiEmbeddingModel.cs
@@ -62,7 +62,7 @@ public async Task<EmbeddingResponse> CreateEmbeddingsAsync(
             providerSettings: provider.EmbeddingSettings);
         var results = await Task.WhenAll(batches.Select(async batch =>
         {
-            var response = await provider.Api.Embeddings.CreateEmbeddingAsync(
+            var response = await provider.Client.Embeddings.CreateEmbeddingAsync(
                 input: batch,
                 model: Id,
                 encodingFormat: CreateEmbeddingRequestEncodingFormat.Float,

diff --git a/src/OpenAI/src/LangChain.Providers.OpenAI.csproj b/src/OpenAI/src/LangChain.Providers.OpenAI.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup Label="Usings">
-        <Using Include="OpenAI" />
+        <Using Include="tryAGI.OpenAI" />
         <Using Include="System.Net.Http" />
     </ItemGroup>
 

diff --git a/src/OpenAI/src/Moderation/OpenAiModerationModel.cs b/src/OpenAI/src/Moderation/OpenAiModerationModel.cs
@@ -24,7 +24,7 @@ public async Task<ModerationResponse> CheckViolationAsync(
     {
         request = request ?? throw new ArgumentNullException(nameof(request));
 
-        var response = await provider.Api.Moderations.CreateModerationAsync(
+        var response = await provider.Client.Moderations.CreateModerationAsync(
             input: request.Prompt,
             model: Id,
             cancellationToken).ConfigureAwait(false);

diff --git a/src/OpenAI/src/OpenAiProvider.cs b/src/OpenAI/src/OpenAiProvider.cs
@@ -10,16 +10,16 @@ public class OpenAiProvider : Provider
     /// <summary>
     /// 
     /// </summary>
-    public OpenAiApi Api { get; private set; }
+    public OpenAiClient Client { get; private set; }
 
     #endregion
 
     #region Constructors
 
-    public OpenAiProvider(OpenAiApi openAiApi)
+    public OpenAiProvider(OpenAiClient client)
         : base(id: OpenAiConfiguration.SectionName)
     {
-        Api = openAiApi ?? throw new ArgumentNullException(nameof(openAiApi));
+        Client = client ?? throw new ArgumentNullException(nameof(client));
     }
 
     public OpenAiProvider(OpenAiConfiguration configuration)
@@ -28,11 +28,11 @@ public OpenAiProvider(OpenAiConfiguration configuration)
         configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
         var apiKey = configuration.ApiKey ?? throw new ArgumentException("ApiKey is not defined", nameof(configuration));
 
-        Api = configuration.Endpoint != null &&
-              !string.IsNullOrWhiteSpace(configuration.Endpoint)
-                ? new OpenAiApi(baseUri: new Uri(configuration.Endpoint))
-                : new OpenAiApi();
-        Api.AuthorizeUsingBearer(apiKey);
+        Client = configuration.Endpoint != null &&
+                 !string.IsNullOrWhiteSpace(configuration.Endpoint)
+                ? new OpenAiClient(baseUri: new Uri(configuration.Endpoint))
+                : new OpenAiClient();
+        Client.AuthorizeUsingBearer(apiKey);
         ChatSettings = configuration.ChatSettings;
         EmbeddingSettings = configuration.EmbeddingSettings;
         TextToImageSettings = configuration.TextToImageSettings;
@@ -49,10 +49,10 @@ public OpenAiProvider(
     {
         apiKey = apiKey ?? throw new ArgumentNullException(nameof(apiKey));
 
-        Api = customEndpoint != null
-            ? new OpenAiApi(baseUri: new Uri(customEndpoint))
-            : new OpenAiApi();
-        Api.AuthorizeUsingBearer(apiKey);
+        Client = customEndpoint != null
+            ? new OpenAiClient(baseUri: new Uri(customEndpoint))
+            : new OpenAiClient();
+        Client.AuthorizeUsingBearer(apiKey);
     }
 
     #endregion

diff --git a/src/OpenAI/src/SpeechToText/OpenAiSpeechToTextModel.cs b/src/OpenAI/src/SpeechToText/OpenAiSpeechToTextModel.cs
@@ -37,7 +37,7 @@ public async Task<SpeechToTextResponse> TranscribeAsync(
             await request.Stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
             memoryStream.Position = 0;
 
-            var response = await provider.Api.Audio.CreateTranscriptionAsync(
+            var response = await provider.Client.Audio.CreateTranscriptionAsync(
                 file: memoryStream.ToArray(),
                 filename: request.Filename ?? "file.wav",
                 //audioName: usedSettings.AudioName!,

diff --git a/src/OpenAI/src/TextToImage/OpenAiImageGenerationModel.cs b/src/OpenAI/src/TextToImage/OpenAiImageGenerationModel.cs
@@ -34,7 +34,7 @@ public async Task<TextToImageResponse> GenerateImageAsync(
             providerSettings: provider.TextToImageSettings,
             defaultSettings: OpenAiTextToImageSettings.GetDefaultSettings(Id));
 
-        var response = await provider.Api.Images.CreateImageAsync(
+        var response = await provider.Client.Images.CreateImageAsync(
             prompt: request.Prompt,
             model: Id,
             n: usedSettings.NumberOfResults!.Value,

diff --git a/src/OpenAI/src/TextToSpeech/OpenAiTextToSpeechModel.cs b/src/OpenAI/src/TextToSpeech/OpenAiTextToSpeechModel.cs
@@ -30,7 +30,7 @@ public async Task<TextToSpeechResponse> GenerateSpeechAsync(
             requestSettings: settings,
             modelSettings: Settings,
             providerSettings: provider.TextToSpeechSettings);
-        var response = await provider.Api.Audio.CreateSpeechAsync(
+        var response = await provider.Client.Audio.CreateSpeechAsync(
             input: request.Prompt,
             model: usedSettings.Model ?? CreateSpeechRequestModel.Tts1,
             voice: usedSettings.Voice!.Value,