diff --git a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index 73c7fb5df..e668bbdc6 100644 --- a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/Shared/Configuration/packages.lock.json b/src/Shared/Configuration/packages.lock.json index e5ef2d8de..6c1965ede 100644 --- a/src/Shared/Configuration/packages.lock.json +++ b/src/Shared/Configuration/packages.lock.json @@ -49,9 +49,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0011, )", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "requested": "[0.1.3-rc0012, )", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/TaskManager/API/ExecutionStatus.cs b/src/TaskManager/API/ExecutionStatus.cs index e1812e837..09c30900a 100644 --- a/src/TaskManager/API/ExecutionStatus.cs +++ b/src/TaskManager/API/ExecutionStatus.cs @@ -23,7 +23,7 @@ public class ExecutionStatus /// /// Gets or sets the status of the execution. /// - public TaskExecutionStatus Status { get; set; } = TaskExecutionStatus.Unknown; + public TaskExecutionStatus Status { get; set; } = TaskExecutionStatus.Created; /// /// Gets or sets the reason of a failure. diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index e7eb3cd24..b490bc1de 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index f79fb3d66..176990c25 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-rc0011, )", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "requested": "[0.1.3-rc0012, )", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json index f6a700ac4..8a72191fa 100644 --- a/src/TaskManager/Database/packages.lock.json +++ b/src/TaskManager/Database/packages.lock.json @@ -49,15 +49,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.11", - "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" + "resolved": "3.7.12", + "contentHash": "mIQRvJhLwIB90hxMaRBMOs9FKd8fHZcOKIToYELupCMOPzkwthh0S4y674ExL8n5f+wQ/5m4U26lm1yBkHtqtA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.176", - "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", + "resolved": "3.7.1.165", + "contentHash": "vz0ryVyjs6r9FD2cy9yzujNR5MKesRivfEJJ6tOaSNcw1gw268fq9dXBLD70H/Ppdw++xxMD9HuFwANj7d8mUg==", "dependencies": { - "AWSSDK.Core": "[3.7.12.11, 4.0.0)" + "AWSSDK.Core": "[3.7.12, 4.0.0)" } }, "DnsClient": { @@ -140,8 +140,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -262,39 +262,10 @@ "resolved": "4.7.1", "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" }, - "monai.deploy.workflowmanager.contracts": { - "type": "Project", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.176", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0011", - "MongoDB.Bson": "2.17.0", - "Newtonsoft.Json": "13.0.1" - } - }, - "monai.deploy.workflowmanager.database": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.17.0", - "MongoDB.Driver": "2.17.0" - } - }, - "monai.deploy.workflowmanager.logging": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" - } - }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "MongoDB.Bson": "2.17.0" } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index ccacd4b1e..67f2ff169 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -95,8 +95,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -166,8 +166,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.0.24", - "contentHash": "hA7bacntMiZv1Yf9xtjwl/GP3GT1mG84QxhAk7ijAUD0pJhJaVVwXScE13vMpXnNtlaRDW6SeyZdWg2j2qrh4w==" + "resolved": "17.0.18", + "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ==" }, "System.Memory": { "type": "Transitive", @@ -184,21 +184,10 @@ "resolved": "4.7.1", "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" }, - "monai.deploy.workflowmanager.configuration": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0011", - "Monai.Deploy.Storage": "0.2.0-rc0014", - "Newtonsoft.Json": "13.0.1", - "System.IO.Abstractions": "17.0.24" - } - }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "MongoDB.Bson": "2.17.0" } diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index f5b817c83..1a0c5114c 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -193,7 +193,7 @@ public override async Task GetStatus(string identity, Cancellat { return new ExecutionStatus { - Status = TaskExecutionStatus.Unknown, + Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.Unknown, Errors = $"Argo status = '{workflow.Status.Phase}'. Messages = '{workflow.Status.Message}'.", Stats = 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 a31f23660..bb22df4d5 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 @@ -33,7 +33,7 @@ all 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 5c19fa607..54a3b939f 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-rc0011, )", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "requested": "[0.1.3-rc0012, )", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -529,7 +529,7 @@ "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "Newtonsoft.Json": "13.0.1", "System.IO.Abstractions": "17.0.24" @@ -538,7 +538,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "MongoDB.Bson": "2.17.0" } diff --git a/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj b/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj index c2343912b..4cd61708f 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj +++ b/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 843f30290..d5fe6981c 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 2f4462b66..6004fdb4a 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -82,9 +82,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0011, )", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "requested": "[0.1.3-rc0012, )", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -1230,7 +1230,7 @@ "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "Newtonsoft.Json": "13.0.1", "System.IO.Abstractions": "17.0.24" @@ -1239,7 +1239,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "MongoDB.Bson": "2.17.0" } @@ -1249,7 +1249,7 @@ "dependencies": { "IdentityModel.OidcClient": "5.0.0", "KubernetesClient": "7.2.19", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 3203ee757..9c1be52a9 100644 --- a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index a5aaa7a42..179ba5d41 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -370,8 +370,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -809,7 +809,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.176", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "MongoDB.Bson": "2.17.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index abe7cfd0d..3d5035e36 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -332,8 +332,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -743,7 +743,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.176", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "MongoDB.Bson": "2.17.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 9dd83dd88..04e6c155e 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -415,8 +415,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -903,7 +903,7 @@ "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "Newtonsoft.Json": "13.0.1", "System.IO.Abstractions": "17.0.24" @@ -914,7 +914,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.176", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "MongoDB.Bson": "2.17.0", "Newtonsoft.Json": "13.0.1" } @@ -953,7 +953,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.176", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 72fae098f..9635e3a4e 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -345,8 +345,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -765,7 +765,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.176", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "MongoDB.Bson": "2.17.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs index 01d6abf13..522b9761f 100644 --- a/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs +++ b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs @@ -28,14 +28,12 @@ public static bool IsTaskExecutionStatusUpdateValid(this TaskExecutionStatus new return newStatus switch { - TaskExecutionStatus.Unknown => newStatus.UnknownValidStatuses(), TaskExecutionStatus.Created => newStatus.CreatedValidStatuses(oldStatus), TaskExecutionStatus.Dispatched => newStatus.DispatchedValidStatuses(oldStatus), TaskExecutionStatus.Accepted => newStatus.AcceptedValidStatuses(oldStatus), TaskExecutionStatus.Succeeded => newStatus.SucceededValidStatuses(oldStatus), TaskExecutionStatus.Failed => newStatus.FailedValidStatuses(oldStatus), TaskExecutionStatus.Canceled => newStatus.CanceledValidStatuses(oldStatus), - TaskExecutionStatus.Exported => newStatus.ExportedValidStatuses(oldStatus), _ => false, }; } @@ -46,16 +44,14 @@ private static bool AcceptedValidStatuses(this TaskExecutionStatus newStatus, Ta oldStatus != TaskExecutionStatus.Created && oldStatus != TaskExecutionStatus.Failed && oldStatus != TaskExecutionStatus.Canceled && - oldStatus != TaskExecutionStatus.Succeeded && - oldStatus != TaskExecutionStatus.Unknown; + oldStatus != TaskExecutionStatus.Succeeded; private static bool DispatchedValidStatuses(this TaskExecutionStatus newStatus, TaskExecutionStatus oldStatus) => newStatus == TaskExecutionStatus.Dispatched && oldStatus != TaskExecutionStatus.Dispatched && oldStatus != TaskExecutionStatus.Canceled && oldStatus != TaskExecutionStatus.Failed && - oldStatus != TaskExecutionStatus.Succeeded && - oldStatus != TaskExecutionStatus.Unknown; + oldStatus != TaskExecutionStatus.Succeeded; private static bool CreatedValidStatuses(this TaskExecutionStatus newStatus, TaskExecutionStatus oldStatus) => newStatus == TaskExecutionStatus.Created && @@ -64,11 +60,7 @@ private static bool CreatedValidStatuses(this TaskExecutionStatus newStatus, Tas oldStatus != TaskExecutionStatus.Failed && oldStatus != TaskExecutionStatus.Canceled && oldStatus != TaskExecutionStatus.Succeeded && - oldStatus != TaskExecutionStatus.Accepted && - oldStatus != TaskExecutionStatus.Unknown; - - private static bool UnknownValidStatuses(this TaskExecutionStatus newStatus) => - false; + oldStatus != TaskExecutionStatus.Accepted; private static bool SucceededValidStatuses(this TaskExecutionStatus newStatus, TaskExecutionStatus oldStatus) => newStatus == TaskExecutionStatus.Succeeded && @@ -84,12 +76,5 @@ private static bool CanceledValidStatuses(this TaskExecutionStatus newStatus, Ta newStatus == TaskExecutionStatus.Canceled && oldStatus != TaskExecutionStatus.Succeeded && oldStatus != TaskExecutionStatus.Failed; - - private static bool ExportedValidStatuses(this TaskExecutionStatus newStatus, TaskExecutionStatus oldStatus) => - newStatus == TaskExecutionStatus.Exported && - oldStatus != TaskExecutionStatus.Succeeded && - oldStatus != TaskExecutionStatus.Failed && - oldStatus != TaskExecutionStatus.Created && - oldStatus != TaskExecutionStatus.Canceled; } } diff --git a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index fbd93605f..0198eae37 100644 --- a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 84e3007fa..2608be9ba 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -380,7 +380,7 @@ private async Task DispatchDicomExport(WorkflowInstance workflowInstance, } await ExportRequest(workflowInstance, task, exportDestinations, artifactValues, correlationId); - return await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstance.Id, task.TaskId, TaskExecutionStatus.Exported); + return await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstance.Id, task.TaskId, TaskExecutionStatus.Dispatched); } private async Task HandleOutputArtifacts(WorkflowInstance workflowInstance, List outputs, TaskExecution task) diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index c4ed2f14b..b223439b4 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -22,9 +22,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.3-rc0011, )", - "resolved": "0.1.3-rc0011", - "contentHash": "XIwNoQ8DVvhsVh8pEpCEbusmShOHca3Bx1MPxnBvH5vLDun1ZTAWxKL7NK2gBjsc9ORrdnQwggzXwH/qKpOZDA==", + "requested": "[0.1.3-rc0012, )", + "resolved": "0.1.3-rc0012", + "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -906,7 +906,7 @@ "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "Monai.Deploy.Storage": "0.2.0-rc0014", "Newtonsoft.Json": "13.0.1", "System.IO.Abstractions": "17.0.24" @@ -917,7 +917,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.176", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0011", + "Monai.Deploy.Messaging": "0.1.3-rc0012", "MongoDB.Bson": "2.17.0", "Newtonsoft.Json": "13.0.1" } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs index ec2751e3d..cbe89b8dc 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs @@ -94,7 +94,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, @@ -111,7 +110,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.InvalidMessage, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, @@ -128,7 +126,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.RunnerNotSupported, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, @@ -145,7 +142,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, @@ -165,7 +161,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, @@ -184,7 +179,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, @@ -204,7 +198,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", TaskId = "303c441f-7181-43cf-b1fd-83e5acec99fa", @@ -221,7 +214,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", Metadata = new Dictionary() @@ -236,7 +228,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) { WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, CorrelationId = Guid.NewGuid().ToString(), - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, @@ -252,7 +243,6 @@ public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName) { WorkflowInstanceId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Id, ExecutionId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].ExecutionId, - Status = TaskExecutionStatus.Unknown, Reason = FailureReason.None, Message = "Task Message", TaskId = Helper.GetWorkflowInstanceByName("WFI_Task_Status_Update").WorkflowInstance.Tasks[0].TaskId, diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs index f805f8c29..171f9cf8f 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs @@ -1178,7 +1178,7 @@ public static WorkflowInstance CreateWorkflowInstance(string workflowName) ExecutionId = Guid.NewGuid().ToString(), TaskId = Helper.GetWorkflowByName("Workflow_Revision_for_export_multi_dest_2").WorkflowRevision.Workflow.Tasks[1].Id, TaskType = Helper.GetWorkflowByName("Workflow_Revision_for_export_multi_dest_2").WorkflowRevision?.Workflow.Tasks[1].Type, - Status = TaskExecutionStatus.Exported, + Status = TaskExecutionStatus.Dispatched, InputArtifacts = null, OutputArtifacts = null, } @@ -1278,7 +1278,7 @@ public static WorkflowInstance CreateWorkflowInstance(string workflowName) ExecutionId = "666faff9-c702-48a9-ae37-5d92e1f6b324", TaskId = "aad3762a-5c49-499b-a368-e5f9b98408e4", TaskType = "export", - Status = TaskExecutionStatus.Exported, + Status = TaskExecutionStatus.Dispatched, InputArtifacts = null, OutputArtifacts = null, }, @@ -1390,7 +1390,7 @@ public static WorkflowInstance CreateWorkflowInstance(string workflowName) ExecutionId = "666faff9-c702-481a9-ae37-5d92e1f6b324", TaskId = "aad3762a-5c49-499b-a368-e5f9b98408e4", TaskType = "export", - Status = TaskExecutionStatus.Exported, + Status = TaskExecutionStatus.Dispatched, InputArtifacts = null, OutputArtifacts = null, }, diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index ffe83d737..a4c7c5477 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -560,7 +560,7 @@ public async Task ArgoPlugin_GetStatus_ReturnsExecutionStatusOnSuccess(string ph } else { - Assert.Equal(TaskExecutionStatus.Unknown, result.Status); + Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.Unknown, result.FailureReason); Assert.Equal($"Argo status = '{phase}'. Messages = 'error'.", result.Errors); } diff --git a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj index 9909e4148..94e23dc6f 100644 --- a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj +++ b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj @@ -27,7 +27,7 @@ - + diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs index 81563635c..8d57d1330 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs @@ -36,9 +36,6 @@ public class TaskExecutionStatusExtensions [InlineData(TaskExecutionStatus.Dispatched, TaskExecutionStatus.Canceled, true)] [InlineData(TaskExecutionStatus.Accepted, TaskExecutionStatus.Succeeded, true)] [InlineData(TaskExecutionStatus.Accepted, TaskExecutionStatus.Failed, true)] - [InlineData(TaskExecutionStatus.Dispatched, TaskExecutionStatus.Exported, true)] - [InlineData(TaskExecutionStatus.Exported, TaskExecutionStatus.Succeeded, true)] - [InlineData(TaskExecutionStatus.Exported, TaskExecutionStatus.Failed, true)] public void IsTaskExecutionStatusUpdateValid_ReturnesExpected(TaskExecutionStatus oldStatus, TaskExecutionStatus newStatus, bool expected) => Assert.Equal(expected, newStatus.IsTaskExecutionStatusUpdateValid(oldStatus)); } }