Merge pull request #17 from devgopher/release/0.8

Release/0.8

Author: devgopher

.idea/.idea.Botticelli/.idea/vcs.xml

@@ -54,7 +54,7 @@ protected override async Task ProcessGptResponse(AiMessage message,
                 text.AppendJoin(' ',
                                 part?.Choices?
                                         .Select(c => (c.Message ?? c.Delta)?.Content) ??
-                                Array.Empty<string>());
+                                []);
 
                 var responseMessage = new SendMessageResponse(message.Uid)
                 {
@@ -99,14 +99,14 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
         var content = JsonContent.Create(new ChatGptInputMessage
         {
             Model = Settings.Value.Model,
-            Messages = new List<ChatGptMessage>
-            {
+            Messages =
+            [
                 new()
                 {
                     Role = "user",
                     Content = message.Body
                 }
-            },
+            ],
             Temperature = Settings.Value.Temperature,
             Stream = Settings.Value.StreamGeneration
         });

Botticelli.AI.ChatGpt/Provider/ChatGptProvider.cs

@@ -33,7 +33,8 @@ public static IServiceCollection AddDeepSeekProvider(this IServiceCollection ser
             s.Instruction = deepSeekGptSettings.Instruction;
         });
 
-        services.AddSingleton<IAiProvider, DeepSeekGptProvider>();
+        services.AddSingleton<IAiProvider, DeepSeekGptProvider>()
+                .AddHttpClient();
 
         return services;
     }

Botticelli.AI.DeepSeekGpt/Extensions/ServiceCollectionExtensions.cs

@@ -67,19 +67,20 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
         {
             Model = Settings.Value.Model,
             MaxTokens = Settings.Value.MaxTokens,
-            Messages = new List<DeepSeekInnerInputMessage>
-            {
+            Messages =
+            [
                 new()
                 {
                     Role = SystemRole,
                     Content = Settings.Value.Instruction
                 },
+
                 new()
                 {
                     Role = UserRole,
                     Content = message.Body
                 }
-            }
+            ]
         };
 
         deepSeekGptMessage.Messages.AddRange(message.AdditionalMessages?.Select(m => new DeepSeekInnerInputMessage
@@ -91,7 +92,7 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
 
         var content = JsonContent.Create(deepSeekGptMessage);
 
-        Logger.LogDebug($"{nameof(SendAsync)}({message.ChatIds}) content: {content.Value}");
+        Logger.LogDebug("{SendAsyncName}({MessageChatIds}) content: {ContentValue}", nameof(SendAsync), message.ChatIds, content.Value);
 
         return await client.PostAsync(Completion,
                                       content,

Botticelli.AI.DeepSeekGpt/Provider/DeepSeekGptProvider.cs

@@ -71,7 +71,7 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
             Temperature = Settings.Value.Temperature
         });
 
-        Logger.LogDebug($"{nameof(SendAsync)}({message.ChatIds}) content: {content.Value}");
+        Logger.LogDebug("{SendAsyncName}({MessageChatIds}) content: {ContentValue}", nameof(SendAsync), message.ChatIds, content.Value);
 
         return await client.PostAsync(Url.Combine($"{Settings.Value.Url}", "generate"),
                                       content,

Botticelli.AI.GptJ/Provider/GptJProvider.cs

@@ -12,7 +12,7 @@
 using FluentAssertions;
 using FluentValidation;
 using NUnit.Framework;
-using Shared;
+using Mocks;
 using WireMock.Server;
 
 namespace Botticelli.AI.Test.AIProvider;

Botticelli.AI.Test/AIProvider/BaseAiProviderTest.cs

@@ -5,7 +5,7 @@
 using Botticelli.AI.ChatGpt.Provider;
 using Botticelli.AI.ChatGpt.Settings;
 using NUnit.Framework;
-using Shared;
+using Mocks;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Usage = Botticelli.AI.ChatGpt.Message.ChatGpt.Usage;

Botticelli.AI.Test/AIProvider/ChatGptProviderTest.cs

@@ -5,7 +5,7 @@
 using Botticelli.AI.DeepSeekGpt.Provider;
 using Botticelli.AI.DeepSeekGpt.Settings;
 using NUnit.Framework;
-using Shared;
+using Mocks;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Usage = Botticelli.AI.DeepSeekGpt.Message.DeepSeek.Usage;

Botticelli.AI.Test/AIProvider/DeepSeekGptProviderTest.cs

@@ -4,7 +4,7 @@
 using Botticelli.AI.YaGpt.Provider;
 using Botticelli.AI.YaGpt.Settings;
 using NUnit.Framework;
-using Shared;
+using Mocks;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 

Botticelli.AI.Test/AIProvider/YaGptProviderTest.cs

@@ -24,7 +24,7 @@
 		<ProjectReference Include="..\Botticelli.AI.DeepSeekGpt\Botticelli.AI.DeepSeekGpt.csproj"/>
 		<ProjectReference Include="..\Botticelli.AI.YaGpt\Botticelli.AI.YaGpt.csproj"/>
 		<ProjectReference Include="..\Botticelli.AI\Botticelli.AI.csproj"/>
-		<ProjectReference Include="..\Tests\Shared\Shared.csproj"/>
+		<ProjectReference Include="..\Tests\Mocks\Mocks.csproj" />
 	</ItemGroup>
 
 </Project>