Merge pull request #517 from Project-MONAI/AI-627

Ai 627

.github/.gitversion.yml

@@ -16,15 +16,17 @@ assembly-versioning-scheme: MajorMinorPatchTag
 mode: ContinuousDelivery
 branches:
   main:
-    tag: ''
+    label: ''
   release:
-    tag: rc
+    label: rc
   develop:
-    tag: beta
+    label: beta
+    increment: Patch
   feature:
-    tag: alpha.{BranchName}
+    label: alpha.{BranchName}
   pull-request:
-    tag: pr
+    label: pr
+    increment: Patch
 
 ignore:
   sha: []

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
       semVer: ${{ steps.gitversion.outputs.semVer }}
       preReleaseLabel: ${{ steps.gitversion.outputs.preReleaseLabel }}
       majorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}
-      nuGetVersionV2: ${{ steps.gitversion.outputs.nuGetVersionV2 }}
+      nuGetVersionV2: ${{ steps.gitversion.outputs.MajorMinorPatch }}
 
     steps:
       - uses: actions/checkout@v4
@@ -50,12 +50,17 @@ jobs:
         with:
           dotnet-version: "8.0.x"
 
+      # - name: Install GitVersion
+      #   run: dotnet tool install --global GitVersion.Tool
+
       - name: Install GitVersion
-        run: dotnet tool install --global GitVersion.Tool
+        uses: gittools/actions/gitversion/[email protected]
+        with:
+          versionSpec: '6.x'
 
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.10.2
+        uses: gittools/actions/gitversion/execute@v2.0.1
         with:
           useConfigFile: true
           updateAssemblyInfo: true

doc/dependency_decisions.yml

@@ -588,6 +588,7 @@
       - 8.0.2
       - 8.0.3
       - 8.0.6
+      - 8.0.7
     :when: 2022-10-14T23:37:16.793Z
     :who: mocsharp
     :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)

src/Api/Storage/Payload.cs

@@ -86,6 +86,8 @@ public TimeSpan Elapsed
 
         public int FilesFailedToUpload { get => Files.Count(p => p.IsUploadFailed); }
 
+        public Payload() { }
+
         public Payload(string key, string correlationId, string? workflowInstanceId, string? taskId, DataOrigin dataTrigger, uint timeout)
         {
             Guard.Against.NullOrWhiteSpace(key, nameof(key));

src/Api/packages.lock.json

@@ -41,9 +41,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
-        "resolved": "8.0.6",
-        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
+        "requested": "[8.0.7, )",
+        "resolved": "8.0.7",
+        "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
       },
       "Monai.Deploy.Messaging": {
         "type": "Direct",

src/CLI/packages.lock.json

@@ -35,9 +35,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
-        "resolved": "8.0.6",
-        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
+        "requested": "[8.0.7, )",
+        "resolved": "8.0.7",
+        "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
       },
       "System.CommandLine.Hosting": {
         "type": "Direct",

src/Client.Common/packages.lock.json

@@ -10,9 +10,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
-        "resolved": "8.0.6",
-        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
+        "requested": "[8.0.7, )",
+        "resolved": "8.0.7",
+        "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
       }
     }
   }

src/Common/packages.lock.json

@@ -10,9 +10,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
-        "resolved": "8.0.6",
-        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
+        "requested": "[8.0.7, )",
+        "resolved": "8.0.7",
+        "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
       },
       "System.IO.Abstractions": {
         "type": "Direct",

src/Configuration/packages.lock.json

@@ -4,9 +4,9 @@
     "net8.0": {
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
-        "resolved": "8.0.6",
-        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
+        "requested": "[8.0.7, )",
+        "resolved": "8.0.7",
+        "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
       },
       "Ardalis.GuardClauses": {
         "type": "Transitive",

src/DicomWebClient/CLI/packages.lock.json

@@ -14,9 +14,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
-        "resolved": "8.0.6",
-        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
+        "requested": "[8.0.7, )",
+        "resolved": "8.0.7",
+        "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
       },
       "Ardalis.GuardClauses": {
         "type": "Transitive",

src/DicomWebClient/packages.lock.json

@@ -23,9 +23,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
-        "resolved": "8.0.6",
-        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
+        "requested": "[8.0.7, )",
+        "resolved": "8.0.7",
+        "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
       },
       "Ardalis.GuardClauses": {
         "type": "Transitive",

src/InformaticsGateway/Logging/Log.0.General.cs

@@ -59,5 +59,11 @@ public static partial class Log
 
         [LoggerMessage(EventId = 13, Level = LogLevel.Critical, Message = "Failed to start {ServiceName}.")]
         public static partial void ServiceFailedToStart(this ILogger logger, string serviceName, Exception ex);
+
+        [LoggerMessage(EventId = 14, Level = LogLevel.Critical, Message = "All services are unhealthy")]
+        public static partial void AllServiceUnheathly(this ILogger logger);
+
+        [LoggerMessage(EventId = 15, Level = LogLevel.Error, Message = "Some services are unhealthy {list}")]
+        public static partial void SomeServiceUnheathly(this ILogger logger, string list);
     }
 }

src/InformaticsGateway/Program.cs

@@ -36,6 +36,7 @@
 using Monai.Deploy.InformaticsGateway.Services.DicomWeb;
 using Monai.Deploy.InformaticsGateway.Services.Export;
 using Monai.Deploy.InformaticsGateway.Services.Fhir;
+using Monai.Deploy.InformaticsGateway.Services.HealthLevel7;
 using Monai.Deploy.InformaticsGateway.Services.Http;
 using Monai.Deploy.InformaticsGateway.Services.Scp;
 using Monai.Deploy.InformaticsGateway.Services.Scu;
@@ -138,7 +139,6 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddSingleton<IScuQueue, ScuQueue>();
                     services.AddSingleton<IMllpService, MllpService>();
 
-
                     var timeout = TimeSpan.FromSeconds(hostContext.Configuration.GetValue("InformaticsGateway:dicomWeb:clientTimeout", DicomWebConfiguration.DefaultClientTimeout));
                     services
                         .AddHttpClient("dicomweb", configure => configure.Timeout = timeout)
@@ -163,7 +163,7 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddHostedService<ScuExportService>();
                     services.AddHostedService<DicomWebExportService>();
                     services.AddHostedService<PayloadNotificationService>();
-                    services.AddHostedService<MllpService>();
+                    services.AddHostedService<MllpServiceHost>();
                     services.AddHostedService<Hl7ExportService>();
 
                 })

src/InformaticsGateway/Repositories/MonaiServiceLocator.cs

@@ -19,6 +19,8 @@
 using System.Linq;
 using System.Reflection;
 using Ardalis.GuardClauses;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
 using Monai.Deploy.InformaticsGateway.Services.Common;
 
@@ -51,7 +53,13 @@ public Dictionary<string, ServiceStatus> GetServiceStatus()
         {
             Guard.Against.Null(type, nameof(type));
 
-            return (_serviceProvider.GetService(type) as IMonaiService);
+            var TypeInterface = type.GetInterfaces().FirstOrDefault(i => i.Name == $"I{type.Name}");
+            if (TypeInterface is null)
+            {
+                var service = _serviceProvider.GetServices<IHostedService>()?.FirstOrDefault(i => i.GetType().Name == type.Name);
+                return service as IMonaiService;
+            }
+            return (_serviceProvider.GetService(TypeInterface) as IMonaiService);
 
         }
 
@@ -67,7 +75,7 @@ private static List<Type> LocateTypes()
             return services.Distinct().ToList();
         }
 
-        private IList<IMonaiService> LocateServices()
+        private List<IMonaiService> LocateServices()
         {
             var list = new List<IMonaiService>();
             foreach (var t in _types)

src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs

@@ -25,9 +25,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Rest;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Monai.Deploy.InformaticsGateway.Logging;
+using Monai.Deploy.InformaticsGateway.Services.Common;
 using Monai.Deploy.Messaging.Events;
 
 #nullable enable
@@ -38,7 +40,7 @@ namespace Monai.Deploy.InformaticsGateway.Services.Connectors
     /// An in-memory queue for providing any files/DICOM instances received by the Informatics Gateway to
     /// other internal services.
     /// </summary>
-    internal sealed partial class PayloadAssembler : IPayloadAssembler, IDisposable
+    internal sealed partial class PayloadAssembler : IPayloadAssembler, IDisposable, IMonaiService
     {
         internal const int DEFAULT_TIMEOUT = 5;
         private readonly ILogger<PayloadAssembler> _logger;
@@ -56,6 +58,8 @@ public PayloadAssembler(
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _serviceScopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
+            var scope = _serviceScopeFactory.CreateScope();
+            var repository = scope.ServiceProvider.GetRequiredService<IPayloadRepository>(); // done here to ensure connection on startup
 
             _workItems = [];
             _tokenSource = new CancellationTokenSource();
@@ -69,8 +73,14 @@ public PayloadAssembler(
             };
             _timer.Elapsed += OnTimedEvent;
             _timer.Enabled = true;
+
+            Status = ServiceStatus.Running;
         }
 
+        public string ServiceName { get => nameof(PayloadAssembler); }
+
+        public ServiceStatus Status { get; set; } = ServiceStatus.Unknown;
+
         private async Task RemovePendingPayloads()
         {
             _logger.RemovingPendingPayloads();
@@ -193,6 +203,8 @@ private async Task QueueBucketForNotification(string key, Payload payload)
                 payload.State = Payload.PayloadState.Move;
                 var scope = _serviceScopeFactory.CreateScope();
                 var repository = scope.ServiceProvider.GetRequiredService<IPayloadRepository>();
+
+
                 await repository.UpdateAsync(payload).ConfigureAwait(false);
                 _logger.PayloadSaved(payload.PayloadId);
                 _workItems.Add(payload);
@@ -219,9 +231,11 @@ private async Task<Payload> CreateOrGetPayload(string key, string correlationId,
 
         private async Task<Payload> PayloadFactory(string key, string correlationId, string? workflowInstanceId, string? taskId, Messaging.Events.DataOrigin dataOrigin, uint timeout, CancellationToken cancellationToken)
         {
+            var newPayload = new Payload(key, correlationId, workflowInstanceId, taskId, dataOrigin, timeout, null);
             var scope = _serviceScopeFactory.CreateScope();
             var repository = scope.ServiceProvider.GetRequiredService<IPayloadRepository>();
-            var newPayload = new Payload(key, correlationId, workflowInstanceId, taskId, dataOrigin, timeout, null);
+
+
             await repository.AddAsync(newPayload, cancellationToken).ConfigureAwait(false);
             _logger.BucketCreated(key, timeout);
             return newPayload;
@@ -232,6 +246,7 @@ public void Dispose()
             _tokenSource.Cancel();
             _payloads.Clear();
             _timer.Stop();
+            Status = ServiceStatus.Stopped;
         }
     }
 }

src/InformaticsGateway/Services/Export/Hl7ExportService.cs

@@ -28,37 +28,38 @@
 using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Monai.Deploy.InformaticsGateway.Logging;
-using Monai.Deploy.InformaticsGateway.Api.Mllp;
 using Monai.Deploy.Messaging.Common;
 using Polly;
+using Monai.Deploy.InformaticsGateway.Api.Mllp;
 
 namespace Monai.Deploy.InformaticsGateway.Services.Export
 {
     internal class Hl7ExportService : ExportServiceBase
     {
         private readonly ILogger<Hl7ExportService> _logger;
         private readonly InformaticsGatewayConfiguration _configuration;
-        private readonly IMllpService _mllpService;
 
         protected override ushort Concurrency { get; }
         public override string RoutingKey { get; }
         public override string ServiceName => "DICOM Export HL7 Service";
+        private readonly IMllpService _mllpService;
 
 
         public Hl7ExportService(
             ILogger<Hl7ExportService> logger,
             IServiceScopeFactory serviceScopeFactory,
             IOptions<InformaticsGatewayConfiguration> configuration,
-            IDicomToolkit dicomToolkit)
+            IDicomToolkit dicomToolkit,
+            IMllpService mllpService)
             : base(logger, configuration, serviceScopeFactory, dicomToolkit)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _configuration = configuration.Value ?? throw new ArgumentNullException(nameof(configuration));
 
-            _mllpService = serviceScopeFactory.CreateScope().ServiceProvider.GetRequiredService<IMllpService>();
             RoutingKey = $"{configuration.Value.Messaging.Topics.ExportHL7}";
             ExportCompleteTopic = $"{configuration.Value.Messaging.Topics.ExportHl7Complete}";
             Concurrency = _configuration.Dicom.Scu.MaximumNumberOfAssociations;
+            _mllpService = mllpService ?? throw new ArgumentNullException(nameof(mllpService));
         }
 
 
@@ -159,6 +160,5 @@ protected override Task<ExportRequestDataMessage> ExecuteOutputDataEngineCallbac
         {
             return Task.FromResult(exportDataRequest);
         }
-
     }
 }