Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/hydrodiy/io/hyruns.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions src/hydrodiy/io/tests/test_hyio_hyruns.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down