Skip to content

Commit 99bcbeb

Browse files
authored
Merge pull request #864 from Project-MONAI/externalApp
External app
2 parents e3daeb7 + e6d004a commit 99bcbeb

File tree

63 files changed

+2754
-2424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2754
-2424
lines changed

doc/dependency_decisions.yml

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- 3.7.100.14
99
- 3.7.100.25
1010
- 3.7.105.20
11+
- 3.7.200.13
1112
:when: 2022-10-14 23:36:39.233755632 Z
1213
- - :approve
1314
- AWSSDK.SecurityToken
@@ -18,13 +19,15 @@
1819
- 3.7.100.14
1920
- 3.7.100.25
2021
- 3.7.101.26
22+
- 3.7.201.9
2123
:when: 2022-10-14 23:36:39.628260680 Z
2224
- - :approve
2325
- Ardalis.GuardClauses
2426
- :who: mocsharp
2527
:why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE)
2628
:versions:
2729
- 4.0.1
30+
- 4.1.1
2831
:when: 2022-10-14 23:36:39.999308652 Z
2932
- - :approve
3033
- AutoFixture
@@ -399,6 +402,8 @@
399402
:versions:
400403
- 6.0.1
401404
- 7.0.0
405+
- 2.2.0
406+
- 3.1.0
402407
:when: 2022-10-14 23:37:00.596541774 Z
403408
- - :approve
404409
- Microsoft.Extensions.Configuration.Abstractions
@@ -414,6 +419,7 @@
414419
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
415420
:versions:
416421
- 3.0.0
422+
- 3.1.0
417423
- 2.2.0
418424
- 7.0.3
419425
:when: 2022-10-14 23:37:01.366955631 Z
@@ -469,6 +475,7 @@
469475
- :who: mocsharp
470476
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
471477
:versions:
478+
- 3.1.0
472479
- 6.0.0
473480
- 6.0.1
474481
- 2.2.0
@@ -506,6 +513,7 @@
506513
- 6.0.12
507514
- 6.0.14
508515
- 6.0.15
516+
- 6.0.21
509517
:when: 2022-10-14 23:37:05.589288760 Z
510518
- - :approve
511519
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions
@@ -515,6 +523,7 @@
515523
- 6.0.12
516524
- 6.0.14
517525
- 6.0.15
526+
- 6.0.21
518527
:when: 2022-10-14 23:37:05.963687838 Z
519528
- - :approve
520529
- Microsoft.Extensions.FileProviders.Abstractions
@@ -585,6 +594,8 @@
585594
:versions:
586595
- 6.0.0
587596
- 7.0.0
597+
- 2.2.0
598+
- 3.1.0
588599
:when: 2022-10-14 23:37:09.454044811 Z
589600
- - :approve
590601
- Microsoft.Extensions.Logging.Abstractions
@@ -593,6 +604,7 @@
593604
:versions:
594605
- 6.0.2
595606
- 2.0.0
607+
- 6.0.4
596608
- 7.0.0
597609
:when: 2022-10-14 23:37:09.821156462 Z
598610
- - :approve
@@ -851,6 +863,7 @@
851863
:versions:
852864
- 4.0.6
853865
- 4.0.7
866+
- 5.0.0
854867
:when: 2022-10-14 23:37:22.726827733 Z
855868
- - :approve
856869
- Moq
@@ -923,13 +936,15 @@
923936
:why: BSD-3-Clause (https://github.com/App-vNext/Polly/raw/main/LICENSE.txt)
924937
:versions:
925938
- 7.2.3
939+
- 7.2.4
926940
:when: 2022-10-14 23:37:30.185774702 Z
927941
- - :approve
928942
- RabbitMQ.Client
929943
- :who: mocsharp
930944
:why: Apache-2.0 (https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2)
931945
:versions:
932946
- 6.4.0
947+
- 6.5.0
933948
:when: 2022-10-14 23:37:30.555988654 Z
934949
- - :approve
935950
- Serilog
@@ -1195,7 +1210,15 @@
11951210
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
11961211
:versions:
11971212
- 5.0.0
1213+
- 4.3.0
11981214
:when: 2022-10-14 23:37:45.155805918 Z
1215+
- - :approve
1216+
- System.ComponentModel
1217+
- :who: nsouth
1218+
:why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770)
1219+
:versions:
1220+
- 4.3.0
1221+
:when: 2023-8-18 08:53:45.155805918 Z
11991222
- - :approve
12001223
- System.Configuration.ConfigurationManager
12011224
- :who: mocsharp
@@ -1381,6 +1404,13 @@
13811404
:versions:
13821405
- 4.3.0
13831406
:when: 2022-10-14 23:37:55.295846123 Z
1407+
- - :approve
1408+
- System.IO.Hashing
1409+
- :who: nsouth
1410+
:why: MIT
1411+
:versions:
1412+
- 7.0.0
1413+
:when: 2023-8-18 08:53:55.295846123 Z
13841414
- - :approve
13851415
- System.IdentityModel.Tokens.Jwt
13861416
- :who: mocsharp
@@ -1425,6 +1455,7 @@
14251455
:why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
14261456
:versions:
14271457
- 4.5.4
1458+
- 4.5.5
14281459
:when: 2022-10-14 23:37:58.271685148 Z
14291460
- - :approve
14301461
- System.Net.Http
@@ -1902,6 +1933,7 @@
19021933
:versions:
19031934
- 4.7.1
19041935
- 6.0.0
1936+
- 7.0.0
19051937
:when: 2022-10-14 23:38:26.916570960 Z
19061938
- - :approve
19071939
- System.Threading.Tasks
@@ -2336,6 +2368,7 @@
23362368
:versions:
23372369
- 0.1.21
23382370
- 0.1.23
2371+
- 0.1.25
23392372
:when: 2022-12-15 21:43:10.781625468 Z
23402373
- - :approve
23412374
- Monai.Deploy.Messaging.RabbitMQ
@@ -2344,6 +2377,7 @@
23442377
:versions:
23452378
- 0.1.21
23462379
- 0.1.23
2380+
- 0.1.25
23472381
:when: 2022-12-15 21:43:20.975488411 Z
23482382
- - :approve
23492383
- Monai.Deploy.Storage
@@ -2353,6 +2387,7 @@
23532387
- 0.2.10
23542388
- 0.2.13
23552389
- 0.2.15
2390+
- 0.2.18
23562391
:when: 2022-11-02 21:43:46.964761113 Z
23572392
- - :approve
23582393
- Monai.Deploy.Storage.MinIO
@@ -2362,6 +2397,7 @@
23622397
- 0.2.10
23632398
- 0.2.13
23642399
- 0.2.15
2400+
- 0.2.18
23652401
:when: 2022-11-02 21:43:57.620687413 Z
23662402
- - :approve
23672403
- Monai.Deploy.Storage.S3Policy
@@ -2371,6 +2407,7 @@
23712407
- 0.2.10
23722408
- 0.2.13
23732409
- 0.2.15
2410+
- 0.2.18
23742411
:when: 2022-11-02 21:44:06.994266372 Z
23752412
- - :approve
23762413
- MongoDB.Bson
@@ -2553,6 +2590,7 @@
25532590
:why: MIT (https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/License.md)
25542591
:versions:
25552592
- 7.1.2
2593+
- 8.1.0
25562594
:when: 2023-05-17 14:44:00.000000000 Z
25572595
- - :approve
25582596
- fo-dicom
@@ -2561,5 +2599,11 @@
25612599
:versions:
25622600
- 5.0.3
25632601
:when: 2023-05-17 14:44:00.000000000 Z
2564-
2602+
- - :approve
2603+
- CommunityToolkit.HighPerformance
2604+
- :who: nsouth
2605+
:why: MIT
2606+
:versions:
2607+
- 8.1.0
2608+
:when: 2023-08-18 09:09:00.000000000 Z
25652609

guidelines/mwm-workflow-spec.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ These tasks are borken down into different types:
249249
| ---- | ------- |
250250
| Router | A task to control the flow through a workflow |
251251
| Export | A task to trigger the exporting of data |
252+
| External App | A task to trigger execution of an external app |
252253
| `Plugin_Name` | A task which has a matching Plugin installed & enabled |
253254

254255

@@ -402,6 +403,11 @@ Example (output sent to another task if the patient is female, otherwise to PACS
402403

403404
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.
404405

406+
#### External App
407+
These are task types that allow for execution of external apps and in
408+
structure are identical to the Export type above.
409+
410+
405411
#### Plugin
406412
These are tasks are Named the same as the installed Pluging.
407413
The task also requires these extra attributes:-

src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.23" />
35-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.15" />
34+
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.25" />
35+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

src/Shared/Configuration/WorkflowManagerOptions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ public class WorkflowManagerOptions : PagedOptions
7171
[ConfigurationKeyName("dicomTagsDisallowed")]
7272
public string DicomTagsDisallowed { get; set; } = string.Empty;
7373

74+
[ConfigurationKeyName("migExternalAppPlugins")]
75+
public List<string> MigExternalAppPlugins { get; set; }
76+
7477
public WorkflowManagerOptions()
7578
{
7679
Messaging = new MessageBrokerConfiguration();

0 commit comments

Comments
 (0)