fix: excluded context from task in json option manager (#45)

Author: jlerat

src/hydrodiy/io/hyruns.py

@@ -104,7 +104,7 @@ def search(self, siteid):
 class OptionTask():
     def __init__(self, taskid, context, options):
         self.taskid = taskid
-        self.context = context
+        self.context = {} if context is None else context
         self.options = options
 
     def __str__(self):
@@ -135,18 +135,20 @@ def __getitem__(self, key):
             return self.options[key]
         return self.context[key]
 
-    def to_dict(self):
+    def to_dict(self, prefix="", include_context=True):
         dd = {
             "taskid": self.taskid,
-            _DICT_KEYNAMES["context_name"]: self.context,
             _DICT_KEYNAMES["task_options_name"]: self.options
             }
+        if include_context:
+            dd[_DICT_KEYNAMES["context_name"]] = self.context
+
         return dd
 
     @classmethod
     def from_dict(cls, dd):
         return OptionTask(dd["taskid"],
-                          dd[_DICT_KEYNAMES["context_name"]],
+                          dd.get(_DICT_KEYNAMES["context_name"], None),
                           dd[_DICT_KEYNAMES["task_options_name"]])
 
     def log(self, logger):
@@ -259,21 +261,22 @@ def from_file(cls, path, wait_secs=2):
 
         return cls.from_dict(js)
 
-    def to_dict(self):
+    def to_dict(self, prefix=""):
         dd = {
             "name": self.name,
             _DICT_KEYNAMES["context_name"]: self.context,
             _DICT_KEYNAMES["manager_options_name"]: self.options,
-            "tasks": [self.get_task(taskid).to_dict()
+            "tasks": [self.get_task(taskid).to_dict(prefix,
+                                                    include_context=False)
                       for taskid in range(self.ntasks)]
         }
         return dd
 
-    def save(self, filename, overwrite=False):
+    def save(self, filename, prefix="", overwrite=False):
         """ Save option manager to disk.
         Overwrite existing one if different.
         """
-        dd = self.to_dict()
+        dd = self.to_dict(prefix)
         filename = Path(filename)
 
         if filename.exists() and not overwrite:

src/hydrodiy/io/tests/test_hyio_hyruns.py

@@ -141,6 +141,9 @@ def test_option_manager():
         js = json.load(fo)
     assert not set(list(js.keys())) ^ set(["name", "tasks", "context", "options"])
 
+    # Ensures json tasks do not contain context
+    assert not set(js["tasks"][0].keys()) ^ set(["taskid", "options"])
+
     fout.unlink()