Worklist server improvements

Author: amazy

Diff for: orthanc_tools/helpers/old_files_deleter.py

@@ -57,7 +57,8 @@ def execute(self):
         self.execute_once()
 
         while self._is_running:
-            timeout.wait_until_expired()
+            while self._is_running and not timeout.is_expired():
+                time.sleep(1)
             self.execute_once()
             timeout.reset()
 

Diff for: orthanc_tools/hl7Lib/hl7_dicom_worklist_builder.py

@@ -102,7 +102,7 @@ def generate(self, values: typing.Dict[str, str], file_name: str = None) -> str:
         if file_name is None:  # if no filename provided, save in the folder
             file_name = os.path.join(self._folder, "{id}.wl".format(id = ds.AccessionNumber))
 
-        ds.save_as(file_name, write_like_original = False)
+        ds.save_as(file_name, enforce_file_format=True)
         return file_name
 
     def _add_field(self, ds: pydicom.dataset.Dataset, values: typing.Dict[str, str], field_name: str, element_type: DicomElementType):

Diff for: orthanc_tools/hl7Lib/hl7_server.py

@@ -104,6 +104,7 @@ def _route_message(self, msg):
             try:
                 handler, args = self._handlers[msgType][0], self._handlers[msgType][1:]
             except KeyError:
+                logger.warning(f"Unsupported message type '{msgType}'")
                 raise UnsupportedMessageType(msgType)
 
             # create a new handler and call the constructor with the args provided

Diff for: orthanc_tools/hl7_worklist_server_for_orthanc.py

@@ -35,22 +35,19 @@
     worklist_builder = DicomWorklistBuilder(folder = folder)
     orm_handler = Hl7OrmWorklistMsgHandler(parser=orm_parser, builder=worklist_builder)
 
-    # configure server
-    mllp_server = MLLPServer(
+    # configure and start MLLP server
+    with MLLPServer(
             host = '0.0.0.0',
             port = port,
             handlers = {
-            'ORM^O01': (orm_handler.handle_orm_message,)
+                'ORM^O01': (orm_handler.handle_orm_message,),
+                'ORM^O01^ORM_O01': (orm_handler.handle_orm_message,)
             }
-    )
+    ) as mllp_server:
 
-    # start server
-    mllp_server.start()
+        # configure and start old_files_deleter
+        with OldFilesDeleter(folder_to_monitor = folder, timeout = retention*3600.0, filter = '*.wl', execution_interval = 3600.0) as worklist_cleaner:
 
-    # configurer and start old_files_deleter
-    worklist_cleaner = OldFilesDeleter(folder_to_monitor = folder, timeout = retention*3600.0, filter = '*.wl', execution_interval = 3600.0)
-    worklist_cleaner.start()
-
-    while True:
-        time.sleep(1)
+            while True:
+                time.sleep(1)
 

Diff for: release-notes.md

@@ -1,6 +1,8 @@
-v 0.15.2
+v 0.15.3
 ========
-- `Hl7WorklistParser`: support for HL7 v2.5. 
+- `Hl7WorklistParser`: 
+  - added support for HL7 v2.5.
+  - nicer exiting of OldFilesDeleter
 
 v 0.15.1
 ========

Diff for: setup.py

@@ -28,7 +28,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/guides/single-sourcing-package-version/
-    version='0.15.2',  # Required
+    version='0.15.3',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field: