LM-Kit · lcarrere · Nov 23, 2024 · Nov 23, 2024
diff --git a/LM-Kit-Maestro/App.xaml b/LM-Kit-Maestro/App.xaml
@@ -1,12 +1,12 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:LMKitMaestro"
+             xmlns:local="clr-namespace:LMKit.Maestro"
              xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-             x:Class="LMKitMaestro.App">
+             x:Class="LMKit.Maestro.App">
     <Application.Resources>
         <ResourceDictionary>
-            <!--<StyleSheet Source="Resources/CSS/LmKitMaestro.css"/>
+            <!--<StyleSheet Source="Resources/CSS/LMKitMaestro.css"/>
             <StyleSheet Source="Resources/CSS/font-awesome.css"/>-->
             <mct:VariableMultiValueConverter x:Key="AllTrueConverter" ConditionType="All"/>
             <mct:VariableMultiValueConverter x:Key="AllFalseConverter" ConditionType="None"/>

diff --git a/LM-Kit-Maestro/App.xaml.cs b/LM-Kit-Maestro/App.xaml.cs
@@ -1,7 +1,7 @@
-using LMKitMaestro.ViewModels;
+using LMKit.Maestro.ViewModels;
 using Microsoft.AspNetCore.Components.WebView.Maui;
 
-namespace LMKitMaestro
+namespace LMKit.Maestro
 {
     public partial class App : Application
     {
@@ -32,7 +32,7 @@
            });

            _appShellViewModel = appShellViewModel;
            MainPage = new AppShell(appShellViewModel);
        }

        protected override async void OnStart()

diff --git a/LM-Kit-Maestro/AppConstants.cs b/LM-Kit-Maestro/AppConstants.cs
@@ -1,8 +1,8 @@
-namespace LMKitMaestro;
+namespace LMKit.Maestro;
 
 internal static class AppConstants
 {
-    public const string DatabaseFilename = "LMKitMaestroSQLite.db3";
+    public const string DatabaseFilename = "MaestroSQLite.db3";
 
     public const SQLite.SQLiteOpenFlags Flags =
         // open the database in read/write mode

diff --git a/LM-Kit-Maestro/AppShell.xaml b/LM-Kit-Maestro/AppShell.xaml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <shell:SimpleShell
-    x:Class="LMKitMaestro.AppShell"
+    x:Class="LMKit.Maestro.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ui="clr-namespace:LMKitMaestro.UI"
-    xmlns:vm="clr-namespace:LMKitMaestro.ViewModels"
-    xmlns:local="clr-namespace:LMKitMaestro"
+    xmlns:ui="clr-namespace:LMKit.Maestro.UI"
+    xmlns:vm="clr-namespace:LMKit.Maestro.ViewModels"
+    xmlns:local="clr-namespace:LMKit.Maestro"
     xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:shell="clr-namespace:SimpleToolkit.SimpleShell;assembly=SimpleToolkit.SimpleShell"
-    xmlns:converters="clr-namespace:LMKitMaestro.Converters"
+    xmlns:converters="clr-namespace:LMKit.Maestro.Converters"
     Shell.FlyoutBehavior="Disabled"
     Shell.NavBarIsVisible="False"
-    Title="LM-Kit Maestro"
+    Title="Maestro"
     x:DataType="vm:AppShellViewModel"
     x:Name="thisShell"
     >
@@ -64,7 +64,7 @@
                         BindableLayout.ItemsSource="{Binding Tabs}"
                         Spacing="12">
                         <BindableLayout.ItemTemplate>
-                            <DataTemplate x:DataType="vm:LMKitMaestroTabViewModel">
+                            <DataTemplate x:DataType="vm:MaestroTabViewModel">
                                 <ui:LinkView
                                     Command="{Binding Source={RelativeSource AncestorType={x:Type vm:AppShellViewModel}}, Path=NavigateCommand}"
                                     CommandParameter="{Binding}"

diff --git a/LM-Kit-Maestro/AppShell.xaml.cs b/LM-Kit-Maestro/AppShell.xaml.cs
@@ -1,7 +1,7 @@
 using SimpleToolkit.SimpleShell;
-using LMKitMaestro.ViewModels;
+using LMKit.Maestro.ViewModels;
 
-namespace LMKitMaestro
+namespace LMKit.Maestro
 {
     public partial class AppShell : SimpleShell
     {

diff --git a/LM-Kit-Maestro/Controls/ChatBoxEditor.cs b/LM-Kit-Maestro/Controls/ChatBoxEditor.cs
@@ -9,7 +9,7 @@
 using Microsoft.Maui.Controls.Compatibility.Platform.Android;
 #endif
 
-namespace LMKitMaestro.Controls
+namespace LMKit.Maestro.Controls
 {
     internal class ChatBoxEditor : Editor
     {

diff --git a/LM-Kit-Maestro/Controls/CustomCollectionView.xaml b/LM-Kit-Maestro/Controls/CustomCollectionView.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ScrollView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="LMKitMaestro.Controls.CustomCollectionView"
+             x:Class="LMKit.Maestro.Controls.CustomCollectionView"
              x:Name="customCollectionView">
 
     <VerticalStackLayout 

diff --git a/LM-Kit-Maestro/Controls/CustomCollectionView.xaml.cs b/LM-Kit-Maestro/Controls/CustomCollectionView.xaml.cs
@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace LMKitMaestro.Controls;
+namespace LMKit.Maestro.Controls;
 
 public partial class CustomCollectionView : ScrollView
 {

diff --git a/LM-Kit-Maestro/Controls/CustomEditor.cs b/LM-Kit-Maestro/Controls/CustomEditor.cs
@@ -1,4 +1,4 @@
-namespace LMKitMaestro.Controls;
+namespace LMKit.Maestro.Controls;
 
 class CustomEditor : Editor
 {

diff --git a/LM-Kit-Maestro/Controls/CustomEntry.cs b/LM-Kit-Maestro/Controls/CustomEntry.cs
@@ -3,7 +3,7 @@
 using Windows.System;
 #endif
 
-namespace LMKitMaestro.Controls;
+namespace LMKit.Maestro.Controls;
 
 class CustomEntry : Entry
 {

diff --git a/LM-Kit-Maestro/Controls/StatefulContentView.cs b/LM-Kit-Maestro/Controls/StatefulContentView.cs
@@ -1,13 +1,13 @@
 using System.Windows.Input;
 
-namespace LMKitMaestro.Controls
+namespace LMKit.Maestro.Controls
 {
     public class StatefulContentView : ContentView
     {
        public event EventHandler<EventArgs> Pressed;
        public event EventHandler<EventArgs> LongPressed;
        public event EventHandler<EventArgs> Hovered;
        public event EventHandler<EventArgs> HoverExited;
        public event EventHandler<EventArgs> Tapped;

        internal void InvokePressed() => Pressed?.Invoke(this, EventArgs.Empty);

diff --git a/LM-Kit-Maestro/Converters/EqualToZeroConverter.cs b/LM-Kit-Maestro/Converters/EqualToZeroConverter.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace LMKitMaestro.Converters;
+namespace LMKit.Maestro.Converters;
 
 internal sealed class EqualToZeroConverter : IValueConverter
 {

diff --git a/LM-Kit-Maestro/Converters/FileNameConverter.cs b/LM-Kit-Maestro/Converters/FileNameConverter.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace LMKitMaestro.Converters;
+namespace LMKit.Maestro.Converters;
 
 internal sealed class FileNameConverter : IValueConverter
 {

diff --git a/LM-Kit-Maestro/Converters/FileSizeConverter.cs b/LM-Kit-Maestro/Converters/FileSizeConverter.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace LMKitMaestro.Converters;
+namespace LMKit.Maestro.Converters;
 
 internal sealed class FileSizeConverter : IValueConverter
 {

diff --git a/LM-Kit-Maestro/Converters/GreaterThanZeroConverter.cs b/LM-Kit-Maestro/Converters/GreaterThanZeroConverter.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace LMKitMaestro.Converters;
+namespace LMKit.Maestro.Converters;
 
 internal sealed class GreaterThanZeroConverter : IValueConverter
 {

diff --git a/LM-Kit-Maestro/Data/ChatPlaygroundDatabase.cs b/LM-Kit-Maestro/Data/ChatPlaygroundDatabase.cs
@@ -1,11 +1,11 @@
-using LMKitMaestro.Models;
+using LMKit.Maestro.Models;
 using SQLite;
 
-namespace LMKitMaestro.Data
+namespace LMKit.Maestro.Data
 {
-    public sealed class LMKitMaestroDatabase : ILMKitMaestroDatabase
+    public sealed class MaestroDatabase : IMaestroDatabase
     {
-        public static string DatabasePath => Path.Combine(FileSystem.AppDataDirectory, "LMKitMaestroSQLite.db3");
+        public static string DatabasePath => Path.Combine(FileSystem.AppDataDirectory, "MaestroSQLite.db3");
 
         private SQLiteAsyncConnection? _sqlDatabase;
 

diff --git a/LM-Kit-Maestro/Data/IChatPlaygroundDatabase.cs b/LM-Kit-Maestro/Data/IChatPlaygroundDatabase.cs
@@ -1,8 +1,8 @@
-using LMKitMaestro.Models;
+using LMKit.Maestro.Models;
 
-namespace LMKitMaestro.Data;
+namespace LMKit.Maestro.Data;
 
-public interface ILMKitMaestroDatabase
+public interface IMaestroDatabase
 {
     Task<List<ConversationLog>> GetConversations();
     Task<int> SaveConversation(ConversationLog conversationLog);

diff --git a/LM-Kit-Maestro/Handlers/CustomEditorHandler.cs b/LM-Kit-Maestro/Handlers/CustomEditorHandler.cs
@@ -13,7 +13,7 @@
 using Microsoft.UI.Xaml.Controls;
 #endif
 
-namespace LMKitMaestro.Handlers;
+namespace LMKit.Maestro.Handlers;
 
 public partial class CustomEditorHandler : EditorHandler
 {
@@ -21,7 +21,7 @@
    {
    }

    public CustomEditorHandler(IPropertyMapper mapper = null) : base(mapper)
    {
    }
 }

diff --git a/LM-Kit-Maestro/Handlers/CustomEntryHandler.cs b/LM-Kit-Maestro/Handlers/CustomEntryHandler.cs
@@ -13,7 +13,7 @@
 using Windows.UI.Notifications;
 #endif
 
-namespace LMKitMaestro.Handlers;
+namespace LMKit.Maestro.Handlers;
 
 public partial class CustomEntryHandler : EntryHandler
 {

diff --git a/LM-Kit-Maestro/Handlers/MauiHandlerCollectionExtensions.cs b/LM-Kit-Maestro/Handlers/MauiHandlerCollectionExtensions.cs
@@ -1,6 +1,6 @@
-using LMKitMaestro.Controls;
+using LMKit.Maestro.Controls;
 
-namespace LMKitMaestro.Handlers;
+namespace LMKit.Maestro.Handlers;
 
 public static class MauiHandlerCollectionExtensions
 {

diff --git a/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Android.cs b/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Android.cs
@@ -1,10 +1,10 @@
 #if ANDROID
 using Android.Views;
-using LMKitMaestro.Controls;
+using LMKit.Maestro.Controls;
 using Microsoft.Maui.Platform;
 using static Microsoft.Maui.Controls.VisualStateManager;
 
-namespace LMKitMaestro.Handlers;
+namespace LMKit.Maestro.Handlers;
 
 public partial class StatefulContentViewHandler
 {

diff --git a/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Apple.cs b/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Apple.cs
@@ -1,11 +1,11 @@
 #if IOS || MACCATALYST
 using Foundation;
-using LMKitMaestro.Controls;
+using LMKit.Maestro.Controls;
 using System.Diagnostics;
 using UIKit;
 using static Microsoft.Maui.Controls.VisualStateManager;
 
-namespace LMKitMaestro.Handlers;
+namespace LMKit.Maestro.Handlers;
 
 public partial class StatefulContentViewHandler
 {
@@ -18,7 +18,7 @@

    protected override void ConnectHandler(Microsoft.Maui.Platform.ContentView platformView)
    {
        platformView.AddGestureRecognizer(new UIContinousGestureRecognizer(Tapped));
        if (OperatingSystem.IsIOSVersionAtLeast(13))
        {
            platformView.AddGestureRecognizer(new UIHoverGestureRecognizer(OnHover));
@@ -83,11 +83,11 @@
    }

    // TODO: Move it to the different file
    internal class UIContinousGestureRecognizer : UIGestureRecognizer
    {
        private readonly Action<UIGestureRecognizer> action;

        public UIContinousGestureRecognizer(Action<UIGestureRecognizer> action)
        {
            this.action = action;
        }

diff --git a/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Windows.cs b/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Windows.cs
@@ -1,10 +1,10 @@
 #if WINDOWS
-using LMKitMaestro.Controls;
+using LMKit.Maestro.Controls;
 using Microsoft.Maui.Platform;
 using Microsoft.UI.Xaml.Input;
 using static Microsoft.Maui.Controls.VisualStateManager;
 
-namespace LMKitMaestro.Handlers;
+namespace LMKit.Maestro.Handlers;
 
 public partial class StatefulContentViewHandler
 {

diff --git a/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.cs b/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.cs
@@ -1,7 +1,7 @@
 using static Microsoft.Maui.Controls.VisualStateManager;
 using Microsoft.Maui.Handlers;
 using System.Windows.Input;
-using LMKitMaestro.Controls;
+using LMKit.Maestro.Controls;
 
 #if ANDROID
 using Android.Views;
@@ -14,7 +14,7 @@
 using UIKit;
 #endif
 
-namespace LMKitMaestro.Handlers;
+namespace LMKit.Maestro.Handlers;
 
 /// <summary>
 /// A handler for <see cref="StatefulContentView"/>.

diff --git a/LM-Kit-Maestro/Helpers/ChatPlaygroundHelpers.cs b/LM-Kit-Maestro/Helpers/ChatPlaygroundHelpers.cs
@@ -1,9 +1,9 @@
-using LMKitMaestro.Services;
-using LMKitMaestro.ViewModels;
+using LMKit.Maestro.Services;
+using LMKit.Maestro.ViewModels;
 
-namespace LMKitMaestro.Helpers
+namespace LMKit.Maestro.Helpers
 {
-    internal static class LMKitMaestroHelpers
+    internal static class MaestroHelpers
     {
         public static ModelInfoViewModel? TryGetExistingModelInfoViewModel(ICollection<ModelInfoViewModel> modelInfoViewModels, ModelInfo modelInfo)
         {

diff --git a/LM-Kit-Maestro/Helpers/FileHelpers.cs b/LM-Kit-Maestro/Helpers/FileHelpers.cs
@@ -1,7 +1,7 @@
-using LMKitMaestro.Services;
+using LMKit.Maestro.Services;
 using System.Web;
 
-namespace LMKitMaestro.Helpers;
+namespace LMKit.Maestro.Helpers;
 
 public static class FileHelpers
 {

diff --git a/LM-Kit-Maestro/LM-Kit-Maestro.csproj b/LM-Kit-Maestro/LM-Kit-Maestro.csproj
@@ -13,7 +13,7 @@
 		<!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
 
 		<OutputType Condition="'$(TargetFramework)' != 'net9.0'">Exe</OutputType>
-		<RootNamespace>LMKitMaestro</RootNamespace>
+		<RootNamespace>LMKit.Maestro</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -22,7 +22,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
 		<!-- Display name -->
-		<ApplicationTitle>LM-Kit Maestro</ApplicationTitle>
+		<ApplicationTitle>Maestro</ApplicationTitle>
 
 		<!-- App Identifier -->
 		<ApplicationId>com.companyname.lm-kit-maestro</ApplicationId>
@@ -66,8 +66,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LM-Kit.NET" Version="2024.11.4" />
-		<PackageReference Include="LM-Kit.NET.Backend.Cuda12.Windows" Version="2024.11.4" />
+		<PackageReference Include="LM-Kit.NET" Version="2024.11.5" />
+		<PackageReference Include="LM-Kit.NET.Backend.Cuda12.Windows" Version="2024.11.5" />
 		<PackageReference Include="Majorsoft.Blazor.Components.Common.JsInterop" Version="1.5.0" />
 		<PackageReference Include="Markdig" Version="0.38.0" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.10" />

diff --git a/LM-Kit-Maestro/MauiExceptions.cs b/LM-Kit-Maestro/MauiExceptions.cs
@@ -1,4 +1,4 @@
-namespace LMKitMaestro;
+namespace LMKit.Maestro;
 
 public static class MauiExceptions
 {

diff --git a/LM-Kit-Maestro/MauiProgram.cs b/LM-Kit-Maestro/MauiProgram.cs
@@ -1,18 +1,18 @@
 using CommunityToolkit.Maui;
 using Microsoft.Extensions.Logging;
-using LMKitMaestro.UI;
-using LMKitMaestro.ViewModels;
-using LMKitMaestro.Services;
-using LMKitMaestro.Data;
+using LMKit.Maestro.UI;
+using LMKit.Maestro.ViewModels;
+using LMKit.Maestro.Services;
+using LMKit.Maestro.Data;
 using SimpleToolkit.SimpleShell;
-using LMKitMaestro.Handlers;
+using LMKit.Maestro.Handlers;
 using MetroLog.MicrosoftExtensions;
 using MetroLog.Operators;
 using Majorsoft.Blazor.Components.Common.JsInterop;
 using Mopups.Hosting;
 using Mopups.Services;
 
-namespace LMKitMaestro
+namespace LMKit.Maestro
 {
     public static class MauiProgram
     {
@@ -90,7 +90,7 @@ private static void RegisterServices(this MauiAppBuilder builder)
             builder.Services.AddSingleton(MopupService.Instance);
 
             builder.Services.AddSingleton<AppSettingsService>();
-            builder.Services.AddSingleton<ILMKitMaestroDatabase, LMKitMaestroDatabase>();
+            builder.Services.AddSingleton<IMaestroDatabase, MaestroDatabase>();
             builder.Services.AddSingleton<ILLMFileManager, LLMFileManager>();
             builder.Services.AddSingleton<IAppSettingsService, AppSettingsService>();
             builder.Services.AddSingleton<IPopupService, Services.PopupService>();

diff --git a/LM-Kit-Maestro/Models/ConversationLog.cs b/LM-Kit-Maestro/Models/ConversationLog.cs
@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace LMKitMaestro.Models;
+namespace LMKit.Maestro.Models;
 
 public sealed class ConversationLog
 {

diff --git a/LM-Kit-Maestro/Models/Message.cs b/LM-Kit-Maestro/Models/Message.cs
@@ -1,5 +1,5 @@
 
-namespace LMKitMaestro.Models;
+namespace LMKit.Maestro.Models;
 
 public sealed class Message
 {

diff --git a/LM-Kit-Maestro/Platforms/Android/MainActivity.cs b/LM-Kit-Maestro/Platforms/Android/MainActivity.cs
@@ -2,7 +2,7 @@
 using Android.Content.PM;
 using Android.OS;
 
-namespace LMKitMaestro
+namespace LMKit.Maestro
 {
     [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
     public class MainActivity : MauiAppCompatActivity

diff --git a/LM-Kit-Maestro/Platforms/Android/MainApplication.cs b/LM-Kit-Maestro/Platforms/Android/MainApplication.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Runtime;
 
-namespace LMKitMaestro
+namespace LMKit.Maestro
 {
     [Application]
     public class MainApplication : MauiApplication