Fixes bug in QIDO-RS relational Serie-level query

Author: sjoerdk

dicomtrolley/core.py

@@ -556,7 +556,7 @@ def init_from_query(
                 f"parameters. You are probably converting between incompatible "
                 f"query subtypes. Use a basic Query instance to avoid this error. "
                 f"See ValidationError for details on which parameter is causing "
-                f"the problem"
+                f"the problem. Original error: {str(e)}"
             ) from e
 
     @staticmethod

dicomtrolley/qido_rs.py

@@ -322,7 +322,7 @@ def uri_base(self) -> str:
         if self.query_level == QueryLevels.STUDY:
             raise ValueError(STUDY_VALUE_ERROR_TEXT)
         elif self.query_level == QueryLevels.SERIES:
-            return "/studies"
+            return "/series"
         elif self.query_level == QueryLevels.INSTANCE:
             if self.StudyInstanceUID:
                 # all instances for this study
@@ -399,10 +399,11 @@ def ensure_query_type(cls, query: Query) -> QidoRSQueryBase:
                     "to HierarchicalQuery"
                 )
                 return HierarchicalQuery.init_from_query(query)
-            except UnSupportedParameterError:
+            except UnSupportedParameterError as e:
                 logger.debug(
                     "Converting to HierarchicalQuery did not work. "
-                    "Trying slower but less stringent RelationalQuery"
+                    "Trying slower but less stringent RelationalQuery. Error was: "
+                    f"{str(e)}"
                 )
                 return RelationalQuery.init_from_query(query)
         else:

tests/test_qido_rs.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from dicomtrolley.core import QueryLevels
+from dicomtrolley.core import Query, QueryLevels
 from dicomtrolley.qido_rs import HierarchicalQuery, QidoRS, RelationalQuery
 from tests.conftest import set_mock_response
 from tests.mock_responses import (
@@ -158,3 +158,11 @@ def test_qido_searcher_204(requests_mock, a_qido):
     set_mock_response(requests_mock, QIDO_RS_204_NO_RESULTS)
     result = a_qido.find_studies(HierarchicalQuery())
     assert len(result) == 0
+
+
+def test_ensure_query_type(a_qido):
+    """Exposes bug where Series level Relational query calles a study url"""
+    ensured = a_qido.ensure_query_type(
+        Query(AccessionNumber="123", query_level=QueryLevels.SERIES)
+    )
+    assert ensured.uri_base() == "/series"