devgopher · devgopher · Oct 6, 2025 · Apr 11, 2025 · Apr 11, 2025 · Apr 11, 2025
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -0,0 +1,51 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["develop"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.idea/.idea.Botticelli/.idea/vcs.xml b/.idea/.idea.Botticelli/.idea/vcs.xml
diff --git a/Botticelli.AI.ChatGpt/Provider/ChatGptProvider.cs b/Botticelli.AI.ChatGpt/Provider/ChatGptProvider.cs
@@ -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
         });

diff --git a/Botticelli.AI.DeepSeekGpt/Extensions/ServiceCollectionExtensions.cs b/Botticelli.AI.DeepSeekGpt/Extensions/ServiceCollectionExtensions.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;
     }

diff --git a/Botticelli.AI.DeepSeekGpt/Provider/DeepSeekGptProvider.cs b/Botticelli.AI.DeepSeekGpt/Provider/DeepSeekGptProvider.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,

diff --git a/Botticelli.AI.GptJ/Provider/GptJProvider.cs b/Botticelli.AI.GptJ/Provider/GptJProvider.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,

diff --git a/Botticelli.AI.Test/AIProvider/BaseAiProviderTest.cs b/Botticelli.AI.Test/AIProvider/BaseAiProviderTest.cs
@@ -12,7 +12,7 @@
 using FluentAssertions;
 using FluentValidation;
 using NUnit.Framework;
-using Shared;
+using Mocks;
 using WireMock.Server;
 
 namespace Botticelli.AI.Test.AIProvider;

diff --git a/Botticelli.AI.Test/AIProvider/ChatGptProviderTest.cs b/Botticelli.AI.Test/AIProvider/ChatGptProviderTest.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;

diff --git a/Botticelli.AI.Test/AIProvider/DeepSeekGptProviderTest.cs b/Botticelli.AI.Test/AIProvider/DeepSeekGptProviderTest.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;

diff --git a/Botticelli.AI.Test/AIProvider/YaGptProviderTest.cs b/Botticelli.AI.Test/AIProvider/YaGptProviderTest.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;
 

diff --git a/Botticelli.AI.Test/Botticelli.AI.Test.csproj b/Botticelli.AI.Test/Botticelli.AI.Test.csproj
@@ -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>
diff --git a/Botticelli.AI.YaGpt/Provider/YaGptProvider.cs b/Botticelli.AI.YaGpt/Provider/YaGptProvider.cs
@@ -89,19 +89,20 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
         var yaGptMessage = new YaGptInputMessage
         {
             ModelUri = Settings.Value.Model,
-            Messages = new List<YaGptMessage>
-            {
+            Messages =
+            [
                 new()
                 {
                     Role = SystemRole,
                     Text = Settings.Value.Instruction
                 },
+
                 new()
                 {
                     Role = UserRole,
                     Text = message.Body
                 }
-            },
+            ],
             CompletionOptions = new CompletionOptions
             {
                 MaxTokens = Settings.Value.MaxTokens,
@@ -119,7 +120,7 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
 
         var content = JsonContent.Create(yaGptMessage);
 
-        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}", Completion),
                                       content,

diff --git a/Botticelli.AI/AIProvider/ChatGptProvider.cs b/Botticelli.AI/AIProvider/ChatGptProvider.cs
@@ -37,7 +37,7 @@ public virtual async Task SendAsync(AiMessage message, CancellationToken token)
 
         try
         {
-            Logger.LogDebug($"{nameof(SendAsync)}({message.ChatIds}) started");
+            Logger.LogDebug("{SendAsyncName}({MessageChatIds}) started", nameof(SendAsync), message.ChatIds);
 
             using var client = GetClient();
 
@@ -53,7 +53,7 @@ public virtual async Task SendAsync(AiMessage message, CancellationToken token)
                 await SendErrorGptResponse(message, reason, token);
             }
 
-            Logger.LogDebug($"{nameof(SendAsync)}({message.ChatIds}) finished");
+            Logger.LogDebug("{SendAsyncName}({MessageChatIds}) finished", nameof(SendAsync), message.ChatIds);
         }
         catch (Exception ex)
         {

diff --git a/Botticelli.AI/Botticelli.AI.csproj b/Botticelli.AI/Botticelli.AI.csproj
@@ -4,7 +4,7 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>0.7.0</Version>
+		<Version>0.8.0</Version>
 		<Company>Botticelli</Company>
 		<Copyright>Igor Evdokimov</Copyright>
 		<PackageProjectUrl>https://github.com/devgopher/botticelli</PackageProjectUrl>

diff --git a/Botticelli.Analytics.Shared/Botticelli.Analytics.Shared.csproj b/Botticelli.Analytics.Shared/Botticelli.Analytics.Shared.csproj
@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>0.7.0</Version>
+		<Version>0.8.0</Version>
 		<PackageProjectUrl>https://botticellibots.com</PackageProjectUrl>
 		<PackageIcon>new_logo_compact.png</PackageIcon>
 		<RepositoryUrl>https://github.com/devgopher/botticelli</RepositoryUrl>
@@ -14,11 +14,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="..\new_logo_compact.png">
-			<Pack>True</Pack>
-			<PackagePath></PackagePath>
-			<Link>new_logo_compact.png</Link>
-		</None>
+		<None Include="..\new_logo_compact.png" Pack="true" PackagePath=""/>
 	</ItemGroup>
 
 </Project>
diff --git a/Botticelli.Audio/Botticelli.Audio.csproj b/Botticelli.Audio/Botticelli.Audio.csproj
@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>0.7.0</Version>
+		<Version>0.8.0</Version>
 		<Title>Botticelli.Audio</Title>
 		<Authors>BotticelliBots</Authors>
 		<PackageIcon>new_logo_compact.png</PackageIcon>

diff --git a/Botticelli.Audio/UniversalLowQualityConvertor.cs b/Botticelli.Audio/UniversalLowQualityConvertor.cs
@@ -35,7 +35,7 @@ public byte[] Convert(Stream input, AudioInfo tgtParams)
         }
         catch (Exception ex)
         {
-            _logger.LogError($"{nameof(Convert)} => ({tgtParams.AudioFormat}, {tgtParams.Bitrate}) error", ex);
+            _logger.LogError("{ConvertName} => ({TgtParamsAudioFormat}, {TgtParamsBitrate}) error: {Ex}!", nameof(Convert), tgtParams.AudioFormat, tgtParams.Bitrate, ex);
 
             throw new AudioConvertorException($"Audio conversion error: {ex.Message}", ex);
         }
@@ -94,9 +94,9 @@ private byte[] ProcessByStreamEncoder(Stream input, AudioInfo tgtParams)
         }
         catch (IOException ex)
         {
-            _logger.LogError($"{nameof(Convert)} => ({tgtParams.AudioFormat}, {tgtParams.Bitrate}) error", ex);
+            _logger.LogError("{ConvertName} => ({TgtParamsAudioFormat}, {TgtParamsBitrate}) error", nameof(Convert), tgtParams.AudioFormat, tgtParams.Bitrate, ex);
 
-            return Array.Empty<byte>();
+            return [];
         }
     }
 

diff --git a/Botticelli.Auth.Data.Postgres/Botticelli.Auth.Data.Postgres.csproj b/Botticelli.Auth.Data.Postgres/Botticelli.Auth.Data.Postgres.csproj
@@ -7,10 +7,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.16"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10"/>
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Botticelli.Auth.Data.Postgres/Migrations/20250219145627_auth.Designer.cs b/Botticelli.Auth.Data.Postgres/Migrations/20250219145627_auth.Designer.cs
diff --git a/Botticelli.Auth.Data.Postgres/Migrations/AuthDefaultDbContextModelSnapshot.cs b/Botticelli.Auth.Data.Postgres/Migrations/AuthDefaultDbContextModelSnapshot.cs
@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasDefaultSchema("Botticelli.Auth.Sample.Telegram")
-                .HasAnnotation("ProductVersion", "8.0.13")
+                .HasAnnotation("ProductVersion", "8.0.16")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);

diff --git a/Botticelli.Auth.Data.Sqlite/Botticelli.Auth.Data.Sqlite.csproj b/Botticelli.Auth.Data.Sqlite/Botticelli.Auth.Data.Sqlite.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.13"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.16"/>
 		<PackageReference Include="SQLitePCLRaw.core" Version="2.1.11"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>

diff --git a/Botticelli.Auth.Data.Sqlite/Migrations/20250308203827_auth.Designer.cs b/Botticelli.Auth.Data.Sqlite/Migrations/20250308203827_auth.Designer.cs
diff --git a/Botticelli.Auth.Data.Sqlite/Migrations/AuthDefaultDbContextModelSnapshot.cs b/Botticelli.Auth.Data.Sqlite/Migrations/AuthDefaultDbContextModelSnapshot.cs
@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasDefaultSchema("Botticelli.Auth.Sample.Telegram")
-                .HasAnnotation("ProductVersion", "8.0.13");
+                .HasAnnotation("ProductVersion", "8.0.16");
 
             modelBuilder.Entity("Botticelli.Auth.Data.Models.AccessHistory<Botticelli.Auth.Data.Models.BotUser>", b =>
                 {

diff --git a/Botticelli.Auth.Data/Botticelli.Auth.Data.csproj b/Botticelli.Auth.Data/Botticelli.Auth.Data.csproj
@@ -8,11 +8,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.16">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.16"/>
 	</ItemGroup>
 
 </Project>
diff --git a/Botticelli.Auth/Botticelli.Auth.csproj b/Botticelli.Auth/Botticelli.Auth.csproj
@@ -9,8 +9,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Mapster" Version="7.4.0"/>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10"/>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.16"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.16"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
 	</ItemGroup>
 

diff --git a/Botticelli.Bot.Dal/BotInfoContext.cs b/Botticelli.Bot.Dal/BotInfoContext.cs
@@ -6,12 +6,7 @@ namespace Botticelli.Bot.Data;
 
 public class BotInfoContext : DbContext
 {
-    // public BotInfoContext() : base((new DbContextOptionsBuilder<BotInfoContext>().UseSqlite("Data Source=database.db")).Options)
-    // {
-    //
-    // }
-
-    public BotInfoContext(DbContextOptions options) : base(options)
+    public BotInfoContext(DbContextOptions<BotInfoContext> options) : base(options)
     {
     }