From 8355b420030add05fd59a44b71cbec056df24dd9 Mon Sep 17 00:00:00 2001 From: ValentinaHutter <85164505+ValentinaHutter@users.noreply.github.com> Date: Tue, 19 Apr 2022 17:53:51 +0200 Subject: [PATCH 1/3] change model to id parameter --- src/openeo_processes/cubes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openeo_processes/cubes.py b/src/openeo_processes/cubes.py index 5b31178a..01b50f32 100644 --- a/src/openeo_processes/cubes.py +++ b/src/openeo_processes/cubes.py @@ -2142,11 +2142,11 @@ def load_ml_model(): class LoadMLModel: @staticmethod - def exec_num(model, input_filepath = 'path'): - date = os.listdir(f'{input_filepath}/jobs/{model}') + def exec_num(id, input_filepath = 'path'): + date = os.listdir(f'{input_filepath}/jobs/{id}') if len(date) > 0: date = date[0] - filepath = f'{input_filepath}/jobs/{model}/{date}/result/out_model.json' + filepath = f'{input_filepath}/jobs/{id}/{date}/result/out_model.json' model_xgb = xgb.Booster() model_xgb.load_model(filepath) return model_xgb From e13a3e96017addc170dbb3c8007d4eac91fad435 Mon Sep 17 00:00:00 2001 From: ValentinaHutter <85164505+ValentinaHutter@users.noreply.github.com> Date: Wed, 20 Apr 2022 19:37:11 +0200 Subject: [PATCH 2/3] add context parameter --- src/openeo_processes/cubes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openeo_processes/cubes.py b/src/openeo_processes/cubes.py index 01b50f32..25c0472b 100644 --- a/src/openeo_processes/cubes.py +++ b/src/openeo_processes/cubes.py @@ -2061,9 +2061,11 @@ def predict_random_forest(): class PredictRandomForest: @staticmethod - def exec_xar(data, model, dimension, client = None, input_filepath = None): + def exec_xar(data, model = None, dimension, client = None, context = None, input_filepath = None): if isinstance(model, str): model = load_ml_model(model, input_filepath = input_filepath) + if context is not None: + model = context if dimension in ['time', 't', 'times']: # time dimension must be converted into values dimension = get_time_dimension_from_data(data, dimension) predictor_cols = list(data.dims) From ef03a7a1e494d3f83635e017a33573a42e1b6f6b Mon Sep 17 00:00:00 2001 From: ValentinaHutter <85164505+ValentinaHutter@users.noreply.github.com> Date: Wed, 20 Apr 2022 19:39:05 +0200 Subject: [PATCH 3/3] sort prediction parameters --- src/openeo_processes/cubes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openeo_processes/cubes.py b/src/openeo_processes/cubes.py index 25c0472b..e4855943 100644 --- a/src/openeo_processes/cubes.py +++ b/src/openeo_processes/cubes.py @@ -2061,7 +2061,7 @@ def predict_random_forest(): class PredictRandomForest: @staticmethod - def exec_xar(data, model = None, dimension, client = None, context = None, input_filepath = None): + def exec_xar(data, dimension, model = None, context = None, client = None, input_filepath = None): if isinstance(model, str): model = load_ml_model(model, input_filepath = input_filepath) if context is not None: