Merge pull request #864 from Project-MONAI/externalApp

External app
Project-MONAI · Aug 22, 2023 · 99bcbeb · 99bcbeb
2 parents e3daeb7 + e6d004a
commit 99bcbeb
Show file tree

Hide file tree

Showing 63 changed files with 2,754 additions and 2,424 deletions.
diff --git 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,13 +19,15 @@
     - 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
   - :who: mocsharp
     :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE)
     :versions:
     - 4.0.1
+    - 4.1.1
     :when: 2022-10-14 23:36:39.999308652 Z
 - - :approve
   - AutoFixture
@@ -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,6 +604,7 @@
     :versions:
     - 6.0.2
     - 2.0.0
+    - 6.0.4
     - 7.0.0
     :when: 2022-10-14 23:37:09.821156462 Z
 - - :approve
@@ -851,6 +863,7 @@
     :versions:
     - 4.0.6
     - 4.0.7
+    - 5.0.0
     :when: 2022-10-14 23:37:22.726827733 Z
 - - :approve
   - Moq
@@ -923,13 +936,15 @@
     :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
   - :who: mocsharp
     :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 +1210,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 +1404,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 +1455,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 +1933,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 +2368,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 +2377,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 +2387,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 +2397,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 +2407,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 +2590,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 +2599,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
@@ -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/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj
@@ -31,8 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.23" />
-    <PackageReference Include="Monai.Deploy.Storage" Version="0.2.15" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.25" />
+    <PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Shared/Configuration/WorkflowManagerOptions.cs b/src/Shared/Configuration/WorkflowManagerOptions.cs
@@ -71,6 +71,9 @@ public class WorkflowManagerOptions : PagedOptions
         [ConfigurationKeyName("dicomTagsDisallowed")]
         public string DicomTagsDisallowed { get; set; } = string.Empty;
 
+        [ConfigurationKeyName("migExternalAppPlugins")]
+        public List<string> MigExternalAppPlugins { get; set; }
+
         public WorkflowManagerOptions()
         {
             Messaging = new MessageBrokerConfiguration();