Upload app.py

app.py

@@ -470,27 +470,21 @@ class FulltextDatabases:
                         timings["snippet_fallback_sql"] = timings.get("snippet_fallback_sql", 0) + (time.perf_counter() - fallback_started) * 1000
                     for number, match_position, content_length, text in rows:
                         payload_started = time.perf_counter()
-                        payload = build_snippet_payload(text or "", query, exact=exact)
+                        extracted_start = max(int(match_position or 0) - 220, 1)
+                        if exact and not has_wildcard_query(query):
+                            payload = build_normalized_exact_snippet_payload(text or "", query)
+                            if not payload["highlights"]:
+                                payload = build_snippet_payload(text or "", query, exact=True)
+                        else:
+                            payload = build_snippet_payload(text or "", query, exact=exact)
+                            if not payload["highlights"]:
+                                payload = build_snippet_payload(text or "", needle, exact=True)
                         if timings is not None:
                             timings["snippet_payload"] = timings.get("snippet_payload", 0) + (time.perf_counter() - payload_started) * 1000
-                        if not payload["highlights"]:
-                            payload = build_snippet_payload(text or "", needle, exact=True)
-                        extracted_start = max(int(match_position or 0) - 220, 1)
                         if payload["snippet"] and extracted_start > 1 and not payload["snippet"].startswith("..."):
                             payload["snippet"] = "..." + payload["snippet"]
                         if payload["snippet"] and extracted_start + len(text or "") <= int(content_length or 0) and not payload["snippet"].endswith("..."):
                             payload["snippet"] += "..."
-                        if exact and not has_wildcard_query(query):
-                            direct_started = time.perf_counter()
-                            direct_payload = build_normalized_exact_snippet_payload(text or "", query)
-                            if direct_payload["snippet"] and extracted_start > 1 and not direct_payload["snippet"].startswith("..."):
-                                direct_payload["snippet"] = "..." + direct_payload["snippet"]
-                            if direct_payload["snippet"] and extracted_start + len(text or "") <= int(content_length or 0) and not direct_payload["snippet"].endswith("..."):
-                                direct_payload["snippet"] += "..."
-                            if timings is not None:
-                                timings["snippet_exact_payload_direct"] = timings.get("snippet_exact_payload_direct", 0) + (time.perf_counter() - direct_started) * 1000
-                                if direct_payload != payload:
-                                    timings["snippet_exact_payload_mismatch"] = timings.get("snippet_exact_payload_mismatch", 0) + 1
                         snippets[doc_id_by_number[int(number)]] = payload
                 except sqlite3.OperationalError:
                     continue
@@ -1122,7 +1116,7 @@ def run_search(body: SearchRequest, sources_filter=None, timings=None):
 
 def format_server_timing(timings: dict) -> str:
     values = [f'cache;desc="{timings.get("cache", "unknown")}";dur={timings.get("cache_lookup", 0):.2f}']
-    for name in ("sqlite", "metadata", "filter", "rank", "sort", "summaries", "snippet_anchor_sql", "snippet_anchor_error", "snippet_fallback_sql", "snippet_payload", "snippet_exact_payload_direct", "snippet_exact_payload_mismatch", "snippets", "decorate", "engine", "json"):
+    for name in ("sqlite", "metadata", "filter", "rank", "sort", "summaries", "snippet_anchor_sql", "snippet_anchor_error", "snippet_fallback_sql", "snippet_payload", "snippets", "decorate", "engine", "json"):
         if name in timings:
             values.append(f"{name};dur={timings[name]:.2f}")
     return ", ".join(values)