Project-MONAI
diff --git a/‎src/Api/Rest/InferenceRequest.cs
+17-16 b/‎src/Api/Rest/InferenceRequest.cs
+17-16
diff --git a/‎src/Api/Test/packages.lock.json
+10-10 b/‎src/Api/Test/packages.lock.json
+10-10
diff --git a/‎src/Api/packages.lock.json
+5-5 b/‎src/Api/packages.lock.json
+5-5
diff --git a/‎src/CLI/Test/packages.lock.json
+28-28 b/‎src/CLI/Test/packages.lock.json
+28-28
diff --git a/‎src/CLI/packages.lock.json
+16-16 b/‎src/CLI/packages.lock.json
+16-16
diff --git a/‎src/Client.Common/Test/packages.lock.json
+2-2 b/‎src/Client.Common/Test/packages.lock.json
+2-2
@@ -168,7 +168,7 @@ public InputConnectionDetails? Application
         {
             get
             {
-                return InputResources.FirstOrDefault(predicate => predicate.Interface == InputInterfaceType.Algorithm)?.ConnectionDetails;
+                return InputResources?.FirstOrDefault(predicate => predicate.Interface == InputInterfaceType.Algorithm)?.ConnectionDetails;
             }
         }
 
@@ -232,13 +232,13 @@ private void ValidateOUtputResources(List<string> errors)
         {
             Guard.Against.Null(errors);
 
-            if (InputMetadata.Inputs.IsNullOrEmpty())
+            if (InputMetadata is not null && InputMetadata.Inputs.IsNullOrEmpty())
             {
                 errors.Add("Request has no `inputMetadata` defined. At least one `inputs` or `inputMetadata` required.");
             }
-            else
+            else if (InputMetadata!.Inputs is not null)
             {
-                foreach (var inputDetails in InputMetadata.Inputs)
+                foreach (var inputDetails in InputMetadata!.Inputs)
                 {
                     CheckInputMetadataDetails(inputDetails, errors);
                 }
@@ -249,7 +249,7 @@ private void ValidateInputMetadata(List<string> errors)
         {
             Guard.Against.Null(errors);
 
-            foreach (var output in OutputResources)
+            foreach (var output in OutputResources ?? Enumerable.Empty<RequestOutputDataResource>())
             {
                 if (output.Interface == InputInterfaceType.DicomWeb)
                 {
@@ -267,12 +267,12 @@ private void ValidateInputResources(List<string> errors)
             Guard.Against.Null(errors);
 
             if (InputResources.IsNullOrEmpty() ||
-                !InputResources.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm))
+                !InputResources!.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm))
             {
                 errors.Add("No 'inputResources' specified.");
             }
 
-            foreach (var input in InputResources)
+            foreach (var input in InputResources ?? Enumerable.Empty<RequestInputDataResource>())
             {
                 if (input.Interface == InputInterfaceType.DicomWeb)
                 {
@@ -326,7 +326,7 @@ private static void CheckInputMetadataWithTypeFhirResource(InferenceRequestDetai
             {
                 errors.Add("Request type is set to `FHIR_RESOURCE` but no FHIR `resources` defined.");
             }
-            else
+            else if (details.Resources is not null)
             {
                 errors.AddRange(details.Resources.Where(resource => string.IsNullOrWhiteSpace(resource.Type)).Select(resource => "A FHIR resource type cannot be empty."));
             }
@@ -341,7 +341,7 @@ private static void CheckInputMetadataWithTypDicomUid(InferenceRequestDetails de
             {
                 errors.Add("Request type is set to `DICOM_UID` but no `studies` defined.");
             }
-            else
+            else if (details.Studies is not null)
             {
                 foreach (var study in details.Studies)
                 {
@@ -358,39 +358,40 @@ private static void CheckInputMetadataWithTypDicomUid(InferenceRequestDetails de
 
         private static void CheckInputMetadataWithTypeDicomSeries(List<string> errors, RequestedStudy study)
         {
-            foreach (var series in study.Series)
+            foreach (var series in study.Series ?? Enumerable.Empty<RequestedSeries>())
             {
                 if (string.IsNullOrWhiteSpace(series.SeriesInstanceUid))
                 {
                     errors.Add("`SeriesInstanceUID` cannot be empty.");
                 }
 
                 if (series.Instances is null) continue;
+
                 errors.AddRange(
                     series.Instances
                         .Where(
                             instance => instance.SopInstanceUid.IsNullOrEmpty() ||
-                            instance.SopInstanceUid.Any(p => string.IsNullOrWhiteSpace(p)))
+                            instance.SopInstanceUid!.Any(p => string.IsNullOrWhiteSpace(p)))
                         .Select(instance => "`SOPInstanceUID` cannot be empty."));
             }
         }
 
-        private static void CheckFhirConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails connection)
+        private static void CheckFhirConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails? connection)
         {
-            if (!Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))
+            if (connection is not null && !Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))
             {
                 errors.Add($"The provided URI '{connection.Uri}' in `{source}` is not well formed.");
             }
         }
 
-        private static void CheckDicomWebConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails connection)
+        private static void CheckDicomWebConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails? connection)
         {
-            if (connection.AuthType != ConnectionAuthType.None && string.IsNullOrWhiteSpace(connection.AuthId))
+            if (connection is not null && connection.AuthType != ConnectionAuthType.None && string.IsNullOrWhiteSpace(connection.AuthId))
             {
                 errors.Add($"One of the '{source}' has authType of '{connection.AuthType:F}' but does not include a valid value for 'authId'");
             }
 
-            if (!Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))
+            if (connection is not null && !Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))
             {
                 errors.Add($"The provided URI '{connection.Uri}' is not well formed.");
             }
 
@@ -1267,22 +1267,22 @@
       "monai.deploy.informaticsgateway.api": {
         "type": "Project",
         "dependencies": {
-          "Macross.Json.Extensions": "[3.0.0, )",
-          "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.12, )",
-          "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
-          "Monai.Deploy.Messaging": "[0.1.19, )",
-          "Monai.Deploy.Storage": "[0.2.13, )"
+          "Macross.Json.Extensions": "3.0.0",
+          "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12",
+          "Monai.Deploy.InformaticsGateway.Common": "1.0.0",
+          "Monai.Deploy.Messaging": "0.1.19",
+          "Monai.Deploy.Storage": "0.2.13"
         }
       },
       "monai.deploy.informaticsgateway.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.IO.Abstractions": "[17.2.3, )",
-          "System.Threading.Tasks.Dataflow": "[6.0.0, )",
-          "fo-dicom": "[5.0.3, )"
+          "Ardalis.GuardClauses": "4.0.1",
+          "System.IO.Abstractions": "17.2.3",
+          "System.Threading.Tasks.Dataflow": "6.0.0",
+          "fo-dicom": "5.0.3"
         }
       }
     }
   }
-}
+}
@@ -279,12 +279,12 @@
       "monai.deploy.informaticsgateway.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.IO.Abstractions": "[17.2.3, )",
-          "System.Threading.Tasks.Dataflow": "[6.0.0, )",
-          "fo-dicom": "[5.0.3, )"
+          "Ardalis.GuardClauses": "4.0.1",
+          "System.IO.Abstractions": "17.2.3",
+          "System.Threading.Tasks.Dataflow": "6.0.0",
+          "fo-dicom": "5.0.3"
         }
       }
     }
   }
-}
+}
@@ -1553,55 +1553,55 @@
       "mig-cli": {
         "type": "Project",
         "dependencies": {
-          "Crayon": "[2.0.69, )",
-          "Docker.DotNet": "[3.125.12, )",
-          "Microsoft.Extensions.Hosting": "[6.0.1, )",
-          "Microsoft.Extensions.Logging": "[6.0.0, )",
-          "Microsoft.Extensions.Logging.Console": "[6.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Client": "[1.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
-          "System.CommandLine": "[2.0.0-beta4.22272.1, )",
-          "System.CommandLine.Hosting": "[0.4.0-alpha.22272.1, )",
-          "System.CommandLine.Rendering": "[0.4.0-alpha.22272.1, )",
-          "System.IO.Abstractions": "[17.2.3, )"
+          "Crayon": "2.0.69",
+          "Docker.DotNet": "3.125.12",
+          "Microsoft.Extensions.Hosting": "6.0.1",
+          "Microsoft.Extensions.Logging": "6.0.0",
+          "Microsoft.Extensions.Logging.Console": "6.0.0",
+          "Monai.Deploy.InformaticsGateway.Api": "1.0.0",
+          "Monai.Deploy.InformaticsGateway.Client": "1.0.0",
+          "Monai.Deploy.InformaticsGateway.Common": "1.0.0",
+          "System.CommandLine": "2.0.0-beta4.22272.1",
+          "System.CommandLine.Hosting": "0.4.0-alpha.22272.1",
+          "System.CommandLine.Rendering": "0.4.0-alpha.22272.1",
+          "System.IO.Abstractions": "17.2.3"
         }
       },
       "monai.deploy.informaticsgateway.api": {
         "type": "Project",
         "dependencies": {
-          "Macross.Json.Extensions": "[3.0.0, )",
-          "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.12, )",
-          "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
-          "Monai.Deploy.Messaging": "[0.1.19, )",
-          "Monai.Deploy.Storage": "[0.2.13, )"
+          "Macross.Json.Extensions": "3.0.0",
+          "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12",
+          "Monai.Deploy.InformaticsGateway.Common": "1.0.0",
+          "Monai.Deploy.Messaging": "0.1.19",
+          "Monai.Deploy.Storage": "0.2.13"
         }
       },
       "monai.deploy.informaticsgateway.client": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.AspNet.WebApi.Client": "[5.2.9, )",
-          "Microsoft.Extensions.Http": "[6.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )"
+          "Microsoft.AspNet.WebApi.Client": "5.2.9",
+          "Microsoft.Extensions.Http": "6.0.0",
+          "Monai.Deploy.InformaticsGateway.Api": "1.0.0",
+          "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0"
         }
       },
       "monai.deploy.informaticsgateway.client.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.Text.Json": "[6.0.7, )"
+          "Ardalis.GuardClauses": "4.0.1",
+          "System.Text.Json": "6.0.7"
         }
       },
       "monai.deploy.informaticsgateway.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.IO.Abstractions": "[17.2.3, )",
-          "System.Threading.Tasks.Dataflow": "[6.0.0, )",
-          "fo-dicom": "[5.0.3, )"
+          "Ardalis.GuardClauses": "4.0.1",
+          "System.IO.Abstractions": "17.2.3",
+          "System.Threading.Tasks.Dataflow": "6.0.0",
+          "fo-dicom": "5.0.3"
         }
       }
     }
   }
-}
+}
@@ -1421,38 +1421,38 @@
       "monai.deploy.informaticsgateway.api": {
         "type": "Project",
         "dependencies": {
-          "Macross.Json.Extensions": "[3.0.0, )",
-          "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.12, )",
-          "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
-          "Monai.Deploy.Messaging": "[0.1.19, )",
-          "Monai.Deploy.Storage": "[0.2.13, )"
+          "Macross.Json.Extensions": "3.0.0",
+          "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12",
+          "Monai.Deploy.InformaticsGateway.Common": "1.0.0",
+          "Monai.Deploy.Messaging": "0.1.19",
+          "Monai.Deploy.Storage": "0.2.13"
         }
       },
       "monai.deploy.informaticsgateway.client": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.AspNet.WebApi.Client": "[5.2.9, )",
-          "Microsoft.Extensions.Http": "[6.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )"
+          "Microsoft.AspNet.WebApi.Client": "5.2.9",
+          "Microsoft.Extensions.Http": "6.0.0",
+          "Monai.Deploy.InformaticsGateway.Api": "1.0.0",
+          "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0"
         }
       },
       "monai.deploy.informaticsgateway.client.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.Text.Json": "[6.0.7, )"
+          "Ardalis.GuardClauses": "4.0.1",
+          "System.Text.Json": "6.0.7"
         }
       },
       "monai.deploy.informaticsgateway.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.IO.Abstractions": "[17.2.3, )",
-          "System.Threading.Tasks.Dataflow": "[6.0.0, )",
-          "fo-dicom": "[5.0.3, )"
+          "Ardalis.GuardClauses": "4.0.1",
+          "System.IO.Abstractions": "17.2.3",
+          "System.Threading.Tasks.Dataflow": "6.0.0",
+          "fo-dicom": "5.0.3"
         }
       }
     }
   }
-}
+}
@@ -1086,8 +1086,8 @@
       "monai.deploy.informaticsgateway.client.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.Text.Json": "[6.0.7, )"
+          "Ardalis.GuardClauses": "4.0.1",
+          "System.Text.Json": "6.0.7"
         }
       }
     }
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public InputConnectionDetails? Application`
`168`	`168`	`{`
`169`	`169`	`get`
`170`	`170`	`{`
`171`		`- return InputResources.FirstOrDefault(predicate => predicate.Interface == InputInterfaceType.Algorithm)?.ConnectionDetails;`
	`171`	`+ return InputResources?.FirstOrDefault(predicate => predicate.Interface == InputInterfaceType.Algorithm)?.ConnectionDetails;`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`@@ -232,13 +232,13 @@ private void ValidateOUtputResources(List<string> errors)`
`232`	`232`	`{`
`233`	`233`	`Guard.Against.Null(errors);`
`234`	`234`
`235`		`- if (InputMetadata.Inputs.IsNullOrEmpty())`
	`235`	`+ if (InputMetadata is not null && InputMetadata.Inputs.IsNullOrEmpty())`
`236`	`236`	`{`
`237`	`237`	errors.Add("Request has no `inputMetadata` defined. At least one `inputs` or `inputMetadata` required.");
`238`	`238`	`}`
`239`		`- else`
	`239`	`+ else if (InputMetadata!.Inputs is not null)`
`240`	`240`	`{`
`241`		`- foreach (var inputDetails in InputMetadata.Inputs)`
	`241`	`+ foreach (var inputDetails in InputMetadata!.Inputs)`
`242`	`242`	`{`
`243`	`243`	`CheckInputMetadataDetails(inputDetails, errors);`
`244`	`244`	`}`
`@@ -249,7 +249,7 @@ private void ValidateInputMetadata(List<string> errors)`
`249`	`249`	`{`
`250`	`250`	`Guard.Against.Null(errors);`
`251`	`251`
`252`		`- foreach (var output in OutputResources)`
	`252`	`+ foreach (var output in OutputResources ?? Enumerable.Empty<RequestOutputDataResource>())`
`253`	`253`	`{`
`254`	`254`	`if (output.Interface == InputInterfaceType.DicomWeb)`
`255`	`255`	`{`
`@@ -267,12 +267,12 @@ private void ValidateInputResources(List<string> errors)`
`267`	`267`	`Guard.Against.Null(errors);`
`268`	`268`
`269`	`269`	`if (InputResources.IsNullOrEmpty() \|\|`
`270`		`- !InputResources.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm))`
	`270`	`+ !InputResources!.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm))`
`271`	`271`	`{`
`272`	`272`	`errors.Add("No 'inputResources' specified.");`
`273`	`273`	`}`
`274`	`274`
`275`		`- foreach (var input in InputResources)`
	`275`	`+ foreach (var input in InputResources ?? Enumerable.Empty<RequestInputDataResource>())`
`276`	`276`	`{`
`277`	`277`	`if (input.Interface == InputInterfaceType.DicomWeb)`
`278`	`278`	`{`
`@@ -326,7 +326,7 @@ private static void CheckInputMetadataWithTypeFhirResource(InferenceRequestDetai`
`326`	`326`	`{`
`327`	`327`	errors.Add("Request type is set to `FHIR_RESOURCE` but no FHIR `resources` defined.");
`328`	`328`	`}`
`329`		`- else`
	`329`	`+ else if (details.Resources is not null)`
`330`	`330`	`{`
`331`	`331`	`errors.AddRange(details.Resources.Where(resource => string.IsNullOrWhiteSpace(resource.Type)).Select(resource => "A FHIR resource type cannot be empty."));`
`332`	`332`	`}`
`@@ -341,7 +341,7 @@ private static void CheckInputMetadataWithTypDicomUid(InferenceRequestDetails de`
`341`	`341`	`{`
`342`	`342`	errors.Add("Request type is set to `DICOM_UID` but no `studies` defined.");
`343`	`343`	`}`
`344`		`- else`
	`344`	`+ else if (details.Studies is not null)`
`345`	`345`	`{`
`346`	`346`	`foreach (var study in details.Studies)`
`347`	`347`	`{`
`@@ -358,39 +358,40 @@ private static void CheckInputMetadataWithTypDicomUid(InferenceRequestDetails de`
`358`	`358`
`359`	`359`	`private static void CheckInputMetadataWithTypeDicomSeries(List<string> errors, RequestedStudy study)`
`360`	`360`	`{`
`361`		`- foreach (var series in study.Series)`
	`361`	`+ foreach (var series in study.Series ?? Enumerable.Empty<RequestedSeries>())`
`362`	`362`	`{`
`363`	`363`	`if (string.IsNullOrWhiteSpace(series.SeriesInstanceUid))`
`364`	`364`	`{`
`365`	`365`	errors.Add("`SeriesInstanceUID` cannot be empty.");
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`if (series.Instances is null) continue;`
	`369`	`+`
`369`	`370`	`errors.AddRange(`
`370`	`371`	`series.Instances`
`371`	`372`	`.Where(`
`372`	`373`	`instance => instance.SopInstanceUid.IsNullOrEmpty() \|\|`
`373`		`- instance.SopInstanceUid.Any(p => string.IsNullOrWhiteSpace(p)))`
	`374`	`+ instance.SopInstanceUid!.Any(p => string.IsNullOrWhiteSpace(p)))`
`374`	`375`	.Select(instance => "`SOPInstanceUID` cannot be empty."));
`375`	`376`	`}`
`376`	`377`	`}`
`377`	`378`
`378`		`- private static void CheckFhirConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails connection)`
	`379`	`+ private static void CheckFhirConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails? connection)`
`379`	`380`	`{`
`380`		`- if (!Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))`
	`381`	`+ if (connection is not null && !Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))`
`381`	`382`	`{`
`382`	`383`	errors.Add($"The provided URI '{connection.Uri}' in `{source}` is not well formed.");
`383`	`384`	`}`
`384`	`385`	`}`
`385`	`386`
`386`		`- private static void CheckDicomWebConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails connection)`
	`387`	`+ private static void CheckDicomWebConnectionDetails(string source, List<string> errors, DicomWebConnectionDetails? connection)`
`387`	`388`	`{`
`388`		`- if (connection.AuthType != ConnectionAuthType.None && string.IsNullOrWhiteSpace(connection.AuthId))`
	`389`	`+ if (connection is not null && connection.AuthType != ConnectionAuthType.None && string.IsNullOrWhiteSpace(connection.AuthId))`
`389`	`390`	`{`
`390`	`391`	`errors.Add($"One of the '{source}' has authType of '{connection.AuthType:F}' but does not include a valid value for 'authId'");`
`391`	`392`	`}`
`392`	`393`
`393`		`- if (!Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))`
	`394`	`+ if (connection is not null && !Uri.IsWellFormedUriString(connection.Uri, UriKind.Absolute))`
`394`	`395`	`{`
`395`	`396`	`errors.Add($"The provided URI '{connection.Uri}' is not well formed.");`
`396`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,12 +279,12 @@`
`279`	`279`	`"monai.deploy.informaticsgateway.common": {`
`280`	`280`	`"type": "Project",`
`281`	`281`	`"dependencies": {`
`282`		`- "Ardalis.GuardClauses": "[4.0.1, )",`
`283`		`- "System.IO.Abstractions": "[17.2.3, )",`
`284`		`- "System.Threading.Tasks.Dataflow": "[6.0.0, )",`
`285`		`- "fo-dicom": "[5.0.3, )"`
	`282`	`+ "Ardalis.GuardClauses": "4.0.1",`
	`283`	`+ "System.IO.Abstractions": "17.2.3",`
	`284`	`+ "System.Threading.Tasks.Dataflow": "6.0.0",`
	`285`	`+ "fo-dicom": "5.0.3"`
`286`	`286`	`}`
`287`	`287`	`}`
`288`	`288`	`}`
`289`	`289`	`}`
`290`		`-}`
	`290`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1086,8 +1086,8 @@`
`1086`	`1086`	`"monai.deploy.informaticsgateway.client.common": {`
`1087`	`1087`	`"type": "Project",`
`1088`	`1088`	`"dependencies": {`
`1089`		`- "Ardalis.GuardClauses": "[4.0.1, )",`
`1090`		`- "System.Text.Json": "[6.0.7, )"`
	`1089`	`+ "Ardalis.GuardClauses": "4.0.1",`
	`1090`	`+ "System.Text.Json": "6.0.7"`
`1091`	`1091`	`}`
`1092`	`1092`	`}`
`1093`	`1093`	`}`