Merge pull request #1060 from iceljc/test/google-realtime

add session reconnect

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs

@@ -8,7 +8,7 @@ public enum AgentField
     IsPublic,
     Disabled,
     Type,
-    Mode,
+    RoutingMode,
     InheritAgentId,
     Profile,
     Label,

src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs

@@ -9,6 +9,7 @@ public class Agent
     public string Id { get; set; } = string.Empty;
     public string Name { get; set; } = string.Empty;
     public string Description { get; set; } = string.Empty;
+
     /// <summary>
     /// Agent Type
     /// </summary>
@@ -17,7 +18,8 @@ public class Agent
     /// <summary>
     /// Routing Mode: lazy or eager
     /// </summary>
-    public string Mode { get; set; } = "eager";
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Mode { get; set; }
 
     public DateTime CreatedDateTime { get; set; }
     public DateTime UpdatedDateTime { get; set; }
@@ -277,18 +279,18 @@ public Agent SetMergeUtility(bool merge)
         return this;
     }
 
-    public Agent SetAgentType(string type)
+    public Agent SetType(string type)
     {
         Type = type;
         return this;
     }
 
     /// <summary>
-    /// Set agent mode: lazy or eager
+    /// Set agent routing mode: lazy or eager
     /// </summary>
     /// <param name="mode"></param>
     /// <returns></returns>
-    public Agent SetAgentMode(string mode)
+    public Agent SetRoutingMode(string? mode)
     {
         Mode = mode;
         return this;

src/Infrastructure/BotSharp.Abstraction/Crontab/Settings/CrontabSettings.cs

@@ -0,0 +1,12 @@
+namespace BotSharp.Abstraction.Crontab.Settings;
+
+public class CrontabSettings
+{
+    public CrontabBaseSetting EventSubscriber { get; set; } = new();
+    public CrontabBaseSetting Watcher { get; set; } = new();
+}
+
+public class CrontabBaseSetting
+{
+    public bool Enabled { get; set; } = true;
+}

src/Infrastructure/BotSharp.Abstraction/Infrastructures/Attributes/BotSharpAuthAttribute.cs

@@ -0,0 +1,32 @@
+using BotSharp.Abstraction.Users;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BotSharp.Abstraction.Infrastructures.Attributes;
+
+/// <summary>
+/// BotSharp authorization: check whether the request user is admin or root role.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+public class BotSharpAuthAttribute : Attribute, IAsyncAuthorizationFilter
+{
+    public BotSharpAuthAttribute()
+    {
+        
+    }
+
+    public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
+    {
+        var services = context.HttpContext.RequestServices;
+
+        var userIdentity = services.GetRequiredService<IUserIdentity>();
+        var userService = services.GetRequiredService<IUserService>();
+
+        var (isAdmin, user) = await userService.IsAdminUser(userIdentity.Id);
+        if (!isAdmin || user == null)
+        {
+            context.Result = new UnauthorizedResult();
+        }
+    }
+}

src/Infrastructure/BotSharp.Abstraction/MLTasks/IRealTimeCompletion.cs

@@ -19,6 +19,8 @@ Task Connect(
         Func<RoleDialogModel, Task> onInputAudioTranscriptionDone,
         Func<Task> onInterruptionDetected);
 
+    Task Reconnect(RealtimeHubConnection conn);
+
     Task AppenAudioBuffer(string message);
     Task AppenAudioBuffer(ArraySegment<byte> data, int length);
 

src/Infrastructure/BotSharp.Abstraction/Realtime/IRealtimeHook.cs

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Hooks;
 using BotSharp.Abstraction.MLTasks;
+using BotSharp.Abstraction.Realtime.Models;
 
 namespace BotSharp.Abstraction.Realtime;
 
@@ -8,4 +9,5 @@ public interface IRealtimeHook : IHookBase
     Task OnModelReady(Agent agent, IRealTimeCompletion completer);
     string[] OnModelTranscriptPrompt(Agent agent);
     Task OnTranscribeCompleted(RoleDialogModel message, TranscriptionData data);
+    Task<bool> ShouldReconnect(RealtimeHubConnection conn) => Task.FromResult(false);
 }

src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionOptions.cs

@@ -1,9 +1,12 @@
+using Microsoft.Extensions.Logging;
 using System.Text.Json;
 
 namespace BotSharp.Abstraction.Realtime.Models.Session;
 
 public class ChatSessionOptions
 {
+    public string Provider { get; set; }
     public int? BufferSize { get; set; }
     public JsonSerializerOptions? JsonOptions { get; set; }
+    public ILogger? Logger { get; set; }
 }

…Repositories/BotSharpDatabaseSettings.cs …ies/Settings/BotSharpDatabaseSettings.cssrc/Infrastructure/BotSharp.Abstraction/Repositories/BotSharpDatabaseSettings.cs renamed to src/Infrastructure/BotSharp.Abstraction/Repositories/Settings/BotSharpDatabaseSettings.cs src/Infrastructure/BotSharp.Abstraction/Repositories/BotSharpDatabaseSettings.cs renamed to src/Infrastructure/BotSharp.Abstraction/Repositories/Settings/BotSharpDatabaseSettings.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Repositories;
+namespace BotSharp.Abstraction.Repositories.Settings;
 
 public class BotSharpDatabaseSettings : DatabaseBasicSettings
 {

src/Infrastructure/BotSharp.Abstraction/Routing/Enums/RoutingMode.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Routing.Enums;
+
+public class RoutingMode
+{
+    public const string Eager = "eager";
+    public const string Lazy = "lazy";
+}

src/Infrastructure/BotSharp.Abstraction/Utilities/StringExtensions.cs

@@ -5,7 +5,7 @@ namespace BotSharp.Abstraction.Utilities;
 
 public static class StringExtensions
 {
-    public static string IfNullOrEmptyAs(this string str, string defaultValue)
+    public static string IfNullOrEmptyAs(this string? str, string defaultValue)
         => string.IsNullOrEmpty(str) ? defaultValue : str;
 
     public static string SubstringMax(this string str, int maxLength)