Skip to content

Commit e704a20

Browse files
committed
Merge branch 'release/0.7' into develop
2 parents 834d790 + 5ca3895 commit e704a20

File tree

585 files changed

+13644
-5767
lines changed

Some content is hidden

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

585 files changed

+13644
-5767
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,12 @@ _pkginfo.txt
229229
*.appxbundle
230230
*.appxupload
231231

232+
*.db
233+
*.db-dhm
234+
*.db-wal
235+
236+
*.patch
237+
232238
# Visual Studio cache files
233239
# files ending in .cache can be ignored
234240
*.[Cc]ache

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "3dParty/FileSignatures"]
22
path = 3dParty/FileSignatures
33
url = https://github.com/devgopher/FileSignatures
4+
[submodule "3dParty/currency"]
5+
path = 3dParty/currency
6+
url = https://github.com/ourworldincode/currency.git

.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/currency

Submodule currency added at a083d35
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/Extensions/ServiceCollectionExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Botticelli.AI.ChatGpt.Provider;
33
using Botticelli.AI.ChatGpt.Settings;
44
using Botticelli.AI.Exceptions;
5-
using Botticelli.AI.Settings;
65
using Microsoft.Extensions.Configuration;
76
using Microsoft.Extensions.DependencyInjection;
87

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
}

0 commit comments

Comments
 (0)