Improved command matching for some patterns

Author: Tomasz Juszczak

.gitignore

@@ -2,4 +2,6 @@ bin/
 obj/
 /packages/
 riderModule.iml
-/_ReSharper.Caches/
+/_ReSharper.Caches/
+/Slack-GPT-Socket/app-log.db
+/Slack-GPT-Socket/app.db

Slack-GPT-Socket.sln.DotSettings.user

@@ -1,4 +1,19 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=518a87a3_002D49c7_002D40fb_002Dbec1_002D478ce2091847/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GptClientEdgeCasesTests_1" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.GptApi.GptClientEdgeCasesTests.GptClientEdgeCasesTests_1&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
+&lt;/SessionState&gt;</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=7a21a381_002D1bd7_002D4190_002Daea7_002D60bbc3080eac/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GptClientEdgeCasesTests_1 #3" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.GptApi.GptClientEdgeCasesTests.GptClientEdgeCasesTests_1&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
+&lt;/SessionState&gt;</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=bc0f8e87_002D43a6_002D4830_002D802e_002Db69debc2f54b/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GptClientEdgeCasesTests_1 #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.GptApi.GptClientEdgeCasesTests.GptClientEdgeCasesTests_1&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
+&lt;/SessionState&gt;</s:String>
 
 
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=e72966db_002D060a_002D4577_002D858b_002D3601c1cb06de/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="ContextBlockSanitation_OK" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
@@ -22,5 +37,7 @@
     &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.TestLiteDB.TestNullConnectionString_Ok&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.Handlers.CommandHandlerTests.CommandsCommand_AddOverwrite_Ok&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.Handlers.CommandHandlerTests.CommandsCommand_RemoveSingle_Ok&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.GptApi.GptClientEdgeCasesTests.GptClientEdgeCasesTests_1&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.GptApi.GptClientEdgeCasesTests.GptClientEdgeCases_Ok&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>

Slack-GPT-Socket/GptApi/GptClientResolver.cs

@@ -126,9 +126,11 @@ private void ResolveModel(ref GptRequest input)
     private void ResolveParameters(ref GptRequest input)
     {
         var lastIndex = 0;
-        Match match;
-
-        while ((match = ParameterRegex.Match(input.Prompt)).Success)
+        Match match = ParameterRegex.Match(input.Prompt);
+        
+        if(!match.Success) return;
+        
+        do
         {
             var paramName = match.Groups[1].Value;
             var paramValueTrim = match.Groups[2]?.Value.Trim() ?? string.Empty;
@@ -163,7 +165,7 @@ private void ResolveParameters(ref GptRequest input)
                 // if we get an exception, we'll just ignore the parameter and move on
                 break;
             }
-        }
+        } while ((match = match.NextMatch()).Success);
     }
 
     /// <summary>

Slack-GPT-Tests/GptApi/FileCases/stack-overflow-30042023.txt

@@ -0,0 +1,3 @@
+-context "You are an expert programmer in TypeScript. You are tasked to find issues with the code and perform critical code reviews. You will ALWAYS ask questions to clarify is something is unclear. You will only provide code to fix an issue after everything is perfectly clear and understand."
+Given this method, please find why sometimes all there is background visible and not a still frame of a previous video.
+...

Slack-GPT-Tests/GptApi/GptClientEdgeCasesTests.cs

@@ -0,0 +1,57 @@
+using FluentAssertions;
+using LiteDB;
+using Slack_GPT_Socket.GptApi;
+using Slack_GPT_Socket.Settings;
+using Slack_GPT_Socket.Utilities.LiteDB;
+
+namespace Slack_GPT_Tests.GptApi;
+
+[TestFixture]
+[Parallelizable(ParallelScope.All)]
+[FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
+public class GptClientEdgeCasesTests
+{
+    [SetUp]
+    public void Setup()
+    {
+        _gptDefaults = new GptDefaults();
+        _customCommands = new GptCustomCommands(MoqUtils.CreateOptionsMonitorMock(
+            new GptCommands()
+        ));
+        var userCommandDb = new UserCommandDb(new LiteDatabase("Filename=:memory:;Mode=Memory;Cache=Shared"));
+        _resolver = new GptClientResolver(_customCommands, _gptDefaults, userCommandDb);
+    }
+
+    private GptDefaults _gptDefaults;
+    private GptCustomCommands _customCommands;
+    private GptClientResolver _resolver;
+    
+    private string GetTestFile(string fileName)
+    {
+        var solutionPath = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..\\..\\..\\"));
+        var filePath = Path.Combine(solutionPath, $"GptApi/FileCases/{fileName}");
+        Assert.True(File.Exists(filePath));
+        var file = File.ReadAllText(filePath);
+        file.Should().NotBeNull();
+        return file;
+    }
+    
+    [Test]
+    [Timeout(1000)]
+    [TestCase("stack-overflow-30042023.txt")]
+    public void GptClientEdgeCases_Ok(string fileName)
+    {
+        var content = GetTestFile(fileName);
+        
+        var prompts = new[] {
+            ("user",  content)
+        };
+
+        // Act
+        var chatRequest = _resolver.TestParseRequest("U0123ID", prompts);
+        
+        // Assert not null
+        chatRequest.Should().NotBeNull();
+        chatRequest.Messages.Should().NotBeNull();
+    }
+}