add types to InterDependencies_Dict

Akshita07 · Sep 2, 2020 · db4df1c · db4df1c
1 parent 104b9cf
commit db4df1c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 15 deletions.
diff --git a/qcodes/dataset/descriptions/dependencies.py b/qcodes/dataset/descriptions/dependencies.py
@@ -467,24 +467,36 @@ def _from_dict(cls, ser: InterDependencies_Dict) -> 'InterDependencies_':
         representation of such an object
         """
         params = ser['parameters']
-        deps = {}
-        for key, value in ser['dependencies'].items():
-            deps_key = ParamSpecBase._from_dict(params[key])
-            deps_vals = tuple(ParamSpecBase._from_dict(params[val]) for
-                              val in value)
-            deps.update({deps_key: deps_vals})
+        deps = cls._extract_deps_from_dict(ser)
+
+        inffs = cls._extract_inffs_from_dict(ser)
 
+        stdls = tuple(ParamSpecBase._from_dict(params[ps_id]) for
+                      ps_id in ser['standalones'])
+
+        return cls(dependencies=deps, inferences=inffs, standalones=stdls)
+
+    @classmethod
+    def _extract_inffs_from_dict(cls, ser: InterDependencies_Dict) -> ParamSpecTree:
+        params = ser['parameters']
         inffs = {}
         for key, value in ser['inferences'].items():
             inffs_key = ParamSpecBase._from_dict(params[key])
             inffs_vals = tuple(ParamSpecBase._from_dict(params[val]) for
                                val in value)
             inffs.update({inffs_key: inffs_vals})
+        return inffs
 
-        stdls = tuple(ParamSpecBase._from_dict(params[ps_id]) for
-                      ps_id in ser['standalones'])
-
-        return cls(dependencies=deps, inferences=inffs, standalones=stdls)
+    @classmethod
+    def _extract_deps_from_dict(cls, ser: InterDependencies_Dict) -> ParamSpecTree:
+        params = ser['parameters']
+        deps = {}
+        for key, value in ser['dependencies'].items():
+            deps_key = ParamSpecBase._from_dict(params[key])
+            deps_vals = tuple(ParamSpecBase._from_dict(params[val]) for
+                              val in value)
+            deps.update({deps_key: deps_vals})
+        return deps
 
     def __repr__(self) -> str:
         rep = (f"InterDependencies_(dependencies={self.dependencies}, "

diff --git a/qcodes/dataset/descriptions/versioning/rundescribertypes.py b/qcodes/dataset/descriptions/versioning/rundescribertypes.py
@@ -17,18 +17,18 @@
 from typing import Dict, Any, List, Tuple, Union
 from typing_extensions import TypedDict
 
-from ..param_spec import ParamSpecDict
+from ..param_spec import ParamSpecDict, ParamSpecBaseDict
 
 
 class InterDependenciesDict(TypedDict):
     paramspecs: Tuple[ParamSpecDict, ...]
 
 
 class InterDependencies_Dict(TypedDict):
-    parameters: Dict[str, Any]
-    dependencies: Dict[str, Any]
-    inferences: Dict[str, Any]
-    standalones: List[Any]
+    parameters: Dict[str, ParamSpecBaseDict]
+    dependencies: Dict[str, List[str]]
+    inferences: Dict[str, List[str]]
+    standalones: List[str]
 
 
 class RunDescriberV0Dict(TypedDict):