Improves Agents module and updates dependencies

.github/workflows/packages.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'develop/*'
       - 'bug/*'
       - 'issue/*'
       - 'patch/*'
@@ -12,7 +13,7 @@ on:
   release:
     types: [ prereleased, published ]
 env:
-  base_version: '3.6.0'
+  base_version: '3.7.0'
   feedz_feed_source: 'https://f.feedz.io/elsa-workflows/elsa-3/nuget/index.json'
   nuget_feed_source: 'https://api.nuget.org/v3/index.json'
 
@@ -30,7 +31,7 @@ jobs:
           PACKAGE_PREFIX=$(echo $BRANCH_NAME | rev | cut -d/ -f1 | rev | tr '_' '-')
 
           # If the branch name is main, use the preview version. Otherwise, use the branch name as the version prefix.
-          if [[ "${BRANCH_NAME}" == "main" || "${BRANCH_NAME}" =~ ^rc/ ]]; then
+          if [[ "${BRANCH_NAME}" == "main" || "${BRANCH_NAME}" =~ ^develop/ ]]; then
               PACKAGE_PREFIX="preview"
           fi
 

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <UseProjectReferences>true</UseProjectReferences>
+        <UseProjectReferences>false</UseProjectReferences>
     </PropertyGroup>
     <PropertyGroup>
         <Authors>Elsa Workflows Community</Authors>
@@ -41,8 +41,8 @@
 	</PropertyGroup>
 
 	<PropertyGroup Label="PackageVersions">
-        <ElsaVersion>3.6.0-preview.3056</ElsaVersion>
-		<ElsaStudioVersion>3.6.0-preview.1087</ElsaStudioVersion>
+        <ElsaVersion>3.7.0-preview.3055</ElsaVersion>
+		<ElsaStudioVersion>3.6.0-preview.1029</ElsaStudioVersion>
         <MicrosoftVersion>9.0.6</MicrosoftVersion>
     </PropertyGroup>
 

Directory.Packages.props

@@ -38,14 +38,15 @@
     <PackageVersion Include="Elsa.Workflows.Management" Version="$(ElsaVersion)" />
     <PackageVersion Include="Elsa.Workflows.Runtime" Version="$(ElsaVersion)" />
     <PackageVersion Include="Elsa.Workflows.Runtime.Distributed" Version="$(ElsaVersion)" />
+    <PackageVersion Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.59.0" />
   </ItemGroup>
   <ItemGroup Label="Elsa Studio">
     <PackageVersion Include="Elsa.Studio" Version="$(ElsaStudioVersion)" />
     <PackageVersion Include="Elsa.Studio.Core" Version="$(ElsaStudioVersion)" />
     <PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="$(ElsaStudioVersion)" />
     <PackageVersion Include="Elsa.Studio.Shared" Version="$(ElsaStudioVersion)" />
     <PackageVersion Include="Elsa.Studio.Workflows" Version="$(ElsaStudioVersion)" />
-    <PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="$(ElsaStudioVersion)"/>
+    <PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="$(ElsaStudioVersion)" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Antlr4.Runtime.Standard" Version="4.13.1" />

src/modules/agents/Elsa.Agents.Activities/Activities/AgentActivity.cs

@@ -47,7 +47,11 @@ protected override async ValueTask ExecuteAsync(ActivityExecutionContext context
 
         var agentInvoker = context.GetRequiredService<AgentInvoker>();
         var result = await agentInvoker.InvokeAgentAsync(AgentName, functionInput, context.CancellationToken);
-        var json = result.FunctionResult.GetValue<string>();
+        var json = result.ChatMessageContent.Content?.Trim();
+
+        if (string.IsNullOrWhiteSpace(json))
+            throw new InvalidOperationException("The message content is empty or null.");
+
         var outputType = context.ActivityDescriptor.Outputs.Single().Type;
 
         // If the target type is object, we want the JSON to be deserialized into an ExpandoObject for dynamic field access. 

src/modules/agents/Elsa.Agents.Activities/Elsa.Agents.Activities.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Description>Provides Agent activities</Description>

src/modules/agents/Elsa.Agents.Core/Contracts/IkernelFactory.cs

@@ -0,0 +1,8 @@
+using Microsoft.SemanticKernel;
+namespace Elsa.Agents;
+
+public interface IKernelFactory
+{
+    Kernel CreateKernel(KernelConfig kernelConfig, AgentConfig agentConfig);
+    Kernel CreateKernel(KernelConfig kernelConfig, string agentName);
+}

src/modules/agents/Elsa.Agents.Core/Elsa.Agents.Core.csproj

@@ -11,6 +11,7 @@
         <PackageReference Include="Microsoft.Extensions.Logging" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" />
         <PackageReference Include="Microsoft.SemanticKernel" />
+        <PackageReference Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" />
     </ItemGroup>
 
     <ItemGroup Label="Elsa" Condition="'$(UseProjectReferences)' != 'true'">

src/modules/agents/Elsa.Agents.Core/Extensions/AgentConfigExtensions.cs

@@ -20,6 +20,7 @@ public static OpenAIPromptExecutionSettings ToOpenAIPromptExecutionSettings(this
             ToolCallBehavior = ToolCallBehavior.AutoInvokeKernelFunctions,
             ResponseFormat = agentConfig.ExecutionSettings.ResponseFormat,
             ChatSystemPrompt = agentConfig.PromptTemplate,
+            ServiceId = "default"
         };
     }
 

src/modules/agents/Elsa.Agents.Core/Extensions/FunctionResultExtensions.cs

@@ -8,18 +8,24 @@ public static class FunctionResultExtensions
     public static async Task<JsonElement> AsJsonElementAsync(this Task<InvokeAgentResult> resultTask)
     {
         var result = await resultTask;
-        return result.FunctionResult.AsJsonElement();
+        return result.ChatMessageContent.AsJsonElement();
     }
-
-    public static async Task<JsonElement> AsJsonElementAsync(this Task<FunctionResult> resultTask)
-    {
-        var result = await resultTask;
-        return result.AsJsonElement();
-    }
-
-    public static JsonElement AsJsonElement(this FunctionResult result)
+
+    public static JsonElement AsJsonElement(this ChatMessageContent result)
     {
-        var response = result.GetValue<string>()!;
-        return JsonSerializer.Deserialize<JsonElement>(response);
+        var content = result.Content?.Trim();
+
+        if (string.IsNullOrWhiteSpace(content))
+            throw new InvalidOperationException("The message content is empty.");
+
+        try
+        {
+            return JsonSerializer.Deserialize<JsonElement>(content!);
+        }
+        catch (JsonException ex)
+        {
+            throw new InvalidOperationException($"Error deserializing the message content as JSON:\n{content}", ex);
+        }
+
     }
 }

src/modules/agents/Elsa.Agents.Core/Models/InvokeAgentResult.cs

@@ -3,12 +3,8 @@
 
 namespace Elsa.Agents;
 
-public record InvokeAgentResult(AgentConfig Function, FunctionResult FunctionResult)
+public record InvokeAgentResult(AgentConfig Function, ChatMessageContent ChatMessageContent)
 {
-    public object? ParseResult()
-    {
-        var targetType = Type.GetType(Function.OutputVariable.Type) ?? typeof(JsonElement);
-        var json = FunctionResult.GetValue<string>();
-        return JsonSerializer.Deserialize(json, targetType);
-    }
+
+
 }

src/modules/agents/Elsa.Agents.Core/Services/AgentInvoker.cs

@@ -1,12 +1,14 @@
 using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
 using Microsoft.SemanticKernel.Connectors.OpenAI;
+using Microsoft.SemanticKernel.PromptTemplates.Handlebars;
 
 #pragma warning disable SKEXP0010
 #pragma warning disable SKEXP0001
 
 namespace Elsa.Agents;
 
-public class AgentInvoker(KernelFactory kernelFactory, IKernelConfigProvider kernelConfigProvider)
+public class AgentInvoker(IKernelFactory kernelFactory, IKernelConfigProvider kernelConfigProvider)
 {
     public async Task<InvokeAgentResult> InvokeAgentAsync(string agentName, IDictionary<string, object?> input, CancellationToken cancellationToken = default)
     {
@@ -21,9 +23,9 @@ public async Task<InvokeAgentResult> InvokeAgentAsync(string agentName, IDiction
             MaxTokens = executionSettings.MaxTokens,
             PresencePenalty = executionSettings.PresencePenalty,
             FrequencyPenalty = executionSettings.FrequencyPenalty,
-            ToolCallBehavior = ToolCallBehavior.AutoInvokeKernelFunctions,
             ResponseFormat = executionSettings.ResponseFormat,
             ChatSystemPrompt = agentConfig.PromptTemplate,
+            FunctionChoiceBehavior = FunctionChoiceBehavior.Auto()
         };
 
         var promptExecutionSettingsDictionary = new Dictionary<string, PromptExecutionSettings>
@@ -46,10 +48,36 @@ public async Task<InvokeAgentResult> InvokeAgentAsync(string agentName, IDiction
                 AllowDangerouslySetContent = true
             }).ToList()
         };
-
-        var kernelFunction = kernel.CreateFunctionFromPrompt(promptTemplateConfig);
+
+        var templateFactory = new HandlebarsPromptTemplateFactory();
+
+        var promptConfig = new PromptTemplateConfig
+        {
+            Template = agentConfig.PromptTemplate,
+            TemplateFormat = "handlebars",
+            Name = agentConfig.FunctionName
+        };
+
+        var promptTemplate = templateFactory.Create(promptConfig);
+
         var kernelArguments = new KernelArguments(input);
-        var result = await kernelFunction.InvokeAsync(kernel, kernelArguments, cancellationToken: cancellationToken);
-        return new(agentConfig, result);
+        string renderedPrompt = await promptTemplate.RenderAsync(kernel, kernelArguments);
+
+        ChatHistory chatHistory = [];
+        chatHistory.AddUserMessage(renderedPrompt);
+
+        IChatCompletionService chatCompletion = kernel.GetRequiredService<IChatCompletionService>();
+
+        OpenAIPromptExecutionSettings openAIPromptExecutionSettings = new()
+        {
+            FunctionChoiceBehavior = FunctionChoiceBehavior.Auto()
+        };
+
+        var response = await chatCompletion.GetChatMessageContentAsync(
+            chatHistory,
+            executionSettings: openAIPromptExecutionSettings,
+            kernel: kernel);
+
+        return new(agentConfig, response);
     }
 }

src/modules/agents/Elsa.Agents.Core/Services/KernelFactory.cs

@@ -7,7 +7,7 @@
 
 namespace Elsa.Agents;
 
-public class KernelFactory(IPluginDiscoverer pluginDiscoverer, IServiceDiscoverer serviceDiscoverer, ILoggerFactory loggerFactory, IServiceProvider serviceProvider, ILogger<KernelFactory> logger)
+public class KernelFactory(IPluginDiscoverer pluginDiscoverer, IServiceDiscoverer serviceDiscoverer, ILoggerFactory loggerFactory, IServiceProvider serviceProvider, ILogger<KernelFactory> logger) : IKernelFactory
 {
     public Kernel CreateKernel(KernelConfig kernelConfig, string agentName)
     {

src/modules/alterations/Elsa.Alterations.Core/Contexts/AlterationHandlerContext.cs

@@ -99,13 +99,26 @@ public void Succeed(Func<Task> commitAction)
         CommitAction = commitAction;
     }
 
+    /// <summary>
+    /// Marks the alteration as succeeded.
+    /// </summary>
+    public void Succeed(Action commitAction)
+    {
+        Succeed();
+        CommitAction = () =>
+        {
+            commitAction();
+            return Task.CompletedTask;
+        };
+    }
+
     /// <summary>
     /// Marks the alteration as succeeded.
     /// </summary>
     public void Succeed(string message)
     {
         HasSucceeded = true;
-        Log($"Alteration {Alteration.GetType().Name} succeeded", message, LogLevel.Information);
+        Log($"Alteration {Alteration.GetType().Name} succeeded", message);
     }
 
     /// <summary>
@@ -116,6 +129,19 @@ public void Succeed(string message, Func<Task> commitAction)
         Succeed(message);
         CommitAction = commitAction;
     }
+
+    /// <summary>
+    /// Marks the alteration as succeeded.
+    /// </summary>
+    public void Succeed(string message, Action commitAction)
+    {
+        Succeed(message);
+        CommitAction = () =>
+        {
+            commitAction();
+            return Task.CompletedTask;
+        };
+    }
 
     /// <summary>
     /// Marks the alteration as failed.
@@ -126,4 +152,4 @@ public void Fail(string? message = null)
         HasFailed = true;
         Log($"Alteration {Alteration.GetType().Name} failed", message ?? $"{Alteration.GetType().Name} failed", LogLevel.Error);
     }
-}
+}

src/modules/alterations/Elsa.Alterations/Services/BackgroundAlterationJobDispatcher.cs

@@ -1,34 +1,25 @@
 using Elsa.Alterations.Core.Contracts;
 using Elsa.Mediator.Contracts;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Elsa.Alterations.Services;
 
 /// <summary>
 /// Dispatches an alteration job for execution using an in-memory channel.
 /// </summary>
-public class BackgroundAlterationJobDispatcher : IAlterationJobDispatcher
+public class BackgroundAlterationJobDispatcher(IJobQueue jobQueue, IServiceScopeFactory scopeFactory) : IAlterationJobDispatcher
 {
-    private readonly IJobQueue _jobQueue;
-    private readonly IAlterationJobRunner _alterationJobRunner;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BackgroundAlterationJobDispatcher"/> class.
-    /// </summary>
-    public BackgroundAlterationJobDispatcher(IJobQueue jobQueue, IAlterationJobRunner alterationJobRunner)
-    {
-        _jobQueue = jobQueue;
-        _alterationJobRunner = alterationJobRunner;
-    }
-
     /// <inheritdoc />
     public ValueTask DispatchAsync(string jobId, CancellationToken cancellationToken = default)
     {
-        _jobQueue.Enqueue(ct => ExecuteJobAsync(jobId, ct));
+        jobQueue.Enqueue(ct => ExecuteJobAsync(jobId, ct));
         return default;
     }
 
     private async Task ExecuteJobAsync(string alterationJobId, CancellationToken cancellationToken)
     {
-        await _alterationJobRunner.RunAsync(alterationJobId, cancellationToken);
+        using var scope = scopeFactory.CreateScope();
+        var alterationJobRunner = scope.ServiceProvider.GetRequiredService<IAlterationJobRunner>();
+        await alterationJobRunner.RunAsync(alterationJobId, cancellationToken);
     }
-}
+}

src/modules/dropins/Elsa.DropIns/HostedServices/DropInDirectoryMonitorHostedService.cs

@@ -67,7 +67,14 @@ private async void OnChanged(object sender, FileSystemEventArgs e)
         if (task == null)
             return;
 
-        await task;
+        try
+        {
+            await task;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error processing change for path {Path}", e.FullPath);
+        }
     }
 
     private async void OnDeleted(object sender, FileSystemEventArgs e)
@@ -77,7 +84,14 @@ private async void OnDeleted(object sender, FileSystemEventArgs e)
         if (task == null)
             return;
 
-        await task;
+        try
+        {
+            await task;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error processing delete for path {Path}", e.FullPath);
+        }
     }
 
     private async Task LoadDropInAssemblyAsync(string fullPath)
@@ -140,4 +154,4 @@ public override void Dispose()
 
         base.Dispose();
     }
-}
+}

src/modules/persistence/Elsa.Persistence.EFCore/Modules/Runtime/WorkflowExecutionLogStore.cs

@@ -103,4 +103,5 @@ private bool ShouldSerializePayload(WorkflowExecutionLogRecord source)
     }
 
     private static IQueryable<WorkflowExecutionLogRecord> Filter(IQueryable<WorkflowExecutionLogRecord> queryable, WorkflowExecutionLogRecordFilter filter) => filter.Apply(queryable);
-}
+}
+}