Merge pull request #911 from Project-MONAI/IA-300

Ia 300
Project-MONAI · Nov 21, 2023 · 609a2f7 · 609a2f7
2 parents 449e557 + 96acd8e
commit 609a2f7
Show file tree

Hide file tree

Showing 44 changed files with 323 additions and 151 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -82,8 +82,8 @@ jobs:
         image: rabbitmq:3.8.18-management
         env:
           RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
-          RABBITMQ_DEFAULT_USER: "admin"
-          RABBITMQ_DEFAULT_PASS: "admin"
+          RABBITMQ_DEFAULT_USER: "rabbitmq"
+          RABBITMQ_DEFAULT_PASS: "rabbitmq"
           RABBITMQ_DEFAULT_VHOST: "monaideploy"
         ports:
         - "15672:15672"
@@ -159,8 +159,8 @@ jobs:
         image: rabbitmq:3.8.18-management
         env:
           RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
-          RABBITMQ_DEFAULT_USER: "admin"
-          RABBITMQ_DEFAULT_PASS: "admin"
+          RABBITMQ_DEFAULT_USER: "rabbitmq"
+          RABBITMQ_DEFAULT_PASS: "rabbitmq"
           RABBITMQ_DEFAULT_VHOST: "monaideploy"
         ports:
         - "15672:15672"

diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml
@@ -16,7 +16,7 @@ version: '3.9'
 
 services:
   minio:
-      image: "minio/minio:latest"
+      image: "minio/minio:RELEASE.2023-10-16T04-13-43Z"
       command: server --console-address ":9001" /data
       hostname: minio
       volumes:
@@ -38,8 +38,8 @@ services:
     hostname: "rabbit1"
     environment:
       RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
-      RABBITMQ_DEFAULT_USER: "admin"
-      RABBITMQ_DEFAULT_PASS: "admin"
+      RABBITMQ_DEFAULT_USER: "rabbitmq"
+      RABBITMQ_DEFAULT_PASS: "rabbitmq"
       RABBITMQ_DEFAULT_VHOST: "monaideploy"
     ports:
       - "15672:15672"

diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
@@ -763,6 +763,7 @@
         - 1.0.1
         - 1.0.3
         - 1.0.4
+        - 1.0.5-rc0006
     :when: 2023-24-10 11:43:10.781625468 Z
 - - :approve
   - Monai.Deploy.Messaging.RabbitMQ
@@ -772,6 +773,7 @@
         - 1.0.1
         - 1.0.3
         - 1.0.4
+        - 1.0.5-rc0006
     :when: 2023-24-10 11:43:20.975488411 Z
 - - :approve
   - Monai.Deploy.Security

diff --git a/src/Common/Configuration/MessageBrokerConfigurationKeys.cs b/src/Common/Configuration/MessageBrokerConfigurationKeys.cs
@@ -91,5 +91,12 @@ public class MessageBrokerConfigurationKeys
 
         [ConfigurationKeyName("artifactrecieved")]
         public string ArtifactRecieved { get; set; } = "md.workflow.artifactrecieved";
+
+        /// <summary>
+        /// Gets or sets the topic for publishing export requests.
+        /// Defaults to `md_export_request`.
+        /// </summary>
+        [ConfigurationKeyName("externalAppRequest")]
+        public string ExternalAppRequest { get; set; } = "md.externalapp.request";
     }
 }
diff --git a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.4" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5-rc0006" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
   </ItemGroup>
 

diff --git a/src/Common/Configuration/packages.lock.json b/src/Common/Configuration/packages.lock.json
@@ -4,9 +4,9 @@
     "net6.0": {
       "Monai.Deploy.Messaging": {
         "type": "Direct",
-        "requested": "[1.0.4, )",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "requested": "[1.0.5-rc0006, )",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

diff --git a/src/Common/Miscellaneous/packages.lock.json b/src/Common/Miscellaneous/packages.lock.json
@@ -146,8 +146,8 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -236,7 +236,7 @@
       "monai.deploy.workflowmanager.common.configuration": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Monai.Deploy.Storage": "[0.2.18, )"
         }
       }

diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj
@@ -39,9 +39,8 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.4" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5-rc0006" />
     <PackageReference Include="Mongo.Migration" Version="3.1.4" />
     <PackageReference Include="MongoDB.Bson" Version="2.21.0" />
   </ItemGroup>
-
 </Project>
diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json
@@ -4,9 +4,9 @@
     "net6.0": {
       "Monai.Deploy.Messaging": {
         "type": "Direct",
-        "requested": "[1.0.4, )",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "requested": "[1.0.5-rc0006, )",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json
@@ -247,8 +247,8 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -684,7 +684,7 @@
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Mongo.Migration": "[3.1.4, )",
           "MongoDB.Bson": "[2.21.0, )"
         }

diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json
@@ -258,8 +258,8 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -733,7 +733,7 @@
       "monai.deploy.workflowmanager.common.configuration": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Monai.Deploy.Storage": "[0.2.18, )"
         }
       },
@@ -747,7 +747,7 @@
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Mongo.Migration": "[3.1.4, )",
           "MongoDB.Bson": "[2.21.0, )"
         }

diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json
@@ -368,8 +368,8 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -871,7 +871,7 @@
       "monai.deploy.workflowmanager.common.configuration": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Monai.Deploy.Storage": "[0.2.18, )"
         }
       },
@@ -885,7 +885,7 @@
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Mongo.Migration": "[3.1.4, )",
           "MongoDB.Bson": "[2.21.0, )"
         }

diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj
@@ -58,12 +58,11 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.22" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5-rc0006" />
+    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="1.0.5-rc0006" />
     <PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.18">
       <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>
-    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="1.0.4">
-      <TreatAsUsed>true</TreatAsUsed>
-    </PackageReference>
     <PackageReference Include="Monai.Deploy.Security" Version="0.1.3" />
     <PackageReference Include="NLog" Version="5.2.4">
       <TreatAsUsed>true</TreatAsUsed>
@@ -87,9 +86,7 @@
     </ProjectReference>
     <ProjectReference Include="..\Plug-ins\Argo\Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj" />
     <ProjectReference Include="..\Plug-ins\Docker\Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj" />
-    <ProjectReference Include="..\Plug-ins\Email\Monai.Deploy.WorkflowManager.TaskManager.Email.csproj">
-      <TreatAsUsed>true</TreatAsUsed>
-    </ProjectReference>
+    <ProjectReference Include="..\Plug-ins\Email\Monai.Deploy.WorkflowManager.TaskManager.Email.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/TaskManager/TaskManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json
@@ -94,7 +94,7 @@
         "virtualHost": "monaideploy",
         "exchange": "monaideploy",
         "deadLetterExchange": "deadLetterExchange",
-        "deliveryLimit": "5",
+        "deliveryLimit": "3",
         "requeueDelay": "0"
       },
       "subscriberServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessageSubscriberService, Monai.Deploy.Messaging.RabbitMQ",

diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json
@@ -23,13 +23,25 @@
           "Newtonsoft.Json.Bson": "1.0.2"
         }
       },
+      "Monai.Deploy.Messaging": {
+        "type": "Direct",
+        "requested": "[1.0.5-rc0006, )",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
+        "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.Messaging.RabbitMQ": {
         "type": "Direct",
-        "requested": "[1.0.4, )",
-        "resolved": "1.0.4",
-        "contentHash": "2llZ4XbE91Km2Q+JEKSSeTyhZLWRq3lN5xQ6+Klqow3V8SXBAlOQQ+b5//BEm6x0QdoycFberMOVAsZYYM0j7g==",
+        "requested": "[1.0.5-rc0006, )",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==",
         "dependencies": {
-          "Monai.Deploy.Messaging": "1.0.4",
+          "Monai.Deploy.Messaging": "1.0.5-rc0006",
           "Polly": "7.2.4",
           "RabbitMQ.Client": "6.5.0"
         }
@@ -535,17 +547,6 @@
           "System.Reactive.Linq": "5.0.0"
         }
       },
-      "Monai.Deploy.Messaging": {
-        "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
-        "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",
@@ -1138,7 +1139,7 @@
       "monai.deploy.workflowmanager.common.configuration": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Monai.Deploy.Storage": "[0.2.18, )"
         }
       },
@@ -1160,7 +1161,7 @@
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Mongo.Migration": "[3.1.4, )",
           "MongoDB.Bson": "[2.21.0, )"
         }

diff --git a/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs b/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs
@@ -23,5 +23,7 @@ public static class TaskTypeConstants
         public const string ExportTask = "export";
 
         public const string ExternalAppTask = "remote_app_execution";
+
+        public const string ExportHl7Task = "export_hl7";
     }
 }
diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj
@@ -38,7 +38,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.4" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5-rc0006" />
     <PackageReference Include="Mongo.Migration" Version="3.1.4" />
     <PackageReference Include="MongoDB.Bson" Version="2.21.0" />
   </ItemGroup>

diff --git a/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs b/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs
@@ -22,7 +22,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.WorkflowManager.Common.Database.Options;
-using MongoDB.Bson;
 using MongoDB.Driver;
 using Artifact = Monai.Deploy.Messaging.Common.Artifact;
 
@@ -46,7 +45,7 @@ public static ArtifactReceivedDetails FromArtifact(Artifact artifact) =>
 
     public class ArtifactReceivedItems
     {
-        public string Id { get; set; }
+        public string Id { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or Sets WorkflowInstanceId.

diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json
@@ -269,8 +269,8 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -685,7 +685,7 @@
       "monai.deploy.workflowmanager.contracts": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Mongo.Migration": "[3.1.4, )",
           "MongoDB.Bson": "[2.21.0, )"
         }

diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json
@@ -210,8 +210,8 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
+        "resolved": "1.0.5-rc0006",
+        "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.1.1",
           "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -641,7 +641,7 @@
       "monai.deploy.workflowmanager.contracts": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "[1.0.4, )",
+          "Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
           "Mongo.Migration": "[3.1.4, )",
           "MongoDB.Bson": "[2.21.0, )"
         }