Merge pull request #17985 from mvdbeek/invalid_datatype_message_fix

[24.0] Raise MessagException if collection element has unknown extension
This commit is contained in:
Marius van den Beek
2024-04-16 10:27:21 +02:00
committed by GitHub
+10 -2
View File
@@ -17,8 +17,12 @@ from typing import (
from packaging.version import Version
from galaxy import model
from galaxy.exceptions import ItemAccessibilityException
from galaxy.exceptions import (
ItemAccessibilityException,
RequestParameterInvalidException,
)
from galaxy.job_execution.actions.post import ActionBox
from galaxy.managers.context import ProvidesHistoryContext
from galaxy.model import (
HistoryDatasetAssociation,
Job,
@@ -98,7 +102,7 @@ class DefaultToolAction(ToolAction):
self,
tool,
param_values,
trans,
trans: ProvidesHistoryContext,
history,
current_user_roles=None,
dataset_collection_elements=None,
@@ -256,6 +260,10 @@ class DefaultToolAction(ToolAction):
for ext in extensions:
if ext:
datatype = trans.app.datatypes_registry.get_datatype_by_extension(ext)
if not datatype:
raise RequestParameterInvalidException(
f"Extension '{ext}' unknown, cannot use dataset collection as input"
)
if not datatype.matches_any(input.formats):
conversion_required = True
break