fix httpclient

AndreaPic · May 23, 2023 · 63f1fcc · 63f1fcc
1 parent a9c80fd
commit 63f1fcc
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 31 deletions.
diff --git a/DevExtremeAI/DevExtremeAI.csproj b/DevExtremeAI/DevExtremeAI.csproj
@@ -12,7 +12,7 @@
 		<RepositoryUrl>https://github.com/AndreaPic/DevExtremeAI</RepositoryUrl>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Version>$(VersionPrefix)$(VersionSuffix)</Version>
-		<VersionPrefix>1.0.1</VersionPrefix>
+		<VersionPrefix>1.0.2</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<PackageTags>openai;dotnet;aspnet;csharp;gpt-4;gpt-3.5-turbo;davinci;DALL·E;Whisper;fine-tunes</PackageTags>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>

diff --git a/DevExtremeAI/OpenAIClient/OpenAIAPIClient.FineTune.cs b/DevExtremeAI/OpenAIClient/OpenAIAPIClient.FineTune.cs
@@ -90,20 +90,30 @@ public async Task<ResponseDTO<GetFineTuneListResponse>> GetFineTuneJobListAsync(
         public async Task<ResponseDTO<FineTuneData>> GetFineTuneJobDataAsync(FineTuneRequest request)
         {
             ResponseDTO<FineTuneData> ret = new ResponseDTO<FineTuneData>();
-            HttpClient httpClient = HttpClientFactory.CreateClient();
-            FillBaseAddress(httpClient);
-            FillAuthRequestHeaders(httpClient.DefaultRequestHeaders);
-
-            var httpResponse = await httpClient.GetAsync($"fine-tunes/{request.FineTuneId}");
-            if (httpResponse.IsSuccessStatusCode)
+            HttpClient httpClient = CreateHttpClient(out bool doDispose);
+            try
             {
-                ret.OpenAIResponse = await httpResponse.Content.ReadFromJsonAsync<FineTuneData>();
+                FillBaseAddress(httpClient);
+                FillAuthRequestHeaders(httpClient.DefaultRequestHeaders);
+
+                var httpResponse = await httpClient.GetAsync($"fine-tunes/{request.FineTuneId}");
+                if (httpResponse.IsSuccessStatusCode)
+                {
+                    ret.OpenAIResponse = await httpResponse.Content.ReadFromJsonAsync<FineTuneData>();
+                }
+                else
+                {
+                    ret.ErrorResponse = await httpResponse.Content.ReadFromJsonAsync<ErrorResponse>() ?? ErrorResponse.CreateDefaultErrorResponse();
+                }
+                return ret;
             }
-            else
+            finally
             {
-                ret.ErrorResponse = await httpResponse.Content.ReadFromJsonAsync<ErrorResponse>() ?? ErrorResponse.CreateDefaultErrorResponse();
+                if (doDispose)
+                {
+                    httpClient.Dispose();
+                }
             }
-            return ret;
         }
 
         /// <summary>
@@ -114,20 +124,30 @@ public async Task<ResponseDTO<FineTuneData>> GetFineTuneJobDataAsync(FineTuneReq
         public async Task<ResponseDTO<FineTuneData>> CancelFineTuneJobAsync(FineTuneRequest request)
         {
             ResponseDTO<FineTuneData> ret = new ResponseDTO<FineTuneData>();
-            HttpClient httpClient = HttpClientFactory.CreateClient();
-            FillBaseAddress(httpClient);
-            FillAuthRequestHeaders(httpClient.DefaultRequestHeaders);
-
-            var httpResponse = await httpClient.PostAsync($"fine-tunes/{request.FineTuneId}/cancel",null);
-            if (httpResponse.IsSuccessStatusCode)
+            HttpClient httpClient = CreateHttpClient(out bool doDispose);
+            try
             {
-                ret.OpenAIResponse = await httpResponse.Content.ReadFromJsonAsync<FineTuneData>();
+                FillBaseAddress(httpClient);
+                FillAuthRequestHeaders(httpClient.DefaultRequestHeaders);
+
+                var httpResponse = await httpClient.PostAsync($"fine-tunes/{request.FineTuneId}/cancel",null);
+                if (httpResponse.IsSuccessStatusCode)
+                {
+                    ret.OpenAIResponse = await httpResponse.Content.ReadFromJsonAsync<FineTuneData>();
+                }
+                else
+                {
+                    ret.ErrorResponse = await httpResponse.Content.ReadFromJsonAsync<ErrorResponse>() ?? ErrorResponse.CreateDefaultErrorResponse();
+                }
+                return ret;
             }
-            else
+            finally
             {
-                ret.ErrorResponse = await httpResponse.Content.ReadFromJsonAsync<ErrorResponse>() ?? ErrorResponse.CreateDefaultErrorResponse();
+                if (doDispose)
+                {
+                    httpClient.Dispose();
+                }
             }
-            return ret;
         }
 
         /// <summary>
@@ -139,20 +159,30 @@ public async Task<ResponseDTO<FineTuneData>> CancelFineTuneJobAsync(FineTuneRequ
         public async Task<ResponseDTO<GetFineTuneEventListResponse>> GetFineTuneEventListAsync(FineTuneRequest request)
         {
             ResponseDTO<GetFineTuneEventListResponse> ret = new ResponseDTO<GetFineTuneEventListResponse>();
-            HttpClient httpClient = HttpClientFactory.CreateClient();
-            FillBaseAddress(httpClient);
-            FillAuthRequestHeaders(httpClient.DefaultRequestHeaders);
-
-            var httpResponse = await httpClient.GetAsync($"fine-tunes/{request.FineTuneId}/events");
-            if (httpResponse.IsSuccessStatusCode)
+            HttpClient httpClient = CreateHttpClient(out bool doDispose);
+            try
             {
-                ret.OpenAIResponse = await httpResponse.Content.ReadFromJsonAsync<GetFineTuneEventListResponse>();
+                FillBaseAddress(httpClient);
+                FillAuthRequestHeaders(httpClient.DefaultRequestHeaders);
+
+                var httpResponse = await httpClient.GetAsync($"fine-tunes/{request.FineTuneId}/events");
+                if (httpResponse.IsSuccessStatusCode)
+                {
+                    ret.OpenAIResponse = await httpResponse.Content.ReadFromJsonAsync<GetFineTuneEventListResponse>();
+                }
+                else
+                {
+                    ret.ErrorResponse = await httpResponse.Content.ReadFromJsonAsync<ErrorResponse>() ?? ErrorResponse.CreateDefaultErrorResponse();
+                }
+                return ret;
             }
-            else
+            finally
             {
-                ret.ErrorResponse = await httpResponse.Content.ReadFromJsonAsync<ErrorResponse>() ?? ErrorResponse.CreateDefaultErrorResponse();
+                if (doDispose)
+                {
+                    httpClient.Dispose();
+                }
             }
-            return ret;
         }