Fix #55 create model meta class

* bump to version 0.2.6 Bicycle Bears
* update model attribute if layers declared as classes in model class so that it can be saved as JSON and remove FIXME
* fix import issues in carousel.test - don't use imp, instead use importlib, since imp causes import issues with pvpower.tests
* change name of import from "pvpower_models" to "sandia_performance_model" in tests, test_model and test_calcs
* use dirname(path) instead of join(path, '..')

Author: mikofski

carousel/__init__.py

@@ -7,5 +7,5 @@
 __author__ = u'Mark Mikofski'
 __email__ = u'mark.mikofski@sunpowercorp.com'
 __url__ = u'https://github.com/SunPower/Carousel'
-__version__ = u'0.2.5'
-__release__ = u'Brass Rings'
+__version__ = u'0.2.6'
+__release__ = u'Bicycle Bears'

carousel/core/models.py

@@ -178,6 +178,7 @@ def _initialize(self):
         # initialize layers
         # FIXME: move import inside loop for custom layers in different modules
         mod = importlib.import_module(self.layers_mod, self.layers_pkg)
+        src_model = {}
         for layer, value in self.model.iteritems():
             # from layers module get the layer's class definition
             layer_cls = getattr(mod, self.layer_cls_names[layer])  # class def
@@ -200,10 +201,12 @@ def _initialize(self):
                 src_value[src.__name__].update(kwargs)
             # use layer values generated from source class
             if src_value:
-                value = src_value
-                # FIXME: update model with dictionary, can't save
+                value = src_model[layer] = src_value
             # set layer attribute with model data
             setattr(self, layer, layer_cls(value))
+        # update model with layer values generated from source classes
+        if src_model:
+            self.model.update(src_model)
         self._update()
         self._state = 'initialized'
 
@@ -329,4 +332,5 @@ def command(self, cmd, progress_hook=None, *args, **kwargs):
             sim_names = self.cmd_layer.reg.iterkeys()
         for sim_name in sim_names:
             sim_cmd = getattr(self.cmd_layer.reg[sim_name], cmd)
-            sim_cmd(self.registries, progress_hook=progress_hook, *args, **kwargs)
+            sim_cmd(self.registries, progress_hook=progress_hook,
+                    *args, **kwargs)

carousel/tests/__init__.py

@@ -3,7 +3,7 @@
 """
 
 from carousel.core import logging
-import imp
+import importlib
 import os
 import sys
 
@@ -17,10 +17,29 @@
 ))
 
 sys.path.append(PROJ_PATH)
-try:
-    fid, fn, info = imp.find_module(
-        MODEL, [os.path.join(PROJ_PATH, PROJECT.lower())]
-    )
-    pvpower_models = imp.load_module(MODEL, fid, fn, info)
-finally:
-    fid.close()
+sandia_performance_model = importlib.import_module(
+    '.%s' % MODEL, PROJECT.lower()
+)
+
+# using imp interferes with pvpower tests so comment out
+
+# import imp
+# PVPOWER_PKG = PROJECT.lower()
+#
+# # pvpower package
+# fid, fn, info = imp.find_module(PVPOWER_PKG, [PROJ_PATH])
+# LOGGER.debug('filename: %s', fn)
+# try:
+#     PVPOWER_PKG = imp.load_module(PVPOWER_PKG, fid, fn, info)
+# finally:
+#     if fid:
+#         fid.close()
+# LOGGER.debug('package: %r', PVPOWER_PKG)
+# PVPOWER_MOD = '%s.%s' % (PVPOWER_PKG.__name__, MODEL)
+# # pvpower model
+# fid, fn, info = imp.find_module(MODEL, PVPOWER_PKG.__path__)
+# try:
+#     sandia_performance_model = imp.load_module(PVPOWER_MOD, fid, fn, info)
+# finally:
+#     if fid:
+#         fid.close()

carousel/tests/test_calcs.py

@@ -4,7 +4,7 @@
 
 from nose.tools import ok_, eq_
 from carousel.core.calculations import Calc
-from carousel.tests import PROJ_PATH, pvpower_models
+from carousel.tests import PROJ_PATH, sandia_performance_model
 import os
 import uncertainties
 from pvlib.solarposition import get_solarposition as solpos
@@ -73,7 +73,7 @@ def test_static_calc_unc():
     # FIXME: this shouldn't have to run a model to test the uncertainty
     test_model_file = os.path.join(PROJ_PATH, 'models',
                                    'sandia_performance_model-Tuscon.json')
-    test_model = pvpower_models.SAPM(test_model_file)  # create model
+    test_model = sandia_performance_model.SAPM(test_model_file)  # create model
     test_model.command('start')  # start simulation
     # get parameters from model
     dt = test_model.outputs.reg['timestamps']  # timestamps

carousel/tests/test_model.py

@@ -5,7 +5,7 @@
 
 from nose.tools import ok_
 from carousel.core.models import Model
-from carousel.tests import PROJ_PATH, pvpower_models, logging
+from carousel.tests import PROJ_PATH, sandia_performance_model, logging
 import os
 
 LOGGER = logging.getLogger(__name__)
@@ -18,7 +18,7 @@ def test_carousel_model():
     """
 
     model_test_file = os.path.join(PROJ_PATH, 'models', MODELFILE)
-    carousel_model_test1 = pvpower_models.SAPM(model_test_file)
+    carousel_model_test1 = sandia_performance_model.SAPM(model_test_file)
     ok_(isinstance(carousel_model_test1, Model))
 
     carousel_model_test2 = PVPowerSAPM2()
@@ -98,23 +98,26 @@ class PVPowerSAPM2(Model):
 class PVPowerSAPM3(Model):
     modelpath = PROJ_PATH
     outputs = [
-        pvpower_models.PVPowerOutputs,
-        pvpower_models.PerformanceOutputs,
-        pvpower_models.IrradianceOutputs
+        sandia_performance_model.PVPowerOutputs,
+        sandia_performance_model.PerformanceOutputs,
+        sandia_performance_model.IrradianceOutputs
     ]
     formulas = [
-        pvpower_models.UtilityFormulas,
-        pvpower_models.PerformanceFormulas,
-        pvpower_models.IrradianceFormulas
+        sandia_performance_model.UtilityFormulas,
+        sandia_performance_model.PerformanceFormulas,
+        sandia_performance_model.IrradianceFormulas
+    ]
+    data = [
+        (sandia_performance_model.PVPowerData,
+         {"path": None, "filename": "Tuscon.json"})
     ]
-    data = [(pvpower_models.PVPowerData, {"filename": "Tuscon.json"})]
     calculations = [
-        pvpower_models.UtilityCalcs,
-        pvpower_models.PerformanceCalcs,
-        pvpower_models.IrradianceCalcs
+        sandia_performance_model.UtilityCalcs,
+        sandia_performance_model.PerformanceCalcs,
+        sandia_performance_model.IrradianceCalcs
     ]
     simulations = [
-        (pvpower_models.Standalone,
+        (sandia_performance_model.Standalone,
          {"path": "Standalone", "filename": "Tuscon.json"})
     ]
 

examples/PVPower/pvpower/__init__.py

@@ -9,4 +9,4 @@
 __email__ = 'mark.mikofski@sunpowercorp.com'
 
 PKG_PATH = os.path.abspath(os.path.dirname(__file__))
-PROJ_PATH = os.path.abspath(os.path.join(PKG_PATH, '..'))
+PROJ_PATH = os.path.dirname(PKG_PATH)