fix: update simulation forecast window logic and include node relationship loading in trip query

main
Cizz22 3 months ago
parent e77732cbbe
commit 6713cc7b22

@ -533,8 +533,8 @@ async def get_forecast_eaf(
# 4. Define Forecast Window # 4. Define Forecast Window
duration = 168 if time_range == "weekly" else 720 duration = 168 if time_range == "weekly" else 720
start_date = oh_date + timedelta(hours=offset_hours) start_date = oh_date
end_date = start_date + timedelta(hours=duration) end_date = now + timedelta(hours=duration)
project = await get_project(db_session=db_session) project = await get_project(db_session=db_session)
# 5. Create Simulation Request # 5. Create Simulation Request

@ -180,7 +180,7 @@ async def get_latest_sim_results_by_pattern(db_session: DbSession, pattern: str)
trip_query = select(AerosSimulationCalcResult).join(AerosNode).where( trip_query = select(AerosSimulationCalcResult).join(AerosNode).where(
AerosSimulationCalcResult.aeros_simulation_id == simulation.id, AerosSimulationCalcResult.aeros_simulation_id == simulation.id,
AerosNode.node_type == 'RegularNode' AerosNode.node_type == 'RegularNode'
).order_by(AerosSimulationCalcResult.num_events.desc()).limit(5) ).options(selectinload(AerosSimulationCalcResult.aeros_node)).order_by(AerosSimulationCalcResult.num_events.desc()).limit(5)
trip_res_exec = await db_session.execute(trip_query) trip_res_exec = await db_session.execute(trip_query)
trip_results = trip_res_exec.scalars().all() trip_results = trip_res_exec.scalars().all()

Loading…
Cancel
Save