add load_from_yaml method for Resource machine task class (#401)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

dpdispatcher/machine.py

@@ -4,6 +4,7 @@
 from abc import ABCMeta, abstractmethod
 from typing import List, Tuple
 
+import yaml
 from dargs import Argument, Variant
 
 from dpdispatcher import dlog
@@ -124,6 +125,13 @@ def load_from_json(cls, json_path):
         machine = cls.load_from_dict(machine_dict=machine_dict)
         return machine
 
+    @classmethod
+    def load_from_yaml(cls, yaml_path):
+        with open(yaml_path) as f:
+            machine_dict = yaml.safe_load(f)
+        machine = cls.load_from_dict(machine_dict=machine_dict)
+        return machine
+
     @classmethod
     def load_from_dict(cls, machine_dict):
         batch_type = machine_dict["batch_type"]

dpdispatcher/submission.py

@@ -11,6 +11,7 @@
 from hashlib import sha1
 from typing import List, Optional
 
+import yaml
 from dargs.dargs import Argument, Variant
 
 from dpdispatcher import dlog
@@ -615,6 +616,13 @@ def load_from_json(cls, json_file):
             task_dict = json.load(f)
         return cls.load_from_dict(task_dict)
 
+    @classmethod
+    def load_from_yaml(cls, yaml_file):
+        with open(yaml_file) as f:
+            task_dict = yaml.safe_load(f)
+        task = cls.load_from_dict(task_dict=task_dict)
+        return task
+
     @classmethod
     def load_from_dict(cls, task_dict: dict) -> "Task":
         # check dict
@@ -1096,7 +1104,14 @@ def __getitem__(self, key):
     def load_from_json(cls, json_file):
         with open(json_file) as f:
             resources_dict = json.load(f)
-        resources = cls.deserialize(resources_dict=resources_dict)
+        resources = cls.load_from_dict(resources_dict=resources_dict)
+        return resources
+
+    @classmethod
+    def load_from_yaml(cls, yaml_file):
+        with open(yaml_file) as f:
+            resources_dict = yaml.safe_load(f)
+        resources = cls.load_from_dict(resources_dict=resources_dict)
         return resources
 
     @classmethod

pyproject.toml

@@ -27,6 +27,7 @@ dependencies = [
     'requests',
     'tqdm>=4.9.0',
     'typing_extensions; python_version < "3.7"',
+    'pyyaml',
 ]
 requires-python = ">=3.7"
 readme = "README.md"