Added updateParamsFromDictionary() function

Author: hzclarksm

simtool/__init__.py

@@ -8,7 +8,7 @@
 
 from .utils import getGetSimToolNameRevisionFromEnvironment, findInstalledSimToolNotebooks, searchForSimTool
 from .utils import findInstalledSimToolNotebooks as findSimTools
-from .utils import parse, getValidatedInputs, getParamsFromDictionary
+from .utils import parse, getValidatedInputs, getParamsFromDictionary, updateParamsFromDictionary
 from .utils import findSimToolNotebook, getSimToolInputs, getSimToolOutputs
 from .run import Run, DB 
 from .experiment import Experiment, set_experiment, get_experiment

simtool/run.py

@@ -86,7 +86,7 @@ def __init__(self,simToolLocation,inputs,runName,cache,
       self.dstore = None
       if not trustedExecution:
          if cache:
-            hashableInputs = _get_inputs_cache_dict(getParamsFromDictionary(inputsSchema,self.input_dict))
+            hashableInputs = _get_inputs_cache_dict(updateParamsFromDictionary(inputsSchema,self.input_dict))
             self.dstore = RunBase.DSHANDLER(simToolLocation['simToolName'],simToolLocation['simToolRevision'],hashableInputs)
             del hashableInputs
             self.cached = self.dstore.read_cache(self.outdir)

simtool/utils.py

@@ -7,6 +7,7 @@
 import os
 import sys
 import re
+import copy
 import glob
 import nbformat
 import hashlib
@@ -52,6 +53,7 @@ def getParamsFromDictionary(inputs,
    try:
       parameters = parse(inputs)
    except ValueError as e:
+      parameters = {}
       print(e)
    else:
       for label in inputs:
@@ -79,6 +81,46 @@ def getParamsFromDictionary(inputs,
    return parameters
 
 
+def updateParamsFromDictionary(parameters,
+                               valueDictionary):
+   """Update Params objects from dictionary of values
+
+      Args:
+          parameters: Valid Params
+
+          valueDictionary: dictionary of values. valueDictionary.keys()
+                           should match parameters.keys()
+      Returns:
+          updatedParameters: dictionary of Params objects.  Each Params object
+                             represents one SimTool input or output.
+   """
+   updatedParameters = copy.deepcopy(parameters)
+   for label in valueDictionary:
+      if label in parameters:
+         value = valueDictionary[label]
+         checkForFile = False
+         if hasattr(parameters[label],'file'):
+            try:
+               if isinstance(value,basestring):
+                  checkForFile = True
+            except NameError:
+               if isinstance(value,str):
+                  checkForFile = True
+
+         if checkForFile:
+            if value.startswith('file://'):
+               updatedParameters[label].file = value[7:]
+            else:
+               updatedParameters[label].value = value
+         else:
+            try:
+               updatedParameters[label].value = value
+            except:
+               pass
+
+   return updatedParameters
+
+
 def getValidatedInputs(inputs):
    """Test inputs for validity.