Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/Configuration/MessageBrokerConfigurationKeys.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// SPDX-FileCopyrightText: © 2022 MONAI Consortium
// SPDX-License-Identifier: Apache License 2.0

using Newtonsoft.Json;

using Microsoft.Extensions.Configuration;

namespace Monai.Deploy.WorkflowManager.Configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SPDX-License-Identifier: Apache License 2.0
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0019" />
<PackageReference Include="System.IO.Abstractions" Version="16.1.25" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Configuration/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.0-rc0035, )",
"resolved": "0.1.0-rc0035",
"contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==",
"requested": "[0.1.0-rc0036, )",
"resolved": "0.1.0-rc0036",
"contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache License 2.0
<ItemGroup>
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.141" />
<PackageReference Include="MongoDB.Bson" Version="2.15.0" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Monai.Deploy.WorkflowManager.Database.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="MongoDB.Bson" Version="2.15.0" />
<PackageReference Include="MongoDB.Driver" Version="2.15.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Database/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.0-rc0035, )",
"resolved": "0.1.0-rc0035",
"contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==",
"requested": "[0.1.0-rc0036, )",
"resolved": "0.1.0-rc0036",
"contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand Down Expand Up @@ -240,7 +240,7 @@
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.141",
"Microsoft.Extensions.Configuration": "6.0.1",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"MongoDB.Bson": "2.15.0",
"Newtonsoft.Json": "13.0.1"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache License 2.0
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0019" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache License 2.0
</ItemGroup>

<ItemGroup>
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0019" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/TaskManager/API/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net6.0": {
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.0-rc0035, )",
"resolved": "0.1.0-rc0035",
"contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==",
"requested": "[0.1.0-rc0036, )",
"resolved": "0.1.0-rc0036",
"contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand Down Expand Up @@ -245,4 +245,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ SPDX-License-Identifier: Apache License 2.0
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0019" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,6 @@ private async Task ConfigureInputArtifactStore(string templateName, ICollection<
continue;
}


var storageInfo = Event.Inputs.FirstOrDefault(p => p.Name.Equals(artifact.Name, StringComparison.Ordinal));
if (storageInfo is null)
{
Expand Down Expand Up @@ -401,7 +400,6 @@ private bool IsInputConfiguredInStepOrDag(ICollection<Template2> templates, stri
}
}


return artifacts.Any(p => p.Name.Equals(referencedArtifactName, StringComparison.Ordinal));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace Monai.Deploy.WorkflowManager.TaskManager.Argo
{
[Serializable]
internal class ArtifactMappingNotFoundException : Exception
public class ArtifactMappingNotFoundException : Exception
{
public ArtifactMappingNotFoundException()
{
Expand All @@ -24,4 +24,4 @@ protected ArtifactMappingNotFoundException(SerializationInfo info, StreamingCont
{
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SPDX-License-Identifier: Apache License 2.0
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0019" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TaskManager/Plug-ins/Argo/Specs/ArgoWorkflowsAPI.json
Original file line number Diff line number Diff line change
Expand Up @@ -9357,7 +9357,7 @@
],
"properties": {
"duration": {
"description": "Duration is the time between each retry, examples values are \"300ms\", \"1s\" or \"5m\". Valid time units are \"ns\", \"us\" (or \"�s\"), \"ms\", \"s\", \"m\", \"h\".",
"description": "Duration is the time between each retry, examples values are \"300ms\", \"1s\" or \"5m\". Valid time units are \"ns\", \"us\" (or \"�s\"), \"ms\", \"s\", \"m\", \"h\".",
"type": "string"
},
"retries": {
Expand Down
14 changes: 7 additions & 7 deletions src/TaskManager/Plug-ins/Argo/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.0-rc0035, )",
"resolved": "0.1.0-rc0035",
"contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==",
"requested": "[0.1.0-rc0036, )",
"resolved": "0.1.0-rc0036",
"contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand Down Expand Up @@ -601,7 +601,7 @@
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.141",
"Microsoft.Extensions.Configuration": "6.0.1",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"MongoDB.Bson": "2.15.0",
"Newtonsoft.Json": "13.0.1"
}
Expand All @@ -612,7 +612,7 @@
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0",
"MongoDB.Bson": "2.15.0",
Expand All @@ -628,10 +628,10 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.Storage": "0.1.0-rc0019"
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/TaskManager/Runner/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@
}
},
"AllowedHosts": "*"
}
}
16 changes: 8 additions & 8 deletions src/TaskManager/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.0-rc0035, )",
"resolved": "0.1.0-rc0035",
"contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==",
"requested": "[0.1.0-rc0036, )",
"resolved": "0.1.0-rc0036",
"contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand Down Expand Up @@ -562,7 +562,7 @@
"dependencies": {
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.Storage": "0.1.0-rc0019",
"Newtonsoft.Json": "13.0.1",
"System.IO.Abstractions": "16.1.25"
Expand All @@ -573,7 +573,7 @@
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.141",
"Microsoft.Extensions.Configuration": "6.0.1",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"MongoDB.Bson": "2.15.0",
"Newtonsoft.Json": "13.0.1"
}
Expand All @@ -584,7 +584,7 @@
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0",
"MongoDB.Bson": "2.15.0",
Expand All @@ -600,10 +600,10 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.Storage": "0.1.0-rc0019"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0019" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.141" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ SPDX-License-Identifier: Apache License 2.0
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
Expand Down
16 changes: 8 additions & 8 deletions src/WorkflowManager/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.0-rc0035, )",
"resolved": "0.1.0-rc0035",
"contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==",
"requested": "[0.1.0-rc0036, )",
"resolved": "0.1.0-rc0036",
"contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand Down Expand Up @@ -721,7 +721,7 @@
"dependencies": {
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.Storage": "0.1.0-rc0019",
"Newtonsoft.Json": "13.0.1",
"System.IO.Abstractions": "16.1.25"
Expand All @@ -732,7 +732,7 @@
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.141",
"Microsoft.Extensions.Configuration": "6.0.1",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"MongoDB.Bson": "2.15.0",
"Newtonsoft.Json": "13.0.1"
}
Expand All @@ -743,7 +743,7 @@
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0",
"MongoDB.Bson": "2.15.0",
Expand All @@ -761,7 +761,7 @@
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.Storage": "0.1.0-rc0019",
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
Expand All @@ -775,7 +775,7 @@
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.141",
"Ardalis.GuardClauses": "4.0.1",
"Monai.Deploy.Messaging": "0.1.0-rc0035",
"Monai.Deploy.Messaging": "0.1.0-rc0036",
"Monai.Deploy.Storage": "0.1.0-rc0019",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache License 2.0
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="16.1.25" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache License 2.0
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
<PackageReference Include="coverlet.collector" Version="3.1.0" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0035" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0036" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading