fix: prioritize reservation conflicts by value

This commit is contained in:
Your Name committed 2026-06-23 11:46:02 +08:00
1 parent 4af2adc4d6
commit 25df550304
10 files changed
+362 -16

No files matched your search

@@ -518,16 +518,22 @@ def step4_make_join_decision(
remain_seconds = int(future_timestamp - current_time)
if remain_seconds > 0:
try:
current_prize_value = float(detail[4] or 0.0)
except Exception:
current_prize_value = 0.0
# 设置等待开奖标志和预期开奖时间
self._waiting_for_lottery_result = True
self._lottery_result_expected_ts = future_timestamp
self._lottery_wait_start_ts = time.time()
self._lottery_wait_prize_value_yuan = current_prize_value
self._log_kv(
"参与",
"参与成功,设置等待开奖标志,停止其他行为",
remain_seconds=remain_seconds,
future_ts=int(future_timestamp),
prize_value_yuan=current_prize_value,
)
# 检查是否是预约福袋,如果是处理锁定期和移除预约
@@ -179,6 +179,7 @@ def apply_fudai_defaults(self: Any) -> None:
self._fudai_detail_consecutive_failures = 0
self._detail_closed_by_attend = False
self._lottery_result_expected_ts = 0.0
self._lottery_wait_prize_value_yuan = 0.0
self._lottery_wait_start_ts = 0.0
@@ -48,6 +48,7 @@ def handle_waiting_for_lottery_result(self: "fudai_analyse", start_time: float)
if current_ts >= timeout_ts:
self._waiting_for_lottery_result = False
self._current_attending_reservation_fudai = False
self._lottery_wait_prize_value_yuan = 0.0
timeout_seconds = int(current_ts - future_ts)
self._log_kv(
"参与",
@@ -107,6 +108,7 @@ def handle_waiting_for_lottery_result(self: "fudai_analyse", start_time: float)
if result:
self._waiting_for_lottery_result = False
self._current_attending_reservation_fudai = False
self._lottery_wait_prize_value_yuan = 0.0
try:
self._log_kv(
"参与",
@@ -151,6 +153,7 @@ def handle_waiting_for_lottery_result(self: "fudai_analyse", start_time: float)
self._waiting_for_lottery_result = False
self._current_attending_reservation_fudai = False
self._lottery_wait_prize_value_yuan = 0.0
try:
self._log_kv(
"参与",
@@ -192,6 +195,7 @@ def handle_waiting_for_lottery_result(self: "fudai_analyse", start_time: float)
self._log_kv("参与", "等待开奖检测时出错", error=str(exc))
self._waiting_for_lottery_result = False
self._current_attending_reservation_fudai = False
self._lottery_wait_prize_value_yuan = 0.0
return False
@@ -10,6 +10,26 @@ if TYPE_CHECKING:
from ..douyin_fudai import fudai_analyse
def _safe_float_attr(obj, name: str, default: float) -> float:
try:
value = getattr(obj, name, default)
if not isinstance(value, (int, float, str)):
return float(default)
return float(value if value is not None else default)
except Exception:
return float(default)
def _safe_int_attr(obj, name: str, default: int) -> int:
try:
value = getattr(obj, name, default)
if not isinstance(value, (int, float, str)):
return int(default)
return int(value if value is not None else default)
except Exception:
return int(default)
def handle_reservation_check(self: "fudai_analyse", start_time: float) -> bool:
"""0.1 高价值预约检查:清空队列 / 处理队列已满 / 调 process_reservation_attend_window。"""
try:
@@ -218,14 +238,18 @@ def _run_reservation_attend_window(self: "fudai_analyse", start_time: float) ->
except Exception:
return False
max_reservations = int(getattr(self, "high_value_fudai_max_reservations", 3) or 3)
if getattr(self, "_waiting_for_lottery_result", False):
if not _should_allow_reservation_preempt_waiting_lottery(self):
return False
max_reservations = _safe_int_attr(self, "high_value_fudai_max_reservations", 3)
if len(self.reservations) >= max_reservations and not self.queue_full_waiting_at_earliest:
waiting = douyin_reservation_logic.handle_queue_full_wait_at_earliest(
analyser=self,
reservations=self.reservations,
room_pos=int(getattr(self, "room_pos", 0) or 0),
reservation_focus_until_ts_ref=focus_ref,
reservation_back_swipe_delay_s=float(self.reservation_back_swipe_delay or 0.6),
reservation_back_swipe_delay_s=_safe_float_attr(self, "reservation_back_swipe_delay", 0.6),
swipe_down_back_callback=_swipe_down_once,
seek_reservation_room_callback=_seek_reservation_room,
sort_reservations_callback=_sort_reservations,
@@ -239,12 +263,7 @@ def _run_reservation_attend_window(self: "fudai_analyse", start_time: float) ->
self._log_kv("流程", "run_once_basic完成(预约队列满等待)", elapsed_seconds=round(elapsed, 2))
return True
if getattr(self, "_waiting_for_lottery_result", False):
try:
self._log_kv("预约", "[预约] 正在等待开奖,跳过预约回退检查", waiting_for_lottery=True)
except Exception:
pass
elif getattr(self, "_current_attending_reservation_fudai", False):
if getattr(self, "_current_attending_reservation_fudai", False):
try:
self._log_kv(
"预约",
@@ -303,7 +322,7 @@ def _run_reservation_attend_window(self: "fudai_analyse", start_time: float) ->
room_pos=int(getattr(self, "room_pos", 0) or 0),
reservation_focus_until_ts_ref=focus_ref,
reservation_after_action_pending_ref=after_action_ref,
reservation_back_swipe_delay_s=float(self.reservation_back_swipe_delay or 0.6),
reservation_back_swipe_delay_s=_safe_float_attr(self, "reservation_back_swipe_delay", 0.6),
swipe_down_back_callback=_swipe_down_once,
seek_reservation_room_callback=_seek_reservation_room,
sort_reservations_callback=_sort_reservations,
@@ -353,6 +372,150 @@ def _run_reservation_attend_window(self: "fudai_analyse", start_time: float) ->
return False
def _should_allow_reservation_preempt_waiting_lottery(self: "fudai_analyse") -> bool:
"""等待开奖期间只允许明显更高价值的预约抢占。"""
try:
current_value = float(getattr(self, "_lottery_wait_prize_value_yuan", 0.0) or 0.0)
except Exception:
current_value = 0.0
try:
current_future_ts = float(getattr(self, "_lottery_result_expected_ts", 0.0) or 0.0)
except Exception:
current_future_ts = 0.0
try:
reservations = list(getattr(self, "reservations", []) or [])
except Exception:
reservations = []
if not reservations:
try:
self._log_kv(
"预约",
"[预约] 正在等待开奖,预约队列为空,跳过预约回退检查",
waiting_for_lottery=True,
current_wait_value=current_value,
current_future_ts=int(current_future_ts) if current_future_ts > 0 else 0,
)
except Exception:
pass
return False
now_ts = time.time()
try:
poll_before = _safe_float_attr(self, "high_value_fudai_poll_before_seconds", 10.0)
except Exception:
poll_before = 10.0
join_ahead = _safe_float_attr(self, "high_value_fudai_join_ahead_seconds", 100.0)
swipe_delay = _safe_float_attr(self, "reservation_back_swipe_delay", 0.6)
try:
room_pos = int(getattr(self, "room_pos", 0) or 0)
except Exception:
room_pos = 0
try:
from douyin.reservation.reservation_logic.attend_window_helpers import compute_dynamic_ahead
from douyin.reservation.reservation_logic.helpers import (
_select_reservation_target_for_window,
)
def _dynamic_ahead_for_item(item: dict) -> float:
dynamic_ahead, _est = compute_dynamic_ahead(
self,
item,
room_pos,
swipe_delay,
join_ahead,
)
return dynamic_ahead
selected_idx, target = _select_reservation_target_for_window(
reservations,
now_ts,
_dynamic_ahead_for_item,
poll_before,
)
except Exception:
selected_idx, target = 0, reservations[0]
try:
target_future_ts = float(target.get("future_ts") or 0.0)
except Exception:
target_future_ts = 0.0
try:
target_value = float(target.get("prize_value_yuan") or 0.0)
except Exception:
target_value = 0.0
# 若选择器没有命中当前窗口,会返回队头;此时不要用未来预约打断等待开奖。
in_window = False
try:
from douyin.reservation.reservation_logic.attend_window_helpers import compute_dynamic_ahead
dynamic_ahead, _est = compute_dynamic_ahead(
self,
target,
room_pos,
swipe_delay,
join_ahead,
)
in_window = (target_future_ts > 0) and (
now_ts >= target_future_ts - max(0.0, dynamic_ahead)
) and (now_ts <= target_future_ts + max(0.0, poll_before))
except Exception:
in_window = False
if not in_window:
try:
self._log_kv(
"预约",
"[预约] 正在等待开奖,预约未到参与窗口,跳过预约回退检查",
waiting_for_lottery=True,
current_wait_value=current_value,
target_value=target_value,
target_future_ts=int(target_future_ts) if target_future_ts > 0 else 0,
decision="skip_reservation_back",
reason="waiting_lottery_target_window_not_reached",
)
except Exception:
pass
return False
if target_value <= current_value:
try:
self._log_kv(
"预约",
"[预约] 正在等待开奖,当前已参与福袋价值不低于预约,跳过预约回退检查",
waiting_for_lottery=True,
current_wait_value=current_value,
current_future_ts=int(current_future_ts) if current_future_ts > 0 else 0,
target_value=target_value,
target_future_ts=int(target_future_ts) if target_future_ts > 0 else 0,
selected_index=int(selected_idx),
decision="skip_reservation_back",
reason="waiting_lottery_current_value_ge_target",
)
except Exception:
pass
return False
try:
self._log_kv(
"预约",
"[预约] 正在等待开奖,但预约价值更高,允许抢占当前等待",
waiting_for_lottery=True,
current_wait_value=current_value,
current_future_ts=int(current_future_ts) if current_future_ts > 0 else 0,
target_value=target_value,
target_future_ts=int(target_future_ts) if target_future_ts > 0 else 0,
selected_index=int(selected_idx),
decision="allow_reservation_back",
reason="waiting_lottery_target_value_gt_current",
)
except Exception:
pass
return True
def _write_reservations_state(self: "fudai_analyse") -> None:
from datetime import datetime
+10
View File
@@ -363,11 +363,21 @@ def attend_choujiang(analyser) -> bool:
analyser._waiting_for_lottery_result = True
analyser._lottery_result_expected_ts = future_ts
analyser._lottery_wait_start_ts = current_time
try:
analyser._lottery_wait_prize_value_yuan = float(
prize_value_yuan or 0.0
)
except Exception:
analyser._lottery_wait_prize_value_yuan = 0.0
analyser._log_kv(
"参与",
"参与成功,设置等待开奖标志",
remain_seconds=int(remain_seconds),
future_ts=int(future_ts),
prize_value_yuan=float(
getattr(analyser, "_lottery_wait_prize_value_yuan", 0.0)
or 0.0
),
lottery_result_expected_ts=int(
analyser._lottery_result_expected_ts
),
@@ -895,6 +895,7 @@ def handle_reservation_direct_attend(analyser: Any) -> None:
analyser._waiting_for_lottery_result = True
analyser._lottery_result_expected_ts = future_ts
analyser._lottery_wait_start_ts = current_time
analyser._lottery_wait_prize_value_yuan = prize_value_yuan
analyser._current_attending_reservation_fudai = (
True # 标记当前正在参与预约福袋
)
@@ -903,6 +904,7 @@ def handle_reservation_direct_attend(analyser: Any) -> None:
"[预约] 预约回退后参与成功,设置开奖等待状态",
remain_seconds=int(remain_seconds),
future_ts=int(future_ts),
prize_value_yuan=float(prize_value_yuan or 0.0),
lottery_result_expected_ts=int(
analyser._lottery_result_expected_ts
),
@@ -22,6 +22,7 @@ from .helpers import (
_extract_content_core,
_normalize_room_title_for_matching,
_now_ts,
_select_reservation_target_for_window,
_sort_reservations_inplace,
)
from .attend_window_helpers import (
@@ -273,8 +274,45 @@ def process_reservation_attend_window(
except Exception:
pass
# 取队头(最早需要处理的一条;若在锁定期内已将锁定目标移动到队头,则这里即为锁定目标)
target = reservations[0]
# 取目标预约:默认最早开奖;若多个预约窗口同时命中,则优先价值更高的。
def _dynamic_ahead_for_item(item: ReservationItem) -> float:
dynamic_ahead_i, _est_back_times_i = compute_dynamic_ahead(
analyser,
item,
room_pos,
reservation_back_swipe_delay_s,
join_ahead=float(
getattr(analyser, "high_value_fudai_join_ahead_seconds", 100) or 100
),
)
return dynamic_ahead_i
selected_idx, target = _select_reservation_target_for_window(
reservations,
now_ts,
_dynamic_ahead_for_item,
poll_before,
)
if selected_idx != 0:
try:
selected_item = reservations.pop(selected_idx)
reservations.insert(0, selected_item)
target = selected_item
analyser._log_kv(
"预约",
"[预约] 多预约窗口冲突,优先选择价值更高预约",
selected_index=int(selected_idx),
selected_future_ts=int(float(target.get("future_ts") or 0.0)),
selected_value=float(target.get("prize_value_yuan") or 0.0),
earliest_future_ts=int(float(reservations[1].get("future_ts") or 0.0))
if len(reservations) > 1
else 0,
earliest_value=float(reservations[1].get("prize_value_yuan") or 0.0)
if len(reservations) > 1
else 0.0,
)
except Exception:
pass
try:
ft = float(target.get("future_ts") or 0.0)
except Exception:
@@ -10,7 +10,7 @@ from __future__ import annotations
import re
import time
from typing import List
from typing import List, Tuple
from ._common import ReservationItem
@@ -128,3 +128,51 @@ def _sort_reservations_inplace(reservations: List[ReservationItem]) -> None:
reservations.sort(key=_key)
def _select_reservation_target_for_window(
reservations: List[ReservationItem],
now_ts: float,
dynamic_ahead_for_item,
poll_before: float,
) -> Tuple[int, ReservationItem]:
"""Pick the highest-value reservation among items whose attend windows overlap now.
The normal queue order remains earliest-first. This selector only changes behavior
when multiple reservations are already actionable at the same time.
"""
if not reservations:
raise IndexError("empty reservations")
actionable = []
for idx, item in enumerate(reservations):
try:
ft = float(item.get("future_ts") or 0.0)
except Exception:
ft = 0.0
if ft <= 0:
continue
try:
dynamic_ahead = float(dynamic_ahead_for_item(item) or 0.0)
except Exception:
dynamic_ahead = 0.0
window_start = ft - max(0.0, dynamic_ahead)
window_end = ft + max(0.0, poll_before)
if now_ts < window_start or now_ts > window_end:
continue
try:
value = float(item.get("prize_value_yuan") or 0.0)
except Exception:
value = 0.0
try:
created = float(item.get("created_ts") or 0.0)
except Exception:
created = 0.0
actionable.append((idx, value, ft, created, item))
if not actionable:
return 0, reservations[0]
actionable.sort(key=lambda row: (-row[1], row[2], row[3], row[0]))
idx, _value, _ft, _created, item = actionable[0]
return idx, item
+43
View File
@@ -160,6 +160,49 @@ class TestSortReservationsInplace:
assert id(items) == original_id
class TestSelectReservationTargetForWindow:
def test_selects_highest_value_when_windows_overlap(self):
from douyin.reservation.reservation_logic.helpers import (
_select_reservation_target_for_window,
)
items = [
{"future_ts": 100.0, "prize_value_yuan": 200.0, "created_ts": 1.0},
{"future_ts": 105.0, "prize_value_yuan": 900.0, "created_ts": 2.0},
{"future_ts": 110.0, "prize_value_yuan": 300.0, "created_ts": 3.0},
]
idx, item = _select_reservation_target_for_window(
items,
now_ts=95.0,
dynamic_ahead_for_item=lambda _item: 10.0,
poll_before=10.0,
)
assert idx == 1
assert item["prize_value_yuan"] == 900.0
def test_keeps_earliest_when_no_window_reached(self):
from douyin.reservation.reservation_logic.helpers import (
_select_reservation_target_for_window,
)
items = [
{"future_ts": 100.0, "prize_value_yuan": 200.0, "created_ts": 1.0},
{"future_ts": 105.0, "prize_value_yuan": 900.0, "created_ts": 2.0},
]
idx, item = _select_reservation_target_for_window(
items,
now_ts=50.0,
dynamic_ahead_for_item=lambda _item: 10.0,
poll_before=10.0,
)
assert idx == 0
assert item["future_ts"] == 100.0
class TestComputeDynamicAhead:
def test_includes_runtime_capture_and_verify_budget(self):
class _A:
+35 -4
View File
@@ -487,20 +487,51 @@ class TestHandleReservationCheck:
mock_cleanup.assert_called_once()
def test_waiting_for_lottery_skips_attend_window(self):
"""_waiting_for_lottery_result=True → 跳过预约回退,仍 return False。"""
"""_waiting_for_lottery_result=True 且预约价值不高于当前等待 → 不回退。"""
import time
s = self._mk_for_reservation()
s.high_value_fudai_enabled = True
s._waiting_for_lottery_result = True
s._lottery_wait_prize_value_yuan = 500.0
s._lottery_result_expected_ts = time.time() + 30.0
s.reservations = [
{"future_ts": time.time() + 100, "content": "X", "pos_seen": 0}
{
"future_ts": time.time() + 20,
"content": "X",
"pos_seen": 0,
"prize_value_yuan": 200.0,
}
]
with patch(
"douyin.reservation.douyin_reservation_logic.process_reservation_attend_window"
) as mock_process:
result = ronce.handle_reservation_check(s, 0.0)
# 等待开奖时仍会执行多间模式 process(这是原代码行为:日志后不 return,让流程继续)
assert result is False
# process 仍被调用(日志只是说"跳过预约回退"但代码没真的跳)
mock_process.assert_not_called()
def test_waiting_for_lottery_allows_higher_value_reservation(self):
import time
s = self._mk_for_reservation()
s.high_value_fudai_enabled = True
s._waiting_for_lottery_result = True
s._lottery_wait_prize_value_yuan = 200.0
s._lottery_result_expected_ts = time.time() + 30.0
s.reservations = [
{
"future_ts": time.time() + 20,
"content": "X",
"pos_seen": 0,
"prize_value_yuan": 800.0,
}
]
with patch(
"douyin.reservation.douyin_reservation_logic.process_reservation_attend_window",
return_value=True,
) as mock_process:
result = ronce.handle_reservation_check(s, 0.0)
assert result is False
mock_process.assert_called_once()
assert s._current_attending_reservation_fudai is True