-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gh-419 Implement data output plug-in engine and integration with SCU/…
…DICOMWeb export services (#428) * Update Ardalis.GuardClauses * Update coverlet.collector * Update Docker.DotNet * Update xunit * Update NLog * Update MongoDB * Update Polly * Update Monai.Deploy libraries * Update Microsoft .NET 6 libraries * Update fo-dicom * Remove fo-dicom logging support and use .NET logging * Implement OutputDataPluginEngine for export service (SCU, DICOMWeb) * Add WorkflowInstanceId and TaskId properties for plugins to use * Fix package hash * Fix JSON property name of TaskId * Update Moq, NLog, NLog.Web.AspNetCore and dependencie decisions * Update dependency decisions: Devlooped.SponsorLink * Fix comments Signed-off-by: Victor Chang <vicchang@nvidia.com>
- Loading branch information
Showing
55 changed files
with
966 additions
and
446 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * 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 System.Threading.Tasks; | ||
| using FellowOakDicom; | ||
|
|
||
| namespace Monai.Deploy.InformaticsGateway.Api | ||
| { | ||
| /// <summary> | ||
| /// <c>IOutputDataPlugin</c> enables lightweight data processing over incoming data received from supported data ingestion | ||
| /// services. | ||
| /// Refer to <see cref="IOutputDataPluginEngine" /> for additional details. | ||
| /// </summary> | ||
| public interface IOutputDataPlugin | ||
| { | ||
| Task<(DicomFile dicomFile, ExportRequestDataMessage exportRequestDataMessage)> Execute(DicomFile dicomFile, ExportRequestDataMessage exportRequestDataMessage); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * 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 System.Collections.Generic; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Monai.Deploy.InformaticsGateway.Api | ||
| { | ||
| /// <summary> | ||
| /// <c>IOutputDataPluginEngine</c> processes each file before exporting to its destination | ||
| /// through a list of plug-ins based on <see cref="IOutputDataPlugin"/>. | ||
| /// Rules: | ||
| /// <list type="bullet"> | ||
| /// <item>A list of plug-ins can be included with each export request, and each plug-in is executed in the order stored, processing one file at a time, enabling piping of the data before each file is exported.</item> | ||
| /// <item>Plugins MUST be lightweight and not hinder the export process.</item> | ||
| /// <item>Plugins SHALL not accumulate files in memory or storage for bulk processing.</item> | ||
| /// </list> | ||
| /// </summary> | ||
| public interface IOutputDataPluginEngine | ||
| { | ||
| void Configure(IReadOnlyList<string> pluginAssemblies); | ||
|
|
||
| Task<ExportRequestDataMessage> ExecutePlugins(ExportRequestDataMessage exportRequestDataMessage); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.