64 tasks api (#266)

* TasksApi implementation

Signed-off-by: Lillie Dae <[email protected]>

Author: lillie-dae

.gitignore

@@ -576,3 +576,4 @@ GitExtensions.settings.backup
 *.AssemblyHooks.cs
 *.AssemblyHooks.vb
 /src/WorkflowManager/mc.exe
+*.lutconfig

src/Common/Interfaces/IPayloadService.cs

@@ -19,7 +19,7 @@
 
 namespace Monai.Deploy.WorkflowManager.Common.Interfaces
 {
-    public interface IPayloadService
+    public interface IPayloadService : IPaginatedApi<Payload>
     {
         /// <summary>
         /// Creates a payload and appends patient details.
@@ -41,12 +41,6 @@ Task<IList<Payload>> GetAllAsync(int? skip = null,
                                          string? patientId = "",
                                          string? patientName = "");
 
-        /// <summary>
-        /// Gets Count of objects
-        /// </summary>
-        /// <returns>the count of objects</returns>
-        Task<long> CountAsync();
-
         /// <summary>
         /// Updates a payload
         /// </summary>

src/Common/Interfaces/ITasksService.cs

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021-2022 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.
+ */
+
+using Monai.Deploy.WorkflowManager.Contracts.Models;
+
+namespace Monai.Deploy.WorkflowManager.Common.Interfaces
+{
+    public interface ITasksService : IPaginatedApi<TaskExecution>
+    {
+        Task<TaskExecution?> GetTaskAsync(string workflowInstanceId, string taskId, string executionId);
+    }
+}

src/Common/Services/PayloadService.cs

@@ -25,7 +25,7 @@
 
 namespace Monai.Deploy.WorkflowManager.Common.Services
 {
-    public class PayloadService : IPayloadService, IPaginatedApi<Payload>
+    public class PayloadService : IPayloadService
     {
         private readonly IPayloadRepsitory _payloadRepsitory;
 
@@ -95,6 +95,5 @@ public async Task<IList<Payload>> GetAllAsync(int? skip = null, int? limit = nul
 
         public async Task<bool> UpdateWorkflowInstanceIdsAsync(string payloadId, IEnumerable<string> workflowInstances)
             => await _payloadRepsitory.UpdateAssociatedWorkflowInstancesAsync(payloadId, workflowInstances);
-
     }
 }

src/Common/Services/TasksService.cs

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021-2022 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.
+ */
+
+using Monai.Deploy.WorkflowManager.Common.Interfaces;
+using Monai.Deploy.WorkflowManager.Database.Interfaces;
+using Monai.Deploy.WorkflowManager.Contracts.Models;
+
+namespace Monai.Deploy.WorkflowManager.Common.Services
+{
+    public class TasksService : ITasksService
+    {
+        private readonly ITasksRepository _tasksRepository;
+
+        public TasksService(ITasksRepository workflowInstanceRepository)
+        {
+            _tasksRepository = workflowInstanceRepository ?? throw new ArgumentNullException(nameof(workflowInstanceRepository));
+        }
+
+        /// <summary>
+        /// Not Required For Tasks Service is 
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<long> CountAsync()
+            => await _tasksRepository.CountAsync();
+
+        /// <summary>
+        /// Gets all running  tasks
+        /// </summary>
+        /// <param name="skip"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        public async Task<IList<TaskExecution>> GetAllAsync(int? skip = null, int? limit = null)
+            => await _tasksRepository.GetAllAsync(skip, limit);
+
+        /// <summary>
+        /// Gets task by WorkflowInstanceId, TaskId, ExecutionId.
+        /// </summary>
+        /// <param name="workflowInstanceId">Instance Id.</param>
+        /// <param name="taskId">Task Id.</param>
+        /// <param name="executionId">Execution Id.</param>
+        /// <returns></returns>
+        public async Task<TaskExecution?> GetTaskAsync(string workflowInstanceId, string taskId, string executionId)
+            => await _tasksRepository.GetTaskAsync(workflowInstanceId, taskId, executionId);
+    }
+}

src/Contracts/Models/WorkflowInstanceTasksUnwindResult.cs

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021-2022 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.
+ */
+
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace Monai.Deploy.WorkflowManager.Contracts.Models
+{
+    public class WorkflowInstanceTasksUnwindResult
+    {
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; } = string.Empty;
+
+        [JsonProperty(PropertyName = "ae_title")]
+        public string AeTitle { get; set; } = string.Empty;
+
+        [JsonProperty(PropertyName = "workflow_id")]
+        public string WorkflowId { get; set; } = string.Empty;
+
+        [JsonProperty(PropertyName = "payload_id")]
+        public string PayloadId { get; set; } = string.Empty;
+
+        [JsonProperty(PropertyName = "start_time")]
+        public DateTime StartTime { get; set; }
+
+        [JsonProperty(PropertyName = "status")]
+        public Status Status { get; set; }
+
+        [JsonProperty(PropertyName = "bucket_id")]
+        public string BucketId { get; set; } = string.Empty;
+
+        [JsonProperty(PropertyName = "input_metadata")]
+        public Dictionary<string, string> InputMetaData { get; set; } = new Dictionary<string, string>();
+
+        [JsonProperty(PropertyName = "tasks")]
+        public TaskExecution Tasks { get; set; }
+    }
+}

src/Database/Interfaces/ITasksRepository.cs

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021-2022 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.
+ */
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Monai.Deploy.WorkflowManager.Contracts.Models;
+
+namespace Monai.Deploy.WorkflowManager.Database.Interfaces
+{
+    public interface ITasksRepository
+    {
+        /// <summary>
+        /// Gets all running tasks.
+        /// </summary>
+        /// <param name="skip">skip.</param>
+        /// <param name="limit">limit.</param>
+        /// <returns></returns>
+        Task<IList<TaskExecution>> GetAllAsync(int? skip, int? limit);
+
+        /// <summary>
+        /// Gets count of Tasks.
+        /// </summary>
+        /// <returns></returns>
+        Task<long> CountAsync();
+
+        /// <summary>
+        /// Gets Task Execution given workflowInstanceId, taskId and executionId.
+        /// </summary>
+        /// <param name="workflowInstanceId">workflowInstanceId.</param>
+        /// <param name="taskId">taskId.</param>
+        /// <param name="executionId">executionId<./param>
+        /// <returns></returns>
+        Task<TaskExecution?> GetTaskAsync(string workflowInstanceId, string taskId, string executionId);
+    }
+}

src/Database/Interfaces/IWorkflowInstanceRepository.cs

@@ -40,7 +40,10 @@ public interface IWorkflowInstanceRepository
         /// <param name="workflowInstanceId">A Workflow Instance Id to retrieve.</param>
         Task<WorkflowInstance> GetByWorkflowInstanceIdAsync(string workflowInstanceId);
 
-
+        /// <summary>
+        /// Gets count of Workflow Instances.
+        /// </summary>
+        /// <returns></returns>
         Task<long> CountAsync();
 
         /// <summary>

src/Database/PayloadRepository.cs …tabase/Repositories/PayloadRepository.cssrc/Database/PayloadRepository.cs renamed to src/Database/Repositories/PayloadRepository.cs src/Database/PayloadRepository.cs renamed to src/Database/Repositories/PayloadRepository.cs

@@ -26,7 +26,7 @@
 using Monai.Deploy.WorkflowManager.Logging.Logging;
 using MongoDB.Driver;
 
-namespace Monai.Deploy.WorkflowManager.Database
+namespace Monai.Deploy.WorkflowManager.Database.Repositories
 {
     public class PayloadRepository : RepositoryBase, IPayloadRepsitory
     {
@@ -48,7 +48,7 @@ public PayloadRepository(
             _payloadCollection = mongoDatabase.GetCollection<Payload>(databaseSettings.Value.PayloadCollectionName);
         }
 
-        public Task<long> CountAsync() => base.CountAsync(_payloadCollection, null);
+        public Task<long> CountAsync() => CountAsync(_payloadCollection, null);
 
         public async Task<bool> CreateAsync(Payload payload)
         {
@@ -68,7 +68,7 @@ public async Task<bool> CreateAsync(Payload payload)
             }
         }
 
-        public async Task<IList<Payload>> GetAllAsync(int? skip = null, int? limit = null, string? patientId = "", string? patientName = "")
+        public async Task<IList<Payload>> GetAllAsync(int? skip = null, int? limit = null, string patientId = "", string patientName = "")
         {
             var builder = Builders<Payload>.Filter;
             var filter = builder.Empty;
@@ -81,7 +81,7 @@ public async Task<IList<Payload>> GetAllAsync(int? skip = null, int? limit = nul
                 filter &= builder.Eq(p => p.PatientDetails.PatientName, patientName);
             }
 
-            return await base.GetAllAsync(_payloadCollection,
+            return await GetAllAsync(_payloadCollection,
                                       filter,
                                       Builders<Payload>.Sort.Descending(x => x.Timestamp),
                                       skip,

src/Database/RepositoryBase.cs …/Database/Repositories/RepositoryBase.cssrc/Database/RepositoryBase.cs renamed to src/Database/Repositories/RepositoryBase.cs src/Database/RepositoryBase.cs renamed to src/Database/Repositories/RepositoryBase.cs

@@ -20,11 +20,11 @@
 using System.Threading.Tasks;
 using MongoDB.Driver;
 
-namespace Monai.Deploy.WorkflowManager.Database
+namespace Monai.Deploy.WorkflowManager.Database.Repositories
 {
     public abstract class RepositoryBase
     {
-        public async Task<long> CountAsync<T>(IMongoCollection<T> collection, Expression<Func<T, bool>>? filterFunction)
+        public static async Task<long> CountAsync<T>(IMongoCollection<T> collection, Expression<Func<T, bool>>? filterFunction)
             => await collection.CountDocumentsAsync(filterFunction ?? Builders<T>.Filter.Empty);
 
         /// <summary>
@@ -37,7 +37,7 @@ public async Task<long> CountAsync<T>(IMongoCollection<T> collection, Expression
         /// <param name="skip">Items to skip.</param>
         /// <param name="limit">Items to limit results by.</param>
         /// <returns></returns>
-        public async Task<IList<T>> GetAllAsync<T>(IMongoCollection<T> collection, Expression<Func<T, bool>>? filterFunction, SortDefinition<T> sortFunction, int? skip = null, int? limit = null)
+        public static async Task<IList<T>> GetAllAsync<T>(IMongoCollection<T> collection, Expression<Func<T, bool>> filterFunction, SortDefinition<T> sortFunction, int? skip = null, int? limit = null)
         {
             return await collection
                 .Find(filterFunction ?? Builders<T>.Filter.Empty)
@@ -47,7 +47,7 @@ public async Task<IList<T>> GetAllAsync<T>(IMongoCollection<T> collection, Expre
                 .ToListAsync();
         }
 
-        public async Task<IList<T>> GetAllAsync<T>(IMongoCollection<T> collection, FilterDefinition<T> filterFunction, SortDefinition<T> sortFunction, int? skip = null, int? limit = null)
+        public static async Task<IList<T>> GetAllAsync<T>(IMongoCollection<T> collection, FilterDefinition<T> filterFunction, SortDefinition<T> sortFunction, int? skip = null, int? limit = null)
         {
             return await collection
                 .Find(filterFunction)