cleanup

Author: srebrek

Examples/Examples/Utils/GeminiExampleSetup.cs

@@ -10,7 +10,7 @@ public static void Setup()
         MaINBootstrapper.Initialize(configureSettings: (options) =>
         {
             options.BackendType = BackendType.Gemini;
-            options.GeminiKey = "<Gemini API Key>";
+            options.GeminiKey = "<YOUR_GEMINI_KEY>";
         });
     }
 }

MaIN.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.1.11312.151 d18.0
+VisualStudioVersion = 18.1.11312.151
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaIN.Infrastructure", "src\MaIN.Infrastructure\MaIN.Infrastructure.csproj", "{84C09EF9-B9E3-4ACB-9BC3-DEFFC29D528F}"
 EndProject
@@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaIN.InferPage", "src\MaIN.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaIN.Core.IntegrationTests", "MaIN.Core.IntegrationTests\MaIN.Core.IntegrationTests.csproj", "{2C15062A-E9F6-47FC-A4CD-1190A49E3FE3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{EC6B1BDC-EA44-41C9-86AB-ED9CF1AC35B7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,10 +67,6 @@ Global
 		{2C15062A-E9F6-47FC-A4CD-1190A49E3FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C15062A-E9F6-47FC-A4CD-1190A49E3FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C15062A-E9F6-47FC-A4CD-1190A49E3FE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC6B1BDC-EA44-41C9-86AB-ED9CF1AC35B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC6B1BDC-EA44-41C9-86AB-ED9CF1AC35B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC6B1BDC-EA44-41C9-86AB-ED9CF1AC35B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC6B1BDC-EA44-41C9-86AB-ED9CF1AC35B7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -82,7 +76,6 @@ Global
 		{46E6416B-1736-478C-B697-B37BB8E6A23E} = {53D24B04-279D-4D18-8829-EA0F57AE69F3}
 		{75DEBB8A-75CD-44BA-9369-3916950428EF} = {28851935-517F-438D-BF7C-02FEB1A37A68}
 		{2C15062A-E9F6-47FC-A4CD-1190A49E3FE3} = {53D24B04-279D-4D18-8829-EA0F57AE69F3}
-		{EC6B1BDC-EA44-41C9-86AB-ED9CF1AC35B7} = {28851935-517F-438D-BF7C-02FEB1A37A68}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {82494AB7-60FC-49E3-B37C-B9785FB0DE7A}

Test/Program.cs

@@ -197,7 +197,7 @@ private async Task DownloadModelAsync(string url, string fileName, CancellationT
         }
     }
 
-    private async Task DownloadWithProgressAsync(HttpResponseMessage response, string filePath, string fileName, CancellationToken cancellationToken)
+    private static async Task DownloadWithProgressAsync(HttpResponseMessage response, string filePath, string fileName, CancellationToken cancellationToken)
     {
         var totalBytes = response.Content.Headers.ContentLength;
         var totalBytesRead = 0L;
@@ -215,10 +215,13 @@ private async Task DownloadWithProgressAsync(HttpResponseMessage response, strin
 
         while (true)
         {
-            var bytesRead = await contentStream.ReadAsync(buffer, 0, buffer.Length, cancellationToken);
-            if (bytesRead == 0) break;
+            var bytesRead = await contentStream.ReadAsync(buffer, cancellationToken);
+            if (bytesRead == 0)
+            {
+                break;
+            }
 
-            await fileStream.WriteAsync(buffer, 0, bytesRead, cancellationToken);
+            await fileStream.WriteAsync(buffer.AsMemory(0, bytesRead), cancellationToken);
             totalBytesRead += bytesRead;
 
             if (ShouldUpdateProgress(progressStopwatch))
@@ -317,7 +320,7 @@ private static void ShowProgress(long totalBytesRead, long? totalBytes, Stopwatc
                          $"Speed: {FormatBytes((long)speed)}/s ETA: {eta:hh\\:mm\\:ss}");
 
             var (leftAfter, topAfter) = Console.GetCursorPosition();
-            int lengthDifference = leftBefore - leftAfter + (topBefore - topAfter) * Console.WindowWidth;
+            int lengthDifference = leftBefore - leftAfter + ((topBefore - topAfter) * Console.WindowWidth);
             while (lengthDifference > 0)
             {
                 Console.Write(' ');
@@ -345,7 +348,10 @@ private static void ShowFinalProgress(long totalBytesRead, Stopwatch totalStopwa
 
     private static string FormatBytes(long bytes)
     {
-        if (bytes == 0) return "0 Bytes";
+        if (bytes == 0)
+        {
+            return "0 Bytes";
+        }
 
         const int scale = 1024;
         string[] orders = ["GB", "MB", "KB", "Bytes"];
@@ -354,14 +360,17 @@ private static string FormatBytes(long bytes)
         foreach (var order in orders)
         {
             if (bytes >= max)
+            {
                 return $"{decimal.Divide(bytes, max):##.##} {order}";
+            }
+
             max /= scale;
         }
 
         return "0 Bytes";
     }
 
-    private string ResolvePath(string? settingsModelsPath) =>
+    private static string ResolvePath(string? settingsModelsPath) =>
         settingsModelsPath
         ?? Environment.GetEnvironmentVariable("MaIN_ModelsPath")
         ?? throw new ModelsPathNotFoundException();

Test/Test.csproj

@@ -9,11 +9,12 @@ public class Chat
 {
     public string Id { get; init; } = string.Empty;
     public required string Name { get; init; }
-    public required string ModelId { get; set; } // TODO: make set private and settable by the ModelInstance setter
+    public required string ModelId { get; set; }
+    private AIModel? _modelInstance;
     public AIModel? ModelInstance
     {
-        get => _modelInstance ?? ModelRegistry.GetById(ModelId);
-        set => _modelInstance = value;
+        get => _modelInstance ??= ModelRegistry.GetById(ModelId);
+        set => (_modelInstance, ModelId) = (value, value?.Id ?? ModelId);
     }
     public List<Message> Messages { get; set; } = [];
     public ChatType Type { get; set; } = ChatType.Conversation;
@@ -29,6 +30,4 @@ public AIModel? ModelInstance
 
     public bool Interactive = false;
     public bool Translate = false;
-
-    private AIModel? _modelInstance;
 }

Test/appsettings.json

@@ -0,0 +1,10 @@
+using System.Net;
+
+namespace MaIN.Domain.Exceptions.Models;
+
+public class MissingModelInstanceException() 
+    : MaINCustomException("Model instance cannot be null.")
+{
+    public override string PublicErrorMessage => "Model instance cannot be null.";
+    public override HttpStatusCode HttpStatusCode => HttpStatusCode.BadRequest;
+}

src/MaIN.Core/Hub/Contexts/ModelContext.cs

@@ -2,7 +2,7 @@
 
 namespace MaIN.Services.Dtos;
 
-public class ChatDto // TODO: make it record and not nullable for Id, Name, Model as they are required
+public record ChatDto
 {
     [JsonPropertyName("id")] 
     public string? Id { get; set; }

src/MaIN.Domain/Entities/Chat.cs

@@ -36,7 +36,7 @@ public async Task<ChatResult> Completions(
         {
             chat.Visual = true; // TODO: add IImageGenModel interface and check for that instead
         }
-        chat.Backend ??= settings.BackendType; // can be romved as we set backend on chat creation
+        chat.Backend ??= settings.BackendType;
 
         chat.Messages.Where(x => x.Type == MessageType.NotSet).ToList()
             .ForEach(x => x.Type = chat.Backend != BackendType.Self ? MessageType.CloudLLM : MessageType.LocalLLM);