highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-05-18 15:50:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use user information in Slack bot DMs (#2360)

Browse Source 
* Use user information from Slack bot DMs

* fix lint

---------

Co-authored-by: Hyeong Joon Suh <hyeongjoonsuh@Hyeongs-MacBook-Pro.local>
This commit is contained in:
hj-danswer 2024-09-07 20:08:24 -07:00 committed by GitHub
parent 7d4f8ef4e8
commit b43e5735d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/danswer/danswerbot/slack/handlers/handle_regular_answer.py
View File

@ -22,6 +22,7 @@ from danswer.configs.danswerbot_configs import DANSWER_BOT_USE_QUOTES
from danswer.configs.danswerbot_configs import DANSWER_FOLLOWUP_EMOJI from danswer.configs.danswerbot_configs import DANSWER_FOLLOWUP_EMOJI
from danswer.configs.danswerbot_configs import DANSWER_REACT_EMOJI from danswer.configs.danswerbot_configs import DANSWER_REACT_EMOJI
from danswer.configs.danswerbot_configs import ENABLE_DANSWERBOT_REFLEXION from danswer.configs.danswerbot_configs import ENABLE_DANSWERBOT_REFLEXION
from danswer.connectors.slack.utils import expert_info_from_slack_id
from danswer.danswerbot.slack.blocks import build_documents_blocks from danswer.danswerbot.slack.blocks import build_documents_blocks
from danswer.danswerbot.slack.blocks import build_follow_up_block from danswer.danswerbot.slack.blocks import build_follow_up_block
from danswer.danswerbot.slack.blocks import build_qa_response_blocks from danswer.danswerbot.slack.blocks import build_qa_response_blocks
@ -38,6 +39,7 @@ from danswer.db.models import SlackBotConfig
from danswer.db.models import SlackBotResponseType from danswer.db.models import SlackBotResponseType
from danswer.db.persona import fetch_persona_by_id from danswer.db.persona import fetch_persona_by_id
from danswer.db.search_settings import get_current_search_settings from danswer.db.search_settings import get_current_search_settings
from danswer.db.users import get_user_by_email
from danswer.llm.answering.prompts.citations_prompt import ( from danswer.llm.answering.prompts.citations_prompt import (
compute_max_document_tokens_for_persona, compute_max_document_tokens_for_persona,
) )
@ -99,6 +101,15 @@ def handle_regular_answer(
messages = message_info.thread_messages messages = message_info.thread_messages
message_ts_to_respond_to = message_info.msg_to_respond message_ts_to_respond_to = message_info.msg_to_respond
is_bot_msg = message_info.is_bot_msg is_bot_msg = message_info.is_bot_msg
user = None
if message_info.is_bot_dm:
slack_user_info = expert_info_from_slack_id(
message_info.sender, client, user_cache={}
)
if slack_user_info and slack_user_info.email:
engine = get_sqlalchemy_engine()
with Session(engine) as db_session:
user = get_user_by_email(slack_user_info.email, db_session)
document_set_names: list[str] | None = None document_set_names: list[str] | None = None
persona = slack_bot_config.persona if slack_bot_config else None persona = slack_bot_config.persona if slack_bot_config else None
@ -185,7 +196,7 @@ def handle_regular_answer(
# This also handles creating the query event in postgres # This also handles creating the query event in postgres
answer = get_search_answer( answer = get_search_answer(
query_req=new_message_request, query_req=new_message_request,
user=None, user=user,
max_document_tokens=max_document_tokens, max_document_tokens=max_document_tokens,
max_history_tokens=max_history_tokens, max_history_tokens=max_history_tokens,
db_session=db_session, db_session=db_session,