highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-07-13 22:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor update to typing

Browse Source
This commit is contained in:
pablodanswer
2024-09-26 17:22:16 -07:00
parent 516f1840ce
commit 341bf26ff2
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/danswer/background/update.py
View File

@ -415,8 +415,6 @@ def update_loop(
for tenant_id in tenants: for tenant_id in tenants:
try: try:
logger.debug(f"Processing tenant: {tenant_id}") logger.debug(f"Processing tenant: {tenant_id}")
# Existing Dask clients
with Session(get_sqlalchemy_engine(schema=tenant_id)) as db_session: with Session(get_sqlalchemy_engine(schema=tenant_id)) as db_session:
try: try:
check_index_swap(db_session) check_index_swap(db_session)

2
backend/danswer/search/enums.py
View File

@ -10,8 +10,6 @@ class RecencyBiasSetting(str, Enum):
NO_DECAY = "no_decay" NO_DECAY = "no_decay"
# Determine based on query if to use base_decay or favor_recent # Determine based on query if to use base_decay or favor_recent
AUTO = "auto" AUTO = "auto"
auto = "auto"
class OptionalSearchSetting(str, Enum): class OptionalSearchSetting(str, Enum):
ALWAYS = "always" ALWAYS = "always"

1
backend/danswer/search/preprocessing/preprocessing.py
View File

@ -152,6 +152,7 @@ def retrieval_preprocessing(
user_acl_filters = ( user_acl_filters = (
None if bypass_acl else build_access_filters_for_user(user, db_session) None if bypass_acl else build_access_filters_for_user(user, db_session)
) )
final_filters = IndexFilters( final_filters = IndexFilters(
source_type=preset_filters.source_type or predicted_source_filters, source_type=preset_filters.source_type or predicted_source_filters,
document_set=preset_filters.document_set, document_set=preset_filters.document_set,

3
backend/danswer/server/query_and_chat/query_backend.py
View File

@ -40,6 +40,7 @@ from danswer.server.query_and_chat.models import SourceTag
from danswer.server.query_and_chat.models import TagResponse from danswer.server.query_and_chat.models import TagResponse
from danswer.server.query_and_chat.token_limit import check_token_rate_limits from danswer.server.query_and_chat.token_limit import check_token_rate_limits
from danswer.utils.logger import setup_logger from danswer.utils.logger import setup_logger
from danswer.db.engine import get_current_tenant_id
logger = setup_logger() logger = setup_logger()
@ -52,6 +53,7 @@ def admin_search(
question: AdminSearchRequest, question: AdminSearchRequest,
user: User | None = Depends(current_curator_or_admin_user), user: User | None = Depends(current_curator_or_admin_user),
db_session: Session = Depends(get_session), db_session: Session = Depends(get_session),
tenant_id: str | None = Depends(get_current_tenant_id),
) -> AdminSearchResponse: ) -> AdminSearchResponse:
query = question.query query = question.query
logger.notice(f"Received admin search query: {query}") logger.notice(f"Received admin search query: {query}")
@ -62,6 +64,7 @@ def admin_search(
time_cutoff=question.filters.time_cutoff, time_cutoff=question.filters.time_cutoff,
tags=question.filters.tags, tags=question.filters.tags,
access_control_list=user_acl_filters, access_control_list=user_acl_filters,
tenant_id=tenant_id,
) )
search_settings = get_current_search_settings(db_session) search_settings = get_current_search_settings(db_session)
document_index = get_default_document_index( document_index = get_default_document_index(

1
web/src/app/layout.tsx
View File

@ -100,6 +100,7 @@ export default async function RootLayout({
<body className={`relative ${inter.variable} font-sans`}> <body className={`relative ${inter.variable} font-sans`}>
<div <div
className={`text-default bg-background ${ className={`text-default bg-background ${
// TODO: remove this once proper dark mode exists
process.env.THEME_IS_DARK?.toLowerCase() === "true" ? "dark" : "" process.env.THEME_IS_DARK?.toLowerCase() === "true" ? "dark" : ""
}`} }`}
> >