修复异常错误

AIDotNet · Dec 16, 2024 · e47f057 · e47f057
1 parent 3d242ed
commit e47f057
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/Thor.Service/Infrastructure/Helper/TokenHelper.cs b/src/Thor.Service/Infrastructure/Helper/TokenHelper.cs
@@ -18,7 +18,7 @@ static TokenHelper()
     /// <param name="content"></param>
     /// <returns></returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static int GetTotalTokens(params string[] content)
+    public static int GetTotalTokens(params string?[] content)
     {
         return content.Sum((s => RefGetTokens(ref s)));
     }

diff --git a/src/Thor.Service/Service/ChatService.cs b/src/Thor.Service/Service/ChatService.cs
@@ -864,8 +864,6 @@ await userService.ConsumeAsync(user!.Id, (long)quota, (int)requestToken, token?.
             // 判断请求token数量是否超过额度
             if (quota > user.ResidualCredit) throw new InsufficientQuotaException("账号余额不足请充值");
 
-            var circuitBreaker = new CircuitBreaker(3, TimeSpan.FromSeconds(10));
-
             ThorChatCompletionsResponse result = await openService.ChatCompletionsAsync(request, platformOptions);
 
             await context.Response.WriteAsJsonAsync(result);
@@ -883,7 +881,7 @@ await userService.ConsumeAsync(user!.Id, (long)quota, (int)requestToken, token?.
             else
             {
                 responseToken =
-                    TokenHelper.GetTotalTokens(result?.Choices?.Select(x => x.Delta?.Content).ToArray());
+                    TokenHelper.GetTotalTokens(result?.Choices?.Select(x => x.Delta?.Content).ToArray() ?? []);
             }
         }
         else
@@ -896,13 +894,11 @@ await userService.ConsumeAsync(user!.Id, (long)quota, (int)requestToken, token?.
             // 判断请求token数量是否超过额度
             if (quota > user.ResidualCredit) throw new InsufficientQuotaException("账号余额不足请充值");
 
-            var circuitBreaker = new CircuitBreaker(3, TimeSpan.FromSeconds(10));
-
-            ThorChatCompletionsResponse result = await openService.ChatCompletionsAsync(request, platformOptions);
+            var result = await openService.ChatCompletionsAsync(request, platformOptions);
 
             await context.Response.WriteAsJsonAsync(result);
 
-            responseToken = TokenHelper.GetTokens(result.Choices.FirstOrDefault()?.Delta.Content ?? string.Empty);
+            responseToken = TokenHelper.GetTokens(result.Choices?.FirstOrDefault()?.Delta.Content ?? string.Empty);
         }
 
         if (request.ResponseFormat?.JsonSchema is not null)