Merge pull request #1169 from iceljc/features/refine-model-settings

Features/refine model settings
This commit is contained in:
iceljc 2025-09-18 20:06:10 -05:00 committed by GitHub
commit bc35112e1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 13 deletions

View file

@ -15,9 +15,6 @@
******************************************************************************/ ******************************************************************************/
using BotSharp.Core.Infrastructures; using BotSharp.Core.Infrastructures;
using NetTopologySuite.Index.KdTree;
using Newtonsoft.Json.Linq;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace BotSharp.Core.SideCar.Services; namespace BotSharp.Core.SideCar.Services;

View file

@ -14,8 +14,6 @@
limitations under the License. limitations under the License.
******************************************************************************/ ******************************************************************************/
using BotSharp.Abstraction.Conversations.Enums;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Options; using BotSharp.Abstraction.Options;
using BotSharp.Abstraction.SideCar; using BotSharp.Abstraction.SideCar;

View file

@ -37,11 +37,11 @@ public class GetWeatherFn : IFunctionCallback
await Task.Delay(1500); await Task.Delay(1500);
#if DEBUG #if DEBUG
var temp = RoleDialogModel.From(message, AgentRole.Assistant, $"Here is your weather in {args?.City}"); var intermediateMsg = RoleDialogModel.From(message, AgentRole.Assistant, $"Here is your weather in {args?.City}");
messageHub.Push(new() messageHub.Push(new()
{ {
EventName = ChatEvent.OnIntermediateMessageReceivedFromAssistant, EventName = ChatEvent.OnIntermediateMessageReceivedFromAssistant,
Data = temp, Data = intermediateMsg,
RefId = conv.ConversationId, RefId = conv.ConversationId,
SaveDataToDb = true SaveDataToDb = true
}); });

View file

@ -30,6 +30,8 @@ public class ConversationObserver : BotSharpObserverBase<HubObserveData<RoleDial
public override void OnNext(HubObserveData<RoleDialogModel> value) public override void OnNext(HubObserveData<RoleDialogModel> value)
{ {
var conv = _services.GetRequiredService<IConversationService>(); var conv = _services.GetRequiredService<IConversationService>();
var storage = _services.GetRequiredService<IConversationStorage>();
var routeCtx = _services.GetRequiredService<IRoutingContext>();
if (value.EventName == ChatEvent.OnIndicationReceived) if (value.EventName == ChatEvent.OnIndicationReceived)
{ {
@ -41,5 +43,16 @@ public class ConversationObserver : BotSharpObserverBase<HubObserveData<RoleDial
func(value).ConfigureAwait(false).GetAwaiter().GetResult(); func(value).ConfigureAwait(false).GetAwaiter().GetResult();
} }
} }
else if (value.EventName == ChatEvent.OnIntermediateMessageReceivedFromAssistant)
{
var dialogs = routeCtx.GetDialogs();
dialogs.Add(value.Data);
routeCtx.SetDialogs(dialogs);
if (value.SaveDataToDb)
{
storage.Append(conv.ConversationId, value.Data);
}
}
} }
} }

View file

@ -140,12 +140,6 @@ public class ChatHubObserver : BotSharpObserverBase<HubObserveData<RoleDialogMod
Role = AgentRole.Assistant Role = AgentRole.Assistant
} }
}; };
if (value.SaveDataToDb)
{
var storage = _services.GetRequiredService<IConversationStorage>();
storage.Append(conv.ConversationId, message);
}
break; break;
} }