Skip to content

Commit 736dc51

Browse files
lillie-daelillie-dae
authored
Fix for ExecutionStats not working in mongo (#250)
* Execution stats not working with objects of objects so parsing it as strings instead. Signed-off-by: Lillie Dae <[email protected]>
1 parent 53760ec commit 736dc51

30 files changed

+205
-192
lines changed

‎src/CLI/packages.lock.json‎

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

‎src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ SPDX-License-Identifier: Apache License 2.0
1616
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
1717
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1818
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.1.0" />
19-
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0008" />
19+
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0010" />
2020
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.1" />
21-
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0008" />
21+
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0010" />
2222
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
2323
</ItemGroup>
2424

‎src/Configuration/packages.lock.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
},
2525
"Monai.Deploy.Messaging": {
2626
"type": "Direct",
27-
"requested": "[0.1.3-rc0008, )",
28-
"resolved": "0.1.3-rc0008",
29-
"contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==",
27+
"requested": "[0.1.3-rc0010, )",
28+
"resolved": "0.1.3-rc0010",
29+
"contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==",
3030
"dependencies": {
3131
"Ardalis.GuardClauses": "4.0.1",
3232
"Microsoft.Extensions.Configuration": "6.0.1",
@@ -39,11 +39,11 @@
3939
},
4040
"Monai.Deploy.Messaging.RabbitMQ": {
4141
"type": "Direct",
42-
"requested": "[0.1.3-rc0008, )",
43-
"resolved": "0.1.3-rc0008",
44-
"contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==",
42+
"requested": "[0.1.3-rc0010, )",
43+
"resolved": "0.1.3-rc0010",
44+
"contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==",
4545
"dependencies": {
46-
"Monai.Deploy.Messaging": "0.1.3-rc0008"
46+
"Monai.Deploy.Messaging": "0.1.3-rc0010"
4747
}
4848
},
4949
"Monai.Deploy.Storage": {

‎src/Contracts/Models/TaskExecution.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class TaskExecution
2020
public DateTime? TaskStartTime { get; set; }
2121

2222
[JsonProperty(PropertyName = "execution_stats")]
23-
public Dictionary<string, object> ExecutionStats { get; set; }
23+
public Dictionary<string, string> ExecutionStats { get; set; }
2424

2525
[JsonProperty(PropertyName = "task_plugin_arguments")]
2626
public Dictionary<string, string> TaskPluginArguments { get; set; }

‎src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ SPDX-License-Identifier: Apache License 2.0
1818
<ItemGroup>
1919
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.167" />
2020
<PackageReference Include="MongoDB.Bson" Version="2.15.0" />
21-
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0008" />
22-
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0008" />
21+
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0010" />
22+
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0010" />
2323
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
2525
</ItemGroup>

‎src/Database/Monai.Deploy.WorkflowManager.Database.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
2222
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
23-
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0008" />
24-
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0008" />
23+
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0010" />
24+
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0010" />
2525
<PackageReference Include="MongoDB.Bson" Version="2.15.0" />
2626
<PackageReference Include="MongoDB.Driver" Version="2.15.0" />
2727
</ItemGroup>

‎src/Database/packages.lock.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
},
3030
"Monai.Deploy.Messaging": {
3131
"type": "Direct",
32-
"requested": "[0.1.3-rc0008, )",
33-
"resolved": "0.1.3-rc0008",
34-
"contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==",
32+
"requested": "[0.1.3-rc0010, )",
33+
"resolved": "0.1.3-rc0010",
34+
"contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==",
3535
"dependencies": {
3636
"Ardalis.GuardClauses": "4.0.1",
3737
"Microsoft.Extensions.Configuration": "6.0.1",
@@ -44,11 +44,11 @@
4444
},
4545
"Monai.Deploy.Messaging.RabbitMQ": {
4646
"type": "Direct",
47-
"requested": "[0.1.3-rc0008, )",
48-
"resolved": "0.1.3-rc0008",
49-
"contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==",
47+
"requested": "[0.1.3-rc0010, )",
48+
"resolved": "0.1.3-rc0010",
49+
"contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==",
5050
"dependencies": {
51-
"Monai.Deploy.Messaging": "0.1.3-rc0008"
51+
"Monai.Deploy.Messaging": "0.1.3-rc0010"
5252
}
5353
},
5454
"MongoDB.Bson": {
@@ -255,8 +255,8 @@
255255
"dependencies": {
256256
"AWSSDK.SecurityToken": "3.7.1.167",
257257
"Microsoft.Extensions.Configuration": "6.0.1",
258-
"Monai.Deploy.Messaging": "0.1.3-rc0008",
259-
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008",
258+
"Monai.Deploy.Messaging": "0.1.3-rc0010",
259+
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010",
260260
"MongoDB.Bson": "2.15.0",
261261
"Newtonsoft.Json": "13.0.1"
262262
}

‎src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@
148148
},
149149
"Monai.Deploy.Messaging": {
150150
"type": "Transitive",
151-
"resolved": "0.1.3-rc0008",
152-
"contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==",
151+
"resolved": "0.1.3-rc0010",
152+
"contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==",
153153
"dependencies": {
154154
"Ardalis.GuardClauses": "4.0.1",
155155
"Microsoft.Extensions.Configuration": "6.0.1",
@@ -162,10 +162,10 @@
162162
},
163163
"Monai.Deploy.Messaging.RabbitMQ": {
164164
"type": "Transitive",
165-
"resolved": "0.1.3-rc0008",
166-
"contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==",
165+
"resolved": "0.1.3-rc0010",
166+
"contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==",
167167
"dependencies": {
168-
"Monai.Deploy.Messaging": "0.1.3-rc0008"
168+
"Monai.Deploy.Messaging": "0.1.3-rc0010"
169169
}
170170
},
171171
"Monai.Deploy.Storage": {
@@ -812,8 +812,8 @@
812812
"dependencies": {
813813
"AWSSDK.SecurityToken": "3.7.1.167",
814814
"Microsoft.Extensions.Configuration": "6.0.1",
815-
"Monai.Deploy.Messaging": "0.1.3-rc0008",
816-
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008",
815+
"Monai.Deploy.Messaging": "0.1.3-rc0010",
816+
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010",
817817
"MongoDB.Bson": "2.15.0",
818818
"Newtonsoft.Json": "13.0.1"
819819
}

‎src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ SPDX-License-Identifier: Apache License 2.0
1919
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
2020
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
2121
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.1.0" />
22-
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0008" />
22+
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0010" />
2323
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.1" />
24-
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0008" />
24+
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0010" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎src/PayloadListener/packages.lock.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
},
2525
"Monai.Deploy.Messaging": {
2626
"type": "Direct",
27-
"requested": "[0.1.3-rc0008, )",
28-
"resolved": "0.1.3-rc0008",
29-
"contentHash": "+Eymlt3+E/h04RxVquFUB0+I4IXeVXMZcdoSBL0w7yNn18bTmQBmd4vazPLplXoJesnpzBU1wULGAPi4fb423g==",
27+
"requested": "[0.1.3-rc0010, )",
28+
"resolved": "0.1.3-rc0010",
29+
"contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==",
3030
"dependencies": {
3131
"Ardalis.GuardClauses": "4.0.1",
3232
"Microsoft.Extensions.Configuration": "6.0.1",
@@ -39,11 +39,11 @@
3939
},
4040
"Monai.Deploy.Messaging.RabbitMQ": {
4141
"type": "Direct",
42-
"requested": "[0.1.3-rc0008, )",
43-
"resolved": "0.1.3-rc0008",
44-
"contentHash": "1eQjHj8gtIRKNmhn6xDyrGEaKnuNm9Lq7Ig5juCKlbhvn2Er0b2DI67keQzFPIbrWkSkfbaE/O+MgXdYEAIH3w==",
42+
"requested": "[0.1.3-rc0010, )",
43+
"resolved": "0.1.3-rc0010",
44+
"contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==",
4545
"dependencies": {
46-
"Monai.Deploy.Messaging": "0.1.3-rc0008"
46+
"Monai.Deploy.Messaging": "0.1.3-rc0010"
4747
}
4848
},
4949
"Monai.Deploy.Storage": {
@@ -922,8 +922,8 @@
922922
"dependencies": {
923923
"Microsoft.Extensions.Configuration": "6.0.1",
924924
"Microsoft.Extensions.Options": "6.0.0",
925-
"Monai.Deploy.Messaging": "0.1.3-rc0008",
926-
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008",
925+
"Monai.Deploy.Messaging": "0.1.3-rc0010",
926+
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010",
927927
"Monai.Deploy.Storage": "0.1.1",
928928
"Monai.Deploy.Storage.MinIO": "0.1.0",
929929
"Newtonsoft.Json": "13.0.1",
@@ -935,8 +935,8 @@
935935
"dependencies": {
936936
"AWSSDK.SecurityToken": "3.7.1.167",
937937
"Microsoft.Extensions.Configuration": "6.0.1",
938-
"Monai.Deploy.Messaging": "0.1.3-rc0008",
939-
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008",
938+
"Monai.Deploy.Messaging": "0.1.3-rc0010",
939+
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010",
940940
"MongoDB.Bson": "2.15.0",
941941
"Newtonsoft.Json": "13.0.1"
942942
}
@@ -947,8 +947,8 @@
947947
"Ardalis.GuardClauses": "4.0.1",
948948
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
949949
"Microsoft.Extensions.Options": "6.0.0",
950-
"Monai.Deploy.Messaging": "0.1.3-rc0008",
951-
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008",
950+
"Monai.Deploy.Messaging": "0.1.3-rc0010",
951+
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010",
952952
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
953953
"Monai.Deploy.WorkflowManager.Logging": "1.0.0",
954954
"MongoDB.Bson": "2.15.0",
@@ -976,8 +976,8 @@
976976
"dependencies": {
977977
"AWSSDK.SecurityToken": "3.7.1.167",
978978
"Ardalis.GuardClauses": "4.0.1",
979-
"Monai.Deploy.Messaging": "0.1.3-rc0008",
980-
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008",
979+
"Monai.Deploy.Messaging": "0.1.3-rc0010",
980+
"Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010",
981981
"Monai.Deploy.Storage": "0.1.1",
982982
"Monai.Deploy.Storage.MinIO": "0.1.0",
983983
"Monai.Deploy.WorkflowManager.Common": "1.0.0",

0 commit comments

Comments
 (0)