Skip to content

Commit 076cc86

Browse files
neildsouthneildsouth
authored
Merge pull request #487 from Project-MONAI/AI-230
adding artifactReceieved
2 parents e6a1400 + 2bdc712 commit 076cc86

File tree

68 files changed

+1034
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1034
-306
lines changed

‎doc/dependency_decisions.yml

100644100755
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,17 @@
774774
- :who: neilsouth
775775
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
776776
:versions:
777-
- 1.0.1
778-
:when: 2022-08-16 23:06:21.051573547 Z
777+
- 1.0.3
778+
- 1.0.4
779+
:when: 2023-10-13 18:06:21.511789690 Z
779780
- - :approve
780781
- Monai.Deploy.Messaging.RabbitMQ
781782
- :who: neilsouth
782783
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
783784
:versions:
784-
- 1.0.1
785-
:when: 2022-08-16 23:06:21.511789690 Z
785+
- 1.0.3
786+
- 1.0.4
787+
:when: 2023-10-13 18:06:21.511789690 Z
786788
- - :approve
787789
- Monai.Deploy.Storage
788790
- :who: mocsharp

‎docker-compose/configs/orthanc.json

100644100755
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,21 @@
191191
"STORESCP",
192192
"127.0.0.1",
193193
104
194+
],
195+
"mig-local-1104": [
196+
"STORESCP",
197+
"host.docker.internal",
198+
1104
199+
],
200+
201+
"mig-local-1104StartMWMExtApp": [
202+
"StartMWMExtApp",
203+
"host.docker.internal",
204+
1104
194205
]
206+
207+
208+
195209
/**
196210
* By default, the Orthanc SCP accepts all DICOM commands (C-ECHO,
197211
* C-STORE, C-FIND, C-MOVE) issued by the registered remote SCU
@@ -512,4 +526,4 @@
512526
"StowMaxSize": 10, // For STOW-RS client, the maximum size of the body in one single HTTP query (in MB, 0 = no limit)
513527
"QidoCaseSensitive": true // For QIDO-RS server, whether search is case sensitive (since release 0.5)
514528
}
515-
}
529+
}

‎docker-compose/docker-compose.yml

100644100755
File mode changed.

‎src/Api/ExportRequestDataMessage.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ public string CorrelationId
5858
get { return _exportRequest.CorrelationId; }
5959
}
6060

61+
public string? FilePayloadId
62+
{
63+
get { return _exportRequest.PayloadId; }
64+
}
65+
6166
public string[] Destinations
6267
{
6368
get { return _exportRequest.Destinations; }

‎src/Api/Monai.Deploy.InformaticsGateway.Api.csproj

100644100755
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</PropertyGroup>
3434
<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
3535
<ItemGroup>
36-
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
36+
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
3737
</ItemGroup>
3838
</Target>
3939

@@ -55,7 +55,8 @@
5555
<PackageReference Include="fo-dicom" Version="5.1.1" />
5656
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
5757
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.22" />
58-
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.1" />
58+
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.4" />
59+
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="1.0.4" />
5960
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
6061
</ItemGroup>
6162

‎src/Api/MonaiApplicationEntity.cs

100644100755
File mode changed.

‎src/Api/Storage/Payload.cs

100644100755
Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ public TimeSpan Elapsed
8989
public Payload(string key, string correlationId, string? workflowInstanceId, string? taskId, DataOrigin dataTrigger, uint timeout)
9090
{
9191
Guard.Against.NullOrWhiteSpace(key, nameof(key));
92-
9392
Files = new List<FileStorageMetadata>();
9493
DataOrigins = new HashSet<DataOrigin>();
9594
_lastReceived = new Stopwatch();
@@ -107,6 +106,21 @@ public Payload(string key, string correlationId, string? workflowInstanceId, str
107106
DataTrigger = dataTrigger;
108107
}
109108

109+
public Payload(string key, string correlationId, string? workflowInstanceId, string? taskId, DataOrigin dataTrigger, uint timeout, string? payloadId = null) :
110+
this(key, correlationId, workflowInstanceId, taskId, dataTrigger, timeout)
111+
{
112+
Guard.Against.NullOrWhiteSpace(key, nameof(key));
113+
114+
if (payloadId is null)
115+
{
116+
PayloadId = Guid.NewGuid();
117+
}
118+
else
119+
{
120+
PayloadId = Guid.Parse(payloadId);
121+
}
122+
}
123+
110124
public void Add(FileStorageMetadata value)
111125
{
112126
Guard.Against.Null(value, nameof(value));
@@ -158,4 +172,4 @@ public void Dispose()
158172
GC.SuppressFinalize(this);
159173
}
160174
}
161-
}
175+
}

‎src/Api/Test/packages.lock.json

100644100755
Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,25 @@
249249
},
250250
"Monai.Deploy.Messaging": {
251251
"type": "Transitive",
252-
"resolved": "1.0.1",
253-
"contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==",
252+
"resolved": "1.0.4",
253+
"contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
254254
"dependencies": {
255255
"Ardalis.GuardClauses": "4.1.1",
256256
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
257257
"Newtonsoft.Json": "13.0.3",
258258
"System.IO.Abstractions": "17.2.3"
259259
}
260260
},
261+
"Monai.Deploy.Messaging.RabbitMQ": {
262+
"type": "Transitive",
263+
"resolved": "1.0.4",
264+
"contentHash": "2llZ4XbE91Km2Q+JEKSSeTyhZLWRq3lN5xQ6+Klqow3V8SXBAlOQQ+b5//BEm6x0QdoycFberMOVAsZYYM0j7g==",
265+
"dependencies": {
266+
"Monai.Deploy.Messaging": "1.0.4",
267+
"Polly": "7.2.4",
268+
"RabbitMQ.Client": "6.5.0"
269+
}
270+
},
261271
"Monai.Deploy.Storage": {
262272
"type": "Transitive",
263273
"resolved": "0.2.18",
@@ -339,6 +349,20 @@
339349
"resolved": "6.5.0",
340350
"contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg=="
341351
},
352+
"Polly": {
353+
"type": "Transitive",
354+
"resolved": "7.2.4",
355+
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
356+
},
357+
"RabbitMQ.Client": {
358+
"type": "Transitive",
359+
"resolved": "6.5.0",
360+
"contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==",
361+
"dependencies": {
362+
"System.Memory": "4.5.5",
363+
"System.Threading.Channels": "7.0.0"
364+
}
365+
},
342366
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
343367
"type": "Transitive",
344368
"resolved": "4.3.0",
@@ -684,6 +708,11 @@
684708
"System.Threading": "4.3.0"
685709
}
686710
},
711+
"System.Memory": {
712+
"type": "Transitive",
713+
"resolved": "4.5.5",
714+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
715+
},
687716
"System.Net.Http": {
688717
"type": "Transitive",
689718
"resolved": "4.3.0",
@@ -1126,8 +1155,8 @@
11261155
},
11271156
"System.Threading.Channels": {
11281157
"type": "Transitive",
1129-
"resolved": "6.0.0",
1130-
"contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
1158+
"resolved": "7.0.0",
1159+
"contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA=="
11311160
},
11321161
"System.Threading.Tasks": {
11331162
"type": "Transitive",
@@ -1251,7 +1280,8 @@
12511280
"Macross.Json.Extensions": "[3.0.0, )",
12521281
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )",
12531282
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
1254-
"Monai.Deploy.Messaging": "[1.0.1, )",
1283+
"Monai.Deploy.Messaging": "[1.0.4, )",
1284+
"Monai.Deploy.Messaging.RabbitMQ": "[1.0.4, )",
12551285
"Monai.Deploy.Storage": "[0.2.18, )",
12561286
"fo-dicom": "[5.1.1, )"
12571287
}

‎src/Api/packages.lock.json

100644100755
Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,27 @@
3535
},
3636
"Monai.Deploy.Messaging": {
3737
"type": "Direct",
38-
"requested": "[1.0.1, )",
39-
"resolved": "1.0.1",
40-
"contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==",
38+
"requested": "[1.0.4, )",
39+
"resolved": "1.0.4",
40+
"contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
4141
"dependencies": {
4242
"Ardalis.GuardClauses": "4.1.1",
4343
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
4444
"Newtonsoft.Json": "13.0.3",
4545
"System.IO.Abstractions": "17.2.3"
4646
}
4747
},
48+
"Monai.Deploy.Messaging.RabbitMQ": {
49+
"type": "Direct",
50+
"requested": "[1.0.4, )",
51+
"resolved": "1.0.4",
52+
"contentHash": "2llZ4XbE91Km2Q+JEKSSeTyhZLWRq3lN5xQ6+Klqow3V8SXBAlOQQ+b5//BEm6x0QdoycFberMOVAsZYYM0j7g==",
53+
"dependencies": {
54+
"Monai.Deploy.Messaging": "1.0.4",
55+
"Polly": "7.2.4",
56+
"RabbitMQ.Client": "6.5.0"
57+
}
58+
},
4859
"Monai.Deploy.Storage": {
4960
"type": "Direct",
5061
"requested": "[0.2.18, )",
@@ -194,6 +205,20 @@
194205
"resolved": "13.0.3",
195206
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
196207
},
208+
"Polly": {
209+
"type": "Transitive",
210+
"resolved": "7.2.4",
211+
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
212+
},
213+
"RabbitMQ.Client": {
214+
"type": "Transitive",
215+
"resolved": "6.5.0",
216+
"contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==",
217+
"dependencies": {
218+
"System.Memory": "4.5.5",
219+
"System.Threading.Channels": "7.0.0"
220+
}
221+
},
197222
"System.Buffers": {
198223
"type": "Transitive",
199224
"resolved": "4.5.1",
@@ -212,6 +237,11 @@
212237
"resolved": "17.2.3",
213238
"contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
214239
},
240+
"System.Memory": {
241+
"type": "Transitive",
242+
"resolved": "4.5.5",
243+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
244+
},
215245
"System.Runtime.CompilerServices.Unsafe": {
216246
"type": "Transitive",
217247
"resolved": "6.0.0",
@@ -244,8 +274,8 @@
244274
},
245275
"System.Threading.Channels": {
246276
"type": "Transitive",
247-
"resolved": "6.0.0",
248-
"contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
277+
"resolved": "7.0.0",
278+
"contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA=="
249279
},
250280
"monai.deploy.informaticsgateway.common": {
251281
"type": "Project",

‎src/CLI/Test/packages.lock.json

100644100755
Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -497,15 +497,25 @@
497497
},
498498
"Monai.Deploy.Messaging": {
499499
"type": "Transitive",
500-
"resolved": "1.0.1",
501-
"contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==",
500+
"resolved": "1.0.4",
501+
"contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
502502
"dependencies": {
503503
"Ardalis.GuardClauses": "4.1.1",
504504
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
505505
"Newtonsoft.Json": "13.0.3",
506506
"System.IO.Abstractions": "17.2.3"
507507
}
508508
},
509+
"Monai.Deploy.Messaging.RabbitMQ": {
510+
"type": "Transitive",
511+
"resolved": "1.0.4",
512+
"contentHash": "2llZ4XbE91Km2Q+JEKSSeTyhZLWRq3lN5xQ6+Klqow3V8SXBAlOQQ+b5//BEm6x0QdoycFberMOVAsZYYM0j7g==",
513+
"dependencies": {
514+
"Monai.Deploy.Messaging": "1.0.4",
515+
"Polly": "7.2.4",
516+
"RabbitMQ.Client": "6.5.0"
517+
}
518+
},
509519
"Monai.Deploy.Storage": {
510520
"type": "Transitive",
511521
"resolved": "0.2.18",
@@ -587,6 +597,20 @@
587597
"resolved": "6.5.0",
588598
"contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg=="
589599
},
600+
"Polly": {
601+
"type": "Transitive",
602+
"resolved": "7.2.4",
603+
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
604+
},
605+
"RabbitMQ.Client": {
606+
"type": "Transitive",
607+
"resolved": "6.5.0",
608+
"contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==",
609+
"dependencies": {
610+
"System.Memory": "4.5.5",
611+
"System.Threading.Channels": "7.0.0"
612+
}
613+
},
590614
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
591615
"type": "Transitive",
592616
"resolved": "4.3.0",
@@ -959,6 +983,11 @@
959983
"System.Threading": "4.3.0"
960984
}
961985
},
986+
"System.Memory": {
987+
"type": "Transitive",
988+
"resolved": "4.5.5",
989+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
990+
},
962991
"System.Net.Http": {
963992
"type": "Transitive",
964993
"resolved": "4.3.0",
@@ -1401,8 +1430,8 @@
14011430
},
14021431
"System.Threading.Channels": {
14031432
"type": "Transitive",
1404-
"resolved": "6.0.0",
1405-
"contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
1433+
"resolved": "7.0.0",
1434+
"contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA=="
14061435
},
14071436
"System.Threading.Tasks": {
14081437
"type": "Transitive",
@@ -1521,7 +1550,7 @@
15211550
"Crayon": "[2.0.69, )",
15221551
"Docker.DotNet": "[3.125.15, )",
15231552
"Microsoft.Extensions.Http": "[6.0.0, )",
1524-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1553+
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
15251554
"Monai.Deploy.InformaticsGateway.Client": "[1.0.0, )",
15261555
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
15271556
"System.CommandLine.Hosting": "[0.4.0-alpha.22272.1, )",
@@ -1534,15 +1563,16 @@
15341563
"Macross.Json.Extensions": "[3.0.0, )",
15351564
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )",
15361565
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
1537-
"Monai.Deploy.Messaging": "[1.0.1, )",
1566+
"Monai.Deploy.Messaging": "[1.0.4, )",
1567+
"Monai.Deploy.Messaging.RabbitMQ": "[1.0.4, )",
15381568
"Monai.Deploy.Storage": "[0.2.18, )",
15391569
"fo-dicom": "[5.1.1, )"
15401570
}
15411571
},
15421572
"monai.deploy.informaticsgateway.client": {
15431573
"type": "Project",
15441574
"dependencies": {
1545-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1575+
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
15461576
"Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )"
15471577
}
15481578
},

0 commit comments

Comments
 (0)