Merge pull request #979 from Project-MONAI/AI-437

refactor to match ticked field name predicate
Project-MONAI · Apr 16, 2024 · c44cded · c44cded
2 parents a818376 + 76cef11
commit c44cded
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/guidelines/mwm-workflow-spec.md b/guidelines/mwm-workflow-spec.md
@@ -120,6 +120,8 @@ This is the top-level object in a workflow spec. It contains the following prope
 |description|Optional[str] (200)|
 |informatics_gateway|[InformaticsGateway](#informatics-gateway)|
 |tasks|list[[Task](#tasks)]|
+|dataRetentionDays|int|
+|predicate|string[]|
 
 The following is an example of the structure of a workflow.
 
@@ -134,8 +136,9 @@ The following is an example of the structure of a workflow.
  ┗ tasks\
 &nbsp;&nbsp;&nbsp; ┣ task1\
 &nbsp;&nbsp;&nbsp; ┣ task2\
-&nbsp;&nbsp;&nbsp; ┗ task3
-
+&nbsp;&nbsp;&nbsp; ┗ task3\
+┣ dataRetentionDays\
+┣ predicate  [A detailed breakdown of predicate logic can be found here.](https://github.com/Project-MONAI/monai-deploy-workflow-manager/blob/develop/guidelines/mwm-conditionals.md)
 
 
 #### Examples
@@ -159,6 +162,8 @@ An example of a workflow with two tasks:
 			"ORTHANC"
 		]
 	},
+    "dataRetentionDays": -1,
+    "predicate" : []
 	"tasks": [
 		{
 			"id": "mean-pixel-calc",

diff --git a/src/WorkflowManager/Contracts/Models/Workflow.cs b/src/WorkflowManager/Contracts/Models/Workflow.cs
@@ -39,8 +39,8 @@ public class Workflow
         [JsonProperty(PropertyName = "dataRetentionDays")]
         public int? DataRetentionDays { get; set; } = 3;// note. -1 = never delete
 
-        [JsonProperty(PropertyName = "conditions")]
-        public string[] Conditions { get; set; } = [];
+        [JsonProperty(PropertyName = "predicate")]
+        public string[] Predicate { get; set; } = [];
 
     }
 }
diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
@@ -1120,9 +1120,9 @@ private async Task<bool> ClinicalReviewTimeOutEvent(WorkflowInstance workflowIns
 
             // check if the conditionals allow the workflow to be created
 
-            if (workflow.Workflow.Conditions.Length != 0)
+            if (workflow.Workflow.Predicate.Length != 0)
             {
-                var conditionalMet = _conditionalParameterParser.TryParse(workflow.Workflow.Conditions, workflowInstance, out var resolvedConditional);
+                var conditionalMet = _conditionalParameterParser.TryParse(workflow.Workflow.Predicate, workflowInstance, out var resolvedConditional);
                 if (conditionalMet is false)
                 {
                     return null;

diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs
@@ -3903,7 +3903,7 @@ public async Task ProcessPayload_With_Failing_Workflow_Conditional_Should_Not_Pr
                                 Description = "taskdesc"
                             }
                         ],
-                        Conditions = ["{{ context.dicom.series.any('0010','0040') }} == 'lordge'"]
+                        Predicate = ["{{ context.dicom.series.any('0010','0040') }} == 'lordge'"]
                     }
                 }
             };
@@ -3956,7 +3956,7 @@ public async Task ProcessPayload_With_Passing_Workflow_Conditional_Should_Procce
                                 Description = "taskdesc"
                             }
                         ],
-                        Conditions = ["{{ context.dicom.series.any('0010','0040') }} == 'lordge'"]
+                        Predicate = ["{{ context.dicom.series.any('0010','0040') }} == 'lordge'"]
                     }
                 }
             };