From c44c22a00989eeca0120c12de84c2d83131b39b9 Mon Sep 17 00:00:00 2001 From: Weves Date: Mon, 19 Aug 2024 07:16:32 -0700 Subject: [PATCH] Fix model server --- backend/danswer/configs/constants.py | 5 ----- backend/danswer/danswerbot/slack/handlers/handle_message.py | 2 +- backend/danswer/danswerbot/slack/listener.py | 2 +- backend/danswer/utils/logger.py | 2 +- backend/shared_configs/configs.py | 2 ++ 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/backend/danswer/configs/constants.py b/backend/danswer/configs/constants.py index f30f8c0f931c..d5f2b63b5dbd 100644 --- a/backend/danswer/configs/constants.py +++ b/backend/danswer/configs/constants.py @@ -12,11 +12,6 @@ ID_SEPARATOR = ":;:" DEFAULT_BOOST = 0 SESSION_KEY = "session" - -# Used for logging -SLACK_CHANNEL_ID = "channel_id" - - # For chunking/processing chunks RETURN_SEPARATOR = "\n\r\n" SECTION_SEPARATOR = "\n\n" diff --git a/backend/danswer/danswerbot/slack/handlers/handle_message.py b/backend/danswer/danswerbot/slack/handlers/handle_message.py index e94786a77245..2edbd9735537 100644 --- a/backend/danswer/danswerbot/slack/handlers/handle_message.py +++ b/backend/danswer/danswerbot/slack/handlers/handle_message.py @@ -4,7 +4,6 @@ from slack_sdk import WebClient from slack_sdk.errors import SlackApiError from sqlalchemy.orm import Session -from danswer.configs.constants import SLACK_CHANNEL_ID from danswer.configs.danswerbot_configs import DANSWER_BOT_FEEDBACK_REMINDER from danswer.configs.danswerbot_configs import DANSWER_REACT_EMOJI from danswer.danswerbot.slack.blocks import get_feedback_reminder_blocks @@ -23,6 +22,7 @@ from danswer.danswerbot.slack.utils import update_emote_react from danswer.db.engine import get_sqlalchemy_engine from danswer.db.models import SlackBotConfig from danswer.utils.logger import setup_logger +from shared_configs.configs import SLACK_CHANNEL_ID logger_base = setup_logger() diff --git a/backend/danswer/danswerbot/slack/listener.py b/backend/danswer/danswerbot/slack/listener.py index 90aca4f68abc..d83a902d56de 100644 --- a/backend/danswer/danswerbot/slack/listener.py +++ b/backend/danswer/danswerbot/slack/listener.py @@ -10,7 +10,6 @@ from slack_sdk.socket_mode.response import SocketModeResponse from sqlalchemy.orm import Session from danswer.configs.constants import MessageType -from danswer.configs.constants import SLACK_CHANNEL_ID from danswer.configs.danswerbot_configs import DANSWER_BOT_REPHRASE_MESSAGE from danswer.configs.danswerbot_configs import DANSWER_BOT_RESPOND_EVERY_CHANNEL from danswer.configs.danswerbot_configs import NOTIFY_SLACKBOT_NO_ANSWER @@ -56,6 +55,7 @@ from danswer.server.manage.models import SlackBotTokens from danswer.utils.logger import setup_logger from shared_configs.configs import MODEL_SERVER_HOST from shared_configs.configs import MODEL_SERVER_PORT +from shared_configs.configs import SLACK_CHANNEL_ID logger = setup_logger() diff --git a/backend/danswer/utils/logger.py b/backend/danswer/utils/logger.py index 400b3a332fa0..a7751ca3dc7a 100644 --- a/backend/danswer/utils/logger.py +++ b/backend/danswer/utils/logger.py @@ -4,10 +4,10 @@ from collections.abc import MutableMapping from logging.handlers import RotatingFileHandler from typing import Any -from danswer.configs.constants import SLACK_CHANNEL_ID from shared_configs.configs import DEV_LOGGING_ENABLED from shared_configs.configs import LOG_FILE_NAME from shared_configs.configs import LOG_LEVEL +from shared_configs.configs import SLACK_CHANNEL_ID logging.addLevelName(logging.INFO + 5, "NOTICE") diff --git a/backend/shared_configs/configs.py b/backend/shared_configs/configs.py index eb822f009399..7de65dc16cc8 100644 --- a/backend/shared_configs/configs.py +++ b/backend/shared_configs/configs.py @@ -1,5 +1,7 @@ import os +# Used for logging +SLACK_CHANNEL_ID = "channel_id" MODEL_SERVER_HOST = os.environ.get("MODEL_SERVER_HOST") or "localhost" MODEL_SERVER_ALLOWED_HOST = os.environ.get("MODEL_SERVER_HOST") or "0.0.0.0"