SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #845 from iceljc/features/add-global-stats

Browse source 
refine sidecar async
This commit is contained in:
iceljc 2025-01-25 04:00:11 -06:00 committed by GitHub
parent 620d71cab4 eb7bddd5e8
commit f87a520430
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Infrastructure/BotSharp.Abstraction/SideCar/Attributes/SideCarAttribute.cs
View file

@ -4,7 +4,6 @@ using Rougamo.Context;
using Microsoft.Extensions.DependencyInjection;
using BotSharp.Abstraction.Shared;
namespace BotSharp.Abstraction.SideCar.Attributes;
[AttributeUsage(AttributeTargets.Method, Inherited = true)]
@ -34,7 +33,7 @@ public class SideCarAttribute : AsyncMoAttribute
if (typeof(Task).IsAssignableFrom(retType))
{
var syncResultType = retType.IsConstructedGenericType ? retType.GenericTypeArguments[0] : typeof(void);
(isHandled, value) = CallAsyncMethod(sidecar, sidecarMethod, syncResultType, methodArgs);
(isHandled, value) = await CallAsyncMethod(sidecar, sidecarMethod, syncResultType, methodArgs);
}
else
{
@ -67,9 +66,10 @@ public class SideCarAttribute : AsyncMoAttribute
return (sidecar, sidecarMethod);
}
private (bool, object?) CallAsyncMethod(IConversationSideCar instance, MethodInfo method, Type retType, object[] args)
private async Task<(bool, object?)> CallAsyncMethod(IConversationSideCar instance, MethodInfo method, Type retType, object[] args)
{
object? value = null;
object? res = null;
var isHandled = false;
var enabled = instance != null && instance.IsEnabled() && method != null;
@ -81,12 +81,20 @@ public class SideCarAttribute : AsyncMoAttribute
isHandled = true;
if (retType == typeof(void))
{
value = GetMethod(nameof(CallAsync)).Invoke(this, [instance, method, args]);
res = GetMethod(nameof(CallAsync)).Invoke(this, [instance, method, args]);
}
else
{
var task = GetMethod(nameof(CallGenericAsync)).MakeGenericMethod(retType).Invoke(this, [instance, method, args]);
value = task?.GetType().GetProperty("Result")?.GetValue(task);
res = GetMethod(nameof(CallGenericAsync)).MakeGenericMethod(retType).Invoke(this, [instance, method, args]);
}
if (res != null && res is Task task)
{
await task;
if (method.ReturnType.IsGenericType && method.ReturnType.GetGenericTypeDefinition() == typeof(Task<>))
{
value = task?.GetType()?.GetProperty("Result")?.GetValue(task);
}
}
return (isHandled, value);