add multiple conditions to task destinations

guidelines/mwm-workflow-spec.md

@@ -373,6 +373,34 @@ Example (run my-task-id when the patient is female):
 }
 ```
 
+The following examples both function the same and act as an AND condition.
+
+```json
+{
+    ...task...
+    "task_destinations": [
+        {
+            "name": "my-task-id",
+            "conditions": ["{{context.input.dicom.series.all('0010','0040')}} == 'F' AND {{context.input.dicom.series.all('0010','0040')}} == 'M'"]
+        },
+    ],
+    ...
+}
+```
+
+```json
+{
+    ...task...
+    "task_destinations": [
+        {
+            "name": "my-task-id",
+            "conditions": ["{{context.input.dicom.series.all('0010','0040')}} == 'F'", "{{context.input.dicom.series.all('0010','0040')}} == 'M'"]
+        },
+    ],
+    ...
+}
+```
+
 ### Retention Policies
 _Future version: TBD_
 

src/WorkflowManager/ConditionsResolver/Extensions/StringExtensions.cs

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+using System.Text;
+
 namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions
 {
     public static class StringExtensions
@@ -53,5 +55,32 @@ public static string TrimStartExt(this string input, string prefixToRemove, Stri
             }
             return string.Empty;
         }
+
+        /// <summary>
+        /// Adds brackets to multiple conditions.
+        /// </summary>
+        /// <param name="input">Array of conditions.</param>
+        /// <returns></returns>
+        public static string CombineConditionString(this string[] input)
+        {
+            var value = new StringBuilder();
+
+            if (input.Length == 1)
+            {
+                return input.First();
+            }
+
+            for (var i = 0; i < input.Length; i++)
+            {
+                value.Append($"({input[i]})");
+
+                if (i != input.Length - 1)
+                {
+                    value.Append(" AND ");
+                }
+            }
+
+            return value.ToString();
+        }
     }
 }

src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs

@@ -19,6 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Monai.Deploy.WorkflowManager.Common.Interfaces;
 using Monai.Deploy.WorkflowManager.ConditionsResolver.Constants;
+using Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions;
 using Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver;
 using Monai.Deploy.WorkflowManager.Contracts.Models;
 using Monai.Deploy.WorkflowManager.Storage.Services;
@@ -92,6 +93,24 @@ private set
             }
         }
 
+        public bool TryParse(string[] conditions, WorkflowInstance workflowInstance)
+        {
+            Guard.Against.NullOrEmpty(conditions);
+            Guard.Against.Null(workflowInstance);
+            try
+            {
+                var joinedConditions = conditions.CombineConditionString();
+                joinedConditions = ResolveParameters(joinedConditions, workflowInstance);
+                var conditionalGroup = ConditionalGroup.Create(joinedConditions);
+                return conditionalGroup.Evaluate();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning($"Failure attemping to parse condition - {conditions}", ex);
+                return false;
+            }
+        }
+
         public bool TryParse(string conditions, WorkflowInstance workflowInstance)
         {
             Guard.Against.NullOrEmpty(conditions);
@@ -109,12 +128,6 @@ public bool TryParse(string conditions, WorkflowInstance workflowInstance)
             }
         }
 
-        /// <summary>
-        /// Resolves parameters in query string.
-        /// </summary>
-        /// <param name="conditions">The query string Example: {{ context.executions.task['other task'].'Fred' }}</param>
-        /// <param name="workflowInstance">workflow instance to resolve metadata parameter</param>
-        /// <returns></returns>
         public string ResolveParameters(string conditions, WorkflowInstance workflowInstance)
         {
             Guard.Against.NullOrEmpty(conditions);

src/WorkflowManager/ConditionsResolver/Parser/IConditionalParameterParser.cs

@@ -20,10 +20,34 @@ namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Parser
 {
     public interface IConditionalParameterParser
     {
+        /// <summary>
+        /// Resolves parameters in query string.
+        /// </summary>
+        /// <param name="conditions">The query string Example: {{ context.executions.other_task.'Fred' }}</param>
+        /// <param name="workflowInstance">workflow instance to resolve metadata parameter</param>
+        /// <returns></returns>
         string ResolveParameters(string conditions, WorkflowInstance workflowInstance);
 
+        /// <summary>
+        /// Resolves parameters in query string.
+        /// </summary>
+        /// <param name="conditions">The query string Example: {{ context.executions.other_task.'Fred' }}</param>
+        /// <param name="workflowInstanceId">workflow instance id to resolve metadata parameter</param>
+        /// <returns></returns>
         string ResolveParameters(string conditions, string workflowInstanceId);
 
+        /// <summary>
+        /// Verifies if an array of strings of conditions evaluates to true.
+        /// </summary>
+        /// <param name="conditions">An array of strings of conditions.</param>
+        /// <param name="workflowInstance">The workflow instance of the task.</param>
+        bool TryParse(string[] conditions, WorkflowInstance workflowInstance);
+
+        /// <summary>
+        /// Verifies if a string of conditions evaluates to true.
+        /// </summary>
+        /// <param name="conditions">A string of conditions.</param>
+        /// <param name="workflowInstance">The workflow instance of the task.</param>
         bool TryParse(string conditions, WorkflowInstance workflowInstance);
     }
 }

src/WorkflowManager/Contracts/Models/TaskDestination.cs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using System;
 using Newtonsoft.Json;
 
 namespace Monai.Deploy.WorkflowManager.Contracts.Models
@@ -24,6 +25,6 @@ public class TaskDestination
         public string Name { get; set; } = string.Empty;
 
         [JsonProperty(PropertyName = "conditions")]
-        public string Conditions { get; set; } = string.Empty;
+        public string[] Conditions { get; set; } = Array.Empty<string>();
     }
 }

src/WorkflowManager/Logging/Logging/Log.cs

@@ -162,5 +162,8 @@ public static void LogControllerEndTime(this ILogger logger, ResultExecutedConte
 
         [LoggerMessage(EventId = 32, Level = LogLevel.Debug, Message = "Verifying artifact existence on bucket {bucket}: {artifactKey}={artifactValue}.")]
         public static partial void VerifyArtifactExistence(this ILogger logger, string bucket, string artifactKey, string artifactValue);
+
+        [LoggerMessage(EventId = 33, Level = LogLevel.Debug, Message = "Task destination condition for task {taskId} with condition: {conditions} resolved to false.")]
+        public static partial void TaskDestinationConditionFalse(this ILogger logger, string conditions, string taskId);
     }
 }

src/WorkflowManager/Storage/Services/DicomService.cs

@@ -243,7 +243,7 @@ private static string GetPatientName(object[] values)
                 }
             }
 
-            if(resultStr.Any() is true)
+            if (resultStr.Any() is true)
             {
                 return string.Concat(resultStr);
             }

src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs

@@ -24,6 +24,7 @@
 using Monai.Deploy.Storage.Configuration;
 using Monai.Deploy.WorkflowManager.Common.Extensions;
 using Monai.Deploy.WorkflowManager.Common.Interfaces;
+using Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions;
 using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser;
 using Monai.Deploy.WorkflowManager.Configuration;
 using Monai.Deploy.WorkflowManager.Contracts.Constants;
@@ -507,10 +508,12 @@ private async Task<List<TaskExecution>> CreateTaskDestinations(WorkflowInstance
             foreach (var taskDest in currentTaskDestinations)
             {
                 //Evaluate Conditional
-                if (!string.IsNullOrEmpty(taskDest.Conditions)
-                    && taskDest.Conditions != string.Empty
-                    && !_conditionalParameterParser.TryParse(taskDest.Conditions, workflowInstance))
+                if (taskDest.Conditions.IsNullOrEmpty() is false
+                    && taskDest.Conditions.Any(c => string.IsNullOrWhiteSpace(c) is false)
+                    && _conditionalParameterParser.TryParse(taskDest.Conditions, workflowInstance) is false)
                 {
+                    _logger.TaskDestinationConditionFalse(taskDest.Conditions.CombineConditionString(), taskDest.Name);
+
                     continue;
                 }
 

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskDestinations.feature

@@ -114,7 +114,23 @@ Scenario: Workflow instance status remains created when any task status is eithe
     And Workflow Instance status is Created
 
 @TaskDestinationConditions
-Scenario: Workflow instance status is failed when a condition is invalid
+Scenario: Single task destinations with multiple conditions true, single task dispatch message sent
+    Given I have a clinical workflow Multi_Task_Workflow_Destination_Single_Multi_Condition_True
+    And I have a Workflow Instance WFI_Task_Destination_Multi_Condition_True with no artifacts
+    When I publish a Task Update Message Task_Update_Task_Destination_Multi_Condition_True with status Succeeded
+    Then 1 Task Dispatch event is published
+    And Workflow Instance status is Created
+
+@TaskDestinationConditions
+Scenario: Single task destinations with one condition true and one false, workflow instance status is succeeded
+    Given I have a clinical workflow Multi_Task_Workflow_Destination_Single_Multi_Condition_False
+    And I have a Workflow Instance WFI_Task_Destination_Multi_Condition_False with no artifacts
+    When I publish a Task Update Message Task_Update_Task_Destination_Multi_Condition_False with status Succeeded
+    Then A Task Dispatch event is not published
+    And Workflow Instance status is Succeeded
+
+@TaskDestinationConditions
+Scenario: Workflow instance status is succeeded when a condition is invalid
     Given I have a clinical workflow Multi_Task_Workflow_Task_Destination_Invalid_Condition
     And I have a Workflow Instance WFI_Task_Destination_Invalid_Condition with no artifacts
     When I publish a Task Update Message Task_Update_Task_Destination_Invalid_Condition with status Succeeded

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs

@@ -444,6 +444,38 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName)
                 }
             },
             new TaskUpdateTestData()
+            {
+                Name = "Task_Update_Task_Destination_Multi_Condition_True",
+                TaskUpdateEvent = new TaskUpdateEvent()
+                {
+                    WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Destination_Multi_Condition_True").WorkflowInstance.Id,
+                    ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Destination_Multi_Condition_True").WorkflowInstance.Tasks[0].ExecutionId,
+                    CorrelationId = Guid.NewGuid().ToString(),
+                    Reason = FailureReason.None,
+                    Message = "Task Message",
+                    TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Destination_Multi_Condition_True").WorkflowInstance.Tasks[0].TaskId,
+                    Metadata = new Dictionary<string, object>()
+                    {
+                    }
+                }
+            },
+            new TaskUpdateTestData()
+            {
+                Name = "Task_Update_Task_Destination_Multi_Condition_False",
+                TaskUpdateEvent = new TaskUpdateEvent()
+                {
+                    WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Destination_Multi_Condition_False").WorkflowInstance.Id,
+                    ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Destination_Multi_Condition_False").WorkflowInstance.Tasks[0].ExecutionId,
+                    CorrelationId = Guid.NewGuid().ToString(),
+                    Reason = FailureReason.None,
+                    Message = "Task Message",
+                    TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Destination_Multi_Condition_False").WorkflowInstance.Tasks[0].TaskId,
+                    Metadata = new Dictionary<string, object>()
+                    {
+                    }
+                }
+            },
+            new TaskUpdateTestData()
             {
                 Name = "Task_Update_Task_Destination_Metadata_Condition_True",
                 TaskUpdateEvent = new TaskUpdateEvent()

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs

@@ -759,6 +759,62 @@ public static WorkflowInstance CreateWorkflowInstance(string workflowName)
                 }
             },
             new WorkflowInstanceTestData()
+            {
+                Name = "WFI_Task_Destination_Multi_Condition_True",
+                WorkflowInstance = new WorkflowInstance()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    AeTitle = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_True")?.WorkflowRevision?.Workflow?.InformaticsGateway?.AeTitle,
+                    WorkflowId = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_True")?.WorkflowRevision?.WorkflowId ?? "",
+                    PayloadId = Guid.NewGuid().ToString(),
+                    StartTime = DateTime.Now,
+                    Status = Status.Created,
+                    BucketId = "bucket_1",
+                    InputMetaData = new Dictionary<string, string>()
+                    {
+                        { "", "" }
+                    },
+                    Tasks = new List<TaskExecution>
+                    {
+                        new TaskExecution()
+                        {
+                            ExecutionId = Guid.NewGuid().ToString(),
+                            TaskId = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_True")?.WorkflowRevision?.Workflow?.Tasks.FirstOrDefault()?.Id,
+                            TaskType = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_True")?.WorkflowRevision?.Workflow?.Tasks.FirstOrDefault()?.Type,
+                            Status = TaskExecutionStatus.Dispatched
+                        }
+                    }
+                }
+            },
+            new WorkflowInstanceTestData()
+            {
+                Name = "WFI_Task_Destination_Multi_Condition_False",
+                WorkflowInstance = new WorkflowInstance()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    AeTitle = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_False")?.WorkflowRevision?.Workflow?.InformaticsGateway?.AeTitle,
+                    WorkflowId = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_False")?.WorkflowRevision?.WorkflowId ?? "",
+                    PayloadId = Guid.NewGuid().ToString(),
+                    StartTime = DateTime.Now,
+                    Status = Status.Created,
+                    BucketId = "bucket_1",
+                    InputMetaData = new Dictionary<string, string>()
+                    {
+                        { "", "" }
+                    },
+                    Tasks = new List<TaskExecution>
+                    {
+                        new TaskExecution()
+                        {
+                            ExecutionId = Guid.NewGuid().ToString(),
+                            TaskId = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_False")?.WorkflowRevision?.Workflow?.Tasks.FirstOrDefault()?.Id,
+                            TaskType = Helper.GetWorkflowByName("Multi_Task_Workflow_Destination_Single_Multi_Condition_False")?.WorkflowRevision?.Workflow?.Tasks.FirstOrDefault()?.Type,
+                            Status = TaskExecutionStatus.Dispatched
+                        }
+                    }
+                }
+            },
+            new WorkflowInstanceTestData()
             {
                 Name = "WFI_Task_Destination_Metadata_Condition_False",
                 WorkflowInstance = new WorkflowInstance()