diff --git a/api/src/engine/connectors/exareme/converters.ts b/api/src/engine/connectors/exareme/converters.ts index 0936d080d19b45ee927b952fea0f69c996cd1ed0..943c73b4fb897f5a84e7b3a94151f887defee502 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,7 +68,10 @@ 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(','), }; }; @@ -84,7 +90,7 @@ export const experimentInputToData = (data: ExperimentCreateInput) => { }) || null; - return { + const params = { algorithm: { parameters: [ { @@ -207,7 +213,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 c05fa04e31dd9de8aaaa1659dd3760d327cb8b4c..354ce594f7e6fce533eaaa4aa81a1331e4de453f 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 f10e3bb93f3d24fdc5a40f8eedbe65abae5e27c4..33ba8eafeaa512b7de549cd0ad12ce620b6d533c 100644 --- a/api/src/schema.gql +++ b/api/src/schema.gql @@ -209,6 +209,7 @@ input AlgorithmInput { input AlgorithmParamInput { id: String! + type: ParamType = STRING value: [String!]! }