Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prototype for surfacing docs without a query #4379

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −12
Draft

prototype for surfacing docs without a query #4379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions backend/onyx/document_index/vespa/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,26 +821,30 @@ def admin_retrieval(
num_to_retrieve: int = NUM_RETURNED_HITS,
offset: int = 0,
) -> list[InferenceChunkUncleaned]:
vespa_where_clauses = build_vespa_filters(filters, include_hidden=True)
yql = (
YQL_BASE.format(index_name=self.index_name)
+ vespa_where_clauses
+ '({grammar: "weakAnd"}userInput(@query) '
# `({defaultIndex: "content_summary"}userInput(@query))` section is
# needed for highlighting while the N-gram highlighting is broken /
# not working as desired
+ f'or ({{defaultIndex: "{CONTENT_SUMMARY}"}}userInput(@query)))'
vespa_where_clauses = build_vespa_filters(
filters, include_hidden=True, remove_trailing_and=True
)
yql = YQL_BASE.format(index_name=self.index_name) + vespa_where_clauses

params: dict[str, str | int] = {
"yql": yql,
"query": query,
"hits": num_to_retrieve,
"offset": 0,
"ranking.profile": "admin_search",
"timeout": VESPA_TIMEOUT,
}

if len(query.strip()) > 0:
yql += (
' and ({grammar: "weakAnd"}userInput(@query) '
# `({defaultIndex: "content_summary"}userInput(@query))` section is
# needed for highlighting while the N-gram highlighting is broken /
# not working as desired
+ f'or ({{defaultIndex: "{CONTENT_SUMMARY}"}}userInput(@query)))'
)
params["yql"] = yql
params["query"] = query

return query_vespa(params)

# Retrieves chunk information for a document:
Expand Down
3 changes: 2 additions & 1 deletion web/src/app/admin/documents/explorer/Explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ export function Explorer({
clearTimeout(timeoutId);
}

if (query && query.trim() !== "") {
let doSearch = true;
if (doSearch) {
router.replace(
`/admin/documents/explorer?query=${encodeURIComponent(query)}`
);
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/user/UserProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export function UserProvider({
};

// Use the custom token refresh hook
useTokenRefresh(upToDateUser, fetchUser);
// useTokenRefresh(upToDateUser, fetchUser);

const updateUserTemperatureOverrideEnabled = async (enabled: boolean) => {
try {
Expand Down