Skip to content

Commit 9f62997

Browse files
sdcbsdcb
committed
Merge branch 'dev'
2 parents 1534103 + d27d49d commit 9f62997

File tree

180 files changed

+940
-1075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+940
-1075
lines changed

‎Chats.sln‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Chats.BE", "src\BE\Chats.BE
1414
EndProject
1515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Chats.BE.Tests", "src\BE.Tests\Chats.BE.Tests.csproj", "{B785B397-23AB-4782-807B-C5D5001C1ECC}"
1616
EndProject
17-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{04AEF080-BF5C-4CD7-BB7E-3D509A0FD3F6}"
18-
ProjectSection(SolutionItems) = preProject
19-
src\scripts\20240902-db-migration.linq = src\scripts\20240902-db-migration.linq
20-
src\scripts\20241101-model-reference-sql.linq = src\scripts\20241101-model-reference-sql.linq
21-
src\scripts\20241112-db-migration.linq = src\scripts\20241112-db-migration.linq
22-
src\scripts\20241115-db-migration.sql = src\scripts\20241115-db-migration.sql
23-
src\scripts\20241121-int-migration.sql = src\scripts\20241121-int-migration.sql
24-
src\scripts\20241127-ref.sql = src\scripts\20241127-ref.sql
25-
src\scripts\20241129-file.sql = src\scripts\20241129-file.sql
26-
EndProjectSection
27-
EndProject
2817
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github-actions", "github-actions", "{29CC0F58-0B4E-4F4F-A084-7C461F7A4E60}"
2918
ProjectSection(SolutionItems) = preProject
3019
.github\workflows\build-container.yml = .github\workflows\build-container.yml
3120
EndProjectSection
3221
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "scripts", "src\scripts\scripts.csproj", "{1AE54C98-13A3-408B-B428-1FD975C02AF2}"
23+
EndProject
3324
Global
3425
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3526
Debug|Any CPU = Debug|Any CPU
@@ -44,12 +35,15 @@ Global
4435
{B785B397-23AB-4782-807B-C5D5001C1ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
4536
{B785B397-23AB-4782-807B-C5D5001C1ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
4637
{B785B397-23AB-4782-807B-C5D5001C1ECC}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{1AE54C98-13A3-408B-B428-1FD975C02AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{1AE54C98-13A3-408B-B428-1FD975C02AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{1AE54C98-13A3-408B-B428-1FD975C02AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{1AE54C98-13A3-408B-B428-1FD975C02AF2}.Release|Any CPU.Build.0 = Release|Any CPU
4742
EndGlobalSection
4843
GlobalSection(SolutionProperties) = preSolution
4944
HideSolutionNode = FALSE
5045
EndGlobalSection
5146
GlobalSection(NestedProjects) = preSolution
52-
{04AEF080-BF5C-4CD7-BB7E-3D509A0FD3F6} = {6C78A2EB-D01E-4634-BBA7-85F12BF86232}
5347
{29CC0F58-0B4E-4F4F-A084-7C461F7A4E60} = {6C78A2EB-D01E-4634-BBA7-85F12BF86232}
5448
EndGlobalSection
5549
GlobalSection(ExtensibilityGlobals) = postSolution

‎src/BE/Chats.BE.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
12-
<PackageReference Include="AWSSDK.S3" Version="3.7.410.1" />
12+
<PackageReference Include="AWSSDK.S3" Version="3.7.410.3" />
1313
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1414
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" /> <!-- fix security issue from Azure.AI.OpenAI -->
1515
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
@@ -26,12 +26,12 @@
2626
<PackageReference Include="OpenAI" Version="2.1.0" />
2727
<PackageReference Include="Sdcb.DashScope" Version="2.0.0" />
2828
<PackageReference Include="Sdcb.WenXinQianFan" Version="1.2.0" />
29-
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
29+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
3030
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
3131
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3232
<PackageReference Include="System.Runtime.Caching" Version="9.0.0" />
33-
<PackageReference Include="TencentCloudSDK.Hunyuan" Version="3.0.1137" />
34-
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1137" />
33+
<PackageReference Include="TencentCloudSDK.Hunyuan" Version="3.0.1139" />
34+
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1139" />
3535
</ItemGroup>
3636

3737
</Project>

‎src/BE/Controllers/Chats/Chats/ChatController.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Chats.BE.Services;
77
using Chats.BE.Services.ChatServices;
88
using Chats.BE.Services.ChatServices.Dtos;
9+
using Chats.BE.Services.ChatServices.Extensions;
910
using Chats.BE.Services.FileServices;
1011
using Chats.BE.Services.UrlEncryption;
1112
using Microsoft.AspNetCore.Authorization;
@@ -155,12 +156,8 @@ ..await GetMessageTree(existingMessages, messageId).ToAsyncEnumerable().SelectAw
155156
throw new InvalidModelException(request.ModelId.ToString());
156157
}
157158

159+
ChatCompletionOptions cco = request.UserModelConfig.ToChatCompletionOptions(currentUser.Id);
158160
using ChatService s = conversationFactory.CreateConversationService(userModel.Model);
159-
ChatCompletionOptions cco = new()
160-
{
161-
Temperature = request.UserModelConfig.Temperature,
162-
EndUserId = currentUser.Id.ToString(),
163-
};
164161
await foreach (InternalChatSegment seg in icc.Run(userBalance.Balance, userModel, s.ChatStreamedFEProcessed(messageToSend, cco, cancellationToken)))
165162
{
166163
if (seg.TextSegment == string.Empty) continue;

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Chats.BE.DB;
22
using Chats.BE.DB.Enums;
33
using Chats.BE.DB.Jsons;
4-
using Chats.BE.Services.ChatServices;
54
using Chats.BE.Services.UrlEncryption;
65
using System.Text.Json.Serialization;
76

@@ -21,9 +20,6 @@ public record ChatsResponse
2120
[JsonPropertyName("modelName")]
2221
public required string ModelName { get; init; }
2322

24-
[JsonPropertyName("modelConfig")]
25-
public required JsonModelConfig ModelConfig { get; init; }
26-
2723
[JsonPropertyName("userModelConfig")]
2824
public required JsonUserModelConfig UserModelConfig { get; init; }
2925

@@ -41,16 +37,11 @@ public static ChatsResponse FromDB(Chat chat, IUrlEncryptionService idEncryption
4137
Title = chat.Title,
4238
ModelId = chat.ModelId,
4339
ModelName = chat.Model.Name,
44-
ModelConfig = new JsonModelConfig
45-
{
46-
DeploymentName = chat.Model.DeploymentName,
47-
EnableSearch = chat.Model.ModelReference.AllowSearch,
48-
MaxLength = chat.Model.ModelReference.MaxResponseTokens,
49-
Temperature = ChatService.DefaultTemperature,
50-
Version = chat.Model.ModelKey.ModelProvider.Name,
51-
Prompt = ChatService.DefaultPrompt,
40+
UserModelConfig = new JsonUserModelConfig
41+
{
42+
EnableSearch = chat.EnableSearch,
43+
Temperature = chat.Temperature,
5244
},
53-
UserModelConfig = new JsonUserModelConfig { EnableSearch = chat.EnableSearch, Temperature = chat.Temperature },
5445
IsShared = chat.IsShared,
5546
ModelProviderId = (DBModelProvider)chat.Model.ModelKey.ModelProviderId,
5647
};
@@ -85,11 +76,6 @@ public ChatsResponse ToResponse(IUrlEncryptionService idEncryption)
8576
Title = Title,
8677
ModelId = ChatModelId,
8778
ModelName = ModelName,
88-
ModelConfig = new JsonModelConfig
89-
{
90-
Prompt = ChatService.DefaultPrompt,
91-
Temperature = Temperature ?? ChatService.DefaultTemperature,
92-
},
9379
UserModelConfig = UserModelConfig,
9480
IsShared = IsShared,
9581
ModelProviderId = ModelProvider,

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ public async Task<ActionResult<PagedResult<ChatsResponse>>> GetChats([FromQuery]
7676
{
7777
EnableSearch = x.EnableSearch,
7878
Temperature = x.Temperature,
79+
Prompt = x.Messages
80+
.FirstOrDefault(x => x.ChatRoleId == (byte)DBChatRole.System)
81+
!.MessageContents
82+
.FirstOrDefault()
83+
!.MessageContentText
84+
!.Content
7985
},
8086
}),
8187
request,

‎src/BE/Controllers/Public/ModelInfo/DTOs/LegacyModelProviderDto.cs‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎src/BE/Controllers/Public/ModelInfo/DTOs/LegacyModelReferenceDto.cs‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/BE/DB/Enums/DBModelProvider.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ public enum DBModelProvider
1313
Sparkdesk = 8,
1414
ZhiPuAI = 9,
1515
DeepSeek = 10,
16+
xAI = 11,
17+
GithubModels = 12,
1618
}

0 commit comments

Comments
 (0)