Add dicttype arg to JSON.parsefile calls throughout code

CHANGELOG.md

@@ -25,6 +25,10 @@ Classify the change according to the following categories:
     ### Deprecated
     ### Removed
 
+## dict-type
+### Fixed
+- Added dicttype arg to _JSON.parsefile_ (solves _MethodError_ when the parsed JSON file is passed to the next function (e.g. `Scenario`) as a _JSON.Object_ but expecting _Dict_)
+
 ## v0.59.2
 ### Fixed
 - Restrictive validation to let CHP heuristic sizing parameters (avg heating and cooling values) be zero

src/core/pv.jl

@@ -584,7 +584,7 @@ function get_pv_defaults_size_class()
         throw(ErrorException("pv_defaults.json not found at path: $pv_defaults_path"))
     end
 
-    pv_defaults_all = JSON.parsefile(pv_defaults_path)
+    pv_defaults_all = parse_json_file_to_dict(pv_defaults_path)
     return pv_defaults_all["size_classes"]
 end
 

src/core/reopt.jl

@@ -27,7 +27,7 @@ Solve the model using the `Scenario` defined in JSON file stored at the file pat
 function run_reopt(m::JuMP.AbstractModel, fp::String)
 
 	try
-		s = Scenario(JSON.parsefile(fp))
+		s = Scenario(parse_json_file_to_dict(fp))
 		run_reopt(m, REoptInputs(s))
 	catch e
 		if isnothing(e) # Error thrown by REopt
@@ -99,7 +99,7 @@ Solve the `Scenario` and `BAUScenario` in parallel using the first two (empty) m
 JSON file at the filepath `fp`.
 """
 function run_reopt(ms::AbstractArray{T, 1}, fp::String) where T <: JuMP.AbstractModel
-	d = JSON.parsefile(fp)
+	d = parse_json_file_to_dict(fp)
     run_reopt(ms, d)
 end
 
@@ -172,7 +172,7 @@ Add variables and constraints for REopt model.
 `fp` is used to load in JSON file to construct REoptInputs.
 """
 function build_reopt!(m::JuMP.AbstractModel, fp::String)
-	s = Scenario(JSON.parsefile(fp))
+	s = Scenario(parse_json_file_to_dict(fp))
 	build_reopt!(m, REoptInputs(s))
 	nothing
 end

src/core/reopt_inputs.jl

@@ -147,14 +147,14 @@ end
 Use `fp` to load in JSON scenario:
 ```
 function REoptInputs(fp::String)
-    s = Scenario(JSON.parsefile(fp))
+    s = Scenario(parse_json_file_to_dict(fp))
     REoptInputs(s)
 end
 ```
 Useful if you want to manually modify REoptInputs before solving the model.
 """
 function REoptInputs(fp::String)
-    s = Scenario(JSON.parsefile(fp))
+    s = Scenario(parse_json_file_to_dict(fp))
     REoptInputs(s)
 end
 

src/core/scenario.jl

@@ -77,7 +77,6 @@ function Scenario(d::Dict; flex_hvac_from_json=false)
     else
         settings = Settings()
     end
-
     site = Site(;dictkeys_tosymbols(d["Site"])...)
 
     # Check that only PV, electric storage, and generator are modeled for off-grid
@@ -1077,7 +1076,7 @@ end
 Consruct Scenario from filepath `fp` to JSON with keys aligned with the `Scenario(d::Dict)` method.
 """
 function Scenario(fp::String)
-    Scenario(JSON.parsefile(fp); flex_hvac_from_json=true)
+    Scenario(parse_json_file_to_dict(fp); flex_hvac_from_json=true)
 end
 
 

src/core/utils.jl

@@ -1,4 +1,13 @@
 # REopt®, Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/REopt.jl/blob/master/LICENSE.
+"""
+    parse_json_file_to_dict(fp::String)::Dict{String, Any}
+
+Parse a JSON file at filepath `fp` and return a `Dict{String, Any}`.
+"""
+function parse_json_file_to_dict(fp::String)::Dict{String, Any}
+    JSON.parsefile(fp, dicttype = Dict{String, Any})
+end
+
 function time_step_wrap_around(time_step::Int; time_steps_per_hour::Int=1)::Int
     time_steps_per_year = 8760 * time_steps_per_hour
     ((time_step - 1) % time_steps_per_year) + 1

src/mpc/inputs.jl

@@ -29,7 +29,7 @@ end
 
 
 function MPCInputs(fp::String)
-    s = MPCScenario(JSON.parsefile(fp))
+    s = MPCScenario(parse_json_file_to_dict(fp))
     MPCInputs(s)
 end
 

src/mpc/model.jl

@@ -7,7 +7,7 @@ Solve the model predictive control problem using the `MPCScenario` defined in th
 Returns a Dict of results with keys matching those in the `MPCScenario`.
 """
 function run_mpc(m::JuMP.AbstractModel, fp::String)
-	s = MPCScenario(JSON.parsefile(fp))
+	s = MPCScenario(parse_json_file_to_dict(fp))
 	run_mpc(m, MPCInputs(s))
 end