tests

Author: eshaan-mehta

backend/tests/conftest.py

@@ -273,11 +273,27 @@ def mock_modal_dict(mocker):
     fake_dict = {}
     mock_dict = mocker.MagicMock()
 
-    mock_dict.__getitem__ = lambda self, key: fake_dict[key]
-    mock_dict.__setitem__ = lambda self, key, val: fake_dict.__setitem__(key, val)
-    mock_dict.__delitem__ = lambda self, key: fake_dict.__delitem__(key)
-    mock_dict.__contains__ = lambda self, key: key in fake_dict
-    mock_dict.get = lambda self, key, default=None: fake_dict.get(key, default)
+    def getitem(_, key):
+        return fake_dict[key]
+
+    def setitem(_, key, value):
+        fake_dict[key] = value
+
+    def delitem(_, key):
+        del fake_dict[key]
+
+    def contains(_, key):
+        return key in fake_dict
+
+    def get(_, key, default=None):
+        return fake_dict.get(key, default)
+
+    mock_dict.__getitem__ = getitem
+    mock_dict.__setitem__ = setitem
+    mock_dict.__delitem__ = delitem
+    mock_dict.__contains__ = contains
+    mock_dict.get = get
+    mock_dict.keys.side_effect = fake_dict.keys
 
     mocker.patch('modal.Dict.from_name', return_value=mock_dict)
     return fake_dict

backend/tests/unit/test_r2_connector.py

@@ -1,6 +1,8 @@
 import base64
 from botocore.exceptions import ClientError
 
+from database.r2_connector import DEFAULT_PRESIGNED_URL_TTL
+
 
 class TestR2ConnectorInitialization:
     """Test connector initialization."""
@@ -142,6 +144,9 @@ def test_fetch_page_success(self, mock_r2_connector):
             Prefix="ns/",
             MaxKeys=3,
         )
+        for call in mock_client.generate_presigned_url.call_args_list:
+            kwargs = call.kwargs
+            assert kwargs['ExpiresIn'] == DEFAULT_PRESIGNED_URL_TTL
 
     def test_fetch_page_handles_error(self, mock_r2_connector):
         connector, mock_client, _ = mock_r2_connector
@@ -179,6 +184,9 @@ def test_fetch_page_cursor_fallback(self, mock_r2_connector):
             MaxKeys=3,
             StartAfter='ns/vid2.mp4',
         )
+        for call in mock_client.generate_presigned_url.call_args_list:
+            kwargs = call.kwargs
+            assert kwargs['ExpiresIn'] == DEFAULT_PRESIGNED_URL_TTL
 
 
 class TestFetchAllVideoData:

backend/tests/unit/test_video_cache.py

@@ -0,0 +1,47 @@
+import pytest
+
+from cache.video_cache import VideoCache, VIDEO_PAGE_TTL_SECONDS
+
+
+class TestVideoCachePagination:
+    def test_get_page_respects_ttl(self, mock_modal_dict, mocker):
+        time_mock = mocker.patch("cache.video_cache.time")
+        time_mock.time.return_value = 1_000.0
+
+        cache = VideoCache(environment="dev")
+        cache.set_page(
+            namespace="ns",
+            page_token=None,
+            page_size=20,
+            videos=[{"file_name": "vid.mp4"}],
+            next_token="token",
+        )
+
+        # Within TTL -> entry returned
+        time_mock.time.return_value = 1_000.0 + VIDEO_PAGE_TTL_SECONDS - 10
+        entry = cache.get_page("ns", None, 20)
+        assert entry is not None
+        assert entry["videos"][0]["file_name"] == "vid.mp4"
+
+        # Beyond TTL -> entry evicted and not returned
+        time_mock.time.return_value = 1_000.0 + VIDEO_PAGE_TTL_SECONDS + 1
+        expired_entry = cache.get_page("ns", None, 20)
+        assert expired_entry is None
+        assert not mock_modal_dict  # key removed
+
+    def test_namespace_metadata_respects_ttl(self, mock_modal_dict, mocker):
+        time_mock = mocker.patch("cache.video_cache.time")
+        time_mock.time.return_value = 2_000.0
+
+        cache = VideoCache(environment="dev")
+        cache.set_namespace_metadata("ns", {"total_videos": 5})
+
+        time_mock.time.return_value = 2_000.0 + VIDEO_PAGE_TTL_SECONDS - 10
+        metadata = cache.get_namespace_metadata("ns")
+        assert metadata is not None
+        assert metadata["total_videos"] == 5
+
+        time_mock.time.return_value = 2_000.0 + VIDEO_PAGE_TTL_SECONDS + 1
+        expired_metadata = cache.get_namespace_metadata("ns")
+        assert expired_metadata is None
+        assert not mock_modal_dict

frontend/streamlit/pages/search_demo.py

@@ -23,6 +23,16 @@
     st.session_state.repo_page_tokens = []
 if 'repo_current_page_idx' not in st.session_state:
     st.session_state.repo_current_page_idx = 0
+if 'repo_total_videos' not in st.session_state:
+    st.session_state.repo_total_videos = 0
+if 'repo_total_pages' not in st.session_state:
+    st.session_state.repo_total_pages = 0
+if 'repo_loading' not in st.session_state:
+    st.session_state.repo_loading = False
+if 'repo_error' not in st.session_state:
+    st.session_state.repo_error = None
+if 'repo_action' not in st.session_state:
+    st.session_state.repo_action = None
 
 # Configs
 SEARCH_API_URL = Config.SEARCH_API_URL
@@ -35,6 +45,11 @@
 IS_INTERNAL_ENV = Config.IS_INTERNAL_ENV
 
 
+def set_repo_action(action: str) -> None:
+    """Schedule a repository navigation action for the next render."""
+    st.session_state.repo_action = action
+
+
 def search_videos(query: str):
     """Send search query to backend."""
     try:
@@ -62,6 +77,8 @@ def fetch_videos_page(page_token: str | None = None, page_size: int = REPO_PAGE_
             return {
                 "videos": data.get("videos", []),
                 "next_page_token": data.get("next_page_token"),
+                "total_videos": data.get("total_videos", 0),
+                "total_pages": data.get("total_pages", 0),
             }
         return {"error": f"Fetch failed with status {resp.status_code}"}
     except requests.RequestException as e:
@@ -78,6 +95,8 @@ def load_repository_page(page_token: str | None = None, append: bool = False) ->
 
     videos = result.get("videos", [])
     next_token = result.get("next_page_token")
+    total_videos = result.get("total_videos", 0) or 0
+    total_pages = result.get("total_pages", 0) or 0
 
     if append:
         st.session_state.repo_pages.append(videos)
@@ -90,6 +109,8 @@ def load_repository_page(page_token: str | None = None, append: bool = False) ->
 
     st.session_state.repo_videos = st.session_state.repo_pages[st.session_state.repo_current_page_idx]
     st.session_state.repo_next_token = next_token
+    st.session_state.repo_total_videos = total_videos
+    st.session_state.repo_total_pages = total_pages
     st.session_state.repo_initialized = True
     return True, None
 
@@ -102,6 +123,11 @@ def reset_repository_state() -> None:
     st.session_state.repo_pages = []
     st.session_state.repo_page_tokens = []
     st.session_state.repo_current_page_idx = 0
+    st.session_state.repo_total_videos = 0
+    st.session_state.repo_total_pages = 0
+    st.session_state.repo_loading = False
+    st.session_state.repo_error = None
+    st.session_state.repo_action = None
 
 
 def upload_files_to_backend(files_data: list[tuple[bytes, str, str]]):
@@ -423,42 +449,88 @@ def delete_confirmation_dialog(hashed_identifier: str, filename: str):
 
     current_page_idx = st.session_state.repo_current_page_idx
     total_loaded_pages = len(st.session_state.repo_pages)
-    has_more_pages = st.session_state.repo_next_token is not None
+    repo_action = st.session_state.repo_action
+    st.session_state.repo_action = None
+
+    if repo_action == "prev" and not st.session_state.repo_loading:
+        if current_page_idx > 0:
+            st.session_state.repo_current_page_idx -= 1
+            st.session_state.repo_videos = st.session_state.repo_pages[st.session_state.repo_current_page_idx]
+            st.session_state.repo_error = None
+            st.rerun()
+
+    if repo_action == "next" and not st.session_state.repo_loading:
+        if current_page_idx + 1 < total_loaded_pages:
+            st.session_state.repo_current_page_idx += 1
+            st.session_state.repo_videos = st.session_state.repo_pages[st.session_state.repo_current_page_idx]
+            st.session_state.repo_error = None
+            st.rerun()
+        elif st.session_state.repo_next_token:
+            st.session_state.repo_loading = True
+            try:
+                with st.spinner("Loading next page..."):
+                    success, error = load_repository_page(
+                        page_token=st.session_state.repo_next_token,
+                        append=True
+                    )
+            finally:
+                st.session_state.repo_loading = False
+            if not success and error:
+                st.session_state.repo_error = error
+            else:
+                st.session_state.repo_error = None
+                st.rerun()
 
-    prev_disabled = current_page_idx <= 0
-    next_disabled = (current_page_idx >= total_loaded_pages - 1) and not has_more_pages
+    current_page_idx = st.session_state.repo_current_page_idx
+    total_loaded_pages = len(st.session_state.repo_pages)
+    total_pages = st.session_state.repo_total_pages or 0
+    total_videos = st.session_state.repo_total_videos or 0
+
+    prev_disabled = st.session_state.repo_loading or current_page_idx <= 0
+    if st.session_state.repo_loading:
+        next_disabled = True
+    elif total_pages > 0:
+        next_disabled = (current_page_idx + 1) >= total_pages
+    else:
+        next_disabled = True
 
     nav_info_col, nav_prev_col, nav_next_col = st.columns([6, 0.3, 0.3])
 
     with nav_info_col:
-        page_label = f"Page {current_page_idx + 1} of {max(total_loaded_pages, 1)}"
-        if has_more_pages:
-            page_label += " (more available)"
-        st.markdown(f"<div style='text-align:left;font-weight:600;'>{page_label}</div>", unsafe_allow_html=True)
+        if total_pages > 0:
+            current_display_page = current_page_idx + 1
+        else:
+            current_display_page = 0
+        page_label = f"Page {current_display_page} of {total_pages}"
+        video_suffix = "video" if total_videos == 1 else "videos"
+        page_label += f" • {total_videos} {video_suffix}"
+        st.markdown(
+            f"<div style='text-align:left;font-weight:600;'>{page_label}</div>",
+            unsafe_allow_html=True
+        )
 
     with nav_prev_col:
-        if st.button("◄", disabled=prev_disabled, use_container_width=True, key="repo_prev_btn"):
-            if current_page_idx > 0:
-                st.session_state.repo_current_page_idx -= 1
-                st.session_state.repo_videos = st.session_state.repo_pages[st.session_state.repo_current_page_idx]
-                st.rerun()
+        st.button(
+            "◄",
+            disabled=prev_disabled,
+            use_container_width=True,
+            key="repo_prev_btn",
+            on_click=set_repo_action,
+            args=("prev",),
+        )
 
     with nav_next_col:
-        if st.button("►", disabled=next_disabled, use_container_width=True, key="repo_next_btn"):
-            if current_page_idx + 1 < total_loaded_pages:
-                st.session_state.repo_current_page_idx += 1
-                st.session_state.repo_videos = st.session_state.repo_pages[st.session_state.repo_current_page_idx]
-                st.rerun()
-            elif st.session_state.repo_next_token:
-                with st.spinner("Loading next page..."):
-                    success, error = load_repository_page(
-                        page_token=st.session_state.repo_next_token,
-                        append=True
-                    )
-                if not success and error:
-                    st.error(f"Failed to load additional videos: {error}")
-                else:
-                    st.rerun()
+        st.button(
+            "►",
+            disabled=next_disabled,
+            use_container_width=True,
+            key="repo_next_btn",
+            on_click=set_repo_action,
+            args=("next",),
+        )
+
+    if st.session_state.repo_error:
+        st.error(f"Failed to load additional videos: {st.session_state.repo_error}")
 
     if videos:
         # Create a grid of videos