Fixed bug with multiple components with the same class name when auto-generating modules.json (#15)

Author: willgebhardt

ngcsimlib/context.py

@@ -147,6 +147,7 @@ def register_component(self, component, *args, **kwargs):
 
         c_path = component.path
         c_class = component.__class__.__name__
+        c_mod = component.__class__.__module__
 
         _args = []
 
@@ -163,7 +164,7 @@ def register_component(self, component, *args, **kwargs):
             del _kwargs[key]
             info("Failed to serialize \"", key, "\" in ", component.path, sep="")
 
-        obj = {"class": c_class, "args": _args, "kwargs": _kwargs}
+        obj = {"class": c_class, "module": c_mod, "args": _args, "kwargs": _kwargs}
         self._json_objects['components'][c_path] = obj
 
     def add_component(self, component):
@@ -272,6 +273,8 @@ def save_to_json(self, directory, model_name=None, custom_save=True, overwrite=F
             for c_path, component in self._json_objects['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']}
             if len(hp.keys()) != 0:
@@ -455,9 +458,7 @@ def make_modules(self):
         modules = {}
         jComponents = self._json_objects['components']
         for c_path, c in jComponents.items():
-            mod = load_module(c["class"]).__name__
-
-            module = ".".join(mod.split(".")[:-1])
+            module = load_module(c["module"], absolute_path=True).__name__
             klass = c["class"]
 
             if module not in modules.keys():