nit

onyx-dot-app · Oct 14, 2024 · bc344c9 · bc344c9
1 parent dbbddc7
commit bc344c9
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/backend/danswer/auth/users.py b/backend/danswer/auth/users.py
@@ -46,6 +46,12 @@
 from danswer.configs.app_configs import EMAIL_FROM
 from danswer.configs.app_configs import MULTI_TENANT
 from danswer.configs.app_configs import REQUIRE_EMAIL_VERIFICATION
+from danswer.configs.app_configs import SECRET_JWT_KEY
+from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS
+from danswer.configs.app_configs import SMTP_PASS
+from danswer.configs.app_configs import SMTP_PORT
+from danswer.configs.app_configs import SMTP_SERVER
+from danswer.configs.app_configs import SMTP_USER
 from danswer.configs.app_configs import TRACK_EXTERNAL_IDP_EXPIRY
 from danswer.configs.app_configs import USER_AUTH_SECRET
 from danswer.configs.app_configs import VALID_EMAIL_DOMAINS
@@ -73,12 +79,6 @@
 from danswer.utils.telemetry import RecordType
 from danswer.utils.variable_functionality import fetch_versioned_implementation
 from shared_configs.configs import current_tenant_id
-from shared_configs.configs import SECRET_JWT_KEY
-from shared_configs.configs import SESSION_EXPIRE_TIME_SECONDS
-from shared_configs.configs import SMTP_PASS
-from shared_configs.configs import SMTP_PORT
-from shared_configs.configs import SMTP_SERVER
-from shared_configs.configs import SMTP_USER
 
 logger = setup_logger()
 

diff --git a/backend/danswer/db/engine.py b/backend/danswer/db/engine.py
@@ -35,11 +35,11 @@
 from danswer.configs.app_configs import POSTGRES_POOL_RECYCLE
 from danswer.configs.app_configs import POSTGRES_PORT
 from danswer.configs.app_configs import POSTGRES_USER
+from danswer.configs.app_configs import SECRET_JWT_KEY
 from danswer.configs.constants import POSTGRES_DEFAULT_SCHEMA
 from danswer.configs.constants import POSTGRES_UNKNOWN_APP_NAME
 from danswer.utils.logger import setup_logger
 from shared_configs.configs import current_tenant_id
-from shared_configs.configs import SECRET_JWT_KEY
 
 logger = setup_logger()
 

diff --git a/backend/danswer/indexing/chunker.py b/backend/danswer/indexing/chunker.py
@@ -1,6 +1,7 @@
 from danswer.configs.app_configs import BLURB_SIZE
 from danswer.configs.app_configs import LARGE_CHUNK_RATIO
 from danswer.configs.app_configs import MINI_CHUNK_SIZE
+from danswer.configs.app_configs import SKIP_METADATA_IN_CHUNK
 from danswer.configs.constants import DocumentSource
 from danswer.configs.constants import RETURN_SEPARATOR
 from danswer.configs.constants import SECTION_SEPARATOR
@@ -14,7 +15,6 @@
 from danswer.natural_language_processing.utils import BaseTokenizer
 from danswer.utils.logger import setup_logger
 from danswer.utils.text_processing import shared_precompare_cleanup
-from shared_configs.configs import SKIP_METADATA_IN_CHUNK
 
 
 # Not supporting overlaps, we need a clean combination of chunks and it is unclear if overlaps

diff --git a/backend/danswer/main.py b/backend/danswer/main.py
@@ -37,6 +37,7 @@
 from danswer.configs.app_configs import OAUTH_CLIENT_SECRET
 from danswer.configs.app_configs import POSTGRES_API_SERVER_POOL_OVERFLOW
 from danswer.configs.app_configs import POSTGRES_API_SERVER_POOL_SIZE
+from danswer.configs.app_configs import SYSTEM_RECURSION_LIMIT
 from danswer.configs.app_configs import USER_AUTH_SECRET
 from danswer.configs.app_configs import WEB_DOMAIN
 from danswer.configs.constants import AuthType
@@ -93,7 +94,6 @@
 from danswer.utils.variable_functionality import set_is_ee_based_on_env_variable
 from shared_configs.configs import CORS_ALLOWED_ORIGIN
 from shared_configs.configs import SENTRY_DSN
-from shared_configs.configs import SYSTEM_RECURSION_LIMIT
 
 logger = setup_logger()
 

diff --git a/backend/danswer/server/manage/users.py b/backend/danswer/server/manage/users.py
@@ -34,6 +34,7 @@
 from danswer.configs.app_configs import AUTH_TYPE
 from danswer.configs.app_configs import ENABLE_EMAIL_INVITES
 from danswer.configs.app_configs import MULTI_TENANT
+from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS
 from danswer.configs.app_configs import VALID_EMAIL_DOMAINS
 from danswer.configs.constants import AuthType
 from danswer.db.auth import get_total_users
@@ -65,7 +66,6 @@
 from ee.danswer.server.tenants.billing import register_tenant_users
 from ee.danswer.server.tenants.provisioning import add_users_to_tenant
 from ee.danswer.server.tenants.provisioning import remove_users_from_tenant
-from shared_configs.configs import SESSION_EXPIRE_TIME_SECONDS
 
 logger = setup_logger()
 

diff --git a/backend/danswer/server/utils.py b/backend/danswer/server/utils.py
@@ -6,12 +6,12 @@
 from textwrap import dedent
 from typing import Any
 
+from danswer.configs.app_configs import SMTP_PASS
+from danswer.configs.app_configs import SMTP_PORT
+from danswer.configs.app_configs import SMTP_SERVER
+from danswer.configs.app_configs import SMTP_USER
 from danswer.configs.app_configs import WEB_DOMAIN
 from danswer.db.models import User
-from shared_configs.configs import SMTP_PASS
-from shared_configs.configs import SMTP_PORT
-from shared_configs.configs import SMTP_SERVER
-from shared_configs.configs import SMTP_USER
 
 
 class DateTimeEncoder(json.JSONEncoder):

diff --git a/backend/ee/danswer/db/saml.py b/backend/ee/danswer/db/saml.py
@@ -7,9 +7,9 @@
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
+from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS
 from danswer.db.models import SamlAccount
 from danswer.db.models import User
-from shared_configs.configs import SESSION_EXPIRE_TIME_SECONDS
 
 
 def upsert_saml_account(

diff --git a/backend/ee/danswer/server/middleware/tenant_tracking.py b/backend/ee/danswer/server/middleware/tenant_tracking.py
@@ -9,10 +9,10 @@
 from fastapi import Response
 
 from danswer.configs.app_configs import MULTI_TENANT
+from danswer.configs.app_configs import SECRET_JWT_KEY
 from danswer.configs.constants import POSTGRES_DEFAULT_SCHEMA
 from danswer.db.engine import is_valid_schema_name
 from shared_configs.configs import current_tenant_id
-from shared_configs.configs import SECRET_JWT_KEY
 
 
 def add_tenant_id_middleware(app: FastAPI, logger: logging.LoggerAdapter) -> None:

diff --git a/backend/ee/danswer/server/saml.py b/backend/ee/danswer/server/saml.py
@@ -17,6 +17,7 @@
 from danswer.auth.schemas import UserCreate
 from danswer.auth.schemas import UserRole
 from danswer.auth.users import get_user_manager
+from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS
 from danswer.db.auth import get_user_count
 from danswer.db.auth import get_user_db
 from danswer.db.engine import get_async_session
@@ -29,7 +30,6 @@
 from ee.danswer.db.saml import upsert_saml_account
 from ee.danswer.utils.secrets import encrypt_string
 from ee.danswer.utils.secrets import extract_hashed_cookie
-from shared_configs.configs import SESSION_EXPIRE_TIME_SECONDS
 
 
 logger = setup_logger()