Merge pull request #922 from Project-MONAI/AI-183

Ai 183

src/Common/Configuration/ConfigurationValidator.cs

@@ -58,6 +58,9 @@ public bool IsTopicsValid(MessageBrokerConfigurationKeys configurationKeys)
             valid &= IsStringValueNotNull(nameof(configurationKeys.WorkflowRequest), configurationKeys.WorkflowRequest);
             valid &= IsStringValueNotNull(nameof(configurationKeys.ExportRequestPrefix), configurationKeys.ExportRequestPrefix);
             valid &= IsStringValueNotNull(nameof(configurationKeys.TaskDispatchRequest), configurationKeys.TaskDispatchRequest);
+            valid &= IsStringValueNotNull(nameof(configurationKeys.ExportHL7), configurationKeys.ExportHL7);
+            valid &= IsStringValueNotNull(nameof(configurationKeys.ExportHL7Complete), configurationKeys.ExportHL7Complete);
+
 
             return valid;
         }

src/Common/Configuration/MessageBrokerConfigurationKeys.cs

@@ -34,6 +34,13 @@ public class MessageBrokerConfigurationKeys
         [ConfigurationKeyName("exportComplete")]
         public string ExportComplete { get; set; } = "md.export.complete";
 
+        /// <summary>
+        /// Gets or sets the topic for publishing workflow requests.
+        /// Defaults to `md.export.complete`.
+        /// </summary>
+        [ConfigurationKeyName("exportHL7Complete")]
+        public string ExportHL7Complete { get; set; } = "md.export.hl7complete";
+
         /// <summary>
         /// Gets or sets the topic for publishing workflow requests.
         /// Defaults to `md.export.request`.
@@ -98,5 +105,20 @@ public class MessageBrokerConfigurationKeys
         /// </summary>
         [ConfigurationKeyName("externalAppRequest")]
         public string ExternalAppRequest { get; set; } = "md.externalapp.request";
+
+        /// <summary>
+        /// Gets or sets the topic for publishing workflow requests.
+        /// Defaults to `md.export.request`.
+        /// </summary>
+        [ConfigurationKeyName("exportHl7")]
+        public string ExportHL7 { get; set; } = "md.export.hl7";
+
+
+        /// <summary>
+        /// Gets or sets the topic for publishing export complete requests.
+        /// Defaults to `md_export_complete`.
+        /// </summary>
+        [ConfigurationKeyName("exportHl7Complete")]
+        public string ExportHl7Complete { get; set; } = "md.export.hl7complete";
     }
 }

src/Common/Miscellaneous/ValidationConstants.cs

@@ -118,6 +118,11 @@ public enum NotificationValues
         /// </summary>
         public const string ExternalAppTaskType = "remote_app_execution";
 
+        /// <summary>
+        /// Key for Hl7 export task type.
+        /// </summary>
+        public const string HL7ExportTask = "export_hl7";
+
         /// <summary>
         /// Key for the export task type.
         /// </summary>
@@ -141,7 +146,8 @@ public enum NotificationValues
                 ExportTaskType,
                 DockerTaskType,
                 Email,
-                ExternalAppTaskType
+                ExternalAppTaskType,
+                HL7ExportTask
             };
     }
 }

src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj

@@ -43,4 +43,6 @@
     <PackageReference Include="Mongo.Migration" Version="3.1.4" />
     <PackageReference Include="MongoDB.Bson" Version="2.21.0" />
   </ItemGroup>
+
+
 </Project>

src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj

@@ -78,15 +78,14 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
     <ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
-    <ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
     <ProjectReference Include="..\API\Monai.Deploy.WorkflowManager.TaskManager.API.csproj" />
     <ProjectReference Include="..\Database\Monai.Deploy.WorkflowManager.TaskManager.Database.csproj" />
     <ProjectReference Include="..\Plug-ins\AideClinicalReview\Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj">
       <TreatAsUsed>true</TreatAsUsed>
     </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" />
+    <ProjectReference Include="..\Plug-ins\Email\Monai.Deploy.WorkflowManager.TaskManager.Email.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

src/TaskManager/TaskManager/appsettings.json

@@ -77,6 +77,7 @@
         "aideClinicalReviewCancelation": "aide.clinical_review.cancellation",
         "notificationEmailRequest": "aide.notification_email.request",
         "notificationEmailCancelation": "aide.notification_email.cancellation",
+        "exportHl7": "md.export.hl7"
       },
       "dicomAgents": {
         "dicomWebAgentName": "monaidicomweb",

src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs

@@ -20,10 +20,10 @@ public static class TaskTypeConstants
     {
         public const string RouterTask = "router";
 
-        public const string ExportTask = "export";
+        public const string DicomExportTask = "export";
 
         public const string ExternalAppTask = "remote_app_execution";
 
-        public const string ExportHl7Task = "export_hl7";
+        public const string HL7ExportTask = "export_hl7";
     }
 }

src/WorkflowManager/Logging/Log.200000.Workflow.cs

@@ -108,5 +108,8 @@ public static partial class Log
 
         [LoggerMessage(EventId = 210007, Level = LogLevel.Information, Message = "Exporting to MIG task Id {taskid}, export destination {destination} number of files {fileCount} Mig data plugins {plugins}.")]
         public static partial void LogMigExport(this ILogger logger, string taskid, string destination, int fileCount, string plugins);
+
+        [LoggerMessage(EventId = 200018, Level = LogLevel.Error, Message = "ExportList or Artifacts are empty! workflowInstanceId {workflowInstanceId} TaskId {taskId}")]
+        public static partial void ExportListOrArtifactsAreEmpty(this ILogger logger, string taskId, string workflowInstanceId);
     }
 }

src/WorkflowManager/Logging/Log.700000.Artifact.cs

@@ -51,5 +51,12 @@ public static partial class Log
         [LoggerMessage(EventId = 700009, Level = LogLevel.Debug, Message = "Mandatory output artifacts for task {taskId} are missing. waiting for remaining artifacts... {missingArtifacts}")]
         public static partial void MandatoryOutputArtifactsMissingForTask(this ILogger logger, string taskId, string missingArtifacts);
 
+        [LoggerMessage(EventId = 700010, Level = LogLevel.Debug, Message = "no files exsist in storage {artifactList}")]
+        public static partial void NoFilesExistInStorage(this ILogger logger, string artifactList);
+
+        [LoggerMessage(EventId = 700011, Level = LogLevel.Debug, Message = "adding files to workflowInstance {workflowInstanceId} :Task {taskId} :  {artifactList}")]
+        public static partial void AddingFilesToWorkflowInstance(this ILogger logger, string workflowInstanceId, string taskId, string artifactList);
+
+
     }
 }

src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs

@@ -43,6 +43,7 @@ public class PayloadListenerService : IHostedService, IMonaiService, IDisposable
         public string TaskStatusUpdateRoutingKey { get; set; }
         public string ExportCompleteRoutingKey { get; set; }
         public string ArtifactRecievedRoutingKey { get; set; }
+        public string ExportHL7CompleteRoutingKey { get; set; }
         protected int Concurrency { get; set; }
         public ServiceStatus Status { get; set; } = ServiceStatus.Unknown;
         public string ServiceName => "Payload Listener Service";
@@ -67,6 +68,7 @@ public PayloadListenerService(
             WorkflowRequestRoutingKey = configuration.Value.Messaging.Topics.WorkflowRequest;
             ExportCompleteRoutingKey = configuration.Value.Messaging.Topics.ExportComplete;
             ArtifactRecievedRoutingKey = configuration.Value.Messaging.Topics.ArtifactRecieved;
+            ExportHL7CompleteRoutingKey = configuration.Value.Messaging.Topics.ExportHL7Complete;
 
             Concurrency = 2;
 
@@ -110,6 +112,9 @@ private void SetupPolling()
 
             _messageSubscriber.SubscribeAsync(ArtifactRecievedRoutingKey, ArtifactRecievedRoutingKey, OnArtifactReceivedtReceivedCallbackAsync);
             _logger.EventSubscription(ServiceName, ArtifactRecievedRoutingKey);
+
+            _messageSubscriber.SubscribeAsync(ExportHL7CompleteRoutingKey, ExportHL7CompleteRoutingKey, OnExportHL7CompleteReceivedCallback);
+            _logger.EventSubscription(ServiceName, ExportHL7CompleteRoutingKey);
         }
 
         private async Task OnWorkflowRequestReceivedCallbackAsync(MessageReceivedEventArgs eventArgs)
@@ -156,6 +161,21 @@ private async Task OnExportCompleteReceivedCallback(MessageReceivedEventArgs eve
 
         }
 
+        private async Task OnExportHL7CompleteReceivedCallback(MessageReceivedEventArgs eventArgs)
+        {
+            using var loggerScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary<string, object>
+            {
+                ["correlationId"] = eventArgs.Message.CorrelationId,
+                ["source"] = eventArgs.Message.ApplicationId,
+                ["messageId"] = eventArgs.Message.MessageId,
+                ["messageDescription"] = eventArgs.Message.MessageDescription,
+            });
+
+            _logger.ExportCompleteReceived();
+            await _eventPayloadListenerService.ExportCompletePayload(eventArgs);
+
+        }
+
         private async Task OnArtifactReceivedtReceivedCallbackAsync(MessageReceivedEventArgs eventArgs)
         {
 

src/WorkflowManager/PayloadListener/packages.lock.json

@@ -833,6 +833,7 @@
       "monai.deploy.workloadmanager.workflowexecuter": {
         "type": "Project",
         "dependencies": {
+          "Monai.Deploy.Messaging": "[1.0.5, )",
           "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
           "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )",
           "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )",

src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs

@@ -181,7 +181,7 @@ private async Task<KeyValuePair<string, string>> ConvertVariableStringToPath(Art
                     var artifactName = variableWords[4];
                     var outputArtifact = task.OutputArtifacts?.FirstOrDefault(a => a.Key == artifactName);
 
-                    if (!outputArtifact.HasValue)
+                    if (!outputArtifact.HasValue || string.IsNullOrEmpty(outputArtifact.Value.Value))
                     {
                         return default;
                     }
@@ -203,7 +203,7 @@ private async Task<KeyValuePair<string, string>> VerifyExists(KeyValuePair<strin
             if (shouldExistYet)
             {
                 _logger.VerifyArtifactExistence(bucketId, artifact.Key, artifact.Value);
-                artifact = await _storageService.VerifyObjectExistsAsync(bucketId, artifact.Value) ? artifact : default(KeyValuePair<string, string>);
+                artifact = await _storageService.VerifyObjectExistsAsync(bucketId, artifact.Value) ? artifact : default;
             }
 
             return artifact;

src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj

@@ -37,6 +37,10 @@
 		<AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
 	</ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5" />
+  </ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\..\Common\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
 		<ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
@@ -46,6 +50,7 @@
 		<ProjectReference Include="..\Database\Monai.Deploy.WorkflowManager.Database.csproj" />
 		<ProjectReference Include="..\Logging\Monai.Deploy.WorkflowManager.Logging.csproj" />
 		<ProjectReference Include="..\Storage\Monai.Deploy.WorkflowManager.Storage.csproj" />
+
 	</ItemGroup>
 
 	<PropertyGroup>