Merge pull request #18 from NACLab/dev

Dev

Author: ago109

ngcsimlib/context.py

@@ -327,6 +327,7 @@ def make_components(self, path_to_components_file, custom_file_dir=None):
                 this directory is named `custom` if the save_to_json method is
                 used. (Default: None)
         """
+        made_components = []
         with open(path_to_components_file, 'r') as file:
             componentsConfig = json.load(file)
 
@@ -349,6 +350,9 @@ def make_components(self, path_to_components_file, custom_file_dir=None):
                 if check_attributes(obj, ["load"]):
                     obj.load(custom_file_dir)
 
+                made_components.append(obj)
+        return made_components
+
     def make_ops(self, path_to_ops_file):
         """
         Loads a collection of ops from a json file. Follow `ops.schema`
@@ -501,3 +505,4 @@ def make_modules(self):
             _modules.append({"absolute_path": key, "attributes": value["attributes"]})
 
         return _modules
+

ngcsimlib/logger.py

@@ -69,7 +69,7 @@ def init_logging():
         loggingConfig = {"logging_file": None,
                          "logging_level": logging.WARNING,
                          "hide_console": False,
-                         "custom_levels": {"ANALYSIS", 25}}
+                         "custom_levels": {"ANALYSIS": 25}}
 
     if loggingConfig.get("custom_levels", None) is not None:
         for level_name, level_num in loggingConfig.get("custom_levels", {}).items():
@@ -163,6 +163,23 @@ def debug(msg):
 
 @_concatArgs
 def custom_log(msg, logging_level=None):
+    """
+    Logs to a user defined logging level. This will only work for user defined
+    levels if a builtin logging level is desired please use on of the builtin
+    logging methods found in this file. To defined logging levels add them to the
+    configuration file of your project. To add levels here add the map of
+    `logging_levels` to the top level logging object and have the key be the new
+    logging level name, and the value be the numerical logging value. To see all
+    build in logging levels look at the builtin python logger package.
+
+
+    This is decorated to have the same functionality of python's print argument concatenation
+
+    Args:
+        msg: The message to log
+
+        logging_level: The user defined logging level.
+    """
     if isinstance(logging_level, str):
         logging_level = logging_level.upper()