Loading

Added saving processes to contexts, changed ops to use path's to allow for cross model operations

Author: willgebhardt

ngcsimlib/context.py

@@ -1,10 +1,11 @@
 from ngcsimlib.utils import make_unique_path, check_attributes, \
     check_serializable, load_from_path, get_compartment_by_name, \
     get_context, add_context, get_current_path, get_current_context, \
-    set_new_context, load_module, is_pre_loaded, GuideList
+    set_new_context, load_module, GuideList, infer_context
 from ngcsimlib.logger import warn, info, critical
 from ngcsimlib import preload_modules
 from ngcsimlib.compilers import dynamic_compile, wrap_command
+from ngcsimlib.compilers.process import Process
 from ngcsimlib.component import Component
 from ngcsimlib.configManager import get_config
 import json, os, shutil, copy
@@ -73,7 +74,7 @@ def __init__(self, name, should_validate=None):
         self.path = get_current_path() + "/" + str(name)
         self._last_context = ""
 
-        self._json_objects = {"ops": [], "components": {}, "commands": {}}
+        self._json_objects = {"ops": [], "components": {}, "commands": {}, "processes" : []}
 
         if should_validate is None:
             _base_config = get_config("context")
@@ -200,6 +201,11 @@ def register_component(self, component, *args, **kwargs):
                "kwargs": _kwargs}
         self._json_objects['components'][c_path] = obj
 
+    def register_process(self, process):
+        self._json_objects['processes'].append(process)
+
+
+
     def add_component(self, component):
         """
         Adds a component to the context if it does not exist already in the
@@ -278,6 +284,12 @@ def save_to_json(self, directory, model_name=None, custom_save=True,
         with open(path + "/commands.json", 'w') as fp:
             json.dump(self._json_objects['commands'], fp, indent=4)
 
+        with open(path + "/processes.json", 'w') as fp:
+            objs = []
+            for process in self._json_objects['processes']:
+                objs.append(process.as_obj())
+            json.dump(objs, fp, indent=4)
+
         with open(path + "/components.json", 'w') as fp:
             hyperparameters = {}
             _components = copy.deepcopy(self._json_objects['components'])
@@ -349,14 +361,16 @@ def load_from_dir(self, directory, custom_folder="/custom"):
                 components. (Default: `/custom`)
         """
 
-        if os.path.isfile(directory + "/modules.json") and not is_pre_loaded():
+        if os.path.isfile(directory + "/modules.json"):
             info("No modules file loaded, loading from model directory")
             preload_modules(path=directory + "/modules.json")
 
         self.make_components(directory + "/components.json",
                              directory + custom_folder)
         self.make_ops(directory + "/ops.json")
         self.make_commands(directory + "/commands.json")
+        self.make_process(directory + "/processes.json")
+
 
     def make_components(self, path_to_components_file, custom_file_dir=None):
         """
@@ -445,18 +459,28 @@ def _make_op(self, op_spec):
                 _sources.append(self._make_op(s))
             else:
                 _sources.append(
-                    get_compartment_by_name(get_current_context(), s))
+                    get_compartment_by_name(infer_context(s, trailing_path=2),
+                                            "/".join(s.split("/")[-2:])))
 
         obj = klass(*_sources)
 
         if op_spec['destination'] is None:
             return obj
 
         else:
-            dest = get_compartment_by_name(get_current_context(),
-                                           op_spec['destination'])
+            d = op_spec['destination']
+            dest = get_compartment_by_name(infer_context(d, trailing_path=2),
+                                           "/".join(d.split("/")[-2:]))
             dest << obj
 
+    def make_process(self, path_to_process_file):
+        with open(path_to_process_file, 'r') as file:
+            process_spec = json.load(file)
+
+            all_processes = [Process.make_process(p) for p in process_spec]
+            for p in all_processes:
+                self.add_command(p.pure, p.name)
+
     @staticmethod
     def dynamicCommand(fn):
         """

ngcsimlib/operations/baseOp.py

@@ -95,9 +95,9 @@ def dump(self):
             if isinstance(source, BaseOp):
                 source_array.append(source.dump())
             else:
-                source_array.append(source.name)
+                source_array.append(source.path)
 
-        destination = self.destination.name if self.destination is not None \
+        destination = self.destination.path if self.destination is not None \
             else None
 
         return {"class": class_name, "sources": source_array,