Skip to content

Commit c11fdac

Browse files
devgopherdevgopher
committed
- resharper
1 parent afbdd78 commit c11fdac

File tree

360 files changed

+5078
-4206
lines changed

Some content is hidden

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

360 files changed

+5078
-4206
lines changed

‎.idea/.idea.Botticelli/.idea/.gitignore

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.Botticelli/.idea/indexLayout.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3dParty/FileSignatures

Submodule FileSignatures updated 50 files

‎Botticelli.AI.ChatGpt/Botticelli.AI.ChatGpt.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<ProjectReference Include="..\Botticelli.AI\Botticelli.AI.csproj"/>
11-
</ItemGroup>
9+
<ItemGroup>
10+
<ProjectReference Include="..\Botticelli.AI\Botticelli.AI.csproj"/>
11+
</ItemGroup>
1212

13-
<ItemGroup>
14-
<Folder Include="Message\"/>
15-
</ItemGroup>
13+
<ItemGroup>
14+
<Folder Include="Message\"/>
15+
</ItemGroup>
1616

1717
</Project>

‎Botticelli.AI.ChatGpt/Message/ChatGpt/ChatGptInputMessage.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ namespace Botticelli.AI.ChatGpt.Message.ChatGpt;
44

55
public class ChatGptInputMessage
66
{
7-
[JsonPropertyName("model")] public string Model { get; set; }
7+
[JsonPropertyName("model")]
8+
public string Model { get; set; }
89

9-
[JsonPropertyName("messages")] public List<ChatGptMessage> Messages { get; set; }
10+
[JsonPropertyName("messages")]
11+
public List<ChatGptMessage> Messages { get; set; }
1012

11-
[JsonPropertyName("temperature")] public double Temperature { get; set; }
12-
[JsonPropertyName("stream")] public bool Stream { get; set; }
13+
[JsonPropertyName("temperature")]
14+
public double Temperature { get; set; }
15+
16+
[JsonPropertyName("stream")]
17+
public bool Stream { get; set; }
1318
}

‎Botticelli.AI.ChatGpt/Message/ChatGpt/ChatGptMessage.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ namespace Botticelli.AI.ChatGpt.Message.ChatGpt;
44

55
public class ChatGptMessage
66
{
7-
[JsonPropertyName("role")] public string Role { get; set; }
7+
[JsonPropertyName("role")]
8+
public string Role { get; set; }
89

9-
[JsonPropertyName("content")] public string Content { get; set; }
10+
[JsonPropertyName("content")]
11+
public string Content { get; set; }
1012
}

‎Botticelli.AI.ChatGpt/Message/ChatGpt/ChatGptOutputMessage.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,21 @@ namespace Botticelli.AI.ChatGpt.Message.ChatGpt;
66

77
public class ChatGptOutputMessage
88
{
9-
[JsonPropertyName("id")] public string Id { get; set; }
9+
[JsonPropertyName("id")]
10+
public string Id { get; set; }
1011

11-
[JsonPropertyName("object")] public string Object { get; set; }
12+
[JsonPropertyName("object")]
13+
public string Object { get; set; }
1214

13-
[JsonPropertyName("created")] public int Created { get; set; }
15+
[JsonPropertyName("created")]
16+
public int Created { get; set; }
1417

15-
[JsonPropertyName("model")] public string Model { get; set; }
18+
[JsonPropertyName("model")]
19+
public string Model { get; set; }
1620

17-
[JsonPropertyName("usage")] public Usage Usage { get; set; }
21+
[JsonPropertyName("usage")]
22+
public Usage Usage { get; set; }
1823

19-
[JsonPropertyName("choices")] public List<Choice> Choices { get; set; }
24+
[JsonPropertyName("choices")]
25+
public List<Choice> Choices { get; set; }
2026
}

‎Botticelli.AI.ChatGpt/Message/ChatGpt/Choice.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ namespace Botticelli.AI.ChatGpt.Message.ChatGpt;
44

55
public class Choice
66
{
7-
[JsonPropertyName("message")] public ChatGptMessage? Message { get; set; }
7+
[JsonPropertyName("message")]
8+
public ChatGptMessage? Message { get; set; }
89

9-
[JsonPropertyName("delta")] public ChatGptMessage? Delta { get; set; }
10-
[JsonPropertyName("finish_reason")] public string? FinishReason { get; set; }
10+
[JsonPropertyName("delta")]
11+
public ChatGptMessage? Delta { get; set; }
1112

12-
[JsonPropertyName("index")] public int Index { get; set; }
13+
[JsonPropertyName("finish_reason")]
14+
public string? FinishReason { get; set; }
15+
16+
[JsonPropertyName("index")]
17+
public int Index { get; set; }
1318
}

‎Botticelli.AI.ChatGpt/Message/ChatGpt/Usage.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ namespace Botticelli.AI.ChatGpt.Message.ChatGpt;
44

55
public class Usage
66
{
7-
[JsonPropertyName("prompt_tokens")] public int PromptTokens { get; set; }
7+
[JsonPropertyName("prompt_tokens")]
8+
public int PromptTokens { get; set; }
89

910
[JsonPropertyName("completion_tokens")]
1011
public int CompletionTokens { get; set; }
1112

12-
[JsonPropertyName("total_tokens")] public int TotalTokens { get; set; }
13+
[JsonPropertyName("total_tokens")]
14+
public int TotalTokens { get; set; }
1315
}

‎Botticelli.AI.ChatGpt/Provider/ChatGptProvider.cs

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,44 @@ namespace Botticelli.AI.ChatGpt.Provider;
1717
public class ChatGptProvider : ChatGptProvider<GptSettings>
1818
{
1919
public ChatGptProvider(IOptions<GptSettings> gptSettings,
20-
IHttpClientFactory? factory,
21-
ILogger<ChatGptProvider> logger,
22-
IBusClient? bus,
23-
IValidator<AiMessage>? messageValidator) : base(gptSettings,
24-
factory,
25-
logger,
26-
bus,
27-
messageValidator)
20+
IHttpClientFactory? factory,
21+
ILogger<ChatGptProvider> logger,
22+
IBusClient? bus,
23+
IValidator<AiMessage>? messageValidator) : base(gptSettings,
24+
factory,
25+
logger,
26+
bus,
27+
messageValidator)
2828
{
2929
}
3030

3131
public override string AiName => "chatgpt";
3232

33-
protected override async Task ProcessGptResponse(AiMessage message, CancellationToken token,
34-
HttpResponseMessage response)
33+
protected override async Task ProcessGptResponse(AiMessage message,
34+
CancellationToken token,
35+
HttpResponseMessage response)
3536
{
3637
var text = new StringBuilder();
3738

3839
var outStream = await response.Content.ReadAsStreamAsync(token);
3940
using var sr = new StreamReader(outStream);
4041

4142
using var reader = TextReader.Synchronized(sr);
42-
var partText = Settings.Value.StreamGeneration
43-
? await reader.ReadLineAsync(token)
44-
: await reader.ReadToEndAsync(token);
43+
var partText = Settings.Value.StreamGeneration ? await reader.ReadLineAsync(token) : await reader.ReadToEndAsync(token);
4544
var seqNumber = 0;
45+
4646
while (partText != null)
4747
{
4848
try
4949
{
50-
if (Settings.Value.StreamGeneration)
51-
partText = partText.Replace("data: ", string.Empty);
50+
if (Settings.Value.StreamGeneration) partText = partText.Replace("data: ", string.Empty);
5251

5352
var part = JsonConvert.DeserializeObject<ChatGptOutputMessage>(partText);
5453

5554
text.AppendJoin(' ',
56-
part?.Choices?
57-
.Select(c => (c.Message ?? c.Delta)?.Content) ?? Array.Empty<string>());
55+
part?.Choices?
56+
.Select(c => (c.Message ?? c.Delta)?.Content) ??
57+
Array.Empty<string>());
5858

5959
var responseMessage = new SendMessageResponse(message.Uid)
6060
{
@@ -73,11 +73,10 @@ protected override async Task ProcessGptResponse(AiMessage message, Cancellation
7373
};
7474

7575
await Bus.SendResponse(responseMessage,
76-
token);
76+
token);
7777

7878
if (Settings.Value.StreamGeneration)
79-
if (part?.Choices?.Any(
80-
c => c.FinishReason != null ? c.FinishReason.Contains("stop") : false) ==
79+
if (part?.Choices?.Any(c => c.FinishReason != null ? c.FinishReason.Contains("stop") : false) ==
8180
true)
8281
break;
8382
}
@@ -93,8 +92,9 @@ await Bus.SendResponse(responseMessage,
9392
}
9493
}
9594

96-
protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage message, CancellationToken token,
97-
HttpClient client)
95+
protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage message,
96+
CancellationToken token,
97+
HttpClient client)
9898
{
9999
var content = JsonContent.Create(new ChatGptInputMessage
100100
{
@@ -112,8 +112,9 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
112112
});
113113

114114
var response = await client.PostAsync(Url.Combine($"{Settings.Value.Url}", "completions"),
115-
content,
116-
token);
115+
content,
116+
token);
117+
117118
return response;
118119
}
119120
}

‎Botticelli.AI.DeepSeekGpt/Botticelli.AI.DeepSeekGpt.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<Folder Include="Message\"/>
11-
</ItemGroup>
9+
<ItemGroup>
10+
<Folder Include="Message\"/>
11+
</ItemGroup>
1212

13-
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2"/>
15-
</ItemGroup>
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2"/>
15+
</ItemGroup>
1616

17-
<ItemGroup>
18-
<ProjectReference Include="..\Botticelli.AI\Botticelli.AI.csproj"/>
19-
</ItemGroup>
17+
<ItemGroup>
18+
<ProjectReference Include="..\Botticelli.AI\Botticelli.AI.csproj"/>
19+
</ItemGroup>
2020

2121
</Project>

‎Botticelli.AI.DeepSeekGpt/Message/DeepSeek/DeepSeekInputMessage.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@ namespace Botticelli.AI.DeepSeekGpt.Message.DeepSeek;
44

55
public class DeepSeekInputMessage
66
{
7-
[JsonPropertyName("model")] public string Model { get; set; }
7+
[JsonPropertyName("model")]
8+
public string Model { get; set; }
89

9-
[JsonPropertyName("messages")] public List<DeepSeekInnerInputMessage> Messages { get; set; }
10+
[JsonPropertyName("messages")]
11+
public List<DeepSeekInnerInputMessage> Messages { get; set; }
1012

11-
[JsonPropertyName("temperature")] public double Temperature { get; set; }
13+
[JsonPropertyName("temperature")]
14+
public double Temperature { get; set; }
1215

13-
[JsonPropertyName("maxTokens")] public int MaxTokens { get; set; }
16+
[JsonPropertyName("maxTokens")]
17+
public int MaxTokens { get; set; }
1418
}
1519

1620
public class DeepSeekInnerInputMessage
1721
{
18-
[JsonPropertyName("role")] public string Role { get; set; }
22+
[JsonPropertyName("role")]
23+
public string Role { get; set; }
1924

20-
[JsonPropertyName("content")] public string Content { get; set; }
25+
[JsonPropertyName("content")]
26+
public string Content { get; set; }
2127
}

0 commit comments

Comments
 (0)