Skip to content

fix misc issues #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 5, 2022
Merged

fix misc issues #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c8c62f
fix misc issues
jackschofield23 Sep 2, 2022
eaaaab7
fix build
jackschofield23 Sep 2, 2022
9b3336c
fix int tests
jackschofield23 Sep 2, 2022
20e3d66
change appsettings
jackschofield23 Sep 5, 2022
c08ee63
fix int tests
jackschofield23 Sep 5, 2022
5f49844
add output test
jackschofield23 Sep 5, 2022
8379d69
add argo documentation
jackschofield23 Sep 5, 2022
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
20 changes: 20 additions & 0 deletions guidelines/mwm-workflow-spec.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,26 @@ Example:
]
```

Artifacts also support path suffixes after the variables like so, these can be used to further dictate an artifact path:

Example:
```json
"input": [
{
"name": "input_dicom",
"value": "{{ context.input.dicom }}/study1",
"mandatory": true
}
],
"output": [
{
"name": "fracture_report",
"mandatory": true
}
]
```


> ##### Creating artifacts:
> How artifacts are created is beyond the scope of this document. The specifics differ depending on which Task Plugin is being used.
>
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.1" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.5" />
<PackageReference Include="System.IO.Abstractions" Version="17.1.1" />
</ItemGroup>

Expand Down
61 changes: 44 additions & 17 deletions src/Shared/Configuration/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,16 @@
},
"Monai.Deploy.Storage": {
"type": "Direct",
"requested": "[0.2.1, )",
"resolved": "0.2.1",
"contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==",
"requested": "[0.2.5, )",
"resolved": "0.2.5",
"contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==",
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.185",
"AWSSDK.SecurityToken": "3.7.1.190",
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
"Microsoft.Extensions.Logging": "6.0.0",
"Monai.Deploy.Storage.S3Policy": "0.2.1",
"Monai.Deploy.Storage.S3Policy": "0.2.5",
"System.IO.Abstractions": "17.1.1"
}
},
Expand All @@ -98,15 +99,15 @@
},
"AWSSDK.Core": {
"type": "Transitive",
"resolved": "3.7.12.21",
"contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A=="
"resolved": "3.7.12.26",
"contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
"resolved": "3.7.1.185",
"contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==",
"resolved": "3.7.1.190",
"contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==",
"dependencies": {
"AWSSDK.Core": "[3.7.12.21, 4.0.0)"
"AWSSDK.Core": "[3.7.12.26, 4.0.0)"
}
},
"JetBrains.Annotations": {
Expand Down Expand Up @@ -144,12 +145,28 @@
"resolved": "6.0.0",
"contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
"resolved": "6.0.8",
"contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==",
"dependencies": {
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
"resolved": "6.0.8",
"contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "kahEeykb6FyQytoZNNXuz74X85B4weIEt8Kd+0klK48bkXDWOIHAOvNjlGsPMcS9CL935Te8QGQS83JqCbpdHA==",
"resolved": "6.0.0",
"contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
"dependencies": {
"Microsoft.Extensions.Primitives": "3.0.0"
"Microsoft.Extensions.Primitives": "6.0.0"
}
},
"Microsoft.Extensions.FileProviders.Physical": {
Expand All @@ -166,10 +183,20 @@
"resolved": "3.0.0",
"contentHash": "E1GcUu8JvY/8QfqMUYTs6HlDLefMYhEzeHsjrhRqOZguBmDTFU8d8m+mGtHEyYHWMRT1TEiha0a8I2AuozDUWQ=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"Microsoft.Extensions.Hosting.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
"contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
"resolved": "6.0.1",
"contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
Expand Down Expand Up @@ -201,8 +228,8 @@
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
"resolved": "0.2.1",
"contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==",
"resolved": "0.2.5",
"contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Newtonsoft.Json": "13.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<ItemGroup>
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0012" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.1" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.5" />
<PackageReference Include="MongoDB.Bson" Version="2.17.1" />
</ItemGroup>

Expand Down
63 changes: 49 additions & 14 deletions src/TaskManager/API/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
},
"Monai.Deploy.Storage": {
"type": "Direct",
"requested": "[0.2.1, )",
"resolved": "0.2.1",
"contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==",
"requested": "[0.2.5, )",
"resolved": "0.2.5",
"contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==",
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.185",
"AWSSDK.SecurityToken": "3.7.1.190",
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
"Microsoft.Extensions.Logging": "6.0.0",
"Monai.Deploy.Storage.S3Policy": "0.2.1",
"Monai.Deploy.Storage.S3Policy": "0.2.5",
"System.IO.Abstractions": "17.1.1"
}
},
Expand All @@ -50,15 +51,15 @@
},
"AWSSDK.Core": {
"type": "Transitive",
"resolved": "3.7.12.21",
"contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A=="
"resolved": "3.7.12.26",
"contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
"resolved": "3.7.1.185",
"contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==",
"resolved": "3.7.1.190",
"contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==",
"dependencies": {
"AWSSDK.Core": "[3.7.12.21, 4.0.0)"
"AWSSDK.Core": "[3.7.12.26, 4.0.0)"
}
},
"JetBrains.Annotations": {
Expand Down Expand Up @@ -97,6 +98,40 @@
"resolved": "6.0.0",
"contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
"resolved": "6.0.8",
"contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==",
"dependencies": {
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
"resolved": "6.0.8",
"contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
"dependencies": {
"Microsoft.Extensions.Primitives": "6.0.0"
}
},
"Microsoft.Extensions.Hosting.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
}
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
"resolved": "6.0.0",
Expand All @@ -111,8 +146,8 @@
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
"resolved": "6.0.1",
"contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg=="
},
"Microsoft.Extensions.Options": {
"type": "Transitive",
Expand All @@ -133,8 +168,8 @@
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
"resolved": "0.2.1",
"contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==",
"resolved": "0.2.5",
"contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Newtonsoft.Json": "13.0.1"
Expand Down
63 changes: 49 additions & 14 deletions src/TaskManager/Database/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
},
"AWSSDK.Core": {
"type": "Transitive",
"resolved": "3.7.12.21",
"contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A=="
"resolved": "3.7.12.26",
"contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
"resolved": "3.7.1.185",
"contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==",
"resolved": "3.7.1.190",
"contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==",
"dependencies": {
"AWSSDK.Core": "[3.7.12.21, 4.0.0)"
"AWSSDK.Core": "[3.7.12.26, 4.0.0)"
}
},
"DnsClient": {
Expand Down Expand Up @@ -104,6 +104,40 @@
"resolved": "6.0.0",
"contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
"resolved": "6.0.8",
"contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==",
"dependencies": {
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
"resolved": "6.0.8",
"contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
"dependencies": {
"Microsoft.Extensions.Primitives": "6.0.0"
}
},
"Microsoft.Extensions.Hosting.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
}
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
"resolved": "6.0.0",
Expand Down Expand Up @@ -154,21 +188,22 @@
},
"Monai.Deploy.Storage": {
"type": "Transitive",
"resolved": "0.2.1",
"contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==",
"resolved": "0.2.5",
"contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==",
"dependencies": {
"AWSSDK.SecurityToken": "3.7.1.185",
"AWSSDK.SecurityToken": "3.7.1.190",
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
"Microsoft.Extensions.Logging": "6.0.0",
"Monai.Deploy.Storage.S3Policy": "0.2.1",
"Monai.Deploy.Storage.S3Policy": "0.2.5",
"System.IO.Abstractions": "17.1.1"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
"resolved": "0.2.1",
"contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==",
"resolved": "0.2.5",
"contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Newtonsoft.Json": "13.0.1"
Expand Down Expand Up @@ -265,9 +300,9 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[0.1.3-rc0012, )",
"Monai.Deploy.Storage": "[0.2.1, )",
"MongoDB.Bson": "[2.17.1, )"
"Monai.Deploy.Messaging": "0.1.3-rc0012",
"Monai.Deploy.Storage": "0.2.5",
"MongoDB.Bson": "2.17.1"
}
}
}
Expand Down
Loading