Revert "Hot Fix: ASHP defaults updating from REopt.jl"

Author: Bill-Becker

reoptjl/src/process_results.py

@@ -141,10 +141,8 @@ def update_inputs_in_database(inputs_to_update: dict, run_uuid: str) -> None:
             else:
                 ExistingChillerInputs.objects.filter(meta__run_uuid=run_uuid).update(**inputs_to_update["ExistingChiller"])
         if inputs_to_update["ASHPSpaceHeater"]:
-            prune_update_fields(ASHPSpaceHeaterInputs, inputs_to_update["ASHPSpaceHeater"])
             ASHPSpaceHeaterInputs.objects.filter(meta__run_uuid=run_uuid).update(**inputs_to_update["ASHPSpaceHeater"])
         if inputs_to_update["ASHPWaterHeater"]:
-            prune_update_fields(ASHPWaterHeaterInputs, inputs_to_update["ASHPWaterHeater"])
             ASHPWaterHeaterInputs.objects.filter(meta__run_uuid=run_uuid).update(**inputs_to_update["ASHPWaterHeater"])
     except Exception as e:
         exc_type, exc_value, exc_traceback = sys.exc_info()
@@ -154,13 +152,3 @@ def update_inputs_in_database(inputs_to_update: dict, run_uuid: str) -> None:
                                                                         tb.format_tb(exc_traceback)
                                                                     )
         log.debug(debug_msg)
-
-def prune_update_fields(model_obj, dict_to_update):
-    """
-    REopt.jl may return more fields than the API has to update, so prune those extra ones before updating the model/db object
-    """
-    field_names = [field.name for field in model_obj._meta.get_fields()]
-    dict_to_update_keys = list(dict_to_update.keys())
-    for key in dict_to_update_keys:
-        if key not in field_names:
-            del dict_to_update[key]

reoptjl/test/posts/ashp_defaults_update.json

@@ -311,19 +311,4 @@ def test_centralghp(self):
         resp = self.api_client.get(f'/v3/job/{run_uuid}/results')
         r = json.loads(resp.content)
 
-        self.assertAlmostEqual(r["outputs"]["Financial"]["lifecycle_capital_costs"], 1046066.8, delta=1000)
-
-    def test_ashp_defaults_update_from_julia(self):
-        # Test that the inputs_with_defaults_set_in_julia feature worked for ASHPSpaceHeater
-        post_file = os.path.join('reoptjl', 'test', 'posts', 'ashp_defaults_update.json')
-        post = json.load(open(post_file, 'r'))
-        resp = self.api_client.post('/stable/job/', format='json', data=post)
-        self.assertHttpCreated(resp)
-        r = json.loads(resp.content)
-        run_uuid = r.get('run_uuid')
-
-        resp = self.api_client.get(f'/stable/job/{run_uuid}/results')
-        r = json.loads(resp.content)
-        
-        self.assertEquals(r["inputs"]["ASHPSpaceHeater"]["om_cost_per_ton"], 0.0)
-        self.assertEquals(r["inputs"]["ASHPSpaceHeater"]["sizing_factor"], 1.1)        
+        self.assertAlmostEqual(r["outputs"]["Financial"]["lifecycle_capital_costs"], 1046066.8, delta=1000)