Skip to content

Commit ae9f0e8

Browse files
mocsharpmocsharp
committed
Rebase from develop
Signed-off-by: Victor Chang <[email protected]>
1 parent 1b98b8b commit ae9f0e8

File tree

12 files changed

+2443
-2399
lines changed

12 files changed

+2443
-2399
lines changed

‎src/Database/Interfaces/IWorkflowInstanceRepository.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Collections.Generic;
55
using System.Threading.Tasks;
66
using Monai.Deploy.Messaging.Events;
7+
using Monai.Deploy.WorkflowManager.Contracts.Models;
78

89
namespace Monai.Deploy.WorkflowManager.Database.Interfaces
910
{

‎src/WorkflowManager/Extentions/TaskManagerExtensions.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Microsoft.Extensions.Hosting;
77
using Microsoft.Extensions.Options;
88
using Monai.Deploy.Storage.Configuration;
9-
using Monai.Deploy.Storage.MinioAdmin.Interfaces;
109
using Monai.Deploy.WorkflowManager.TaskManager.Argo;
1110

1211
namespace Monai.Deploy.WorkflowManager.Services
@@ -20,16 +19,6 @@ public static IServiceCollection AddTaskManager(this IServiceCollection services
2019
services.AddSingleton<IArgoProvider, ArgoProvider>();
2120
services.AddSingleton<IKubernetesProvider, KubernetesProvider>();
2221

23-
services.AddSingleton<IMinioAdmin>((implementationFactory) =>
24-
{
25-
var options = implementationFactory.GetService<IOptions<StorageServiceConfiguration>>();
26-
var executable = options.Value.Settings["executableLocation"];
27-
var endpoint = options.Value.Settings["endpoint"];
28-
var secretKey = options.Value.Settings["accessToken"];
29-
var accessKey = options.Value.Settings["accessKey"];
30-
return new Storage.MinioAdmin.Shell(executable, "minioApp", endpoint, accessKey, secretKey);
31-
});
32-
3322
services.AddSingleton<TaskManager.TaskManager>();
3423
services.AddHostedService(p => p.GetRequiredService<TaskManager.TaskManager>());
3524

‎src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44
using Ardalis.GuardClauses;
55
using Microsoft.Extensions.DependencyInjection;
66
using Microsoft.Extensions.Hosting;
7+
using Microsoft.Extensions.Logging;
8+
using Monai.Deploy.Storage.API;
79
using Monai.Deploy.WorkflowManager.Common.Interfaces;
810
using Monai.Deploy.WorkflowManager.Common.Services;
911
using Monai.Deploy.WorkflowManager.PayloadListener.Services;
1012
using Monai.Deploy.WorkflowManager.PayloadListener.Validators;
13+
using Monai.Deploy.WorkflowManager.Storage.Services;
1114
using Monai.Deploy.WorkflowManager.WorkfowExecuter.Common;
1215
using Monai.Deploy.WorkflowManager.WorkfowExecuter.Services;
16+
using Monai.Deploy.WorkloadManager.WorkfowExecuter.Common;
1317

1418
namespace Monai.Deploy.WorkflowManager.Services
1519
{
@@ -21,12 +25,23 @@ public static IServiceCollection AddWorkflowExecutor(this IServiceCollection ser
2125

2226
services.AddTransient<IWorkflowService, WorkflowService>();
2327
services.AddTransient<IWorkflowInstanceService, WorkflowInstanceService>();
28+
services.AddTransient<IPayloadService, PayloadService>();
29+
services.AddTransient<IDicomService, DicomService>();
2430

2531
services.AddSingleton<IEventPayloadReceiverService, EventPayloadReceiverService>();
2632
services.AddTransient<IEventPayloadValidator, EventPayloadValidator>();
2733
services.AddSingleton<IWorkflowExecuterService, WorkflowExecuterService>();
2834
services.AddSingleton<IArtifactMapper, ArtifactMapper>();
2935

36+
services.AddSingleton<IConditionalParameterParser, ConditionalParameterParser>(s =>
37+
{
38+
var logger = s.GetService<ILogger<ConditionalParameterParser>>();
39+
var storage = s.GetService<IStorageService>();
40+
var dicomStore = s.GetService<IDicomService>();
41+
42+
return new ConditionalParameterParser(logger, storage, dicomStore);
43+
});
44+
3045
services.AddSingleton<PayloadListenerService>();
3146
services.AddHostedService(p => p.GetService<PayloadListenerService>());
3247

‎src/WorkflowManager/Services/TaskManagerExtensions.cs‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/WorkflowManager/Services/WorkflowExecutorExtensions.cs‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/WorkflowManager/packages.lock.json‎

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -928,6 +928,15 @@
928928
"System.Runtime.InteropServices": "4.3.0"
929929
}
930930
},
931+
"System.IdentityModel.Tokens.Jwt": {
932+
"type": "Transitive",
933+
"resolved": "6.13.1",
934+
"contentHash": "BTVPnmvqpKxv+ucl3Ii7HnRVvXvfm/P5iq3rnTnJ0YuneZUS7zGtE+DRrVQWSd431ntjZuHBGPbjaB+nCSq9Uw==",
935+
"dependencies": {
936+
"Microsoft.IdentityModel.JsonWebTokens": "6.13.1",
937+
"Microsoft.IdentityModel.Tokens": "6.13.1"
938+
}
939+
},
931940
"System.IO": {
932941
"type": "Transitive",
933942
"resolved": "4.3.0",
@@ -1055,40 +1064,6 @@
10551064
"System.Runtime": "4.3.0"
10561065
}
10571066
},
1058-
"System.Reflection.Primitives": {
1059-
"type": "Transitive",
1060-
"resolved": "4.3.0",
1061-
"contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==",
1062-
"dependencies": {
1063-
"Microsoft.NETCore.Platforms": "1.1.0",
1064-
"Microsoft.NETCore.Targets": "1.1.0",
1065-
"System.Runtime": "4.3.0"
1066-
}
1067-
},
1068-
"System.Resources.ResourceManager": {
1069-
"type": "Transitive",
1070-
"resolved": "4.3.0",
1071-
"contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==",
1072-
"dependencies": {
1073-
"Microsoft.NETCore.Platforms": "1.1.0",
1074-
"Microsoft.NETCore.Targets": "1.1.0",
1075-
"System.Globalization": "4.3.0",
1076-
"System.Reflection": "4.3.0",
1077-
"System.Runtime": "4.3.0"
1078-
}
1079-
},
1080-
"System.Reflection": {
1081-
"type": "Transitive",
1082-
"resolved": "4.3.0",
1083-
"contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==",
1084-
"dependencies": {
1085-
"Microsoft.NETCore.Platforms": "1.1.0",
1086-
"Microsoft.NETCore.Targets": "1.1.0",
1087-
"System.IO": "4.3.0",
1088-
"System.Reflection.Primitives": "4.3.0",
1089-
"System.Runtime": "4.3.0"
1090-
}
1091-
},
10921067
"System.Reflection.Emit": {
10931068
"type": "Transitive",
10941069
"resolved": "4.7.0",
@@ -1206,21 +1181,8 @@
12061181
},
12071182
"System.Security.Cryptography.Cng": {
12081183
"type": "Transitive",
1209-
"resolved": "4.3.0",
1210-
"contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==",
1211-
"dependencies": {
1212-
"Microsoft.NETCore.Platforms": "1.1.0",
1213-
"System.IO": "4.3.0",
1214-
"System.Resources.ResourceManager": "4.3.0",
1215-
"System.Runtime": "4.3.0",
1216-
"System.Runtime.Extensions": "4.3.0",
1217-
"System.Runtime.Handles": "4.3.0",
1218-
"System.Runtime.InteropServices": "4.3.0",
1219-
"System.Security.Cryptography.Algorithms": "4.3.0",
1220-
"System.Security.Cryptography.Encoding": "4.3.0",
1221-
"System.Security.Cryptography.Primitives": "4.3.0",
1222-
"System.Text.Encoding": "4.3.0"
1223-
}
1184+
"resolved": "4.5.0",
1185+
"contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A=="
12241186
},
12251187
"System.Security.Cryptography.Csp": {
12261188
"type": "Transitive",
@@ -1393,6 +1355,11 @@
13931355
"resolved": "4.4.0",
13941356
"contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ=="
13951357
},
1358+
"YamlDotNet": {
1359+
"type": "Transitive",
1360+
"resolved": "11.2.1",
1361+
"contentHash": "tBt8K+korVfrjH9wyDEhiLKxbs8qoLCLIFwvYgkSUuMC9//w3z0cFQ8LQAI/5MCKq+BMil0cfRTRvPeE7eXhQw=="
1362+
},
13961363
"monai.deploy.workflowmanager.common": {
13971364
"type": "Project",
13981365
"dependencies": {
@@ -1475,6 +1442,42 @@
14751442
"Monai.Deploy.WorkflowManager.Logging": "1.0.0"
14761443
}
14771444
},
1445+
"monai.deploy.workflowmanager.taskmanager": {
1446+
"type": "Project",
1447+
"dependencies": {
1448+
"Microsoft.Extensions.Hosting": "6.0.1",
1449+
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
1450+
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
1451+
"Microsoft.Extensions.Options": "6.0.0",
1452+
"Monai.Deploy.Messaging": "0.1.0-rc0047",
1453+
"Monai.Deploy.Storage": "0.1.0-rc0060",
1454+
"Monai.Deploy.Storage.MinIO": "0.1.0-rc0060",
1455+
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
1456+
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
1457+
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
1458+
}
1459+
},
1460+
"monai.deploy.workflowmanager.taskmanager.api": {
1461+
"type": "Project",
1462+
"dependencies": {
1463+
"Monai.Deploy.Messaging": "0.1.0-rc0047",
1464+
"Monai.Deploy.Storage": "0.1.0-rc0060",
1465+
"Monai.Deploy.Storage.MinIO": "0.1.0-rc0060"
1466+
}
1467+
},
1468+
"monai.deploy.workflowmanager.taskmanager.argo": {
1469+
"type": "Project",
1470+
"dependencies": {
1471+
"IdentityModel.OidcClient": "5.0.0",
1472+
"KubernetesClient": "7.2.19",
1473+
"Monai.Deploy.Messaging": "0.1.0-rc0047",
1474+
"Monai.Deploy.Storage": "0.1.0-rc0060",
1475+
"Monai.Deploy.Storage.MinIO": "0.1.0-rc0060",
1476+
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
1477+
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
1478+
"Newtonsoft.Json": "13.0.1"
1479+
}
1480+
},
14781481
"monai.deploy.workloadmanager.workfowexecuter": {
14791482
"type": "Project",
14801483
"dependencies": {

0 commit comments

Comments
 (0)