Skip to content

Extensions to enable Workflow Executor & Task Executor #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoeBatt1989 merged 3 commits into from
Jul 6, 2022
Merged

Extensions to enable Workflow Executor & Task Executor #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec0cff5
Ability to turn on/off Workflow Executor & Task Manager
mocsharp Jun 14, 2022
1b98b8b
Updated to get the Task Executor to work in our design
JJFinnerty Jun 16, 2022
ae9f0e8
Rebase from develop
mocsharp Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Database/Interfaces/IWorkflowInstanceRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// SPDX-License-Identifier: Apache License 2.0

using System.Collections.Generic;
using Monai.Deploy.WorkflowManager.Contracts.Models;
using System.Threading.Tasks;
using Monai.Deploy.Messaging.Events;
using Monai.Deploy.WorkflowManager.Contracts.Models;

namespace Monai.Deploy.WorkflowManager.Database.Interfaces
{
Expand Down
28 changes: 28 additions & 0 deletions src/WorkflowManager/Extentions/TaskManagerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// SPDX-FileCopyrightText: © 2022 MONAI Consortium
// SPDX-License-Identifier: Apache License 2.0

using Ardalis.GuardClauses;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
using Monai.Deploy.Storage.Configuration;
using Monai.Deploy.WorkflowManager.TaskManager.Argo;

namespace Monai.Deploy.WorkflowManager.Services
{
internal static class TaskManagerExtensions
{
public static IServiceCollection AddTaskManager(this IServiceCollection services, HostBuilderContext hostContext)
{
Guard.Against.Null(hostContext, nameof(hostContext));

services.AddSingleton<IArgoProvider, ArgoProvider>();
services.AddSingleton<IKubernetesProvider, KubernetesProvider>();

services.AddSingleton<TaskManager.TaskManager>();
services.AddHostedService(p => p.GetRequiredService<TaskManager.TaskManager>());

return services;
}
}
}
51 changes: 51 additions & 0 deletions src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// SPDX-FileCopyrightText: © 2022 MONAI Consortium
// SPDX-License-Identifier: Apache License 2.0

using Ardalis.GuardClauses;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Monai.Deploy.Storage.API;
using Monai.Deploy.WorkflowManager.Common.Interfaces;
using Monai.Deploy.WorkflowManager.Common.Services;
using Monai.Deploy.WorkflowManager.PayloadListener.Services;
using Monai.Deploy.WorkflowManager.PayloadListener.Validators;
using Monai.Deploy.WorkflowManager.Storage.Services;
using Monai.Deploy.WorkflowManager.WorkfowExecuter.Common;
using Monai.Deploy.WorkflowManager.WorkfowExecuter.Services;
using Monai.Deploy.WorkloadManager.WorkfowExecuter.Common;

namespace Monai.Deploy.WorkflowManager.Services
{
internal static class WorkflowExecutorExtensions
{
public static IServiceCollection AddWorkflowExecutor(this IServiceCollection services, HostBuilderContext hostContext)
{
Guard.Against.Null(hostContext, nameof(hostContext));

services.AddTransient<IWorkflowService, WorkflowService>();
services.AddTransient<IWorkflowInstanceService, WorkflowInstanceService>();
services.AddTransient<IPayloadService, PayloadService>();
services.AddTransient<IDicomService, DicomService>();

services.AddSingleton<IEventPayloadReceiverService, EventPayloadReceiverService>();
services.AddTransient<IEventPayloadValidator, EventPayloadValidator>();
services.AddSingleton<IWorkflowExecuterService, WorkflowExecuterService>();
services.AddSingleton<IArtifactMapper, ArtifactMapper>();

services.AddSingleton<IConditionalParameterParser, ConditionalParameterParser>(s =>
{
var logger = s.GetService<ILogger<ConditionalParameterParser>>();
var storage = s.GetService<IStorageService>();
var dicomStore = s.GetService<IDicomService>();

return new ConditionalParameterParser(logger, storage, dicomStore);
});

services.AddSingleton<PayloadListenerService>();
services.AddHostedService(p => p.GetService<PayloadListenerService>());

return services;
}
}
}
2 changes: 2 additions & 0 deletions src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ SPDX-License-Identifier: Apache License 2.0
<ProjectReference Include="..\Common\Monai.Deploy.WorkflowManager.Common.csproj" />
<ProjectReference Include="..\PayloadListener\Monai.Deploy.WorkflowManager.PayloadListener.csproj" />
<ProjectReference Include="..\Logging\Monai.Deploy.WorkflowManager.Logging.csproj" />
<ProjectReference Include="..\TaskManager\Monai.Deploy.WorkflowManager.TaskManager.csproj" />
<ProjectReference Include="..\TaskManager\Plug-ins\Argo\Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
33 changes: 11 additions & 22 deletions src/WorkflowManager/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
using Monai.Deploy.WorkflowManager.Database;
using Monai.Deploy.WorkflowManager.Database.Interfaces;
using Monai.Deploy.WorkflowManager.Database.Options;
using Monai.Deploy.WorkflowManager.PayloadListener.Services;
using Monai.Deploy.WorkflowManager.PayloadListener.Validators;
using Monai.Deploy.WorkflowManager.Services;
using Monai.Deploy.WorkflowManager.Services.DataRetentionService;
using Monai.Deploy.WorkflowManager.Services.Http;
using Monai.Deploy.WorkflowManager.Storage.Services;
Expand Down Expand Up @@ -88,11 +87,8 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
services.AddHostedService<DataRetentionService>(p => p.GetService<DataRetentionService>());

// Services
services.AddTransient<IWorkflowService, WorkflowService>();
services.AddTransient<IWorkflowInstanceService, WorkflowInstanceService>();
services.AddTransient<IPayloadService, PayloadService>();
services.AddTransient<IDicomService, DicomService>();
services.AddTransient<IFileSystem, FileSystem>();
services.AddHttpClient();

// Mongo DB
services.Configure<WorkloadManagerDatabaseSettings>(hostContext.Configuration.GetSection("WorkloadManagerDatabase"));
Expand All @@ -108,23 +104,10 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
services.AddMonaiDeployMessageBrokerPublisherService(hostContext.Configuration.GetSection("WorkflowManager:messaging:publisherServiceAssemblyName").Value);
services.AddMonaiDeployMessageBrokerSubscriberService(hostContext.Configuration.GetSection("WorkflowManager:messaging:subscriberServiceAssemblyName").Value);

services.AddSingleton<IConditionalParameterParser, ConditionalParameterParser>(s =>
{
var logger = s.GetService<ILogger<ConditionalParameterParser>>();
var storage = s.GetService<IStorageService>();
var dicomStore = s.GetService<IDicomService>();
services.AddHostedService(p => p.GetService<DataRetentionService>());

return new ConditionalParameterParser(logger, storage, dicomStore);
});

services.AddSingleton<IEventPayloadReceiverService, EventPayloadReceiverService>();
services.AddTransient<IEventPayloadValidator, EventPayloadValidator>();
services.AddSingleton<IWorkflowExecuterService, WorkflowExecuterService>();
services.AddSingleton<IArtifactMapper, ArtifactMapper>();

services.AddSingleton<PayloadListenerService>();

services.AddHostedService<PayloadListenerService>(p => p.GetService<PayloadListenerService>());
services.AddTaskManager(hostContext);
services.AddWorkflowExecutor(hostContext);
})
.ConfigureWebHostDefaults(webBuilder =>
{
Expand All @@ -135,6 +118,12 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
private static void Main(string[] args)
{
var host = CreateHostBuilder(args).Build();

if (args.Length == 0)
{
host.Services.GetService<TaskManager.TaskManager>().StartAsync(System.Threading.CancellationToken.None).RunSynchronously();
}

host.Run();
}

Expand Down
Loading