Skip to content

Commit

Permalink
Merge pull request #811 from Project-MONAI/AC-2017
Browse files Browse the repository at this point in the history 
added missed GetStatus method
  • Loading branch information
@neildsouth
neildsouth authored May 23, 2023
2 parents 4765ff6 + 84b0021 commit 2a9eeb5
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 27 deletions.
2 changes: 2 additions & 0 deletions docs/changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

# Changelog

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)

Renamed the (Generated) Argo client to ArgoGeneratedClient, added a new ArgoClient using just the methods used by this codebase.

Enhanced the ArgoClient -> Argo_Get_WorkflowLogsAsync method to decode the json better and make the logs extracted from Argo more readable.
Expand Down
10 changes: 5 additions & 5 deletions src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -740,16 +740,16 @@
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"fo-dicom": "5.0.3"
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"fo-dicom": "[5.0.3, )"
}
},
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[0.1.22, )",
"Monai.Deploy.Messaging": "[0.1.23, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
Expand Down
10 changes: 5 additions & 5 deletions src/TaskManager/Plug-ins/Argo/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1210,16 +1210,16 @@
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"fo-dicom": "5.0.3"
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"fo-dicom": "[5.0.3, )"
}
},
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[0.1.22, )",
"Monai.Deploy.Messaging": "[0.1.23, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
Expand Down
8 changes: 6 additions & 2 deletions src/TaskManager/Plug-ins/Email/EmailPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,11 @@ private async Task SendEmailRequestEvent(JsonMessage<EmailRequestEvent> message)
_logger.SendEmailRequestMessageSent(_requestQueue);
}

public override Task<ExecutionStatus> GetStatus(string identity, TaskCallbackEvent callbackEvent, CancellationToken cancellationToken = default) => throw new NotImplementedException();
public override Task HandleTimeout(string identity) => Task.CompletedTask; // not implemented;
public override Task<ExecutionStatus> GetStatus(string identity, TaskCallbackEvent callbackEvent, CancellationToken cancellationToken = default)
{
var result = new ExecutionStatus() { Status = TaskExecutionStatus.Succeeded };
return Task.FromResult(result);
}
public override Task HandleTimeout(string identity) => Task.CompletedTask;
}
}
39 changes: 24 additions & 15 deletions src/TaskManager/TaskManager/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1927,43 +1927,43 @@
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"fo-dicom": "5.0.3"
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"fo-dicom": "[5.0.3, )"
}
},
"monai.deploy.workflowmanager.taskmanager.aideclinicalreview": {
"type": "Project",
"dependencies": {
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"Monai.Deploy.WorkflowManager.Shared": "1.0.0",
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[0.1.22, )",
"Monai.Deploy.Messaging": "[0.1.23, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
},
"monai.deploy.workflowmanager.taskmanager.argo": {
"type": "Project",
"dependencies": {
"KubernetesClient": "10.1.4",
"Microsoft.AspNetCore.Mvc.Core": "2.2.5",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"Monai.Deploy.WorkflowManager.Shared": "1.0.0",
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
"KubernetesClient": "[10.1.4, )",
"Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.taskmanager.database": {
"type": "Project",
"dependencies": {
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
"MongoDB.Driver": "2.19.0"
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )",
"MongoDB.Driver": "[2.19.0, )"
}
},
"monai.deploy.workflowmanager.taskmanager.docker": {
Expand All @@ -1973,6 +1973,15 @@
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.taskmanager.email": {
"type": "Project",
"dependencies": {
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )",
"fo-dicom": "[5.0.3, )"
}
}
}
}
Expand Down

0 comments on commit 2a9eeb5

Please sign in to comment.