merge: sync feature/N7Web into feature/N7Web-Tech
# Conflicts: # apps/web-console/app.js # apps/web-console/assistant-chat.js # apps/web-console/index.html # apps/web-console/service-worker.js # src/cognitive_agent/server.py # tests/e2e/test_seat_web_api.py # tests/unit/test_assistant_frontend_contract.py # tests/unit/test_energy_monitor_frontend_contract.py # tests/unit/test_frontend_theme_contract.py # tests/unit/test_mode_scene_catalog.py
This commit is contained in:
@@ -61,6 +61,7 @@ from cognitive_agent.application.mode_scene_catalog import ( # noqa: E402
|
||||
MODE_SCENE_MQTT_BURST_WINDOW_S,
|
||||
)
|
||||
from cognitive_agent.application.pet_cards import PetCardService # noqa: E402
|
||||
from cognitive_agent.application.mode_schedule_service import public_schedule_status # noqa: E402
|
||||
from cognitive_agent.application.seat_service import ( # noqa: E402
|
||||
LOCAL_CONTROL_BUDGET_MS,
|
||||
SeatDemoService,
|
||||
@@ -361,6 +362,14 @@ class SeatDemoHandler(BaseHTTPRequestHandler):
|
||||
if path == "/api/runtime":
|
||||
self._json(self.service.runtime_info())
|
||||
return
|
||||
if path == "/api/modes/schedule/status":
|
||||
query = parse_qs(parsed_url.query)
|
||||
try:
|
||||
vehicle = self.service.vehicle_profiles.get(str(query.get("vehicle_id", [""])[0]) or None)
|
||||
self._json(public_schedule_status(self.service.mode_schedule_runner.status(vehicle.id)))
|
||||
except ValueError as exc:
|
||||
self._json({"error": "invalid_request", "message": str(exc)}, HTTPStatus.BAD_REQUEST)
|
||||
return
|
||||
if path == "/api/vehicle-display-sync":
|
||||
self._json(self.vehicle_display_sync.snapshot(self._extension_health()))
|
||||
return
|
||||
@@ -1545,8 +1554,9 @@ class SeatDemoHandler(BaseHTTPRequestHandler):
|
||||
re.search(
|
||||
r"然后|随后|接着|之后|"
|
||||
r"(?:\d+(?:\.\d+)?|[一二三四五六七八九十两半]+)"
|
||||
r"(?:ms|s|毫秒|秒|分钟)",
|
||||
r"(?:毫秒|秒(?:钟)?|分钟|小时|ms(?![A-Za-z])|s(?![A-Za-z]))",
|
||||
residual,
|
||||
flags=re.IGNORECASE,
|
||||
)
|
||||
)
|
||||
):
|
||||
|
||||
Reference in New Issue
Block a user