diff --git a/api/src/engine/connectors/exareme/converters.ts b/api/src/engine/connectors/exareme/converters.ts index 61bcce8c639ff26a0d111ef1b28601c546af9da1..1fe5af2c42f4f9e4b2bac7be6c816b4efcdcb740 100644 --- a/api/src/engine/connectors/exareme/converters.ts +++ b/api/src/engine/connectors/exareme/converters.ts @@ -1,7 +1,10 @@ import { Category } from 'src/engine/models/category.model'; import { Algorithm } from 'src/engine/models/experiment/algorithm.model'; import { Experiment } from 'src/engine/models/experiment/experiment.model'; -import { AlgorithmParamInput } from 'src/engine/models/experiment/input/algorithm-parameter.input'; +import { + AlgorithmParamInput, + ParamType, +} from 'src/engine/models/experiment/input/algorithm-parameter.input'; import { ExperimentCreateInput } from 'src/engine/models/experiment/input/experiment-create.input'; import { Group } from 'src/engine/models/group.model'; import { ResultUnion } from 'src/engine/models/result/common/result-union.model'; @@ -65,14 +68,17 @@ const algoParamInputToData = (param: AlgorithmParamInput) => { return { name: param.id, label: param.id, - value: param.value.join(','), + value: + param.type === ParamType.NUMBER + ? Number(param.value) + : param.value.join(','), }; }; export const experimentInputToData = (data: ExperimentCreateInput) => { const params = { algorithm: { - parameters: [ + parameters: data.algorithm.parameters.map(algoParamInputToData).concat([ { name: 'dataset', label: 'dataset', @@ -93,7 +99,7 @@ export const experimentInputToData = (data: ExperimentCreateInput) => { label: 'y', value: data.variables.join(','), }, - ].concat(data.algorithm.parameters.map(algoParamInputToData)), + ]), type: data.algorithm.type ?? 'string', name: data.algorithm.id, }, @@ -185,7 +191,7 @@ export const dataJSONtoResult = ( case 'descriptive_stats': return descriptiveDataToTableResult(result); default: - return []; + return dataToRaw(result); } }; diff --git a/api/src/engine/connectors/exareme/transformations.ts b/api/src/engine/connectors/exareme/transformations.ts index 528ecf498c145440ffcb1dba38288d9536c2a7dd..d53a44d981f2a4085e78751671d11681a1253ef1 100644 --- a/api/src/engine/connectors/exareme/transformations.ts +++ b/api/src/engine/connectors/exareme/transformations.ts @@ -34,6 +34,7 @@ export const transformToExperiment = jsonata(` $toArray := function($x) { $type($x) = 'array' ? $x : [$x]}; + { "name": name, "id": uuid, diff --git a/api/src/engine/models/experiment/input/algorithm-parameter.input.ts b/api/src/engine/models/experiment/input/algorithm-parameter.input.ts index 9b550ae34a6fd1a159ffb7ad11f8eff127f2da01..ce27f32c9d703138f19c96b832c37e6d7c7cd283 100644 --- a/api/src/engine/models/experiment/input/algorithm-parameter.input.ts +++ b/api/src/engine/models/experiment/input/algorithm-parameter.input.ts @@ -1,10 +1,25 @@ -import { Field, InputType } from '@nestjs/graphql'; +import { Field, InputType, registerEnumType } from '@nestjs/graphql'; + +export enum ParamType { + STRING, + NUMBER, +} + +registerEnumType(ParamType, { + name: 'ParamType', +}); @InputType() export class AlgorithmParamInput { @Field() id: string; + @Field(() => ParamType, { + nullable: true, + defaultValue: ParamType.STRING, + }) + type?: ParamType; + @Field(() => [String]) value: string[]; } diff --git a/api/src/schema.gql b/api/src/schema.gql index 58bd4703b57987ad9bf65db35a7a1784c7d0cfec..962d5a465320c0c2870bdadc6a4ede560232689c 100644 --- a/api/src/schema.gql +++ b/api/src/schema.gql @@ -207,9 +207,15 @@ input AlgorithmInput { input AlgorithmParamInput { id: String! + type: ParamType = STRING value: [String!]! } +enum ParamType { + STRING + NUMBER +} + input ExperimentEditInput { name: String shared: Boolean