param values tests

anwa/app_tools.py

@@ -90,8 +90,13 @@ def set_parameters_by_path(parameters:pyqtgraph.parametertree.Parameter, path_va
     :return:
     """
 
-    for param in path_val_couple_list:
-        set_parameter_by_path(parameters, param[0], value=ast.literal_eval(param[1], parse_path=parse_path, separator=separator))
+    for param_path, param_value in path_val_couple_list:
+        if type(param_value) is str:
+            value = ast.literal_eval(param_value)
+        else:
+            value = param_value
+        logger.debug(f"param path={param_path}, ast value={value}")
+        set_parameter_by_path(parameters, param_path, value=value, parse_path=parse_path, separator=separator)
 
 
 def set_parameter_by_path(parameters:pyqtgraph.parametertree.Parameter, param_path:str, value, parse_path=True, separator=";"):

anwa/main_click.py

@@ -63,7 +63,7 @@ def run(ctx, *args, **kwargs):
     "--params",
     "-p",
     multiple=True,
-    default="",
+    default=None,
     nargs=2,
     help='Set parameter. First argument is path to parameter separated by ";". Second is the value.'
     "python -m scaffan gui -p Processing;Show True",
@@ -80,7 +80,9 @@ def gui(params, print_params):
 
 
 def set_params(mainapp, params):
-    app_tools.set_parameters_by_path(mainapp.parameters, params)
+    if params is not None:
+        logger.debug("set_params() ...")
+        app_tools.set_parameters_by_path(mainapp.parameters, params)
     # for param in params:
     #     mainapp.set_parameter(param[0], value=ast.literal_eval(param[1]))
 
@@ -115,14 +117,15 @@ def install():
     "--params",
     "-p",
     multiple=True,
-    default="",
+    default=None,
     nargs=2,
-    help='Set parameter. First argument is path to parameter separated by ",". Second is the value.'
+    help='Set parameter. First argument is path to parameter separated by ";". Second is the value.'
     "python -m anwa nogui -p Processing;Show True",
 )
 @click.option("--print-params", "-pp", is_flag=True, help="Print parameters")
 def nogui(input_path, params, print_params):
     mainapp = algorithm.AnimalWatch()
+    logger.debug(f"params={params})")
     if print_params:
         make_print_params(mainapp)
         exit()

tests/anwa_import_test.py

@@ -41,7 +41,7 @@ def test_cli():
 
     runner = click.testing.CliRunner()
     # runner.invoke(anwa.main_click.nogui, ["-i", str(pth)])
-    runner.invoke(anwa.main_click.run, ["nogui", "-i", pth, "-p", "Processing;Report Level", 60])
+    runner.invoke(anwa.main_click.run, ["nogui", "-i", pth, "-p", "Processing;Report Level", "60"])
     # runner.invoke(anwa.main_click.run, ["nogui", "-i", pth])
 
     assert expected_pth.exists()