Merge pull request #23 from NACLab/dev

Deprecators and bug fixes

Author: willgebhardt

ngcsimlib/context.py

@@ -4,7 +4,7 @@
     get_context, add_context, get_current_path, get_current_context, set_new_context, load_module, is_pre_loaded
 from ngcsimlib import preload_modules
 from ngcsimlib.compilers.command_compiler import dynamic_compile, wrap_command
-import json, os, shutil
+import json, os, shutil, copy
 
 
 
@@ -241,8 +241,8 @@ def save_to_json(self, directory, model_name=None, custom_save=True, overwrite=F
 
         with open(path + "/components.json", 'w') as fp:
             hyperparameters = {}
-
-            for c_path, component in self._json_objects['components'].items():
+            _components = copy.deepcopy(self._json_objects['components'])
+            for c_path, component in _components.items():
                 if component['kwargs'].get('parameter_map', None) is not None:
                     for cKey, pKey in component['kwargs']['parameter_map'].items():
                         pVal = component['kwargs'][cKey]
@@ -264,19 +264,19 @@ def save_to_json(self, directory, model_name=None, custom_save=True, overwrite=F
 
                 for c_path, cKey, _ in hyperparameters[param]:
                     if matched:
-                        self._json_objects['components'][c_path]['kwargs'][cKey] = param
+                        _components[c_path]['kwargs'][cKey] = param
 
                     else:
                         warn("Unable to extract hyperparameter", param,
                              "as it is mismatched between components. Parameter will not be extracted")
 
-            for c_path, component in self._json_objects['components'].items():
+            for c_path, component in _components.items():
                 if "parameter_map" in component['kwargs'].keys():
                     del component['kwargs']["parameter_map"]
                 if "module" in component.keys():
                     del component['module']
 
-            obj = {"components": self._json_objects['components']}
+            obj = {"components": _components}
             if len(hp.keys()) != 0:
                 obj["hyperparameters"] = hp
 

ngcsimlib/deprecators.py

@@ -0,0 +1,29 @@
+from ngcsimlib.logger import warn
+
+
+def deprecated(fn):
+    def _wrapped(*args, **kwargs):
+        warn(fn.__qualname__, "is deprecated")
+        return fn(*args, **kwargs)
+    return _wrapped
+
+
+def deprecate_args(_rebind=True, **arg_list):
+    def _deprecate_args(fn):
+        def _wrapped(*args, **kwargs):
+            for kwarg in list(kwargs.keys()):
+                if kwarg in arg_list.keys():
+                    new_kwarg = arg_list[kwarg]
+                    if new_kwarg is None:
+                        warn(f"The argument \"{kwarg}\" is depricated for {fn.__qualname__}, and will no longer be supported")
+                    else:
+                        warn(f"The argument \"{kwarg}\" is deprecated for {fn.__qualname__}, use \"{new_kwarg}\" instead")
+
+                    if _rebind:
+                        if new_kwarg is not None:
+                            kwargs[new_kwarg] = kwargs[kwarg]
+                        del kwargs[kwarg]
+
+            return fn(*args, **kwargs)
+        return _wrapped
+    return _deprecate_args

ngcsimlib/metaComponent.py

@@ -15,8 +15,12 @@ def pre_init(self, name, *args, **kwargs):
         Called before the classes default init
         """
         self.connections = []
-        self.path = get_current_context().path + "/" + name
-        get_current_context().register_component(self, name, *args, **kwargs)
+        cc = get_current_context()
+        if cc is None:
+            self.path = "/" + name
+        else:
+            self.path = cc.path + "/" + name
+            cc.register_component(self, name, *args, **kwargs)
         self._meta_init = True
 
 
@@ -29,7 +33,8 @@ def post_init(self, *args, **kwargs):
             if Compartment.is_compartment(value):
                 value._setup(self, key)
         # add component to context
-        get_current_context().add_component(self)
+        if get_current_context() is not None:
+            get_current_context().add_component(self)
 
     @staticmethod
     def add_connection(self, op):