Billing for render (#2622)

microsoft · Apr 28, 2023 · f8ff8eb · f8ff8eb
1 parent 821af41
commit f8ff8eb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/src/Microsoft.Health.Dicom.Api.UnitTests/Features/Context/DefaultDicomRequestContext.cs b/src/Microsoft.Health.Dicom.Api.UnitTests/Features/Context/DefaultDicomRequestContext.cs
@@ -26,6 +26,8 @@ public class DefaultDicomRequestContext : IDicomRequestContext
 
     public long BytesTranscoded { get; set; }
 
+    public long BytesRendered { get; set; }
+
     public long ResponseSize { get; set; }
 
     public int PartCount { get; set; }

diff --git a/src/Microsoft.Health.Dicom.Core.UnitTests/Features/Retrieve/RetrieveRenderedServiceTests.cs b/src/Microsoft.Health.Dicom.Core.UnitTests/Features/Retrieve/RetrieveRenderedServiceTests.cs
@@ -194,6 +194,8 @@ public async Task GivenStoredInstancesWithFramesJpeg_WhenRetrieveRenderedForFram
         resultStream.Position = 0;
         AssertStreamsEqual(resultStream, response.ResponseStream);
         Assert.Equal("image/jpeg", response.ContentType);
+        Assert.Equal(1, _dicomRequestContextAccessor.RequestContext.PartCount);
+        Assert.Equal(resultStream.Length, _dicomRequestContextAccessor.RequestContext.BytesRendered);
 
         var retrieveRenderedRequest2 = new RetrieveRenderedRequest(_studyInstanceUid, _firstSeriesInstanceUid, _sopInstanceUid, ResourceType.Frames, 2, 75, new[] { AcceptHeaderHelpers.CreateRenderAcceptHeader() });
 
@@ -210,6 +212,8 @@ public async Task GivenStoredInstancesWithFramesJpeg_WhenRetrieveRenderedForFram
         resultStream2.Position = 0;
         AssertStreamsEqual(resultStream2, response2.ResponseStream);
         Assert.Equal("image/jpeg", response.ContentType);
+        Assert.Equal(1, _dicomRequestContextAccessor.RequestContext.PartCount);
+        Assert.Equal(resultStream2.Length, _dicomRequestContextAccessor.RequestContext.BytesRendered);
 
         copyStream.Dispose();
         streamAndStoredFileForFrame2.Dispose();
@@ -256,6 +260,8 @@ public async Task GivenStoredInstancesWithFramesJpeg_WhenRetrieveRenderedForFram
         resultStream.Position = 0;
         AssertStreamsEqual(resultStream, response.ResponseStream);
         Assert.Equal("image/jpeg", response.ContentType);
+        Assert.Equal(1, _dicomRequestContextAccessor.RequestContext.PartCount);
+        Assert.Equal(resultStream.Length, _dicomRequestContextAccessor.RequestContext.BytesRendered);
 
         var retrieveRenderedRequest2 = new RetrieveRenderedRequest(_studyInstanceUid, _firstSeriesInstanceUid, _sopInstanceUid, ResourceType.Frames, 2, 20, new[] { AcceptHeaderHelpers.CreateRenderAcceptHeader() });
 
@@ -273,6 +279,8 @@ public async Task GivenStoredInstancesWithFramesJpeg_WhenRetrieveRenderedForFram
         resultStream2.Position = 0;
         AssertStreamsEqual(resultStream2, response2.ResponseStream);
         Assert.Equal("image/jpeg", response.ContentType);
+        Assert.Equal(1, _dicomRequestContextAccessor.RequestContext.PartCount);
+        Assert.Equal(resultStream2.Length, _dicomRequestContextAccessor.RequestContext.BytesRendered);
 
         copyStream.Dispose();
         streamAndStoredFileForFrame2.Dispose();
@@ -314,6 +322,8 @@ public async Task GivenStoredInstancesWithFramesPNG_WhenRetrieveRenderedForFrame
         resultStream.Position = 0;
         AssertStreamsEqual(resultStream, response.ResponseStream);
         Assert.Equal("image/png", response.ContentType);
+        Assert.Equal(1, _dicomRequestContextAccessor.RequestContext.PartCount);
+        Assert.Equal(resultStream.Length, _dicomRequestContextAccessor.RequestContext.BytesRendered);
 
         var retrieveRenderedRequest2 = new RetrieveRenderedRequest(_studyInstanceUid, _firstSeriesInstanceUid, _sopInstanceUid, ResourceType.Frames, 2, 75, new[] { AcceptHeaderHelpers.CreateRenderAcceptHeader(mediaType: KnownContentTypes.ImagePng) });
 
@@ -330,6 +340,8 @@ public async Task GivenStoredInstancesWithFramesPNG_WhenRetrieveRenderedForFrame
         resultStream2.Position = 0;
         AssertStreamsEqual(resultStream2, response2.ResponseStream);
         Assert.Equal("image/png", response.ContentType);
+        Assert.Equal(1, _dicomRequestContextAccessor.RequestContext.PartCount);
+        Assert.Equal(resultStream2.Length, _dicomRequestContextAccessor.RequestContext.BytesRendered);
 
         copyStream.Dispose();
         streamAndStoredFileForFrame2.Dispose();
@@ -369,6 +381,8 @@ public async Task GivenStoredInstances_WhenRetrieveRenderedWithoutSpecifyingAcce
         resultStream.Position = 0;
         AssertStreamsEqual(resultStream, response.ResponseStream);
         Assert.Equal("image/jpeg", response.ContentType);
+        Assert.Equal(1, _dicomRequestContextAccessor.RequestContext.PartCount);
+        Assert.Equal(resultStream.Length, _dicomRequestContextAccessor.RequestContext.BytesRendered);
 
         response.ResponseStream.Dispose();
         copyStream.Dispose();

diff --git a/src/Microsoft.Health.Dicom.Core/Features/Context/DicomRequestContext.cs b/src/Microsoft.Health.Dicom.Core/Features/Context/DicomRequestContext.cs
@@ -73,6 +73,8 @@ public DicomRequestContext(
 
     public long BytesTranscoded { get; set; }
 
+    public long BytesRendered { get; set; }
+
     public long ResponseSize { get; set; }
 
     public int PartCount { get; set; }

diff --git a/src/Microsoft.Health.Dicom.Core/Features/Context/IDicomRequestContext.cs b/src/Microsoft.Health.Dicom.Core/Features/Context/IDicomRequestContext.cs
@@ -20,6 +20,8 @@ public interface IDicomRequestContext : IRequestContext
 
     long BytesTranscoded { get; set; }
 
+    public long BytesRendered { get; set; }
+
     int PartCount { get; set; }
 
     PartitionEntry DataPartitionEntry { get; set; }

diff --git a/src/Microsoft.Health.Dicom.Core/Features/Retrieve/RetrieveRenderedService.cs b/src/Microsoft.Health.Dicom.Core/Features/Retrieve/RetrieveRenderedService.cs
@@ -75,6 +75,7 @@ public async Task<RetrieveRenderedResponse> RetrieveRenderedImageAsync(RetrieveR
         Stopwatch sw = new Stopwatch();
 
         int partitionKey = _dicomRequestContextAccessor.RequestContext.GetPartitionKey();
+        _dicomRequestContextAccessor.RequestContext.PartCount = 1;
         AcceptHeader returnHeader = GetValidRenderAcceptHeader(request.AcceptHeaders);
 
         try
@@ -96,6 +97,8 @@ public async Task<RetrieveRenderedResponse> RetrieveRenderedImageAsync(RetrieveR
             sw.Stop();
             _logger.LogInformation("Render from dicom to {OutputContentType}, uncompressed file size was {UncompressedFrameSize}, output frame size is {OutputFrameSize} and took {ElapsedMilliseconds} ms", outputContentType, stream.Length, resultStream.Length, sw.ElapsedMilliseconds);
 
+            _dicomRequestContextAccessor.RequestContext.BytesRendered = resultStream.Length;
+
             return new RetrieveRenderedResponse(resultStream, resultStream.Length, outputContentType);
         }