Merge pull request #1297 from iceljc/features/add-conv-thumbnail

Features/add conv thumbnail

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs

@@ -1,5 +1,4 @@
 using BotSharp.Abstraction.Repositories.Filters;
-using BotSharp.Abstraction.Users.Models;
 
 namespace BotSharp.Abstraction.Conversations;
 
@@ -41,7 +40,7 @@ Task<bool> SendMessage(string agentId,
         PostbackMessageModel? replyMessage,
         Func<RoleDialogModel, Task> onResponseReceived);
 
-    Task<List<RoleDialogModel>> GetDialogHistory(int lastCount = 100, bool fromBreakpoint = true, IEnumerable<string>? includeMessageTypes = null);
+    Task<List<RoleDialogModel>> GetDialogHistory(int lastCount = 100, bool fromBreakpoint = true, IEnumerable<string>? includeMessageTypes = null, ConversationDialogFilter? filter = null);
     Task CleanHistory(string agentId);
 
     /// <summary>

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStorage.cs

@@ -1,8 +1,10 @@
+using BotSharp.Abstraction.Repositories.Filters;
+
 namespace BotSharp.Abstraction.Conversations;
 
 public interface IConversationStorage
 {
     Task Append(string conversationId, RoleDialogModel dialog);
     Task Append(string conversationId, IEnumerable<RoleDialogModel> dialogs);
-    Task<List<RoleDialogModel>> GetDialogs(string conversationId);
+    Task<List<RoleDialogModel>> GetDialogs(string conversationId, ConversationDialogFilter? filter = null);
 }

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/ConversationFile.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Conversations.Models;
+
+public class ConversationFile
+{
+    public string ConversationId { get; set; }
+    public string? Thumbnail { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationDialogFilter.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Repositories.Filters;
+
+public class ConversationDialogFilter
+{
+    public string Order { get; set; } = "asc";
+}

src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFileFilter.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Repositories.Filters;
+
+public class ConversationFileFilter
+{
+    public IEnumerable<string> ConversationIds { get; set; } = [];
+}

src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFilter.cs

@@ -31,6 +31,7 @@ public class ConversationFilter
     public List<string>? Tags { get; set; }
 
     public bool IsLoadLatestStates { get; set; }
+    public bool IsLoadThumbnail { get; set; }
 
     public static ConversationFilter Empty()
     {

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -129,7 +129,7 @@ Task CreateNewConversation(Conversation conversation)
         => throw new NotImplementedException();
     Task<bool> DeleteConversations(IEnumerable<string> conversationIds)
         => throw new NotImplementedException();
-    Task<List<DialogElement>> GetConversationDialogs(string conversationId)
+    Task<List<DialogElement>> GetConversationDialogs(string conversationId, ConversationDialogFilter? filter = null)
         => throw new NotImplementedException();
     Task AppendConversationDialogs(string conversationId, List<DialogElement> dialogs)
         => throw new NotImplementedException();
@@ -169,6 +169,12 @@ Task<List<string>> GetConversationsToMigrate(int batchSize = 100)
         => throw new NotImplementedException();
     Task<bool> MigrateConvsersationLatestStates(string conversationId)
          => throw new NotImplementedException();
+    Task<List<ConversationFile>> GetConversationFiles(ConversationFileFilter filter)
+        => throw new NotImplementedException();
+    Task<bool> SaveConversationFiles(List<ConversationFile> files)
+        => throw new NotImplementedException();
+    Task<bool> DeleteConversationFiles(List<string> conversationIds)
+        => throw new NotImplementedException();
     #endregion
 
     #region LLM Completion Log

src/Infrastructure/BotSharp.Abstraction/SideCar/Attributes/SideCarAttribute.cs

@@ -62,13 +62,13 @@ private static MethodInfo GetMethod(string name)
         try
         {
             var sidecar = serviceProvider.GetService<IConversationSideCar>();
-            var argTypes = args.Select(x => x.GetType()).ToArray();
+            var argTypes = args.Select(x => x != null ? x.GetType() : null).ToArray();
             var sidecarMethod = sidecar?.GetType()?.GetMethods(BindingFlags.Public | BindingFlags.Instance)
                                                    .FirstOrDefault(x => x.Name == methodName
                                                    && x.ReturnType == retType
                                                    && x.GetParameters().Length == argTypes.Length
                                                    && x.GetParameters().Select(p => p.ParameterType)
-                                                       .Zip(argTypes, (paramType, argType) => paramType.IsAssignableFrom(argType)).All(y => y));
+                                                       .Zip(argTypes, (paramType, argType) => IsParameterTypeMatch(paramType, argType)).All(y => y));
 
             return (sidecar, sidecarMethod);
         }
@@ -78,6 +78,28 @@ private static MethodInfo GetMethod(string name)
         }
     }
 
+    private static bool IsParameterTypeMatch(Type paramType, Type? argType)
+    {
+        // If argument is null, check if parameter type is nullable
+        if (argType == null)
+        {
+            // Check if it's a nullable value type (e.g., int?)
+            if (paramType.IsGenericType && paramType.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                return true;
+            }
+            // Check if it's a reference type (which are inherently nullable)
+            if (!paramType.IsValueType)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        // Normal type matching
+        return paramType.IsAssignableFrom(argType);
+    }
+
     private async Task<(bool, object?)> CallAsyncMethod(IConversationSideCar instance, MethodInfo method, Type retType, object[] args)
     {
         object? value = null;

src/Infrastructure/BotSharp.Abstraction/SideCar/IConversationSideCar.cs

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.SideCar.Options;
 
 namespace BotSharp.Abstraction.SideCar;
@@ -8,7 +9,7 @@ public interface IConversationSideCar
     bool IsEnabled { get; }
 
     Task AppendConversationDialogs(string conversationId, List<DialogElement> messages);
-    Task<List<DialogElement>> GetConversationDialogs(string conversationId);
+    Task<List<DialogElement>> GetConversationDialogs(string conversationId, ConversationDialogFilter? filter = null);
     Task UpdateConversationBreakpoint(string conversationId, ConversationBreakpoint breakpoint);
     Task<ConversationBreakpoint?> GetConversationBreakpoint(string conversationId);
     Task UpdateConversationStates(string conversationId, List<StateKeyValue> states);

src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs

@@ -14,7 +14,7 @@ You may obtain a copy of the License at
   limitations under the License.
 ******************************************************************************/
 
-using BotSharp.Abstraction.SideCar.Options;
+using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Core.Infrastructures;
 
 namespace BotSharp.Core.SideCar.Services;
@@ -54,16 +54,20 @@ public async Task AppendConversationDialogs(string conversationId, List<DialogEl
         await Task.CompletedTask;
     }
 
-    public async Task<List<DialogElement>> GetConversationDialogs(string conversationId)
+    public async Task<List<DialogElement>> GetConversationDialogs(string conversationId, ConversationDialogFilter? filter = null)
     {
         if (!IsValid(conversationId))
         {
-            return new List<DialogElement>();
+            return [];
         }
 
-        await Task.CompletedTask;
+        var dialogs = _contextStack.Peek().Dialogs ?? [];
+        if (filter?.Order == "desc")
+        {
+            dialogs = dialogs.OrderByDescending(x => x.MetaData?.CreatedTime).ToList();
+        }
 
-        return _contextStack.Peek().Dialogs;
+        return await Task.FromResult(dialogs);
     }
 
     public async Task UpdateConversationBreakpoint(string conversationId, ConversationBreakpoint breakpoint)
@@ -87,9 +91,7 @@ public async Task UpdateConversationBreakpoint(string conversationId, Conversati
         }
 
         var top = _contextStack.Peek().Breakpoints;
-
-        await Task.CompletedTask;
-        return top.LastOrDefault();
+        return await Task.FromResult(top.LastOrDefault());
     }
 
     public async Task UpdateConversationStates(string conversationId, List<StateKeyValue> states)