diff --git a/src/dashboard_model/service.py b/src/dashboard_model/service.py index dda0eca..bec64d4 100644 --- a/src/dashboard_model/service.py +++ b/src/dashboard_model/service.py @@ -42,7 +42,13 @@ async def get_model_data(*, db_session: DbSession, simulation_id: Optional[UUID] # Equivalent Forced Outage Rate (EFOR) EFOR = main_calc_data.efor + #Prediction EAF = main_calc_data.eaf + EAF_KONKIN = main_calc_data.eaf_konkin + + #Realization + EAF_REAL = 97 + EAF_KONKIN_REAL = 96 powerplant_reliability = { "Plant Control": 98, @@ -66,4 +72,15 @@ async def get_model_data(*, db_session: DbSession, simulation_id: Optional[UUID] "WTP": 98, } - return {"id": str(simulation.id), "availability": availability, "EFOR": EFOR, "EAF": EAF, "powerplant_reliability": powerplant_reliability} + return { + "id": str(simulation.id), + "availability": availability, + "EFOR": EFOR, + "EAF": { + "Prediction_EAF": EAF, + "Prediction_EAF_KONKIN": EAF_KONKIN, + "Real_EAF": EAF_REAL, + "Real_EAF_KONKIN": EAF_KONKIN_REAL + }, + "powerplant_reliability": powerplant_reliability +}