import { unionize, ofType, UnionOf } from "~/common/unionize";
import { ServiceRepository } from "~/services/services";
import { RootState } from '~/store/store';
-import { WorkflowResource, getWorkflowInputs, parseWorkflowDefinition } from '~/models/workflow';
+import { getUserUuid } from "~/common/getuser";
+import { WorkflowResource, WorkflowRunnerResources, getWorkflow, getWorkflowInputs, parseWorkflowDefinition } from '~/models/workflow';
import { getFormValues, initialize } from 'redux-form';
import { RUN_PROCESS_BASIC_FORM, RunProcessBasicFormData } from '~/views/run-process-panel/run-process-basic-form';
import { RUN_PROCESS_INPUTS_FORM } from '~/views/run-process-panel/run-process-inputs-form';
import { WorkflowInputsData } from '~/models/workflow';
import { createWorkflowMounts } from '~/models/process';
import { ContainerRequestState } from '~/models/container-request';
-import { navigateToProcess } from '../navigation/navigation-action';
-import { RunProcessAdvancedFormData, RUN_PROCESS_ADVANCED_FORM } from '~/views/run-process-panel/run-process-advanced-form';
-import { isItemNotInProject, isProjectOrRunProcessRoute } from '~/store/projects/project-create-actions';
+import { navigateTo } from '../navigation/navigation-action';
+import {
+ RunProcessAdvancedFormData, RUN_PROCESS_ADVANCED_FORM, VCPUS_FIELD,
+ KEEP_CACHE_RAM_FIELD, RAM_FIELD, RUNTIME_FIELD, OUTPUT_FIELD, RUNNER_IMAGE_FIELD
+} from '~/views/run-process-panel/run-process-advanced-form';
import { dialogActions } from '~/store/dialog/dialog-actions';
import { setBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions';
export const runProcessPanelActions = unionize({
+ SET_PROCESS_PATHNAME: ofType<string>(),
SET_PROCESS_OWNER_UUID: ofType<string>(),
SET_CURRENT_STEP: ofType<number>(),
SET_STEP_CHANGED: ofType<boolean>(),
async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
try {
dispatch(setBreadcrumbs([{ label: 'Run Process' }]));
- dispatch(runProcessPanelActions.RESET_RUN_PROCESS_PANEL());
const response = await services.workflowService.list();
dispatch(runProcessPanelActions.SET_WORKFLOWS(response.items));
} catch (e) {
}
};
+export const getWorkflowRunnerSettings = (workflow: WorkflowResource) => {
+ const advancedFormValues = {};
+ Object.assign(advancedFormValues, DEFAULT_ADVANCED_FORM_VALUES);
+
+ const wf = getWorkflow(parseWorkflowDefinition(workflow));
+ const hints = wf ? wf.hints : undefined;
+ if (hints) {
+ const resc = hints.find(item => item.class === 'http://arvados.org/cwl#WorkflowRunnerResources') as WorkflowRunnerResources | undefined;
+ if (resc) {
+ if (resc.ramMin) { advancedFormValues[RAM_FIELD] = resc.ramMin * (1024 * 1024); }
+ if (resc.coresMin) { advancedFormValues[VCPUS_FIELD] = resc.coresMin; }
+ if (resc.keep_cache) { advancedFormValues[KEEP_CACHE_RAM_FIELD] = resc.keep_cache * (1024 * 1024); }
+ if (resc.acrContainerImage) { advancedFormValues[RUNNER_IMAGE_FIELD] = resc.acrContainerImage; }
+ }
+ }
+ return advancedFormValues;
+};
+
export const setWorkflow = (workflow: WorkflowResource, isWorkflowChanged = true) =>
(dispatch: Dispatch<any>, getState: () => RootState) => {
const isStepChanged = getState().runProcessPanel.isStepChanged;
+
+ const advancedFormValues = getWorkflowRunnerSettings(workflow);
+
if (isStepChanged && isWorkflowChanged) {
dispatch(runProcessPanelActions.SET_STEP_CHANGED(false));
dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
dispatch<any>(loadPresets(workflow.uuid));
+ dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, advancedFormValues));
}
if (!isWorkflowChanged) {
dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
dispatch<any>(loadPresets(workflow.uuid));
+ dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, advancedFormValues));
}
};
-const loadPresets = (workflowUuid: string) =>
+export const loadPresets = (workflowUuid: string) =>
async (dispatch: Dispatch<any>, _: () => RootState, { workflowService }: ServiceRepository) => {
const { items } = await workflowService.presets(workflowUuid);
dispatch(runProcessPanelActions.SET_WORKFLOW_PRESETS(items));
const state = getState();
const basicForm = getFormValues(RUN_PROCESS_BASIC_FORM)(state) as RunProcessBasicFormData;
const inputsForm = getFormValues(RUN_PROCESS_INPUTS_FORM)(state) as WorkflowInputsData;
- const advancedForm = getFormValues(RUN_PROCESS_ADVANCED_FORM)(state) as RunProcessAdvancedFormData;
- const userUuid = getState().auth.user!.uuid;
- const router = getState();
- const properties = getState().properties;
+ const userUuid = getUserUuid(getState());
+ if (!userUuid) { return; }
const { processOwnerUuid, selectedWorkflow } = state.runProcessPanel;
+ const ownerUUid = processOwnerUuid ? processOwnerUuid : userUuid;
if (selectedWorkflow) {
+ const advancedForm = getFormValues(RUN_PROCESS_ADVANCED_FORM)(state) as RunProcessAdvancedFormData || getWorkflowRunnerSettings(selectedWorkflow);
const newProcessData = {
- ownerUuid: isItemNotInProject(properties) || !isProjectOrRunProcessRoute(router) ? userUuid : processOwnerUuid,
+ ownerUuid: ownerUUid,
name: basicForm.name,
description: basicForm.description,
state: ContainerRequestState.COMMITTED,
mounts: createWorkflowMounts(selectedWorkflow, normalizeInputKeys(inputsForm)),
runtimeConstraints: {
API: true,
- vcpus: 1,
- ram: 1073741824,
+ vcpus: advancedForm[VCPUS_FIELD],
+ ram: (advancedForm[KEEP_CACHE_RAM_FIELD] + advancedForm[RAM_FIELD]),
+ },
+ schedulingParameters: {
+ max_run_time: advancedForm[RUNTIME_FIELD]
},
- containerImage: 'arvados/jobs',
+ containerImage: advancedForm[RUNNER_IMAGE_FIELD],
cwd: '/var/spool/cwl',
command: [
'arvados-cwl-runner',
- '--local',
'--api=containers',
- `--project-uuid=${processOwnerUuid}`,
+ '--local',
+ `--project-uuid=${ownerUUid}`,
'/var/lib/cwl/workflow.json#main',
'/var/lib/cwl/cwl.input.json'
],
outputPath: '/var/spool/cwl',
priority: 1,
- outputName: advancedForm && advancedForm.output ? advancedForm.output : undefined,
+ outputName: advancedForm[OUTPUT_FIELD] ? advancedForm[OUTPUT_FIELD] : undefined,
+ properties: {
+ workflowUuid: selectedWorkflow.uuid,
+ workflowName: selectedWorkflow.name
+ }
};
const newProcess = await services.containerRequestService.create(newProcessData);
- dispatch(navigateToProcess(newProcess.uuid));
+ dispatch(navigateTo(newProcess.uuid));
}
};
+const DEFAULT_ADVANCED_FORM_VALUES: Partial<RunProcessAdvancedFormData> = {
+ [VCPUS_FIELD]: 1,
+ [RAM_FIELD]: 1073741824,
+ [KEEP_CACHE_RAM_FIELD]: 268435456,
+ [RUNNER_IMAGE_FIELD]: "arvados/jobs"
+};
+
const normalizeInputKeys = (inputs: WorkflowInputsData): WorkflowInputsData =>
Object.keys(inputs).reduce((normalizedInputs, key) => ({
...normalizedInputs,
projects / arvados-workbench2.git / blobdiff