fix(vector): address PR review round 11 — broaden offset-skip gate, clarify ordering

- search/context.py: drop the doc_type=='file' guard on skip_offset_lookup
  so notes / deck cards / news items also bypass the unindexed offset
  fallback when chunk_index is available. Legacy chunk_index=None data
  still uses the offset path.
- vector/qdrant_client.py: clarify the backfill/_ensure_payload_indexes
  ordering invariant (backfill rewrites payload values only, never schema
  or indexes). Acknowledge OSS-vs-Cloud uncertainty in the 400-branch
  comment and the new-collection call-site comment.
- vector/scanner.py: hoist qdrant_client to function scope so the
  file-scroll block doesn't depend on a name bound inside the
  notes-scroll block.
- tests/unit/test_chunk_context_offset_gate.py: flip the note-with-
  chunk_index test to assert the offset fallback is skipped.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Chris Coutinho
2026-05-09 17:59:41 +02:00
co-authored by Claude Opus 4.7
parent 47c531969f
commit f3ce46da0f
4 changed files with 55 additions and 21 deletions
+15 -7
View File
@@ -28,8 +28,12 @@ def mock_nc_client() -> MagicMock:
class TestOffsetFallbackGate:
"""When chunk_index is provided AND doc_type=='file', the offset fallback
must be skipped — see PR #767 review (🟡 spurious Qdrant error log).
"""When chunk_index is provided, the offset fallback must be skipped for
every doc_type. The original gate was file-only (PR #767 review, 🟡
spurious Qdrant error log); PR #773 round 11 broadened it to all
doc_types because chunk_start/end_offset aren't in
``_PAYLOAD_INDEX_FIELDS`` and 400 in Qdrant Cloud strict mode for
notes / deck cards / news items the same way they do for files.
"""
async def test_file_with_chunk_index_skips_offset_fallback_on_miss(
@@ -64,11 +68,15 @@ class TestOffsetFallbackGate:
mock_indexed.assert_awaited_once()
mock_offset.assert_not_awaited()
async def test_note_with_chunk_index_still_uses_offset_fallback(
async def test_note_with_chunk_index_skips_offset_fallback_on_miss(
self, mock_nc_client
):
"""Notes/deck cards keep the offset fallback (cheap, useful for legacy
data): the gate is file-specific.
"""Notes (and other non-file doc_types) trust the indexed
chunk_index lookup as canonical too. A miss means absent — don't
hit the unindexed offset path that 400s in Qdrant Cloud strict
mode. Legacy data without chunk_index still uses the offset path
via the chunk_index=None branch (see
test_file_without_chunk_index_uses_offset_fallback).
"""
with (
patch.object(
@@ -81,7 +89,7 @@ class TestOffsetFallbackGate:
context_module,
"_get_chunk_from_qdrant",
new_callable=AsyncMock,
return_value=None,
return_value="should-not-be-returned",
) as mock_offset,
patch.object(
context_module,
@@ -102,7 +110,7 @@ class TestOffsetFallbackGate:
)
mock_indexed.assert_awaited_once()
mock_offset.assert_awaited_once()
mock_offset.assert_not_awaited()
async def test_file_without_chunk_index_uses_offset_fallback(self, mock_nc_client):
"""Files with no chunk_index supplied still use the offset path —