From 8e231b90ea2c848b4ff80e95682bf9c0058e977a Mon Sep 17 00:00:00 2001
From: stevereis <stevereis93@gmail.com>
Date: Mon, 22 Nov 2021 18:01:59 +0100
Subject: [PATCH] Add param type value algorithm input
---
api/src/engine/connectors/exareme/converters.ts | 14 ++++++++++----
.../connectors/exareme/transformations.ts | 1 +
.../input/algorithm-parameter.input.ts | 17 ++++++++++++++++-
api/src/schema.gql | 1 +
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/api/src/engine/connectors/exareme/converters.ts b/api/src/engine/connectors/exareme/converters.ts
index 0936d08..943c73b 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 c05fa04..354ce59 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 9b550ae..ce27f32 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 f10e3bb..33ba8ea 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!]!
}
--
GitLab