Skip to content

Commit 7d1ab34

Browse files
committed
Apply fallback if parameters are missing or celery is disabled
1 parent 1b3a130 commit 7d1ab34

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

client/src/components/Tool/ToolForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ export default {
435435
try {
436436
const jobResponse = await submitToolJob({
437437
jobDef,
438-
inputsTree: this.formConfig.inputs,
438+
formConfig: this.formConfig,
439439
formData: this.formData,
440440
});
441441
jobResponse.produces_entry_points = this.formConfig.model_class === "InteractiveTool";

client/src/components/Tool/submit/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ import { useConfigStore } from "@/stores/configurationStore";
33
import { submitToolJob as submitAsync } from "./submitAsync";
44
import { submitToolJob as submitLegacy } from "./submitLegacy";
55

6-
const ENABLE_ASYNC = false;
7-
86
export async function submitToolJob(params) {
97
const configStore = useConfigStore();
10-
if (ENABLE_ASYNC && configStore.config?.enable_celery_tasks) {
8+
const hasParameters = !!params.formConfig?.has_parameters;
9+
if (configStore.config?.enable_celery_tasks && hasParameters) {
1110
return submitAsync(params);
1211
}
1312
return submitLegacy(params);

client/src/components/Tool/submit/submitAsync.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { buildNestedState } from "@/components/Form/utilities";
33
import { pollUntil } from "@/composables/pollUntil";
44
import { rethrowSimple } from "@/utils/simple-error";
55

6-
export async function submitToolJob({ jobDef, inputsTree, formData }) {
7-
const nestedInputs = buildNestedState(inputsTree, formData);
6+
export async function submitToolJob({ jobDef, formConfig, formData }) {
7+
const nestedInputs = buildNestedState(formConfig.inputs, formData);
88
const request = { ...jobDef, inputs: nestedInputs };
99
const { tool_request_id } = await submitJobRequest(request);
1010
const detail = await waitForToolRequest(tool_request_id);

lib/galaxy/tools/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3032,6 +3032,8 @@ def to_dict(self, trans, link_details=False, io_details=False, tool_help=False):
30323032
tool_dict["inputs"] = [input.to_dict(trans) for input in self.inputs.values()]
30333033
tool_dict["outputs"] = [output.to_dict(app=self.app) for output in self.outputs.values()]
30343034

3035+
tool_dict["has_parameters"] = self.parameters is not None
3036+
30353037
tool_dict["panel_section_id"], tool_dict["panel_section_name"] = self.get_panel_section()
30363038

30373039
tool_class = self.__class__

0 commit comments

Comments
 (0)