Skip to content

couple of small fixs, including validation on exportTasks->continditions #277

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 2, 2022
Merged

couple of small fixs, including validation on exportTasks->continditions #277

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
5d6ce19
couple of small fixs, including validation on exportTasks->continditions
neildsouth Aug 2, 2022
2a4bd33
merge in develop
neildsouth Aug 2, 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
18 changes: 9 additions & 9 deletions deploy/helm/Gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
replicaCount: 1

image:
repository: 847264867502.dkr.ecr.eu-west-2.amazonaws.com/monai-deploy-informatics-gateway-dev
repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/infomatics-gateway
pullPolicy: IfNotPresent
tag: latest
tag: 2022-08-01

enviromentVariables:
InformaticsGateway__messaging__publisherSettings__endpoint: "rabbitmq-monai"
InformaticsGateway__messaging__publisherSettings__username: "admin"
InformaticsGateway__messaging__publisherSettings__password: "admin"
InformaticsGateway__messaging__publisherSettings__username: "monaideploy"
InformaticsGateway__messaging__publisherSettings__password: "monaideploy"
InformaticsGateway__messaging__subscriberSettings__endpoint: "rabbitmq-monai"
InformaticsGateway__messaging__subscriberSettings__username: "admin"
InformaticsGateway__messaging__subscriberSettings__password: "admin"
InformaticsGateway__storage__settings__endpoint: "minio:9000"
InformaticsGateway__storage__settings__accessKey: "minioadmin"
InformaticsGateway__storage__settings__accessToken: "minioadmin"
InformaticsGateway__messaging__subscriberSettings__username: "monaideploy"
InformaticsGateway__messaging__subscriberSettings__password: "monaideploy"
InformaticsGateway__storage__settings__endpoint: "minio.monai:9000"
InformaticsGateway__storage__settings__accessKey: "rootminio"
InformaticsGateway__storage__settings__accessToken: "rootminio"

service:
type: ClusterIP
Expand Down
4 changes: 3 additions & 1 deletion src/Contracts/Models/TaskDestination.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ namespace Monai.Deploy.WorkflowManager.Contracts.Models
public class TaskDestination
{
[JsonProperty(PropertyName = "name")]
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
public string Name { get; set; }
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.

[JsonProperty(PropertyName = "conditions")]
public string Conditions { get; set; }
public string Conditions { get; set; } = "";
}
}
11 changes: 8 additions & 3 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 @@ -215,10 +215,15 @@ private Dictionary<string, string> GetExecutuionStats(Workflow workflow)
{
Guard.Against.Null(workflow);

TimeSpan? duration = null;
if (workflow.Status?.StartedAt is not null && workflow.Status?.FinishedAt is not null)
{
duration = workflow.Status?.FinishedAt - workflow.Status?.StartedAt;
}
var stats = new Dictionary<string, string>
{
{ "workflowId", Event.WorkflowInstanceId },
{ "duration", workflow.Status?.EstimatedDuration.ToString() ?? string.Empty },
{ "duration", duration.HasValue ? duration.Value.TotalMilliseconds.ToString() : string.Empty },
{ "startedAt", workflow.Status?.StartedAt.ToString() ?? string.Empty },
{ "finishedAt", workflow.Status?.FinishedAt.ToString() ?? string.Empty }
};
Expand Down Expand Up @@ -501,13 +506,13 @@ private async Task ConfigureInputArtifactStoreForTemplates(ICollection<Template2
{
if (template.Dag is not null)
{
await ConfigureInputArtifactStore(template.Name, templates, template.Dag.Tasks.Where(p => p.Arguments is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
await ConfigureInputArtifactStore(template.Name, templates, template.Dag.Tasks.Where(p => p.Arguments is not null && p.Arguments.Artifacts is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
}
else if (template.Steps is not null)
{
foreach (var step in template.Steps)
{
await ConfigureInputArtifactStore(template.Name, templates, step.Where(p => p.Arguments is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
await ConfigureInputArtifactStore(template.Name, templates, step.Where(p => p.Arguments is not null && p.Arguments.Artifacts is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
}
}
else if (template.Inputs is not null)
Expand Down