Merge pull request #18447 from mvdbeek/exception_cleanup

[24.1] Improve workflow-related exception reporting
galaxyproject · Jun 28, 2024 · 7a7a2e1 · 7a7a2e1
2 parents 6ec7521 + 9830488
commit 7a7a2e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/galaxy/managers/base.py b/lib/galaxy/managers/base.py
@@ -178,7 +178,7 @@ def get_object(trans, id, class_name, check_ownership=False, check_accessible=Fa
         item = trans.sa_session.query(item_class).get(decoded_id)
         assert item is not None
     except Exception:
-        log.exception(f"Invalid {class_name} id ( {id} ) specified.")
+        log.warning(f"Invalid {class_name} id ( {id} ) specified.")
         raise exceptions.MessageException(f"Invalid {class_name} id ( {id} ) specified", type="error")
 
     if check_ownership or check_accessible:

diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
@@ -1856,10 +1856,14 @@ def __load_subworkflow_from_step_dict(
         embedded_subworkflow = step_dict.get("subworkflow", None)
         subworkflow_id = step_dict.get("content_id", None)
         if embedded_subworkflow and subworkflow_id:
-            raise Exception("Subworkflow step defines both subworkflow and content_id, only one may be specified.")
+            raise exceptions.RequestParameterInvalidException(
+                "Subworkflow step defines both subworkflow and content_id, only one may be specified."
+            )
 
         if not embedded_subworkflow and not subworkflow_id:
-            raise Exception("Subworkflow step must define either subworkflow or content_id.")
+            raise exceptions.RequestParameterInvalidException(
+                "Subworkflow step must define either subworkflow or content_id."
+            )
 
         if embedded_subworkflow:
             assert not dry_run

diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -7666,7 +7666,7 @@ def get_internal_version(self, version):
         if version is None:
             return self.latest_workflow
         if len(self.workflows) <= version:
-            raise Exception("Version does not exist")
+            raise galaxy.exceptions.RequestParameterInvalidException("Version does not exist")
         return list(reversed(self.workflows))[version]
 
     def version_of(self, workflow):