Merge branch 'develop' into AC-1810

Author: woodheadio

src/Shared/Shared/ApiControllerBase.cs

@@ -22,7 +22,6 @@
 using Monai.Deploy.WorkflowManager.Shared.Filter;
 using Monai.Deploy.WorkflowManager.Shared.Wrappers;
 using Monai.Deploy.WorkflowManager.Shared.Services;
-using Microsoft.AspNetCore.Routing;
 
 namespace Monai.Deploy.WorkflowManager.ControllersShared
 {
@@ -85,7 +84,7 @@ public PagedResponse<IEnumerable<T>> CreatePagedReponse<T>(IEnumerable<T> pagedD
 
         public StatsPagedResponse<IEnumerable<T>> CreateStatsPagedReponse<T>(IEnumerable<T> pagedData, PaginationFilter validFilter, long totalRecords, IUriService uriService, string route)
         {
-            var response = new StatsPagedResponse<IEnumerable<T>>(pagedData, validFilter.PageNumber, validFilter.PageSize.Value);
+            var response = new StatsPagedResponse<IEnumerable<T>>(pagedData, validFilter.PageNumber, validFilter.PageSize ?? 10);
             response.SetUp(validFilter, totalRecords, uriService, route);
             return response;
         }

src/Shared/Shared/Filter/TimeFilter.cs

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2023 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Monai.Deploy.WorkflowManager.Shared.Filter
+{
+    public class TimeFilter : PaginationFilter
+    {
+        public DateTime StartTime { get; set; }
+
+        public DateTime EndTime { get; set; }
+    }
+}

src/Shared/Shared/MonaiServiceLocator.cs

@@ -41,7 +41,7 @@ public Dictionary<string, ServiceStatus> GetServiceStatus()
             return _runningServices.ToDictionary(k => k.ServiceName, v => v.Status);
         }
 
-        private IMonaiService GetService(Type type)
+        private IMonaiService? GetService(Type type)
         {
             Guard.Against.Null(type, nameof(type));
 
@@ -58,7 +58,7 @@ private static List<Type> LocateTypes()
                                             serviceType.IsAssignableFrom(p) &&
                                             p != serviceType &&
                                             !p.IsAbstract &&
-                                            p.FullName.StartsWith("Monai", StringComparison.InvariantCulture));
+                                            p.FullName is not null && p.FullName.StartsWith("Monai", StringComparison.InvariantCulture));
             return services.Distinct().ToList();
         }
 

src/TaskManager/TaskManager/Filter/TimeFilter.cs renamed to src/Shared/Shared/TimeFilter.cs

@@ -54,12 +54,12 @@ public PagedResponse(T data, int pageNumber, int pageSize)
         /// <summary>
         /// Gets or sets FirstPage.
         /// </summary>
-        public string FirstPage { get; set; }
+        public string? FirstPage { get; set; }
 
         /// <summary>
         /// Gets or sets LastPage.
         /// </summary>
-        public string LastPage { get; set; }
+        public string? LastPage { get; set; }
 
         /// <summary>
         /// Gets or sets TotalPages.
@@ -74,12 +74,12 @@ public PagedResponse(T data, int pageNumber, int pageSize)
         /// <summary>
         /// Gets or sets NextPage.
         /// </summary>
-        public string NextPage { get; set; }
+        public string? NextPage { get; set; }
 
         /// <summary>
         /// Gets or sets previousPage.
         /// </summary>
-        public string PreviousPage { get; set; }
+        public string? PreviousPage { get; set; }
 
         public void SetUp(PaginationFilter validFilter, long totalRecords, IUriService uriService, string route)
         {
@@ -94,7 +94,7 @@ public void SetUp(PaginationFilter validFilter, long totalRecords, IUriService u
             PreviousPage =
                 validFilter.PageNumber - 1 >= 1 && validFilter.PageNumber <= roundedTotalPages
                 ? uriService.GetPageUriString(new PaginationFilter(validFilter.PageNumber - 1, PageSize), route)
-            : null;
+                : null;
 
             FirstPage = uriService.GetPageUriString(new PaginationFilter(1, PageSize), route);
             LastPage = uriService.GetPageUriString(new PaginationFilter(roundedTotalPages, PageSize), route);

src/Shared/Shared/Wrappers/PagedResponse.cs

@@ -54,11 +54,11 @@ public Response(T data)
         /// <summary>
         /// Gets or sets errors.
         /// </summary>
-        public string[] Errors { get; set; }
+        public string?[] Errors { get; set; }
 
         /// <summary>
         /// Gets or sets message.
         /// </summary>
-        public string Message { get; set; }
+        public string? Message { get; set; }
     }
 }

src/Shared/Shared/Wrappers/Response.cs

@@ -29,7 +29,7 @@ public class DocumentVersionConvert : JsonConverter
             var minor = 0;
             var revision = 0;
 
-            var res = (reader.Value as string)?.Split(new char[] { ',' });
+            var res = (reader.Value as string)?.Split(new char[] { ',', '.' });
 
             if (res?.Length == 3)
             {

src/TaskManager/API/Migrations/DocumentVersionConvert.cs

@@ -467,7 +467,7 @@ private void AddLimit(Template2 template, ResourcesKey key)
                 value = bool.TryParse(value, out bool gpuRequired) && gpuRequired ? "1" : "0";
             }
 
-            template.Container.Resources.Limits.Add(key.ArgoKey, value);
+            template.Container.Resources.Limits[key.ArgoKey] = value;
         }
 
         private async Task AddMainWorkflowTemplate(Workflow workflow, CancellationToken cancellationToken)

src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-using Argo;
 using Microsoft.Extensions.Logging;
 
 namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging
@@ -78,7 +77,7 @@ public static partial class Log
         [LoggerMessage(EventId = 1018, Level = LogLevel.Error, Message = "Error deserializing WorkflowTemplateCreateRequest. {message}")]
         public static partial void ErrorDeserializingWorkflowTemplateCreateRequest(this ILogger logger, string message, Exception ex);
 
-        [LoggerMessage(EventId = 1017, Level = LogLevel.Error, Message = "Error deleting Template in Argo.")]
+        [LoggerMessage(EventId = 1019, Level = LogLevel.Error, Message = "Error deleting Template in Argo.")]
         public static partial void ErrorDeletingWorkflowTemplate(this ILogger logger, Exception ex);
 
     }

src/TaskManager/Plug-ins/Argo/Logging/Log.cs

@@ -18,14 +18,10 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues
 {
     public static class ResourcesKeys
     {
-        public static readonly ResourcesKey MemoryReservation = new() { TaskKey = "memory_reservation", ArgoKey = "requests.memory" };
-
-        public static readonly ResourcesKey CpuReservation = new() { TaskKey = "cpu_reservation", ArgoKey = "requests.cpu" };
-
         public static readonly ResourcesKey GpuLimit = new() { TaskKey = "gpu_required", ArgoKey = "nvidia.com/gpu" };
 
-        public static readonly ResourcesKey MemoryLimit = new() { TaskKey = "memory_gb", ArgoKey = "limits.memory" };
+        public static readonly ResourcesKey MemoryLimit = new() { TaskKey = "memory_gb", ArgoKey = "memory" };
 
-        public static readonly ResourcesKey CpuLimit = new() { TaskKey = "cpu", ArgoKey = "limits.cpu" };
+        public static readonly ResourcesKey CpuLimit = new() { TaskKey = "cpu", ArgoKey = "cpu" };
     }
 }