Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

fix(video): preserve concurrent progress during playback discovery

dajiaohuang11baf1e8bb33
diff --git a/deeptutor/video_learning/service.py b/deeptutor/video_learning/service.py
index 9dea9be07..fb32d4190 100644
--- a/deeptutor/video_learning/service.py
+++ b/deeptutor/video_learning/service.py
@@ -691,7 +691,8 @@ async def resolve_material(
async def material_with_playback(material_id: str) -> dict[str, Any]:
- material = get_timed_media_store().get(material_id)
+ store = get_timed_media_store()
+ material = store.get(material_id)
provider = load_video_learning_settings()["default_provider"]
if provider == "invidious" and not material.get("provider_cache", {}).get("invidious_formats"):
source = material.get("source") if isinstance(material.get("source"), dict) else {}
@@ -729,7 +730,11 @@ async def material_with_playback(material_id: str) -> dict[str, Any]:
}
material["segments"] = build_segments(cues)
material["provider_cache"] = {"invidious_formats": formats}
- get_timed_media_store().save(material)
+ with store.lock(material_id):
+ latest = store.get(material_id, lock_held=True)
+ if isinstance(latest.get("learning"), dict):
+ material["learning"] = latest["learning"]
+ material = store.save(material)
return public_material(material, provider=provider)
diff --git a/tests/video_learning/test_playback_learning_state.py b/tests/video_learning/test_playback_learning_state.py
new file mode 100644
index 000000000..0ccb02746
--- /dev/null
+++ b/tests/video_learning/test_playback_learning_state.py
@@ -0,0 +1,67 @@
+"""Playback provider discovery preserves learning edits made during HTTP I/O."""
+
+from pathlib import Path
+
+import httpx
+import pytest
+
+from deeptutor.video_learning import service
+from deeptutor.video_learning.marks import create_mark
+
+
[email protected]("edit", ["position", "mark"])
+async def test_playback_discovery_keeps_concurrent_learning(
+ tmp_path: Path, monkeypatch, edit: str
+) -> None:
+ """Use the native HTTP client and persisted marks across provider discovery."""
+ store = service.TimedMediaStore(tmp_path)
+ material_id = service.material_id_for("dQw4w9WgXcQ")
+ store.save(
+ {
+ "type": "timed_media",
+ "material_id": material_id,
+ "source": {"video_id": "dQw4w9WgXcQ", "url": "https://youtu.be/dQw4w9WgXcQ"},
+ "metadata": {"duration_seconds": 120},
+ "learning": {"last_position": 0},
+ "transcript": {"cues": []},
+ "_caption_text_version": 1,
+ }
+ )
+ settings = service.normalize_video_learning_settings(
+ {
+ "default_provider": "invidious",
+ "invidious": {"api_base_url": "https://video.example"},
+ }
+ )
+ monkeypatch.setattr(service, "get_timed_media_store", lambda: store)
+ monkeypatch.setattr(service, "load_video_learning_settings", lambda: settings)
+ edited_learning = {}
+
+ async def respond(request: httpx.Request) -> httpx.Response:
+ assert request.url.path == "/api/v1/videos/dQw4w9WgXcQ"
+ with store.lock(material_id):
+ latest = store.get(material_id, lock_held=True)
+ if edit == "position":
+ latest["learning"]["last_position"] = 42
+ else:
+ create_mark(
+ latest,
+ {"kind": "review", "start_seconds": 12, "note": "Review this concept"},
+ )
+ store.save(latest)
+ edited_learning.update(latest["learning"])
+ return httpx.Response(
+ 200, json={"title": "Video", "formatStreams": [{"type": "video/mp4", "itag": 18}]}
+ )
+
+ client_type = httpx.AsyncClient
+ monkeypatch.setattr(
+ service.httpx,
+ "AsyncClient",
+ lambda **kwargs: client_type(transport=httpx.MockTransport(respond), **kwargs),
+ )
+ result = await service.material_with_playback(material_id)
+ assert result["learning"] == edited_learning
+ assert store.get(material_id)["learning"] == edited_learning
+ assert result["playback"]["format_id"] == "18"