Skip to content

remove parameter parser #282

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
merged 2 commits into from
Aug 3, 2022
Merged

remove parameter parser #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d39d9
remove parameter parser
jackschofield23 Aug 3, 2022
c03c613
fix code smell
jackschofield23 Aug 3, 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
8 changes: 2 additions & 6 deletions src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
using Monai.Deploy.Messaging.Events;
using Monai.Deploy.WorkflowManager.Common;
using Monai.Deploy.WorkflowManager.Common.Extensions;
using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser;
using Monai.Deploy.WorkflowManager.TaskManager.API;
using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging;
using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues;
Expand All @@ -37,7 +36,6 @@ public sealed class ArgoPlugin : TaskPluginBase, IAsyncDisposable
private readonly IServiceScope _scope;
private readonly IKubernetesProvider _kubernetesProvider;
private readonly IArgoProvider _argoProvider;
private readonly IConditionalParameterParser _conditionalParser;
private readonly ILogger<ArgoPlugin> _logger;
private int? _activeDeadlineSeconds;
private string _namespace;
Expand All @@ -59,7 +57,6 @@ public ArgoPlugin(

_kubernetesProvider = _scope.ServiceProvider.GetRequiredService<IKubernetesProvider>() ?? throw new ServiceNotFoundException(nameof(IKubernetesProvider));
_argoProvider = _scope.ServiceProvider.GetRequiredService<IArgoProvider>() ?? throw new ServiceNotFoundException(nameof(IArgoProvider));
_conditionalParser = _scope.ServiceProvider.GetRequiredService<IConditionalParameterParser>() ?? throw new ServiceNotFoundException(nameof(IConditionalParameterParser));

_logger = logger;
_namespace = Strings.DefaultNamespace;
Expand Down Expand Up @@ -88,7 +85,7 @@ private void Initialize()

if (Event.TaskPluginArguments.ContainsKey(Keys.AllowInsecureseUrl))
{
_allowInsecure = string.Compare("true", Event.TaskPluginArguments[Keys.AllowInsecureseUrl], true) == 0 ? true : false;
_allowInsecure = string.Compare("true", Event.TaskPluginArguments[Keys.AllowInsecureseUrl], true) == 0;
}

_baseUrl = Event.TaskPluginArguments[Keys.BaseUrl];
Expand Down Expand Up @@ -318,8 +315,7 @@ private void ProcessTaskPluginArguments(Workflow workflow)
{
foreach (var item in argoParameters)
{
var value = _conditionalParser.ResolveParameters(item.Value, Event.WorkflowInstanceId);
workflow.Spec.Arguments.Parameters.Add(new Parameter() { Name = item.Key, Value = value });
workflow.Spec.Arguments.Parameters.Add(new Parameter() { Name = item.Key, Value = item.Value });
}
}

Expand Down
1 change: 0 additions & 1 deletion src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

<ItemGroup>
<ProjectReference Include="..\..\..\Common\Monai.Deploy.WorkflowManager.Common.csproj" />
<ProjectReference Include="..\..\..\ConditionsResolver\Monai.Deploy.WorkflowManager.ConditionsResolver.csproj" />
<ProjectReference Include="..\..\API\Monai.Deploy.WorkflowManager.TaskManager.API.csproj" />
</ItemGroup>

Expand Down
12 changes: 0 additions & 12 deletions src/TaskManager/Runner/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
using Monai.Deploy.WorkflowManager.Common;
using Monai.Deploy.WorkflowManager.Common.Interfaces;
using Monai.Deploy.WorkflowManager.Common.Services;
using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser;
using Monai.Deploy.WorkflowManager.Configuration;
using Monai.Deploy.WorkflowManager.Database.Interfaces;
using Monai.Deploy.WorkflowManager.Database.Options;
Expand Down Expand Up @@ -226,17 +225,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
});

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

services.AddSingleton<IConditionalParameterParser, ConditionalParameterParser>(s =>
{
var logger = s.GetRequiredService<ILogger<ConditionalParameterParser>>();
var payloadService = s.GetRequiredService<IPayloadService>();
var workflowService = s.GetRequiredService<IWorkflowService>();
var dicomStore = s.GetRequiredService<IDicomService>();
var workflowInstanceService = s.GetRequiredService<IWorkflowInstanceService>();

return new ConditionalParameterParser(logger, dicomStore, workflowInstanceService, payloadService, workflowService);
});
});
}
}
1 change: 0 additions & 1 deletion src/WorkflowManager/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,6 @@
"Monai.Deploy.Messaging": "0.1.3-rc0010",
"Monai.Deploy.Storage": "0.2.0-rc0014",
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
"Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0",
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
"Newtonsoft.Json": "13.0.1"
}
Expand Down
13 changes: 0 additions & 13 deletions tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
using Monai.Deploy.Messaging.Configuration;
using Monai.Deploy.Messaging.Events;
using Monai.Deploy.WorkflowManager.Common.Interfaces;
using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser;
using Monai.Deploy.WorkflowManager.SharedTest;
using Monai.Deploy.WorkflowManager.Storage.Services;
using Monai.Deploy.WorkflowManager.TaskManager.API;
Expand All @@ -53,7 +52,6 @@ public class ArgoPluginTest
private readonly Mock<IArgoProvider> _argoProvider;
private readonly Mock<IArgoClient> _argoClient;
private readonly Mock<IKubernetes> _kubernetesClient;
private readonly IConditionalParameterParser _conditionalParameterParser;
private readonly IOptions<MessageBrokerServiceConfiguration> _options;

public ArgoPluginTest()
Expand All @@ -70,14 +68,6 @@ public ArgoPluginTest()
var workflowInstanceService = new Mock<IWorkflowInstanceService>();
var workflowService = new Mock<IWorkflowService>();
var payloadService = new Mock<IPayloadService>();
var parserLogger = new Mock<ILogger<ConditionalParameterParser>>();

_conditionalParameterParser = new ConditionalParameterParser(
parserLogger.Object,
dicomService.Object,
workflowInstanceService.Object,
payloadService.Object,
workflowService.Object);

_options = Options.Create(new MessageBrokerServiceConfiguration());
_options.Value.PublisherSettings.Add("username", "username");
Expand All @@ -95,9 +85,6 @@ public ArgoPluginTest()
serviceProvider
.Setup(x => x.GetService(typeof(IArgoProvider)))
.Returns(_argoProvider.Object);
serviceProvider
.Setup(x => x.GetService(typeof(IConditionalParameterParser)))
.Returns(_conditionalParameterParser);

_serviceScope.Setup(x => x.ServiceProvider).Returns(serviceProvider.Object);

Expand Down
1 change: 0 additions & 1 deletion tests/UnitTests/WorkflowManager.Tests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1718,7 +1718,6 @@
"Monai.Deploy.Messaging": "0.1.3-rc0010",
"Monai.Deploy.Storage": "0.2.0-rc0014",
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
"Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0",
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
"Newtonsoft.Json": "13.0.1"
}
Expand Down