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

Slack fixes

Browse Source
This commit is contained in:
Weves
2024-12-31 17:51:48 -08:00
committed by Chris Weaver
parent d64464ca7c
commit 92add655e0
4 changed files with 29 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/onyx/connectors/slack/utils.py
View File

@ -264,24 +264,6 @@ class SlackTextCleaner:
message = message.replace("<!everyone>", "@everyone") message = message.replace("<!everyone>", "@everyone")
return message return message
@staticmethod
def replace_links(message: str) -> str:
"""Replaces slack links e.g. `<URL>` -> `URL` and `<URL|DISPLAY>` -> `DISPLAY`"""
# Find user IDs in the message
possible_link_matches = re.findall(r"<(.*?)>", message)
for possible_link in possible_link_matches:
if not possible_link:
continue
# Special slack patterns that aren't for links
if possible_link[0] not in ["#", "@", "!"]:
link_display = (
possible_link
if "|" not in possible_link
else possible_link.split("|")[1]
)
message = message.replace(f"<{possible_link}>", link_display)
return message
@staticmethod @staticmethod
def replace_special_catchall(message: str) -> str: def replace_special_catchall(message: str) -> str:
"""Replaces pattern of <!something|another-thing> with another-thing """Replaces pattern of <!something|another-thing> with another-thing

39
backend/onyx/onyxbot/slack/blocks.py
View File

@ -1,6 +1,4 @@
import re
from datetime import datetime from datetime import datetime
from re import Match
import pytz import pytz
import timeago # type: ignore import timeago # type: ignore
@ -59,33 +57,6 @@ def get_feedback_reminder_blocks(thread_link: str, include_followup: bool) -> Bl
return SectionBlock(text=text) return SectionBlock(text=text)
def _process_citations_for_slack(text: str) -> str:
"""
Converts instances of [[x]](LINK) in the input text to Slack's link format <LINK|[x]>.
Args:
- text (str): The input string containing markdown links.
Returns:
- str: The string with markdown links converted to Slack format.
"""
# Regular expression to find all instances of [[x]](LINK)
pattern = r"\[\[(.*?)\]\]\((.*?)\)"
# Function to replace each found instance with Slack's format
def slack_link_format(match: Match) -> str:
link_text = match.group(1)
link_url = match.group(2)
# Account for empty link citations
if link_url == "":
return f"[{link_text}]"
return f"<{link_url}|[{link_text}]>"
# Substitute all matches in the input text
return re.sub(pattern, slack_link_format, text)
def _split_text(text: str, limit: int = 3000) -> list[str]: def _split_text(text: str, limit: int = 3000) -> list[str]:
if len(text) <= limit: if len(text) <= limit:
return [text] return [text]
@ -369,15 +340,12 @@ def _build_citations_blocks(
def _build_qa_response_blocks( def _build_qa_response_blocks(
answer: ChatOnyxBotResponse, answer: ChatOnyxBotResponse,
process_message_for_citations: bool = False,
) -> list[Block]: ) -> list[Block]:
retrieval_info = answer.docs retrieval_info = answer.docs
if not retrieval_info: if not retrieval_info:
# This should not happen, even with no docs retrieved, there is still info returned # This should not happen, even with no docs retrieved, there is still info returned
raise RuntimeError("Failed to retrieve docs, cannot answer question.") raise RuntimeError("Failed to retrieve docs, cannot answer question.")
formatted_answer = format_slack_message(answer.answer) if answer.answer else None
if DISABLE_GENERATIVE_AI: if DISABLE_GENERATIVE_AI:
return [] return []
@ -408,18 +376,18 @@ def _build_qa_response_blocks(
filter_block = SectionBlock(text=f"_{filter_text}_") filter_block = SectionBlock(text=f"_{filter_text}_")
if not formatted_answer: if not answer.answer:
answer_blocks = [ answer_blocks = [
SectionBlock( SectionBlock(
text="Sorry, I was unable to find an answer, but I did find some potentially relevant docs 🤓" text="Sorry, I was unable to find an answer, but I did find some potentially relevant docs 🤓"
) )
] ]
else: else:
# replaces markdown links with slack format links
formatted_answer = format_slack_message(answer.answer)
answer_processed = decode_escapes( answer_processed = decode_escapes(
remove_slack_text_interactions(formatted_answer) remove_slack_text_interactions(formatted_answer)
) )
if process_message_for_citations:
answer_processed = _process_citations_for_slack(answer_processed)
answer_blocks = [ answer_blocks = [
SectionBlock(text=text) for text in _split_text(answer_processed) SectionBlock(text=text) for text in _split_text(answer_processed)
] ]
@ -525,7 +493,6 @@ def build_slack_response_blocks(
answer_blocks = _build_qa_response_blocks( answer_blocks = _build_qa_response_blocks(
answer=answer, answer=answer,
process_message_for_citations=use_citations,
) )
web_follow_up_block = [] web_follow_up_block = []

70
backend/onyx/onyxbot/slack/icons.py
View File

@ -4,73 +4,55 @@ from onyx.configs.constants import DocumentSource
def source_to_github_img_link(source: DocumentSource) -> str | None: def source_to_github_img_link(source: DocumentSource) -> str | None:
# TODO: store these images somewhere better # TODO: store these images somewhere better
if source == DocumentSource.WEB.value: if source == DocumentSource.WEB.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/Web.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/Web.png"
if source == DocumentSource.FILE.value: if source == DocumentSource.FILE.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/File.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/File.png"
if source == DocumentSource.GOOGLE_SITES.value: if source == DocumentSource.GOOGLE_SITES.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/GoogleSites.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/GoogleSites.png"
if source == DocumentSource.SLACK.value: if source == DocumentSource.SLACK.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Slack.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Slack.png"
)
if source == DocumentSource.GMAIL.value: if source == DocumentSource.GMAIL.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Gmail.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Gmail.png"
)
if source == DocumentSource.GOOGLE_DRIVE.value: if source == DocumentSource.GOOGLE_DRIVE.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/GoogleDrive.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/GoogleDrive.png"
if source == DocumentSource.GITHUB.value: if source == DocumentSource.GITHUB.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Github.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Github.png"
)
if source == DocumentSource.GITLAB.value: if source == DocumentSource.GITLAB.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Gitlab.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Gitlab.png"
)
if source == DocumentSource.CONFLUENCE.value: if source == DocumentSource.CONFLUENCE.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/Confluence.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/Confluence.png"
if source == DocumentSource.JIRA.value: if source == DocumentSource.JIRA.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/Jira.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/Jira.png"
if source == DocumentSource.NOTION.value: if source == DocumentSource.NOTION.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Notion.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Notion.png"
)
if source == DocumentSource.ZENDESK.value: if source == DocumentSource.ZENDESK.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/Zendesk.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/Zendesk.png"
if source == DocumentSource.GONG.value: if source == DocumentSource.GONG.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Gong.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Gong.png"
if source == DocumentSource.LINEAR.value: if source == DocumentSource.LINEAR.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Linear.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Linear.png"
)
if source == DocumentSource.PRODUCTBOARD.value: if source == DocumentSource.PRODUCTBOARD.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Productboard.webp" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Productboard.webp"
if source == DocumentSource.SLAB.value: if source == DocumentSource.SLAB.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/SlabLogo.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/SlabLogo.png"
if source == DocumentSource.ZULIP.value: if source == DocumentSource.ZULIP.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Zulip.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Zulip.png"
)
if source == DocumentSource.GURU.value: if source == DocumentSource.GURU.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/Guru.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/Guru.png"
if source == DocumentSource.HUBSPOT.value: if source == DocumentSource.HUBSPOT.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/HubSpot.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/HubSpot.png"
)
if source == DocumentSource.DOCUMENT360.value: if source == DocumentSource.DOCUMENT360.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Document360.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Document360.png"
if source == DocumentSource.BOOKSTACK.value: if source == DocumentSource.BOOKSTACK.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Bookstack.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Bookstack.png"
if source == DocumentSource.LOOPIO.value: if source == DocumentSource.LOOPIO.value:
return ( return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Loopio.png"
"https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Loopio.png"
)
if source == DocumentSource.SHAREPOINT.value: if source == DocumentSource.SHAREPOINT.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/web/public/Sharepoint.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/web/public/Sharepoint.png"
if source == DocumentSource.REQUESTTRACKER.value: if source == DocumentSource.REQUESTTRACKER.value:
# just use file icon for now # just use file icon for now
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/File.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/File.png"
if source == DocumentSource.INGESTION_API.value: if source == DocumentSource.INGESTION_API.value:
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/File.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/File.png"
return "https://raw.githubusercontent.com/onyx-ai/onyx/main/backend/slackbot_images/File.png" return "https://raw.githubusercontent.com/onyx-dot-app/onyx/main/backend/slackbot_images/File.png"

1
backend/onyx/onyxbot/slack/utils.py
View File

@ -375,7 +375,6 @@ def remove_slack_text_interactions(slack_str: str) -> str:
slack_str = SlackTextCleaner.replace_tags_basic(slack_str) slack_str = SlackTextCleaner.replace_tags_basic(slack_str)
slack_str = SlackTextCleaner.replace_channels_basic(slack_str) slack_str = SlackTextCleaner.replace_channels_basic(slack_str)
slack_str = SlackTextCleaner.replace_special_mentions(slack_str) slack_str = SlackTextCleaner.replace_special_mentions(slack_str)
slack_str = SlackTextCleaner.replace_links(slack_str)
slack_str = SlackTextCleaner.replace_special_catchall(slack_str) slack_str = SlackTextCleaner.replace_special_catchall(slack_str)
slack_str = SlackTextCleaner.add_zero_width_whitespace_after_tag(slack_str) slack_str = SlackTextCleaner.add_zero_width_whitespace_after_tag(slack_str)
return slack_str return slack_str