From b715e82ad923e2628b1b5d1216a923e6457f5dec Mon Sep 17 00:00:00 2001 From: Lillie Dae Date: Thu, 21 Jul 2022 13:24:43 +0100 Subject: [PATCH 1/3] Execution stats not working with objects of objects so parsing it as strings instead. Signed-off-by: Lillie Dae --- ...eploy.WorkflowManager.Configuration.csproj | 4 +- src/Configuration/packages.lock.json | 14 +++--- src/Contracts/Models/TaskExecution.cs | 2 +- ...ai.Deploy.WorkflowManager.Contracts.csproj | 4 +- ...nai.Deploy.WorkflowManager.Database.csproj | 6 +-- src/Database/packages.lock.json | 18 +++---- .../packages.lock.json | 14 +++--- ...loy.WorkflowManager.PayloadListener.csproj | 4 +- src/PayloadListener/packages.lock.json | 30 ++++++------ src/TaskManager/API/ExecutionStatus.cs | 2 +- ...loy.WorkflowManager.TaskManager.API.csproj | 4 +- src/TaskManager/API/packages.lock.json | 14 +++--- ....Deploy.WorkflowManager.TaskManager.csproj | 4 +- ...ager.TaskManager.AideClinicalReview.csproj | 2 +- .../AideClinicalReview/packages.lock.json | 20 ++++---- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 36 ++++++++++---- ...oy.WorkflowManager.TaskManager.Argo.csproj | 4 +- .../Plug-ins/Argo/packages.lock.json | 26 +++++----- src/TaskManager/packages.lock.json | 30 ++++++------ ...loy.WorkloadManager.WorkfowExecuter.csproj | 4 +- src/WorkflowExecuter/packages.lock.json | 26 +++++----- .../Monai.Deploy.WorkflowManager.csproj | 4 +- src/WorkflowManager/packages.lock.json | 48 +++++++++---------- ...anager.TaskManager.IntegrationTests.csproj | 2 +- ...r.WorkflowExecutor.IntegrationTests.csproj | 2 +- ...WorkflowManager.Configuration.Tests.csproj | 4 +- ...rkflowManager.PayloadListener.Tests.csproj | 4 +- .../TaskManager.Argo.Tests/ArgoPluginTest.cs | 13 +++-- .../WorkflowManager.Tests/packages.lock.json | 48 +++++++++---------- 29 files changed, 206 insertions(+), 187 deletions(-) diff --git a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index ef76f7df5..ad80fef6c 100644 --- a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -16,9 +16,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index 4b89fe7a4..08d50bf97 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -24,9 +24,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -39,11 +39,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { diff --git a/src/Contracts/Models/TaskExecution.cs b/src/Contracts/Models/TaskExecution.cs index b723d840e..3bbc7a87a 100644 --- a/src/Contracts/Models/TaskExecution.cs +++ b/src/Contracts/Models/TaskExecution.cs @@ -20,7 +20,7 @@ public class TaskExecution public DateTime? TaskStartTime { get; set; } [JsonProperty(PropertyName = "execution_stats")] - public Dictionary ExecutionStats { get; set; } + public Dictionary ExecutionStats { get; set; } [JsonProperty(PropertyName = "task_plugin_arguments")] public Dictionary TaskPluginArguments { get; set; } diff --git a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 8affc9b51..60af338d2 100644 --- a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -18,8 +18,8 @@ SPDX-License-Identifier: Apache License 2.0 - - + + diff --git a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj index c8032248c..c33a29b36 100644 --- a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -20,8 +20,8 @@ - - + + diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index 2a794db0f..cab24e901 100644 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -29,9 +29,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -44,11 +44,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "MongoDB.Bson": { @@ -255,8 +255,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json b/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json index 3f54e7e96..dbeb36827 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json +++ b/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json @@ -148,8 +148,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -162,10 +162,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { @@ -812,8 +812,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index 2ade38cd9..29167f55a 100644 --- a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -19,9 +19,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/PayloadListener/packages.lock.json b/src/PayloadListener/packages.lock.json index 96b0b1ba5..518aec055 100644 --- a/src/PayloadListener/packages.lock.json +++ b/src/PayloadListener/packages.lock.json @@ -24,9 +24,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -39,11 +39,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { @@ -922,8 +922,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -935,8 +935,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -947,8 +947,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -976,8 +976,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", diff --git a/src/TaskManager/API/ExecutionStatus.cs b/src/TaskManager/API/ExecutionStatus.cs index ac7bf2dd9..c789098b6 100644 --- a/src/TaskManager/API/ExecutionStatus.cs +++ b/src/TaskManager/API/ExecutionStatus.cs @@ -25,6 +25,6 @@ public class ExecutionStatus /// /// Contains various stats /// - public Dictionary? Stats { get; set; } + public Dictionary Stats { get; set; } } } diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index 4b50a9a14..d7d7908f0 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -22,9 +22,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index 6b69d4e02..d408067b2 100644 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -19,11 +19,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { diff --git a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 848b531b6..2f0ebff0f 100644 --- a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -39,9 +39,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj index ac18debad..67569c065 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index 4063aa96b..31f159760 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -4,11 +4,11 @@ "net6.0": { "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Ardalis.GuardClauses": { @@ -141,8 +141,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -803,8 +803,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -814,8 +814,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 0ba20c8d0..43d776022 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -148,7 +148,7 @@ public override async Task GetStatus(string identity, Cancellat var stats = GetExecutuionStats(workflow); if (stats is null) { - stats = new Dictionary(); + stats = new Dictionary(); } if (Strings.ArgoFailurePhases.Contains(workflow.Status.Phase, StringComparer.OrdinalIgnoreCase)) { @@ -192,20 +192,40 @@ public override async Task GetStatus(string identity, Cancellat } } - private Dictionary GetExecutuionStats(Workflow workflow) + private Dictionary GetExecutuionStats(Workflow workflow) { Guard.Against.Null(workflow); - var stats = new Dictionary + var stats = new Dictionary { { "workflowId", Event.WorkflowInstanceId }, - { "duration", workflow.Status?.EstimatedDuration ?? -1 }, - { "resourceDuration", workflow.Status?.ResourcesDuration }, - { "nodeInfo", workflow.Status?.Nodes }, - { "startedAt", workflow.Status?.StartedAt }, - { "finishedAt", workflow.Status?.FinishedAt } + { "duration", workflow.Status?.EstimatedDuration.ToString() ?? string.Empty }, + { "startedAt", workflow.Status?.StartedAt.ToString() ?? string.Empty }, + { "finishedAt", workflow.Status?.FinishedAt.ToString() ?? string.Empty } }; + if (workflow.Status is null) + { + return stats; + } + + if (workflow.Status.ResourcesDuration is not null) + { + foreach (var item in workflow.Status.ResourcesDuration) + { + stats.Add($"resourceDuration.{item.Key}", item.Value.ToString()); + } + } + + if (workflow.Status.Nodes is not null) + { + foreach (var item in workflow.Status.Nodes) + { + var json = JsonConvert.SerializeObject(item.Value, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }); + stats.Add($"nodes.{item.Key}", json); + } + } + return stats; } diff --git a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj index 2ed9853d8..ff8877571 100644 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -23,9 +23,9 @@ SPDX-License-Identifier: Apache License 2.0 runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index f205228c3..8e5067b9e 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -34,9 +34,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -49,11 +49,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { @@ -1038,8 +1038,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1050,8 +1050,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1077,8 +1077,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } diff --git a/src/TaskManager/packages.lock.json b/src/TaskManager/packages.lock.json index 78c506107..b00149ec9 100644 --- a/src/TaskManager/packages.lock.json +++ b/src/TaskManager/packages.lock.json @@ -60,9 +60,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -75,11 +75,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { @@ -1116,8 +1116,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -1129,8 +1129,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1141,8 +1141,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1168,8 +1168,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } diff --git a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index 0707f29f1..05a14e146 100644 --- a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -18,9 +18,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/WorkflowExecuter/packages.lock.json b/src/WorkflowExecuter/packages.lock.json index c5df486e0..0bcd3a50c 100644 --- a/src/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowExecuter/packages.lock.json @@ -22,9 +22,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -37,11 +37,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { @@ -905,8 +905,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -918,8 +918,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -930,8 +930,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 21e08bd75..7de41556e 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -34,8 +34,8 @@ SPDX-License-Identifier: Apache License 2.0 - - + + all diff --git a/src/WorkflowManager/packages.lock.json b/src/WorkflowManager/packages.lock.json index 83c45ab37..e1f34fc48 100644 --- a/src/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/packages.lock.json @@ -138,9 +138,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -153,11 +153,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0008, )", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "requested": "[0.1.2-mes-executuion-s0011, )", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Newtonsoft.Json": { @@ -1394,8 +1394,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -1407,8 +1407,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1419,8 +1419,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1439,8 +1439,8 @@ "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1466,8 +1466,8 @@ "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1478,7 +1478,7 @@ "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" } @@ -1486,8 +1486,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } @@ -1497,8 +1497,8 @@ "dependencies": { "IdentityModel.OidcClient": "5.0.0", "KubernetesClient": "7.2.19", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1518,8 +1518,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj index d725233b2..15c3ef8b3 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index a50b405a1..7f7f224d9 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj index 395eee960..ecb2acaa1 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -18,8 +18,8 @@ SPDX-License-Identifier: Apache License 2.0 runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj index ce46b781f..409bdcc47 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -18,8 +18,8 @@ SPDX-License-Identifier: Apache License 2.0 - - + + diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index c3a7c9115..cf013f6a9 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -17,7 +17,6 @@ using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.Configuration; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.Storage.API; using Monai.Deploy.WorkflowManager.Common.Interfaces; using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser; using Monai.Deploy.WorkflowManager.SharedTest; @@ -506,21 +505,21 @@ public async Task ArgoPlugin_GetStatus_HasStatsInfo() var runner = new ArgoPlugin(_serviceScopeFactory.Object, _logger.Object, message); var result = await runner.GetStatus("identity", CancellationToken.None).ConfigureAwait(false); - var objNodeInfo = result?.Stats?["nodeInfo"]; + var objNodeInfo = result?.Stats; Assert.NotNull(objNodeInfo); - var nodeInfo = ToDictionary>(objNodeInfo); + var nodeInfo = ValiateCanConvertToDictionary(objNodeInfo); - Assert.Equal(3, nodeInfo.Values.Count); - Assert.Equal("firstId", nodeInfo["first"]["id"]); + Assert.Equal(7, nodeInfo.Values.Count); + Assert.Equal("{\"id\":\"firstId\"}", nodeInfo["nodes.first"]); Assert.Empty(result?.Errors); _argoClient.Verify(p => p.WorkflowService_GetWorkflowAsync(It.Is(p => p.Equals("namespace", StringComparison.OrdinalIgnoreCase)), It.Is(p => p.Equals("identity", StringComparison.OrdinalIgnoreCase)), It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(3)); } - public static Dictionary ToDictionary(object obj) + public static Dictionary ValiateCanConvertToDictionary(object obj) { var json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }); - var dictionary = JsonConvert.DeserializeObject>(json); + var dictionary = JsonConvert.DeserializeObject>(json); return dictionary; } diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 5b7332627..5cf9072bf 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -691,8 +691,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0008", - "contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -705,10 +705,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.3-rc0008", - "contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==", + "resolved": "0.1.2-mes-executuion-s0011", + "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008" + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" } }, "Monai.Deploy.Storage": { @@ -1825,8 +1825,8 @@ "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Logging.Console": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", @@ -1866,8 +1866,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -1879,8 +1879,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1891,8 +1891,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1911,8 +1911,8 @@ "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1938,8 +1938,8 @@ "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1950,7 +1950,7 @@ "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" } @@ -1958,8 +1958,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } @@ -1969,8 +1969,8 @@ "dependencies": { "IdentityModel.OidcClient": "5.0.0", "KubernetesClient": "7.2.19", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1990,8 +1990,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0008", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008", + "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", From 42ad37f511a51aa2eab1799aace148f497931568 Mon Sep 17 00:00:00 2001 From: Lillie Dae Date: Thu, 21 Jul 2022 16:37:48 +0100 Subject: [PATCH 2/3] update storage package Signed-off-by: Lillie Dae --- ...eploy.WorkflowManager.Configuration.csproj | 4 +- src/Configuration/packages.lock.json | 14 +++--- ...ai.Deploy.WorkflowManager.Contracts.csproj | 4 +- ...nai.Deploy.WorkflowManager.Database.csproj | 6 +-- src/Database/packages.lock.json | 18 +++---- .../packages.lock.json | 14 +++--- ...loy.WorkflowManager.PayloadListener.csproj | 4 +- src/PayloadListener/packages.lock.json | 30 ++++++------ ...loy.WorkflowManager.TaskManager.API.csproj | 4 +- src/TaskManager/API/packages.lock.json | 14 +++--- ....Deploy.WorkflowManager.TaskManager.csproj | 4 +- ...ager.TaskManager.AideClinicalReview.csproj | 2 +- .../AideClinicalReview/packages.lock.json | 20 ++++---- ...oy.WorkflowManager.TaskManager.Argo.csproj | 4 +- .../Plug-ins/Argo/packages.lock.json | 26 +++++----- src/TaskManager/packages.lock.json | 30 ++++++------ ...loy.WorkloadManager.WorkfowExecuter.csproj | 4 +- src/WorkflowExecuter/packages.lock.json | 26 +++++----- .../Monai.Deploy.WorkflowManager.csproj | 4 +- src/WorkflowManager/packages.lock.json | 48 +++++++++---------- ...anager.TaskManager.IntegrationTests.csproj | 2 +- ...r.WorkflowExecutor.IntegrationTests.csproj | 2 +- ...WorkflowManager.Configuration.Tests.csproj | 4 +- ...rkflowManager.PayloadListener.Tests.csproj | 4 +- .../WorkflowManager.Tests/packages.lock.json | 48 +++++++++---------- 25 files changed, 170 insertions(+), 170 deletions(-) diff --git a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index ad80fef6c..d86f2505d 100644 --- a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -16,9 +16,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index 08d50bf97..37d464044 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -24,9 +24,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -39,11 +39,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { diff --git a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 60af338d2..23f850e4c 100644 --- a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -18,8 +18,8 @@ SPDX-License-Identifier: Apache License 2.0 - - + + diff --git a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj index c33a29b36..d978627e9 100644 --- a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -20,8 +20,8 @@ - - + + diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index cab24e901..cc8f42e39 100644 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -29,9 +29,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -44,11 +44,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "MongoDB.Bson": { @@ -255,8 +255,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json b/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json index dbeb36827..9271f02b7 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json +++ b/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json @@ -148,8 +148,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -162,10 +162,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { @@ -812,8 +812,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index 29167f55a..0a2430750 100644 --- a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -19,9 +19,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/PayloadListener/packages.lock.json b/src/PayloadListener/packages.lock.json index 518aec055..af9e04111 100644 --- a/src/PayloadListener/packages.lock.json +++ b/src/PayloadListener/packages.lock.json @@ -24,9 +24,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -39,11 +39,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { @@ -922,8 +922,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -935,8 +935,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -947,8 +947,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -976,8 +976,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index d7d7908f0..fc5b6a23a 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -22,9 +22,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index d408067b2..673fb559b 100644 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -19,11 +19,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { diff --git a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 2f0ebff0f..cccf4cba0 100644 --- a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -39,9 +39,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj index 67569c065..2a07ee2af 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index 31f159760..256a1fc45 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -4,11 +4,11 @@ "net6.0": { "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Ardalis.GuardClauses": { @@ -141,8 +141,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -803,8 +803,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -814,8 +814,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } diff --git a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj index ff8877571..0e63e61a9 100644 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -23,9 +23,9 @@ SPDX-License-Identifier: Apache License 2.0 runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 8e5067b9e..ac22f730f 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -34,9 +34,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -49,11 +49,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { @@ -1038,8 +1038,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1050,8 +1050,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1077,8 +1077,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } diff --git a/src/TaskManager/packages.lock.json b/src/TaskManager/packages.lock.json index b00149ec9..67b46a06f 100644 --- a/src/TaskManager/packages.lock.json +++ b/src/TaskManager/packages.lock.json @@ -60,9 +60,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -75,11 +75,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { @@ -1116,8 +1116,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -1129,8 +1129,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1141,8 +1141,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1168,8 +1168,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } diff --git a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index 05a14e146..e2762b0e3 100644 --- a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -18,9 +18,9 @@ SPDX-License-Identifier: Apache License 2.0 - + - + diff --git a/src/WorkflowExecuter/packages.lock.json b/src/WorkflowExecuter/packages.lock.json index 0bcd3a50c..b18450333 100644 --- a/src/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowExecuter/packages.lock.json @@ -22,9 +22,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -37,11 +37,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { @@ -905,8 +905,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -918,8 +918,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -930,8 +930,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 7de41556e..9e326e0ae 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -34,8 +34,8 @@ SPDX-License-Identifier: Apache License 2.0 - - + + all diff --git a/src/WorkflowManager/packages.lock.json b/src/WorkflowManager/packages.lock.json index e1f34fc48..8718c33e7 100644 --- a/src/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/packages.lock.json @@ -138,9 +138,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -153,11 +153,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.2-mes-executuion-s0011, )", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Newtonsoft.Json": { @@ -1394,8 +1394,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -1407,8 +1407,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1419,8 +1419,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1439,8 +1439,8 @@ "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1466,8 +1466,8 @@ "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1478,7 +1478,7 @@ "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" } @@ -1486,8 +1486,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } @@ -1497,8 +1497,8 @@ "dependencies": { "IdentityModel.OidcClient": "5.0.0", "KubernetesClient": "7.2.19", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1518,8 +1518,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj index 15c3ef8b3..1d312810c 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 7f7f224d9..5603a2ef9 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj index ecb2acaa1..156ca4a98 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -18,8 +18,8 @@ SPDX-License-Identifier: Apache License 2.0 runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj index 409bdcc47..e170bf9ef 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -18,8 +18,8 @@ SPDX-License-Identifier: Apache License 2.0 - - + + diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 5cf9072bf..88a76661e 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -691,8 +691,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "TAUPi9ptCEwLW8Kt5NZLZ+TJInJRvlXgMbLWDMIUUFV6wrc/E4BeLwaV1clip4dnWV1qHbivM+zbzPScqRaIXQ==", + "resolved": "0.1.3-rc0010", + "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -705,10 +705,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.2-mes-executuion-s0011", - "contentHash": "1PbMJKxXj2+/AfjboGmvMXYd94mdj0Vyts6DC5maH3ETyaFC3gz1UPQAv5luhY27D7YFfD0Wtw5m1QUV77wOQg==", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011" + "Monai.Deploy.Messaging": "0.1.3-rc0010" } }, "Monai.Deploy.Storage": { @@ -1825,8 +1825,8 @@ "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Logging.Console": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", @@ -1866,8 +1866,8 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Newtonsoft.Json": "13.0.1", @@ -1879,8 +1879,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1891,8 +1891,8 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1911,8 +1911,8 @@ "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1938,8 +1938,8 @@ "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1950,7 +1950,7 @@ "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" } @@ -1958,8 +1958,8 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0" } @@ -1969,8 +1969,8 @@ "dependencies": { "IdentityModel.OidcClient": "5.0.0", "KubernetesClient": "7.2.19", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", @@ -1990,8 +1990,8 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.167", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.2-mes-executuion-s0011", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.2-mes-executuion-s0011", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.1.1", "Monai.Deploy.Storage.MinIO": "0.1.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", From 27978e29a27996333b053b6ac6b60605007cd0c7 Mon Sep 17 00:00:00 2001 From: Lillie Dae Date: Fri, 22 Jul 2022 09:55:50 +0100 Subject: [PATCH 3/3] hash miss match fix Signed-off-by: Lillie Dae --- src/CLI/packages.lock.json | 6 ------ src/Configuration/packages.lock.json | 2 +- src/Database/packages.lock.json | 2 +- src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json | 2 +- src/PayloadListener/packages.lock.json | 2 +- src/TaskManager/API/packages.lock.json | 2 +- .../Plug-ins/AideClinicalReview/packages.lock.json | 2 +- src/TaskManager/Plug-ins/Argo/packages.lock.json | 2 +- src/TaskManager/packages.lock.json | 2 +- src/WorkflowExecuter/packages.lock.json | 2 +- src/WorkflowManager/packages.lock.json | 2 +- tests/UnitTests/WorkflowManager.Tests/packages.lock.json | 2 +- 12 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 src/CLI/packages.lock.json diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json deleted file mode 100644 index 2fca7fd98..000000000 --- a/src/CLI/packages.lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": 1, - "dependencies": { - "net6.0": {} - } -} \ No newline at end of file diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index 37d464044..1e5a291a4 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -26,7 +26,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index cc8f42e39..df855f2a5 100644 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -31,7 +31,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json b/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json index 9271f02b7..877759ff5 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json +++ b/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json @@ -149,7 +149,7 @@ "Monai.Deploy.Messaging": { "type": "Transitive", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/PayloadListener/packages.lock.json b/src/PayloadListener/packages.lock.json index af9e04111..dff8d876c 100644 --- a/src/PayloadListener/packages.lock.json +++ b/src/PayloadListener/packages.lock.json @@ -26,7 +26,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index 673fb559b..9248f2c01 100644 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -6,7 +6,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index 256a1fc45..ee370b31b 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -142,7 +142,7 @@ "Monai.Deploy.Messaging": { "type": "Transitive", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index ac22f730f..9af8401dc 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -36,7 +36,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/TaskManager/packages.lock.json b/src/TaskManager/packages.lock.json index 67b46a06f..2ef29e9e1 100644 --- a/src/TaskManager/packages.lock.json +++ b/src/TaskManager/packages.lock.json @@ -62,7 +62,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/WorkflowExecuter/packages.lock.json b/src/WorkflowExecuter/packages.lock.json index b18450333..39169df81 100644 --- a/src/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowExecuter/packages.lock.json @@ -24,7 +24,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/WorkflowManager/packages.lock.json b/src/WorkflowManager/packages.lock.json index 8718c33e7..8ed7d89eb 100644 --- a/src/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/packages.lock.json @@ -140,7 +140,7 @@ "type": "Direct", "requested": "[0.1.3-rc0010, )", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 88a76661e..63fc2ce79 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -692,7 +692,7 @@ "Monai.Deploy.Messaging": { "type": "Transitive", "resolved": "0.1.3-rc0010", - "contentHash": "a/PM8627wlALmYqqB1Mf1L+tBZbPQQSRgEJuGqmrZaKRqa6v614zq+67A4ZPzwzailWhkl3h1rVzuf8S1dyPAg==", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1",