#133 fixed missing included parameters after normalization

Author: bugy

src/model/model_helper.py

@@ -105,16 +105,6 @@ def is_empty(value):
     return (not value) and (value != 0) and (value is not False)
 
 
-def normalize_incoming_values(param_values, parameters):
-    normalized_values = {}
-
-    for param in parameters:
-        if param.name in param_values:
-            normalized_value = param.normalize_user_value(param_values[param.name])
-            normalized_values[param.name] = normalized_value
-
-    return normalized_values
-
 def fill_parameter_values(parameter_configs, template, values):
     result = template
 

src/model/script_configs.py

@@ -91,10 +91,6 @@ def set_param_value(self, param_name, value):
         self.parameter_values[param_name] = value
 
     def set_all_param_values(self, param_values):
-        for key, value in param_values.items():
-            if self.find_parameter(key) is None:
-                LOGGER.warning('Incoming value for unknown parameter ' + key)
-
         original_values = dict(self.parameter_values)
         processed = {}
 
@@ -110,7 +106,7 @@ def set_all_param_values(self, param_values):
                 if required_parameters and any(r not in processed for r in required_parameters):
                     continue
 
-                value = param_values.get(parameter.name)
+                value = parameter.normalize_user_value(param_values.get(parameter.name))
                 validation_error = parameter.validate_value(value)
                 if validation_error:
                     self.parameter_values.set(original_values)
@@ -125,6 +121,10 @@ def set_all_param_values(self, param_values):
                 self.parameter_values.set(original_values)
                 raise Exception('Could not resolve order for dependencies. Remaining: ' + str(remaining))
 
+        for key, value in param_values.items():
+            if self.find_parameter(key) is None:
+                LOGGER.warning('Incoming value for unknown parameter ' + key)
+
     def list_files_for_param(self, parameter_name, path):
         parameter = self.find_parameter(parameter_name)
         if not parameter:

src/tests/model_helper_test.py

@@ -1,9 +1,9 @@
 import os
 import unittest
 
-from config.constants import PARAM_TYPE_MULTISELECT, FILE_TYPE_FILE, FILE_TYPE_DIR
+from config.constants import FILE_TYPE_FILE, FILE_TYPE_DIR
 from model import script_configs, model_helper
-from model.model_helper import read_list, read_dict, normalize_incoming_values, fill_parameter_values, resolve_env_vars, \
+from model.model_helper import read_list, read_dict, fill_parameter_values, resolve_env_vars, \
     InvalidFileException
 from tests import test_utils
 from tests.test_utils import create_parameter_model
@@ -150,32 +150,6 @@ def test_default_when_specified(self):
         self.assertEqual(dict_value, {'key2': 'value2'})
 
 
-class TestNormalizeIncomingValues(unittest.TestCase):
-
-    def test_no_values(self):
-        normalized = normalize_incoming_values({}, [])
-
-        self.assertEqual({}, normalized)
-
-    def test_normalize_simple_parameters(self):
-        p1 = create_parameter_model('p1')
-        p2 = create_parameter_model('p2')
-        p3 = create_parameter_model('p3')
-
-        normalized = normalize_incoming_values({'p1': 1, 'p3': None}, [p1, p2, p3])
-
-        self.assertEqual({'p1': 1, 'p3': None}, normalized)
-
-    def test_normalize_one_multiselect(self):
-        p1 = create_parameter_model('p1')
-        p2 = create_parameter_model('p2', type=PARAM_TYPE_MULTISELECT, allowed_values=['abc'])
-        p3 = create_parameter_model('p3')
-
-        normalized = normalize_incoming_values({'p2': 'abc', 'p3': True}, [p1, p2, p3])
-
-        self.assertEqual({'p2': ['abc'], 'p3': True}, normalized)
-
-
 class TestFillParameterValues(unittest.TestCase):
     def test_fill_single_parameter(self):
         result = fill_parameter_values(self.create_parameters('p1'), 'Hello, ${p1}!', {'p1': 'world'})

src/tests/script_config_test.py

@@ -132,6 +132,18 @@ def test_set_all_values_when_dependants_cylce(self):
         values = {'p1': 'XabcX', 'p2': 'abc'}
         self.assertRaisesRegex(Exception, 'Could not resolve order', config_model.set_all_param_values, values)
 
+    def test_set_all_values_with_normalization(self):
+        allowed_values = ['abc', 'def', 'xyz']
+        parameters = [
+            create_script_param_config('p1', type=PARAM_TYPE_MULTISELECT, allowed_values=allowed_values),
+            create_script_param_config('p2', type=PARAM_TYPE_MULTISELECT, allowed_values=allowed_values),
+            create_script_param_config('p3', type=PARAM_TYPE_MULTISELECT, allowed_values=allowed_values)]
+
+        config_model = _create_config_model('config', parameters=parameters)
+        config_model.set_all_param_values({'p1': '', 'p2': ['def'], 'p3': 'abc'})
+
+        self.assertEqual({'p1': [], 'p2': ['def'], 'p3': ['abc']}, config_model.parameter_values)
+
 
 class ConfigModelListFilesTest(unittest.TestCase):
     def test_list_files_for_valid_param(self):

src/web/server.py

@@ -27,7 +27,6 @@
 from features.file_download_feature import FileDownloadFeature
 from features.file_upload_feature import FileUploadFeature
 from model import external_model
-from model import model_helper
 from model.external_model import to_short_execution_log, to_long_execution_log, parameter_to_external
 from model.model_helper import is_empty
 from model.script_configs import InvalidValueException, ParameterNotFoundException, WrongParameterUsageException
@@ -373,10 +372,9 @@ def post(self, user):
                     file_path = file_upload_feature.save_file(file_info.filename, file_info.body, audit_name)
                     parameter_values[key] = file_path
 
-            parameter_values = model_helper.normalize_incoming_values(parameter_values, config_model.parameters)
-
             try:
                 config_model.set_all_param_values(parameter_values)
+                normalized_values = dict(config_model.parameter_values)
             except InvalidValueException as e:
                 message = 'Invalid parameter %s value: %s' % (e.param_name, str(e))
                 LOGGER.error(message)
@@ -389,7 +387,7 @@ def post(self, user):
 
             execution_id = self.application.execution_service.start_script(
                 config_model,
-                parameter_values,
+                normalized_values,
                 user_id,
                 all_audit_names)