Unverified Commit 7a7a2e12 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18447 from mvdbeek/exception_cleanup 

[24.1] Improve workflow-related exception reporting
parents 6ec7521e 98304880

lib/galaxy/managers/base.py

+1 −1
Original line number Diff line number Diff line
@@ -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:

lib/galaxy/managers/workflows.py

+6 −2
Original line number Diff line number Diff line
@@ -1856,10 +1856,14 @@ class WorkflowContentsManager(UsesAnnotations): 
        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

lib/galaxy/model/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -7666,7 +7666,7 @@ class StoredWorkflow(Base, HasTags, Dictifiable, RepresentById, UsesCreateAndUpd 
        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):