highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-09-19 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Rebase Issues (#92)

Browse Source
This commit is contained in:
Yuhong Sun
2024-05-27 16:10:01 -07:00
committed by Chris Weaver
parent 775ca5787b
commit 44284f7912
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/ee/danswer/server/enterprise_settings/api.py
View File

@@ -6,6 +6,7 @@ from fastapi import UploadFile
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from danswer.auth.users import current_admin_user from danswer.auth.users import current_admin_user
from danswer.configs.constants import FileOrigin
from danswer.db.engine import get_session from danswer.db.engine import get_session
from danswer.db.models import User from danswer.db.models import User
from danswer.file_store.file_store import get_default_file_store from danswer.file_store.file_store import get_default_file_store
@@ -56,18 +57,27 @@ def upload_logo(
detail="Invalid file type - only .png, .jpg, and .jpeg files are allowed", detail="Invalid file type - only .png, .jpg, and .jpeg files are allowed",
) )
# Save the file to the server
file_store = get_default_file_store(db_session) file_store = get_default_file_store(db_session)
file_store.save_file(_LOGO_FILENAME, file.file) file_store.save_file(
file_name=_LOGO_FILENAME,
content=file.file,
# The rest aren't really used for anything
display_name=file.filename or "DanswerReplacementLogo",
file_origin=FileOrigin.OTHER,
file_type=file.content_type or "image/jpeg",
)
@basic_router.get("/logo") @basic_router.get("/logo")
def fetch_logo(db_session: Session = Depends(get_session)) -> Response: def fetch_logo(db_session: Session = Depends(get_session)) -> Response:
file_store = get_default_file_store(db_session) try:
file_io = file_store.read_file(_LOGO_FILENAME, mode="b") file_store = get_default_file_store(db_session)
# NOTE: specifying "image/jpeg" here, but it still works for pngs file_io = file_store.read_file(_LOGO_FILENAME, mode="b")
# TODO: do this properly # NOTE: specifying "image/jpeg" here, but it still works for pngs
return Response(content=file_io.read(), media_type="image/jpeg") # TODO: do this properly
return Response(content=file_io.read(), media_type="image/jpeg")
except Exception:
raise HTTPException(status_code=404, detail="No logo file found")
@admin_router.put("/custom-analytics-script") @admin_router.put("/custom-analytics-script")

2
backend/ee/danswer/server/query_and_chat/chat_backend.py
View File

@@ -87,7 +87,7 @@ def handle_simplified_chat_message(
chat_session_id=chat_message_req.chat_session_id, chat_session_id=chat_message_req.chat_session_id,
parent_message_id=parent_message.id, parent_message_id=parent_message.id,
message=chat_message_req.message, message=chat_message_req.message,
file_ids=[], file_descriptors=[],
prompt_id=None, prompt_id=None,
search_doc_ids=chat_message_req.search_doc_ids, search_doc_ids=chat_message_req.search_doc_ids,
retrieval_options=retrieval_options, retrieval_options=retrieval_options,