Make chat service not inherit IDisposable

sdcb · sdcb · commit d88fc09c0977 · 2025-11-26T18:51:19.000+08:00
diff --git a/src/BE/Controllers/Api/AnthropicCompatible/AnthropicCountTokenController.cs b/src/BE/Controllers/Api/AnthropicCompatible/AnthropicCountTokenController.cs
@@ -49,7 +49,7 @@ public async Task<ActionResult> CountTokens([FromBody] JsonObject json, Cancella
         try
         {
             Model cm = userModel.Model;
-            using ChatService s = cf.CreateChatService(cm);
+            ChatService s = cf.CreateChatService(cm);
             ChatRequest chatRequest = request.ToChatRequest(currentApiKey.User.Id.ToString(), cm);
             int inputTokens = await s.CountTokenAsync(chatRequest, cancellationToken);
 
diff --git a/src/BE/Controllers/Api/AnthropicCompatible/AnthropicMessagesController.cs b/src/BE/Controllers/Api/AnthropicCompatible/AnthropicMessagesController.cs
@@ -70,7 +70,7 @@ private async Task<ActionResult> ProcessMessage(
         CancellationToken cancellationToken)
     {
         Model cm = userModel.Model;
-        using ChatService s = cf.CreateChatService(cm);
+        ChatService s = cf.CreateChatService(cm);
         UserBalance userBalance = await db.UserBalances
             .Where(x => x.UserId == currentApiKey.User.Id)
             .FirstOrDefaultAsync(cancellationToken) ?? throw new InvalidOperationException("User balance not found.");
diff --git a/src/BE/Controllers/Api/OpenAICompatible/OpenAIChatCompletionController.cs b/src/BE/Controllers/Api/OpenAICompatible/OpenAIChatCompletionController.cs
@@ -237,7 +237,7 @@ private async Task<ActionResult> ChatCompletionUseCache(
     private async Task<ActionResult> ChatCompletionNoCache(CcoWrapper cco, UserModel userModel, InChatContext icc, Task<int> clientInfoIdTask, CancellationToken cancellationToken)
     {
         Model cm = userModel.Model;
-        using ChatService s = cf.CreateChatService(cm);
+        ChatService s = cf.CreateChatService(cm);
         UserBalance userBalance = await db.UserBalances
             .Where(x => x.UserId == currentApiKey.User.Id)
             .FirstOrDefaultAsync(cancellationToken) ?? throw new InvalidOperationException("User balance not found.");
diff --git a/src/BE/Controllers/Chats/Chats/ChatController.cs b/src/BE/Controllers/Chats/Chats/ChatController.cs
@@ -632,7 +632,7 @@ async Task<Step> RunOne(ChatRequest request, CancellationToken cancellationToken
             string? errorText = null;
             try
             {
-                using ChatService s = chatFactory.CreateChatService(userModel.Model);
+                ChatService s = chatFactory.CreateChatService(userModel.Model);
 
                 bool responseStated = false, reasoningStarted = false;
                 await foreach (InternalChatSegment seg in icc.Run(calc, userModel, s.ChatEntry(request, fup, UsageSource.WebChat, cancellationToken)))
diff --git a/src/BE/Services/Models/ChatServices/ChatService.cs b/src/BE/Services/Models/ChatServices/ChatService.cs
@@ -11,7 +11,7 @@
 
 namespace Chats.BE.Services.Models;
 
-public abstract partial class ChatService : IDisposable
+public abstract partial class ChatService
 {
     internal static Tokenizer Tokenizer { get; } = TiktokenTokenizer.CreateForEncoding("o200k_base");
 
@@ -206,12 +206,4 @@ static async Task<StepContent> DownloadImagePart(HttpClient http, string url, Ca
     }
 
     private static readonly HttpClient http = new();
-
-    public void Dispose()
-    {
-        Disposing();
-        GC.SuppressFinalize(this);
-    }
-
-    protected virtual void Disposing() { }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public async Task<ActionResult> CountTokens([FromBody] JsonObject json, Cancella`
`49`	`49`	`try`
`50`	`50`	`{`
`51`	`51`	`Model cm = userModel.Model;`
`52`		`- using ChatService s = cf.CreateChatService(cm);`
	`52`	`+ ChatService s = cf.CreateChatService(cm);`
`53`	`53`	`ChatRequest chatRequest = request.ToChatRequest(currentApiKey.User.Id.ToString(), cm);`
`54`	`54`	`int inputTokens = await s.CountTokenAsync(chatRequest, cancellationToken);`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ private async Task<ActionResult> ProcessMessage(`
`70`	`70`	`CancellationToken cancellationToken)`
`71`	`71`	`{`
`72`	`72`	`Model cm = userModel.Model;`
`73`		`- using ChatService s = cf.CreateChatService(cm);`
	`73`	`+ ChatService s = cf.CreateChatService(cm);`
`74`	`74`	`UserBalance userBalance = await db.UserBalances`
`75`	`75`	`.Where(x => x.UserId == currentApiKey.User.Id)`
`76`	`76`	`.FirstOrDefaultAsync(cancellationToken) ?? throw new InvalidOperationException("User balance not found.");`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ private async Task<ActionResult> ChatCompletionUseCache(`
`237`	`237`	`private async Task<ActionResult> ChatCompletionNoCache(CcoWrapper cco, UserModel userModel, InChatContext icc, Task<int> clientInfoIdTask, CancellationToken cancellationToken)`
`238`	`238`	`{`
`239`	`239`	`Model cm = userModel.Model;`
`240`		`- using ChatService s = cf.CreateChatService(cm);`
	`240`	`+ ChatService s = cf.CreateChatService(cm);`
`241`	`241`	`UserBalance userBalance = await db.UserBalances`
`242`	`242`	`.Where(x => x.UserId == currentApiKey.User.Id)`
`243`	`243`	`.FirstOrDefaultAsync(cancellationToken) ?? throw new InvalidOperationException("User balance not found.");`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ async Task<Step> RunOne(ChatRequest request, CancellationToken cancellationToken`
`632`	`632`	`string? errorText = null;`
`633`	`633`	`try`
`634`	`634`	`{`
`635`		`- using ChatService s = chatFactory.CreateChatService(userModel.Model);`
	`635`	`+ ChatService s = chatFactory.CreateChatService(userModel.Model);`
`636`	`636`
`637`	`637`	`bool responseStated = false, reasoningStarted = false;`
`638`	`638`	`await foreach (InternalChatSegment seg in icc.Run(calc, userModel, s.ChatEntry(request, fup, UsageSource.WebChat, cancellationToken)))`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Chats.BE.Services.Models;`
`13`	`13`
`14`		`-public abstract partial class ChatService : IDisposable`
	`14`	`+public abstract partial class ChatService`
`15`	`15`	`{`
`16`	`16`	`internal static Tokenizer Tokenizer { get; } = TiktokenTokenizer.CreateForEncoding("o200k_base");`
`17`	`17`
`@@ -206,12 +206,4 @@ static async Task<StepContent> DownloadImagePart(HttpClient http, string url, Ca`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`private static readonly HttpClient http = new();`
`209`		`-`
`210`		`- public void Dispose()`
`211`		`- {`
`212`		`- Disposing();`
`213`		`- GC.SuppressFinalize(this);`
`214`		`- }`
`215`		`-`
`216`		`- protected virtual void Disposing() { }`
`217`	`209`	`}`