From 4a61b6eb7a21c330a0214954825ebd5c47cfa712 Mon Sep 17 00:00:00 2001 From: shreyash0502 Date: Mon, 8 Jul 2024 14:30:29 +0530 Subject: [PATCH] Fixed missing members retry + emails to lower case --- backend/alembic/env.py | 3 ++- backend/danswer/danswerbot/slack/utils.py | 31 +++++++++++++--------- backend/danswer/server/manage/slack_bot.py | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/backend/alembic/env.py b/backend/alembic/env.py index 5ca57c4c7f0..cace5063bcc 100644 --- a/backend/alembic/env.py +++ b/backend/alembic/env.py @@ -85,7 +85,8 @@ def run_migrations_online() -> None: asyncio.run(run_async_migrations()) -migrate = os.getenv("APPLY_MIGRATIONS") +# migrate = os.getenv("APPLY_MIGRATIONS") +migrate = True if migrate: if context.is_offline_mode(): run_migrations_offline() diff --git a/backend/danswer/danswerbot/slack/utils.py b/backend/danswer/danswerbot/slack/utils.py index ab4396ced26..3132aa6f24a 100644 --- a/backend/danswer/danswerbot/slack/utils.py +++ b/backend/danswer/danswerbot/slack/utils.py @@ -144,7 +144,6 @@ def respond_in_thread( slack_call = make_slack_api_rate_limited(client.chat_postMessage) else: slack_call = make_slack_api_rate_limited(client.chat_postEphemeral) - if not receiver_ids: response = slack_call( channel=channel, @@ -158,19 +157,25 @@ def respond_in_thread( if not response.get("ok"): raise RuntimeError(f"Failed to post message: {response}") else: + success = False for receiver in receiver_ids: - response = slack_call( - channel=channel, - user=receiver, - text=text, - blocks=blocks, - thread_ts=thread_ts, - metadata=metadata, - unfurl_links=unfurl, - unfurl_media=unfurl, - ) - if not response.get("ok"): - raise RuntimeError(f"Failed to post message: {response}") + try: + response = slack_call( + channel=channel, + user=receiver, + text=text, + blocks=blocks, + thread_ts=thread_ts, + metadata=metadata, + unfurl_links=unfurl, + unfurl_media=unfurl, + ) + if response.get("ok"): + success = True + except: + pass + if not success: + raise RuntimeError(f"Failed to post message: {response}") def build_feedback_id( diff --git a/backend/danswer/server/manage/slack_bot.py b/backend/danswer/server/manage/slack_bot.py index b2c57b3ad13..71ee4df1f27 100644 --- a/backend/danswer/server/manage/slack_bot.py +++ b/backend/danswer/server/manage/slack_bot.py @@ -73,7 +73,7 @@ def _form_channel_config( if respond_tag_only is not None: channel_config["respond_tag_only"] = respond_tag_only if respond_team_member_list: - channel_config["respond_team_member_list"] = respond_team_member_list + channel_config["respond_team_member_list"] = [item.lower() for item in respond_team_member_list] if respond_slack_group_list: channel_config["respond_slack_group_list"] = respond_slack_group_list if answer_filters: