From 3d05c498a10127cc974da4e339c8ff7afa34fc81 Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 24 Aug 2023 09:46:07 +0100 Subject: [PATCH] fixup regex with timeout Signed-off-by: Neil South --- doc/dependency_decisions.yml | 49 +- guidelines/mwm-workflow-spec.md | 6 + .../ArgoCallbackConfiguration.cs | 2 +- .../BackgroundServiceSettings.cs | 2 +- .../Configuration/ConfigurationValidator.cs | 2 +- .../Configuration/DicomAgentConfiguration.cs | 2 +- .../Exceptions/ConfigurationException.cs | 2 +- .../InformaticsGatewayConfiguration.cs | 2 +- .../MessageBrokerConfiguration.cs | 2 +- .../MessageBrokerConfigurationKeys.cs | 2 +- ...rkflowManager.Common.Configuration.csproj} | 4 +- .../Configuration/PagedOptions.cs | 2 +- .../Configuration/PaginationSettings.cs | 2 +- .../Configuration/RetryConfiguration.cs | 2 +- .../Configuration/StorageConfiguration.cs | 2 +- .../Configuration/TaskManagerConfiguration.cs | 2 +- .../Configuration/WorkflowManagerOptions.cs | 5 +- src/Common/Configuration/packages.lock.json | 142 ++++ .../Miscellaneous}/ApiControllerBase.cs | 18 +- .../Miscellaneous}/Filter/PaginationFilter.cs | 2 +- .../Miscellaneous}/Filter/TimeFilter.cs | 2 +- .../Miscellaneous}/HttpLoggingExtensions.cs | 2 +- .../Miscellaneous}/IMonaiService.cs | 2 +- .../Miscellaneous}/IMonaiServiceLocator.cs | 2 +- ...rkflowManager.Common.Miscellaneous.csproj} | 8 +- .../Miscellaneous}/MonaiHealthCheck.cs | 2 +- .../Miscellaneous}/MonaiServiceLocator.cs | 2 +- .../Miscellaneous}/PatientKeys.cs | 2 +- .../Miscellaneous}/PlugInAttribute.cs | 2 +- .../Miscellaneous}/ServiceStatus.cs | 2 +- .../Miscellaneous}/Services/IUriService.cs | 4 +- .../Miscellaneous}/Services/UriService.cs | 4 +- .../Utilities/DicomTagUtilities.cs | 2 +- .../Miscellaneous}/ValidationConstants.cs | 10 +- .../Miscellaneous}/Wrappers/PagedResponse.cs | 6 +- .../Miscellaneous}/Wrappers/Response.cs | 6 +- .../Wrappers/StatsPagedResponse.cs | 6 +- .../Miscellaneous}/packages.lock.json | 119 +-- src/Monai.Deploy.WorkflowManager.sln | 32 +- src/Shared/Configuration/packages.lock.json | 199 ----- src/Shared/Shared/TimeFilter.cs | 26 - src/TaskManager/API/ExecutionStatus.cs | 2 +- .../API/ITaskDispatchEventService.cs | 4 +- ...loy.WorkflowManager.TaskManager.API.csproj | 2 +- src/TaskManager/API/packages.lock.json | 83 +- .../Database/ITaskDispatchEventRepository.cs | 2 +- .../Database/TaskDispatchEventRepository.cs | 6 +- src/TaskManager/Database/packages.lock.json | 81 +- .../AideClinicalReviewPlugin.cs | 50 +- .../Events/ClinicalReviewRequestEvent.cs | 18 +- .../Models/PatientMetadata.cs | 12 +- ...ager.TaskManager.AideClinicalReview.csproj | 4 +- .../AideClinicalReviewMetadataRepository.cs | 10 +- .../AideClinicalReview/packages.lock.json | 130 ++- src/TaskManager/Plug-ins/Argo/ArgoClient.cs | 46 +- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 31 +- src/TaskManager/Plug-ins/Argo/ArgoProvider.cs | 3 +- .../Argo/Controllers/TemplateController.cs | 2 +- .../Plug-ins/Argo/ExitHookTemplate.cs | 2 +- src/TaskManager/Plug-ins/Argo/IArgoClient.cs | 6 +- ...oy.WorkflowManager.TaskManager.Argo.csproj | 4 +- .../Repositories/ArgoMetadataRepository.cs | 10 +- .../Argo/StaticValues/ResourcesKeys.cs | 2 +- .../Plug-ins/Argo/packages.lock.json | 102 +-- .../Plug-ins/Docker/ContainerStatusMonitor.cs | 4 +- ....WorkflowManager.TaskManager.Docker.csproj | 2 +- src/TaskManager/Plug-ins/Email/EmailPlugin.cs | 21 +- ...y.WorkflowManager.TaskManager.Email.csproj | 4 +- .../Repositories/TestPluginRepository.cs | 10 +- .../TaskManager/ApplicationPartsLogger.cs | 6 +- .../Extensions/TaskManagerExtensions.cs | 10 +- .../TaskManager/GlobalSuppressions.cs | 28 + ....Deploy.WorkflowManager.TaskManager.csproj | 13 +- src/TaskManager/TaskManager/PluginStrings.cs | 2 + src/TaskManager/TaskManager/Program.cs | 50 +- .../TaskManager/Services/Http/Startup.cs | 2 +- .../Services/TaskDispatchEventService.cs | 16 +- src/TaskManager/TaskManager/TaskManager.cs | 85 +- .../TaskManager/TaskManagerException.cs | 11 +- .../TaskManager/packages.lock.json | 631 ++++----------- .../Common/Exceptions/BadRequestException.cs | 2 +- .../Exceptions/InternalServerException.cs | 2 +- .../Common/Exceptions/NotFoundException.cs | 2 +- .../Common/Extensions/ArrayExtensions.cs | 2 +- .../Common/Extensions/CollectionExtensions.cs | 4 +- .../Common/Extensions/FileExtensions.cs | 2 +- .../Extensions/StorageListExtensions.cs | 2 +- .../Common/Interfaces/IPaginatedApi.cs | 2 +- .../Common/Interfaces/IPayloadService.cs | 4 +- .../Common/Interfaces/ITasksService.cs | 4 +- .../Interfaces/IWorkflowInstanceService.cs | 4 +- .../Common/Interfaces/IWorkflowService.cs | 4 +- .../Common/Services/PayloadService.cs | 24 +- .../Common/Services/TasksService.cs | 8 +- .../Services/WorkflowInstanceService.cs | 22 +- .../Common/Services/WorkflowService.cs | 22 +- .../Constants/ParameterConstants.cs | 2 +- .../Extensions/RegexExtensions.cs | 2 +- .../Extensions/StringExtensions.cs | 2 +- .../Parser/ConditionalParameterParser.cs | 38 +- .../Parser/IConditionalParameterParser.cs | 4 +- .../Resovler/Conditional.cs | 2 +- .../Resovler/ConditionalGroup.cs | 20 +- .../ConditionsResolver/Resovler/Keyword.cs | 2 +- .../Contracts/Constants/TaskTypeConstants.cs | 4 +- .../Migrations/DocumentVersionConvert.cs | 2 +- .../M001_ExecutionStats_addVersion.cs | 4 +- .../Migrations/M001_Payload_addVerion.cs | 4 +- .../M001_WorkflowInstance_addVerion.cs | 4 +- .../M001_WorkflowRevision_addVerion.cs | 4 +- .../M002_ExecutionStats_addWorkflowId.cs | 4 +- .../M002_Payload_addPayloadDeleted.cs | 4 +- .../Contracts/Models/Artifact.cs | 2 +- .../Contracts/Models/ArtifactMap.cs | 2 +- .../Contracts/Models/DicomValue.cs | 2 +- .../Contracts/Models/ExecutionStatDTO.cs | 2 +- .../Contracts/Models/ExecutionStats.cs | 4 +- .../Contracts/Models/ExportDestination.cs | 4 +- .../Contracts/Models/ISoftDeleteable.cs | 2 +- .../Contracts/Models/InformaticsGateway.cs | 2 +- .../Contracts/Models/PatientDetails.cs | 2 +- .../Contracts/Models/Payload.cs | 4 +- .../Contracts/Models/PayloadDto.cs | 2 +- .../Contracts/Models/Status.cs | 2 +- .../Contracts/Models/TaskDestination.cs | 2 +- .../Contracts/Models/TaskExecution.cs | 2 +- .../Contracts/Models/TaskObject.cs | 2 +- .../Contracts/Models/Workflow.cs | 2 +- .../Contracts/Models/WorkflowInstance.cs | 4 +- .../Contracts/Models/WorkflowRevision.cs | 4 +- .../Contracts/Models/WorkflowUpdateRequest.cs | 6 +- ...ai.Deploy.WorkflowManager.Contracts.csproj | 2 +- .../Responses/CreateWorkflowResponse.cs | 2 +- .../Database/Interfaces/IPayloadRepository.cs | 4 +- .../ITaskExecutionStatsRepository.cs | 4 +- .../Database/Interfaces/ITasksRepository.cs | 4 +- .../Interfaces/IWorkflowInstanceRepository.cs | 4 +- .../Interfaces/IWorkflowRepository.cs | 4 +- .../Options/ExecutionStatsDatabaseSettings.cs | 2 +- .../WorkloadManagerDatabaseSettings.cs | 2 +- .../Repositories/PayloadRepository.cs | 18 +- .../Database/Repositories/RepositoryBase.cs | 6 +- .../TaskExecutionStatsRepository.cs | 8 +- .../Database/Repositories/TasksRepository.cs | 10 +- .../WorkflowInstanceRepository.cs | 11 +- .../Repositories/WorkflowRepository.cs | 18 +- .../Database/packages.lock.json | 81 +- .../Logging/Log.100000.Http.cs | 2 +- .../Logging/Log.200000.Workflow.cs | 4 +- .../Logging/Log.300000.Payload.cs | 2 +- .../Logging/Log.500000.Messaging.cs | 2 +- .../Logging/Log.600000.Dicom.cs | 2 +- .../Logging/Log.700000.Artifact.cs | 4 +- .../Logging/Log.800000.Database.cs | 4 +- .../Logging/Log.900000.General.cs | 2 +- .../Logging/packages.lock.json | 81 +- .../packages.lock.json | 124 ++- .../Logging/Log.400000.cs | 2 +- .../MonaiBackgroundService/Worker.cs | 18 +- .../Extensions/ValidationExtensions.cs | 4 +- ...loy.WorkflowManager.PayloadListener.csproj | 5 +- .../Services/EventPayloadRecieverService.cs | 10 +- .../Services/IEventPayloadRecieverService.cs | 2 +- .../Services/PayloadListenerService.cs | 87 +- .../Validators/EventPayloadValidator.cs | 6 +- .../Validators/IEventPayloadValidator.cs | 2 +- .../PayloadListener/packages.lock.json | 184 ++--- .../IInformaticsGatewayService.cs | 2 +- .../InformaticsGatewayService.cs | 6 +- ...nai.Deploy.WorkflowManager.Services.csproj | 2 +- .../Services/packages.lock.json | 756 ++++++++++++++++++ .../Storage/Constants/DicomTagConstants.cs | 2 +- ...onai.Deploy.WorkflowManager.Storage.csproj | 2 +- .../Storage/Services/DicomService.cs | 42 +- .../Storage/Services/IDicomService.cs | 4 +- .../Storage/packages.lock.json | 114 +-- .../WorkflowExecuter/Common/ArtifactMapper.cs | 24 +- .../WorkflowExecuter/Common/EventMapper.cs | 30 +- .../Common/IArtifactMapper.cs | 4 +- .../Common/TaskExecutionStatusExtensions.cs | 6 +- ...loy.WorkloadManager.WorkfowExecuter.csproj | 4 +- .../Services/IWorkflowExecuterService.cs | 4 +- .../Services/WorkflowExecuterService.cs | 100 ++- .../WorkflowExecuter/packages.lock.json | 168 ++-- .../AuthenticatedApiControllerBase.cs | 4 +- .../Controllers/PayloadsController.cs | 20 +- .../Controllers/TaskStatsController.cs | 18 +- .../Controllers/TasksController.cs | 18 +- .../Controllers/WFMApiControllerBase.cs | 4 +- .../Controllers/WorkflowInstanceController.cs | 18 +- .../Controllers/WorkflowsController.cs | 30 +- .../Extentions/WorkflowExecutorExtensions.cs | 22 +- .../WorkflowManager/GlobalSuppressions.cs | 24 + .../WorkflowManager/Models/TasksRequest.cs | 2 +- .../Monai.Deploy.WorkflowManager.csproj | 16 +- .../WorkflowManager/Program.cs | 24 +- .../DataRetentionService.cs | 6 +- .../WorkflowManager/Services/Http/Startup.cs | 6 +- .../Validators/WorkflowValidator.cs | 177 ++-- .../WorkflowManager/appsettings.json | 3 +- .../WorkflowManager/packages.lock.json | 630 ++++----------- .../TaskManager.IntegrationTests/Hooks.cs | 9 +- ...anager.TaskManager.IntegrationTests.csproj | 14 +- .../POCO/TestExecutionConfig.cs | 50 +- .../StepDefinitions/CommonApiDefinitions.cs | 4 +- .../StepDefinitions/CommonStepDefinitions.cs | 5 +- .../Support/ApiHelper.cs | 13 +- .../Support/Assertions.cs | 14 +- .../Support/DataHelper.cs | 4 +- .../Support/HttpRequestMessageExtensions.cs | 2 +- .../Support/MinioClientUtil.cs | 45 +- .../Support/RabbitConsumer.cs | 9 +- .../Support/RabbitPublisher.cs | 2 +- .../TestData/Helper.cs | 2 +- .../TestData/TaskCallbackTestData.cs | 7 +- .../Hooks.cs | 14 +- .../WorkflowRequestMessage.cs | 2 +- .../Models/Storage/VirtuaFileInfo.cs | 2 +- ...r.WorkflowExecutor.IntegrationTests.csproj | 12 +- .../POCO/HealthCheckResponse.cs | 2 +- .../POCO/TestExecutionConfig.cs | 6 +- .../CommonApiStepDefinitions.cs | 10 +- .../ExecutionStatsStepDefinitions.cs | 11 +- .../PayloadApiStepDefinitions.cs | 8 +- .../PayloadCollectionStepDefinitions.cs | 8 +- .../TaskDestinationsStepDefinitions.cs | 4 +- .../TaskStatusUpdateStepDefinitions.cs | 11 +- .../TasksApiStepDefinitions.cs | 10 +- .../WorkflowApiStepDefinitions.cs | 13 +- .../WorkflowInstanceStepDefintions.cs | 8 +- .../WorkflowInstancesApiStepDefinitions.cs | 14 +- .../WorkflowRequestStepDefinitions.cs | 10 +- .../WorkflowTaskArtifactStepDefinitions.cs | 6 +- .../Support/ApiHelper.cs | 7 +- .../Support/Assertions.cs | 18 +- .../Support/DataHelper.cs | 12 +- .../Support/HttpRequestMessageExtensions.cs | 2 +- .../Support/JsonFormatter.cs | 2 +- .../Support/MessageReceiver.cs | 2 +- .../Support/MinioClientUtil.cs | 44 +- .../Support/MinioDataSeeding.cs | 16 +- .../Support/MongoClientUtil.cs | 8 +- .../Support/RabbitConnectionFactory.cs | 4 +- .../Support/RabbitConsumer.cs | 53 +- .../Support/RabbitPublisher.cs | 2 +- .../Support/WorkflowExecutorStartup.cs | 24 +- .../TestData/ExecutionStatsTestData.cs | 4 +- .../TestData/ExportCompleteTestData.cs | 4 +- .../TestData/Helper.cs | 2 +- .../TestData/PatientTestData.cs | 4 +- .../TestData/PayloadTestData.cs | 4 +- .../TestData/TaskRequestTestData.cs | 4 +- .../TestData/TaskUpdateTestData.cs | 2 +- .../TestData/WorkflowInstanceTestData.cs | 8 +- .../TestData/WorkflowObjectTestData.cs | 4 +- .../TestData/WorkflowRequestTestData.cs | 4 +- .../TestData/WorkflowRevisionTestData.cs | 4 +- tests/Shared/VerifyLogExtension.cs | 7 +- .../Extensions/CollectionExtensionsTests.cs | 6 +- .../Extensions/FileExtensionsTests.cs | 4 +- .../Extensions/StorageListExtensionsTests.cs | 4 +- .../Services/PayloadServiceTests.cs | 14 +- .../Services/TasksServiceTests.cs | 10 +- .../Services/WorkflowInstanceServiceTests.cs | 15 +- .../Services/WorkflowServiceTests.cs | 10 +- .../Resolver/ConditionalGroupTests.cs | 5 +- .../Resolver/ConditionalTests.cs | 8 +- .../Resolver/RegexExtensionsTests.cs | 8 +- .../Resolver/StringExtensionsTests.cs | 4 +- .../ConfigurationValidatorTest.cs | 4 +- ...WorkflowManager.Configuration.Tests.csproj | 2 +- .../Configuration.Tests/VerifyLogExtension.cs | 2 +- .../TaskExecutionStatsRepositoryTests.cs | 8 +- .../Database.Tests/TaskExecutionStatsTests.cs | 84 -- .../DicomTagUtilitiesTests.cs | 4 +- .../HttpLoggingExtensionsTests.cs | 3 +- ...Deploy.WorkflowManager.Shared.Tests.csproj | 2 +- .../MonaiHealthCheckTests.cs | 7 +- .../MonaiServiceLocatorTests.cs | 4 +- .../UriServiceTests.cs | 8 +- .../WorkerTests.cs | 10 +- .../EventPayloadRecieverServiceTests.cs | 31 +- .../Validators/EventPayloadValidatorTests.cs | 46 +- .../PayloadListener.Tests/packages.lock.json | 153 ++-- .../Services/DicomServiceTests.cs | 8 +- .../AideClinicalReviewPluginTests.cs | 4 +- .../TaskManager.Argo.Tests/ArgoClientTest.cs | 4 + .../TaskManager.Argo.Tests/ArgoPluginTest.cs | 7 +- .../ArgoPluginTestBase.cs | 4 +- .../Controller/TemplateControllerTests.cs | 4 +- .../ContainerStatusMonitorTest.cs | 2 +- .../DockerPluginTest.cs | 5 +- .../EmailPluginTests.cs | 14 +- ...y.WorkflowManager.TaskManager.Tests.csproj | 2 +- .../Services/TaskDispatchEventServiceTests.cs | 7 +- .../TaskManager.Tests/TaskManagerTest.cs | 5 +- .../Common/ArtifactMapperTests.cs | 8 +- .../Common/EventMapperTests.cs | 6 +- .../TaskExecutionStatusExtensionsTests.cs | 4 +- .../ConditionalParameterParserTests.cs | 10 +- .../Services/WorkflowExecuterServiceTests.cs | 523 +++++++++++- .../InformaticsGatewayServiceTests.cs | 8 +- ...ploy.WorkflowManager.Services.Tests.csproj | 2 +- .../Controllers/PayloadControllerTests.cs | 26 +- .../TaskExecutionStatsControllerTests.cs | 23 +- .../Controllers/TasksControllerTests.cs | 24 +- .../WorkflowInstanceControllerTests.cs | 29 +- .../Controllers/WorkflowsControllerTests.cs | 31 +- .../DummyMessagingService.cs | 8 +- .../DummyStorageService.cs | 2 +- .../Monai.Deploy.WorkflowManager.Tests.csproj | 4 +- .../WorkflowManager.Tests/ProgramTest.cs | 2 +- .../DataRetentionServiceTest.cs | 13 +- .../Shared/VerifyLogExtension.cs | 22 +- .../Validators/WorkflowValidatorTests.cs | 508 +++++++++++- .../WorkflowManager.Tests/appsettings.json | 6 +- .../WorkflowManager.Tests/packages.lock.json | 643 +++++++++++---- 317 files changed, 4880 insertions(+), 3602 deletions(-) rename src/{Shared => Common}/Configuration/ArgoCallbackConfiguration.cs (95%) rename src/{Shared => Common}/Configuration/BackgroundServiceSettings.cs (93%) rename src/{Shared => Common}/Configuration/ConfigurationValidator.cs (97%) rename src/{Shared => Common}/Configuration/DicomAgentConfiguration.cs (95%) rename src/{Shared => Common}/Configuration/Exceptions/ConfigurationException.cs (94%) rename src/{Shared => Common}/Configuration/InformaticsGatewayConfiguration.cs (94%) rename src/{Shared => Common}/Configuration/MessageBrokerConfiguration.cs (96%) rename src/{Shared => Common}/Configuration/MessageBrokerConfigurationKeys.cs (98%) rename src/{Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj => Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj} (98%) mode change 100755 => 100644 rename src/{Shared => Common}/Configuration/PagedOptions.cs (93%) rename src/{Shared => Common}/Configuration/PaginationSettings.cs (93%) rename src/{Shared => Common}/Configuration/RetryConfiguration.cs (96%) rename src/{Shared => Common}/Configuration/StorageConfiguration.cs (97%) rename src/{Shared => Common}/Configuration/TaskManagerConfiguration.cs (98%) rename src/{Shared => Common}/Configuration/WorkflowManagerOptions.cs (94%) mode change 100755 => 100644 create mode 100644 src/Common/Configuration/packages.lock.json rename src/{Shared/Shared => Common/Miscellaneous}/ApiControllerBase.cs (85%) rename src/{Shared/Shared => Common/Miscellaneous}/Filter/PaginationFilter.cs (96%) rename src/{Shared/Shared => Common/Miscellaneous}/Filter/TimeFilter.cs (91%) rename src/{Shared/Shared => Common/Miscellaneous}/HttpLoggingExtensions.cs (97%) rename src/{Shared/Shared => Common/Miscellaneous}/IMonaiService.cs (92%) rename src/{Shared/Shared => Common/Miscellaneous}/IMonaiServiceLocator.cs (92%) rename src/{Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj => Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj} (92%) mode change 100755 => 100644 rename src/{Shared/Shared => Common/Miscellaneous}/MonaiHealthCheck.cs (96%) rename src/{Shared/Shared => Common/Miscellaneous}/MonaiServiceLocator.cs (97%) rename src/{Shared/Shared => Common/Miscellaneous}/PatientKeys.cs (96%) rename src/{Shared/Shared => Common/Miscellaneous}/PlugInAttribute.cs (92%) rename src/{Shared/Shared => Common/Miscellaneous}/ServiceStatus.cs (95%) rename src/{Shared/Shared => Common/Miscellaneous}/Services/IUriService.cs (88%) rename src/{Shared/Shared => Common/Miscellaneous}/Services/UriService.cs (93%) rename src/{Shared/Shared => Common/Miscellaneous}/Utilities/DicomTagUtilities.cs (95%) rename src/{Shared/Shared => Common/Miscellaneous}/ValidationConstants.cs (94%) rename src/{Shared/Shared => Common/Miscellaneous}/Wrappers/PagedResponse.cs (94%) rename src/{Shared/Shared => Common/Miscellaneous}/Wrappers/Response.cs (90%) rename src/{Shared/Shared => Common/Miscellaneous}/Wrappers/StatsPagedResponse.cs (84%) rename src/{Shared/Shared => Common/Miscellaneous}/packages.lock.json (62%) delete mode 100755 src/Shared/Configuration/packages.lock.json delete mode 100644 src/Shared/Shared/TimeFilter.cs create mode 100644 src/TaskManager/TaskManager/GlobalSuppressions.cs rename src/WorkflowManager/{Monai.Deploy.WorkflowManager.Services => Services}/InformaticsGateway/IInformaticsGatewayService.cs (92%) rename src/WorkflowManager/{Monai.Deploy.WorkflowManager.Services => Services}/InformaticsGateway/InformaticsGatewayService.cs (91%) rename src/WorkflowManager/{Monai.Deploy.WorkflowManager.Services => Services}/Monai.Deploy.WorkflowManager.Services.csproj (93%) create mode 100644 src/WorkflowManager/Services/packages.lock.json create mode 100644 src/WorkflowManager/WorkflowManager/GlobalSuppressions.cs delete mode 100644 tests/UnitTests/Database.Tests/TaskExecutionStatsTests.cs diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 56ea892e4..027801285 100755 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -8,6 +8,7 @@ - 3.7.100.14 - 3.7.100.25 - 3.7.105.20 + - 3.7.200.13 :when: 2022-10-14 23:36:39.233755632 Z - - :approve - AWSSDK.SecurityToken @@ -18,6 +19,7 @@ - 3.7.100.14 - 3.7.100.25 - 3.7.101.26 + - 3.7.201.9 :when: 2022-10-14 23:36:39.628260680 Z - - :approve - Ardalis.GuardClauses @@ -25,7 +27,8 @@ :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE) :versions: - 4.0.1 - :when: 2022-10-14 23:36:39.999308652 Z + - 4.1.1 + :when: 2023-08-15 16:36:39.999308652 Z - - :approve - AutoFixture - :who: mocsharp @@ -399,6 +402,8 @@ :versions: - 6.0.1 - 7.0.0 + - 2.2.0 + - 3.1.0 :when: 2022-10-14 23:37:00.596541774 Z - - :approve - Microsoft.Extensions.Configuration.Abstractions @@ -414,6 +419,7 @@ :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 3.0.0 + - 3.1.0 - 2.2.0 - 7.0.3 :when: 2022-10-14 23:37:01.366955631 Z @@ -469,6 +475,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: + - 3.1.0 - 6.0.0 - 6.0.1 - 2.2.0 @@ -506,6 +513,7 @@ - 6.0.12 - 6.0.14 - 6.0.15 + - 6.0.21 :when: 2022-10-14 23:37:05.589288760 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions @@ -515,6 +523,7 @@ - 6.0.12 - 6.0.14 - 6.0.15 + - 6.0.21 :when: 2022-10-14 23:37:05.963687838 Z - - :approve - Microsoft.Extensions.FileProviders.Abstractions @@ -585,6 +594,8 @@ :versions: - 6.0.0 - 7.0.0 + - 2.2.0 + - 3.1.0 :when: 2022-10-14 23:37:09.454044811 Z - - :approve - Microsoft.Extensions.Logging.Abstractions @@ -593,7 +604,9 @@ :versions: - 6.0.2 - 2.0.0 + - 6.0.4 - 7.0.0 + - 6.0.4 :when: 2022-10-14 23:37:09.821156462 Z - - :approve - Microsoft.Extensions.Logging.Configuration @@ -851,6 +864,7 @@ :versions: - 4.0.6 - 4.0.7 + - 5.0.0 :when: 2022-10-14 23:37:22.726827733 Z - - :approve - Moq @@ -923,6 +937,7 @@ :why: BSD-3-Clause (https://github.com/App-vNext/Polly/raw/main/LICENSE.txt) :versions: - 7.2.3 + - 7.2.4 :when: 2022-10-14 23:37:30.185774702 Z - - :approve - RabbitMQ.Client @@ -930,6 +945,7 @@ :why: Apache-2.0 (https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2) :versions: - 6.4.0 + - 6.5.0 :when: 2022-10-14 23:37:30.555988654 Z - - :approve - Serilog @@ -1195,7 +1211,15 @@ :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 5.0.0 + - 4.3.0 :when: 2022-10-14 23:37:45.155805918 Z +- - :approve + - System.ComponentModel + - :who: nsouth + :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) + :versions: + - 4.3.0 + :when: 2023-8-18 08:53:45.155805918 Z - - :approve - System.Configuration.ConfigurationManager - :who: mocsharp @@ -1381,6 +1405,13 @@ :versions: - 4.3.0 :when: 2022-10-14 23:37:55.295846123 Z +- - :approve + - System.IO.Hashing + - :who: nsouth + :why: MIT + :versions: + - 7.0.0 + :when: 2023-8-18 08:53:55.295846123 Z - - :approve - System.IdentityModel.Tokens.Jwt - :who: mocsharp @@ -1425,6 +1456,7 @@ :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - 4.5.4 + - 4.5.5 :when: 2022-10-14 23:37:58.271685148 Z - - :approve - System.Net.Http @@ -1902,6 +1934,7 @@ :versions: - 4.7.1 - 6.0.0 + - 7.0.0 :when: 2022-10-14 23:38:26.916570960 Z - - :approve - System.Threading.Tasks @@ -2336,6 +2369,7 @@ :versions: - 0.1.21 - 0.1.23 + - 0.1.25 :when: 2022-12-15 21:43:10.781625468 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ @@ -2344,6 +2378,7 @@ :versions: - 0.1.21 - 0.1.23 + - 0.1.25 :when: 2022-12-15 21:43:20.975488411 Z - - :approve - Monai.Deploy.Storage @@ -2353,6 +2388,7 @@ - 0.2.10 - 0.2.13 - 0.2.15 + - 0.2.18 :when: 2022-11-02 21:43:46.964761113 Z - - :approve - Monai.Deploy.Storage.MinIO @@ -2362,6 +2398,7 @@ - 0.2.10 - 0.2.13 - 0.2.15 + - 0.2.18 :when: 2022-11-02 21:43:57.620687413 Z - - :approve - Monai.Deploy.Storage.S3Policy @@ -2371,6 +2408,7 @@ - 0.2.10 - 0.2.13 - 0.2.15 + - 0.2.18 :when: 2022-11-02 21:44:06.994266372 Z - - :approve - MongoDB.Bson @@ -2553,6 +2591,7 @@ :why: MIT (https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/License.md) :versions: - 7.1.2 + - 8.1.0 :when: 2023-05-17 14:44:00.000000000 Z - - :approve - fo-dicom @@ -2561,5 +2600,11 @@ :versions: - 5.0.3 :when: 2023-05-17 14:44:00.000000000 Z - +- - :approve + - CommunityToolkit.HighPerformance + - :who: nsouth + :why: MIT + :versions: + - 8.1.0 + :when: 2023-08-18 09:09:00.000000000 Z diff --git a/guidelines/mwm-workflow-spec.md b/guidelines/mwm-workflow-spec.md index c6cf37cf9..275d1e470 100644 --- a/guidelines/mwm-workflow-spec.md +++ b/guidelines/mwm-workflow-spec.md @@ -249,6 +249,7 @@ These tasks are borken down into different types: | ---- | ------- | | Router | A task to control the flow through a workflow | | Export | A task to trigger the exporting of data | +| External App | A task to trigger execution of an external app | | `Plugin_Name` | A task which has a matching Plugin installed & enabled | @@ -402,6 +403,11 @@ Example (output sent to another task if the patient is female, otherwise to PACS Export destinations define an external location to which the output of the task can be sent. This will take the form of an event published to a pub/sub service notifying of an available export to a specific destination reference. Most commonly, the export location will be a PACs system and the notification will be picked up by the Monai Informatics Gateway. +#### External App +These are task types that allow for execution of external apps and in +structure are identical to the Export type above. + + #### Plugin These are tasks are Named the same as the installed Pluging. The task also requires these extra attributes:- diff --git a/src/Shared/Configuration/ArgoCallbackConfiguration.cs b/src/Common/Configuration/ArgoCallbackConfiguration.cs similarity index 95% rename from src/Shared/Configuration/ArgoCallbackConfiguration.cs rename to src/Common/Configuration/ArgoCallbackConfiguration.cs index 402e11f62..5ab8e2d81 100644 --- a/src/Shared/Configuration/ArgoCallbackConfiguration.cs +++ b/src/Common/Configuration/ArgoCallbackConfiguration.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class ArgoCallbackConfiguration { diff --git a/src/Shared/Configuration/BackgroundServiceSettings.cs b/src/Common/Configuration/BackgroundServiceSettings.cs similarity index 93% rename from src/Shared/Configuration/BackgroundServiceSettings.cs rename to src/Common/Configuration/BackgroundServiceSettings.cs index d1161ea8b..79d5c9462 100644 --- a/src/Shared/Configuration/BackgroundServiceSettings.cs +++ b/src/Common/Configuration/BackgroundServiceSettings.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class BackgroundServiceSettings { diff --git a/src/Shared/Configuration/ConfigurationValidator.cs b/src/Common/Configuration/ConfigurationValidator.cs similarity index 97% rename from src/Shared/Configuration/ConfigurationValidator.cs rename to src/Common/Configuration/ConfigurationValidator.cs index 71f9c3529..b1ba52a89 100644 --- a/src/Shared/Configuration/ConfigurationValidator.cs +++ b/src/Common/Configuration/ConfigurationValidator.cs @@ -19,7 +19,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { /// /// Validates configuration based on application requirements and DICOM VR requirements. diff --git a/src/Shared/Configuration/DicomAgentConfiguration.cs b/src/Common/Configuration/DicomAgentConfiguration.cs similarity index 95% rename from src/Shared/Configuration/DicomAgentConfiguration.cs rename to src/Common/Configuration/DicomAgentConfiguration.cs index a42dedbac..16cbb1c6d 100644 --- a/src/Shared/Configuration/DicomAgentConfiguration.cs +++ b/src/Common/Configuration/DicomAgentConfiguration.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class DicomAgentConfiguration { diff --git a/src/Shared/Configuration/Exceptions/ConfigurationException.cs b/src/Common/Configuration/Exceptions/ConfigurationException.cs similarity index 94% rename from src/Shared/Configuration/Exceptions/ConfigurationException.cs rename to src/Common/Configuration/Exceptions/ConfigurationException.cs index c3f38151f..f5653f2ff 100644 --- a/src/Shared/Configuration/Exceptions/ConfigurationException.cs +++ b/src/Common/Configuration/Exceptions/ConfigurationException.cs @@ -17,7 +17,7 @@ using System; using System.Runtime.Serialization; -namespace Monai.Deploy.WorkflowManager.Configuration.Exceptions +namespace Monai.Deploy.WorkflowManager.Common.Configuration.Exceptions { /// /// Represnets an exception based upon invalid configuration. diff --git a/src/Shared/Configuration/InformaticsGatewayConfiguration.cs b/src/Common/Configuration/InformaticsGatewayConfiguration.cs similarity index 94% rename from src/Shared/Configuration/InformaticsGatewayConfiguration.cs rename to src/Common/Configuration/InformaticsGatewayConfiguration.cs index b2c316846..61bc18e3c 100644 --- a/src/Shared/Configuration/InformaticsGatewayConfiguration.cs +++ b/src/Common/Configuration/InformaticsGatewayConfiguration.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class InformaticsGatewayConfiguration { diff --git a/src/Shared/Configuration/MessageBrokerConfiguration.cs b/src/Common/Configuration/MessageBrokerConfiguration.cs similarity index 96% rename from src/Shared/Configuration/MessageBrokerConfiguration.cs rename to src/Common/Configuration/MessageBrokerConfiguration.cs index ac9b15755..b227190f0 100644 --- a/src/Shared/Configuration/MessageBrokerConfiguration.cs +++ b/src/Common/Configuration/MessageBrokerConfiguration.cs @@ -17,7 +17,7 @@ using Microsoft.Extensions.Configuration; using Monai.Deploy.Messaging.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class MessageBrokerConfiguration : MessageBrokerServiceConfiguration { diff --git a/src/Shared/Configuration/MessageBrokerConfigurationKeys.cs b/src/Common/Configuration/MessageBrokerConfigurationKeys.cs similarity index 98% rename from src/Shared/Configuration/MessageBrokerConfigurationKeys.cs rename to src/Common/Configuration/MessageBrokerConfigurationKeys.cs index 116d6c387..96e7e0c2e 100644 --- a/src/Shared/Configuration/MessageBrokerConfigurationKeys.cs +++ b/src/Common/Configuration/MessageBrokerConfigurationKeys.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class MessageBrokerConfigurationKeys { diff --git a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj old mode 100755 new mode 100644 similarity index 98% rename from src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj rename to src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj index 59cff5a15..a1d8eb30a --- a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj @@ -31,8 +31,8 @@ - - + + diff --git a/src/Shared/Configuration/PagedOptions.cs b/src/Common/Configuration/PagedOptions.cs similarity index 93% rename from src/Shared/Configuration/PagedOptions.cs rename to src/Common/Configuration/PagedOptions.cs index 56796bc7d..00b5aab53 100644 --- a/src/Shared/Configuration/PagedOptions.cs +++ b/src/Common/Configuration/PagedOptions.cs @@ -15,7 +15,7 @@ */ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class PagedOptions { diff --git a/src/Shared/Configuration/PaginationSettings.cs b/src/Common/Configuration/PaginationSettings.cs similarity index 93% rename from src/Shared/Configuration/PaginationSettings.cs rename to src/Common/Configuration/PaginationSettings.cs index ce898c4fb..41cb7fce1 100644 --- a/src/Shared/Configuration/PaginationSettings.cs +++ b/src/Common/Configuration/PaginationSettings.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class EndpointSettings { diff --git a/src/Shared/Configuration/RetryConfiguration.cs b/src/Common/Configuration/RetryConfiguration.cs similarity index 96% rename from src/Shared/Configuration/RetryConfiguration.cs rename to src/Common/Configuration/RetryConfiguration.cs index ad33af275..45dad8969 100644 --- a/src/Shared/Configuration/RetryConfiguration.cs +++ b/src/Common/Configuration/RetryConfiguration.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class RetryConfiguration { diff --git a/src/Shared/Configuration/StorageConfiguration.cs b/src/Common/Configuration/StorageConfiguration.cs similarity index 97% rename from src/Shared/Configuration/StorageConfiguration.cs rename to src/Common/Configuration/StorageConfiguration.cs index 440e83cce..13445b5da 100644 --- a/src/Shared/Configuration/StorageConfiguration.cs +++ b/src/Common/Configuration/StorageConfiguration.cs @@ -18,7 +18,7 @@ using Microsoft.Extensions.Configuration; using Monai.Deploy.Storage.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class StorageConfiguration : StorageServiceConfiguration { diff --git a/src/Shared/Configuration/TaskManagerConfiguration.cs b/src/Common/Configuration/TaskManagerConfiguration.cs similarity index 98% rename from src/Shared/Configuration/TaskManagerConfiguration.cs rename to src/Common/Configuration/TaskManagerConfiguration.cs index b7eca5642..352dee455 100644 --- a/src/Shared/Configuration/TaskManagerConfiguration.cs +++ b/src/Common/Configuration/TaskManagerConfiguration.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class TaskManagerConfiguration { diff --git a/src/Shared/Configuration/WorkflowManagerOptions.cs b/src/Common/Configuration/WorkflowManagerOptions.cs old mode 100755 new mode 100644 similarity index 94% rename from src/Shared/Configuration/WorkflowManagerOptions.cs rename to src/Common/Configuration/WorkflowManagerOptions.cs index 689d6cff0..b3f375a83 --- a/src/Shared/Configuration/WorkflowManagerOptions.cs +++ b/src/Common/Configuration/WorkflowManagerOptions.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Configuration +namespace Monai.Deploy.WorkflowManager.Common.Configuration { public class WorkflowManagerOptions : PagedOptions { @@ -71,6 +71,9 @@ public class WorkflowManagerOptions : PagedOptions [ConfigurationKeyName("dicomTagsDisallowed")] public string DicomTagsDisallowed { get; set; } = string.Empty; + [ConfigurationKeyName("migExternalAppPlugins")] + public List MigExternalAppPlugins { get; set; } + public WorkflowManagerOptions() { Messaging = new MessageBrokerConfiguration(); diff --git a/src/Common/Configuration/packages.lock.json b/src/Common/Configuration/packages.lock.json new file mode 100644 index 000000000..a829c0d1e --- /dev/null +++ b/src/Common/Configuration/packages.lock.json @@ -0,0 +1,142 @@ +{ + "version": 1, + "dependencies": { + "net6.0": { + "Monai.Deploy.Messaging": { + "type": "Direct", + "requested": "[0.1.25, )", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "dependencies": { + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Newtonsoft.Json": "13.0.3", + "System.IO.Abstractions": "17.2.3" + } + }, + "Monai.Deploy.Storage": { + "type": "Direct", + "requested": "[0.2.18, )", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", + "System.IO.Abstractions": "17.2.3" + } + }, + "Ardalis.GuardClauses": { + "type": "Transitive", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + }, + "AWSSDK.Core": { + "type": "Transitive", + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + }, + "AWSSDK.SecurityToken": { + "type": "Transitive", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "dependencies": { + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + }, + "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.Abstractions": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Monai.Deploy.Storage.S3Policy": { + "type": "Transitive", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "dependencies": { + "Ardalis.GuardClauses": "4.1.1", + "Newtonsoft.Json": "13.0.3" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.3", + "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + } + } + } +} \ No newline at end of file diff --git a/src/Shared/Shared/ApiControllerBase.cs b/src/Common/Miscellaneous/ApiControllerBase.cs similarity index 85% rename from src/Shared/Shared/ApiControllerBase.cs rename to src/Common/Miscellaneous/ApiControllerBase.cs index 2bcf08114..86b3efdc4 100644 --- a/src/Shared/Shared/ApiControllerBase.cs +++ b/src/Common/Miscellaneous/ApiControllerBase.cs @@ -18,12 +18,12 @@ using Ardalis.GuardClauses; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Shared.Filter; -using Monai.Deploy.WorkflowManager.Shared.Wrappers; -using Monai.Deploy.WorkflowManager.Shared.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; -namespace Monai.Deploy.WorkflowManager.ControllersShared +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Base Api Controller. @@ -69,10 +69,10 @@ public ApiControllerBase(IOptions Options) /// Returns . public PagedResponse> CreatePagedResponse(IEnumerable pagedData, PaginationFilter validFilter, long totalRecords, IUriService uriService, string route) { - Guard.Against.Null(pagedData); - Guard.Against.Null(validFilter); - Guard.Against.Null(route); - Guard.Against.Null(uriService); + Guard.Against.Null(pagedData, nameof(pagedData)); + Guard.Against.Null(validFilter, nameof(validFilter)); + Guard.Against.Null(route, nameof(route)); + Guard.Against.Null(uriService, nameof(uriService)); var pageSize = validFilter.PageSize ?? Options.Value.EndpointSettings.DefaultPageSize; var response = new PagedResponse>(pagedData, validFilter.PageNumber, pageSize); diff --git a/src/Shared/Shared/Filter/PaginationFilter.cs b/src/Common/Miscellaneous/Filter/PaginationFilter.cs similarity index 96% rename from src/Shared/Shared/Filter/PaginationFilter.cs rename to src/Common/Miscellaneous/Filter/PaginationFilter.cs index 921ffd36e..9b53ad8ec 100644 --- a/src/Shared/Shared/Filter/PaginationFilter.cs +++ b/src/Common/Miscellaneous/Filter/PaginationFilter.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared.Filter +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter { /// /// Pagination Filter class. diff --git a/src/Shared/Shared/Filter/TimeFilter.cs b/src/Common/Miscellaneous/Filter/TimeFilter.cs similarity index 91% rename from src/Shared/Shared/Filter/TimeFilter.cs rename to src/Common/Miscellaneous/Filter/TimeFilter.cs index a5723f8fd..62cc60b7b 100644 --- a/src/Shared/Shared/Filter/TimeFilter.cs +++ b/src/Common/Miscellaneous/Filter/TimeFilter.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared.Filter +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter { public class TimeFilter : PaginationFilter { diff --git a/src/Shared/Shared/HttpLoggingExtensions.cs b/src/Common/Miscellaneous/HttpLoggingExtensions.cs similarity index 97% rename from src/Shared/Shared/HttpLoggingExtensions.cs rename to src/Common/Miscellaneous/HttpLoggingExtensions.cs index f67443b6c..fb2f409c6 100644 --- a/src/Shared/Shared/HttpLoggingExtensions.cs +++ b/src/Common/Miscellaneous/HttpLoggingExtensions.cs @@ -18,7 +18,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { public static class HttpLoggingExtensions { diff --git a/src/Shared/Shared/IMonaiService.cs b/src/Common/Miscellaneous/IMonaiService.cs similarity index 92% rename from src/Shared/Shared/IMonaiService.cs rename to src/Common/Miscellaneous/IMonaiService.cs index 1e36cb5bc..2e85f3290 100644 --- a/src/Shared/Shared/IMonaiService.cs +++ b/src/Common/Miscellaneous/IMonaiService.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { public interface IMonaiService { diff --git a/src/Shared/Shared/IMonaiServiceLocator.cs b/src/Common/Miscellaneous/IMonaiServiceLocator.cs similarity index 92% rename from src/Shared/Shared/IMonaiServiceLocator.cs rename to src/Common/Miscellaneous/IMonaiServiceLocator.cs index 248e90cdd..43add2599 100644 --- a/src/Shared/Shared/IMonaiServiceLocator.cs +++ b/src/Common/Miscellaneous/IMonaiServiceLocator.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { public interface IMonaiServiceLocator { diff --git a/src/Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj b/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj old mode 100755 new mode 100644 similarity index 92% rename from src/Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj rename to src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj index 6c76ee19d..9b6a642b8 --- a/src/Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj +++ b/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj @@ -18,7 +18,7 @@ net6.0 - Monai.Deploy.WorkflowManager.Shared + Monai.Deploy.WorkflowManager.Common enable enable false @@ -47,13 +47,13 @@ - + - + - + diff --git a/src/Shared/Shared/MonaiHealthCheck.cs b/src/Common/Miscellaneous/MonaiHealthCheck.cs similarity index 96% rename from src/Shared/Shared/MonaiHealthCheck.cs rename to src/Common/Miscellaneous/MonaiHealthCheck.cs index bd6ef5f79..5ef29b381 100644 --- a/src/Shared/Shared/MonaiHealthCheck.cs +++ b/src/Common/Miscellaneous/MonaiHealthCheck.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { public class MonaiHealthCheck : IHealthCheck { diff --git a/src/Shared/Shared/MonaiServiceLocator.cs b/src/Common/Miscellaneous/MonaiServiceLocator.cs similarity index 97% rename from src/Shared/Shared/MonaiServiceLocator.cs rename to src/Common/Miscellaneous/MonaiServiceLocator.cs index 621953fb4..d8ef88144 100644 --- a/src/Shared/Shared/MonaiServiceLocator.cs +++ b/src/Common/Miscellaneous/MonaiServiceLocator.cs @@ -16,7 +16,7 @@ using Ardalis.GuardClauses; -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { public class MonaiServiceLocator : IMonaiServiceLocator { diff --git a/src/Shared/Shared/PatientKeys.cs b/src/Common/Miscellaneous/PatientKeys.cs similarity index 96% rename from src/Shared/Shared/PatientKeys.cs rename to src/Common/Miscellaneous/PatientKeys.cs index 78465c3b1..0ab8fd969 100644 --- a/src/Shared/Shared/PatientKeys.cs +++ b/src/Common/Miscellaneous/PatientKeys.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { public static class PatientKeys { diff --git a/src/Shared/Shared/PlugInAttribute.cs b/src/Common/Miscellaneous/PlugInAttribute.cs similarity index 92% rename from src/Shared/Shared/PlugInAttribute.cs rename to src/Common/Miscellaneous/PlugInAttribute.cs index 1e6366186..181b82e52 100644 --- a/src/Shared/Shared/PlugInAttribute.cs +++ b/src/Common/Miscellaneous/PlugInAttribute.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { [AttributeUsage(AttributeTargets.Assembly)] public class PlugInAttribute : Attribute diff --git a/src/Shared/Shared/ServiceStatus.cs b/src/Common/Miscellaneous/ServiceStatus.cs similarity index 95% rename from src/Shared/Shared/ServiceStatus.cs rename to src/Common/Miscellaneous/ServiceStatus.cs index c4b4d72d1..b7bbad2b1 100644 --- a/src/Shared/Shared/ServiceStatus.cs +++ b/src/Common/Miscellaneous/ServiceStatus.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { /// /// Defines the state of a running service. diff --git a/src/Shared/Shared/Services/IUriService.cs b/src/Common/Miscellaneous/Services/IUriService.cs similarity index 88% rename from src/Shared/Shared/Services/IUriService.cs rename to src/Common/Miscellaneous/Services/IUriService.cs index 1a4311d7f..ac79d9fa5 100644 --- a/src/Shared/Shared/Services/IUriService.cs +++ b/src/Common/Miscellaneous/Services/IUriService.cs @@ -14,9 +14,9 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Shared.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; -namespace Monai.Deploy.WorkflowManager.Shared.Services +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services { /// /// Uri Serivce. diff --git a/src/Shared/Shared/Services/UriService.cs b/src/Common/Miscellaneous/Services/UriService.cs similarity index 93% rename from src/Shared/Shared/Services/UriService.cs rename to src/Common/Miscellaneous/Services/UriService.cs index 3f1131d5f..04247b504 100644 --- a/src/Shared/Shared/Services/UriService.cs +++ b/src/Common/Miscellaneous/Services/UriService.cs @@ -15,9 +15,9 @@ */ using Microsoft.AspNetCore.WebUtilities; -using Monai.Deploy.WorkflowManager.Shared.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; -namespace Monai.Deploy.WorkflowManager.Shared.Services +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services { /// /// Uri Service. diff --git a/src/Shared/Shared/Utilities/DicomTagUtilities.cs b/src/Common/Miscellaneous/Utilities/DicomTagUtilities.cs similarity index 95% rename from src/Shared/Shared/Utilities/DicomTagUtilities.cs rename to src/Common/Miscellaneous/Utilities/DicomTagUtilities.cs index 8a2efce5e..d37d6c8d5 100644 --- a/src/Shared/Shared/Utilities/DicomTagUtilities.cs +++ b/src/Common/Miscellaneous/Utilities/DicomTagUtilities.cs @@ -17,7 +17,7 @@ using System.Text.RegularExpressions; using FellowOakDicom; -namespace Monai.Deploy.WorkflowManager.Shared.Utilities +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Utilities { public static class DicomTagUtilities { diff --git a/src/Shared/Shared/ValidationConstants.cs b/src/Common/Miscellaneous/ValidationConstants.cs similarity index 94% rename from src/Shared/Shared/ValidationConstants.cs rename to src/Common/Miscellaneous/ValidationConstants.cs index a69e45fc8..1429ac56e 100644 --- a/src/Shared/Shared/ValidationConstants.cs +++ b/src/Common/Miscellaneous/ValidationConstants.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { public static class ValidationConstants { @@ -147,6 +147,11 @@ public enum NotificationValues /// public static readonly string ExportTaskType = "export"; + /// + /// Key for the export task type. + /// + public static readonly string ExternalAppTaskType = "remote_app_execution"; + /// /// Key for the export task type. /// @@ -167,7 +172,8 @@ public enum NotificationValues RouterTaskType, ExportTaskType, DockerTaskType, - Email + Email, + ExternalAppTaskType }; } } diff --git a/src/Shared/Shared/Wrappers/PagedResponse.cs b/src/Common/Miscellaneous/Wrappers/PagedResponse.cs similarity index 94% rename from src/Shared/Shared/Wrappers/PagedResponse.cs rename to src/Common/Miscellaneous/Wrappers/PagedResponse.cs index 0ed5690b7..c18681c14 100644 --- a/src/Shared/Shared/Wrappers/PagedResponse.cs +++ b/src/Common/Miscellaneous/Wrappers/PagedResponse.cs @@ -14,10 +14,10 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Shared.Filter; -using Monai.Deploy.WorkflowManager.Shared.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; -namespace Monai.Deploy.WorkflowManager.Shared.Wrappers +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers { /// /// Paged Response for use with paginations. diff --git a/src/Shared/Shared/Wrappers/Response.cs b/src/Common/Miscellaneous/Wrappers/Response.cs similarity index 90% rename from src/Shared/Shared/Wrappers/Response.cs rename to src/Common/Miscellaneous/Wrappers/Response.cs index 53052dea7..73ba0c35b 100644 --- a/src/Shared/Shared/Wrappers/Response.cs +++ b/src/Common/Miscellaneous/Wrappers/Response.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared.Wrappers +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers { /// /// Response object. @@ -44,7 +44,7 @@ public Response(T data) /// /// Gets or sets Data. /// - public T Data { get; set; } + public T? Data { get; set; } /// /// Gets or sets a value indicating whether response has succeeded. @@ -54,7 +54,7 @@ public Response(T data) /// /// Gets or sets errors. /// - public string?[] Errors { get; set; } + public string[]? Errors { get; set; } = Array.Empty(); /// /// Gets or sets message. diff --git a/src/Shared/Shared/Wrappers/StatsPagedResponse.cs b/src/Common/Miscellaneous/Wrappers/StatsPagedResponse.cs similarity index 84% rename from src/Shared/Shared/Wrappers/StatsPagedResponse.cs rename to src/Common/Miscellaneous/Wrappers/StatsPagedResponse.cs index 222ee5fda..1be58c374 100644 --- a/src/Shared/Shared/Wrappers/StatsPagedResponse.cs +++ b/src/Common/Miscellaneous/Wrappers/StatsPagedResponse.cs @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Shared.Wrappers +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers { public class StatsPagedResponse : PagedResponse { @@ -30,9 +30,5 @@ public StatsPagedResponse(T data, int pageNumber, int pageSize) : base(data, pag { } - //public StatsPagedResponse(PagedResponse paged) : base(paged.Data, paged.PageNumber, paged.PageSize) - //{ - // int re = 0; - //} } } diff --git a/src/Shared/Shared/packages.lock.json b/src/Common/Miscellaneous/packages.lock.json similarity index 62% rename from src/Shared/Shared/packages.lock.json rename to src/Common/Miscellaneous/packages.lock.json index 6d24d4f4f..02fb527c5 100644 --- a/src/Shared/Shared/packages.lock.json +++ b/src/Common/Miscellaneous/packages.lock.json @@ -4,12 +4,9 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "requested": "[4.1.1, )", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "fo-dicom": { "type": "Direct", @@ -30,42 +27,28 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "requested": "[6.0.21, )", + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "1.1.1", "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" }, - "Microsoft.Extensions.Configuration": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -76,11 +59,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -90,12 +72,12 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, @@ -117,22 +99,10 @@ "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" } }, - "Microsoft.Extensions.Logging": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" - } - }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -163,38 +133,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -208,19 +172,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.IO.Abstractions": { "type": "Transitive", "resolved": "17.2.3", @@ -254,11 +205,11 @@ "resolved": "6.0.0", "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, - "monai.deploy.workflowmanager.configuration": { + "Monai.Deploy.WorkflowManager.Common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", - "Monai.Deploy.Storage": "[0.2.15, )" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" } } } diff --git a/src/Monai.Deploy.WorkflowManager.sln b/src/Monai.Deploy.WorkflowManager.sln index 79a08c4a1..02c60ae9c 100644 --- a/src/Monai.Deploy.WorkflowManager.sln +++ b/src/Monai.Deploy.WorkflowManager.sln @@ -64,9 +64,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManage EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Storage", "WorkflowManager\Storage\Monai.Deploy.WorkflowManager.Storage.csproj", "{ED1808DD-C873-44DE-8D7F-399104D1FF8E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{37A19144-CEA5-47A2-9FFD-22C522E8B895}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{37A19144-CEA5-47A2-9FFD-22C522E8B895}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Configuration", "Shared\Configuration\Monai.Deploy.WorkflowManager.Configuration.csproj", "{DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Common.Configuration", "Common\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj", "{DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.MonaiBackgroundService", "WorkflowManager\MonaiBackgroundService\Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj", "{93F4FE97-120C-44DC-9B21-69FB7EAB5846}" EndProject @@ -76,20 +76,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManage EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests", "..\tests\UnitTests\TaskManager.Docker.Tests\Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj", "{BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Shared", "Shared\Shared\Monai.Deploy.WorkflowManager.Shared.csproj", "{81E3F943-B992-4C81-AA09-A17C05081236}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Shared.Tests", "..\tests\UnitTests\Monai.Deploy.WorkflowManager.Shared.Tests\Monai.Deploy.WorkflowManager.Shared.Tests.csproj", "{C853A9E3-C53D-4B1A-BFDA-228689A8C94C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Common.Tests", "..\tests\UnitTests\Common.Tests\Monai.Deploy.WorkflowManager.Common.Tests.csproj", "{75A4AEDA-0386-4B2D-9DBA-BC9AE733660E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Services", "WorkflowManager\Monai.Deploy.WorkflowManager.Services\Monai.Deploy.WorkflowManager.Services.csproj", "{526FF10C-1C7F-4C26-8E8A-D7ACD65F5467}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Services.Tests", "..\tests\UnitTests\WorkflowManager.Services.Tests\Monai.Deploy.WorkflowManager.Services.Tests.csproj", "{0D40F7D6-3747-4280-8EB3-9F3A18AC1125}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Email", "TaskManager\Plug-ins\Email\Monai.Deploy.WorkflowManager.TaskManager.Email.csproj", "{72DFDA92-0689-41D7-B3F1-9D41D5AA276E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Email.Tests", "..\tests\UnitTests\TaskManager.Email.Tests\Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj", "{0F0D6868-366E-47FB-B059-F1176562CC15}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Common.Miscellaneous", "Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj", "{8BB67FED-E81A-4EC9-9167-C9F313D96C12}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Services", "WorkflowManager\Services\Monai.Deploy.WorkflowManager.Services.csproj", "{76A9FF94-862D-43E8-A0A7-562DD1DDDB3B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -224,10 +224,6 @@ Global {BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}.Release|Any CPU.Build.0 = Release|Any CPU - {81E3F943-B992-4C81-AA09-A17C05081236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81E3F943-B992-4C81-AA09-A17C05081236}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81E3F943-B992-4C81-AA09-A17C05081236}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81E3F943-B992-4C81-AA09-A17C05081236}.Release|Any CPU.Build.0 = Release|Any CPU {C853A9E3-C53D-4B1A-BFDA-228689A8C94C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C853A9E3-C53D-4B1A-BFDA-228689A8C94C}.Debug|Any CPU.Build.0 = Debug|Any CPU {C853A9E3-C53D-4B1A-BFDA-228689A8C94C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -236,10 +232,6 @@ Global {75A4AEDA-0386-4B2D-9DBA-BC9AE733660E}.Debug|Any CPU.Build.0 = Debug|Any CPU {75A4AEDA-0386-4B2D-9DBA-BC9AE733660E}.Release|Any CPU.ActiveCfg = Release|Any CPU {75A4AEDA-0386-4B2D-9DBA-BC9AE733660E}.Release|Any CPU.Build.0 = Release|Any CPU - {526FF10C-1C7F-4C26-8E8A-D7ACD65F5467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {526FF10C-1C7F-4C26-8E8A-D7ACD65F5467}.Debug|Any CPU.Build.0 = Debug|Any CPU - {526FF10C-1C7F-4C26-8E8A-D7ACD65F5467}.Release|Any CPU.ActiveCfg = Release|Any CPU - {526FF10C-1C7F-4C26-8E8A-D7ACD65F5467}.Release|Any CPU.Build.0 = Release|Any CPU {0D40F7D6-3747-4280-8EB3-9F3A18AC1125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0D40F7D6-3747-4280-8EB3-9F3A18AC1125}.Debug|Any CPU.Build.0 = Debug|Any CPU {0D40F7D6-3747-4280-8EB3-9F3A18AC1125}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -252,6 +244,14 @@ Global {0F0D6868-366E-47FB-B059-F1176562CC15}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F0D6868-366E-47FB-B059-F1176562CC15}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F0D6868-366E-47FB-B059-F1176562CC15}.Release|Any CPU.Build.0 = Release|Any CPU + {8BB67FED-E81A-4EC9-9167-C9F313D96C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BB67FED-E81A-4EC9-9167-C9F313D96C12}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BB67FED-E81A-4EC9-9167-C9F313D96C12}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BB67FED-E81A-4EC9-9167-C9F313D96C12}.Release|Any CPU.Build.0 = Release|Any CPU + {76A9FF94-862D-43E8-A0A7-562DD1DDDB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {76A9FF94-862D-43E8-A0A7-562DD1DDDB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76A9FF94-862D-43E8-A0A7-562DD1DDDB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {76A9FF94-862D-43E8-A0A7-562DD1DDDB3B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -290,13 +290,13 @@ Global {EFECF826-B036-4689-B223-D791CD2C0F10} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {47C31FB9-C862-4770-83B6-E2DDF260CC67} = {541C5347-5D7D-44B7-95D3-B6FB3D9EB955} {BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} - {81E3F943-B992-4C81-AA09-A17C05081236} = {37A19144-CEA5-47A2-9FFD-22C522E8B895} {C853A9E3-C53D-4B1A-BFDA-228689A8C94C} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {75A4AEDA-0386-4B2D-9DBA-BC9AE733660E} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} - {526FF10C-1C7F-4C26-8E8A-D7ACD65F5467} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} {0D40F7D6-3747-4280-8EB3-9F3A18AC1125} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {72DFDA92-0689-41D7-B3F1-9D41D5AA276E} = {541C5347-5D7D-44B7-95D3-B6FB3D9EB955} {0F0D6868-366E-47FB-B059-F1176562CC15} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} + {8BB67FED-E81A-4EC9-9167-C9F313D96C12} = {37A19144-CEA5-47A2-9FFD-22C522E8B895} + {76A9FF94-862D-43E8-A0A7-562DD1DDDB3B} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DC0D56C8-D8CB-45CE-B528-F3DCF86D63ED} diff --git a/src/Shared/Configuration/packages.lock.json b/src/Shared/Configuration/packages.lock.json deleted file mode 100755 index 6bf7fe84f..000000000 --- a/src/Shared/Configuration/packages.lock.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "version": 1, - "dependencies": { - "net6.0": { - "Monai.Deploy.Messaging": { - "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", - "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", - "System.IO.Abstractions": "17.2.3" - } - }, - "Monai.Deploy.Storage": { - "type": "Direct", - "requested": "[0.2.15, )", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", - "System.IO.Abstractions": "17.2.3" - } - }, - "Ardalis.GuardClauses": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } - }, - "AWSSDK.Core": { - "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" - }, - "AWSSDK.SecurityToken": { - "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", - "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" - } - }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, - "Microsoft.Extensions.Configuration": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.Abstractions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" - }, - "Microsoft.Extensions.Diagnostics.HealthChecks": { - "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", - "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0" - } - }, - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { - "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" - }, - "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", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" - }, - "Microsoft.Extensions.Options": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Primitives": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Monai.Deploy.Storage.S3Policy": { - "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Newtonsoft.Json": "13.0.3" - } - }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.IO.Abstractions": { - "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - } - } - } -} \ No newline at end of file diff --git a/src/Shared/Shared/TimeFilter.cs b/src/Shared/Shared/TimeFilter.cs deleted file mode 100644 index 0ef3a6642..000000000 --- a/src/Shared/Shared/TimeFilter.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2023 MONAI Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using Monai.Deploy.WorkflowManager.Shared.Filter; - -namespace Monai.Deploy.WorkflowManager.TaskManager.Filter -{ - public class TimeFilter : PaginationFilter - { - public DateTime StartTime { get; set; } - - public DateTime EndTime { get; set; } - } -} diff --git a/src/TaskManager/API/ExecutionStatus.cs b/src/TaskManager/API/ExecutionStatus.cs index 09c30900a..f79606cc9 100644 --- a/src/TaskManager/API/ExecutionStatus.cs +++ b/src/TaskManager/API/ExecutionStatus.cs @@ -38,6 +38,6 @@ public class ExecutionStatus /// /// Contains various stats /// - public Dictionary Stats { get; set; } + public Dictionary Stats { get; set; } = new(); } } diff --git a/src/TaskManager/API/ITaskDispatchEventService.cs b/src/TaskManager/API/ITaskDispatchEventService.cs index 886b4455d..db4ce1c10 100644 --- a/src/TaskManager/API/ITaskDispatchEventService.cs +++ b/src/TaskManager/API/ITaskDispatchEventService.cs @@ -16,7 +16,7 @@ using Monai.Deploy.WorkflowManager.TaskManager.API.Models; -namespace Monai.Deploy.TaskManager.API +namespace Monai.Deploy.WorkflowManager.TaskManager.API { public interface ITaskDispatchEventService { @@ -46,6 +46,6 @@ public interface ITaskDispatchEventService /// A TaskDispatchEvent to update. /// The plugin arguments to update. /// Returns the updated TaskDispatchEventInfo. - Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEvent, Dictionary pluginArgs); + Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEvent, Dictionary pluginArgs); } } diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index c1304e3c8..12a72ddc1 100755 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index aaf4e3f87..7b741d850 100755 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -4,16 +4,13 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "requested": "[0.1.25, )", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "dependencies": { + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, @@ -50,22 +47,14 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "DnsClient": { "type": "Transitive", "resolved": "1.4.0", "contentHash": "CO1NG1zQdV0nEAXmr/KppLZ0S1qkaPwV0kPX5YPgmYBtrBVh1XMYHM54IXy3RBJu1k4thFtpzwo4HNHqxiuFYw==" }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -112,11 +101,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -137,11 +125,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -151,19 +138,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -185,20 +172,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -429,11 +415,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -444,14 +425,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", diff --git a/src/TaskManager/Database/ITaskDispatchEventRepository.cs b/src/TaskManager/Database/ITaskDispatchEventRepository.cs index 2f7a7de5e..2a7a8de47 100644 --- a/src/TaskManager/Database/ITaskDispatchEventRepository.cs +++ b/src/TaskManager/Database/ITaskDispatchEventRepository.cs @@ -53,6 +53,6 @@ public interface ITaskDispatchEventRepository /// A TaskDispatchEvent to update. /// The plugin arguments to update. /// The updated TaskDispatchEventInfo. - Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEventInfo, Dictionary pluginArgs); + Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEventInfo, Dictionary pluginArgs); } } diff --git a/src/TaskManager/Database/TaskDispatchEventRepository.cs b/src/TaskManager/Database/TaskDispatchEventRepository.cs index d5b8c79d4..d6ec5cc2f 100755 --- a/src/TaskManager/Database/TaskDispatchEventRepository.cs +++ b/src/TaskManager/Database/TaskDispatchEventRepository.cs @@ -110,10 +110,10 @@ await _taskDispatchEventCollection.DeleteOneAsync( } } - public async Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEventInfo, Dictionary pluginArgs) + public async Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEventInfo, Dictionary pluginArgs) { - Guard.Against.Null(taskDispatchEventInfo); - Guard.Against.Null(pluginArgs); + Guard.Against.Null(taskDispatchEventInfo, nameof(taskDispatchEventInfo)); + Guard.Against.Null(pluginArgs, nameof(pluginArgs)); try { diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json index 55ff9e2d3..a3d2ad102 100755 --- a/src/TaskManager/Database/packages.lock.json +++ b/src/TaskManager/Database/packages.lock.json @@ -16,11 +16,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -43,11 +40,6 @@ "Microsoft.Win32.Registry": "5.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -94,11 +86,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -119,11 +110,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -133,19 +123,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -167,20 +157,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -258,15 +247,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, @@ -459,11 +445,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -474,14 +455,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -705,7 +678,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs index 838ec0c20..0af719ecd 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs @@ -21,8 +21,8 @@ using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Events; using Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Logging; using Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Models; @@ -38,21 +38,21 @@ public class AideClinicalReviewPlugin : TaskPluginBase private readonly IOptions _options; private readonly IMessageBrokerPublisherService _messageBrokerPublisherService; - private string _patientId; - private string _patientName; - private string _patientSex; - private string _patientDob; - private string _patientAge; - private string _patientHospitalId; - private string _queueName; - private string _workflowName; + private string? _patientId; + private string? _patientName; + private string? _patientSex; + private string? _patientDob; + private string? _patientAge; + private string? _patientHospitalId; + private string? _queueName = null; + private string? _workflowName; private bool _notifications; - private string _reviewedTaskId; - private string _applicationName; - private string _mode; - private string _applicationVersion; - private string _reviewedExecutionId; - private string[] _reviewerRoles; + private string? _reviewedTaskId; + private string? _applicationName; + private string? _mode; + private string? _applicationVersion; + private string? _reviewedExecutionId; + private string[] _reviewerRoles = Array.Empty(); public AideClinicalReviewPlugin( IServiceScopeFactory serviceScopeFactory, @@ -206,7 +206,7 @@ public override async Task ExecuteTask(CancellationToken cancel } catch (Exception ex) { - _logger.ErrorSendingMessage(_queueName, ex); + _logger.ErrorSendingMessage(_queueName ?? "no queue name", ex); return new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError, Errors = ex.Message }; } @@ -220,9 +220,9 @@ private JsonMessage GenerateClinicalReviewRequestEve ExecutionId = Event.ExecutionId, WorkflowInstanceId = Event.WorkflowInstanceId, TaskId = Event.TaskId, - ReviewedTaskId = _reviewedTaskId, - ReviewedExecutionId = _reviewedExecutionId, - WorkflowName = _workflowName, + ReviewedTaskId = _reviewedTaskId ?? string.Empty, + ReviewedExecutionId = _reviewedExecutionId ?? string.Empty, + WorkflowName = _workflowName ?? string.Empty, Notifications = _notifications, Files = Event.Inputs, ReviewerRoles = _reviewerRoles, @@ -237,9 +237,9 @@ private JsonMessage GenerateClinicalReviewRequestEve }, ApplicationMetadata = new Dictionary { - { Keys.ApplicationName, _applicationName }, - { Keys.ApplicationVersion, _applicationVersion }, - { Keys.Mode, _mode }, + { Keys.ApplicationName, _applicationName ?? string.Empty }, + { Keys.ApplicationVersion, _applicationVersion ?? string.Empty}, + { Keys.Mode, _mode ?? string.Empty }, } }, TaskManagerApplicationId, Event.CorrelationId); } @@ -249,7 +249,7 @@ private async Task SendClinicalReviewRequestEvent(JsonMessage GetStatus(string identity, TaskCallb executionStatus == TaskExecutionStatus.Succeeded ? "Accepted" : "Rejected", DateTime.UtcNow.ToLongDateString(), userId, - _applicationName, + _applicationName ?? string.Empty, reason, message); diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs index eafd915ee..60cbfaee4 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs @@ -28,48 +28,48 @@ public class ClinicalReviewRequestEvent : EventBase /// [JsonProperty(PropertyName = "workflow_instance_id")] [Required] - public string WorkflowInstanceId { get; set; } + public string WorkflowInstanceId { get; set; } = string.Empty; /// /// Gets or sets the execution ID representing the instance of the task. /// [JsonProperty(PropertyName = "execution_id")] [Required] - public string ExecutionId { get; set; } + public string ExecutionId { get; set; } = string.Empty; /// /// Gets or sets the ID representing the instance of the Task. /// [Required] [JsonProperty(PropertyName = "task_id")] - public string TaskId { get; set; } + public string TaskId { get; set; } = string.Empty; /// /// Gets or sets the ID of the reviewed task ID. /// [Required] [JsonProperty(PropertyName = "reviewed_task_id")] - public string ReviewedTaskId { get; set; } + public string ReviewedTaskId { get; set; } = string.Empty; /// /// Gets or sets the ID of the reviewed execution ID. /// [Required] [JsonProperty(PropertyName = "reviewed_execution_id")] - public string ReviewedExecutionId { get; set; } + public string ReviewedExecutionId { get; set; } = string.Empty; /// /// Gets or sets the correlation ID. /// [JsonProperty(PropertyName = "correlation_id")] [Required] - public string CorrelationId { get; set; } + public string CorrelationId { get; set; } = string.Empty; /// /// Gets or sets the name of the workflow. /// [JsonProperty(PropertyName = "workflow_name")] [Required] - public string WorkflowName { get; set; } + public string WorkflowName { get; set; } = string.Empty; /// /// Gets or sets the name of the workflow. @@ -82,7 +82,7 @@ public class ClinicalReviewRequestEvent : EventBase /// Gets or sets patient metadata. /// [JsonProperty(PropertyName = "patient_metadata")] - public PatientMetadata PatientMetadata { get; set; } + public PatientMetadata? PatientMetadata { get; set; } /// /// Gets or sets the reviewer roles. @@ -100,6 +100,6 @@ public class ClinicalReviewRequestEvent : EventBase /// Gets or sets the name of the workflow. /// [JsonProperty(PropertyName = "files")] - public List Files { get; set; } + public List Files { get; set; } = new(); } } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs index 2f51351af..d3a0bd48b 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs @@ -21,21 +21,21 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Models public class PatientMetadata { [JsonProperty(PropertyName = "patient_name")] - public string PatientName { get; set; } + public string? PatientName { get; set; } [JsonProperty(PropertyName = "patient_id")] - public string PatientId { get; set; } + public string? PatientId { get; set; } [JsonProperty(PropertyName = "patient_dob")] - public string PatientDob { get; set; } + public string? PatientDob { get; set; } [JsonProperty(PropertyName = "patient_sex")] - public string PatientSex { get; set; } + public string? PatientSex { get; set; } [JsonProperty(PropertyName = "patient_age")] - public string PatientAge { get; set; } + public string? PatientAge { get; set; } [JsonProperty(PropertyName = "patient_hospital_id")] - public string PatientHospitalId { get; set; } + public string? PatientHospitalId { get; set; } } } 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 e24c711b2..2734b4274 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 @@ -32,8 +32,8 @@ - - + + diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs index 004019eb1..dc46b139a 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs @@ -50,12 +50,12 @@ public AideClinicalReviewMetadataRepository( private void Validate() { - Guard.Against.Null(DispatchEvent); - Guard.Against.Null(CallbackEvent); + Guard.Against.Null(DispatchEvent, nameof(DispatchEvent)); + Guard.Against.Null(CallbackEvent, nameof(CallbackEvent)); - Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId); - Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId); - Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId); + Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId, nameof(DispatchEvent.WorkflowInstanceId)); + Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId, nameof(DispatchEvent.ExecutionId)); + Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId, nameof(DispatchEvent.PayloadId)); } public override Task> RetrieveMetadata(CancellationToken cancellationToken = default) diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index 4d2dfb878..f2c9f58dd 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -4,23 +4,20 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, "DnsClient": { @@ -44,11 +41,6 @@ "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -100,11 +92,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -125,11 +116,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -139,19 +129,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -173,20 +163,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -260,38 +249,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -488,11 +471,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -503,14 +481,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -730,30 +700,30 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, - "monai.deploy.workflowmanager.configuration": { + "Monai.Deploy.WorkflowManager.Common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Monai.Deploy.Storage": "0.2.15" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" } }, - "monai.deploy.workflowmanager.shared": { + "Monai.Deploy.WorkflowManager.Common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", + "Ardalis.GuardClauses": "[4.1.1, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "fo-dicom": "[5.0.3, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Mongo.Migration": "3.1.4", - "MongoDB.Bson": "2.19.0" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Mongo.Migration": "[3.1.4, )", + "MongoDB.Bson": "[2.19.0, )" } } } } -} +} \ No newline at end of file diff --git a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs index b802a9134..5224afbbe 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs @@ -28,8 +28,8 @@ public ArgoClient(HttpClient httpClient) : base(httpClient) { } public async Task Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(argoNamespace); - Guard.Against.Null(body); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); + Guard.Against.Null(body, nameof(body)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}"); @@ -40,10 +40,10 @@ public async Task Argo_CreateWorkflowAsync(string argoNamespace, Workf } - public async Task Argo_GetWorkflowAsync(string argoNamespace, string name, string getOptions_resourceVersion, string fields, CancellationToken cancellationToken) + public async Task Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptions_resourceVersion, string? fields, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(argoNamespace); - Guard.Against.Null(name); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); + Guard.Against.Null(name, nameof(name)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}?"); @@ -64,9 +64,9 @@ public async Task Argo_GetWorkflowAsync(string argoNamespace, string n public async Task Argo_StopWorkflowAsync(string argoNamespace, string name, WorkflowStopRequest body) { - Guard.Against.NullOrWhiteSpace(argoNamespace); - Guard.Against.NullOrWhiteSpace(name); - Guard.Against.Null(body); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); + Guard.Against.Null(body, nameof(body)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/stop"); @@ -79,9 +79,9 @@ public async Task Argo_StopWorkflowAsync(string argoNamespace, string public async Task Argo_TerminateWorkflowAsync(string argoNamespace, string name, WorkflowTerminateRequest body) { - Guard.Against.NullOrWhiteSpace(argoNamespace); - Guard.Against.NullOrWhiteSpace(name); - Guard.Against.Null(body); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); + Guard.Against.Null(body, nameof(body)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/terminate"); @@ -91,10 +91,10 @@ public async Task Argo_TerminateWorkflowAsync(string argoNamespace, st return await SendRequest(content, urlBuilder, Method, new CancellationToken()).ConfigureAwait(false); } - public async Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string getOptions_resourceVersion) + public async Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion) { - Guard.Against.NullOrWhiteSpace(argoNamespace); - Guard.Against.Null(name); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); + Guard.Against.Null(name, nameof(name)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}/{name}?"); @@ -116,15 +116,15 @@ public async Task Argo_GetWorkflowTemplateAsync(string argoNam return await GetRequest(urlBuilder).ConfigureAwait(false); } - public async Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string podName, string logOptions_container) + public async Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container) { - Guard.Against.NullOrWhiteSpace(argoNamespace); - Guard.Against.Null(name); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); + Guard.Against.Null(name, nameof(name)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/log?"); - if (podName != null) + if (string.IsNullOrWhiteSpace(podName) is false) { urlBuilder.Append(Uri.EscapeDataString("podName") + "=").Append(Uri.EscapeDataString(ConvertToString(podName, CultureInfo.InvariantCulture))).Append('&'); } @@ -142,8 +142,8 @@ public async Task Argo_GetWorkflowTemplateAsync(string argoNam /// A server side error occurred. public virtual async Task Argo_CreateWorkflowTemplateAsync(string argoNamespace, WorkflowTemplateCreateRequest body, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(argoNamespace); - Guard.Against.Null(body.Template); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); + Guard.Against.Null(body.Template, nameof(body.Template)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}"); @@ -162,7 +162,7 @@ public virtual async Task Argo_CreateWorkflowTemplateAsync(str /// A server side error occurred. public virtual async Task Argo_DeleteWorkflowTemplateAsync(string argoNamespace, string templateName, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(argoNamespace); + Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}/{templateName}"); @@ -385,7 +385,7 @@ protected virtual async Task> ReadLogResponseAsync( { if (response == null || response.Content == null) { - return new ObjectResponseResult(default, string.Empty); + return new ObjectResponseResult(string.Empty, string.Empty); } try @@ -398,7 +398,7 @@ protected virtual async Task> ReadLogResponseAsync( var jsonBody = $"[{string.Join(",", rows)}]"; var typedBody = Newtonsoft.Json.JsonConvert.DeserializeObject>(jsonBody); - var outputLogs = string.Join("\n", typedBody.Select(b => b.Result.Content)); + var outputLogs = string.Join("\n", typedBody?.Select(b => b.Result.Content) ?? Array.Empty()); return new ObjectResponseResult(outputLogs, string.Empty); } diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 5b08b0339..2aa6c20b9 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -23,10 +23,9 @@ using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.Configuration; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.TaskManager.API; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Shared; using Monai.Deploy.WorkflowManager.TaskManager.API; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.API.Models; using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; @@ -242,7 +241,7 @@ public override async Task GetStatus(string identity, TaskCallb // it take sometime for the Argo job to be in the final state after emitting the callback event. var retryCount = 30; - while (workflow.Status.Phase.Equals(Strings.ArgoPhaseRunning, StringComparison.OrdinalIgnoreCase) && retryCount-- > 0) + while (workflow!.Status.Phase.Equals(Strings.ArgoPhaseRunning, StringComparison.OrdinalIgnoreCase) && retryCount-- > 0) { await Task.Delay(1000, cancellationToken).ConfigureAwait(false); workflow = await client.Argo_GetWorkflowAsync(_namespace, identity, null, null, cancellationToken).ConfigureAwait(false); @@ -305,7 +304,7 @@ public override async Task GetStatus(string identity, TaskCallb private Dictionary GetExecutuionStats(Workflow workflow) { - Guard.Against.Null(workflow); + Guard.Against.Null(workflow, nameof(workflow)); TimeSpan? duration = null; if (workflow.Status?.StartedAt is not null && workflow.Status?.FinishedAt is not null) @@ -348,8 +347,10 @@ private Dictionary GetExecutuionStats(Workflow workflow) { preprend = Strings.ExitHookTemplateSendTemplateName; } +#pragma warning disable CS8604 // Possible null reference argument. stats.Add($"{preprend}podStartTime{podcount}", item.Value.StartedAt is not null ? item.Value.StartedAt.ToString() : ""); stats.Add($"{preprend}podFinishTime{podcount++}", item.Value.FinishedAt is not null ? item.Value.FinishedAt.ToString() : ""); +#pragma warning restore CS8604 // Possible null reference argument. } } } @@ -362,17 +363,17 @@ private async Task PipeExecutionLogs(IArgoClient client, string identity) try { #pragma warning disable CA2254 // Template should be a static expression - var logs = await client.Argo_Get_WorkflowLogsAsync(_namespace, identity, null, "init"); + var logs = await client.Argo_Get_WorkflowLogsAsync(_namespace, identity, null, "init") ?? ""; _logger.ArgoLog(logs); - logs = await client.Argo_Get_WorkflowLogsAsync(_namespace, identity, null, "wait"); + logs = await client.Argo_Get_WorkflowLogsAsync(_namespace, identity, null, "wait") ?? ""; _logger.ArgoLog(logs); - logs = await client.Argo_Get_WorkflowLogsAsync(_namespace, identity, null, "main"); + logs = await client.Argo_Get_WorkflowLogsAsync(_namespace, identity, null, "main") ?? ""; _logger.ArgoLog(logs); #pragma warning restore CA2254 // Template should be a static expression } - catch (Exception ex) + catch (Exception) { - int we = 0; + // swallow execption on purpose. } } @@ -431,7 +432,7 @@ private async Task BuildWorkflowWrapper(CancellationToken cancellation /// private void ProcessTaskPluginArguments(Workflow workflow) { - Guard.Against.Null(workflow); + Guard.Against.Null(workflow, nameof(workflow)); var priorityClassName = Event.GetTaskPluginArgumentsParameter(Keys.TaskPriorityClassName) ?? "standard"; foreach (var template in workflow.Spec.Templates) @@ -446,8 +447,8 @@ private void ProcessTaskPluginArguments(Workflow workflow) private void AddLimit(Template2 template, ResourcesKey key) { - Guard.Against.Null(template); - Guard.Against.Null(key); + Guard.Against.Null(template, nameof(template)); + Guard.Against.Null(key, nameof(key)); if (template.Container is null || !Event.TaskPluginArguments.TryGetValue(key.TaskKey, out var value) || string.IsNullOrWhiteSpace(value)) { return; @@ -533,7 +534,7 @@ private async Task AddExitHookTemplate(Workflow workflow, CancellationToken canc workflow.Spec.Templates.Add(exitHookTemplate.GenerateCallbackMessageTemplate(artifact)); } - private async Task LoadWorkflowTemplate(string workflowTemplateName) + private async Task LoadWorkflowTemplate(string workflowTemplateName) { Guard.Against.NullOrWhiteSpace(workflowTemplateName, nameof(workflowTemplateName)); @@ -932,7 +933,7 @@ public async Task CreateArgoTemplate(string template) throw new InvalidOperationException(mess); } - return await client.Argo_CreateWorkflowTemplateAsync(_namespace, templateCreateRequest, new CancellationToken()).ConfigureAwait(false); + return await client.Argo_CreateWorkflowTemplateAsync(_namespace, templateCreateRequest!, new CancellationToken()).ConfigureAwait(false); } catch (Exception ex) { diff --git a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs index b91f7df8b..6a89f5de5 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs @@ -15,7 +15,6 @@ */ using Ardalis.GuardClauses; -using Argo; using IdentityModel.Client; using Microsoft.Extensions.Logging; using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; @@ -45,7 +44,7 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse var httpClient = _httpClientFactory.CreateClient(ClientName); - Guard.Against.Null(httpClient); + Guard.Against.Null(httpClient, nameof(httpClient)); if (apiToken is not null) { diff --git a/src/TaskManager/Plug-ins/Argo/Controllers/TemplateController.cs b/src/TaskManager/Plug-ins/Argo/Controllers/TemplateController.cs index f64ed337f..3d718180b 100644 --- a/src/TaskManager/Plug-ins/Argo/Controllers/TemplateController.cs +++ b/src/TaskManager/Plug-ins/Argo/Controllers/TemplateController.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Configuration; namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Controllers { diff --git a/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs b/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs index ce0ca5b31..87b018d45 100755 --- a/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs +++ b/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs @@ -16,7 +16,7 @@ using Argo; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; using Newtonsoft.Json; diff --git a/src/TaskManager/Plug-ins/Argo/IArgoClient.cs b/src/TaskManager/Plug-ins/Argo/IArgoClient.cs index ea15b34bb..ded53f890 100644 --- a/src/TaskManager/Plug-ins/Argo/IArgoClient.cs +++ b/src/TaskManager/Plug-ins/Argo/IArgoClient.cs @@ -23,9 +23,9 @@ public interface IArgoClient { Task Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken); - Task Argo_GetWorkflowAsync(string argoNamespace, string name, string getOptions_resourceVersion, string fields, CancellationToken cancellationToken); + Task Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptions_resourceVersion, string? fields, CancellationToken cancellationToken); - Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string getOptions_resourceVersion); + Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion); Task Argo_StopWorkflowAsync(string argoNamespace, string name, WorkflowStopRequest body); @@ -33,7 +33,7 @@ public interface IArgoClient Task Argo_GetVersionAsync(); - Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string podName, string logOptions_container); + Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container); Task Argo_CreateWorkflowTemplateAsync(string argoNamespace, WorkflowTemplateCreateRequest body, CancellationToken cancellationToken); 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 870a2843d..a355c5015 100755 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -41,8 +41,8 @@ - - + + diff --git a/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs b/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs index 2430df884..7bf0a0e14 100644 --- a/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs +++ b/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs @@ -52,12 +52,12 @@ public ArgoMetadataRepository( private void Validate() { - Guard.Against.Null(DispatchEvent); - Guard.Against.Null(CallbackEvent); + Guard.Against.Null(DispatchEvent, nameof(DispatchEvent)); + Guard.Against.Null(CallbackEvent, nameof(CallbackEvent)); - Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId); - Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId); - Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId); + Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId, nameof(DispatchEvent.WorkflowInstanceId)); + Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId, nameof(DispatchEvent.ExecutionId)); + Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId, nameof(DispatchEvent.PayloadId)); } public override async Task> RetrieveMetadata(CancellationToken cancellationToken = default) diff --git a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs index 5d3fdb08b..52fcfd174 100644 --- a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs +++ b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -using static Monai.Deploy.WorkflowManager.Shared.ValidationConstants; +using static Monai.Deploy.WorkflowManager.Common.Miscellaneous.ValidationConstants; namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues { diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 8760538cd..9e57e4d5a 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -46,23 +46,20 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, "DnsClient": { @@ -105,11 +102,6 @@ "Microsoft.Extensions.Logging": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "KubernetesClient.Basic": { "type": "Transitive", "resolved": "10.1.4", @@ -306,11 +298,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -357,19 +348,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -413,8 +404,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -536,38 +527,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -790,11 +775,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -1200,30 +1180,30 @@ "resolved": "13.0.1", "contentHash": "E1e/xFXB+Cbn7pLVlr+8E3nemEitIReVgmAMMMveADvZvXGuSGHP+1Cg6oA+SUfwXHfaXLQn4STCaPKtdIJkWA==" }, - "monai.deploy.workflowmanager.configuration": { + "Monai.Deploy.WorkflowManager.Common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Monai.Deploy.Storage": "0.2.15" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" } }, - "monai.deploy.workflowmanager.shared": { + "Monai.Deploy.WorkflowManager.Common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", + "Ardalis.GuardClauses": "[4.1.1, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "fo-dicom": "[5.0.3, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Mongo.Migration": "3.1.4", - "MongoDB.Bson": "2.19.0" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Mongo.Migration": "[3.1.4, )", + "MongoDB.Bson": "[2.19.0, )" } } } } -} +} \ No newline at end of file diff --git a/src/TaskManager/Plug-ins/Docker/ContainerStatusMonitor.cs b/src/TaskManager/Plug-ins/Docker/ContainerStatusMonitor.cs index 61fa920bb..a5b630b3b 100644 --- a/src/TaskManager/Plug-ins/Docker/ContainerStatusMonitor.cs +++ b/src/TaskManager/Plug-ins/Docker/ContainerStatusMonitor.cs @@ -25,7 +25,7 @@ using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; using Monai.Deploy.Storage.API; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.Docker.Logging; @@ -170,7 +170,7 @@ private async Task UploadOutputArtifacts(IStorageService storageService, IConten } _logger.ContentTypeForFile(objectName, contentType); using var stream = _fileSystem.File.OpenRead(file); - await storageService.PutObjectAsync(destination.Bucket, objectName, stream, stream.Length, contentType, null, cancellationToken).ConfigureAwait(false); + await storageService.PutObjectAsync(destination.Bucket, objectName, stream, stream.Length, contentType, new Dictionary(), cancellationToken).ConfigureAwait(false); } catch (Exception ex) { diff --git a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj index dc3f904df..99d94b012 100644 --- a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj +++ b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj @@ -37,7 +37,7 @@ - + diff --git a/src/TaskManager/Plug-ins/Email/EmailPlugin.cs b/src/TaskManager/Plug-ins/Email/EmailPlugin.cs index c29215111..e0b582fcf 100644 --- a/src/TaskManager/Plug-ins/Email/EmailPlugin.cs +++ b/src/TaskManager/Plug-ins/Email/EmailPlugin.cs @@ -23,10 +23,10 @@ using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.Storage.API; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Microsoft.Extensions.DependencyInjection; namespace Monai.Deploy.WorkflowManager.TaskManager.Email @@ -57,7 +57,7 @@ public EmailPlugin( _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _options = options ?? throw new ArgumentNullException(nameof(options)); - Guard.Against.Null(serviceScopeFactory); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); _scope = serviceScopeFactory.CreateScope(); _messageBrokerPublisherService = _scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IMessageBrokerPublisherService)); @@ -162,13 +162,22 @@ private async Task>> AddRawMetaFromFile(Dictiona _logger.NoMetaDataRequested(); return metadata; } + List allFiles; + try + { + allFiles = (List)await _storageService.ListObjectsAsync(bucketName, path, true); + } + catch (Exception ex) + { + var mess = ex.Message; + throw; + } - var allFiles = await _storageService.ListObjectsAsync(bucketName, path, true); foreach (var file in allFiles) { if (file.FilePath.EndsWith(".json", StringComparison.InvariantCultureIgnoreCase)) continue; - Guard.Against.NullOrWhiteSpace(bucketName); - Guard.Against.NullOrWhiteSpace(path); + Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName)); + Guard.Against.NullOrWhiteSpace(path, nameof(path)); // load file from Minio ! var fileStream = await _storageService.GetObjectAsync(bucketName, $"{file.FilePath}"); diff --git a/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj b/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj index 8d3e74ea6..c299e29dd 100644 --- a/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj +++ b/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj @@ -33,9 +33,9 @@ - + + - diff --git a/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs b/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs index 3a10a30f6..44ca990cf 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs +++ b/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs @@ -40,12 +40,12 @@ public TestPluginRepository( private void Validate() { - Guard.Against.Null(DispatchEvent); - Guard.Against.Null(CallbackEvent); + Guard.Against.Null(DispatchEvent, nameof(DispatchEvent)); + Guard.Against.Null(CallbackEvent, nameof(CallbackEvent)); - Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId); - Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId); - Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId); + Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId, nameof(DispatchEvent.WorkflowInstanceId)); + Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId, nameof(DispatchEvent.ExecutionId)); + Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId, nameof(DispatchEvent.PayloadId)); } public override async Task> RetrieveMetadata(CancellationToken cancellationToken = default) diff --git a/src/TaskManager/TaskManager/ApplicationPartsLogger.cs b/src/TaskManager/TaskManager/ApplicationPartsLogger.cs index d5c6ce94a..ee827f784 100644 --- a/src/TaskManager/TaskManager/ApplicationPartsLogger.cs +++ b/src/TaskManager/TaskManager/ApplicationPartsLogger.cs @@ -45,8 +45,10 @@ public Task StartAsync(CancellationToken cancellationToken) var controllers = controllerFeature.Controllers.Select(x => x.Name); // Log the application parts and controllers - _logger.LogInformation("Found the following application parts: '{ApplicationParts}' with the following controllers: '{Controllers}'", - string.Join(", ", applicationParts), string.Join(", ", controllers)); + _logger.LogInformation( + "Found the following application parts: '{ApplicationParts}' with the following controllers: '{Controllers}'", + string.Join(", ", applicationParts), + string.Join(", ", controllers)); return Task.CompletedTask; } diff --git a/src/TaskManager/TaskManager/Extensions/TaskManagerExtensions.cs b/src/TaskManager/TaskManager/Extensions/TaskManagerExtensions.cs index f0b406562..17872a3de 100644 --- a/src/TaskManager/TaskManager/Extensions/TaskManagerExtensions.cs +++ b/src/TaskManager/TaskManager/Extensions/TaskManagerExtensions.cs @@ -21,10 +21,9 @@ using Microsoft.Extensions.Hosting; using Monai.Deploy.Security.Authentication.Configurations; using Monai.Deploy.Security.Authentication.Extensions; -using Monai.Deploy.TaskManager.API; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; +using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.Argo; -using Monai.Deploy.WorkflowManager.TaskManager.Argo.Controllers; using Monai.Deploy.WorkflowManager.TaskManager.Docker; using Monai.Deploy.WorkflowManager.TaskManager.Services; using NLog; @@ -49,6 +48,7 @@ public static IServiceCollection AddTaskManager(this IServiceCollection services Guard.Against.Null(hostContext, nameof(hostContext)); services.AddTransient(); + // TODO: the plug-in dependencies need to be injected dynamically similar to how storage lib is loaded services.AddSingleton(); services.AddSingleton(); @@ -77,7 +77,7 @@ public static IServiceCollection AddTaskManager(this IServiceCollection services return services; } - private static void CheckAddControllerPlugins(this IServiceCollection services, IConfiguration Configuration, Logger logger) + private static void CheckAddControllerPlugins(this IServiceCollection services, IConfiguration configuration, Logger logger) { var numberAdded = 0; var allFiles = Directory.GetFiles(".", "*.dll"); @@ -95,7 +95,7 @@ private static void CheckAddControllerPlugins(this IServiceCollection services, if (numberAdded > 0) { services.AddOptions() - .Bind(Configuration.GetSection("MonaiDeployAuthentication")); + .Bind(configuration.GetSection("MonaiDeployAuthentication")); services.AddMonaiAuthentication(); } } diff --git a/src/TaskManager/TaskManager/GlobalSuppressions.cs b/src/TaskManager/TaskManager/GlobalSuppressions.cs new file mode 100644 index 000000000..12d41f973 --- /dev/null +++ b/src/TaskManager/TaskManager/GlobalSuppressions.cs @@ -0,0 +1,28 @@ +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1200:Using directives should be placed correctly", Justification = "this is a test")] +[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "this is a test", Scope = "member", Target = "~P:Monai.Deploy.WorkflowManager.TaskManager.TaskManager.Status")] +[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "this is a test", Scope = "member", Target = "~P:Monai.Deploy.WorkflowManager.TaskManager.TaskManager.ServiceName")] +[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "this is a test", Scope = "member", Target = "~M:Monai.Deploy.WorkflowManager.TaskManager.TaskManager.#ctor(Microsoft.Extensions.Logging.ILogger{Monai.Deploy.WorkflowManager.TaskManager.TaskManager},Microsoft.Extensions.Options.IOptions{Monai.Deploy.WorkflowManager.Configuration.WorkflowManagerOptions},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory)")] +[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:File should have header", Justification = "this is a test")] +[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "this is a test", Scope = "type", Target = "~T:Monai.Deploy.WorkflowManager.TaskManager.ApplicationPartsLogger")] diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 8ff9362b0..fd9ead51b 100755 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -61,10 +61,10 @@ - - - - + + + + @@ -77,8 +77,9 @@ - - + + + diff --git a/src/TaskManager/TaskManager/PluginStrings.cs b/src/TaskManager/TaskManager/PluginStrings.cs index 712641b5c..6a8c5156a 100644 --- a/src/TaskManager/TaskManager/PluginStrings.cs +++ b/src/TaskManager/TaskManager/PluginStrings.cs @@ -16,6 +16,7 @@ namespace Monai.Deploy.WorkflowManager.TaskManager { +#pragma warning disable SA1600 // Elements should be documented public static class PluginStrings { // note not to be confused with the ApplicationId Monai.Deploy.WorkflowManager.TaskManager.Argo @@ -26,3 +27,4 @@ public static class PluginStrings public static readonly IReadOnlyList PlugsRequiresPermanentAccoutns = new List() { Argo, Docker }; } } +#pragma warning restore SA1600 // Elements should be documented diff --git a/src/TaskManager/TaskManager/Program.cs b/src/TaskManager/TaskManager/Program.cs index 54ca453ed..f9f2be025 100755 --- a/src/TaskManager/TaskManager/Program.cs +++ b/src/TaskManager/TaskManager/Program.cs @@ -16,7 +16,9 @@ using System.IO.Abstractions; using System.Reflection; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -26,43 +28,38 @@ using Monai.Deploy.Messaging.Configuration; using Monai.Deploy.Storage; using Monai.Deploy.Storage.Configuration; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; using Monai.Deploy.WorkflowManager.TaskManager.Database; using Monai.Deploy.WorkflowManager.TaskManager.Database.Options; using Monai.Deploy.WorkflowManager.TaskManager.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.Services.Http; -using Mongo.Migration.Startup.DotNetCore; using Mongo.Migration.Startup; +using Mongo.Migration.Startup.DotNetCore; using MongoDB.Driver; using NLog; using NLog.LayoutRenderers; using NLog.Web; -using Microsoft.AspNetCore.Http; -using Monai.Deploy.WorkflowManager.Shared.Services; -using Microsoft.AspNetCore.Builder; namespace Monai.Deploy.WorkflowManager.TaskManager { + /// + /// Main entry point for TaskManager. + /// public class Program { + /// + /// Initializes a new instance of the class. + /// protected Program() - { } - - private static void Main(string[] args) { - var version = typeof(Program).Assembly; - var assemblyVersionNumber = version.GetCustomAttribute()?.InformationalVersion ?? "0.0.1"; - - var logger = ConfigureNLog(assemblyVersionNumber); - logger.Info($"Initializing MONAI Deploy Task Manager v{assemblyVersionNumber}"); - - var host = CreateHostBuilder(args).Build(); - host.Run(); - logger.Info("MONAI Deploy Deploy Task Manager shutting down."); - - NLog.LogManager.Shutdown(); } + /// + /// standard host builder construction. + /// + /// args passed in to the runtime. + /// host builder. public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => @@ -95,6 +92,21 @@ public static IHostBuilder CreateHostBuilder(string[] args) => .UseNLog(); + private static void Main(string[] args) + { + var version = typeof(Program).Assembly; + var assemblyVersionNumber = version.GetCustomAttribute()?.InformationalVersion ?? "0.0.1"; + + var logger = ConfigureNLog(assemblyVersionNumber); + logger.Info($"Initializing MONAI Deploy Task Manager v{assemblyVersionNumber}"); + + var host = CreateHostBuilder(args).Build(); + host.Run(); + logger.Info("MONAI Deploy Deploy Task Manager shutting down."); + + NLog.LogManager.Shutdown(); + } + private static void ConfigureServices(HostBuilderContext hostContext, IServiceCollection services) { services.AddOptions().Bind(hostContext.Configuration.GetSection("WorkflowManager")); diff --git a/src/TaskManager/TaskManager/Services/Http/Startup.cs b/src/TaskManager/TaskManager/Services/Http/Startup.cs index 1f50d1c1b..0dee0e0ca 100644 --- a/src/TaskManager/TaskManager/Services/Http/Startup.cs +++ b/src/TaskManager/TaskManager/Services/Http/Startup.cs @@ -24,7 +24,7 @@ using Microsoft.Extensions.Logging; using Microsoft.OpenApi.Models; using Monai.Deploy.Security.Authentication.Extensions; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Newtonsoft.Json.Converters; namespace Monai.Deploy.WorkflowManager.TaskManager.Services.Http diff --git a/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs b/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs index 49579a4fe..ec6639884 100644 --- a/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs +++ b/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs @@ -16,13 +16,17 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; -using Monai.Deploy.TaskManager.API; +using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.API.Models; using Monai.Deploy.WorkflowManager.TaskManager.Database; using Monai.Deploy.WorkflowManager.TaskManager.Logging; namespace Monai.Deploy.WorkflowManager.TaskManager.Services { +#pragma warning disable CS8602 // Dereference of a possibly null reference. +#pragma warning disable CS8604 // Possible null reference argument. +#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. +#pragma warning disable SA1600 public class TaskDispatchEventService : ITaskDispatchEventService { private readonly ITaskDispatchEventRepository _taskDispatchEventRepository; @@ -69,10 +73,10 @@ public TaskDispatchEventService(ITaskDispatchEventRepository taskDispatchEventRe return await _taskDispatchEventRepository.GetByTaskExecutionIdAsync(taskExecutionId).ConfigureAwait(false); } - public async Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEvent, Dictionary pluginArgs) + public async Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEvent, Dictionary pluginArgs) { - Guard.Against.Null(taskDispatchEvent); - Guard.Against.Null(pluginArgs); + Guard.Against.Null(taskDispatchEvent, nameof(taskDispatchEvent)); + Guard.Against.Null(pluginArgs, nameof(pluginArgs)); try { @@ -85,3 +89,7 @@ public async Task UpdateTaskPluginArgsAsync(TaskDispatchE } } } +#pragma warning restore CS8604 // Possible null reference argument. +#pragma warning restore CS8602 // Dereference of a possibly null reference. +#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. +#pragma warning restore SA1600 diff --git a/src/TaskManager/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs index 2091f1db3..0e29af285 100644 --- a/src/TaskManager/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager/TaskManager.cs @@ -14,6 +14,7 @@ * limitations under the License. */ +using System.Reflection; using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -25,14 +26,18 @@ using Monai.Deploy.Messaging.Messages; using Monai.Deploy.Storage.API; using Monai.Deploy.Storage.S3Policy.Policies; -using Monai.Deploy.TaskManager.API; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.API.Models; using Monai.Deploy.WorkflowManager.TaskManager.Logging; +#pragma warning disable CS8602 // Dereference of a possibly null reference. +#pragma warning disable CS8604 // Possible null reference argument. +#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. +#pragma warning disable SA1600 // Elements should be documented +#pragma warning disable SA1201 // Elements should be documented namespace Monai.Deploy.WorkflowManager.TaskManager { public class TaskManager : IHostedService, IDisposable, IMonaiService @@ -111,6 +116,26 @@ public Task StopAsync(CancellationToken cancellationToken) return Task.CompletedTask; } + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + GC.SuppressFinalize(this); + } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + _scope.Dispose(); + } + + _disposedValue = true; + } + } + private static JsonMessage GenerateUpdateEventMessage( JsonMessage message, string executionId, @@ -160,13 +185,14 @@ private async Task TaskCancelationEventCallback(MessageReceivedEventArgs args) } /// - /// Generic Version of task callbacks + /// Generic Version of task callbacks. /// - /// + /// type. /// Message. /// Action to run on the message. - /// - private async Task TaskCallBackGeneric(MessageReceivedEventArgs args, Func, Task> func) where T : EventBase + /// Task. + private async Task TaskCallBackGeneric(MessageReceivedEventArgs args, Func, Task> func) + where T : EventBase { Guard.Against.Null(args, nameof(args)); @@ -174,7 +200,7 @@ private async Task TaskCallBackGeneric(MessageReceivedEventArgs args, Func? message = null; @@ -217,7 +243,7 @@ private async Task HandleCancellationTask(JsonMessage mes try { var taskExecution = await _taskDispatchEventService.GetByTaskExecutionIdAsync(message.Body.ExecutionId).ConfigureAwait(false); - pluginAssembly = _options.Value.TaskManager.PluginAssemblyMappings[taskExecution?.Event.TaskPluginType] ?? String.Empty; + pluginAssembly = _options.Value.TaskManager.PluginAssemblyMappings[taskExecution?.Event.TaskPluginType] ?? string.Empty; var taskExecEvent = taskExecution?.Event; if (taskExecEvent == null) { @@ -303,7 +329,9 @@ private async Task HandleTaskCallback(JsonMessage message) updateMessage = GenerateUpdateEventMessage(message, message.Body.ExecutionId, message.Body.WorkflowInstanceId, message.Body.TaskId, executionStatus, taskExecution.Event.Outputs); updateMessage.Body.Metadata.Add(Strings.JobIdentity, message.Body.Identity); foreach (var item in message.Body.Metadata) + { updateMessage.Body.Metadata.Add(item.Key, item.Value); + } } catch (Exception ex) { @@ -380,7 +408,7 @@ private async Task HandleDispatchTask(JsonMessage message) { ["workflowInstanceId"] = eventInfo.Event.WorkflowInstanceId, ["taskId"] = eventInfo.Event.TaskId, - ["executionId"] = eventInfo.Event.ExecutionId + ["executionId"] = eventInfo.Event.ExecutionId, }); await _taskDispatchEventService.CreateAsync(eventInfo).ConfigureAwait(false); @@ -435,6 +463,9 @@ await Task.WhenAll( } catch (Exception ex) { + var ass = Assembly.Load("Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview"); + var types = ass.GetTypes().ToArray(); + _logger.UnsupportedRunner(pluginAssembly, ex); await HandleMessageExceptionTaskUpdate(message, message.Body.WorkflowInstanceId, message.Body.TaskId, message.Body.ExecutionId, ex.Message, false).ConfigureAwait(false); taskRunner?.Dispose(); @@ -500,7 +531,7 @@ private async Task AddCredentialsToPlugin(JsonMessage storage.Credentials = new Credentials { AccessKey = creds.AccessKeyId, - AccessToken = creds.SecretAccessKey + AccessToken = creds.SecretAccessKey, }; } @@ -540,7 +571,7 @@ private void AcknowledgeMessage(JsonMessage message) } } - //TODO: gh-100 implement retry logic + // TODO: gh-100 implement retry logic private async Task SendUpdateEvent(JsonMessage message) { Guard.Against.NullService(_messageBrokerPublisherService, nameof(IMessageBrokerPublisherService)); @@ -570,11 +601,11 @@ private bool TryReserveResourceForExecution() return Interlocked.CompareExchange(ref _activeJobs, expectedActiveJobs, activeJobs) != activeJobs; } - private async Task HandleMessageExceptionTaskUpdate(MessageBase message, string WorkflowInstanceId, string taskId, string executionId, string errors, bool requeue) + private async Task HandleMessageExceptionTaskUpdate(MessageBase message, string workflowInstanceId, string taskId, string executionId, string errors, bool requeue) { Guard.Against.NullService(_messageBrokerSubscriberService, nameof(IMessageBrokerSubscriberService)); - await HandleMessageException(message, WorkflowInstanceId, taskId, executionId, requeue); + await HandleMessageException(message, workflowInstanceId, taskId, executionId, requeue); var updateMessage = new JsonMessage( new TaskUpdateEvent @@ -583,7 +614,7 @@ private async Task HandleMessageExceptionTaskUpdate(MessageBase message, string ExecutionId = executionId, Reason = FailureReason.PluginError, Status = TaskExecutionStatus.Failed, - WorkflowInstanceId = WorkflowInstanceId, + WorkflowInstanceId = workflowInstanceId, TaskId = taskId, Message = errors, }, @@ -628,25 +659,9 @@ private async Task HandleMessageException(MessageBase message, string workflowIn _logger.ErrorSendingMessage(message.MessageDescription, ex); } } - - protected virtual void Dispose(bool disposing) - { - if (!_disposedValue) - { - if (disposing) - { - _scope.Dispose(); - } - - _disposedValue = true; - } - } - - public void Dispose() - { - // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method - Dispose(disposing: true); - GC.SuppressFinalize(this); - } +#pragma warning restore CS8604 // Possible null reference argument. +#pragma warning restore CS8602 // Dereference of a possibly null reference. +#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. +#pragma warning restore SA1600 // Elements should be documented } } diff --git a/src/TaskManager/TaskManager/TaskManagerException.cs b/src/TaskManager/TaskManager/TaskManagerException.cs index ced7e4dce..0bf8aa205 100644 --- a/src/TaskManager/TaskManager/TaskManagerException.cs +++ b/src/TaskManager/TaskManager/TaskManagerException.cs @@ -19,22 +19,27 @@ namespace Monai.Deploy.WorkflowManager.TaskManager { [Serializable] +#pragma warning disable SA1600 // Elements should be documented internal class TaskManagerException : Exception { public TaskManagerException() { } - public TaskManagerException(string? message) : base(message) + public TaskManagerException(string? message) + : base(message) { } - public TaskManagerException(string? message, Exception? innerException) : base(message, innerException) + public TaskManagerException(string? message, Exception? innerException) + : base(message, innerException) { } - protected TaskManagerException(SerializationInfo info, StreamingContext context) : base(info, context) + protected TaskManagerException(SerializationInfo info, StreamingContext context) + : base(info, context) { } +#pragma warning restore SA1600 // Elements should be documented } } diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index e9ba4d952..2fc1b6ac7 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -74,29 +74,25 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "requested": "[0.1.25, )", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==", + "requested": "[0.1.25, )", + "resolved": "0.1.25", + "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Polly": "7.2.3", - "RabbitMQ.Client": "6.4.0", - "System.Collections.Concurrent": "4.3.0" + "Monai.Deploy.Messaging": "0.1.25", + "Polly": "7.2.4", + "RabbitMQ.Client": "6.5.0" } }, "Monai.Deploy.Security": { @@ -116,32 +112,25 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.15, )", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "requested": "[0.2.18, )", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.15, )", - "resolved": "0.2.15", - "contentHash": "hyN7GuTp80y5cpY01IqbzkRCc0QB3y2v7Sppzarsnw6l6FgLJ1ZUgvMN4VDBwVyMNJytBeEKWfgn/FdidGNYaw==", + "requested": "[0.2.18, )", + "resolved": "0.2.18", + "contentHash": "0sHLiT0qU2Fg5O+AF8UDqzsJEYztUAFZeOPh4kOLC4bckhb+wSsuv7VcAXWtR3BOY6TxaMVVUJ+EK/o5mCp3tQ==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Minio": "4.0.7", - "Monai.Deploy.Storage": "0.2.15", - "Monai.Deploy.Storage.S3Policy": "0.2.15" + "Minio": "5.0.0", + "Monai.Deploy.Storage": "0.2.18", + "Monai.Deploy.Storage.S3Policy": "0.2.18" } }, "Mongo.Migration": { @@ -201,32 +190,26 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, - "Crc32.NET": { + "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==", - "dependencies": { - "NETStandard.Library": "2.0.0" - } + "resolved": "8.1.0", + "contentHash": "kgDi65k02hrgnHy3N0xENecsr0spW13RdIA1tipovi9t16gKziI7uZIu3qkxz0GctCHNM4hfeqXYg//6wHJ6Kw==" }, "DnsClient": { "type": "Transitive", @@ -281,11 +264,6 @@ "Microsoft.Extensions.Logging": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "KubernetesClient": { "type": "Transitive", "resolved": "10.1.4", @@ -633,19 +611,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -704,8 +682,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -864,8 +842,8 @@ }, "Microsoft.NETCore.Targets": { "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, "Microsoft.OpenApi": { "type": "Transitive", @@ -888,24 +866,20 @@ }, "Minio": { "type": "Transitive", - "resolved": "4.0.7", - "contentHash": "gmd+B4YHaE+cz8TCPIzkhov3t30VovGfyf6vMxqXd/iF/cziKmXKJJXv2E9kcHvbGwVHhMWtvk7fXWOzHcU4uw==", + "resolved": "5.0.0", + "contentHash": "7tZj90WEuuH60RAP4wBYexjMuJOhCnK7I46hCiX3CtZPackHisLZ8aAJmn3KlwbUX22dBDphwemD+h37vet8Qw==", "dependencies": { - "Crc32.NET": "1.2.0", - "Microsoft.CSharp": "4.7.0", - "Newtonsoft.Json": "13.0.1", - "System.Net.Http": "4.3.4", - "System.Net.Primitives": "4.3.1", - "System.Reactive.Linq": "5.0.0", - "System.ValueTuple": "4.4.0" + "CommunityToolkit.HighPerformance": "8.1.0", + "System.IO.Hashing": "7.0.0", + "System.Reactive.Linq": "5.0.0" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -949,14 +923,6 @@ "resolved": "1.7.0", "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, "Newtonsoft.Json": { "type": "Transitive", "resolved": "13.0.3", @@ -982,8 +948,8 @@ }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "prometheus-net": { "type": "Transitive", @@ -996,111 +962,22 @@ }, "RabbitMQ.Client": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", + "resolved": "6.5.0", + "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==", "dependencies": { - "System.Memory": "4.5.4", - "System.Threading.Channels": "4.7.1" + "System.Memory": "4.5.5", + "System.Threading.Channels": "7.0.0" } }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" - }, "runtime.native.System": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "resolved": "4.0.0", + "contentHash": "QfS/nQI7k/BLgmLrw7qm7YBoULEvgWnPI+cYsbfCVFTW8Aj+i8JhccxcFMu1RWms0YZzF+UHguNBK4Qn89e2Sg==", "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1" } }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" - }, "Serilog": { "type": "Transitive", "resolved": "2.8.0", @@ -1221,29 +1098,29 @@ }, "System.Collections": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "resolved": "4.0.11", + "contentHash": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" } }, "System.Collections.Concurrent": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "resolved": "4.0.12", + "contentHash": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Reflection": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11" } }, "System.Collections.NonGeneric": { @@ -1259,11 +1136,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -1289,12 +1161,12 @@ }, "System.Diagnostics.Tracing": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "resolved": "4.1.0", + "contentHash": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" } }, "System.Dynamic.Runtime": { @@ -1329,30 +1201,6 @@ "System.Runtime": "4.3.0" } }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.27.0", @@ -1381,37 +1229,42 @@ }, "System.IO.FileSystem": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "resolved": "4.0.1", + "contentHash": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.IO": "4.1.0", + "System.IO.FileSystem.Primitives": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Text.Encoding": "4.0.11", + "System.Threading.Tasks": "4.0.11" } }, "System.IO.FileSystem.Primitives": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "resolved": "4.0.1", + "contentHash": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==", "dependencies": { - "System.Runtime": "4.3.0" + "System.Runtime": "4.1.0" } }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "sDnWM0N3AMCa86LrKTWeF3BZLD2sgWyYUc7HL6z4+xyDZNQRwzmxbo4qP2rX2MqC+Sy1/gOSRDah5ltxY5jPxw==" + }, "System.Linq": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "resolved": "4.1.0", + "contentHash": "bQ0iYFOQI0nuTnt+NQADns6ucV4DUvMdwN6CbkB1yj8i7arTGiTN5eok1kQwdnnNWSDZfIUySQY+J3d5KjWn0g==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0" } }, "System.Linq.Expressions": { @@ -1440,52 +1293,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3", - "System.Runtime": "4.3.1", - "System.Runtime.Handles": "4.3.0" - } + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, "System.ObjectModel": { "type": "Transitive", @@ -1602,11 +1411,11 @@ }, "System.Runtime": { "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" } }, "System.Runtime.CompilerServices.Unsafe": { @@ -1626,25 +1435,25 @@ }, "System.Runtime.Handles": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "resolved": "4.0.1", + "contentHash": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" } }, "System.Runtime.InteropServices": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "resolved": "4.1.0", + "contentHash": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Reflection": "4.1.0", + "System.Reflection.Primitives": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Handles": "4.0.1" } }, "System.Runtime.InteropServices.RuntimeInformation": { @@ -1661,17 +1470,6 @@ "runtime.native.System": "4.0.0" } }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, "System.Security.AccessControl": { "type": "Transitive", "resolved": "5.0.0", @@ -1681,137 +1479,11 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", @@ -1874,8 +1546,8 @@ }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" + "resolved": "7.0.0", + "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA==" }, "System.Threading.Tasks": { "type": "Transitive", @@ -1917,34 +1589,34 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "monai.deploy.workflowmanager.configuration": { + "Monai.Deploy.WorkflowManager.Common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Monai.Deploy.Storage": "0.2.15" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" } }, - "monai.deploy.workflowmanager.shared": { + "Monai.Deploy.WorkflowManager.Common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", + "Ardalis.GuardClauses": "[4.1.1, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "fo-dicom": "[5.0.3, )" } }, "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -1954,8 +1626,8 @@ "dependencies": { "KubernetesClient": "[10.1.4, )", "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" } }, @@ -1969,29 +1641,20 @@ "monai.deploy.workflowmanager.taskmanager.docker": { "type": "Project", "dependencies": { - "Docker.DotNet": "3.125.13", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" - } - }, - "monai.deploy.workflowmanager.taskmanager.email": { - "type": "Project", - "dependencies": { - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.Shared": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", - "fo-dicom": "5.0.3" + "Docker.DotNet": "[3.125.13, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" } }, "monai.deploy.workflowmanager.taskmanager.email": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", "fo-dicom": "[5.0.3, )" } } } } -} +} \ No newline at end of file diff --git a/src/WorkflowManager/Common/Exceptions/BadRequestException.cs b/src/WorkflowManager/Common/Exceptions/BadRequestException.cs index af03776b2..1162f4005 100644 --- a/src/WorkflowManager/Common/Exceptions/BadRequestException.cs +++ b/src/WorkflowManager/Common/Exceptions/BadRequestException.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Common.Exceptions +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions { public class MonaiBadRequestException : Exception { diff --git a/src/WorkflowManager/Common/Exceptions/InternalServerException.cs b/src/WorkflowManager/Common/Exceptions/InternalServerException.cs index 4557c83b1..9fb44e631 100644 --- a/src/WorkflowManager/Common/Exceptions/InternalServerException.cs +++ b/src/WorkflowManager/Common/Exceptions/InternalServerException.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Common.Exceptions +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions { public class MonaiInternalServerException : Exception { diff --git a/src/WorkflowManager/Common/Exceptions/NotFoundException.cs b/src/WorkflowManager/Common/Exceptions/NotFoundException.cs index 35f81d6e2..960dda14b 100644 --- a/src/WorkflowManager/Common/Exceptions/NotFoundException.cs +++ b/src/WorkflowManager/Common/Exceptions/NotFoundException.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Common.Exceptions +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions { public class MonaiNotFoundException : Exception { diff --git a/src/WorkflowManager/Common/Extensions/ArrayExtensions.cs b/src/WorkflowManager/Common/Extensions/ArrayExtensions.cs index 4187366ce..0e5841633 100644 --- a/src/WorkflowManager/Common/Extensions/ArrayExtensions.cs +++ b/src/WorkflowManager/Common/Extensions/ArrayExtensions.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Common.Extensions +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Extensions { public static class ArrayExtensions { diff --git a/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs b/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs index f66f3974b..991bcbd6e 100644 --- a/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs +++ b/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs @@ -16,7 +16,7 @@ using Ardalis.GuardClauses; -namespace Monai.Deploy.WorkflowManager.Common.Extensions +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Extensions { /// /// Set of useful extensions for collections. @@ -42,7 +42,7 @@ public static bool IsNullOrEmpty(this ICollection array) /// public static void Append(this Dictionary array, Dictionary otherArray) where TKey : notnull { - Guard.Against.Null(array); + Guard.Against.Null(array, nameof(array)); if (otherArray.IsNullOrEmpty()) { return; diff --git a/src/WorkflowManager/Common/Extensions/FileExtensions.cs b/src/WorkflowManager/Common/Extensions/FileExtensions.cs index 30e8723e2..563e14a51 100644 --- a/src/WorkflowManager/Common/Extensions/FileExtensions.cs +++ b/src/WorkflowManager/Common/Extensions/FileExtensions.cs @@ -16,7 +16,7 @@ using Monai.Deploy.Storage.API; -namespace Monai.Deploy.WorkflowManager.Common.Extensions +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Extensions { public static class FileExtensions { diff --git a/src/WorkflowManager/Common/Extensions/StorageListExtensions.cs b/src/WorkflowManager/Common/Extensions/StorageListExtensions.cs index a2ccf3a75..bc99e35bd 100755 --- a/src/WorkflowManager/Common/Extensions/StorageListExtensions.cs +++ b/src/WorkflowManager/Common/Extensions/StorageListExtensions.cs @@ -16,7 +16,7 @@ using Ardalis.GuardClauses; -namespace Monai.Deploy.WorkflowManager.Common.Extensions +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Extensions { public static class StorageListExtensions { diff --git a/src/WorkflowManager/Common/Interfaces/IPaginatedApi.cs b/src/WorkflowManager/Common/Interfaces/IPaginatedApi.cs index 75dc3c6ce..3889661f9 100644 --- a/src/WorkflowManager/Common/Interfaces/IPaginatedApi.cs +++ b/src/WorkflowManager/Common/Interfaces/IPaginatedApi.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Common.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces { public interface IPaginatedApi { diff --git a/src/WorkflowManager/Common/Interfaces/IPayloadService.cs b/src/WorkflowManager/Common/Interfaces/IPayloadService.cs index f4b586eee..5362ffca9 100644 --- a/src/WorkflowManager/Common/Interfaces/IPayloadService.cs +++ b/src/WorkflowManager/Common/Interfaces/IPayloadService.cs @@ -15,9 +15,9 @@ */ using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Common.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces { public interface IPayloadService : IPaginatedApi { diff --git a/src/WorkflowManager/Common/Interfaces/ITasksService.cs b/src/WorkflowManager/Common/Interfaces/ITasksService.cs index a886d8b61..0b0ab317b 100644 --- a/src/WorkflowManager/Common/Interfaces/ITasksService.cs +++ b/src/WorkflowManager/Common/Interfaces/ITasksService.cs @@ -14,9 +14,9 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Common.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces { public interface ITasksService { diff --git a/src/WorkflowManager/Common/Interfaces/IWorkflowInstanceService.cs b/src/WorkflowManager/Common/Interfaces/IWorkflowInstanceService.cs index fef88b3ff..3495ed042 100644 --- a/src/WorkflowManager/Common/Interfaces/IWorkflowInstanceService.cs +++ b/src/WorkflowManager/Common/Interfaces/IWorkflowInstanceService.cs @@ -15,9 +15,9 @@ */ using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Common.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces { public interface IWorkflowInstanceService : IPaginatedApi { diff --git a/src/WorkflowManager/Common/Interfaces/IWorkflowService.cs b/src/WorkflowManager/Common/Interfaces/IWorkflowService.cs index 8cce59cc4..14de0c5fa 100644 --- a/src/WorkflowManager/Common/Interfaces/IWorkflowService.cs +++ b/src/WorkflowManager/Common/Interfaces/IWorkflowService.cs @@ -14,9 +14,9 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Common.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces { public interface IWorkflowService : IPaginatedApi { diff --git a/src/WorkflowManager/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs index e1873fcbd..53bd57f08 100644 --- a/src/WorkflowManager/Common/Services/PayloadService.cs +++ b/src/WorkflowManager/Common/Services/PayloadService.cs @@ -19,14 +19,14 @@ using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; using Monai.Deploy.Storage.API; -using Monai.Deploy.WorkflowManager.Common.Exceptions; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Storage.Services; - -namespace Monai.Deploy.WorkflowManager.Common.Services +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Storage.Services; + +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services { public class PayloadService : IPayloadService { @@ -60,7 +60,7 @@ public PayloadService( public async Task CreateAsync(WorkflowRequestEvent eventPayload) { - Guard.Against.Null(eventPayload); + Guard.Against.Null(eventPayload, nameof(eventPayload)); try { @@ -109,7 +109,7 @@ public PayloadService( public async Task GetByIdAsync(string payloadId) { - Guard.Against.NullOrWhiteSpace(payloadId); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); return await _payloadRepository.GetByIdAsync(payloadId); } @@ -119,7 +119,7 @@ public async Task> GetAllAsync(int? skip = null, string? patientId = "", string? patientName = "") => await CreatePayloadsDto( - await _payloadRepository.GetAllAsync(skip, limit, patientId, patientName) + await _payloadRepository.GetAllAsync(skip, limit, patientId ?? string.Empty, patientName ?? string.Empty) ); public async Task> GetAllAsync(int? skip = null, int? limit = null) @@ -164,7 +164,7 @@ private async Task> CreatePayloadsDto(IList payloads) public async Task DeletePayloadFromStorageAsync(string payloadId) { - Guard.Against.NullOrWhiteSpace(payloadId); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); var payload = await GetByIdAsync(payloadId); diff --git a/src/WorkflowManager/Common/Services/TasksService.cs b/src/WorkflowManager/Common/Services/TasksService.cs index e361660de..8efc68ff3 100644 --- a/src/WorkflowManager/Common/Services/TasksService.cs +++ b/src/WorkflowManager/Common/Services/TasksService.cs @@ -14,11 +14,11 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; -namespace Monai.Deploy.WorkflowManager.Common.Services +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services { public class TasksService : ITasksService { diff --git a/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs b/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs index df2131918..9a17907f1 100644 --- a/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs +++ b/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs @@ -17,13 +17,13 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Common.Exceptions; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Logging; -namespace Monai.Deploy.WorkflowManager.Common.Services +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services { public class WorkflowInstanceService : IWorkflowInstanceService, IPaginatedApi { @@ -38,15 +38,15 @@ public WorkflowInstanceService(IWorkflowInstanceRepository workflowInstanceRepos public async Task GetByIdAsync(string id) { - Guard.Against.NullOrWhiteSpace(id); + Guard.Against.NullOrWhiteSpace(id, nameof(id)); return await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(id); } public async Task AcknowledgeTaskError(string workflowInstanceId, string executionId) { - Guard.Against.NullOrWhiteSpace(workflowInstanceId); - Guard.Against.NullOrWhiteSpace(executionId); + Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId)); + Guard.Against.NullOrWhiteSpace(executionId, nameof(executionId)); var workflowInstance = await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(workflowInstanceId); @@ -79,8 +79,8 @@ public async Task AcknowledgeTaskError(string workflowInstance public async Task UpdateExportCompleteMetadataAsync(string workflowInstanceId, string executionId, Dictionary fileStatuses) { - Guard.Against.NullOrWhiteSpace(workflowInstanceId); - Guard.Against.NullOrWhiteSpace(executionId); + Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId)); + Guard.Against.NullOrWhiteSpace(executionId, nameof(executionId)); var resultMetadata = fileStatuses.ToDictionary(f => f.Key, f => f.Value.ToString() as object); diff --git a/src/WorkflowManager/Common/Services/WorkflowService.cs b/src/WorkflowManager/Common/Services/WorkflowService.cs index 788e1a98b..fb3717244 100644 --- a/src/WorkflowManager/Common/Services/WorkflowService.cs +++ b/src/WorkflowManager/Common/Services/WorkflowService.cs @@ -16,12 +16,12 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Logging; -namespace Monai.Deploy.WorkflowManager.Common.Services +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services { public class WorkflowService : IWorkflowService { @@ -36,7 +36,7 @@ public WorkflowService(IWorkflowRepository workflowRepository, ILogger GetAsync(string id) { - Guard.Against.NullOrWhiteSpace(id); + Guard.Against.NullOrWhiteSpace(id, nameof(id)); var workflow = await _workflowRepository.GetByWorkflowIdAsync(id); @@ -45,14 +45,14 @@ public async Task GetAsync(string id) public async Task GetByNameAsync(string name) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return await _workflowRepository.GetByWorkflowNameAsync(name); } public async Task CreateAsync(Workflow workflow) { - Guard.Against.Null(workflow); + Guard.Against.Null(workflow, nameof(workflow)); var id = await _workflowRepository.CreateAsync(workflow); _logger.WorkflowCreated(id, workflow.Name); @@ -61,8 +61,8 @@ public async Task CreateAsync(Workflow workflow) public async Task UpdateAsync(Workflow workflow, string id, bool isUpdateToWorkflowName = false) { - Guard.Against.Null(workflow); - Guard.Against.NullOrWhiteSpace(id); + Guard.Against.Null(workflow, nameof(workflow)); + Guard.Against.NullOrWhiteSpace(id, nameof(id)); var existingWorkflow = await _workflowRepository.GetByWorkflowIdAsync(id); @@ -78,7 +78,7 @@ public async Task CreateAsync(Workflow workflow) public Task DeleteWorkflowAsync(WorkflowRevision workflow) { - Guard.Against.Null(workflow); + Guard.Against.Null(workflow, nameof(workflow)); var result = _workflowRepository.SoftDeleteWorkflow(workflow); _logger.WorkflowDeleted(workflow.WorkflowId, workflow.Id, workflow.Workflow?.Name); return result; diff --git a/src/WorkflowManager/ConditionsResolver/Constants/ParameterConstants.cs b/src/WorkflowManager/ConditionsResolver/Constants/ParameterConstants.cs index ff9f9a9bc..3c873ed4b 100644 --- a/src/WorkflowManager/ConditionsResolver/Constants/ParameterConstants.cs +++ b/src/WorkflowManager/ConditionsResolver/Constants/ParameterConstants.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Constants +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Constants { public static class ParameterConstants { diff --git a/src/WorkflowManager/ConditionsResolver/Extensions/RegexExtensions.cs b/src/WorkflowManager/ConditionsResolver/Extensions/RegexExtensions.cs index a27637e63..8fc5e6e42 100644 --- a/src/WorkflowManager/ConditionsResolver/Extensions/RegexExtensions.cs +++ b/src/WorkflowManager/ConditionsResolver/Extensions/RegexExtensions.cs @@ -16,7 +16,7 @@ using System.Text.RegularExpressions; -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions { public static class RegexExtensions { diff --git a/src/WorkflowManager/ConditionsResolver/Extensions/StringExtensions.cs b/src/WorkflowManager/ConditionsResolver/Extensions/StringExtensions.cs index 3654b8ff0..bccc68181 100644 --- a/src/WorkflowManager/ConditionsResolver/Extensions/StringExtensions.cs +++ b/src/WorkflowManager/ConditionsResolver/Extensions/StringExtensions.cs @@ -16,7 +16,7 @@ using System.Text; -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions { public static class StringExtensions { diff --git a/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs b/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs index 188ef092e..da89cbf5e 100644 --- a/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs +++ b/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs @@ -18,15 +18,15 @@ using System.Text.RegularExpressions; using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Constants; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Storage.Services; - -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Parser +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Constants; +using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions; +using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Storage.Services; + +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Parser { public enum ParameterContext { @@ -51,7 +51,7 @@ public class ConditionalParameterParser : IConditionalParameterParser private readonly IPayloadService _payloadService; private readonly IWorkflowService _workflowService; - private readonly Regex _squigglyBracketsRegex = new Regex(@"\{{(.*?)\}}"); + private readonly Regex _squigglyBracketsRegex = new(@"\{{(.*?)\}}", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2)); private WorkflowInstance? _workflowInstance = null; private string? _workflowInstanceId = null; @@ -97,8 +97,8 @@ private set public bool TryParse(string[] conditions, WorkflowInstance workflowInstance, out string resolvedConditional) { - Guard.Against.NullOrEmpty(conditions); - Guard.Against.Null(workflowInstance); + Guard.Against.NullOrEmpty(conditions, nameof(conditions)); + Guard.Against.Null(workflowInstance, nameof(workflowInstance)); var joinedConditions = conditions.CombineConditionString(); return TryParse(joinedConditions, workflowInstance, out resolvedConditional); @@ -106,8 +106,8 @@ public bool TryParse(string[] conditions, WorkflowInstance workflowInstance, out public bool TryParse(string conditions, WorkflowInstance workflowInstance, out string resolvedConditional) { - Guard.Against.NullOrEmpty(conditions); - Guard.Against.Null(workflowInstance); + Guard.Against.NullOrEmpty(conditions, nameof(conditions)); + Guard.Against.Null(workflowInstance, nameof(workflowInstance)); resolvedConditional = string.Empty; try @@ -127,8 +127,8 @@ public bool TryParse(string conditions, WorkflowInstance workflowInstance, out s public string ResolveParameters(string conditions, WorkflowInstance workflowInstance) { - Guard.Against.NullOrEmpty(conditions); - Guard.Against.Null(workflowInstance); + Guard.Against.NullOrEmpty(conditions, nameof(conditions)); + Guard.Against.Null(workflowInstance, nameof(workflowInstance)); WorkflowInstance = workflowInstance; return ResolveParameters(conditions, workflowInstance.Id); @@ -222,7 +222,7 @@ private void ClearWorkflowParser() /// private (string? Result, ParameterContext Context) ResolveMatch(string value) { - Guard.Against.NullOrWhiteSpace(value); + Guard.Against.NullOrWhiteSpace(value, nameof(value)); value = value.Substring(2, value.Length - 4).Trim(); @@ -252,8 +252,8 @@ private void ClearWorkflowParser() private (string? Result, ParameterContext Context) ResolveDicom(string value) { - Guard.Against.NullOrWhiteSpace(value); - Guard.Against.Null(WorkflowInstance); + Guard.Against.NullOrWhiteSpace(value, nameof(value)); + Guard.Against.Null(WorkflowInstance, nameof(WorkflowInstance)); var subValue = value.Trim().Substring(ContextDicomSeries.Length, value.Length - ContextDicomSeries.Length); var valueArr = subValue.Split('\''); diff --git a/src/WorkflowManager/ConditionsResolver/Parser/IConditionalParameterParser.cs b/src/WorkflowManager/ConditionsResolver/Parser/IConditionalParameterParser.cs index e929ac00b..02b74dd7e 100644 --- a/src/WorkflowManager/ConditionsResolver/Parser/IConditionalParameterParser.cs +++ b/src/WorkflowManager/ConditionsResolver/Parser/IConditionalParameterParser.cs @@ -14,9 +14,9 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Parser +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Parser { public interface IConditionalParameterParser { diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs index 1d4fc2345..73d03c8c4 100644 --- a/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs +++ b/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs @@ -17,7 +17,7 @@ using System.Globalization; using System.Text.RegularExpressions; -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver { public sealed class Conditional { diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs b/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs index 70b7dd4f3..389a0975b 100644 --- a/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs +++ b/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs @@ -16,9 +16,9 @@ using System.Text.RegularExpressions; using Ardalis.GuardClauses; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions; +using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions; -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver { public class ConditionalGroup { @@ -38,13 +38,13 @@ public class ConditionalGroup public int GroupedLogical { get; set; } = 1; - public Regex FindAnds { get; } = new Regex(@"([\s]and[\s]|[\s]AND[\s]|[\s]And[\s])"); + public Regex FindAnds { get; } = new(@"([\s]and[\s]|[\s]AND[\s]|[\s]And[\s])", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2)); - public Regex FindOrs { get; } = new Regex(@"([\s]or[\s]|[\s]OR[\s]|[\s]Or[\s])"); + public Regex FindOrs { get; } = new(@"([\s]or[\s]|[\s]OR[\s]|[\s]Or[\s])", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2)); - public Regex FindBrackets { get; } = new Regex(@"((? FindOrs.SplitOnce(input); @@ -82,7 +82,7 @@ public void Set(string left, string right, Keyword? keyword) public void Parse(string input, int groupedLogicalParent = 0) { - Guard.Against.NullOrEmpty(input); + Guard.Against.NullOrEmpty(input, nameof(input)); var foundOpenBrackets = FindBrackets.Matches(input); var foundClosingBrackets = FindCloseBrackets.Matches(input); @@ -127,7 +127,7 @@ public void Parse(string input, int groupedLogicalParent = 0) public void ParseBrackets(string input) { - Guard.Against.NullOrWhiteSpace(input); + Guard.Against.NullOrWhiteSpace(input, nameof(input)); var foundAnds = FindAnds.Matches(input); var foundOrs = FindOrs.Matches(input); @@ -169,7 +169,7 @@ public void ParseBrackets(string input) private void ParseComplex(string input) { - Guard.Against.NullOrWhiteSpace(input); + Guard.Against.NullOrWhiteSpace(input, nameof(input)); var foundBrackets = FindBrackets.Matches(input); @@ -299,7 +299,7 @@ private bool EvaluteAndsLogicalGroups() public static ConditionalGroup Create(string input, int groupedLogicalParent = 0) { - Guard.Against.NullOrEmpty(input); + Guard.Against.NullOrEmpty(input, nameof(input)); var conditionalGroup = new ConditionalGroup(); if (groupedLogicalParent == 0) { diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs index a30fdd827..9bd77f3dd 100644 --- a/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs +++ b/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver +namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver { /// /// Group Keywords or Operators diff --git a/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs b/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs index 0be64fdfa..32632a8a3 100644 --- a/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs +++ b/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs @@ -14,12 +14,14 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Contracts.Constants +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Constants { public static class TaskTypeConstants { public const string RouterTask = "router"; public const string ExportTask = "export"; + + public const string ExternalAppTask = "remote_app_execution"; } } diff --git a/src/WorkflowManager/Contracts/Migrations/DocumentVersionConvert.cs b/src/WorkflowManager/Contracts/Migrations/DocumentVersionConvert.cs index b80062afe..2e06d685a 100755 --- a/src/WorkflowManager/Contracts/Migrations/DocumentVersionConvert.cs +++ b/src/WorkflowManager/Contracts/Migrations/DocumentVersionConvert.cs @@ -19,7 +19,7 @@ using MongoDB.Bson.Serialization; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Migrations +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations { public class DocumentVersionConvert : JsonConverter { diff --git a/src/WorkflowManager/Contracts/Migrations/M001_ExecutionStats_addVersion.cs b/src/WorkflowManager/Contracts/Migrations/M001_ExecutionStats_addVersion.cs index 67c56bcf3..636b9e4ba 100644 --- a/src/WorkflowManager/Contracts/Migrations/M001_ExecutionStats_addVersion.cs +++ b/src/WorkflowManager/Contracts/Migrations/M001_ExecutionStats_addVersion.cs @@ -14,11 +14,11 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Mongo.Migration.Migrations.Document; using MongoDB.Bson; -namespace Monai.Deploy.WorkflowManager.Contracts.Migrations +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations { public class M001_ExecutionStats_addVersion : DocumentMigration { diff --git a/src/WorkflowManager/Contracts/Migrations/M001_Payload_addVerion.cs b/src/WorkflowManager/Contracts/Migrations/M001_Payload_addVerion.cs index b734e7b23..d377ee09e 100644 --- a/src/WorkflowManager/Contracts/Migrations/M001_Payload_addVerion.cs +++ b/src/WorkflowManager/Contracts/Migrations/M001_Payload_addVerion.cs @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Mongo.Migration.Migrations.Document; using MongoDB.Bson; -namespace Monai.Deploy.WorkflowManager.Contracts.Migrations +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations { public class M001_Payload_addVerion : DocumentMigration { diff --git a/src/WorkflowManager/Contracts/Migrations/M001_WorkflowInstance_addVerion.cs b/src/WorkflowManager/Contracts/Migrations/M001_WorkflowInstance_addVerion.cs index 96e3d9a38..6bb32be66 100644 --- a/src/WorkflowManager/Contracts/Migrations/M001_WorkflowInstance_addVerion.cs +++ b/src/WorkflowManager/Contracts/Migrations/M001_WorkflowInstance_addVerion.cs @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Mongo.Migration.Migrations.Document; using MongoDB.Bson; -namespace Monai.Deploy.WorkflowManager.Contracts.Migrations +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations { public class M001_WorkflowInstance_addVerion : DocumentMigration { diff --git a/src/WorkflowManager/Contracts/Migrations/M001_WorkflowRevision_addVerion.cs b/src/WorkflowManager/Contracts/Migrations/M001_WorkflowRevision_addVerion.cs index 4896f8485..45c1a7449 100644 --- a/src/WorkflowManager/Contracts/Migrations/M001_WorkflowRevision_addVerion.cs +++ b/src/WorkflowManager/Contracts/Migrations/M001_WorkflowRevision_addVerion.cs @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Mongo.Migration.Migrations.Document; using MongoDB.Bson; -namespace Monai.Deploy.WorkflowManager.Contracts.Migrations +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations { public class M001_WorkflowRevision_addVerion : DocumentMigration { diff --git a/src/WorkflowManager/Contracts/Migrations/M002_ExecutionStats_addWorkflowId.cs b/src/WorkflowManager/Contracts/Migrations/M002_ExecutionStats_addWorkflowId.cs index 103b73ac5..deeb530c5 100644 --- a/src/WorkflowManager/Contracts/Migrations/M002_ExecutionStats_addWorkflowId.cs +++ b/src/WorkflowManager/Contracts/Migrations/M002_ExecutionStats_addWorkflowId.cs @@ -14,11 +14,11 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Mongo.Migration.Migrations.Document; using MongoDB.Bson; -namespace Monai.Deploy.WorkflowManager.Contracts.Migrations +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations { public class M002_ExecutionStats_addWorkflowId : DocumentMigration { diff --git a/src/WorkflowManager/Contracts/Migrations/M002_Payload_addPayloadDeleted.cs b/src/WorkflowManager/Contracts/Migrations/M002_Payload_addPayloadDeleted.cs index 7baa4002b..3d80fc912 100644 --- a/src/WorkflowManager/Contracts/Migrations/M002_Payload_addPayloadDeleted.cs +++ b/src/WorkflowManager/Contracts/Migrations/M002_Payload_addPayloadDeleted.cs @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Mongo.Migration.Migrations.Document; using MongoDB.Bson; -namespace Monai.Deploy.WorkflowManager.Contracts.Migrations +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations { public class M002_Payload_addPayloadDeleted : DocumentMigration { diff --git a/src/WorkflowManager/Contracts/Models/Artifact.cs b/src/WorkflowManager/Contracts/Models/Artifact.cs index d1591e905..13b784538 100644 --- a/src/WorkflowManager/Contracts/Models/Artifact.cs +++ b/src/WorkflowManager/Contracts/Models/Artifact.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class Artifact { diff --git a/src/WorkflowManager/Contracts/Models/ArtifactMap.cs b/src/WorkflowManager/Contracts/Models/ArtifactMap.cs index eca655953..e58634594 100644 --- a/src/WorkflowManager/Contracts/Models/ArtifactMap.cs +++ b/src/WorkflowManager/Contracts/Models/ArtifactMap.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class ArtifactMap { diff --git a/src/WorkflowManager/Contracts/Models/DicomValue.cs b/src/WorkflowManager/Contracts/Models/DicomValue.cs index 3c58a8144..3659155dd 100644 --- a/src/WorkflowManager/Contracts/Models/DicomValue.cs +++ b/src/WorkflowManager/Contracts/Models/DicomValue.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class DicomValue { diff --git a/src/WorkflowManager/Contracts/Models/ExecutionStatDTO.cs b/src/WorkflowManager/Contracts/Models/ExecutionStatDTO.cs index d21195a4d..80316be22 100644 --- a/src/WorkflowManager/Contracts/Models/ExecutionStatDTO.cs +++ b/src/WorkflowManager/Contracts/Models/ExecutionStatDTO.cs @@ -16,7 +16,7 @@ using System; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class ExecutionStatDTO diff --git a/src/WorkflowManager/Contracts/Models/ExecutionStats.cs b/src/WorkflowManager/Contracts/Models/ExecutionStats.cs index e7e5a6ad5..1d5eb39c6 100644 --- a/src/WorkflowManager/Contracts/Models/ExecutionStats.cs +++ b/src/WorkflowManager/Contracts/Models/ExecutionStats.cs @@ -16,7 +16,7 @@ using System; using System.ComponentModel.DataAnnotations; -using Monai.Deploy.WorkflowManager.Contracts.Migrations; +using Monai.Deploy.WorkflowManager.Common.Contracts.Migrations; using Ardalis.GuardClauses; using Monai.Deploy.Messaging.Events; using Mongo.Migration.Documents; @@ -24,7 +24,7 @@ using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { [CollectionLocation("ExecutionStats"), RuntimeVersion("1.0.1")] public class ExecutionStats : IDocument diff --git a/src/WorkflowManager/Contracts/Models/ExportDestination.cs b/src/WorkflowManager/Contracts/Models/ExportDestination.cs index 7cc856f19..1b9bed245 100644 --- a/src/WorkflowManager/Contracts/Models/ExportDestination.cs +++ b/src/WorkflowManager/Contracts/Models/ExportDestination.cs @@ -16,11 +16,11 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class ExportDestination { [JsonProperty(PropertyName = "name")] - public string Name { get; set; } + public string Name { get; set; } = ""; } } diff --git a/src/WorkflowManager/Contracts/Models/ISoftDeleteable.cs b/src/WorkflowManager/Contracts/Models/ISoftDeleteable.cs index 5257e2b27..82365a157 100644 --- a/src/WorkflowManager/Contracts/Models/ISoftDeleteable.cs +++ b/src/WorkflowManager/Contracts/Models/ISoftDeleteable.cs @@ -16,7 +16,7 @@ using System; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public interface ISoftDeleteable { diff --git a/src/WorkflowManager/Contracts/Models/InformaticsGateway.cs b/src/WorkflowManager/Contracts/Models/InformaticsGateway.cs index fcef1fe4c..60f066120 100644 --- a/src/WorkflowManager/Contracts/Models/InformaticsGateway.cs +++ b/src/WorkflowManager/Contracts/Models/InformaticsGateway.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class InformaticsGateway { diff --git a/src/WorkflowManager/Contracts/Models/PatientDetails.cs b/src/WorkflowManager/Contracts/Models/PatientDetails.cs index 6e5e4543a..cafc94bde 100644 --- a/src/WorkflowManager/Contracts/Models/PatientDetails.cs +++ b/src/WorkflowManager/Contracts/Models/PatientDetails.cs @@ -17,7 +17,7 @@ using System; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class PatientDetails { diff --git a/src/WorkflowManager/Contracts/Models/Payload.cs b/src/WorkflowManager/Contracts/Models/Payload.cs index cba4f3f54..c46dbd222 100755 --- a/src/WorkflowManager/Contracts/Models/Payload.cs +++ b/src/WorkflowManager/Contracts/Models/Payload.cs @@ -17,14 +17,14 @@ using System; using System.Collections.Generic; using Monai.Deploy.Messaging.Common; -using Monai.Deploy.WorkflowManager.Contracts.Migrations; +using Monai.Deploy.WorkflowManager.Common.Contracts.Migrations; using Mongo.Migration.Documents; using Mongo.Migration.Documents.Attributes; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { [CollectionLocation("Payloads"), RuntimeVersion("1.0.1")] public class Payload : IDocument diff --git a/src/WorkflowManager/Contracts/Models/PayloadDto.cs b/src/WorkflowManager/Contracts/Models/PayloadDto.cs index 116f6278b..5988e9fa2 100644 --- a/src/WorkflowManager/Contracts/Models/PayloadDto.cs +++ b/src/WorkflowManager/Contracts/Models/PayloadDto.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class PayloadDto : Payload { diff --git a/src/WorkflowManager/Contracts/Models/Status.cs b/src/WorkflowManager/Contracts/Models/Status.cs index 0ca97fb0f..487bddc20 100644 --- a/src/WorkflowManager/Contracts/Models/Status.cs +++ b/src/WorkflowManager/Contracts/Models/Status.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public enum Status { diff --git a/src/WorkflowManager/Contracts/Models/TaskDestination.cs b/src/WorkflowManager/Contracts/Models/TaskDestination.cs index 7ddf53ca7..f767777ce 100644 --- a/src/WorkflowManager/Contracts/Models/TaskDestination.cs +++ b/src/WorkflowManager/Contracts/Models/TaskDestination.cs @@ -17,7 +17,7 @@ using System; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class TaskDestination { diff --git a/src/WorkflowManager/Contracts/Models/TaskExecution.cs b/src/WorkflowManager/Contracts/Models/TaskExecution.cs index 8e9de57ab..a76865bca 100644 --- a/src/WorkflowManager/Contracts/Models/TaskExecution.cs +++ b/src/WorkflowManager/Contracts/Models/TaskExecution.cs @@ -19,7 +19,7 @@ using Monai.Deploy.Messaging.Events; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class TaskExecution { diff --git a/src/WorkflowManager/Contracts/Models/TaskObject.cs b/src/WorkflowManager/Contracts/Models/TaskObject.cs index 70c84134c..d9cff4a4f 100644 --- a/src/WorkflowManager/Contracts/Models/TaskObject.cs +++ b/src/WorkflowManager/Contracts/Models/TaskObject.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class TaskObject { diff --git a/src/WorkflowManager/Contracts/Models/Workflow.cs b/src/WorkflowManager/Contracts/Models/Workflow.cs index 17a05a4c9..da6435c49 100755 --- a/src/WorkflowManager/Contracts/Models/Workflow.cs +++ b/src/WorkflowManager/Contracts/Models/Workflow.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class Workflow diff --git a/src/WorkflowManager/Contracts/Models/WorkflowInstance.cs b/src/WorkflowManager/Contracts/Models/WorkflowInstance.cs index d620ce062..e22ffc2a4 100755 --- a/src/WorkflowManager/Contracts/Models/WorkflowInstance.cs +++ b/src/WorkflowManager/Contracts/Models/WorkflowInstance.cs @@ -16,13 +16,13 @@ using System; using System.Collections.Generic; -using Monai.Deploy.WorkflowManager.Contracts.Migrations; +using Monai.Deploy.WorkflowManager.Common.Contracts.Migrations; using Mongo.Migration.Documents; using Mongo.Migration.Documents.Attributes; using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { [CollectionLocation("WorkflowInstances"), RuntimeVersion("1.0.0")] public class WorkflowInstance : IDocument diff --git a/src/WorkflowManager/Contracts/Models/WorkflowRevision.cs b/src/WorkflowManager/Contracts/Models/WorkflowRevision.cs index 0e35c09af..af34bdbd9 100755 --- a/src/WorkflowManager/Contracts/Models/WorkflowRevision.cs +++ b/src/WorkflowManager/Contracts/Models/WorkflowRevision.cs @@ -15,13 +15,13 @@ */ using System; -using Monai.Deploy.WorkflowManager.Contracts.Migrations; +using Monai.Deploy.WorkflowManager.Common.Contracts.Migrations; using Mongo.Migration.Documents; using Mongo.Migration.Documents.Attributes; using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { [CollectionLocation("Workflows"), RuntimeVersion("1.0.0")] public class WorkflowRevision : ISoftDeleteable, IDocument diff --git a/src/WorkflowManager/Contracts/Models/WorkflowUpdateRequest.cs b/src/WorkflowManager/Contracts/Models/WorkflowUpdateRequest.cs index 90daca353..f9e5081e3 100644 --- a/src/WorkflowManager/Contracts/Models/WorkflowUpdateRequest.cs +++ b/src/WorkflowManager/Contracts/Models/WorkflowUpdateRequest.cs @@ -16,14 +16,14 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Models +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { public class WorkflowUpdateRequest { [JsonProperty(PropertyName = "original_workflow_name")] - public string OriginalWorkflowName { get; set; } + public string OriginalWorkflowName { get; set; } = ""; [JsonProperty(PropertyName = "workflow")] - public Workflow Workflow { get; set; } + public Workflow Workflow { get; set; } = new(); } } diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 1126257f2..a44456706 100755 --- a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/WorkflowManager/Contracts/Responses/CreateWorkflowResponse.cs b/src/WorkflowManager/Contracts/Responses/CreateWorkflowResponse.cs index fda0b85e8..85622e107 100644 --- a/src/WorkflowManager/Contracts/Responses/CreateWorkflowResponse.cs +++ b/src/WorkflowManager/Contracts/Responses/CreateWorkflowResponse.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Contracts.Responses +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Responses { public class CreateWorkflowResponse { diff --git a/src/WorkflowManager/Database/Interfaces/IPayloadRepository.cs b/src/WorkflowManager/Database/Interfaces/IPayloadRepository.cs index 75553371e..61fed986d 100644 --- a/src/WorkflowManager/Database/Interfaces/IPayloadRepository.cs +++ b/src/WorkflowManager/Database/Interfaces/IPayloadRepository.cs @@ -16,9 +16,9 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Database.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Database.Interfaces { public interface IPayloadRepository { diff --git a/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs b/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs index e9bd9dbf3..16f51022d 100644 --- a/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs +++ b/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs @@ -19,9 +19,9 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Database +namespace Monai.Deploy.WorkflowManager.Common.Database { public interface ITaskExecutionStatsRepository { diff --git a/src/WorkflowManager/Database/Interfaces/ITasksRepository.cs b/src/WorkflowManager/Database/Interfaces/ITasksRepository.cs index 00876de4a..8863f2012 100644 --- a/src/WorkflowManager/Database/Interfaces/ITasksRepository.cs +++ b/src/WorkflowManager/Database/Interfaces/ITasksRepository.cs @@ -16,9 +16,9 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Database.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Database.Interfaces { public interface ITasksRepository { diff --git a/src/WorkflowManager/Database/Interfaces/IWorkflowInstanceRepository.cs b/src/WorkflowManager/Database/Interfaces/IWorkflowInstanceRepository.cs index d3131ce8b..a6ffbcf4b 100644 --- a/src/WorkflowManager/Database/Interfaces/IWorkflowInstanceRepository.cs +++ b/src/WorkflowManager/Database/Interfaces/IWorkflowInstanceRepository.cs @@ -17,9 +17,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Database.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Database.Interfaces { public interface IWorkflowInstanceRepository { diff --git a/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs b/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs index 41cb8abb7..b8b8107be 100644 --- a/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs +++ b/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs @@ -18,9 +18,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Database.Interfaces +namespace Monai.Deploy.WorkflowManager.Common.Database.Interfaces { public interface IWorkflowRepository { diff --git a/src/WorkflowManager/Database/Options/ExecutionStatsDatabaseSettings.cs b/src/WorkflowManager/Database/Options/ExecutionStatsDatabaseSettings.cs index 01bd75012..6b9d86fb0 100644 --- a/src/WorkflowManager/Database/Options/ExecutionStatsDatabaseSettings.cs +++ b/src/WorkflowManager/Database/Options/ExecutionStatsDatabaseSettings.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Database.Options +namespace Monai.Deploy.WorkflowManager.Common.Database.Options { public class ExecutionStatsDatabaseSettings { diff --git a/src/WorkflowManager/Database/Options/WorkloadManagerDatabaseSettings.cs b/src/WorkflowManager/Database/Options/WorkloadManagerDatabaseSettings.cs index d471a2121..e6baf7340 100755 --- a/src/WorkflowManager/Database/Options/WorkloadManagerDatabaseSettings.cs +++ b/src/WorkflowManager/Database/Options/WorkloadManagerDatabaseSettings.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; -namespace Monai.Deploy.WorkflowManager.Database.Options +namespace Monai.Deploy.WorkflowManager.Common.Database.Options { public class WorkloadManagerDatabaseSettings { diff --git a/src/WorkflowManager/Database/Repositories/PayloadRepository.cs b/src/WorkflowManager/Database/Repositories/PayloadRepository.cs index 3fc10ce8a..78736de45 100755 --- a/src/WorkflowManager/Database/Repositories/PayloadRepository.cs +++ b/src/WorkflowManager/Database/Repositories/PayloadRepository.cs @@ -20,14 +20,14 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Database.Options; -using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Database.Options; +using Monai.Deploy.WorkflowManager.Common.Logging; using MongoDB.Bson; using MongoDB.Driver; -namespace Monai.Deploy.WorkflowManager.Database.Repositories +namespace Monai.Deploy.WorkflowManager.Common.Database.Repositories { public class PayloadRepository : RepositoryBase, IPayloadRepository { @@ -69,7 +69,7 @@ public async Task CreateAsync(Payload payload) } } - public async Task> GetAllAsync(int? skip = null, int? limit = null, string patientId = "", string patientName = "") + public async Task> GetAllAsync(int? skip = null, int? limit = null, string? patientId = "", string? patientName = "") { var builder = Builders.Filter; var filter = builder.Empty; @@ -91,7 +91,7 @@ public async Task> GetAllAsync(int? skip = null, int? limit = nul public async Task GetByIdAsync(string payloadId) { - Guard.Against.NullOrWhiteSpace(payloadId); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); var payload = await _payloadCollection .Find(x => x.PayloadId == payloadId) @@ -120,8 +120,8 @@ public async Task UpdateAsync(Payload payload) public async Task UpdateAssociatedWorkflowInstancesAsync(string payloadId, IEnumerable workflowInstances) { - Guard.Against.NullOrEmpty(workflowInstances); - Guard.Against.NullOrWhiteSpace(payloadId); + Guard.Against.NullOrEmpty(workflowInstances, nameof(workflowInstances)); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); try { diff --git a/src/WorkflowManager/Database/Repositories/RepositoryBase.cs b/src/WorkflowManager/Database/Repositories/RepositoryBase.cs index 48367a335..e4f120d55 100644 --- a/src/WorkflowManager/Database/Repositories/RepositoryBase.cs +++ b/src/WorkflowManager/Database/Repositories/RepositoryBase.cs @@ -20,11 +20,11 @@ using System.Threading.Tasks; using MongoDB.Driver; -namespace Monai.Deploy.WorkflowManager.Database.Repositories +namespace Monai.Deploy.WorkflowManager.Common.Database.Repositories { public abstract class RepositoryBase { - public static async Task CountAsync(IMongoCollection collection, FilterDefinition filter) + public static async Task CountAsync(IMongoCollection collection, FilterDefinition? filter) => await collection.CountDocumentsAsync(filter ?? Builders.Filter.Empty); /// @@ -37,7 +37,7 @@ public static async Task CountAsync(IMongoCollection collection, Fil /// Items to skip. /// Items to limit results by. /// - public static async Task> GetAllAsync(IMongoCollection collection, Expression> filterFunction, SortDefinition sortFunction, int? skip = null, int? limit = null) + public static async Task> GetAllAsync(IMongoCollection collection, Expression>? filterFunction, SortDefinition sortFunction, int? skip = null, int? limit = null) { return await collection .Find(filterFunction ?? Builders.Filter.Empty) diff --git a/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs b/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs index 4d2a79d7b..b8c0c7690 100644 --- a/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs +++ b/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs @@ -23,12 +23,12 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Options; -using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Options; +using Monai.Deploy.WorkflowManager.Common.Logging; using MongoDB.Driver; -namespace Monai.Deploy.WorkflowManager.Database +namespace Monai.Deploy.WorkflowManager.Common.Database { public class TaskExecutionStatsRepository : ITaskExecutionStatsRepository { diff --git a/src/WorkflowManager/Database/Repositories/TasksRepository.cs b/src/WorkflowManager/Database/Repositories/TasksRepository.cs index 72a7ad9c2..7fdd540a4 100755 --- a/src/WorkflowManager/Database/Repositories/TasksRepository.cs +++ b/src/WorkflowManager/Database/Repositories/TasksRepository.cs @@ -21,13 +21,13 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Database.Options; -using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Database.Options; +using Monai.Deploy.WorkflowManager.Common.Logging; using MongoDB.Driver; -namespace Monai.Deploy.WorkflowManager.Database.Repositories +namespace Monai.Deploy.WorkflowManager.Common.Database.Repositories { public class TasksRepository : RepositoryBase, ITasksRepository { diff --git a/src/WorkflowManager/Database/Repositories/WorkflowInstanceRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowInstanceRepository.cs index 5541f0164..4e1ddf205 100755 --- a/src/WorkflowManager/Database/Repositories/WorkflowInstanceRepository.cs +++ b/src/WorkflowManager/Database/Repositories/WorkflowInstanceRepository.cs @@ -22,15 +22,14 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Database.Options; -using Monai.Deploy.WorkflowManager.Logging; -using MongoDB.Bson; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Database.Options; +using Monai.Deploy.WorkflowManager.Common.Logging; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Monai.Deploy.WorkflowManager.Database.Repositories +namespace Monai.Deploy.WorkflowManager.Common.Database.Repositories { public class WorkflowInstanceRepository : RepositoryBase, IWorkflowInstanceRepository { diff --git a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs index c8fe0b574..e4bd22af0 100755 --- a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs +++ b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs @@ -20,13 +20,13 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Database.Options; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Database.Options; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Monai.Deploy.WorkflowManager.Database.Repositories +namespace Monai.Deploy.WorkflowManager.Common.Database.Repositories { public class WorkflowRepository : RepositoryBase, IWorkflowRepository { @@ -63,10 +63,12 @@ private async Task EnsureIndex() { Name = "AeTitleIndex" }; +#pragma warning disable CS8602 // Dereference of a possibly null reference. var model = new CreateIndexModel( Builders.IndexKeys.Ascending(s => s.Workflow.InformaticsGateway.AeTitle), options ); +#pragma warning restore CS8602 // Dereference of a possibly null reference. await _workflowCollection.Indexes.CreateOneAsync(model); } @@ -201,8 +203,8 @@ public async Task> GetWorkflowsByAeTitleAsync(List> GetWorkflowsForWorkflowRequestAsync(string calledAeTitle, string callingAeTitle) { - Guard.Against.NullOrEmpty(calledAeTitle); - Guard.Against.NullOrEmpty(callingAeTitle); + Guard.Against.NullOrEmpty(calledAeTitle, nameof(calledAeTitle)); + Guard.Against.NullOrEmpty(callingAeTitle, nameof(callingAeTitle)); var wfs = await _workflowCollection .Find(x => @@ -221,7 +223,7 @@ public async Task> GetWorkflowsForWorkflowRequestAsync(s public async Task CreateAsync(Workflow workflow) { - Guard.Against.Null(workflow); + Guard.Against.Null(workflow, nameof(workflow)); var workflowRevision = new WorkflowRevision { @@ -258,7 +260,7 @@ public async Task UpdateAsync(Workflow workflow, WorkflowRevision existi public async Task SoftDeleteWorkflow(WorkflowRevision workflow) { - Guard.Against.Null(workflow); + Guard.Against.Null(workflow, nameof(workflow)); var deletedTimeStamp = DateTime.UtcNow; diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 24de264cf..0d40b9c17 100755 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -38,11 +38,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -65,11 +62,6 @@ "Microsoft.Win32.Registry": "5.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -116,11 +108,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -141,11 +132,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -155,19 +145,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -189,20 +179,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -280,15 +269,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, @@ -460,11 +446,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -475,14 +456,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -706,7 +679,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Logging/Log.100000.Http.cs b/src/WorkflowManager/Logging/Log.100000.Http.cs index 3dca637bd..12054ed60 100644 --- a/src/WorkflowManager/Logging/Log.100000.Http.cs +++ b/src/WorkflowManager/Logging/Log.100000.Http.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.200000.Workflow.cs b/src/WorkflowManager/Logging/Log.200000.Workflow.cs index a735fa225..f0a236fff 100644 --- a/src/WorkflowManager/Logging/Log.200000.Workflow.cs +++ b/src/WorkflowManager/Logging/Log.200000.Workflow.cs @@ -15,9 +15,9 @@ */ using Microsoft.Extensions.Logging; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.300000.Payload.cs b/src/WorkflowManager/Logging/Log.300000.Payload.cs index b7f23ef1b..fc85e9ba3 100644 --- a/src/WorkflowManager/Logging/Log.300000.Payload.cs +++ b/src/WorkflowManager/Logging/Log.300000.Payload.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.500000.Messaging.cs b/src/WorkflowManager/Logging/Log.500000.Messaging.cs index dcadc5bf2..a79eed69e 100644 --- a/src/WorkflowManager/Logging/Log.500000.Messaging.cs +++ b/src/WorkflowManager/Logging/Log.500000.Messaging.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.600000.Dicom.cs b/src/WorkflowManager/Logging/Log.600000.Dicom.cs index 817353cd4..3a9dc909e 100644 --- a/src/WorkflowManager/Logging/Log.600000.Dicom.cs +++ b/src/WorkflowManager/Logging/Log.600000.Dicom.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.700000.Artifact.cs b/src/WorkflowManager/Logging/Log.700000.Artifact.cs index 4812c46db..0eceb1e9e 100644 --- a/src/WorkflowManager/Logging/Log.700000.Artifact.cs +++ b/src/WorkflowManager/Logging/Log.700000.Artifact.cs @@ -15,9 +15,9 @@ */ using Microsoft.Extensions.Logging; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.800000.Database.cs b/src/WorkflowManager/Logging/Log.800000.Database.cs index f2eb2b320..fc2a9c854 100644 --- a/src/WorkflowManager/Logging/Log.800000.Database.cs +++ b/src/WorkflowManager/Logging/Log.800000.Database.cs @@ -16,9 +16,9 @@ using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.900000.General.cs b/src/WorkflowManager/Logging/Log.900000.General.cs index 3b052346b..ef474dffa 100644 --- a/src/WorkflowManager/Logging/Log.900000.General.cs +++ b/src/WorkflowManager/Logging/Log.900000.General.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 04721f81c..95b73263e 100755 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -4,22 +4,14 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "DnsClient": { "type": "Transitive", "resolved": "1.4.0", "contentHash": "CO1NG1zQdV0nEAXmr/KppLZ0S1qkaPwV0kPX5YPgmYBtrBVh1XMYHM54IXy3RBJu1k4thFtpzwo4HNHqxiuFYw==" }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -66,11 +58,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -91,11 +82,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -105,19 +95,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -139,20 +129,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -221,15 +210,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, @@ -426,11 +412,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -441,14 +422,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -662,7 +635,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json b/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json index 8c034592d..d5185dcdb 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json +++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json @@ -15,23 +15,20 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, "DnsClient": { @@ -42,11 +39,6 @@ "Microsoft.Win32.Registry": "5.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -93,11 +85,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "3.1.0", + "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "3.1.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -110,19 +101,18 @@ }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==", + "resolved": "3.1.0", + "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "2.2.0" + "Microsoft.Extensions.Configuration": "3.1.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "3.1.0", + "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -132,19 +122,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -166,20 +156,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "3.1.0", + "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "3.1.0", + "Microsoft.Extensions.DependencyInjection": "3.1.0", + "Microsoft.Extensions.Logging.Abstractions": "3.1.0", + "Microsoft.Extensions.Options": "3.1.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -257,38 +246,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -492,11 +475,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -507,14 +485,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -743,17 +713,17 @@ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, - "monai.deploy.workflowmanager.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", - "Monai.Deploy.Storage": "[0.2.15, )" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -776,7 +746,7 @@ "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "[0.2.15, )", + "Monai.Deploy.Storage": "[0.2.18, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } diff --git a/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs b/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs index 7d499a123..b068ceca1 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs +++ b/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.MonaiBackgroundService.Logging +namespace Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService.Logging { public static partial class Log { diff --git a/src/WorkflowManager/MonaiBackgroundService/Worker.cs b/src/WorkflowManager/MonaiBackgroundService/Worker.cs index fcb05d3fa..1e1c26eec 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Worker.cs +++ b/src/WorkflowManager/MonaiBackgroundService/Worker.cs @@ -17,14 +17,14 @@ using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.MonaiBackgroundService.Logging; -using Monai.Deploy.WorkflowManager.WorkfowExecuter.Common; - -namespace Monai.Deploy.WorkflowManager.MonaiBackgroundService +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService.Logging; +using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common; + +namespace Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService { public class Worker : BackgroundService { @@ -80,7 +80,7 @@ public async Task DoWork() await PublishTimeoutUpdateEvent(task, correlationId, task.WorkflowInstanceId).ConfigureAwait(false); // -> task manager - await PublishCancellationEvent(task, correlationId, (string)identity ?? task.ExecutionId, task.WorkflowInstanceId).ConfigureAwait(false); // -> workflow executor + await PublishCancellationEvent(task, correlationId, identity as string ?? task.ExecutionId, task.WorkflowInstanceId).ConfigureAwait(false); // -> workflow executor } } catch (Exception e) diff --git a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs index 2c850670c..0e1ba99ab 100644 --- a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs +++ b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs @@ -16,9 +16,9 @@ using Ardalis.GuardClauses; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.PayloadListener.Extensions +namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Extensions { public static class ValidationExtensions { diff --git a/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index fd8beeaaf..28fe61cf7 100644 --- a/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -36,10 +36,9 @@ - - + + - diff --git a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs index 6de3b9361..67d781124 100644 --- a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs +++ b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs @@ -18,12 +18,12 @@ using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Common; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.PayloadListener.Validators; -using Monai.Deploy.WorkflowManager.WorkfowExecuter.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators; +using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services; -namespace Monai.Deploy.WorkflowManager.PayloadListener.Services +namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Services { public class EventPayloadReceiverService : IEventPayloadReceiverService { diff --git a/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs index cd30ec036..2772687f6 100644 --- a/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs +++ b/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs @@ -16,7 +16,7 @@ using Monai.Deploy.Messaging.Common; -namespace Monai.Deploy.WorkflowManager.PayloadListener.Services +namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Services { public interface IEventPayloadReceiverService { diff --git a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs index 4b0130229..62a39607a 100644 --- a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs +++ b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs @@ -20,11 +20,11 @@ using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Common; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; -namespace Monai.Deploy.WorkflowManager.PayloadListener.Services +namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Services { public class PayloadListenerService : IHostedService, IMonaiService, IDisposable { @@ -96,67 +96,60 @@ public Task StopAsync(CancellationToken cancellationToken) private void SetupPolling() { - _messageSubscriber.Subscribe(WorkflowRequestRoutingKey, WorkflowRequestRoutingKey, OnWorkflowRequestReceivedCallback); + _messageSubscriber.SubscribeAsync(WorkflowRequestRoutingKey, WorkflowRequestRoutingKey, OnWorkflowRequestReceivedCallbackAsync); _logger.EventSubscription(ServiceName, WorkflowRequestRoutingKey); - _messageSubscriber.Subscribe(TaskStatusUpdateRoutingKey, TaskStatusUpdateRoutingKey, OnTaskUpdateStatusReceivedCallback); + _messageSubscriber.SubscribeAsync(TaskStatusUpdateRoutingKey, TaskStatusUpdateRoutingKey, OnTaskUpdateStatusReceivedCallback); _logger.EventSubscription(ServiceName, TaskStatusUpdateRoutingKey); - _messageSubscriber.Subscribe(ExportCompleteRoutingKey, ExportCompleteRoutingKey, OnExportCompleteReceivedCallback); + _messageSubscriber.SubscribeAsync(ExportCompleteRoutingKey, ExportCompleteRoutingKey, OnExportCompleteReceivedCallback); _logger.EventSubscription(ServiceName, ExportCompleteRoutingKey); } - - private void OnWorkflowRequestReceivedCallback(MessageReceivedEventArgs eventArgs) + private async Task OnWorkflowRequestReceivedCallbackAsync(MessageReceivedEventArgs eventArgs) { - Task.Run(async () => + + using var loggerScope = _logger.BeginScope(new Dictionary { - using var loggerScope = _logger.BeginScope(new Dictionary - { - ["correlationId"] = eventArgs.Message.CorrelationId, - ["source"] = eventArgs.Message.ApplicationId, - ["messageId"] = eventArgs.Message.MessageId, - ["messageDescription"] = eventArgs.Message.MessageDescription, - }); - - _logger.WorkflowRequestReceived(); - await _eventPayloadListenerService.ReceiveWorkflowPayload(eventArgs); - }).ConfigureAwait(false); + ["correlationId"] = eventArgs.Message.CorrelationId, + ["source"] = eventArgs.Message.ApplicationId, + ["messageId"] = eventArgs.Message.MessageId, + ["messageDescription"] = eventArgs.Message.MessageDescription, + }); + + _logger.WorkflowRequestReceived(); + await _eventPayloadListenerService.ReceiveWorkflowPayload(eventArgs); } - private void OnTaskUpdateStatusReceivedCallback(MessageReceivedEventArgs eventArgs) + private async Task OnTaskUpdateStatusReceivedCallback(MessageReceivedEventArgs eventArgs) { - Task.Run(async () => + using var loggerScope = _logger.BeginScope(new Dictionary { - using var loggerScope = _logger.BeginScope(new Dictionary - { - ["correlationId"] = eventArgs.Message.CorrelationId, - ["source"] = eventArgs.Message.ApplicationId, - ["messageId"] = eventArgs.Message.MessageId, - ["messageDescription"] = eventArgs.Message.MessageDescription, - }); - - _logger.TaskUpdateReceived(); - await _eventPayloadListenerService.TaskUpdatePayload(eventArgs); - }).ConfigureAwait(false); + ["correlationId"] = eventArgs.Message.CorrelationId, + ["source"] = eventArgs.Message.ApplicationId, + ["messageId"] = eventArgs.Message.MessageId, + ["messageDescription"] = eventArgs.Message.MessageDescription, + }); + + _logger.TaskUpdateReceived(); + await _eventPayloadListenerService.TaskUpdatePayload(eventArgs); } - private void OnExportCompleteReceivedCallback(MessageReceivedEventArgs eventArgs) + private async Task OnExportCompleteReceivedCallback(MessageReceivedEventArgs eventArgs) { - Task.Run(async () => + using var loggerScope = _logger.BeginScope(new Dictionary { - using var loggerScope = _logger.BeginScope(new Dictionary - { - ["correlationId"] = eventArgs.Message.CorrelationId, - ["source"] = eventArgs.Message.ApplicationId, - ["messageId"] = eventArgs.Message.MessageId, - ["messageDescription"] = eventArgs.Message.MessageDescription, - }); - - _logger.ExportCompleteReceived(); - await _eventPayloadListenerService.ExportCompletePayload(eventArgs); - }).ConfigureAwait(false); + ["correlationId"] = eventArgs.Message.CorrelationId, + ["source"] = eventArgs.Message.ApplicationId, + ["messageId"] = eventArgs.Message.MessageId, + ["messageDescription"] = eventArgs.Message.MessageDescription, + }); + + _logger.ExportCompleteReceived(); + await _eventPayloadListenerService.ExportCompletePayload(eventArgs); + } + protected virtual void Dispose(bool disposing) { if (!_disposedValue) diff --git a/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs b/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs index f29dead08..e1c2f5682 100644 --- a/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs +++ b/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs @@ -18,10 +18,10 @@ using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Common; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.PayloadListener.Extensions; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.PayloadListener.Extensions; -namespace Monai.Deploy.WorkflowManager.PayloadListener.Validators +namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators { public class EventPayloadValidator : IEventPayloadValidator { diff --git a/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs b/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs index 77e4f7856..e8835e77b 100644 --- a/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs +++ b/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs @@ -16,7 +16,7 @@ using Monai.Deploy.Messaging.Events; -namespace Monai.Deploy.WorkflowManager.PayloadListener.Validators +namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators { public interface IEventPayloadValidator { diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 51a3849c5..39bd70d80 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -4,23 +4,20 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, "DnsClient": { @@ -47,11 +44,6 @@ "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -103,11 +95,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -128,11 +119,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -142,19 +132,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -176,20 +166,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -272,38 +261,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -507,11 +490,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -522,14 +500,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -768,34 +738,43 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "monai.deploy.workflowmanager.common": { + "Monai.Deploy.WorkflowManager.Common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" } }, - "monai.deploy.workflowmanager.conditionsresolver": { + "Monai.Deploy.WorkflowManager.Common.miscellaneous": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.1.1, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "fo-dicom": "[5.0.3, )" } }, - "monai.deploy.workflowmanager.configuration": { + "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", - "Monai.Deploy.Storage": "[0.2.15, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.conditionsresolver": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -803,46 +782,37 @@ "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "Mongo.Migration": "3.1.4", - "MongoDB.Driver": "2.19.0" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "Mongo.Migration": "[3.1.4, )", + "MongoDB.Driver": "[2.19.0, )" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" - } - }, - "monai.deploy.workflowmanager.shared": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "fo-dicom": "5.0.3" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "0.2.15", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "Monai.Deploy.WorkflowManager.Shared": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } } } diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/InformaticsGateway/IInformaticsGatewayService.cs b/src/WorkflowManager/Services/InformaticsGateway/IInformaticsGatewayService.cs similarity index 92% rename from src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/InformaticsGateway/IInformaticsGatewayService.cs rename to src/WorkflowManager/Services/InformaticsGateway/IInformaticsGatewayService.cs index 2b738159d..13a252503 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/InformaticsGateway/IInformaticsGatewayService.cs +++ b/src/WorkflowManager/Services/InformaticsGateway/IInformaticsGatewayService.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Services.InformaticsGateway +namespace Monai.Deploy.WorkflowManager.Common.Services.InformaticsGateway { public interface IInformaticsGatewayService { diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/InformaticsGateway/InformaticsGatewayService.cs b/src/WorkflowManager/Services/InformaticsGateway/InformaticsGatewayService.cs similarity index 91% rename from src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/InformaticsGateway/InformaticsGatewayService.cs rename to src/WorkflowManager/Services/InformaticsGateway/InformaticsGatewayService.cs index 57fa76ad6..ad1726f04 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/InformaticsGateway/InformaticsGatewayService.cs +++ b/src/WorkflowManager/Services/InformaticsGateway/InformaticsGatewayService.cs @@ -17,10 +17,10 @@ using System.Net; using System.Net.Http.Headers; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Common.Exceptions; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions; +using Monai.Deploy.WorkflowManager.Common.Configuration; -namespace Monai.Deploy.WorkflowManager.Services.InformaticsGateway +namespace Monai.Deploy.WorkflowManager.Common.Services.InformaticsGateway { public class InformaticsGatewayService : IInformaticsGatewayService { diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/Monai.Deploy.WorkflowManager.Services.csproj b/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj similarity index 93% rename from src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/Monai.Deploy.WorkflowManager.Services.csproj rename to src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj index 477269c41..3aedbd03d 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/Monai.Deploy.WorkflowManager.Services.csproj +++ b/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/WorkflowManager/Services/packages.lock.json b/src/WorkflowManager/Services/packages.lock.json new file mode 100644 index 000000000..95972abad --- /dev/null +++ b/src/WorkflowManager/Services/packages.lock.json @@ -0,0 +1,756 @@ +{ + "version": 1, + "dependencies": { + "net6.0": { + "Microsoft.Extensions.Http": { + "type": "Direct", + "requested": "[3.1.0, )", + "resolved": "3.1.0", + "contentHash": "DLigdcV0nYaT6/ly0rnfP80BnXq8NNd/h8/SkfY39uio7Bd9LauVntp6RcRh1Kj23N+uf80GgL7Win6P3BCtoQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0", + "Microsoft.Extensions.Logging": "3.1.0", + "Microsoft.Extensions.Options": "3.1.0" + } + }, + "Ardalis.GuardClauses": { + "type": "Transitive", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + }, + "AWSSDK.Core": { + "type": "Transitive", + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + }, + "AWSSDK.SecurityToken": { + "type": "Transitive", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "dependencies": { + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + } + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, + "LightInject": { + "type": "Transitive", + "resolved": "5.4.0", + "contentHash": "w4EjEhNqtzFb0qlScmpjA84Nuv4+OITNGfYCjDhJoLYyw+uagkrrth+e9Hgidv4bMzuNSlJpHPGTHx6DtE4Ixg==", + "dependencies": { + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.AspNetCore.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "ubycklv+ZY7Kutdwuy1W4upWcZ6VFR8WUXU7l7B2+mvbDBBPAcfpi+E+Y5GFe+Q157YfA3C49D2GCjAZc7Mobw==", + "dependencies": { + "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.2.0", + "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", + "Microsoft.Extensions.Hosting.Abstractions": "2.2.0" + } + }, + "Microsoft.AspNetCore.Hosting.Server.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "1PMijw8RMtuQF60SsD/JlKtVfvh4NORAhF4wjysdABhlhTrYmtgssqyncR0Stq5vqtjplZcj6kbT4LRTglt9IQ==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.2.0", + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" + } + }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.2.0", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "ziFz5zH8f33En4dX81LW84I6XrYXKf9jg6aM39cM+LffN9KJahViKZ61dGMSO2gd3e+qe5yBRwsesvyqlZaSMg==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "3.1.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "3.1.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + }, + "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": "3.1.0", + "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "3.1.0", + "Microsoft.Extensions.DependencyInjection": "3.1.0", + "Microsoft.Extensions.Logging.Abstractions": "3.1.0", + "Microsoft.Extensions.Options": "3.1.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + }, + "Microsoft.Extensions.Logging.Configuration": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "ukU1mQGX9+xBsEzpNd13yl4deFVYI+fxxnmKpOhvNZsF+/trCrAUQh+9QM5pPGHbfYkz3lLQ4BXfKCP0502dLw==", + "dependencies": { + "Microsoft.Extensions.Logging": "2.2.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "2.2.0" + } + }, + "Microsoft.Extensions.Logging.Console": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "1eGgcOJ++PMxW6sn++j6U7wsWvhEBm/5ScqBUUBGLRE8M7AHahi9tsxivDMqEXVM3F0/pshHl3kEpMXtw4BeFg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Microsoft.Extensions.Logging.Configuration": "2.2.0" + } + }, + "Microsoft.Extensions.Logging.Debug": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "JjqWtshxUujSnxslFccCRAaH8uFOciqXkYdRw+h5MwpC4sUc+ju9yZzvVi6PA5vW09ckv26EkasEvXrofGiaJg==", + "dependencies": { + "Microsoft.Extensions.Logging": "2.2.0" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "d4WS6yVXaw43ffiUnHj8oG1t2B6RbDDiQcgdA+Eq//NlPa3Wd+GTJFKj4OM4eDF3GjVumGr/CEVRS/jcYoF5LA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "Monai.Deploy.Messaging": { + "type": "Transitive", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "dependencies": { + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Newtonsoft.Json": "13.0.3", + "System.IO.Abstractions": "17.2.3" + } + }, + "Monai.Deploy.Storage": { + "type": "Transitive", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", + "System.IO.Abstractions": "17.2.3" + } + }, + "Monai.Deploy.Storage.S3Policy": { + "type": "Transitive", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "dependencies": { + "Ardalis.GuardClauses": "4.1.1", + "Newtonsoft.Json": "13.0.3" + } + }, + "Mongo.Migration": { + "type": "Transitive", + "resolved": "3.1.4", + "contentHash": "iA13H1tFH7x3eeKhBAYdgFxzK4gj78hY2pc5yiB08zX3kmhxGT/hp5k+iTDlSlCCyl+pMNpitTUiKiqOI6L6Gg==", + "dependencies": { + "LightInject": "5.4.0", + "Microsoft.AspNetCore.Hosting.Abstractions": "2.2.0", + "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", + "Microsoft.Extensions.DependencyInjection": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Console": "2.2.0", + "Microsoft.Extensions.Logging.Debug": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0", + "MongoDB.Driver": "2.13.1", + "NLog": "4.7.11", + "Serilog": "2.8.0", + "Serilog.Extensions.Logging": "2.0.4", + "Serilog.Extensions.Logging.File": "2.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "MongoDB.Driver": { + "type": "Transitive", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" + } + }, + "MongoDB.Driver.Core": { + "type": "Transitive", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "ZstdSharp.Port": "0.6.2" + } + }, + "MongoDB.Libmongocrypt": { + "type": "Transitive", + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.3", + "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + }, + "NLog": { + "type": "Transitive", + "resolved": "4.7.11", + "contentHash": "A7EpoOjWesV5BPx1cOiBndazZq1VGdagIs6oK8ttcRDl5adCMtHiTqnsD5yYaOrMxOQeCjHBf/w3nKzCmhGbgw==" + }, + "Serilog": { + "type": "Transitive", + "resolved": "2.8.0", + "contentHash": "zjuKXW5IQws43IHX7VY9nURsaCiBYh2kyJCWLJRSWrTsx/syBKHV8MibWe2A+QH3Er0AiwA+OJmO3DhFJDY1+A==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0" + } + }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "2.0.4", + "contentHash": "C8Vf9Wj1M+wGilChTV+OhE4v5ZCDzQfHjLKj2yNDMkXf/zgUKeAUZfbrVrt/c+flXP8M7/SHWBOXTkuPgubFsA==", + "dependencies": { + "Microsoft.Extensions.Logging": "2.0.0", + "Serilog": "2.3.0" + } + }, + "Serilog.Extensions.Logging.File": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "usO0qr4v9VCMBWiTJ1nQmAbPNCt40FrkDol6CpfCXbsxGZS/hH+YCueF7vvPQ32ATI0GWcMWiKRdjXEE7/HxTQ==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.0.0", + "Microsoft.Extensions.Configuration.Binder": "2.0.0", + "Serilog": "2.5.0", + "Serilog.Extensions.Logging": "2.0.2", + "Serilog.Formatting.Compact": "1.0.0", + "Serilog.Sinks.Async": "1.1.0", + "Serilog.Sinks.RollingFile": "3.3.0" + } + }, + "Serilog.Formatting.Compact": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "r3QYz02y7+B7Ng30hyJM929OJhem7SsJ4XDUE0Zfptj2MRiQfpPUb5f58juAFjp/TnNeSX2QNzZEnHwLeoJfHQ==", + "dependencies": { + "Serilog": "2.0.0" + } + }, + "Serilog.Sinks.Async": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "xll0Kanz2BkCxuv+F3p1WXr47jdsVM0GU1n1LZvK+18QiRZ/WGFNxSNw9EMKFV5ED5gr7MUpAe6PCMNL1HGUMA==", + "dependencies": { + "Serilog": "2.1.0", + "System.Collections.Concurrent": "4.0.12" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "3.2.0", + "contentHash": "VHbo68pMg5hwSWrzLEdZv5b/rYmIgHIRhd4d5rl8GnC5/a8Fr+RShT5kWyeJOXax1el6mNJ+dmHDOVgnNUQxaw==", + "dependencies": { + "Serilog": "2.3.0", + "System.IO": "4.1.0", + "System.IO.FileSystem": "4.0.1", + "System.IO.FileSystem.Primitives": "4.0.1", + "System.Text.Encoding.Extensions": "4.0.11", + "System.Threading": "4.0.11", + "System.Threading.Timer": "4.0.1" + } + }, + "Serilog.Sinks.RollingFile": { + "type": "Transitive", + "resolved": "3.3.0", + "contentHash": "2lT5X1r3GH4P0bRWJfhA7etGl8Q2Ipw9AACvtAHWRUSpYZ42NGVyHoVs2ALBZ/cAkkS+tA4jl80Zie144eLQPg==", + "dependencies": { + "Serilog.Sinks.File": "3.2.0", + "System.IO": "4.1.0", + "System.IO.FileSystem.Primitives": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Text.Encoding.Extensions": "4.0.11" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.0.11", + "contentHash": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.0.12", + "contentHash": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Reflection": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.IO": "4.1.0", + "System.IO.FileSystem.Primitives": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Text.Encoding": "4.0.11", + "System.Threading.Tasks": "4.0.11" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==", + "dependencies": { + "System.Runtime": "4.1.0" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Reflection": "4.1.0", + "System.Reflection.Primitives": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Handles": "4.0.1" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encoding.Extensions": { + "type": "Transitive", + "resolved": "4.0.11", + "contentHash": "jtbiTDtvfLYgXn8PTfWI+SiBs51rrmO4AAckx4KR6vFK9Wzf6tI8kcRdsYQNwriUeQ1+CtQbM1W4cMbLXnj/OQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0", + "System.Text.Encoding": "4.0.11" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g==" + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Timer": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "saGfUV8uqVW6LeURiqxcGhZ24PzuRNaUBtbhVeuUAvky1naH395A/1nY0P2bWvrw/BreRtIB/EzTDkGBpqCwEw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.6.2", + "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + }, + "Monai.Deploy.WorkflowManager.Common.configuration": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" + } + }, + "monai.deploy.workflowmanager.common": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.contracts": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "[0.1.25, )", + "Mongo.Migration": "[3.1.4, )", + "MongoDB.Bson": "[2.19.0, )" + } + }, + "monai.deploy.workflowmanager.database": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "Mongo.Migration": "[3.1.4, )", + "MongoDB.Driver": "[2.19.0, )" + } + }, + "monai.deploy.workflowmanager.logging": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.storage": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + } + } + } + } +} \ No newline at end of file diff --git a/src/WorkflowManager/Storage/Constants/DicomTagConstants.cs b/src/WorkflowManager/Storage/Constants/DicomTagConstants.cs index a712487c0..5caf044ae 100644 --- a/src/WorkflowManager/Storage/Constants/DicomTagConstants.cs +++ b/src/WorkflowManager/Storage/Constants/DicomTagConstants.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Storage.Constants +namespace Monai.Deploy.WorkflowManager.Common.Storage.Constants { public static class DicomTagConstants { diff --git a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj index 82b9a5072..67afef829 100755 --- a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj +++ b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj @@ -37,7 +37,7 @@ - + diff --git a/src/WorkflowManager/Storage/Services/DicomService.cs b/src/WorkflowManager/Storage/Services/DicomService.cs index c47c2fc65..fec7f884c 100644 --- a/src/WorkflowManager/Storage/Services/DicomService.cs +++ b/src/WorkflowManager/Storage/Services/DicomService.cs @@ -19,13 +19,13 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; using Monai.Deploy.Storage.API; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Storage.Constants; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Storage.Constants; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Monai.Deploy.WorkflowManager.Storage.Services +namespace Monai.Deploy.WorkflowManager.Common.Storage.Services { public class DicomService : IDicomService { @@ -66,8 +66,8 @@ public DicomService(IStorageService storageService, ILogger logger public async Task GetPayloadPatientDetailsAsync(string payloadId, string bucketName) { - Guard.Against.NullOrWhiteSpace(bucketName); - Guard.Against.NullOrWhiteSpace(payloadId); + Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName)); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); var items = await _storageService.ListObjectsAsync(bucketName, $"{payloadId}/dcm", true); @@ -92,9 +92,9 @@ public async Task GetPayloadPatientDetailsAsync(string payloadId public async Task GetFirstValueAsync(IList items, string payloadId, string bucketId, string keyId) { - Guard.Against.NullOrWhiteSpace(bucketId); - Guard.Against.NullOrWhiteSpace(payloadId); - Guard.Against.NullOrWhiteSpace(keyId); + Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId)); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); + Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId)); try { @@ -134,8 +134,8 @@ public async Task GetPayloadPatientDetailsAsync(string payloadId public async Task> GetDicomPathsForTaskAsync(string outputDirectory, string bucketName) { - Guard.Against.NullOrWhiteSpace(outputDirectory); - Guard.Against.NullOrWhiteSpace(bucketName); + Guard.Against.NullOrWhiteSpace(outputDirectory, nameof(outputDirectory)); + Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName)); var files = await _storageService.ListObjectsAsync(bucketName, outputDirectory, true); @@ -146,9 +146,9 @@ public async Task> GetDicomPathsForTaskAsync(string outputDi public async Task GetAnyValueAsync(string keyId, string payloadId, string bucketId) { - Guard.Against.NullOrWhiteSpace(keyId); - Guard.Against.NullOrWhiteSpace(payloadId); - Guard.Against.NullOrWhiteSpace(bucketId); + Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId)); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); + Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId)); var path = $"{payloadId}/dcm"; var listOfFiles = await _storageService.ListObjectsAsync(bucketId, path, true); @@ -170,9 +170,9 @@ public async Task GetAnyValueAsync(string keyId, string payloadId, strin public async Task GetAllValueAsync(string keyId, string payloadId, string bucketId) { - Guard.Against.NullOrWhiteSpace(keyId); - Guard.Against.NullOrWhiteSpace(payloadId); - Guard.Against.NullOrWhiteSpace(bucketId); + Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId)); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); + Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId)); var path = $"{payloadId}/dcm"; var listOfFiles = await _storageService.ListObjectsAsync(bucketId, path, true); @@ -209,10 +209,10 @@ public async Task GetDcmJsonFileValueAtIndexAsync(int index, string keyId, List items) { - Guard.Against.NullOrWhiteSpace(bucketId); - Guard.Against.NullOrWhiteSpace(path); - Guard.Against.NullOrWhiteSpace(keyId); - Guard.Against.Null(items); + Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId)); + Guard.Against.NullOrWhiteSpace(path, nameof(path)); + Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId)); + Guard.Against.Null(items, nameof(items)); if (index > items.Count) { diff --git a/src/WorkflowManager/Storage/Services/IDicomService.cs b/src/WorkflowManager/Storage/Services/IDicomService.cs index 6f0765ba5..36edc8fd3 100644 --- a/src/WorkflowManager/Storage/Services/IDicomService.cs +++ b/src/WorkflowManager/Storage/Services/IDicomService.cs @@ -14,9 +14,9 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Storage.Services +namespace Monai.Deploy.WorkflowManager.Common.Storage.Services { public interface IDicomService { diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index e9da6dc7c..19d41bf81 100755 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -4,38 +4,32 @@ "net6.0": { "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.15, )", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "requested": "[0.2.18, )", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, "DnsClient": { @@ -43,11 +37,6 @@ "resolved": "1.4.0", "contentHash": "CO1NG1zQdV0nEAXmr/KppLZ0S1qkaPwV0kPX5YPgmYBtrBVh1XMYHM54IXy3RBJu1k4thFtpzwo4HNHqxiuFYw==" }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -94,11 +83,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -119,11 +107,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -133,19 +120,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -167,20 +154,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -249,24 +235,21 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -463,11 +446,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -478,14 +456,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -699,7 +669,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs index 70e08e3e0..f3b773776 100755 --- a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs +++ b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs @@ -17,11 +17,11 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; using Monai.Deploy.Storage.API; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Logging; -namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Common +namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common { public class ArtifactMapper : IArtifactMapper { @@ -75,16 +75,16 @@ public bool TryConvertArtifactVariablesToPath(Artifact[] artifacts, string paylo public async Task> ConvertArtifactVariablesToPath(Artifact[] artifacts, string payloadId, string workflowInstanceId, string bucketId, bool shouldExistYet = true) { - Guard.Against.Null(artifacts); - Guard.Against.NullOrWhiteSpace(payloadId); - Guard.Against.NullOrWhiteSpace(workflowInstanceId); + Guard.Against.Null(artifacts, nameof(artifacts)); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); + Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId)); var artifactPathDictionary = new Dictionary(); foreach (var artifact in artifacts) { - Guard.Against.NullOrWhiteSpace(artifact.Value); - Guard.Against.NullOrWhiteSpace(artifact.Name); + Guard.Against.NullOrWhiteSpace(artifact.Value, nameof(artifact.Value)); + Guard.Against.NullOrWhiteSpace(artifact.Name, nameof(artifact.Name)); if (!TrimArtifactVariable(artifact.Value, out var variableString)) { @@ -98,7 +98,7 @@ public async Task> ConvertArtifactVariablesToPath(Art var suffix = GetArtifactSuffix(artifact.Value); - var mappedArtifact = await ConvertVariableStringToPath(artifact, variableString, workflowInstanceId, payloadId, bucketId, shouldExistYet, suffix); + var mappedArtifact = await ConvertVariableStringToPath(artifact, variableString ?? string.Empty, workflowInstanceId, payloadId, bucketId, shouldExistYet, suffix); if (mappedArtifact.Equals(default(KeyValuePair)) is false) { @@ -132,7 +132,7 @@ public async Task> ConvertArtifactVariablesToPath(Art return variableStrings[1]; } - private static bool TrimArtifactVariable(string valueString, out string variableString) + private static bool TrimArtifactVariable(string valueString, out string? variableString) { var variableStrings = valueString.Split(" "); @@ -148,7 +148,7 @@ private static bool TrimArtifactVariable(string valueString, out string variable return true; } - private async Task> ConvertVariableStringToPath(Artifact artifact, string variableString, string workflowInstanceId, string payloadId, string bucketId, bool shouldExistYet, string suffix = "") + private async Task> ConvertVariableStringToPath(Artifact artifact, string variableString, string workflowInstanceId, string payloadId, string bucketId, bool shouldExistYet, string? suffix = "") { _logger.ConvertingVariableStringToPath(variableString); if (variableString.StartsWith("context.input.dicom", StringComparison.InvariantCultureIgnoreCase)) diff --git a/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs index b00199b6f..27ecf6770 100644 --- a/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs +++ b/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs @@ -18,27 +18,27 @@ using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; using Monai.Deploy.Storage.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Common +namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common { public class GenerateTaskUpdateEventParams { - public string CorrelationId { get; set; } + public string CorrelationId { get; set; } = ""; - public string ExecutionId { get; set; } + public string ExecutionId { get; set; } = ""; - public string WorkflowInstanceId { get; set; } + public string WorkflowInstanceId { get; set; } = ""; - public string TaskId { get; set; } + public string TaskId { get; set; } = ""; public FailureReason FailureReason { get; set; } public TaskExecutionStatus TaskExecutionStatus { get; set; } - public Dictionary Stats { get; set; } + public Dictionary Stats { get; set; } = new(); - public string Errors { get; set; } + public string Errors { get; set; } = ""; } public static class EventMapper @@ -170,15 +170,23 @@ public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, }; } - public static ExportRequestEvent ToExportRequestEvent(IList dicomImages, string[] exportDestinations, string taskId, string workflowInstanceId, string correlationId) + public static ExportRequestEvent ToExportRequestEvent( + IList dicomImages, + string[] exportDestinations, + string taskId, + string workflowInstanceId, + string correlationId, + List? plugins = null) { + plugins ??= new List(); + Guard.Against.NullOrWhiteSpace(taskId, nameof(taskId)); Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId)); Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); Guard.Against.NullOrEmpty(dicomImages, nameof(dicomImages)); Guard.Against.NullOrEmpty(exportDestinations, nameof(exportDestinations)); - return new ExportRequestEvent + var request = new ExportRequestEvent { WorkflowInstanceId = workflowInstanceId, ExportTaskId = taskId, @@ -186,6 +194,8 @@ public static ExportRequestEvent ToExportRequestEvent(IList dicomImages, Files = dicomImages, Destinations = exportDestinations }; + request.PluginAssemblies.AddRange(plugins); + return request; } } } diff --git a/src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs index 13296faf0..12b27f258 100644 --- a/src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs +++ b/src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs @@ -14,9 +14,9 @@ * limitations under the License. */ -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Common +namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common { public interface IArtifactMapper { diff --git a/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs index b50d95e41..187e97218 100644 --- a/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs +++ b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs @@ -17,14 +17,14 @@ using Ardalis.GuardClauses; using Monai.Deploy.Messaging.Events; -namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Common +namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common { public static class TaskExecutionStatusExtensions { public static bool IsTaskExecutionStatusUpdateValid(this TaskExecutionStatus newStatus, TaskExecutionStatus oldStatus) { - Guard.Against.Null(newStatus); - Guard.Against.Null(oldStatus); + Guard.Against.Null(newStatus, nameof(newStatus)); + Guard.Against.Null(oldStatus, nameof(oldStatus)); return newStatus switch { diff --git a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index f882c05f8..8971edfa2 100644 --- a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -36,8 +36,8 @@ - - + + diff --git a/src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs index 7cf256edf..ace4e0244 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs @@ -15,9 +15,9 @@ */ using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Services +namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services { public interface IWorkflowExecuterService { diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 3813b2234..3be6d0a6c 100755 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -21,23 +21,23 @@ using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Monai.Deploy.Storage.API; using Monai.Deploy.Storage.Configuration; -using Monai.Deploy.WorkflowManager.Common.Extensions; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Constants; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Shared; -using Monai.Deploy.WorkflowManager.WorkfowExecuter.Common; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Extensions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions; +using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Parser; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Constants; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common; using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Services +namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services { public class WorkflowExecuterService : IWorkflowExecuterService { @@ -48,6 +48,7 @@ public class WorkflowExecuterService : IWorkflowExecuterService private readonly IMessageBrokerPublisherService _messageBrokerPublisherService; private readonly IConditionalParameterParser _conditionalParameterParser; private readonly ITaskExecutionStatsRepository _taskExecutionStatsRepository; + private readonly List _migExternalAppPlugins; private readonly IArtifactMapper _artifactMapper; private readonly IStorageService _storageService; private readonly IPayloadService _payloadService; @@ -88,6 +89,7 @@ public WorkflowExecuterService( _defaultPerTaskTypeTimeoutMinutes = configuration.Value.PerTaskTypeTimeoutMinutes; TaskDispatchRoutingKey = configuration.Value.Messaging.Topics.TaskDispatchRequest; TaskTimeoutRoutingKey = configuration.Value.Messaging.Topics.AideClinicalReviewCancelation; + _migExternalAppPlugins = configuration.Value.MigExternalAppPlugins; ExportRequestRoutingKey = $"{configuration.Value.Messaging.Topics.ExportRequestPrefix}.{configuration.Value.Messaging.DicomAgents.ScuAgentName}"; _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -107,6 +109,23 @@ public async Task ProcessPayload(WorkflowRequestEvent message, Payload pay Guard.Against.Null(message, nameof(message)); using var loggerScope = _logger.BeginScope($"correlationId={message.CorrelationId}, payloadId={payload.PayloadId}"); + + // for external App executions then workflowInstanceId will be supplied and we can continue the workflow from that task. + if (string.IsNullOrWhiteSpace(message.WorkflowInstanceId) is false) + { + var instance = await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(message.WorkflowInstanceId); + if (instance is not null) + { + var task = instance.Tasks.First(t => t.TaskId == message.TaskId); + if (task is not null) + { + var workflow = await _workflowRepository.GetByWorkflowIdAsync(instance.WorkflowId); + await HandleTaskDestinations(instance, workflow, task, message.CorrelationId); + return true; + } + } + } + var processed = true; List? workflows; @@ -199,6 +218,13 @@ public async Task ProcessFirstWorkflowTask(WorkflowInstance workflowInstance, st return; } + if (string.Equals(task.TaskType, TaskTypeConstants.ExternalAppTask, StringComparison.InvariantCultureIgnoreCase)) + { + await HandleExternalAppAsync(workflow, workflowInstance, task, correlationId); + + return; + } + if (task.Status != TaskExecutionStatus.Created) { _logger.TaskPreviouslyDispatched(workflowInstance.PayloadId, task.TaskId); @@ -245,8 +271,8 @@ public void AttachPatientMetaData(TaskExecution task, PatientDetails patientDeta public async Task ProcessTaskUpdate(TaskUpdateEvent message) { - Guard.Against.Null(message); - Guard.Against.Null(message.WorkflowInstanceId); + Guard.Against.Null(message, nameof(message)); + Guard.Against.Null(message.WorkflowInstanceId, nameof(message.WorkflowInstanceId)); var workflowInstance = await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(message.WorkflowInstanceId); @@ -393,7 +419,10 @@ public async Task ProcessExportComplete(ExportCompleteEvent message, strin return false; } - return await HandleTaskDestinations(workflowInstance, workflow, task, correlationId); + if (string.Compare(task.TaskType, ValidationConstants.ExportTaskType, true) == 0) + { + return await HandleTaskDestinations(workflowInstance, workflow, task, correlationId); + } } if ((message.Status.Equals(ExportStatus.Failure) || message.Status.Equals(ExportStatus.PartialFailure)) && @@ -453,9 +482,15 @@ private async Task UpdateWorkflowInstanceStatus(WorkflowInstance workflowI return true; } + private async Task HandleExternalAppAsync(WorkflowRevision workflow, WorkflowInstance workflowInstance, TaskExecution task, string correlationId) + { + var plugins = _migExternalAppPlugins; + await HandleDicomExportAsync(workflow, workflowInstance, task, correlationId, plugins).ConfigureAwait(false); + } - private async Task HandleDicomExportAsync(WorkflowRevision workflow, WorkflowInstance workflowInstance, TaskExecution task, string correlationId) + private async Task HandleDicomExportAsync(WorkflowRevision workflow, WorkflowInstance workflowInstance, TaskExecution task, string correlationId, List? plugins = null) { + plugins ??= new List(); var exportList = workflow.Workflow?.Tasks?.FirstOrDefault(t => t.Id == task.TaskId)?.ExportDestinations.Select(e => e.Name).ToArray(); var artifactValues = GetDicomExports(workflow, task, exportList); @@ -490,7 +525,7 @@ private async Task HandleDicomExportAsync(WorkflowRevision workflow, WorkflowIns return; } - await DispatchDicomExport(workflowInstance, task, exportList, artifactValues, correlationId); + await DispatchDicomExport(workflowInstance, task, exportList, artifactValues, correlationId, plugins); } private string[] GetDicomExports(WorkflowRevision workflow, TaskExecution task, string[]? exportDestinations) @@ -521,14 +556,14 @@ private string[] GetDicomExports(WorkflowRevision workflow, TaskExecution task, return new List(task.InputArtifacts.Values).ToArray(); } - private async Task DispatchDicomExport(WorkflowInstance workflowInstance, TaskExecution task, string[]? exportDestinations, string[] artifactValues, string correlationId) + private async Task DispatchDicomExport(WorkflowInstance workflowInstance, TaskExecution task, string[]? exportDestinations, string[] artifactValues, string correlationId, List plugins) { if (exportDestinations is null || !exportDestinations.Any()) { return false; } - await ExportRequest(workflowInstance, task, exportDestinations, artifactValues, correlationId); + await ExportRequest(workflowInstance, task, exportDestinations, artifactValues, correlationId, plugins); return await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstance.Id, task.TaskId, TaskExecutionStatus.Dispatched); } @@ -613,6 +648,13 @@ private async Task DispatchTaskDestinations(WorkflowInstance workflowInsta continue; } + if (string.Equals(taskExec!.TaskType, TaskTypeConstants.ExternalAppTask, StringComparison.InvariantCultureIgnoreCase)) + { + await HandleExternalAppAsync(workflow, workflowInstance, taskExec!, correlationId); + + continue; + } + processed &= await DispatchTask(workflowInstance, workflow, taskExec!, correlationId); if (processed is false) @@ -756,9 +798,9 @@ private async Task DispatchTask(WorkflowInstance workflowInstance, Workflo } } - private async Task ExportRequest(WorkflowInstance workflowInstance, TaskExecution taskExec, string[] exportDestinations, IList dicomImages, string correlationId) + private async Task ExportRequest(WorkflowInstance workflowInstance, TaskExecution taskExec, string[] exportDestinations, IList dicomImages, string correlationId, List plugins) { - var exportRequestEvent = EventMapper.ToExportRequestEvent(dicomImages, exportDestinations, taskExec.TaskId, workflowInstance.Id, correlationId); + var exportRequestEvent = EventMapper.ToExportRequestEvent(dicomImages, exportDestinations, taskExec.TaskId, workflowInstance.Id, correlationId, plugins); var jsonMesssage = new JsonMessage(exportRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, exportRequestEvent.CorrelationId, Guid.NewGuid().ToString()); await _messageBrokerPublisherService.Publish(ExportRequestRoutingKey, jsonMesssage.ToMessage()); @@ -825,7 +867,7 @@ public async Task CreateTaskExecutionAsync(TaskObject task, string? payloadId = null, string? previousTaskId = null) { - Guard.Against.Null(workflowInstance); + Guard.Against.Null(workflowInstance, nameof(workflowInstance)); var workflowInstanceId = workflowInstance.Id; @@ -833,12 +875,12 @@ public async Task CreateTaskExecutionAsync(TaskObject task, payloadId ??= workflowInstance.PayloadId; - Guard.Against.Null(task); - Guard.Against.NullOrWhiteSpace(task.Type); - Guard.Against.NullOrWhiteSpace(task.Id); - Guard.Against.NullOrWhiteSpace(workflowInstanceId); - Guard.Against.NullOrWhiteSpace(bucketName); - Guard.Against.NullOrWhiteSpace(payloadId); + Guard.Against.Null(task, nameof(task)); + Guard.Against.NullOrWhiteSpace(task.Type, nameof(task.Type)); + Guard.Against.NullOrWhiteSpace(task.Id, nameof(task.Id)); + Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId)); + Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName)); + Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId)); var executionId = Guid.NewGuid().ToString(); var newTaskArgs = GetTaskArgs(task, workflowInstance); diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 6da93086c..dd2cb8f1a 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -4,23 +4,20 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, "DnsClient": { @@ -47,11 +44,6 @@ "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -103,11 +95,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -128,11 +119,10 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -142,19 +132,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -176,20 +166,19 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -272,38 +261,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -507,11 +490,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -522,14 +500,6 @@ "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -768,34 +738,43 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "monai.deploy.workflowmanager.common": { + "Monai.Deploy.WorkflowManager.Common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" } }, - "monai.deploy.workflowmanager.conditionsresolver": { + "Monai.Deploy.WorkflowManager.Common.miscellaneous": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.1.1, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "fo-dicom": "[5.0.3, )" } }, - "monai.deploy.workflowmanager.configuration": { + "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", - "Monai.Deploy.Storage": "[0.2.15, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.conditionsresolver": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -803,33 +782,24 @@ "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "Mongo.Migration": "3.1.4", - "MongoDB.Driver": "2.19.0" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "Mongo.Migration": "[3.1.4, )", + "MongoDB.Driver": "[2.19.0, )" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" - } - }, - "monai.deploy.workflowmanager.shared": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "fo-dicom": "5.0.3" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "0.2.15", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } } } diff --git a/src/WorkflowManager/WorkflowManager/Controllers/AuthenticatedApiControllerBase.cs b/src/WorkflowManager/WorkflowManager/Controllers/AuthenticatedApiControllerBase.cs index 29a1a31ec..5cafe261b 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/AuthenticatedApiControllerBase.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/AuthenticatedApiControllerBase.cs @@ -16,9 +16,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Configuration; -namespace Monai.Deploy.WorkflowManager.ControllersShared +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Base authenticated api controller base. diff --git a/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs b/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs index a7c7982cd..b31618472 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs @@ -22,16 +22,16 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Common.Exceptions; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Shared.Filter; -using Monai.Deploy.WorkflowManager.Shared.Services; -using Monai.Deploy.WorkflowManager.Shared.Wrappers; - -namespace Monai.Deploy.WorkflowManager.ControllersShared +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers; + +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Payloads Controller. diff --git a/src/WorkflowManager/WorkflowManager/Controllers/TaskStatsController.cs b/src/WorkflowManager/WorkflowManager/Controllers/TaskStatsController.cs index 9a468e601..abf3a9116 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/TaskStatsController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/TaskStatsController.cs @@ -23,15 +23,15 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Database; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Shared.Filter; -using Monai.Deploy.WorkflowManager.Shared.Services; -using Monai.Deploy.WorkflowManager.Shared.Wrappers; - -namespace Monai.Deploy.WorkflowManager.ControllersShared +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Database; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers; + +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Execution stats endpoint. diff --git a/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs b/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs index fdbade648..2f7065b8e 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs @@ -22,16 +22,16 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Models; -using Monai.Deploy.WorkflowManager.Shared.Filter; -using Monai.Deploy.WorkflowManager.Shared.Services; -using Monai.Deploy.WorkflowManager.Shared.Wrappers; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers; +using Monai.Deploy.WorkflowManager.Common.Models; -namespace Monai.Deploy.WorkflowManager.ControllersShared +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Tasks Api endpoint controller. diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WFMApiControllerBase.cs b/src/WorkflowManager/WorkflowManager/Controllers/WFMApiControllerBase.cs index 065e4daab..b297a0294 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/WFMApiControllerBase.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/WFMApiControllerBase.cs @@ -17,9 +17,9 @@ using System; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.Common.Configuration; -namespace Monai.Deploy.WorkflowManager.ControllersShared +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Base Api Controller. diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs index a8d6799f7..98703c9e7 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs @@ -22,15 +22,15 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Common.Exceptions; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Shared.Filter; -using Monai.Deploy.WorkflowManager.Shared.Services; - -namespace Monai.Deploy.WorkflowManager.ControllersShared +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; + +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Workflow Instances Controller. diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs index c823b1736..0f51bd3a5 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs @@ -22,18 +22,18 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Common.Exceptions; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Contracts.Responses; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Shared.Filter; -using Monai.Deploy.WorkflowManager.Shared.Services; -using Monai.Deploy.WorkflowManager.Shared.Wrappers; -using Monai.Deploy.WorkflowManager.Validators; - -namespace Monai.Deploy.WorkflowManager.ControllersShared +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Contracts.Responses; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers; +using Monai.Deploy.WorkflowManager.Common.Validators; + +namespace Monai.Deploy.WorkflowManager.Common.ControllersShared { /// /// Workflows Controller. @@ -324,10 +324,10 @@ public async Task DeleteAsync([FromRoute] string id) } /// - /// + /// Get by AE Title. /// - /// - /// + /// The AE title. + /// The filter. /// A representing the result of the asynchronous operation. [HttpGet("aetitle/{title}")] [ProducesResponseType(typeof(WorkflowRevision), StatusCodes.Status200OK)] diff --git a/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs b/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs index 235b2c2f8..80d89d24a 100644 --- a/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs +++ b/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs @@ -18,18 +18,18 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Common.Services; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser; -using Monai.Deploy.WorkflowManager.PayloadListener.Services; -using Monai.Deploy.WorkflowManager.PayloadListener.Validators; -using Monai.Deploy.WorkflowManager.Services.InformaticsGateway; -using Monai.Deploy.WorkflowManager.Shared; -using Monai.Deploy.WorkflowManager.Storage.Services; -using Monai.Deploy.WorkflowManager.WorkfowExecuter.Common; -using Monai.Deploy.WorkflowManager.WorkfowExecuter.Services; +using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Parser; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; +using Monai.Deploy.WorkflowManager.Common.PayloadListener.Services; +using Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators; +using Monai.Deploy.WorkflowManager.Common.Services.InformaticsGateway; +using Monai.Deploy.WorkflowManager.Common.Storage.Services; +using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common; +using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services; -namespace Monai.Deploy.WorkflowManager.Services +namespace Monai.Deploy.WorkflowManager.Common.Extensions { /// /// Sets up workflow executor service collection. diff --git a/src/WorkflowManager/WorkflowManager/GlobalSuppressions.cs b/src/WorkflowManager/WorkflowManager/GlobalSuppressions.cs new file mode 100644 index 000000000..ffb032dd9 --- /dev/null +++ b/src/WorkflowManager/WorkflowManager/GlobalSuppressions.cs @@ -0,0 +1,24 @@ +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:File should have header", Justification = "Licence header must be first.")] +[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "dont like", Scope = "member", Target = "~M:Monai.Deploy.WorkflowManager.Common.Validators.WorkflowValidator.#ctor(Monai.Deploy.WorkflowManager.Common.Interfaces.IWorkflowService,Monai.Deploy.WorkflowManager.Services.InformaticsGateway.IInformaticsGatewayService,Microsoft.Extensions.Logging.ILogger{Monai.Deploy.WorkflowManager.Validators.WorkflowValidator},Microsoft.Extensions.Options.IOptions{Monai.Deploy.WorkflowManager.Configuration.WorkflowManagerOptions})")] diff --git a/src/WorkflowManager/WorkflowManager/Models/TasksRequest.cs b/src/WorkflowManager/WorkflowManager/Models/TasksRequest.cs index 4e16db655..a31f16b2e 100644 --- a/src/WorkflowManager/WorkflowManager/Models/TasksRequest.cs +++ b/src/WorkflowManager/WorkflowManager/Models/TasksRequest.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; -namespace Monai.Deploy.WorkflowManager.Models +namespace Monai.Deploy.WorkflowManager.Common.Models { /// /// TasksRequest model. diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 3115e5070..d4aaf8047 100755 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -45,11 +45,11 @@ - + - - - + + + @@ -62,16 +62,14 @@ - - - + + - - + diff --git a/src/WorkflowManager/WorkflowManager/Program.cs b/src/WorkflowManager/WorkflowManager/Program.cs index cfa298831..033de4834 100755 --- a/src/WorkflowManager/WorkflowManager/Program.cs +++ b/src/WorkflowManager/WorkflowManager/Program.cs @@ -30,17 +30,17 @@ using Monai.Deploy.Messaging.Configuration; using Monai.Deploy.Storage; using Monai.Deploy.Storage.Configuration; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Database; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Database.Options; -using Monai.Deploy.WorkflowManager.Database.Repositories; -using Monai.Deploy.WorkflowManager.MonaiBackgroundService; -using Monai.Deploy.WorkflowManager.Services; -using Monai.Deploy.WorkflowManager.Services.DataRetentionService; -using Monai.Deploy.WorkflowManager.Services.Http; -using Monai.Deploy.WorkflowManager.Shared.Services; -using Monai.Deploy.WorkflowManager.Validators; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Database; +using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Database.Options; +using Monai.Deploy.WorkflowManager.Common.Database.Repositories; +using Monai.Deploy.WorkflowManager.Common.Extensions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; +using Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService; +using Monai.Deploy.WorkflowManager.Common.Services.DataRetentionService; +using Monai.Deploy.WorkflowManager.Common.Services.Http; +using Monai.Deploy.WorkflowManager.Common.Validators; using Mongo.Migration.Startup; using Mongo.Migration.Startup.DotNetCore; using MongoDB.Driver; @@ -48,7 +48,7 @@ using NLog.LayoutRenderers; using NLog.Web; -namespace Monai.Deploy.WorkflowManager +namespace Monai.Deploy.WorkflowManager.Common { #pragma warning disable SA1600 // Elements should be documented diff --git a/src/WorkflowManager/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs b/src/WorkflowManager/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs index 7f42fb54c..d2c806614 100644 --- a/src/WorkflowManager/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs +++ b/src/WorkflowManager/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs @@ -19,10 +19,10 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; -namespace Monai.Deploy.WorkflowManager.Services.DataRetentionService +namespace Monai.Deploy.WorkflowManager.Common.Services.DataRetentionService { public class DataRetentionService : IHostedService, IDisposable, IMonaiService { diff --git a/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs b/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs index 1c3f625ad..6e1442bc7 100644 --- a/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs +++ b/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs @@ -23,15 +23,13 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; using Monai.Deploy.Security.Authentication.Configurations; using Monai.Deploy.Security.Authentication.Extensions; -using Monai.Deploy.Storage.Configuration; -using Monai.Deploy.WorkflowManager.Shared; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Newtonsoft.Json.Converters; -namespace Monai.Deploy.WorkflowManager.Services.Http +namespace Monai.Deploy.WorkflowManager.Common.Services.Http { /// /// Http Api Endpoint Startup Class. diff --git a/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs b/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs index 4b4bc51db..52e21ae62 100644 --- a/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs +++ b/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs @@ -1,18 +1,18 @@ /* - * Copyright 2022 MONAI Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright 2022 MONAI Consortium +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ using System; using System.Collections.Generic; @@ -22,17 +22,17 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Monai.Deploy.WorkflowManager.Common.Extensions; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging; -using Monai.Deploy.WorkflowManager.Services.InformaticsGateway; -using Monai.Deploy.WorkflowManager.Shared.Utilities; +using Monai.Deploy.WorkflowManager.Common.Configuration; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Extensions; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Utilities; +using Monai.Deploy.WorkflowManager.Common.Services.InformaticsGateway; using MongoDB.Driver.Linq; -using static Monai.Deploy.WorkflowManager.Shared.ValidationConstants; +using static Monai.Deploy.WorkflowManager.Common.Miscellaneous.ValidationConstants; -namespace Monai.Deploy.WorkflowManager.Validators +namespace Monai.Deploy.WorkflowManager.Common.Validators { /// /// Workflow Validator used for validating workflows. @@ -43,15 +43,33 @@ public class WorkflowValidator /// Separator when joining errors in single string. /// public static readonly string Separator = ";"; + + /// + /// the name of the class for priority. + /// + public static readonly string TaskPriorityClassName = "priority"; + private const string Comma = ", "; private readonly ILogger _logger; private readonly IOptions _options; - public static readonly string TaskPriorityClassName = "priority"; + + /// + /// Gets or sets errors from workflow validation. + /// + private List Errors { get; set; } = new List(); + + private IWorkflowService WorkflowService { get; } + + private IInformaticsGatewayService InformaticsGatewayService { get; } /// /// Initializes a new instance of the class. /// /// The workflow service. + /// service fot the MIG. + /// the logger to use. + /// options. +#pragma warning disable SA1201 // Elements should appear in the correct order public WorkflowValidator( IWorkflowService workflowService, IInformaticsGatewayService informaticsGatewayService, @@ -64,17 +82,10 @@ public WorkflowValidator( _options = options ?? throw new ArgumentNullException(nameof(options)); } - /// - /// Gets or sets errors from workflow validation. - /// - private List Errors { get; set; } = new List(); - - private IWorkflowService WorkflowService { get; } - - private IInformaticsGatewayService InformaticsGatewayService { get; } +#pragma warning restore SA1201 // Elements should appear in the correct order /// - /// used for checking for duplicates, if OrignalName is empty it will be determined as a create + /// Gets the original name, used for checking for duplicates, if OrignalName is empty it will be determined as a create /// workflow attempt and check for duplicates or if this is not equal to workflow template it will /// check for duplicates. /// if workflow name is same as original name then we response user is updating workflow some other way @@ -86,7 +97,7 @@ public WorkflowValidator( /// Returns single string of errors. /// /// List of errors. - /// + /// string. public static string ErrorsToString(List errors) { return string.Join(Separator, errors); @@ -112,8 +123,6 @@ public void Reset() /// - Unreferenced tasks other than root task. /// /// Workflow to validate. - /// Check for duplicates. - /// Used to check for duplicate name if it is a new workflow. /// if any validation errors are produced while validating workflow. public async Task> ValidateWorkflow(Workflow workflow) { @@ -144,9 +153,9 @@ private void ValidateTasks(Workflow workflow, string firstTaskId) var destinations = new List(); foreach (var task in workflow.Tasks) { - ValidateTaskArtifacts(task); + ValidateTaskOutputArtifacts(task); - TaskTypeSpecificValidation(workflow.Tasks, task); + TaskTypeSpecificValidation(workflow, task); if (task.TaskDestinations.Any(td => td.Name == firstTaskId)) { @@ -179,6 +188,24 @@ private void ValidateTasks(Workflow workflow, string firstTaskId) } } + private void CheckDestinationInMigDestinations(TaskObject task, InformaticsGateway gateway) + { + var taskDestinationNames = task.ExportDestinations.Select(td => td.Name); + if (taskDestinationNames.Any() && (gateway?.ExportDestinations?.IsNullOrEmpty() ?? true)) + { + Errors.Add("InformaticsGateway ExportDestinations destinations can not be null with an Export Task."); + } + + var diff = taskDestinationNames.Except(gateway?.ExportDestinations).ToList(); + if (!diff.IsNullOrEmpty()) + { + foreach (var missingDestination in diff) + { + Errors.Add($"Task: '{task.Id}' export_destination: '{missingDestination}' must be registered in the informatics_gateway object."); + } + } + } + private void ValidateExportDestinations(Workflow workflow) { if (workflow.Tasks.Any() is false) @@ -188,21 +215,7 @@ private void ValidateExportDestinations(Workflow workflow) foreach (var task in workflow.Tasks.Where(task => task.ExportDestinations.IsNullOrEmpty() is false)) { - var taskExportDestinationNames = task.ExportDestinations.Select(td => td.Name); - if (taskExportDestinationNames.Any() && (workflow.InformaticsGateway?.ExportDestinations?.IsNullOrEmpty() ?? true)) - { - Errors.Add("InformaticsGateway ExportDestinations destinations can not be null with an Export Task."); - return; - } - - var diff = taskExportDestinationNames.Except(workflow.InformaticsGateway?.ExportDestinations).ToList(); - if (!diff.IsNullOrEmpty()) - { - foreach (var missingDestination in diff) - { - Errors.Add($"Task: '{task.Id}' export_destination: '{missingDestination}' must be registered in the informatics_gateway object."); - } - } + CheckDestinationInMigDestinations(task, workflow.InformaticsGateway); } } @@ -257,7 +270,7 @@ private async Task ValidateWorkflowSpec(Workflow workflow) } var taskIds = workflow.Tasks.Select(t => t.Id); - var pattern = new Regex(@"^[a-zA-Z0-9-_]+$"); + var pattern = new Regex(@"^[a-zA-Z0-9-_]+$", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2)); foreach (var taskId in taskIds) { if (pattern.IsMatch(taskId) is false) @@ -293,7 +306,7 @@ private async Task ValidateInformaticsGateaway(InformaticsGateway informaticsGat } } - private void ValidateTaskArtifacts(TaskObject currentTask) + private void ValidateTaskOutputArtifacts(TaskObject currentTask) { if (currentTask.Artifacts != null && currentTask.Artifacts.Output.IsNullOrEmpty() is false) { @@ -307,8 +320,9 @@ private void ValidateTaskArtifacts(TaskObject currentTask) } } - private void TaskTypeSpecificValidation(TaskObject[] tasks, TaskObject currentTask) + private void TaskTypeSpecificValidation(Workflow workflow, TaskObject currentTask) { + var tasks = workflow.Tasks; if (ValidTaskTypes.Contains(currentTask.Type.ToLower()) is false) { Errors.Add($"Task: '{currentTask.Id}' has an invalid type{Comma}please specify: {string.Join(Comma, ValidTaskTypes)}"); @@ -317,6 +331,16 @@ private void TaskTypeSpecificValidation(TaskObject[] tasks, TaskObject currentTa ValidateInputs(currentTask); + if (currentTask.Type.Equals(ExportTaskType, StringComparison.OrdinalIgnoreCase) is true) + { + ValidateExportTask(workflow, currentTask); + } + + if (currentTask.Type.Equals(ExternalAppTaskType, StringComparison.OrdinalIgnoreCase) is true) + { + ValidateExternalAppTask(workflow, currentTask); + } + if (currentTask.Type.Equals(ArgoTaskType, StringComparison.OrdinalIgnoreCase) is true) { ValidateArgoTask(currentTask); @@ -584,5 +608,46 @@ private void ValidateClinicalReviewRequiredFields(TaskObject[] tasks, TaskObject Errors.Add($"Task: '{currentTask.Id}' reviewed_task_id: '{currentTask.Args[ReviewedTaskId]}' does not reference an Argo task."); } } + + private void ValidateExportTask(Workflow workflow, TaskObject currentTask) + { + if (currentTask.ExportDestinations.Any() is false) + { + Errors.Add($"Task: '{currentTask.Id}' does not contain a destination."); + } + + CheckDestinationInMigDestinations(currentTask, workflow.InformaticsGateway); + + if (currentTask.ExportDestinations.Count() != currentTask.ExportDestinations.Select(t => t.Name).Distinct().Count()) + { + Errors.Add($"Task: '{currentTask.Id}' contains duplicate destinations."); + } + + ValidateInputs(currentTask); + } + + private void ValidateExternalAppTask(Workflow workflow, TaskObject currentTask) + { + if (currentTask.ExportDestinations.Any() is false) + { + Errors.Add($"Task: '{currentTask.Id}' does not contain a destination."); + } + + CheckDestinationInMigDestinations(currentTask, workflow.InformaticsGateway); + + if (currentTask.ExportDestinations.Count() != currentTask.ExportDestinations.Select(t => t.Name).Distinct().Count()) + { + Errors.Add($"Task: '{currentTask.Id}' contains duplicate destinations."); + } + + ValidateTaskOutputArtifacts(currentTask); + + if (currentTask.Artifacts == null + || currentTask.Artifacts.Output.IsNullOrEmpty() + || (currentTask.Artifacts.Output.Select(a => a.Name).Any() is false)) + { + Errors.Add($"Task: '{currentTask.Id}' must contain at lease a single output."); + } + } } } diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index 1dfe8f86d..8346de9be 100755 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -101,7 +101,8 @@ "serviceName": "test" } }, - "dicomTagsDisallowed": "PatientName,PatientID,IssuerOfPatientID,TypeOfPatientID,IssuerOfPatientIDQualifiersSequence,SourcePatientGroupIdentificationSequence,GroupOfPatientsIdentificationSequence,SubjectRelativePositionInImage,PatientBirthDate,PatientBirthTime,PatientBirthDateInAlternativeCalendar,PatientDeathDateInAlternativeCalendar,PatientAlternativeCalendar,PatientSex,PatientInsurancePlanCodeSequence,PatientPrimaryLanguageCodeSequence,PatientPrimaryLanguageModifierCodeSequence,QualityControlSubject,QualityControlSubjectTypeCodeSequence,StrainDescription,StrainNomenclature,StrainStockNumber,StrainSourceRegistryCodeSequence,StrainStockSequence,StrainSource,StrainAdditionalInformation,StrainCodeSequence,GeneticModificationsSequence,GeneticModificationsDescription,GeneticModificationsNomenclature,GeneticModificationsCodeSequence,OtherPatientIDsRETIRED,OtherPatientNames,OtherPatientIDsSequence,PatientBirthName,PatientAge,PatientSize,PatientSizeCodeSequence,PatientBodyMassIndex,MeasuredAPDimension,MeasuredLateralDimension,PatientWeight,PatientAddress,InsurancePlanIdentificationRETIRED,PatientMotherBirthName,MilitaryRank,BranchOfService,MedicalRecordLocatorRETIRED,ReferencedPatientPhotoSequence,MedicalAlerts,Allergies,CountryOfResidence,RegionOfResidence,PatientTelephoneNumbers,PatientTelecomInformation,EthnicGroup,Occupation,SmokingStatus,AdditionalPatientHistory,PregnancyStatus,LastMenstrualDate,PatientReligiousPreference,PatientSpeciesDescription,PatientSpeciesCodeSequence,PatientSexNeutered,AnatomicalOrientationType,PatientBreedDescription,PatientBreedCodeSequence,BreedRegistrationSequence,BreedRegistrationNumber,BreedRegistryCodeSequence,ResponsiblePerson,ResponsiblePersonRole,ResponsibleOrganization,PatientComments,ExaminedBodyThickness" + "dicomTagsDisallowed": "PatientName,PatientID,IssuerOfPatientID,TypeOfPatientID,IssuerOfPatientIDQualifiersSequence,SourcePatientGroupIdentificationSequence,GroupOfPatientsIdentificationSequence,SubjectRelativePositionInImage,PatientBirthDate,PatientBirthTime,PatientBirthDateInAlternativeCalendar,PatientDeathDateInAlternativeCalendar,PatientAlternativeCalendar,PatientSex,PatientInsurancePlanCodeSequence,PatientPrimaryLanguageCodeSequence,PatientPrimaryLanguageModifierCodeSequence,QualityControlSubject,QualityControlSubjectTypeCodeSequence,StrainDescription,StrainNomenclature,StrainStockNumber,StrainSourceRegistryCodeSequence,StrainStockSequence,StrainSource,StrainAdditionalInformation,StrainCodeSequence,GeneticModificationsSequence,GeneticModificationsDescription,GeneticModificationsNomenclature,GeneticModificationsCodeSequence,OtherPatientIDsRETIRED,OtherPatientNames,OtherPatientIDsSequence,PatientBirthName,PatientAge,PatientSize,PatientSizeCodeSequence,PatientBodyMassIndex,MeasuredAPDimension,MeasuredLateralDimension,PatientWeight,PatientAddress,InsurancePlanIdentificationRETIRED,PatientMotherBirthName,MilitaryRank,BranchOfService,MedicalRecordLocatorRETIRED,ReferencedPatientPhotoSequence,MedicalAlerts,Allergies,CountryOfResidence,RegionOfResidence,PatientTelephoneNumbers,PatientTelecomInformation,EthnicGroup,Occupation,SmokingStatus,AdditionalPatientHistory,PregnancyStatus,LastMenstrualDate,PatientReligiousPreference,PatientSpeciesDescription,PatientSpeciesCodeSequence,PatientSexNeutered,AnatomicalOrientationType,PatientBreedDescription,PatientBreedCodeSequence,BreedRegistrationSequence,BreedRegistrationNumber,BreedRegistryCodeSequence,ResponsiblePerson,ResponsiblePersonRole,ResponsibleOrganization,PatientComments,ExaminedBodyThickness", + "migExternalAppPlugins": "Monai.Deploy.InformaticsGateway.ExecutionPlugins.ExternalAppOutgoing, Monai.Deploy.InformaticsGateway, Version=0.0.0.0" }, "InformaticsGateway": { "apiHost": "http://localhost:5010", diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 054bbc0d2..3a74206e6 100755 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -70,29 +70,25 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "requested": "[0.1.25, )", + "resolved": "0.1.25", + "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", - "Microsoft.Extensions.Logging": "6.0.0", + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", "Newtonsoft.Json": "13.0.3", - "System.ComponentModel.Annotations": "5.0.0", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==", + "requested": "[0.1.25, )", + "resolved": "0.1.25", + "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Polly": "7.2.3", - "RabbitMQ.Client": "6.4.0", - "System.Collections.Concurrent": "4.3.0" + "Monai.Deploy.Messaging": "0.1.25", + "Polly": "7.2.4", + "RabbitMQ.Client": "6.5.0" } }, "Monai.Deploy.Security": { @@ -112,32 +108,25 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.15, )", - "resolved": "0.2.15", - "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==", + "requested": "[0.2.18, )", + "resolved": "0.2.18", + "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.15", + "AWSSDK.SecurityToken": "3.7.201.9", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Monai.Deploy.Storage.S3Policy": "0.2.18", "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.15, )", - "resolved": "0.2.15", - "contentHash": "hyN7GuTp80y5cpY01IqbzkRCc0QB3y2v7Sppzarsnw6l6FgLJ1ZUgvMN4VDBwVyMNJytBeEKWfgn/FdidGNYaw==", + "requested": "[0.2.18, )", + "resolved": "0.2.18", + "contentHash": "0sHLiT0qU2Fg5O+AF8UDqzsJEYztUAFZeOPh4kOLC4bckhb+wSsuv7VcAXWtR3BOY6TxaMVVUJ+EK/o5mCp3tQ==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.101.26", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Minio": "4.0.7", - "Monai.Deploy.Storage": "0.2.15", - "Monai.Deploy.Storage.S3Policy": "0.2.15" + "Minio": "5.0.0", + "Monai.Deploy.Storage": "0.2.18", + "Monai.Deploy.Storage.S3Policy": "0.2.18" } }, "Mongo.Migration": { @@ -203,32 +192,26 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.105.20", - "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg==" + "resolved": "3.7.200.13", + "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.101.26", - "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==", + "resolved": "3.7.201.9", + "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", "dependencies": { - "AWSSDK.Core": "[3.7.105.20, 4.0.0)" + "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, - "Crc32.NET": { + "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==", - "dependencies": { - "NETStandard.Library": "2.0.0" - } + "resolved": "8.1.0", + "contentHash": "kgDi65k02hrgnHy3N0xENecsr0spW13RdIA1tipovi9t16gKziI7uZIu3qkxz0GctCHNM4hfeqXYg//6wHJ6Kw==" }, "DnsClient": { "type": "Transitive", @@ -254,11 +237,6 @@ "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -424,19 +402,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.21", + "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -495,8 +473,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -630,8 +608,8 @@ }, "Microsoft.NETCore.Targets": { "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, "Microsoft.OpenApi": { "type": "Transitive", @@ -654,24 +632,20 @@ }, "Minio": { "type": "Transitive", - "resolved": "4.0.7", - "contentHash": "gmd+B4YHaE+cz8TCPIzkhov3t30VovGfyf6vMxqXd/iF/cziKmXKJJXv2E9kcHvbGwVHhMWtvk7fXWOzHcU4uw==", + "resolved": "5.0.0", + "contentHash": "7tZj90WEuuH60RAP4wBYexjMuJOhCnK7I46hCiX3CtZPackHisLZ8aAJmn3KlwbUX22dBDphwemD+h37vet8Qw==", "dependencies": { - "Crc32.NET": "1.2.0", - "Microsoft.CSharp": "4.7.0", - "Newtonsoft.Json": "13.0.1", - "System.Net.Http": "4.3.4", - "System.Net.Primitives": "4.3.1", - "System.Reactive.Linq": "5.0.0", - "System.ValueTuple": "4.4.0" + "CommunityToolkit.HighPerformance": "8.1.0", + "System.IO.Hashing": "7.0.0", + "System.Reactive.Linq": "5.0.0" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.15", - "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==", + "resolved": "0.2.18", + "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Newtonsoft.Json": "13.0.3" } }, @@ -715,14 +689,6 @@ "resolved": "1.7.0", "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, "Newtonsoft.Json.Bson": { "type": "Transitive", "resolved": "1.0.2", @@ -743,116 +709,18 @@ }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "RabbitMQ.Client": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Threading.Channels": "4.7.1" - } - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "resolved": "6.5.0", + "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==", "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + "System.Memory": "4.5.5", + "System.Threading.Channels": "7.0.0" } }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" - }, "Serilog": { "type": "Transitive", "resolved": "2.8.0", @@ -965,29 +833,29 @@ }, "System.Collections": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "resolved": "4.0.11", + "contentHash": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" } }, "System.Collections.Concurrent": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "resolved": "4.0.12", + "contentHash": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Reflection": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11" } }, "System.Collections.NonGeneric": { @@ -1003,11 +871,6 @@ "System.Threading": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, "System.Diagnostics.Debug": { "type": "Transitive", "resolved": "4.3.0", @@ -1033,12 +896,12 @@ }, "System.Diagnostics.Tracing": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "resolved": "4.1.0", + "contentHash": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" } }, "System.Globalization": { @@ -1051,30 +914,6 @@ "System.Runtime": "4.3.0" } }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.10.0", @@ -1103,87 +942,36 @@ }, "System.IO.FileSystem": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "resolved": "4.0.1", + "contentHash": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.IO": "4.1.0", + "System.IO.FileSystem.Primitives": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Text.Encoding": "4.0.11", + "System.Threading.Tasks": "4.0.11" } }, "System.IO.FileSystem.Primitives": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "resolved": "4.0.1", + "contentHash": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==", "dependencies": { - "System.Runtime": "4.3.0" + "System.Runtime": "4.1.0" } }, - "System.Linq": { + "System.IO.Hashing": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } + "resolved": "7.0.0", + "contentHash": "sDnWM0N3AMCa86LrKTWeF3BZLD2sgWyYUc7HL6z4+xyDZNQRwzmxbo4qP2rX2MqC+Sy1/gOSRDah5ltxY5jPxw==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3", - "System.Runtime": "4.3.1", - "System.Runtime.Handles": "4.3.0" - } + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, "System.Reactive": { "type": "Transitive", @@ -1235,11 +1023,11 @@ }, "System.Runtime": { "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" } }, "System.Runtime.CompilerServices.Unsafe": { @@ -1259,36 +1047,25 @@ }, "System.Runtime.Handles": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "resolved": "4.0.1", + "contentHash": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" } }, "System.Runtime.InteropServices": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "resolved": "4.1.0", + "contentHash": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==", "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Reflection": "4.1.0", + "System.Reflection.Primitives": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Handles": "4.0.1" } }, "System.Security.AccessControl": { @@ -1300,137 +1077,11 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", @@ -1493,8 +1144,8 @@ }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" + "resolved": "7.0.0", + "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA==" }, "System.Threading.Tasks": { "type": "Transitive", @@ -1531,6 +1182,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, + "Monai.Deploy.WorkflowManager.Common.configuration": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Storage": "[0.2.18, )" + } + }, + "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "type": "Project", + "dependencies": { + "Ardalis.GuardClauses": "[4.1.1, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "fo-dicom": "[5.0.3, )" + } + }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { @@ -1548,17 +1215,10 @@ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, - "monai.deploy.workflowmanager.configuration": { - "type": "Project", - "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", - "Monai.Deploy.Storage": "[0.2.15, )" - } - }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Messaging": "[0.1.25, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -1588,11 +1248,10 @@ "monai.deploy.workflowmanager.payloadlistener": { "type": "Project", "dependencies": { - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )", "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" } }, @@ -1600,23 +1259,14 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Http": "[3.1.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )" - } - }, - "monai.deploy.workflowmanager.shared": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "fo-dicom": "5.0.3" + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "[0.2.15, )", + "Monai.Deploy.Storage": "[0.2.18, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } @@ -1624,13 +1274,13 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } } diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs index 1770e27bb..4bb3f7008 100755 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs @@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.Configuration; +using Monai.Deploy.WorkflowManager.Common.TaskManager.IntegrationTests.Support; using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO; using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support; using Polly; @@ -23,6 +24,9 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests { +#pragma warning disable CS8602 // Dereference of a possibly null reference. +#pragma warning disable CS8604 // Possible null reference argument. +#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. /// /// Hooks class for setting up the integration tests. /// @@ -45,7 +49,7 @@ public Hooks(IObjectContainer objectContainer) public static RabbitConsumer? EmailConsumer { get; private set; } private static MinioClientUtil? MinioClient { get; set; } private static MongoClientUtil? MongoClient { get; set; } - public static AsyncRetryPolicy RetryPolicy { get; private set; } + public static AsyncRetryPolicy? RetryPolicy { get; private set; } private IObjectContainer ObjectContainer { get; set; } private static HttpClient? HttpClient { get; set; } private static WebApplicationFactory? WebApplicationFactory { get; set; } @@ -177,3 +181,6 @@ public static void TearDownRabbit() } } } +#pragma warning restore CS8604 // Possible null reference argument. +#pragma warning restore CS8602 // Dereference of a possibly null reference. +#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. 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 484b2924f..86671c6b9 100755 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -1,4 +1,4 @@ -