Merge branch 'develop' into get-timeseries-table-generalize

Author: gellwood

CHANGELOG.md

@@ -26,14 +26,17 @@ Classify the change according to the following categories:
     ##### Removed
     ### Patches
 
-## v3.17.1
+## v3.17.2
 ### Minor Updates
 ##### Added
 - Added `/job/get_timeseries_table` endpoint which takes a list of run_uuid's and creates a timeseries results table spreadsheet to download in response
 - New custom table option `custom_timeseries_energy_demand` for endpoint `/job/get_timeseries_table`.
 ##### Changed
 - Increased `monthly_totals_kwh` maximum value to 1.0e9.
 
+## v3.17.1
+##### Changed
+- For the `/get_load_metrics` endpoint, update response field names to be consistent with `/simulated_load` for `load_type=electric`: `annual_kwh`, `max_kw` (annual peak load), `monthly_totals_kwh`, and `monthly_peaks_kw`. In a future update, this endpoint will take `load_type` as an input and return the load metrics with consistent units as `/simulated_load` for heating and cooling `load_type`s, such as `monthly_mmbtu` for the heating load types.
 
 ## v3.17.0
 ### Minor Updates

julia_src/http.jl

@@ -600,6 +600,16 @@ function get_load_metrics(req::HTTP.Request)
         load_profile = pop!(d, "load_profile")
         other_kwargs = reoptjl.dictkeys_tosymbols(d)
         data = reoptjl.get_load_metrics(load_profile; other_kwargs...)
+        rename_map = Dict("annual_peak" => "max_kw",
+                          "annual_energy" => "annual_kwh",
+                          "monthly_energy" => "monthly_totals_kwh",
+                          "monthly_peaks" => "monthly_peaks_kw")
+        for (old_key, new_key) in rename_map
+            if haskey(data, old_key)
+                data[new_key] = data[old_key]
+                delete!(data, old_key)
+            end
+        end
     catch e
         @error "Something went wrong in the get_load_metrics" exception=(e, catch_backtrace())
         error_response["error"] = sprint(showerror, e)

reoptjl/views.py

@@ -1675,7 +1675,7 @@ def get_load_metrics(request):
     try:
         if request.method == "POST":
             post_body = json.loads(request.body)
-            load_profile = list(post_body.get("load_profile"))
+            load_profile = list(post_body["load_profile"])
 
             inputs = {
                 "load_profile": load_profile