Branch 1: failed run journal + bisect Infeasible + granulární relaxace (bez vypnutí evening push)
Some checks failed
CI and deploy / migration-check (push) Failing after 14s
CI and deploy / deploy (push) Has been skipped

This commit is contained in:
Dusan Vojacek
2026-06-06 22:23:59 +02:00
parent 1429d402e5
commit 2a963c9793
7 changed files with 593 additions and 72 deletions

View File

@@ -21,6 +21,7 @@ from services.planning_engine import (
_evening_push_discharge_budget_wh,
_evening_push_override_for_solve,
_filter_evening_push_override_indices,
_solver_relax_chain,
_primary_night_export_segment_indices,
_in_evening_push_hour_window,
_in_night_battery_export_window,
@@ -3219,14 +3220,25 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
{2, 5},
relaxed_expensive_import=False,
relaxed_neg_buy_charge=False,
relaxed_neg_prep_hold_only=False,
relaxed_neg_prep_window=False,
neg_sell_phases_fallback=False,
)
self.assertEqual(kept, {2, 5})
kept_prep_hold = _evening_push_override_for_solve(
{2, 5},
relaxed_expensive_import=False,
relaxed_neg_buy_charge=False,
relaxed_neg_prep_hold_only=True,
relaxed_neg_prep_window=False,
neg_sell_phases_fallback=False,
)
self.assertEqual(kept_prep_hold, {2, 5})
dropped = _evening_push_override_for_solve(
{2, 5},
relaxed_expensive_import=True,
relaxed_neg_buy_charge=False,
relaxed_neg_prep_hold_only=False,
relaxed_neg_prep_window=False,
neg_sell_phases_fallback=False,
)
@@ -3369,6 +3381,83 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
push_iso = snap["inputs"].get("evening_push_ts") or []
self.assertGreaterEqual(len(push_iso), 1)
def test_relaxed_neg_prep_hold_only_keeps_hard_push(self) -> None:
"""v63: prep_hold_only uvolní prep hold, ne tvrdý evening push."""
prague = ZoneInfo("Europe/Prague")
slots = [
PlanningSlot(
interval_start=datetime(2026, 5, 30, 18, 0, tzinfo=prague).astimezone(timezone.utc),
buy_price=3.0,
sell_price=4.0,
pv_a_forecast_w=0,
pv_b_forecast_w=0,
load_baseline_w=500,
ev1_connected=False,
ev2_connected=False,
allow_discharge_export=True,
),
PlanningSlot(
interval_start=datetime(2026, 5, 30, 22, 0, tzinfo=prague).astimezone(timezone.utc),
buy_price=3.0,
sell_price=6.0,
pv_a_forecast_w=0,
pv_b_forecast_w=0,
load_baseline_w=500,
ev1_connected=False,
ev2_connected=False,
allow_discharge_export=True,
),
]
battery = _battery(uc_wh=64_000.0)
battery.max_discharge_power_w = 18_000
battery.planner_neg_sell_prep_soc_percent = 80
battery.planner_neg_sell_full_soc_tail_slots = 4
grid = SimpleNamespace(
max_export_power_w=13_500,
max_import_power_w=17_000,
block_export_on_negative_sell=False,
purchase_pricing_mode="spot",
)
_results, _ms, snap = solve_dispatch(
slots,
battery,
SimpleNamespace(rated_heating_power_w=0, tuv_min_temp_c=45.0, tuv_target_temp_c=55.0),
grid,
[None, None],
[
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
],
current_soc_wh=16_000.0,
current_tuv_temp_c=55.0,
relaxed_expensive_import=True,
relaxed_neg_buy_charge=True,
relaxed_neg_prep_hold_only=True,
)
self.assertTrue(snap["inputs"].get("relaxed_neg_prep_hold_only"))
self.assertFalse(snap["inputs"].get("relaxed_neg_prep_window"))
self.assertFalse(snap["inputs"].get("evening_push_hard_suppressed"))
self.assertIn(
"relaxed_neg_prep_hold_only",
snap["inputs"].get("relax_chain") or [],
)
def test_solver_relax_chain_order(self) -> None:
chain = _solver_relax_chain(
relaxed_expensive_import=True,
relaxed_neg_buy_charge=True,
relaxed_neg_prep_hold_only=True,
)
self.assertEqual(
chain,
[
"strict",
"relaxed_expensive_import",
"relaxed_neg_buy_charge",
"relaxed_neg_prep_hold_only",
],
)
def test_kv1_evening_push_profitable_vs_morning_zone_peak(self) -> None:
"""v52: KV1 večer ≥ ranní max (511) degrad; pod prahem ne."""
prague = ZoneInfo("Europe/Prague")