annotate Tests/Toolbox.py @ 341:66a36befb208

extending Toolbox.DoPropFind()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 14 Oct 2020 19:55:26 +0200
parents ec13ace43bde
children bf8369ea3ff1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 #!/usr/bin/python
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
3 # Orthanc - A Lightweight, RESTful DICOM Store
73
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
4 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
5 # Department, University Hospital of Liege, Belgium
260
943166deebcb upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 249
diff changeset
6 # Copyright (C) 2017-2020 Osimis S.A., Belgium
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
7 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
8 # This program is free software: you can redistribute it and/or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
9 # modify it under the terms of the GNU General Public License as
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
10 # published by the Free Software Foundation, either version 3 of the
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
11 # License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
12 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
13 # This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
14 # WITHOUT ANY WARRANTY; without even the implied warranty of
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
16 # General Public License for more details.
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
17 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
18 # You should have received a copy of the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 import hashlib
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 import httplib2
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 import json
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
25 import os
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
26 import re
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
27 import signal
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
28 import subprocess
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
29 import tempfile
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
30 import threading
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
31 import sys
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 import time
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
33 import zipfile
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
35 from xml.dom import minidom
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
36
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
37 from PIL import Image, ImageChops
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
38 import math
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
39 import operator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
40
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
41
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
42 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
43 from urllib.parse import urlencode
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
44 from io import StringIO
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
45 from io import BytesIO
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
46 from urllib.parse import unquote
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
47
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
48 else:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
49 from urllib import urlencode
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
50 from urlparse import unquote
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
51
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
52 # http://stackoverflow.com/a/1313868/881731
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
53 try:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
54 from cStringIO import StringIO
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
55 except:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
56 from StringIO import StringIO
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
57
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
58
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
59 def _DecodeJson(s):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
60 t = s
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
61
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
62 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
63 try:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
64 t = s.decode()
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
65 except:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
66 pass
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
67
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
68 try:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
69 return json.loads(t)
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
70 except:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
71 return t
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
74 def DefineOrthanc(server = 'localhost',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
75 restPort = 8042,
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
76 username = None,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
77 password = None,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
78 aet = 'ORTHANC',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
79 dicomPort = 4242):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
80 #m = re.match(r'(http|https)://([^:]+):([^@]+)@([^@]+)', url)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
81 #if m != None:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
82 # url = m.groups()[0] + '://' + m.groups()[3]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
83 # username = m.groups()[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
84 # password = m.groups()[2]
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
86 #if not url.endswith('/'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
87 # url += '/'
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
89 return {
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
90 'Server' : server,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
91 'Url' : 'http://%s:%d/' % (server, restPort),
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
92 'Username' : username,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
93 'Password' : password,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
94 'DicomAet' : aet,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
95 'DicomPort' : dicomPort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
96 }
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 def _SetupCredentials(orthanc, http):
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
100 if (orthanc['Username'] != None and
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
101 orthanc['Password'] != None):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
102 http.add_credentials(orthanc['Username'], orthanc['Password'])
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103
28
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
104 def DoGetRaw(orthanc, uri, data = {}, body = None, headers = {}):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 d = ''
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 if len(data.keys()) > 0:
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 d = '?' + urlencode(data)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 http = httplib2.Http()
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
110 http.follow_redirects = False
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 _SetupCredentials(orthanc, http)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
113 resp, content = http.request(orthanc['Url'] + uri + d, 'GET', body = body,
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 headers = headers)
28
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
115 return (resp, content)
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
116
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
117
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
118 def DoGet(orthanc, uri, data = {}, body = None, headers = {}):
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
119 (resp, content) = DoGetRaw(orthanc, uri, data = data, body = body, headers = headers)
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
120
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 if not (resp.status in [ 200 ]):
239
8980bd19e31d dicomweb: test_allowed_methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 222
diff changeset
122 raise Exception(resp.status, resp)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 else:
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
124 return _DecodeJson(content)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 def _DoPutOrPost(orthanc, uri, method, data, contentType, headers):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 http = httplib2.Http()
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
128 http.follow_redirects = False
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 _SetupCredentials(orthanc, http)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
131 if isinstance(data, (str, bytearray, bytes)):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 body = data
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 if len(contentType) != 0:
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 headers['content-type'] = contentType
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 else:
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 body = json.dumps(data)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 headers['content-type'] = 'application/json'
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 headers['expect'] = ''
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
141 resp, content = http.request(orthanc['Url'] + uri, method,
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 body = body,
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 headers = headers)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 if not (resp.status in [ 200, 302 ]):
239
8980bd19e31d dicomweb: test_allowed_methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 222
diff changeset
145 raise Exception(resp.status, resp)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 else:
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
147 return _DecodeJson(content)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 def DoDelete(orthanc, uri):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 http = httplib2.Http()
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
151 http.follow_redirects = False
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 _SetupCredentials(orthanc, http)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
154 resp, content = http.request(orthanc['Url'] + uri, 'DELETE')
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 if not (resp.status in [ 200 ]):
239
8980bd19e31d dicomweb: test_allowed_methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 222
diff changeset
156 raise Exception(resp.status, resp)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 else:
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
158 return _DecodeJson(content)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 def DoPut(orthanc, uri, data = {}, contentType = ''):
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 9
diff changeset
161 return _DoPutOrPost(orthanc, uri, 'PUT', data, contentType, {})
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 def DoPost(orthanc, uri, data = {}, contentType = '', headers = {}):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 return _DoPutOrPost(orthanc, uri, 'POST', data, contentType, headers)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
166 def GetDatabasePath(filename):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
167 return os.path.join(os.path.dirname(__file__), '..', 'Database', filename)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
168
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 def UploadInstance(orthanc, filename):
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
170 with open(GetDatabasePath(filename), 'rb') as f:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
171 d = f.read()
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
172
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 return DoPost(orthanc, '/instances', d, 'application/dicom')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 def UploadFolder(orthanc, path):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
176 for i in os.listdir(GetDatabasePath(path)):
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
177 try:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
178 UploadInstance(orthanc, os.path.join(path, i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
179 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
180 pass
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 def DropOrthanc(orthanc):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 # Reset the Lua callbacks
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 DoPost(orthanc, '/tools/execute-script', 'function OnStoredInstance(instanceId, tags, metadata) end', 'application/lua')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 DoDelete(orthanc, '/exports')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 for s in DoGet(orthanc, '/patients'):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 DoDelete(orthanc, '/patients/%s' % s)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
191 def InstallLuaScriptFromPath(orthanc, path):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
192 with open(GetDatabasePath(path), 'r') as f:
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
193 InstallLuaScript(orthanc, f.read())
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
194
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
195 def InstallLuaScript(orthanc, script):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
196 DoPost(orthanc, '/tools/execute-script', script, 'application/lua')
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
197
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
198 def UninstallLuaCallbacks(orthanc):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
199 DoPost(orthanc, '/tools/execute-script', 'function OnStoredInstance() end', 'application/lua')
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
200 InstallLuaScriptFromPath(orthanc, 'Lua/TransferSyntaxEnable.lua')
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
201
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
202
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203 def ComputeMD5(data):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 m = hashlib.md5()
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 m.update(data)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 return m.hexdigest()
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207
249
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
208 def UncompressImage(data):
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
209 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
210 return Image.open(BytesIO(data))
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
211 else:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
212 return Image.open(StringIO(data))
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213
249
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
214 def GetImage(orthanc, uri, headers = {}):
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
215 # http://www.pythonware.com/library/pil/handbook/introduction.htm
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
216 return UncompressImage(DoGet(orthanc, uri, headers = headers))
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
217
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 def GetArchive(orthanc, uri):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 # http://stackoverflow.com/a/1313868/881731
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 s = DoGet(orthanc, uri)
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
221
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
222 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
223 return zipfile.ZipFile(BytesIO(s), "r")
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
224 else:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
225 return zipfile.ZipFile(StringIO(s), "r")
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
227 def PostArchive(orthanc, uri, body):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
228 # http://stackoverflow.com/a/1313868/881731
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
229 s = DoPost(orthanc, uri, body)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
230
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
231 if (sys.version_info >= (3, 0)):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
232 return zipfile.ZipFile(BytesIO(s), "r")
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
233 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
234 return zipfile.ZipFile(StringIO(s), "r")
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
235
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
236 def IsDefinedInLua(orthanc, name):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237 s = DoPost(orthanc, '/tools/execute-script', 'print(type(%s))' % name, 'application/lua')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 return (s.strip() != 'nil')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
240 def WaitEmpty(orthanc):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 while True:
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
242 if len(DoGet(orthanc, '/instances')) == 0:
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243 return
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 time.sleep(0.1)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
246 def WaitJobDone(orthanc, job):
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
247 while True:
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
248 s = DoGet(orthanc, '/jobs/%s' % job) ['State']
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
249
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
250 if s == 'Success':
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
251 return True
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
252 elif s == 'Failure':
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
253 return False
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
254
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
255 time.sleep(0.1)
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
256
138
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
257 def MonitorJob(orthanc, func): # "func" is a lambda
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
258 a = set(DoGet(orthanc, '/jobs'))
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
259 func()
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
260 b = set(DoGet(orthanc, '/jobs'))
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
261
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
262 diff = list(b - a)
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
263 if len(diff) != 1:
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
264 print('No job was created!')
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
265 return False
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
266 else:
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
267 return WaitJobDone(orthanc, diff[0])
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
268
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
269 def MonitorJob2(orthanc, func): # "func" is a lambda
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
270 a = set(DoGet(orthanc, '/jobs'))
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
271 job = func()
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
272 b = set(DoGet(orthanc, '/jobs'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
273
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
274 diff = list(b - a)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
275 if len(diff) != 1:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
276 print('No job was created!')
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
277 return None
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
278 elif (not 'ID' in job or
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
279 diff[0] != job['ID']):
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
280 print('Mismatch in the job ID')
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
281 return None
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
282 elif WaitJobDone(orthanc, diff[0]):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
283 return diff[0]
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
284 else:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
285 print('Error while executing the job')
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
286 return None
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
287
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
288 def WaitAllNewJobsDone(orthanc, func): # "func" is a lambda
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
289 a = set(DoGet(orthanc, '/jobs'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
290 func()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
291
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
292 first = True
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
293
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
294 while True:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
295 b = set(DoGet(orthanc, '/jobs'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
296
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
297 diff = list(b - a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
298 if len(diff) == 0:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
299 if first:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
300 raise Exception('No job was created')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
301 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
302 return # We're done
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
303 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
304 first = False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
305
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
306 if WaitJobDone(orthanc, diff[0]):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
307 a.add(diff[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
308 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
309 raise Exception('Error while executing the job')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
310
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
311
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
312 def GetDockerHostAddress():
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
313 route = subprocess.check_output([ '/sbin/ip', 'route' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
314 m = re.search(r'default via ([0-9.]+)', route)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
315 if m == None:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
316 return 'localhost'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
317 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
318 return m.groups()[0]
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
319
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
320 def FindExecutable(name):
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
321 p = os.path.join('/usr/local/bin', name)
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
322 if os.path.isfile(p):
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
323 return p
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
324
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
325 p = os.path.join('/usr/local/sbin', name)
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
326 if os.path.isfile(p):
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
327 return p
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
328
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
329 return name
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
330
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
331 def IsOrthancVersionAbove(orthanc, major, minor, revision):
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
332 v = DoGet(orthanc, '/system')['Version']
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
333
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
334 if v == 'mainline':
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
335 return True
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
336 else:
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
337 tmp = v.split('.')
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
338 a = int(tmp[0])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
339 b = int(tmp[1])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
340 c = int(tmp[2])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
341 return (a > major or
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
342 (a == major and b > minor) or
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
343 (a == major and b == minor and c >= revision))
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
344
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
345
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
346 class ExternalCommandThread:
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
347 @staticmethod
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
348 def ExternalCommandFunction(arg, stop_event, command, env):
318
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
349 with open(os.devnull, 'w') as devnull:
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
350 external = subprocess.Popen(command, env = env, stderr = devnull)
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
351
318
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
352 while (not stop_event.is_set()):
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
353 error = external.poll()
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
354 if error != None:
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
355 # http://stackoverflow.com/a/1489838/881731
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
356 os._exit(-1)
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
357 stop_event.wait(0.1)
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
358
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
359 print('Stopping the external command')
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
360 external.terminate()
9
3670535fbd4b fix external thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
361 external.communicate() # Wait for the command to stop
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
362
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
363 def __init__(self, command, env = None):
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
364 self.thread_stop = threading.Event()
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
365 self.thread = threading.Thread(target = self.ExternalCommandFunction,
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
366 args = (10, self.thread_stop, command, env))
9
3670535fbd4b fix external thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
367 #self.daemon = True
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
368 self.thread.start()
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
369
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
370 def stop(self):
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
371 self.thread_stop.set()
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
372 self.thread.join()
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
373
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
374
222
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
375 def AssertAlmostEqualRecursive(self, a, b, places = 7, ignoreKeys = []):
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
376 if type(a) is dict:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
377 self.assertTrue(type(b) is dict)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
378 self.assertEqual(a.keys(), b.keys())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
379 for key, value in a.items():
222
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
380 if not key in ignoreKeys:
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
381 AssertAlmostEqualRecursive(self, a[key], b[key], places)
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
382
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
383 elif type(a) is list:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
384 self.assertTrue(type(b) is list)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
385 self.assertEqual(len(a), len(b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
386 for i in range(len(a)):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
387 AssertAlmostEqualRecursive(self, a[i], b[i], places)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
388
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
389 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
390 self.assertAlmostEqual(a, b, places = places)
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
391
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
392
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
393 def GetTransferSyntax(dicom):
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
394 with tempfile.NamedTemporaryFile(delete = True) as f:
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
395 f.write(dicom)
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
396 f.flush()
318
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
397
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
398 with open(os.devnull, 'w') as devnull:
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
399 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ],
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
400 stderr = devnull)
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
401
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
402 return re.search('<data-set xfer="(.*?)"', data).group(1)
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
403
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
404
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
405 def HasGdcmPlugin(orthanc):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
406 plugins = DoGet(orthanc, '/plugins')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
407 return ('gdcm' in plugins)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
408
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
409
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
410 def _GetMaxImageDifference(im1, im2):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
411 h = ImageChops.difference(im1, im2).histogram()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
412
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
413 if len(h) < 256:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
414 raise Exception()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
415
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
416 i = len(h) - 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
417 while h[i] == 0:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
418 i -= 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
419
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
420 return i
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
421
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
422
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
423 def GetMaxImageDifference(im1, im2):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
424 if im1.mode != im2.mode:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
425 raise Exception('Incompatible image modes')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
426
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
427 if im1.mode == 'RGB':
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
428 red1, green1, blue1 = im1.split()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
429 red2, green2, blue2 = im2.split()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
430 return max([ _GetMaxImageDifference(red1, red2),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
431 _GetMaxImageDifference(green1, green2),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
432 _GetMaxImageDifference(blue1, blue2) ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
433 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
434 return _GetMaxImageDifference(im1, im2)
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
435
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
436
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
437 def DoPropFind(orthanc, uri, depth):
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
438 http = httplib2.Http()
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
439 http.follow_redirects = False
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
440 _SetupCredentials(orthanc, http)
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
441
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
442 resp, content = http.request(orthanc['Url'] + uri, 'PROPFIND', headers = { 'Depth' : str(depth) })
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
443
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
444 if not (resp.status in [ 207 ]):
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
445 raise Exception(resp.status, resp)
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
446 else:
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
447 xml = minidom.parseString(content)
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
448
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
449 if (xml.documentElement.nodeName != 'D:multistatus' or
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
450 xml.documentElement.attributes['xmlns:D'].value != 'DAV:'):
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
451 raise Exception()
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
452
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
453 result = {}
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
454
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
455 for i in xml.documentElement.childNodes:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
456 if i.nodeType == minidom.Node.ELEMENT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
457 if i.nodeName != 'D:response':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
458 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
459 href = None
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
460 prop = None
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
461 for j in i.childNodes:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
462 if j.nodeType == minidom.Node.ELEMENT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
463 if j.nodeName == 'D:href':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
464 if href == None:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
465 href = unquote(j.firstChild.nodeValue)
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
466 else:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
467 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
468 elif j.nodeName == 'D:propstat':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
469 for k in j.childNodes:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
470 if k.nodeName == 'D:status':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
471 if k.firstChild.nodeValue != 'HTTP/1.1 200 OK':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
472 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
473 elif k.nodeType == minidom.Node.ELEMENT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
474 if (k.nodeName != 'D:prop' or
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
475 prop != None):
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
476 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
477 prop = k
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
478 else:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
479 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
480 if href == None or prop == None:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
481 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
482 result[href] = prop
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
483 elif i.nodeType != minidom.Node.TEXT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
484 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
485
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
486 return result