Mercurial > hg > orthanc-book
annotate Sphinx/source/users/advanced-rest.rst @ 806:71492ec8af49
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 24 Jan 2022 14:01:39 +0100 |
| parents | 80b9ceeb4045 |
| children | 1c3972c03c2a |
| rev | line source |
|---|---|
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 .. _rest-advanced: |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 Advanced features of the REST API |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 ================================= |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 .. contents:: |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 :depth: 3 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 This section of the Orthanc Book is a complement to the description of |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 the :ref:`REST API of Orthanc <rest>`. It explains some advanced uses |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 of the API. |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 .. _jobs: |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 Jobs |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 ---- |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 Since Orthanc 1.4.0, a jobs engine is embedded within Orthanc. Jobs |
| 227 | 20 are high-level tasks to be processed by Orthanc. Jobs are first added |
| 21 to a queue of pending tasks, and Orthanc will simultaneously execute a | |
| 22 fixed number of jobs (check out :ref:`configuration option | |
| 23 <configuration>` ``ConcurrentJobs``). Once the jobs have been | |
| 24 processed, they are tagged as successful or failed, and kept in a | |
| 25 history (the size of this history is controlled by the | |
| 26 ``JobsHistorySize`` option). | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 |
| 227 | 28 By default, Orthanc saves the jobs into its database (check out the |
| 798 | 29 ``SaveJobs`` option). Jobs are saved every 10 seconds and when |
| 30 Orthanc stops. If Orthanc is stopped then relaunched, the jobs | |
| 227 | 31 whose processing was not finished are automatically put into the queue |
| 798 | 32 of pending tasks or resumed if they were being processed when Orthanc |
| 33 stopped. The command-line option ``--no-jobs`` can also be used to | |
| 34 prevent the loading of jobs from the database upon the launch of | |
| 35 Orthanc. | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 |
| 227 | 37 Note that the queue of pending jobs has a maximum size (check out the |
| 38 ``LimitJobs`` option). When this limit is reached, the addition of new | |
| 39 jobs is blocked until some job finishes. | |
| 40 | |
| 41 | |
| 42 | |
|
672
8bda16db46cf
SynchronousCMove: Synchronous vs. asynchronous C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
671
diff
changeset
|
43 .. _jobs-synchronicity: |
|
8bda16db46cf
SynchronousCMove: Synchronous vs. asynchronous C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
671
diff
changeset
|
44 |
| 227 | 45 Synchronous vs. asynchronous calls |
| 46 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
| 47 | |
| 48 Some calls to the REST API of Orthanc need time to be executed, and | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 thus result in adding a job to the processing queue. This notably |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 includes the following URIs: |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
51 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
52 * :ref:`Modifying and anonymizing <anonymization>` DICOM instances. |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
53 * Creating ZIP or media archives. |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
54 * C-Move SCU (``/queries/.../retrieve``). |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
55 * C-Store SCU (``/modalities/.../store``). |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
56 * Sending to an Orthanc peer (``/peers/.../store``). |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
57 * :ref:`Split/merge <split-merge>`. |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
58 * Sending images using the :ref:`transfers accelerator <transfers>` plugin. |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
59 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
60 Such REST API calls can be configured to be executed in a synchronous |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
61 or an asynchronous mode: |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
62 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
63 * **Synchronous calls** wait for the end of the execution of their |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
64 associated job. This is in general the default behavior. |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 * **Asynchronous calls** end immediately and return a handle to their |
| 227 | 66 associated job. It is up to the caller to monitor the execution by |
| 67 calling the jobs API (e.g. to know whether the job has finished its | |
| 68 execution). | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
69 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
70 The choice between synchronous and asynchronous modes is done by |
| 227 | 71 setting the ``Synchronous`` field (or indifferently the |
| 72 ``Asynchronous`` field) in the POST body of the call to the REST | |
| 73 API. Note that the :ref:`transfers accelerator <transfers>` only runs | |
| 74 in asynchronous mode. | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
75 |
| 227 | 76 An integer number (possibly negative) can be specified in the |
| 77 ``Priority`` field of the POST body. Jobs with higher priority will be | |
| 78 executed first. By default, the priority is set to zero. | |
| 79 | |
| 80 Despite being more complex to handle, the asynchronous mode is highly | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
81 recommended for jobs whose execution time can last over a dozen of |
|
693
650100457193
SynchronousZipStream
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
82 seconds (typically, the creation of an archive if |
|
650100457193
SynchronousZipStream
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
83 ``SynchronousZipStream`` :ref:`configuration option <configuration>` |
|
650100457193
SynchronousZipStream
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
84 is set to ``false``, or a network transfer). Indeed, synchronous |
|
650100457193
SynchronousZipStream
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
85 calls can be affected by timeouts in the HTTP protocol if they last |
|
650100457193
SynchronousZipStream
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
86 too long. |
| 227 | 87 |
| 88 | |
|
260
f9e7036d81d0
updating DICOMweb documentation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
253
diff
changeset
|
89 .. _jobs-monitoring: |
|
f9e7036d81d0
updating DICOMweb documentation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
253
diff
changeset
|
90 |
| 227 | 91 Monitoring jobs |
| 92 ^^^^^^^^^^^^^^^ | |
| 93 | |
| 94 .. highlight:: bash | |
| 95 | |
| 96 The list of all jobs can be retrieved as follows:: | |
| 97 | |
| 98 $ curl http://localhost:8042/jobs | |
| 99 [ "e0d12aac-47eb-454f-bb7f-9857931e2904" ] | |
| 100 | |
| 101 Full details about each job can be retrieved:: | |
| 102 | |
| 103 $ curl http://localhost:8042/jobs/e0d12aac-47eb-454f-bb7f-9857931e2904 | |
| 104 { | |
| 105 "CompletionTime" : "20190306T095223.753851", | |
| 106 "Content" : { | |
| 107 "Description" : "REST API", | |
| 108 "InstancesCount" : 1, | |
| 109 "UncompressedSizeMB" : 0 | |
| 110 }, | |
| 111 "CreationTime" : "20190306T095223.750666", | |
| 112 "EffectiveRuntime" : 0.001, | |
| 113 "ErrorCode" : 0, | |
| 114 "ErrorDescription" : "Success", | |
| 115 "ID" : "e0d12aac-47eb-454f-bb7f-9857931e2904", | |
| 116 "Priority" : 0, | |
| 117 "Progress" : 100, | |
| 118 "State" : "Success", | |
| 119 "Timestamp" : "20190306T095408.556082", | |
| 120 "Type" : "Archive" | |
| 121 } | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 |
| 227 | 123 Note that the ``/jobs?expand`` URI will retrieve this information in |
| 124 one single REST query. The ``Content`` field contains the parameters | |
| 125 of the job, and is very specific to the ``Type`` of job. | |
| 126 | |
| 127 The ``State`` field can be: | |
| 128 | |
| 129 * ``Pending``: The job is waiting to be executed. | |
| 130 * ``Running``: The job is being executed. The ``Progress`` field will | |
| 131 be continuously updated to reflect the progression of the execution. | |
| 132 * ``Success``: The job has finished with success. | |
| 133 * ``Failure``: The job has finished with failure. Check out the | |
| 134 ``ErrorCode`` and ``ErrorDescription`` fields for more information. | |
| 135 * ``Paused``: The job has been paused. | |
| 136 * ``Retry``: The job has failed internally, and has been scheduled for | |
| 763 | 137 re-submission after a delay. As of Orthanc 1.9.7, this feature is not |
| 227 | 138 used by any type of job. |
| 139 | |
| 140 In order to wait for the end of an asynchronous call, the caller will | |
| 141 typically have to poll the ``/jobs/...` URI (i.e. make periodic | |
| 142 calls), waiting for the ``State`` field to become ``Success`` or | |
| 143 ``Failure``. | |
| 144 | |
|
671
bc8fa2bf4cf7
asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
145 Note that the `integration tests of Orthanc |
| 763 | 146 <https://hg.orthanc-server.com/orthanc-tests/file/Orthanc-1.9.7/Tests/Toolbox.py>`__ |
|
671
bc8fa2bf4cf7
asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
147 give an example about how to monitor a job in Python using the REST |
|
bc8fa2bf4cf7
asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
148 API (cf. function ``MonitorJob()``). |
|
bc8fa2bf4cf7
asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
149 |
| 227 | 150 |
|
322
c5226c5509ca
storage commitment scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
151 .. _jobs-controlling: |
|
c5226c5509ca
storage commitment scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
152 |
| 227 | 153 Interacting with jobs |
| 154 ^^^^^^^^^^^^^^^^^^^^^ | |
| 155 | |
| 156 Given the ID of some job, one can: | |
| 157 | |
| 158 * Cancel the job by POST-ing to ``/jobs/.../cancel``. | |
| 159 * Pause the job by POST-ing to ``/jobs/.../pause``. | |
| 160 * Resume a job in ``Paused`` state by POST-ing to ``/jobs/.../resume``. | |
| 161 * Retry a job in ``Failed`` state by POST-ing to ``/jobs/.../resubmit``. | |
| 162 | |
| 163 The related state machine is depicted in the `implementation notes | |
| 449 | 164 <https://hg.orthanc-server.com/orthanc/raw-file/default/OrthancServer/Resources/ImplementationNotes/JobsEngineStates.pdf>`__. |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
165 |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
166 |
|
487
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
167 Example: Asynchronous generation of an archive |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
168 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
169 |
|
487
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
170 .. highlight:: bash |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
171 |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
172 Sucessful jobs are associated with a set of so-called "outputs" that |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
173 can be attached to the job. |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
174 |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
175 Here is a sample bash session to ask Orthanc to generate a ZIP |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
176 archive, then to download it locally:: |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
177 |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
178 $ curl http://localhost:8042/studies/27f7126f-4f66fb14-03f4081b-f9341db2-53925988/archive -d '{"Asynchronous":true}' |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
179 { |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
180 "ID" : "82cc02d1-03fe-41f9-be46-a308d16ea94a", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
181 "Path" : "/jobs/82cc02d1-03fe-41f9-be46-a308d16ea94a" |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
182 } |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
183 $ curl http://localhost:8042/jobs/82cc02d1-03fe-41f9-be46-a308d16ea94a |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
184 { |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
185 "CompletionTime" : "20200817T144700.401777", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
186 "Content" : { |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
187 "Description" : "REST API", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
188 "InstancesCount" : 232, |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
189 "UncompressedSizeMB" : 64 |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
190 }, |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
191 "CreationTime" : "20200817T144658.011824", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
192 "EffectiveRuntime" : 2.3879999999999999, |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
193 "ErrorCode" : 0, |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
194 "ErrorDescription" : "Success", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
195 "ID" : "82cc02d1-03fe-41f9-be46-a308d16ea94a", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
196 "Priority" : 0, |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
197 "Progress" : 100, |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
198 "State" : "Success", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
199 "Timestamp" : "20200817T144705.770825", |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
200 "Type" : "Archive" |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
201 } |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
202 $ curl http://localhost:8042/jobs/82cc02d1-03fe-41f9-be46-a308d16ea94a/archive > a.zip |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
203 |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
204 Note how we retrieve the content of the archive by accessing the |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
205 ``archive`` output of the job (check out the virtual method |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
206 ``IJob::GetOutput()`` from the `source code |
| 763 | 207 <https://hg.orthanc-server.com/orthanc/file/Orthanc-1.9.7/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp>`__ |
|
487
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
208 of Orthanc). |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
209 |
|
516
416581db306e
sample: asynchronous download of media archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
513
diff
changeset
|
210 Here is the corresponding sequence of commands to generate a DICOMDIR |
|
416581db306e
sample: asynchronous download of media archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
513
diff
changeset
|
211 media:: |
|
416581db306e
sample: asynchronous download of media archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
513
diff
changeset
|
212 |
|
416581db306e
sample: asynchronous download of media archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
513
diff
changeset
|
213 $ curl http://localhost:8042/studies/27f7126f-4f66fb14-03f4081b-f9341db2-53925988/media -d '{"Asynchronous":true}' |
|
416581db306e
sample: asynchronous download of media archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
513
diff
changeset
|
214 $ curl http://localhost:8042/jobs/6332be8a-0052-44fb-8cc2-ac959aeccad9/archive > a.zip |
|
416581db306e
sample: asynchronous download of media archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
513
diff
changeset
|
215 |
| 763 | 216 As of Orthanc 1.9.7, only the creation of a ZIP or a DICOMDIR archive |
|
516
416581db306e
sample: asynchronous download of media archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
513
diff
changeset
|
217 produces such "outputs". |
|
487
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
218 |
|
13bb9af3df26
Example: Asynchronous generation of an archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
461
diff
changeset
|
219 |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
220 .. _pdf: |
|
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
221 |
| 310 | 222 Attaching PDF file as DICOM series |
| 223 ---------------------------------- | |
|
224
02399e86f046
starting documentation of jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
224 |
|
226
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
225 Among many different types of data, DICOM files can be used to store |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
226 PDF files. The ``/tools/create-dicom`` URI can be used to upload a PDF |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
227 file to Orthanc. The following scripts perform such a *DICOM-ization*; |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
228 They convert the ``HelloWorld2.pdf`` file to base64, then perform a |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
229 ``POST`` request with JSON data containing the converted payload. |
|
225
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
230 |
|
545
931052bd5a53
explain the "Parent" field in "/tools/create-dicom" for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
528
diff
changeset
|
231 Importantly, the ``Parent`` field of the ``POST`` body can be set to |
|
931052bd5a53
explain the "Parent" field in "/tools/create-dicom" for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
528
diff
changeset
|
232 the :ref:`Orthanc identifier of some study <orthanc-ids>` in order to |
|
931052bd5a53
explain the "Parent" field in "/tools/create-dicom" for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
528
diff
changeset
|
233 attach the newly-created PDF series to the given parent study. |
|
931052bd5a53
explain the "Parent" field in "/tools/create-dicom" for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
528
diff
changeset
|
234 |
|
297
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
235 Using bash: |
| 227 | 236 |
|
297
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
237 .. code-block:: bash |
|
225
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
238 |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
239 # create the json data, with the BASE64 data embedded in it |
|
545
931052bd5a53
explain the "Parent" field in "/tools/create-dicom" for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
528
diff
changeset
|
240 (echo -n '{"Parent": "b6e8436b-c5835b7b-cecc9576-0483e165-ab5c710b", "Tags" : {"Modality" : "CT"}, "Content" : "data:application/pdf;base64,'; base64 HelloWorld2.pdf; echo '"}') > /tmp/foo |
|
225
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
241 |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
242 # upload it to Orthanc |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
243 cat /tmp/foo | curl -H "Content-Type: application/json" -d @- http://localhost:8042/tools/create-dicom |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
244 |
| 227 | 245 |
|
297
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
246 Using powershell: |
|
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
247 |
|
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
248 .. code-block:: perl |
|
225
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
249 |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
250 # create the BASE64 string data |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
251 $fileInBase64 = $([Convert]::ToBase64String((gc -Path "HelloWorld2.pdf" -Encoding Byte))) |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
252 |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
253 # create the json data |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
254 $params = @{Tags = @{PatientName = "Benjamino";Modality = "CT"};Content= "data:application/pdf;base64,$fileInBase64"} |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
255 |
| 376 | 256 # disabling the progress bar makes the Invoke-RestMethod call MUCH faster |
|
297
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
257 $ProgressPreference = 'SilentlyContinue' |
|
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
258 |
|
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
259 # upload it to Orthanc |
|
64d1ddab8246
Improved PDF creation Pwsh snippet + added Dicom instance upload example with
Benjamin Golinvaux <bgo@osimis.io>
parents:
290
diff
changeset
|
260 $reply = Invoke-RestMethod http://localhost:8042/tools/create-dicom -Method POST -Body ($params|ConvertTo-Json) -ContentType 'application/json' |
|
225
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
261 |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
262 # display the result |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
263 Write-Host "The instance can be retrieved in PDF at http://localhost:8042$($reply.Path)/pdf" |
|
ced9dbf86de8
Added tutorial that shows how to upload and retrieve PDF files using the REST API
Benjamin Golinvaux <bgo@osimis.io>
parents:
224
diff
changeset
|
264 |
|
226
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
265 Please note that the ``/tools/create-dicom`` API call will return the |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
266 Orthanc instance ID of the newly created DICOM resource. |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
267 |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
268 You can use the ``/instances/.../pdf`` URI to retrieve an embedded PDF |
|
eaae8d630277
proofreading of pdf
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
269 file. |
| 228 | 270 |
| 271 | |
| 596 | 272 .. _private-tags: |
| 273 | |
| 274 Creating DICOM instance with private tags | |
| 275 ----------------------------------------- | |
| 276 | |
| 277 .. highlight:: json | |
| 278 | |
| 279 The ``/tools/create-dicom`` URI can be used to create DICOM instances | |
| 280 containing private tags. Those private tags must first be defined in | |
| 281 the ``Dictionary`` configuration option of Orthanc. Importantly, the | |
| 282 ``xxxx,0010`` tag must be defined to register the private creator, | |
| 283 where ``xxxx`` is the private group of interest. Here is a sample:: | |
| 284 | |
| 285 { | |
| 286 "Dictionary" : { | |
| 287 "0405,0010" : [ "LO", "Private data element", 1, 1, "RawDataStore" ], | |
| 288 "0405,1001" : [ "ST", "XML", 1, 1, "RawDataStore" ] | |
| 289 } | |
| 290 } | |
| 291 | |
| 292 Once Orthanc is started using this configuration file, it is possible | |
| 293 to create a DICOM instance using the following POST body on | |
| 294 ``/tools/create-dicom``:: | |
| 295 | |
| 296 { | |
| 297 "PrivateCreator" : "RawDataStore", | |
| 298 "Tags" : | |
| 299 { | |
| 300 "PatientName" : "Love^Sarah", | |
| 301 "PatientID" : "7", | |
| 302 "0405,0010" : "RawDataStore", | |
| 303 "0405,1001" : "<xml><test>Testing</test></xml>" | |
| 304 } | |
| 305 } | |
| 306 | |
| 228 | 307 |
| 308 .. _prometheus: | |
| 309 | |
| 310 Instrumentation with Prometheus | |
| 311 ------------------------------- | |
| 312 | |
| 313 .. highlight:: text | |
| 314 | |
| 315 Orthanc publishes its metrics according to the `text-based format of | |
| 316 Prometheus | |
| 317 <https://prometheus.io/docs/instrumenting/exposition_formats/#text-based-format>`__ | |
| 318 (check also the `OpenMetrics project <https://openmetrics.io/>`__), onto | |
| 319 the ``/tools/metrics-prometheus`` URI of the REST API. For instance:: | |
| 320 | |
| 321 $ curl http://localhost:8042/tools/metrics-prometheus | |
| 322 orthanc_count_instances 1 1551868380543 | |
| 323 orthanc_count_patients 1 1551868380543 | |
| 324 orthanc_count_series 1 1551868380543 | |
| 325 orthanc_count_studies 1 1551868380543 | |
| 326 orthanc_disk_size_mb 0.0135002136 1551868380543 | |
| 327 orthanc_jobs_completed 1 1551868380543 | |
| 328 orthanc_jobs_failed 0 1551868380543 | |
| 329 orthanc_jobs_pending 0 1551868380543 | |
| 330 orthanc_jobs_running 0 1551868380543 | |
| 331 orthanc_jobs_success 1 1551868380543 | |
| 332 orthanc_rest_api_active_requests 1 1551868380543 | |
| 333 orthanc_rest_api_duration_ms 0 1551868094265 | |
| 334 orthanc_storage_create_duration_ms 0 1551865919315 | |
| 335 orthanc_storage_read_duration_ms 0 1551865943752 | |
| 336 orthanc_store_dicom_duration_ms 5 1551865919319 | |
| 337 orthanc_uncompressed_size_mb 0.0135002136 1551868380543 | |
| 338 | |
| 339 | |
| 340 .. highlight:: bash | |
| 341 | |
| 342 Note that the collection of metrics can be statically disabled by | |
| 343 setting the :ref:`global configuration option <configuration>` | |
| 344 ``MetricsEnabled`` to ``false``, or dynamically disabled by PUT-ing | |
| 345 ``0`` on ``/tools/metrics``:: | |
| 346 | |
| 347 $ curl http://localhost:8042/tools/metrics | |
| 348 1 | |
| 349 $ curl http://localhost:8042/tools/metrics -X PUT -d '0' | |
| 350 $ curl http://localhost:8042/tools/metrics | |
| 351 0 | |
| 352 | |
| 353 | |
| 354 .. highlight:: yaml | |
| 355 | |
| 356 Here is a sample configuration for Prometheus (in the `YAML format | |
| 357 <https://en.wikipedia.org/wiki/YAML>`__):: | |
| 358 | |
| 359 scrape_configs: | |
| 360 - job_name: 'orthanc' | |
| 361 scrape_interval: 10s | |
| 362 metrics_path: /tools/metrics-prometheus | |
| 363 basic_auth: | |
| 364 username: orthanc | |
| 365 password: orthanc | |
| 366 static_configs: | |
| 367 - targets: ['192.168.0.2:8042'] | |
| 368 | |
| 369 .. highlight:: bash | |
| 370 | |
| 371 Obviously, make sure to adapt this sample with your actual IP | |
| 372 address. Thanks to Docker, you can easily start a Prometheus server by | |
| 373 writing this configuration to, say, ``/tmp/prometheus.yml``, then | |
| 374 type:: | |
| 375 | |
|
363
9c28eeab2db6
removed sudo from docker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
376 $ sudo run -p 9090:9090 -v /tmp/prometheus.yml:/etc/prometheus/prometheus.yml --rm prom/prometheus:v2.7.0 |