Skip to content

Commit 2a9eeb5

Browse files
neildsouthneildsouth
authored
Merge pull request #811 from Project-MONAI/AC-2017
added missed GetStatus method
2 parents 4765ff6 + 84b0021 commit 2a9eeb5

File tree

5 files changed

+42
-27
lines changed

5 files changed

+42
-27
lines changed

‎docs/changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
# Changelog
1919

20+
Added a new Email plugin, this pulls together information and sends a Message (rabbitmq) to a queue for processing via an external application (for the actual sending)
21+
2022
Renamed the (Generated) Argo client to ArgoGeneratedClient, added a new ArgoClient using just the methods used by this codebase.
2123

2224
Enhanced the ArgoClient -> Argo_Get_WorkflowLogsAsync method to decode the json better and make the logs extracted from Argo more readable.

‎src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -740,16 +740,16 @@
740740
"monai.deploy.workflowmanager.shared": {
741741
"type": "Project",
742742
"dependencies": {
743-
"Ardalis.GuardClauses": "4.0.1",
744-
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
745-
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
746-
"fo-dicom": "5.0.3"
743+
"Ardalis.GuardClauses": "[4.0.1, )",
744+
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
745+
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
746+
"fo-dicom": "[5.0.3, )"
747747
}
748748
},
749749
"monai.deploy.workflowmanager.taskmanager.api": {
750750
"type": "Project",
751751
"dependencies": {
752-
"Monai.Deploy.Messaging": "[0.1.22, )",
752+
"Monai.Deploy.Messaging": "[0.1.23, )",
753753
"Mongo.Migration": "[3.1.4, )",
754754
"MongoDB.Bson": "[2.19.0, )"
755755
}

‎src/TaskManager/Plug-ins/Argo/packages.lock.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,16 +1210,16 @@
12101210
"monai.deploy.workflowmanager.shared": {
12111211
"type": "Project",
12121212
"dependencies": {
1213-
"Ardalis.GuardClauses": "4.0.1",
1214-
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
1215-
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
1216-
"fo-dicom": "5.0.3"
1213+
"Ardalis.GuardClauses": "[4.0.1, )",
1214+
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
1215+
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
1216+
"fo-dicom": "[5.0.3, )"
12171217
}
12181218
},
12191219
"monai.deploy.workflowmanager.taskmanager.api": {
12201220
"type": "Project",
12211221
"dependencies": {
1222-
"Monai.Deploy.Messaging": "[0.1.22, )",
1222+
"Monai.Deploy.Messaging": "[0.1.23, )",
12231223
"Mongo.Migration": "[3.1.4, )",
12241224
"MongoDB.Bson": "[2.19.0, )"
12251225
}

‎src/TaskManager/Plug-ins/Email/EmailPlugin.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,11 @@ private async Task SendEmailRequestEvent(JsonMessage<EmailRequestEvent> message)
211211
_logger.SendEmailRequestMessageSent(_requestQueue);
212212
}
213213

214-
public override Task<ExecutionStatus> GetStatus(string identity, TaskCallbackEvent callbackEvent, CancellationToken cancellationToken = default) => throw new NotImplementedException();
215-
public override Task HandleTimeout(string identity) => Task.CompletedTask; // not implemented;
214+
public override Task<ExecutionStatus> GetStatus(string identity, TaskCallbackEvent callbackEvent, CancellationToken cancellationToken = default)
215+
{
216+
var result = new ExecutionStatus() { Status = TaskExecutionStatus.Succeeded };
217+
return Task.FromResult(result);
218+
}
219+
public override Task HandleTimeout(string identity) => Task.CompletedTask;
216220
}
217221
}

‎src/TaskManager/TaskManager/packages.lock.json

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,43 +1927,43 @@
19271927
"monai.deploy.workflowmanager.shared": {
19281928
"type": "Project",
19291929
"dependencies": {
1930-
"Ardalis.GuardClauses": "4.0.1",
1931-
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
1932-
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
1933-
"fo-dicom": "5.0.3"
1930+
"Ardalis.GuardClauses": "[4.0.1, )",
1931+
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
1932+
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
1933+
"fo-dicom": "[5.0.3, )"
19341934
}
19351935
},
19361936
"monai.deploy.workflowmanager.taskmanager.aideclinicalreview": {
19371937
"type": "Project",
19381938
"dependencies": {
1939-
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
1940-
"Monai.Deploy.WorkflowManager.Shared": "1.0.0",
1941-
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
1939+
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
1940+
"Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
1941+
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
19421942
}
19431943
},
19441944
"monai.deploy.workflowmanager.taskmanager.api": {
19451945
"type": "Project",
19461946
"dependencies": {
1947-
"Monai.Deploy.Messaging": "[0.1.22, )",
1947+
"Monai.Deploy.Messaging": "[0.1.23, )",
19481948
"Mongo.Migration": "[3.1.4, )",
19491949
"MongoDB.Bson": "[2.19.0, )"
19501950
}
19511951
},
19521952
"monai.deploy.workflowmanager.taskmanager.argo": {
19531953
"type": "Project",
19541954
"dependencies": {
1955-
"KubernetesClient": "10.1.4",
1956-
"Microsoft.AspNetCore.Mvc.Core": "2.2.5",
1957-
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
1958-
"Monai.Deploy.WorkflowManager.Shared": "1.0.0",
1959-
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
1955+
"KubernetesClient": "[10.1.4, )",
1956+
"Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )",
1957+
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
1958+
"Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
1959+
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
19601960
}
19611961
},
19621962
"monai.deploy.workflowmanager.taskmanager.database": {
19631963
"type": "Project",
19641964
"dependencies": {
1965-
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
1966-
"MongoDB.Driver": "2.19.0"
1965+
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )",
1966+
"MongoDB.Driver": "[2.19.0, )"
19671967
}
19681968
},
19691969
"monai.deploy.workflowmanager.taskmanager.docker": {
@@ -1973,6 +1973,15 @@
19731973
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
19741974
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
19751975
}
1976+
},
1977+
"monai.deploy.workflowmanager.taskmanager.email": {
1978+
"type": "Project",
1979+
"dependencies": {
1980+
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
1981+
"Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
1982+
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )",
1983+
"fo-dicom": "[5.0.3, )"
1984+
}
19761985
}
19771986
}
19781987
}

0 commit comments

Comments
 (0)