Merge branch 'dev' of https://github.com/sdcb/chats into dev

src/BE.Tests/Services/Conversations/ChatCompletionOptionsTests.cs

@@ -1,4 +1,4 @@
-using Chats.BE.Services.Conversations.Extensions;
+using Chats.BE.Services.ChatServices.Extensions;
 using OpenAI.Chat;
 using System.Runtime.CompilerServices;
 

src/BE/Chats.BE.csproj

@@ -9,9 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.409" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.0.0" />
-    <PackageReference Include="Azure.Identity" Version="1.13.1" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.410.1" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" /> <!-- fix security issue from Azure.AI.OpenAI -->
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
@@ -23,16 +22,16 @@
     <PackageReference Include="Microsoft.ML.Tokenizers" Version="1.0.0" />
     <PackageReference Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.0" />
     <PackageReference Include="Microsoft.ML.Tokenizers.Data.O200kBase" Version="1.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
-    <PackageReference Include="OpenAI" Version="2.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
+    <PackageReference Include="OpenAI" Version="2.1.0" />
     <PackageReference Include="Sdcb.DashScope" Version="2.0.0" />
     <PackageReference Include="Sdcb.WenXinQianFan" Version="1.2.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="System.Runtime.Caching" Version="9.0.0" />
-    <PackageReference Include="TencentCloudSDK.Hunyuan" Version="3.0.1133" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1133" />
+    <PackageReference Include="TencentCloudSDK.Hunyuan" Version="3.0.1137" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1137" />
   </ItemGroup>
 
 </Project>

src/BE/Controllers/Admin/AdminMessage/AdminMessageController.cs

@@ -1,12 +1,12 @@
 using Chats.BE.Controllers.Admin.AdminMessage.Dtos;
 using Chats.BE.Controllers.Admin.Common;
-using Chats.BE.Controllers.Chats.Conversations.Dtos;
+using Chats.BE.Controllers.Chats.Chats.Dtos;
 using Chats.BE.Controllers.Common.Dtos;
 using Chats.BE.DB;
 using Chats.BE.DB.Enums;
 using Chats.BE.DB.Jsons;
 using Chats.BE.Infrastructure;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Chats.BE.Services.FileServices;
 using Chats.BE.Services.UrlEncryption;
 using Microsoft.AspNetCore.Mvc;

src/BE/Controllers/Admin/AdminMessage/Dtos/AdminMessageRoot.cs

@@ -1,7 +1,7 @@
-using Chats.BE.Controllers.Chats.Conversations.Dtos;
+using Chats.BE.Controllers.Chats.Chats.Dtos;
 using Chats.BE.Controllers.Chats.Messages.Dtos;
 using Chats.BE.DB;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Chats.BE.Services.FileServices;
 using Chats.BE.Services.UrlEncryption;
 using System.Text.Json.Serialization;
@@ -39,7 +39,7 @@ public AdminMessageRoot ToDto(AdminMessageBasicItem[] messages)
         {
             Name = Name,
             ModelName = ModelName,
-            ModelTemperature = Temperature ?? ConversationService.DefaultTemperature,
+            ModelTemperature = Temperature ?? ChatService.DefaultTemperature,
             ModelPrompt = messages.FirstOrDefault(x => x.Role.Equals(DBChatRole.System.ToString(), StringComparison.OrdinalIgnoreCase))?.Content.Text,
             Messages = messages.Where(x => !x.Role.Equals(DBChatRole.System.ToString(), StringComparison.OrdinalIgnoreCase)).ToArray(),
         };

src/BE/Controllers/Admin/AdminModels/AdminModelsController.cs

@@ -5,7 +5,7 @@
 using Chats.BE.DB.Jsons;
 using Chats.BE.Infrastructure;
 using Chats.BE.Services;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.EntityFrameworkCore;
@@ -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] ConversationFactory conversationFactory,
+        [FromServices] ChatFactory conversationFactory,
         CancellationToken cancellationToken)
     {
         ModelKey? modelKey = await db.ModelKeys

src/BE/Controllers/Admin/ModelKeys/Dtos/AutoCreateModelResult.cs

@@ -1,5 +1,5 @@
 using Chats.BE.DB;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using System.Text.Json.Serialization;
 
 namespace Chats.BE.Controllers.Admin.ModelKeys.Dtos;

src/BE/Controllers/Admin/ModelKeys/ModelKeysController.cs

@@ -3,7 +3,7 @@
 using Chats.BE.Controllers.Common;
 using Chats.BE.DB;
 using Chats.BE.Services.Common;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
@@ -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] ConversationFactory conversationFactory, CancellationToken cancellationToken)
+    public async Task<ActionResult<AutoCreateModelResult[]>> AutoCreateModels(short modelKeyId, [FromServices] ChatFactory conversationFactory, CancellationToken cancellationToken)
     {
         ModelKey? modelKey = await db
             .ModelKeys

src/BE/Controllers/Chats/Conversations/ConversationController.cs → src/BE/Controllers/Chats/Chats/ChatController.cs

@@ -1,11 +1,11 @@
-using Chats.BE.Controllers.Chats.Conversations.Dtos;
+using Chats.BE.Controllers.Chats.Chats.Dtos;
 using Chats.BE.Controllers.Common;
 using Chats.BE.DB;
 using Chats.BE.DB.Jsons;
 using Chats.BE.Infrastructure;
 using Chats.BE.Services;
-using Chats.BE.Services.Conversations;
-using Chats.BE.Services.Conversations.Dtos;
+using Chats.BE.Services.ChatServices;
+using Chats.BE.Services.ChatServices.Dtos;
 using Chats.BE.Services.FileServices;
 using Chats.BE.Services.UrlEncryption;
 using Microsoft.AspNetCore.Authorization;
@@ -18,16 +18,16 @@
 using TencentCloud.Common;
 using OpenAIChatMessage = OpenAI.Chat.ChatMessage;
 
-namespace Chats.BE.Controllers.Chats.Conversations;
+namespace Chats.BE.Controllers.Chats.Chats;
 
 [Route("api/chats"), Authorize]
-public class ConversationController(ChatsDB db, CurrentUser currentUser, ILogger<ConversationController> logger, IUrlEncryptionService idEncryption) : ControllerBase
+public class ChatController(ChatsDB db, CurrentUser currentUser, ILogger<ChatController> logger, IUrlEncryptionService idEncryption) : ControllerBase
 {
     [HttpPost]
     public async Task<IActionResult> StartConversationStreamed(
-        [FromBody] ConversationRequest request,
+        [FromBody] ChatRequest request,
         [FromServices] BalanceService balanceService,
-        [FromServices] ConversationFactory conversationFactory,
+        [FromServices] ChatFactory conversationFactory,
         [FromServices] UserModelManager userModelManager,
         [FromServices] ClientInfoManager clientInfoManager,
         [FromServices] FileUrlProvider fileDownloadUrlProvider,
@@ -155,7 +155,7 @@ ..await GetMessageTree(existingMessages, messageId).ToAsyncEnumerable().SelectAw
                 throw new InvalidModelException(request.ModelId.ToString());
             }
 
-            using ConversationService s = conversationFactory.CreateConversationService(userModel.Model);
+            using ChatService s = conversationFactory.CreateConversationService(userModel.Model);
             ChatCompletionOptions cco = new()
             {
                 Temperature = request.UserModelConfig.Temperature,

src/BE/Controllers/Chats/Conversations/Dtos/ConversationRequest.cs → src/BE/Controllers/Chats/Chats/Dtos/ChatRequest.cs

@@ -2,9 +2,9 @@
 using Chats.BE.DB.Jsons;
 using System.Text.Json.Serialization;
 
-namespace Chats.BE.Controllers.Chats.Conversations.Dtos;
+namespace Chats.BE.Controllers.Chats.Chats.Dtos;
 
-public record ConversationRequest
+public record ChatRequest
 {
     [JsonPropertyName("modelId")]
     public required short ModelId { get; init; }

src/BE/Controllers/Chats/Conversations/Dtos/MessageLiteDto.cs → src/BE/Controllers/Chats/Chats/Dtos/MessageLiteDto.cs

@@ -1,11 +1,11 @@
 using Chats.BE.DB;
 using Chats.BE.DB.Enums;
 using Chats.BE.DB.Extensions;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Chats.BE.Services.FileServices;
 using OpenAI.Chat;
 
-namespace Chats.BE.Controllers.Chats.Conversations.Dtos;
+namespace Chats.BE.Controllers.Chats.Chats.Dtos;
 
 public record MessageLiteDto
 {

src/BE/Controllers/Chats/Conversations/Dtos/SseResponseLine.cs → src/BE/Controllers/Chats/Chats/Dtos/SseResponseLine.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Chats.BE.Controllers.Chats.Conversations.Dtos;
+namespace Chats.BE.Controllers.Chats.Chats.Dtos;
 
 public record SseResponseLine
 {

src/BE/Controllers/Chats/Conversations/InsufficientBalanceException.cs → src/BE/Controllers/Chats/Chats/InsufficientBalanceException.cs

@@ -1,6 +1,6 @@
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 
-namespace Chats.BE.Controllers.Chats.Conversations;
+namespace Chats.BE.Controllers.Chats.Chats;
 
 public abstract class ChatServiceException(DBFinishReason errorCode) : Exception
 {

src/BE/Controllers/Chats/Conversations/UserModelBalanceCalculator.cs → src/BE/Controllers/Chats/Chats/UserModelBalanceCalculator.cs

@@ -1,7 +1,7 @@
 using Chats.BE.DB;
 using Chats.BE.DB.Jsons;
 
-namespace Chats.BE.Controllers.Chats.Conversations;
+namespace Chats.BE.Controllers.Chats.Chats;
 
 public record UserModelBalanceCost(int Counts, int Tokens, decimal Balance, int CostCount, int CostTokens, decimal InputTokenPrice, decimal OutputTokenPrice)
 {

src/BE/Controllers/Chats/Messages/Dtos/MessageDto.cs

@@ -1,6 +1,6 @@
 using Chats.BE.DB;
 using Chats.BE.DB.Enums;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Chats.BE.Services.FileServices;
 using Chats.BE.Services.UrlEncryption;
 using System.Text.Json.Serialization;

src/BE/Controllers/Chats/Messages/MessagesController.cs

@@ -2,7 +2,7 @@
 using Chats.BE.DB;
 using Chats.BE.DB.Enums;
 using Chats.BE.Infrastructure;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Chats.BE.Services.FileServices;
 using Chats.BE.Services.UrlEncryption;
 using Microsoft.AspNetCore.Authorization;

src/BE/Controllers/Chats/Prompts/PromptsController.cs

@@ -1,7 +1,7 @@
 using Chats.BE.Controllers.Chats.Prompts.Dtos;
 using Chats.BE.DB;
 using Chats.BE.Infrastructure;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -97,8 +97,8 @@ public async Task<ActionResult<PromptDto>> GetDefaultPrompt(CancellationToken ca
             IsSystem = consolidated.IsSystem,
         } : new PromptDto()
         {
-            Content = ConversationService.DefaultPrompt,
-            Temperature = ConversationService.DefaultTemperature,
+            Content = ChatService.DefaultPrompt,
+            Temperature = ChatService.DefaultTemperature,
             Id = -1,
             IsDefault = true,
             Name = "Default",

src/BE/Controllers/Chats/Chats/Dtos/ChatsResponse.cs → src/BE/Controllers/Chats/UserChats/Dtos/ChatsResponse.cs

@@ -1,11 +1,11 @@
 using Chats.BE.DB;
 using Chats.BE.DB.Enums;
 using Chats.BE.DB.Jsons;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Chats.BE.Services.UrlEncryption;
 using System.Text.Json.Serialization;
 
-namespace Chats.BE.Controllers.Chats.Chats.Dtos;
+namespace Chats.BE.Controllers.Chats.UserChats.Dtos;
 
 public record ChatsResponse
 {
@@ -46,9 +46,9 @@ public static ChatsResponse FromDB(Chat chat, IUrlEncryptionService idEncryption
                 DeploymentName = chat.Model.DeploymentName,
                 EnableSearch = chat.Model.ModelReference.AllowSearch,
                 MaxLength = chat.Model.ModelReference.MaxResponseTokens,
-                Temperature = ConversationService.DefaultTemperature,
+                Temperature = ChatService.DefaultTemperature,
                 Version = chat.Model.ModelKey.ModelProvider.Name,
-                Prompt = ConversationService.DefaultPrompt,
+                Prompt = ChatService.DefaultPrompt,
             },
             UserModelConfig = new JsonUserModelConfig { EnableSearch = chat.EnableSearch, Temperature = chat.Temperature },
             IsShared = chat.IsShared,
@@ -87,8 +87,8 @@ public ChatsResponse ToResponse(IUrlEncryptionService idEncryption)
             ModelName = ModelName,
             ModelConfig = new JsonModelConfig
             {
-                Prompt = ConversationService.DefaultPrompt,
-                Temperature = Temperature ?? ConversationService.DefaultTemperature,
+                Prompt = ChatService.DefaultPrompt,
+                Temperature = Temperature ?? ChatService.DefaultTemperature,
             },
             UserModelConfig = UserModelConfig,
             IsShared = IsShared, 

src/BE/Controllers/Chats/Chats/Dtos/CreateChatsRequest.cs → src/BE/Controllers/Chats/UserChats/Dtos/CreateChatsRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Chats.BE.Controllers.Chats.Chats.Dtos;
+namespace Chats.BE.Controllers.Chats.UserChats.Dtos;
 
 public record CreateChatsRequest
 {

src/BE/Controllers/Chats/Chats/Dtos/UpdateChatsRequest.cs → src/BE/Controllers/Chats/UserChats/Dtos/UpdateChatsRequest.cs

@@ -3,7 +3,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Chats.BE.Controllers.Chats.Chats.Dtos;
+namespace Chats.BE.Controllers.Chats.UserChats.Dtos;
 
 public class UpdateChatsRequest
 {

src/BE/Controllers/Chats/Chats/UserChatsController.cs → src/BE/Controllers/Chats/UserChats/UserChatsController.cs

@@ -1,4 +1,4 @@
-using Chats.BE.Controllers.Chats.Chats.Dtos;
+using Chats.BE.Controllers.Chats.UserChats.Dtos;
 using Chats.BE.Controllers.Common;
 using Chats.BE.Controllers.Common.Dtos;
 using Chats.BE.DB;
@@ -7,13 +7,13 @@
 using Chats.BE.Infrastructure;
 using Chats.BE.Services;
 using Chats.BE.Services.Common;
-using Chats.BE.Services.Conversations;
+using Chats.BE.Services.ChatServices;
 using Chats.BE.Services.UrlEncryption;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace Chats.BE.Controllers.Chats.Chats;
+namespace Chats.BE.Controllers.Chats.UserChats;
 
 [Route("api/user/chats"), Authorize]
 public class UserChatsController(ChatsDB db, CurrentUser currentUser, IUrlEncryptionService idEncryption) : ControllerBase
@@ -69,7 +69,7 @@ public async Task<ActionResult<PagedResult<ChatsResponse>>> GetChats([FromQuery]
                 ChatModelId = x.ModelId,
                 ModelName = x.Model!.Name,
                 EnableSearch = x.EnableSearch,
-                Temperature = ConversationService.DefaultTemperature,
+                Temperature = ChatService.DefaultTemperature,
                 IsShared = x.IsShared,
                 ModelProvider = (DBModelProvider)x.Model.ModelKey.ModelProviderId,
                 UserModelConfig = new JsonUserModelConfig

src/BE/Controllers/OpenAICompatible/OpenAICompatibleController.cs

@@ -1,8 +1,8 @@
-using Chats.BE.Controllers.Chats.Conversations;
+using Chats.BE.Controllers.Chats.Chats;
 using Chats.BE.DB;
 using Chats.BE.Services;
-using Chats.BE.Services.Conversations;
-using Chats.BE.Services.Conversations.Dtos;
+using Chats.BE.Services.ChatServices;
+using Chats.BE.Services.ChatServices.Dtos;
 using Chats.BE.Services.OpenAIApiKeySession;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -16,7 +16,7 @@
 namespace Chats.BE.Controllers.OpenAICompatible;
 
 [Route("v1"), Authorize(AuthenticationSchemes = "OpenAIApiKey")]
-public partial class OpenAICompatibleController(ChatsDB db, CurrentApiKey currentApiKey, ConversationFactory 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)
@@ -36,7 +36,7 @@ public async Task<ActionResult> ChatCompletion([FromBody] JsonObject json, [From
         if (userModel == null) return InvalidModel(cco.Model);
 
         Model cm = userModel.Model;
-        using ConversationService s = cf.CreateConversationService(cm);
+        using ChatService s = cf.CreateConversationService(cm);
 
         UserBalance userBalance = await db.UserBalances
             .Where(x => x.UserId == currentApiKey.User.Id)

src/BE/DB/Enums/DBModelProvider.cs

@@ -3,13 +3,14 @@
 public enum DBModelProvider
 {
     Test = 0, 
-    Azure = 1,
+    AzureOpenAI = 1,
     HunYuan = 2,
     LingYi = 3, 
     Moonshot = 4,
     OpenAI = 5,
-    QianFan = 6,
-    QianWen = 7,
-    Spark = 8,
-    ZhiPuAI = 9
+    WenXinQianFan = 6,
+    AliyunDashscope = 7,
+    Sparkdesk = 8,
+    ZhiPuAI = 9,
+    DeepSeek = 10,
 }