add model loader

sdcb · sdcb · commit 6a5288e72b88 · 2025-01-20T13:03:00.000+08:00
diff --git a/src/BE/Controllers/Admin/AdminModels/AdminModelsController.cs b/src/BE/Controllers/Admin/AdminModels/AdminModelsController.cs
@@ -182,7 +182,7 @@ public async Task<ActionResult> DeleteModel(short modelId, CancellationToken can
     [HttpPost("models/validate")]
     public async Task<ActionResult<ModelValidateResult>> ValidateModel(
         [FromBody] ValidateModelRequest req,
-        [FromServices] ModelFactory conversationFactory,
+        [FromServices] ChatFactory chatFactory,
         CancellationToken cancellationToken)
     {
         ModelKey? modelKey = await db.ModelKeys
@@ -204,7 +204,7 @@ public async Task<ActionResult<ModelValidateResult>> ValidateModel(
             return this.BadRequestMessage($"Model reference id: {req.ModelReferenceId} not found");
         }
 
-        ModelValidateResult result = await conversationFactory.ValidateModel(modelKey, modelReference, req.DeploymentName, cancellationToken);
+        ModelValidateResult result = await chatFactory.ValidateModel(modelKey, modelReference, req.DeploymentName, cancellationToken);
         return Ok(result);
     }
 
diff --git a/src/BE/Controllers/Admin/ModelKeys/ModelKeysController.cs b/src/BE/Controllers/Admin/ModelKeys/ModelKeysController.cs
@@ -115,7 +115,7 @@ public async Task<ActionResult> DeleteModelKey(short modelKeyId, CancellationTok
     }
 
     [HttpPost("{modelKeyId:int}/auto-create-models")]
-    public async Task<ActionResult<AutoCreateModelResult[]>> AutoCreateModels(short modelKeyId, [FromServices] ModelFactory conversationFactory, CancellationToken cancellationToken)
+    public async Task<ActionResult<AutoCreateModelResult[]>> AutoCreateModels(short modelKeyId, [FromServices] ChatFactory chatFactory, CancellationToken cancellationToken)
     {
         ModelKey? modelKey = await db
             .ModelKeys
@@ -140,7 +140,7 @@ public async Task<ActionResult<AutoCreateModelResult[]>> AutoCreateModels(short
         ParepareAutoCreateModelResult[] scanedModels = await Task.WhenAll(readyRefs
             .Select(async r => existingModelRefIds.Contains(r.Id)
                 ? ParepareAutoCreateModelResult.ModelAlreadyExists(r)
-                : ParepareAutoCreateModelResult.FromModelValidateResult(await conversationFactory.ValidateModel(modelKey, r, r.Name, cancellationToken), r)));
+                : ParepareAutoCreateModelResult.FromModelValidateResult(await chatFactory.ValidateModel(modelKey, r, r.Name, cancellationToken), r)));
 
         FileService? fileService = await db.FileServices
             .OrderByDescending(x => x.Id)
diff --git a/src/BE/Controllers/Chats/Chats/ChatController.cs b/src/BE/Controllers/Chats/Chats/ChatController.cs
@@ -31,7 +31,7 @@ public async Task<IActionResult> FreshChat(
         [FromServices] ILogger<ChatController> logger,
         [FromServices] IUrlEncryptionService idEncryption,
         [FromServices] BalanceService balanceService,
-        [FromServices] ModelFactory chatFactory,
+        [FromServices] ChatFactory chatFactory,
         [FromServices] UserModelManager userModelManager,
         [FromServices] ClientInfoManager clientInfoManager,
         [FromServices] FileUrlProvider fup,
@@ -62,7 +62,7 @@ public async Task<IActionResult> RegenerateMessage(
         [FromServices] ILogger<ChatController> logger,
         [FromServices] IUrlEncryptionService idEncryption,
         [FromServices] BalanceService balanceService,
-        [FromServices] ModelFactory chatFactory,
+        [FromServices] ChatFactory chatFactory,
         [FromServices] UserModelManager userModelManager,
         [FromServices] ClientInfoManager clientInfoManager,
         [FromServices] FileUrlProvider fup,
@@ -87,7 +87,7 @@ public async Task<IActionResult> GeneralChat(
         [FromServices] ILogger<ChatController> logger,
         [FromServices] IUrlEncryptionService idEncryption,
         [FromServices] BalanceService balanceService,
-        [FromServices] ModelFactory chatFactory,
+        [FromServices] ChatFactory chatFactory,
         [FromServices] UserModelManager userModelManager,
         [FromServices] ClientInfoManager clientInfoManager,
         [FromServices] FileUrlProvider fup,
@@ -131,7 +131,7 @@ private async Task<IActionResult> ChatPrivate(
         ILogger<ChatController> logger,
         IUrlEncryptionService idEncryption,
         BalanceService balanceService,
-        ModelFactory chatFactory,
+        ChatFactory chatFactory,
         UserModelManager userModelManager,
         ClientInfoManager clientInfoManager,
         FileUrlProvider fup,
@@ -366,7 +366,7 @@ private static async Task<Message> MakeDbUserMessage(Chat chat, FileUrlProvider
     private static async Task<ChatSpanResponse> ProcessChatSpan(
         CurrentUser currentUser,
         ILogger<ChatController> logger,
-        ModelFactory chatFactory,
+        ChatFactory chatFactory,
         FileUrlProvider fup,
         ChatSpanRequest span,
         long firstTick,
@@ -399,7 +399,7 @@ private static async Task<ChatSpanResponse> ProcessChatSpan(
         string? errorText = null;
         try
         {
-            using ChatService s = chatFactory.CreateConversationService(userModel.Model);
+            using ChatService s = chatFactory.CreateChatService(userModel.Model);
             await foreach (InternalChatSegment seg in icc.Run(userBalance.Balance, userModel, s.ChatStreamedFEProcessed(messageToSend, cco, extraDetails, cancellationToken)))
             {
                 if (seg.TextSegment == string.Empty) continue;
diff --git a/src/BE/Controllers/OpenAICompatible/OpenAICompatibleController.cs b/src/BE/Controllers/OpenAICompatible/OpenAICompatibleController.cs
@@ -17,7 +17,7 @@
 namespace Chats.BE.Controllers.OpenAICompatible;
 
 [Route("v1"), Authorize(AuthenticationSchemes = "OpenAIApiKey")]
-public partial class OpenAICompatibleController(ChatsDB db, CurrentApiKey currentApiKey, ModelFactory cf, UserModelManager userModelManager, ILogger<OpenAICompatibleController> logger, BalanceService balanceService) : ControllerBase
+public partial class OpenAICompatibleController(ChatsDB db, CurrentApiKey currentApiKey, ChatFactory cf, UserModelManager userModelManager, ILogger<OpenAICompatibleController> logger, BalanceService balanceService) : ControllerBase
 {
     [HttpPost("chat/completions")]
     public async Task<ActionResult> ChatCompletion([FromBody] JsonObject json, [FromServices] ClientInfoManager clientInfoManager, CancellationToken cancellationToken)
@@ -37,7 +37,7 @@ public async Task<ActionResult> ChatCompletion([FromBody] JsonObject json, [From
         if (userModel == null) return InvalidModel(cco.Model);
 
         Model cm = userModel.Model;
-        using ChatService s = cf.CreateConversationService(cm);
+        using ChatService s = cf.CreateChatService(cm);
 
         UserBalance userBalance = await db.UserBalances
             .Where(x => x.UserId == currentApiKey.User.Id)
diff --git a/src/BE/DB/Enums/DBModelProvider.cs b/src/BE/DB/Enums/DBModelProvider.cs
@@ -16,4 +16,6 @@ public enum DBModelProvider
     xAI = 11, 
     GithubModels = 12,
     GoogleAI = 13,
+    Ollama = 14,
+    MiniMax = 15,
 }
diff --git a/src/BE/Services/Models/ChatFactory.cs b/src/BE/Services/Models/ChatFactory.cs
@@ -5,13 +5,14 @@
 using Chats.BE.Services.Models.ChatServices.OpenAI;
 using Chats.BE.Services.Models.ChatServices.QianFan;
 using Chats.BE.Services.Models.ChatServices.Test;
+using Chats.BE.Services.Models.ModelLoaders;
 using OpenAI.Chat;
 
 namespace Chats.BE.Services.Models;
 
 public class ChatFactory(ILogger<ChatFactory> logger)
 {
-    public ChatService CreateConversationService(Model model)
+    public ChatService CreateChatService(Model model)
     {
         DBModelProvider modelProvider = (DBModelProvider)model.ModelKey.ModelProviderId;
         ChatService cs = modelProvider switch
@@ -30,14 +31,41 @@ public ChatService CreateConversationService(Model model)
             DBModelProvider.xAI => new XAIChatService(model),
             DBModelProvider.GithubModels => new GithubModelsChatService(model),
             DBModelProvider.GoogleAI => new GoogleAIChatService(model),
+            DBModelProvider.Ollama => new OllamaChatService(model),
+            DBModelProvider.MiniMax => new MiniMaxChatService(model),
             _ => throw new NotSupportedException($"Unknown model provider: {modelProvider}")
         };
         return cs;
     }
 
+    public ModelLoader? CreateModelLoader(DBModelProvider modelProvider)
+    {
+        ModelLoader? ml = modelProvider switch
+        {
+            DBModelProvider.Test => null,
+            DBModelProvider.OpenAI => null,
+            DBModelProvider.AzureOpenAI => null,
+            DBModelProvider.WenXinQianFan => null,
+            DBModelProvider.AliyunDashscope => null,
+            DBModelProvider.ZhiPuAI => null,
+            DBModelProvider.Moonshot => null,
+            DBModelProvider.HunYuan => null,
+            DBModelProvider.Sparkdesk => null,
+            DBModelProvider.LingYi => null,
+            DBModelProvider.DeepSeek => null,
+            DBModelProvider.xAI => null,
+            DBModelProvider.GithubModels => null,
+            DBModelProvider.GoogleAI => null,
+            DBModelProvider.Ollama => new OpenAIModelLoader(),
+            DBModelProvider.MiniMax => null,
+            _ => throw new NotSupportedException($"Unknown model provider: {modelProvider}")
+        };
+        return ml;
+    }
+
     public async Task<ModelValidateResult> ValidateModel(ModelKey modelKey, ModelReference modelReference, string? deploymentName, CancellationToken cancellationToken)
     {
-        using ChatService cs = CreateConversationService(new Model
+        using ChatService cs = CreateChatService(new Model
         {
             ModelKey = modelKey, 
             ModelReference = modelReference,
diff --git a/src/BE/Services/Models/ChatServices/OpenAI/MiniMaxChatService.cs b/src/BE/Services/Models/ChatServices/OpenAI/MiniMaxChatService.cs
@@ -0,0 +1,5 @@
+﻿using Chats.BE.DB;
+
+namespace Chats.BE.Services.Models.ChatServices.OpenAI;
+
+public class MiniMaxChatService(Model model) : OpenAIChatService(model, new Uri("https://api.minimax.chat/v1"));
diff --git a/src/BE/Services/Models/ChatServices/OpenAI/OllamaChatService.cs b/src/BE/Services/Models/ChatServices/OpenAI/OllamaChatService.cs
@@ -0,0 +1,5 @@
+﻿using Chats.BE.DB;
+
+namespace Chats.BE.Services.Models.ChatServices.OpenAI;
+
+public class OllamaChatService(Model model) : OpenAIChatService(model);
diff --git a/src/BE/Services/Models/ModelLoaders/OpenAIModelLoader.cs b/src/BE/Services/Models/ModelLoaders/OpenAIModelLoader.cs
@@ -0,0 +1,21 @@
+﻿using Chats.BE.DB;
+using OpenAI;
+using OpenAI.Models;
+using System.ClientModel;
+
+namespace Chats.BE.Services.Models.ModelLoaders;
+
+public class OpenAIModelLoader : ModelLoader
+{
+    public override async Task<string[]> ListModels(ModelKey modelKey, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(modelKey.Secret, nameof(modelKey.Secret));
+
+        OpenAIClient api = new(new ApiKeyCredential(modelKey.Secret), new OpenAIClientOptions()
+        {
+            Endpoint = !string.IsNullOrWhiteSpace(modelKey.Host) ? new Uri(modelKey.Host) : null,
+        });
+        ClientResult<OpenAIModelCollection> result = await api.GetOpenAIModelClient().GetModelsAsync(cancellationToken);
+        return result.Value.Select(m => m.Id).ToArray();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public async Task<ActionResult> DeleteModel(short modelId, CancellationToken can`
`182`	`182`	`[HttpPost("models/validate")]`
`183`	`183`	`public async Task<ActionResult<ModelValidateResult>> ValidateModel(`
`184`	`184`	`[FromBody] ValidateModelRequest req,`
`185`		`- [FromServices] ModelFactory conversationFactory,`
	`185`	`+ [FromServices] ChatFactory chatFactory,`
`186`	`186`	`CancellationToken cancellationToken)`
`187`	`187`	`{`
`188`	`188`	`ModelKey? modelKey = await db.ModelKeys`
`@@ -204,7 +204,7 @@ public async Task<ActionResult<ModelValidateResult>> ValidateModel(`
`204`	`204`	`return this.BadRequestMessage($"Model reference id: {req.ModelReferenceId} not found");`
`205`	`205`	`}`
`206`	`206`
`207`		`- ModelValidateResult result = await conversationFactory.ValidateModel(modelKey, modelReference, req.DeploymentName, cancellationToken);`
	`207`	`+ ModelValidateResult result = await chatFactory.ValidateModel(modelKey, modelReference, req.DeploymentName, cancellationToken);`
`208`	`208`	`return Ok(result);`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ public enum DBModelProvider`
`16`	`16`	`xAI = 11,`
`17`	`17`	`GithubModels = 12,`
`18`	`18`	`GoogleAI = 13,`
	`19`	`+ Ollama = 14,`
	`20`	`+ MiniMax = 15,`
`19`	`21`	`}`