feat: 修订了调试功能

这个提交包含在:
2026-05-25 17:14:14 +08:00
父节点 8790fcb5a9
当前提交 61b20ca200
共有 17 个文件被更改,包括 838 次插入 和 61 次删除

查看文件

@ -34,6 +34,7 @@ class VoiceSpeedDebugProvider(ExperimentDebugProvider):
"oscilloscope_peak",
"oscilloscope_frequency",
"peak_monitor",
"debug_answer",
]
def status(self) -> Dict[str, Any]:

查看文件

@ -66,6 +66,9 @@ class PeakDetector:
if self._state == PeakState.IDLE:
if len(self._value_buffer) >= self.window_size:
buf = list(self._value_buffer)
if buf[-1] < buf[0] * (1.0 - self.drop_ratio):
return self._snapshot(peak_value)
self._state = PeakState.RISING
self._peak_max = max(self._value_buffer)
return self._snapshot(peak_value)
@ -85,8 +88,7 @@ class PeakDetector:
if self._state == PeakState.COOLDOWN:
valley = self._peak_max * (1.0 - self.cooldown_ratio)
if peak_value > valley * (1.0 + self.drop_ratio * 2):
self._state = PeakState.RISING
self._peak_max = max(self._value_buffer)
self._state = PeakState.IDLE
return self._snapshot(peak_value)
return self._snapshot(peak_value)
@ -97,7 +99,8 @@ class PeakDetector:
self._state = PeakState.COOLDOWN
self._ocr_reading = None
self._pending_field = None
return self._snapshot(self._peak_max if self._value_buffer else None)
self._value_buffer.clear()
return self._snapshot(self._peak_max if self._peak_max > 0 else None)
@property
def state(self) -> PeakState:

查看文件

@ -1,12 +1,15 @@
from __future__ import annotations
import logging
from dataclasses import dataclass, field
from threading import Lock
from typing import Any, Dict, List, Optional
from typing import Any, Callable, Dict, List, Optional
from app.hardware.service import oscilloscope_service
from app.schemas.experiment import GridInputCell, ReadingGuardSource
_logger = logging.getLogger("reading_guard")
@dataclass
class GuardSessionState:
@ -18,12 +21,33 @@ class GuardSessionState:
source: ReadingGuardSource = ReadingGuardSource.MANUAL
manual_answers: Dict[str, Any] = field(default_factory=dict)
peak_ocr_answers: Dict[str, float] = field(default_factory=dict)
peak_monitor_triggered: bool = False
class ReadingGuardManager:
def __init__(self) -> None:
self._lock = Lock()
self._sessions: Dict[str, GuardSessionState] = {}
self._on_peak_ocr_start: Optional[Callable[[], None]] = None
self._on_peak_ocr_done: Optional[Callable[[], None]] = None
self._on_peak_ocr_failed: Optional[Callable[[], None]] = None
def set_peak_ocr_start_callback(self, callback: Callable[[], None]) -> None:
self._on_peak_ocr_start = callback
def set_peak_ocr_done_callback(self, callback: Callable[[], None]) -> None:
self._on_peak_ocr_done = callback
def set_peak_ocr_failed_callback(self, callback: Callable[[], None]) -> None:
self._on_peak_ocr_failed = callback
def _call_callback(self, cb: Optional[Callable[[], None]], label: str) -> None:
if cb is None:
return
try:
cb()
except Exception as exc:
_logger.warning("%s callback failed: %s", label, exc)
def set_manual_answer(self, session_id: str, field_id: str, value: Any) -> None:
with self._lock:
@ -35,6 +59,91 @@ class ReadingGuardManager:
state = self._sessions.setdefault(session_id, GuardSessionState())
state.peak_ocr_answers[field_id] = value
def get_pending_field(self, session_id: str) -> Optional[tuple[str, str, float]]:
with self._lock:
state = self._sessions.get(session_id)
if state is None or state.pending_field is None:
return None
src = state.source.value if isinstance(state.source, ReadingGuardSource) else str(state.source)
return (state.pending_field, src, state.tolerance)
def get_cursor(self, session_id: str) -> tuple[int, int]:
with self._lock:
state = self._sessions.get(session_id)
if state is None:
return (0, 0)
return (state.cursor, len(state.strict_fields))
def get_reference_answer(
self,
session_id: str,
field_id: str,
all_fields: List[GridInputCell],
) -> Optional[dict]:
state = self._ensure_initialized(session_id, all_fields)
if not state.strict_fields:
return None
if field_id not in state.strict_fields:
return {"error": f"field '{field_id}' is not in the strict reading order"}
idx = state.strict_fields.index(field_id)
fields_map = {f.fieldId: f for f in all_fields}
config = fields_map[field_id].readingGuard
if idx > state.cursor:
return {
"field_id": field_id,
"status": "not_started",
"message": f"field '{field_id}' 测量尚未开始,请按顺序先完成前面的步骤",
"cursor": state.cursor,
"total": len(state.strict_fields),
}
source = config.source if config else ReadingGuardSource.MANUAL
answer = state.peak_ocr_answers.get(field_id) if source == ReadingGuardSource.PEAK_OCR else (
state.manual_answers.get(field_id) if source == ReadingGuardSource.MANUAL else None
)
if answer is None and source in (ReadingGuardSource.DEVICE_PEAK, ReadingGuardSource.DEVICE_FREQUENCY):
answer = self._capture_answer(source, field_id, state)
if answer is not None:
return {
"field_id": field_id,
"status": "available",
"reference": answer,
"tolerance": config.tolerance if config else 0.0,
"source": source.value,
}
return {
"field_id": field_id,
"status": "pending",
"message": f"field '{field_id}' 的参考值尚未捕获",
"source": source.value,
}
def undo(
self,
session_id: str,
current_field: GridInputCell,
all_fields: List[GridInputCell],
) -> Optional[tuple[bool, str]]:
state = self._sessions.get(session_id)
if state is None or state.cursor == 0:
return False, "no reading to undo"
expected = state.strict_fields[state.cursor - 1]
if current_field.fieldId != expected:
return False, f"cannot undo: last completed field was {expected}"
state.cursor -= 1
fields_map = {f.fieldId: f for f in all_fields}
if state.source == ReadingGuardSource.PEAK_OCR:
state.peak_ocr_answers.pop(expected, None)
self._arm_next(state, fields_map)
return True, f"undid {expected}, now awaiting: {state.pending_field}"
def _capture_answer(self, source: ReadingGuardSource, field_id: str, state: GuardSessionState) -> Optional[float]:
if source == ReadingGuardSource.DEVICE_PEAK:
snapshot = oscilloscope_service.capture_peak()
@ -93,6 +202,12 @@ class ReadingGuardManager:
state.source = config.source if config else ReadingGuardSource.MANUAL
if state.source != ReadingGuardSource.PEAK_OCR:
state.pending_answer = self._capture_answer(state.source, next_field, state)
elif not state.peak_monitor_triggered and self._on_peak_ocr_start:
state.peak_monitor_triggered = True
try:
self._on_peak_ocr_start()
except Exception as exc:
_logger.warning("auto-start peak monitor failed: %s", exc)
def validate(
self,
@ -100,7 +215,7 @@ class ReadingGuardManager:
current_field: GridInputCell,
current_value: Any,
all_fields: List[GridInputCell],
) -> Optional[tuple[bool, str]]:
) -> Optional[dict]:
state = self._ensure_initialized(session_id, all_fields)
if not state.strict_fields:
return None
@ -109,37 +224,67 @@ class ReadingGuardManager:
return None
if state.pending_field is None:
return True, "reading process completed"
return {"accept": True, "message": "reading process completed", "severity": "ok", "reference": None}
if current_field.fieldId != state.pending_field:
return False, f"should submit field {state.pending_field}, please follow experiment reading order"
return {"accept": False, "message": f"should submit field {state.pending_field}, please follow experiment reading order", "severity": "error", "reference": None}
if state.source == ReadingGuardSource.PEAK_OCR:
state.pending_answer = self._capture_answer(state.source, current_field.fieldId, state)
if state.pending_answer is None:
source_label = "OCR" if state.source == ReadingGuardSource.PEAK_OCR else "standard reading"
return False, f"{source_label} not yet captured, please wait for peak detection or retry"
return {"accept": False, "message": f"{source_label} not yet captured, please wait for peak detection or retry", "severity": "error", "reference": None}
try:
student_value = float(current_value)
except Exception:
return False, "reading fields must be numeric"
return {"accept": False, "message": "reading fields must be numeric", "severity": "error", "reference": None}
error = abs(student_value - state.pending_answer)
if error > state.tolerance:
return (
False,
f"reading mismatch, reference {state.pending_answer:.2f}, tolerance ±{state.tolerance:.2f}, please re-enter",
)
config = current_field.readingGuard
tol1 = config.tolerance if config else 0.0
tol2 = config.tolerance2 if config else None
if error > (tol2 if tol2 is not None else tol1):
if state.source == ReadingGuardSource.PEAK_OCR:
self._call_callback(self._on_peak_ocr_failed, "peak_ocr_failed")
state.pending_answer = None
return {
"accept": False,
"message": f"reading mismatch, reference {state.pending_answer:.2f}, tolerance ±{tol1:.2f}, please re-enter",
"severity": "error",
"reference": state.pending_answer,
}
if tol2 is not None and error > tol1:
state.cursor += 1
fields_map = {f.fieldId: f for f in all_fields}
was_peak_ocr = state.source == ReadingGuardSource.PEAK_OCR
self._arm_next(state, fields_map)
if was_peak_ocr:
self._call_callback(self._on_peak_ocr_done, "peak_ocr_done")
msg = "reading correct, awaiting next: " + (state.pending_field or "done")
return {
"accept": True,
"message": f"读数精度略低 (偏差 {error:.2f} ≤ 二级容差 {tol2:.2f}),但仍接受。{msg}",
"severity": "warning",
"reference": state.pending_answer,
}
state.cursor += 1
fields_map = {f.fieldId: f for f in all_fields}
was_peak_ocr = state.source == ReadingGuardSource.PEAK_OCR
self._arm_next(state, fields_map)
if state.pending_field is None:
return True, "reading correct, all reading steps completed"
return True, f"reading correct, awaiting next: {state.pending_field}"
if was_peak_ocr:
self._call_callback(self._on_peak_ocr_done, "peak_ocr_done")
msg = "reading correct, awaiting next: " + (state.pending_field or "done")
return {
"accept": True,
"message": msg,
"severity": "ok",
"reference": state.pending_answer,
}
reading_guard_manager = ReadingGuardManager()