From d983e2a44cb1c6b633ce4b2c2963737739058516 Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Wed, 24 Jul 2024 12:10:24 -0500
Subject: [PATCH] refine code

---
 .../Hooks/ChatHubConversationHook.cs              |  2 --
 .../Hooks/StreamingLogHook.cs                     | 15 +++------------
 .../BotSharp.Plugin.ChatHub/Hooks/WelcomeHook.cs  |  4 ----
 src/Plugins/BotSharp.Plugin.ChatHub/Using.cs      | 14 +++++++++++++-
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
index b9e2a84b..bf2292ea 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
@@ -1,5 +1,3 @@
-using BotSharp.Abstraction.Messaging.Enums;
-using BotSharp.Abstraction.Options;
 using Microsoft.AspNetCore.SignalR;
 
 namespace BotSharp.Plugin.ChatHub.Hooks;
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
index ec3eb8a9..0b40ede1 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
@@ -1,11 +1,3 @@
-using BotSharp.Abstraction.Agents.Models;
-using BotSharp.Abstraction.Functions.Models;
-using BotSharp.Abstraction.Loggers;
-using BotSharp.Abstraction.Loggers.Enums;
-using BotSharp.Abstraction.Loggers.Models;
-using BotSharp.Abstraction.Options;
-using BotSharp.Abstraction.Repositories;
-using BotSharp.Abstraction.Routing;
 using Microsoft.AspNetCore.SignalR;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
@@ -570,10 +562,9 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
 
     private string FormatJson(string? json)
     {
-        var defaultJson = "{}";
         if (string.IsNullOrWhiteSpace(json))
         {
-            return defaultJson;
+            return "{}";
         }
 
         try
@@ -595,11 +586,11 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
             {
                 Formatting = Newtonsoft.Json.Formatting.Indented
             };
-            return JsonConvert.SerializeObject(parsedJson, jsonSettings) ?? defaultJson;
+            return JsonConvert.SerializeObject(parsedJson, jsonSettings);
         }
         catch
         {
-            return defaultJson;
+            return json;
         }
     }
     #endregion
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/WelcomeHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/WelcomeHook.cs
index 22c02fdf..c8afd3dd 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/WelcomeHook.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/WelcomeHook.cs
@@ -1,8 +1,4 @@
-using BotSharp.Abstraction.Messaging.Models.RichContent;
-using BotSharp.Abstraction.Messaging;
-using BotSharp.Abstraction.Templating;
 using Microsoft.AspNetCore.SignalR;
-using BotSharp.Abstraction.Options;
 
 namespace BotSharp.Plugin.ChatHub.Hooks;
 
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Using.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Using.cs
index 0e730db9..7cc89c9d 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Using.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Using.cs
@@ -19,4 +19,16 @@ global using BotSharp.Abstraction.Conversations.Settings;
 global using BotSharp.Abstraction.Agents.Enums;
 global using BotSharp.Abstraction.Conversations.Models;
 global using BotSharp.OpenAPI.ViewModels.Conversations;
-global using BotSharp.OpenAPI.ViewModels.Users;
\ No newline at end of file
+global using BotSharp.OpenAPI.ViewModels.Users;
+global using BotSharp.Abstraction.Agents.Models;
+global using BotSharp.Abstraction.Functions.Models;
+global using BotSharp.Abstraction.Loggers;
+global using BotSharp.Abstraction.Loggers.Enums;
+global using BotSharp.Abstraction.Loggers.Models;
+global using BotSharp.Abstraction.Options;
+global using BotSharp.Abstraction.Repositories;
+global using BotSharp.Abstraction.Routing;
+global using BotSharp.Abstraction.Messaging;
+global using BotSharp.Abstraction.Messaging.Enums;
+global using BotSharp.Abstraction.Messaging.Models.RichContent;
+global using BotSharp.Abstraction.Templating;
\ No newline at end of file