Merge branch 'evan/make-macos-version-great-for-the-first-time' of ht…

…tps://github.com/LM-Kit/LM-Kit-Maestro into evan/make-macos-version-great-for-the-first-time
LM-Kit · Nov 23, 2024 · a1ab810 · a1ab810
2 parents 90b4937 + 0e81707
commit a1ab810
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 190 deletions.
diff --git a/.github/_typos.toml b/.github/_typos.toml
@@ -8,6 +8,7 @@
 [files]
 extend-exclude = [
     "_typos.toml",
-    "LM-Kit-Maestro/wwwroot/*"
+    "LM-Kit-Maestro/wwwroot/*",
+	"LM-Kit-Maestro/Resources/*"
 ]
 
diff --git a/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Apple.cs b/LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Apple.cs
@@ -18,7 +18,7 @@ protected override Microsoft.Maui.Platform.ContentView CreatePlatformView()
 
     protected override void ConnectHandler(Microsoft.Maui.Platform.ContentView platformView)
     {
-        platformView.AddGestureRecognizer(new UIContinousGestureRecognizer(Tapped));
+        platformView.AddGestureRecognizer(new UIContinuousGestureRecognizer(Tapped));
         if (OperatingSystem.IsIOSVersionAtLeast(13))
         {
             platformView.AddGestureRecognizer(new UIHoverGestureRecognizer(OnHover));
@@ -83,11 +83,11 @@ private void Tapped(UIGestureRecognizer recognizer)
     }
 
     // TODO: Move it to the different file
-    internal class UIContinousGestureRecognizer : UIGestureRecognizer
+    internal class UIContinuousGestureRecognizer : UIGestureRecognizer
     {
         private readonly Action<UIGestureRecognizer> action;
 
-        public UIContinousGestureRecognizer(Action<UIGestureRecognizer> action)
+        public UIContinuousGestureRecognizer(Action<UIGestureRecognizer> action)
         {
             this.action = action;
         }

diff --git a/LM-Kit-Maestro/LM-Kit-Maestro.csproj b/LM-Kit-Maestro/LM-Kit-Maestro.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>net9.0;net9.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
@@ -20,8 +20,9 @@
 		<EnableDefaultCssItems>false</EnableDefaultCssItems>
 		<Nullable>enable</Nullable>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
 		<WindowsPackageType>None</WindowsPackageType>
+		<AssemblyName>Maestro</AssemblyName>
+		<OutputName>Maestro</OutputName>
 
 		<!-- Display name -->
 		<ApplicationTitle>Maestro</ApplicationTitle>
@@ -33,12 +34,9 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/LM-Kit-Maestro/Platforms/Android/AndroidManifest.xml b/LM-Kit-Maestro/Platforms/Android/AndroidManifest.xml
diff --git a/LM-Kit-Maestro/Platforms/Android/MainActivity.cs b/LM-Kit-Maestro/Platforms/Android/MainActivity.cs
diff --git a/LM-Kit-Maestro/Platforms/Android/MainApplication.cs b/LM-Kit-Maestro/Platforms/Android/MainApplication.cs
diff --git a/LM-Kit-Maestro/Platforms/Android/Resources/values/colors.xml b/LM-Kit-Maestro/Platforms/Android/Resources/values/colors.xml
diff --git a/LM-Kit-Maestro/Platforms/Tizen/Main.cs b/LM-Kit-Maestro/Platforms/Tizen/Main.cs
diff --git a/LM-Kit-Maestro/Platforms/Tizen/tizen-manifest.xml b/LM-Kit-Maestro/Platforms/Tizen/tizen-manifest.xml
diff --git a/LM-Kit-Maestro/Platforms/iOS/AppDelegate.cs b/LM-Kit-Maestro/Platforms/iOS/AppDelegate.cs
diff --git a/LM-Kit-Maestro/Platforms/iOS/Info.plist b/LM-Kit-Maestro/Platforms/iOS/Info.plist
diff --git a/LM-Kit-Maestro/Platforms/iOS/Program.cs b/LM-Kit-Maestro/Platforms/iOS/Program.cs
diff --git a/LM-Kit-Maestro/Platforms/iOS/Resources/PrivacyInfo.xcprivacy b/LM-Kit-Maestro/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
diff --git a/LM-Kit-Maestro/Services/LMKitService.cs b/LM-Kit-Maestro/Services/LMKitService.cs
@@ -423,7 +423,7 @@ private void BeforeSubmittingPrompt(Conversation conversation)
             {
                 ChatHistory? chatHistory = shouldUseCurrentChatHistory ? conversation.ChatHistory : ChatHistory.Deserialize(conversation.LatestChatHistoryData, _model);
 
-                _multiTurnConversation = new MultiTurnConversation(_model, chatHistory)
+                _multiTurnConversation = new MultiTurnConversation(_model, chatHistory, LMKitConfig.ContextSize)
                 {
                     SamplingMode = GetTokenSampling(LMKitConfig),
                     MaximumCompletionTokens = LMKitConfig.MaximumCompletionTokens,
@@ -443,6 +443,17 @@ private void BeforeSubmittingPrompt(Conversation conversation)
             conversation.LastUsedModelUri = LMKitConfig.LoadedModelUri;
             _lastConversationUsed = conversation;
         }
+        else //updating sampling options, if any.
+        {
+            //todo: Implement a mechanism to determine whether SamplingMode and MaximumCompletionTokens need to be updated.
+            _multiTurnConversation.SamplingMode = GetTokenSampling(LMKitConfig);
+            _multiTurnConversation.MaximumCompletionTokens = LMKitConfig.MaximumCompletionTokens;
+
+            if (LMKitConfig.ContextSize != _multiTurnConversation.ContextSize)
+            {
+                //todo: implement context size update.
+            }
+        }
 
         if (_singleTurnConversation == null)
         {