stashing

.github/workflows/pr-integration-tests.yml

@@ -94,20 +94,16 @@ jobs:
           cd deployment/docker_compose
           ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=true \
           MULTI_TENANT=true \
-          LOG_LEVEL=DEBUG \
-          AUTH_TYPE=cloud \
+          AUTH_TYPE=basic \
           REQUIRE_EMAIL_VERIFICATION=false \
           DISABLE_TELEMETRY=true \
           IMAGE_TAG=test \
-          DEV_MODE=true \
-          docker compose -f docker-compose.multitenant-dev.yml -p danswer-stack up -d
+          docker compose -f docker-compose.dev.yml -p danswer-stack up -d
         id: start_docker_multi_tenant
 
       # In practice, `cloud` Auth type would require OAUTH credentials to be set.
       - name: Run Multi-Tenant Integration Tests
         run: |
-          echo "Waiting for 3 minutes to ensure API server is ready..."
-          sleep 180
           echo "Running integration tests..."
           docker run --rm --network danswer-stack_default \
             --name test-runner \
@@ -116,7 +112,6 @@ jobs:
             -e POSTGRES_PASSWORD=password \
             -e POSTGRES_DB=postgres \
             -e VESPA_HOST=index \
-            -e LOG_LEVEL=DEBUG \
             -e REDIS_HOST=cache \
             -e API_SERVER_HOST=api_server \
             -e OPENAI_API_KEY=${OPENAI_API_KEY} \
@@ -124,10 +119,6 @@ jobs:
             -e TEST_WEB_HOSTNAME=test-runner \
             -e AUTH_TYPE=cloud \
             -e MULTI_TENANT=true \
-            -e REQUIRE_EMAIL_VERIFICATION=false \
-            -e DISABLE_TELEMETRY=true \
-            -e IMAGE_TAG=test \
-            -e DEV_MODE=true \
             onyxdotapp/onyx-integration:test \
             /app/tests/integration/multitenant_tests
         continue-on-error: true
@@ -135,17 +126,17 @@ jobs:
 
       - name: Check multi-tenant test results
         run: |
-          if [ ${{ steps.run_multitenant_tests.outcome }} == 'failure' ]; then
-            echo "Multi-tenant integration tests failed. Exiting with error."
+          if [ ${{ steps.run_tests.outcome }} == 'failure' ]; then
+            echo "Integration tests failed. Exiting with error."
             exit 1
           else
-            echo "All multi-tenant integration tests passed successfully."
+            echo "All integration tests passed successfully."
           fi
 
       - name: Stop multi-tenant Docker containers
         run: |
           cd deployment/docker_compose
-          docker compose -f docker-compose.multitenant-dev.yml -p danswer-stack down -v
+          docker compose -f docker-compose.dev.yml -p danswer-stack down -v
 
       - name: Start Docker containers
         run: |
@@ -155,7 +146,6 @@ jobs:
           REQUIRE_EMAIL_VERIFICATION=false \
           DISABLE_TELEMETRY=true \
           IMAGE_TAG=test \
-          LOG_LEVEL=DEBUG \
           docker compose -f docker-compose.dev.yml -p danswer-stack up -d
         id: start_docker
 
@@ -204,7 +194,6 @@ jobs:
             -e POSTGRES_DB=postgres \
             -e VESPA_HOST=index \
             -e REDIS_HOST=cache \
-            -e LOG_LEVEL=DEBUG \
             -e API_SERVER_HOST=api_server \
             -e OPENAI_API_KEY=${OPENAI_API_KEY} \
             -e SLACK_BOT_TOKEN=${SLACK_BOT_TOKEN} \
@@ -227,30 +216,27 @@ jobs:
             echo "All integration tests passed successfully."
           fi
 
-      # ------------------------------------------------------------
-      # Always gather logs BEFORE "down":
-      - name: Dump API server logs
-        if: always()
+      # save before stopping the containers so the logs can be captured
+      - name: Save Docker logs
+        if: success() || failure()
         run: |
           cd deployment/docker_compose
-          docker compose -f docker-compose.dev.yml -p danswer-stack logs --no-color api_server > $GITHUB_WORKSPACE/api_server.log || true
-
-      - name: Dump all-container logs (optional)
-        if: always()
-        run: |
-          cd deployment/docker_compose
-          docker compose -f docker-compose.dev.yml -p danswer-stack logs --no-color > $GITHUB_WORKSPACE/docker-compose.log || true
-
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: docker-all-logs
-          path: ${{ github.workspace }}/docker-compose.log
-      # ------------------------------------------------------------
+          docker compose -f docker-compose.dev.yml -p danswer-stack logs > docker-compose.log
+          mv docker-compose.log ${{ github.workspace }}/docker-compose.log
+
+      - name: Stop Docker containers
+        run: |
+          cd deployment/docker_compose
+          docker compose -f docker-compose.dev.yml -p danswer-stack down -v
+
+      - name: Upload logs
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-logs
+          path: ${{ github.workspace }}/docker-compose.log
 
       - name: Stop Docker containers
-        if: always()
         run: |
           cd deployment/docker_compose
           docker compose -f docker-compose.dev.yml -p danswer-stack down -v

backend/alembic/versions/4ee1287bd26a_add_multiple_slack_bot_support.py

@@ -5,6 +5,7 @@ Revises: 47e5bef3a1d7
 Create Date: 2024-11-06 13:15:53.302644
 
 """
+import logging
 from typing import cast
 from alembic import op
 import sqlalchemy as sa
@@ -19,8 +20,13 @@ down_revision = "47e5bef3a1d7"
 branch_labels: None = None
 depends_on: None = None
 
+# Configure logging
+logger = logging.getLogger("alembic.runtime.migration")
+logger.setLevel(logging.INFO)
+
 
 def upgrade() -> None:
+    logger.info(f"{revision}: create_table: slack_bot")
     # Create new slack_bot table
     op.create_table(
         "slack_bot",
@@ -57,6 +63,7 @@ def upgrade() -> None:
     )
 
     # Handle existing Slack bot tokens first
+    logger.info(f"{revision}: Checking for existing Slack bot.")
     bot_token = None
     app_token = None
     first_row_id = None
@@ -64,12 +71,15 @@ def upgrade() -> None:
     try:
         tokens = cast(dict, get_kv_store().load("slack_bot_tokens_config_key"))
     except Exception:
+        logger.warning("No existing Slack bot tokens found.")
         tokens = {}
 
     bot_token = tokens.get("bot_token")
     app_token = tokens.get("app_token")
 
     if bot_token and app_token:
+        logger.info(f"{revision}: Found bot and app tokens.")
+
         session = Session(bind=op.get_bind())
         new_slack_bot = SlackBot(
             name="Slack Bot (Migrated)",
@@ -160,9 +170,10 @@ def upgrade() -> None:
     # Clean up old tokens if they existed
     try:
         if bot_token and app_token:
+            logger.info(f"{revision}: Removing old bot and app tokens.")
             get_kv_store().delete("slack_bot_tokens_config_key")
     except Exception:
-        pass
+        logger.warning("tried to delete tokens in dynamic config but failed")
     # Rename the table
     op.rename_table(
         "slack_bot_config__standard_answer_category",
@@ -179,6 +190,8 @@ def upgrade() -> None:
     # Drop the table with CASCADE to handle dependent objects
     op.execute("DROP TABLE slack_bot_config CASCADE")
 
+    logger.info(f"{revision}: Migration complete.")
+
 
 def downgrade() -> None:
     # Recreate the old slack_bot_config table
@@ -260,7 +273,7 @@ def downgrade() -> None:
             }
             get_kv_store().store("slack_bot_tokens_config_key", tokens)
     except Exception:
-        pass
+        logger.warning("Failed to save tokens back to KV store")
 
     # Drop the new tables in reverse order
     op.drop_table("slack_channel_config")

backend/ee/onyx/server/middleware/tenant_tracking.py

@@ -64,7 +64,6 @@ async def _get_tenant_id_from_request(
 
     try:
         # Look up token data in Redis
-
         token_data = await retrieve_auth_token_data_from_redis(request)
 
         if not token_data:

backend/ee/onyx/server/tenants/provisioning.py

@@ -24,7 +24,6 @@ from ee.onyx.server.tenants.user_mapping import get_tenant_id_for_email
 from ee.onyx.server.tenants.user_mapping import user_owns_a_tenant
 from onyx.auth.users import exceptions
 from onyx.configs.app_configs import CONTROL_PLANE_API_BASE_URL
-from onyx.configs.app_configs import DEV_MODE
 from onyx.configs.constants import MilestoneRecordType
 from onyx.db.engine import get_session_with_tenant
 from onyx.db.engine import get_sqlalchemy_engine
@@ -86,8 +85,7 @@ async def create_tenant(email: str, referral_source: str | None = None) -> str:
         # Provision tenant on data plane
         await provision_tenant(tenant_id, email)
         # Notify control plane
-        if not DEV_MODE:
-            await notify_control_plane(tenant_id, email, referral_source)
+        await notify_control_plane(tenant_id, email, referral_source)
     except Exception as e:
         logger.error(f"Tenant provisioning failed: {e}")
         await rollback_tenant_provisioning(tenant_id)

backend/onyx/agents/agent_search/basic/graph_builder.py

@@ -3,6 +3,7 @@ from langgraph.graph import START
 from langgraph.graph import StateGraph
 
 from onyx.agents.agent_search.basic.states import BasicInput
+from onyx.agents.agent_search.basic.states import BasicOutput
 from onyx.agents.agent_search.basic.states import BasicState
 from onyx.agents.agent_search.orchestration.nodes.basic_use_tool_response import (
     basic_use_tool_response,
@@ -12,8 +13,6 @@ from onyx.agents.agent_search.orchestration.nodes.prepare_tool_input import (
     prepare_tool_input,
 )
 from onyx.agents.agent_search.orchestration.nodes.tool_call import tool_call
-from onyx.agents.agent_search.orchestration.states import ToolChoiceUpdate
-from onyx.configs.agent_configs import AGENT_MAX_TOOL_CALLS
 from onyx.utils.logger import setup_logger
 
 logger = setup_logger()
@@ -23,7 +22,7 @@ def basic_graph_builder() -> StateGraph:
     graph = StateGraph(
         state_schema=BasicState,
         input=BasicInput,
-        output=ToolChoiceUpdate,
+        output=BasicOutput,
     )
 
     ### Add nodes ###
@@ -61,15 +60,11 @@ def basic_graph_builder() -> StateGraph:
         end_key="basic_use_tool_response",
     )
 
-    graph.add_conditional_edges(
-        "basic_use_tool_response", should_continue, ["tool_call", END]
+    graph.add_edge(
+        start_key="basic_use_tool_response",
+        end_key=END,
     )
 
-    # graph.add_edge(
-    #     start_key="basic_use_tool_response",
-    #     end_key=END,
-    # )
-
     return graph
 
 
@@ -77,8 +72,7 @@ def should_continue(state: BasicState) -> str:
     return (
         # If there are no tool calls, basic graph already streamed the answer
         END
-        if state.tool_choices[-1] is None
-        or len(state.tool_choices) > AGENT_MAX_TOOL_CALLS
+        if state.tool_choice is None
         else "tool_call"
     )
 

backend/onyx/agents/agent_search/deep_search/main/edges.py

@@ -30,12 +30,11 @@ def route_initial_tool_choice(
     LangGraph edge to route to agent search.
     """
     agent_config = cast(GraphConfig, config["metadata"]["config"])
-    if state.tool_choices[-1] is not None:
+    if state.tool_choice is not None:
         if (
             agent_config.behavior.use_agentic_search
             and agent_config.tooling.search_tool is not None
-            and state.tool_choices[-1].tool.name
-            == agent_config.tooling.search_tool.name
+            and state.tool_choice.tool.name == agent_config.tooling.search_tool.name
         ):
             return "start_agent_search"
         else:

backend/onyx/agents/agent_search/orchestration/nodes/basic_use_tool_response.py

@@ -4,11 +4,10 @@ from langchain_core.messages import AIMessageChunk
 from langchain_core.runnables.config import RunnableConfig
 from langgraph.types import StreamWriter
 
+from onyx.agents.agent_search.basic.states import BasicOutput
 from onyx.agents.agent_search.basic.states import BasicState
 from onyx.agents.agent_search.basic.utils import process_llm_stream
 from onyx.agents.agent_search.models import GraphConfig
-from onyx.agents.agent_search.orchestration.states import ToolChoiceUpdate
-from onyx.agents.agent_search.orchestration.utils import get_tool_choice_update
 from onyx.chat.models import LlmDoc
 from onyx.chat.models import OnyxContexts
 from onyx.tools.tool_implementations.search.search_tool import (
@@ -24,15 +23,11 @@ logger = setup_logger()
 
 def basic_use_tool_response(
     state: BasicState, config: RunnableConfig, writer: StreamWriter = lambda _: None
-) -> ToolChoiceUpdate:
+) -> BasicOutput:
     agent_config = cast(GraphConfig, config["metadata"]["config"])
     structured_response_format = agent_config.inputs.structured_response_format
     llm = agent_config.tooling.primary_llm
-
-    assert (
-        len(state.tool_choices) > 0
-    ), "Tool choice node must have at least one tool choice"
-    tool_choice = state.tool_choices[-1]
+    tool_choice = state.tool_choice
     if tool_choice is None:
         raise ValueError("Tool choice is None")
     tool = tool_choice.tool
@@ -66,8 +61,6 @@ def basic_use_tool_response(
         stream = llm.stream(
             prompt=new_prompt_builder.build(),
             structured_response_format=structured_response_format,
-            tools=[_tool.tool_definition() for _tool in agent_config.tooling.tools],
-            tool_choice=None,
         )
 
         # For now, we don't do multiple tool calls, so we ignore the tool_message
@@ -81,4 +74,4 @@ def basic_use_tool_response(
             displayed_search_results=initial_search_results or final_search_results,
         )
 
-    return get_tool_choice_update(new_tool_call_chunk, agent_config.tooling.tools)
+    return BasicOutput(tool_call_chunk=new_tool_call_chunk)

backend/onyx/agents/agent_search/orchestration/nodes/llm_tool_choice.py

@@ -1,21 +1,21 @@
 from typing import cast
 from uuid import uuid4
 
+from langchain_core.messages import ToolCall
 from langchain_core.runnables.config import RunnableConfig
 from langgraph.types import StreamWriter
 
-from onyx.agents.agent_search.basic.states import BasicState
 from onyx.agents.agent_search.basic.utils import process_llm_stream
 from onyx.agents.agent_search.models import GraphConfig
 from onyx.agents.agent_search.orchestration.states import ToolChoice
+from onyx.agents.agent_search.orchestration.states import ToolChoiceState
 from onyx.agents.agent_search.orchestration.states import ToolChoiceUpdate
-from onyx.agents.agent_search.orchestration.utils import get_tool_choice_update
 from onyx.chat.prompt_builder.answer_prompt_builder import AnswerPromptBuilder
 from onyx.chat.tool_handling.tool_response_handler import get_tool_by_name
 from onyx.chat.tool_handling.tool_response_handler import (
     get_tool_call_for_non_tool_calling_llm_impl,
 )
-from onyx.llm.interfaces import ToolChoiceOptions
+from onyx.tools.tool import Tool
 from onyx.utils.logger import setup_logger
 
 logger = setup_logger()
@@ -26,7 +26,7 @@ logger = setup_logger()
 # from the state and config
 # TODO: fan-out to multiple tool call nodes? Make this configurable?
 def llm_tool_choice(
-    state: BasicState,
+    state: ToolChoiceState,
     config: RunnableConfig,
     writer: StreamWriter = lambda _: None,
 ) -> ToolChoiceUpdate:
@@ -72,13 +72,11 @@ def llm_tool_choice(
     # This only happens if the tool call was forced or we are using a non-tool calling LLM.
     if tool and tool_args:
         return ToolChoiceUpdate(
-            tool_choices=[
-                ToolChoice(
-                    tool=tool,
-                    tool_args=tool_args,
-                    id=str(uuid4()),
-                )
-            ],
+            tool_choice=ToolChoice(
+                tool=tool,
+                tool_args=tool_args,
+                id=str(uuid4()),
+            ),
         )
 
     # if we're skipping gen ai answer generation, we should only
@@ -86,7 +84,7 @@ def llm_tool_choice(
     # the tool calling llm in the stream() below)
     if skip_gen_ai_answer_generation and not force_use_tool.force_use:
         return ToolChoiceUpdate(
-            tool_choices=[None],
+            tool_choice=None,
         )
 
     built_prompt = (
@@ -101,9 +99,7 @@ def llm_tool_choice(
         # may choose to not call any tools and just generate the answer, in which case the task prompt is needed.
         prompt=built_prompt,
         tools=[tool.tool_definition() for tool in tools] or None,
-        tool_choice=(
-            ToolChoiceOptions.REQUIRED if tools and force_use_tool.force_use else None
-        ),
+        tool_choice=("required" if tools and force_use_tool.force_use else None),
         structured_response_format=structured_response_format,
     )
 
@@ -114,4 +110,45 @@ def llm_tool_choice(
         writer,
     )
 
-    return get_tool_choice_update(tool_message, tools)
+    # If no tool calls are emitted by the LLM, we should not choose a tool
+    if len(tool_message.tool_calls) == 0:
+        logger.debug("No tool calls emitted by LLM")
+        return ToolChoiceUpdate(
+            tool_choice=None,
+        )
+
+    # TODO: here we could handle parallel tool calls. Right now
+    # we just pick the first one that matches.
+    selected_tool: Tool | None = None
+    selected_tool_call_request: ToolCall | None = None
+    for tool_call_request in tool_message.tool_calls:
+        known_tools_by_name = [
+            tool for tool in tools if tool.name == tool_call_request["name"]
+        ]
+
+        if known_tools_by_name:
+            selected_tool = known_tools_by_name[0]
+            selected_tool_call_request = tool_call_request
+            break
+
+        logger.error(
+            "Tool call requested with unknown name field. \n"
+            f"tools: {tools}"
+            f"tool_call_request: {tool_call_request}"
+        )
+
+    if not selected_tool or not selected_tool_call_request:
+        raise ValueError(
+            f"Tool call attempted with tool {selected_tool}, request {selected_tool_call_request}"
+        )
+
+    logger.debug(f"Selected tool: {selected_tool.name}")
+    logger.debug(f"Selected tool call request: {selected_tool_call_request}")
+
+    return ToolChoiceUpdate(
+        tool_choice=ToolChoice(
+            tool=selected_tool,
+            tool_args=selected_tool_call_request["args"],
+            id=selected_tool_call_request["id"],
+        ),
+    )

backend/onyx/agents/agent_search/orchestration/nodes/tool_call.py

@@ -37,10 +37,7 @@ def tool_call(
 
     cast(GraphConfig, config["metadata"]["config"])
 
-    assert (
-        len(state.tool_choices) > 0
-    ), "Tool call node must have at least one tool choice"
-    tool_choice = state.tool_choices[-1]
+    tool_choice = state.tool_choice
     if tool_choice is None:
         raise ValueError("Cannot invoke tool call node without a tool choice")
 

backend/onyx/agents/agent_search/orchestration/states.py

@@ -1,6 +1,3 @@
-from operator import add
-from typing import Annotated
-
 from pydantic import BaseModel
 
 from onyx.chat.prompt_builder.answer_prompt_builder import PromptSnapshot
@@ -44,7 +41,7 @@ class ToolChoice(BaseModel):
 
 
 class ToolChoiceUpdate(BaseModel):
-    tool_choices: Annotated[list[ToolChoice | None], add] = []
+    tool_choice: ToolChoice | None = None
 
 
 class ToolChoiceState(ToolChoiceUpdate, ToolChoiceInput):

backend/onyx/agents/agent_search/orchestration/utils.py

@@ -1,58 +0,0 @@
-from langchain_core.messages import AIMessageChunk
-from langchain_core.messages import ToolCall
-
-from onyx.agents.agent_search.orchestration.states import ToolChoice
-from onyx.agents.agent_search.orchestration.states import ToolChoiceUpdate
-from onyx.tools.tool import Tool
-from onyx.utils.logger import setup_logger
-
-logger = setup_logger()
-
-
-def get_tool_choice_update(
-    tool_message: AIMessageChunk, tools: list[Tool]
-) -> ToolChoiceUpdate:
-    # If no tool calls are emitted by the LLM, we should not choose a tool
-    if len(tool_message.tool_calls) == 0:
-        logger.debug("No tool calls emitted by LLM")
-        return ToolChoiceUpdate(
-            tool_choices=[None],
-        )
-
-    # TODO: here we could handle parallel tool calls. Right now
-    # we just pick the first one that matches.
-    selected_tool: Tool | None = None
-    selected_tool_call_request: ToolCall | None = None
-    for tool_call_request in tool_message.tool_calls:
-        known_tools_by_name = [
-            tool for tool in tools if tool.name == tool_call_request["name"]
-        ]
-
-        if known_tools_by_name:
-            selected_tool = known_tools_by_name[0]
-            selected_tool_call_request = tool_call_request
-            break
-
-        logger.error(
-            "Tool call requested with unknown name field. \n"
-            f"tools: {tools}"
-            f"tool_call_request: {tool_call_request}"
-        )
-
-    if not selected_tool or not selected_tool_call_request:
-        raise ValueError(
-            f"Tool call attempted with tool {selected_tool}, request {selected_tool_call_request}"
-        )
-
-    logger.debug(f"Selected tool: {selected_tool.name}")
-    logger.debug(f"Selected tool call request: {selected_tool_call_request}")
-
-    return ToolChoiceUpdate(
-        tool_choices=[
-            ToolChoice(
-                tool=selected_tool,
-                tool_args=selected_tool_call_request["args"],
-                id=selected_tool_call_request["id"],
-            )
-        ],
-    )

backend/onyx/chat/prompt_builder/answer_prompt_builder.py

@@ -19,7 +19,6 @@ from onyx.llm.utils import message_to_prompt_and_imgs
 from onyx.llm.utils import model_supports_image_input
 from onyx.natural_language_processing.utils import get_tokenizer
 from onyx.prompts.chat_prompts import CHAT_USER_CONTEXT_FREE_PROMPT
-from onyx.prompts.chat_prompts import NO_TOOL_CALL_PREAMBLE
 from onyx.prompts.direct_qa_prompts import HISTORY_BLOCK
 from onyx.prompts.prompt_utils import drop_messages_history_overflow
 from onyx.prompts.prompt_utils import handle_onyx_date_awareness
@@ -28,7 +27,6 @@ from onyx.tools.models import ToolCallFinalResult
 from onyx.tools.models import ToolCallKickoff
 from onyx.tools.models import ToolResponse
 from onyx.tools.tool import Tool
-from onyx.tools.utils import is_anthropic_tool_calling_model
 
 
 def default_build_system_message(
@@ -140,14 +138,6 @@ class AnswerPromptBuilder:
             self.system_message_and_token_cnt = None
             return
 
-        if is_anthropic_tool_calling_model(
-            self.llm_config.model_provider, self.llm_config.model_name
-        ):
-            if isinstance(system_message.content, str):
-                system_message.content += NO_TOOL_CALL_PREAMBLE
-            else:
-                system_message.content.append(NO_TOOL_CALL_PREAMBLE)
-
         self.system_message_and_token_cnt = (
             system_message,
             check_message_tokens(system_message, self.llm_tokenizer_encode_func),

backend/onyx/configs/agent_configs.py

@@ -12,7 +12,7 @@ AGENT_DEFAULT_EXPLORATORY_SEARCH_RESULTS = 5
 AGENT_DEFAULT_MIN_ORIG_QUESTION_DOCS = 3
 AGENT_DEFAULT_MAX_ANSWER_CONTEXT_DOCS = 10
 AGENT_DEFAULT_MAX_STATIC_HISTORY_WORD_LENGTH = 2000
-AGENT_DEFAULT_MAX_TOOL_CALLS = 3
+
 #####
 # Agent Configs
 #####
@@ -77,8 +77,4 @@ AGENT_MAX_STATIC_HISTORY_WORD_LENGTH = int(
     or AGENT_DEFAULT_MAX_STATIC_HISTORY_WORD_LENGTH
 )  # 2000
 
-AGENT_MAX_TOOL_CALLS = int(
-    os.environ.get("AGENT_MAX_TOOL_CALLS") or AGENT_DEFAULT_MAX_TOOL_CALLS
-)  # 1
-
 GRAPH_VERSION_NAME: str = "a"

backend/onyx/connectors/linear/connector.py

@@ -91,7 +91,6 @@ class LinearConnector(LoadConnector, PollConnector, OAuthConnector):
             f"&response_type=code"
             f"&scope=read"
             f"&state={state}"
-            f"&prompt=consent"  # prompts user for access; allows choosing workspace
         )
 
     @classmethod

backend/onyx/llm/interfaces.py

@@ -1,6 +1,6 @@
 import abc
 from collections.abc import Iterator
-from enum import Enum
+from typing import Literal
 
 from langchain.schema.language_model import LanguageModelInput
 from langchain_core.messages import AIMessageChunk
@@ -15,11 +15,7 @@ from onyx.utils.logger import setup_logger
 
 logger = setup_logger()
 
-
-class ToolChoiceOptions(Enum):
-    REQUIRED = "required"
-    AUTO = "auto"
-    NONE = "none"
+ToolChoiceOptions = Literal["required"] | Literal["auto"] | Literal["none"]
 
 
 class LLMConfig(BaseModel):

backend/onyx/prompts/chat_prompts.py

@@ -41,13 +41,6 @@ CHAT_USER_CONTEXT_FREE_PROMPT = f"""
 {{user_query}}
 """.strip()
 
-# we tried telling anthropic to not make repeated tool calls, but it didn't work very well.
-# when anthropic models don't follow this convention, it leads to the user seeing "the model
-# decided not to search" for a second, which isn't great UX.
-NO_TOOL_CALL_PREAMBLE = (
-    "\nThe first time you call a tool, call it IMMEDIATELY without a textual preamble."
-)
-
 
 # Design considerations for the below:
 # - In case of uncertainty, favor yes search so place the "yes" sections near the start of the

backend/onyx/server/documents/standard_oauth.py

@@ -179,10 +179,12 @@ def oauth_callback(
         db_session=db_session,
     )
 
-    # TODO: use a library for url handling
-    sep = "&" if "?" in desired_return_url else "?"
     return CallbackResponse(
-        redirect_url=f"{desired_return_url}{sep}credentialId={credential.id}"
+        redirect_url=(
+            f"{desired_return_url}?credentialId={credential.id}"
+            if "?" not in desired_return_url
+            else f"{desired_return_url}&credentialId={credential.id}"
+        )
     )
 
 

backend/onyx/server/manage/users.py

@@ -34,7 +34,6 @@ from onyx.auth.users import current_curator_or_admin_user
 from onyx.auth.users import current_user
 from onyx.auth.users import optional_user
 from onyx.configs.app_configs import AUTH_TYPE
-from onyx.configs.app_configs import DEV_MODE
 from onyx.configs.app_configs import ENABLE_EMAIL_INVITES
 from onyx.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS
 from onyx.configs.app_configs import VALID_EMAIL_DOMAINS
@@ -287,7 +286,7 @@ def bulk_invite_users(
             detail=f"Invalid email address: {email} - {str(e)}",
         )
 
-    if MULTI_TENANT and not DEV_MODE:
+    if MULTI_TENANT:
         try:
             fetch_ee_implementation_or_noop(
                 "onyx.server.tenants.provisioning", "add_users_to_tenant", None

backend/onyx/tools/utils.py

@@ -6,8 +6,6 @@ from onyx.configs.app_configs import AZURE_DALLE_API_KEY
 from onyx.db.connector import check_connectors_exist
 from onyx.db.document import check_docs_exist
 from onyx.db.models import LLMProvider
-from onyx.llm.llm_provider_options import ANTHROPIC_PROVIDER_NAME
-from onyx.llm.llm_provider_options import OPENAI_PROVIDER_NAME
 from onyx.natural_language_processing.utils import BaseTokenizer
 from onyx.tools.tool import Tool
 
@@ -20,20 +18,9 @@ OPEN_AI_TOOL_CALLING_MODELS = {
     "gpt-4o-mini",
 }
 
-ANTHROPIC_TOOL_CALLING_PREFIX = "claude-3-5-sonnet"
-
-
-def is_anthropic_tool_calling_model(model_provider: str, model_name: str) -> bool:
-    return model_provider == ANTHROPIC_PROVIDER_NAME and model_name.startswith(
-        ANTHROPIC_TOOL_CALLING_PREFIX
-    )
-
 
 def explicit_tool_calling_supported(model_provider: str, model_name: str) -> bool:
-    return (
-        model_provider == OPENAI_PROVIDER_NAME
-        and model_name in OPEN_AI_TOOL_CALLING_MODELS
-    ) or is_anthropic_tool_calling_model(model_provider, model_name)
+    return model_provider == "openai" and model_name in OPEN_AI_TOOL_CALLING_MODELS
 
 
 def compute_tool_tokens(tool: Tool, llm_tokenizer: BaseTokenizer) -> int:

backend/tests/integration/Dockerfile

@@ -70,8 +70,8 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 # Set up application files
 COPY ./onyx /app/onyx
 COPY ./shared_configs /app/shared_configs
-COPY ./alembic_tenants /app/alembic_tenants
 COPY ./alembic /app/alembic
+COPY ./alembic_tenants /app/alembic_tenants
 COPY ./alembic.ini /app/alembic.ini
 COPY ./pytest.ini /app/pytest.ini
 COPY supervisord.conf /usr/etc/supervisord.conf

backend/tests/integration/common_utils/managers/tenant.py

@@ -24,6 +24,35 @@ def generate_auth_token() -> str:
 
 
 class TenantManager:
+    @staticmethod
+    def create(
+        tenant_id: str | None = None,
+        initial_admin_email: str | None = None,
+        referral_source: str | None = None,
+    ) -> dict[str, str]:
+        body = {
+            "tenant_id": tenant_id,
+            "initial_admin_email": initial_admin_email,
+            "referral_source": referral_source,
+        }
+
+        token = generate_auth_token()
+        headers = {
+            "Authorization": f"Bearer {token}",
+            "X-API-KEY": "",
+            "Content-Type": "application/json",
+        }
+
+        response = requests.post(
+            url=f"{API_SERVER_URL}/tenants/create",
+            json=body,
+            headers=headers,
+        )
+
+        response.raise_for_status()
+
+        return response.json()
+
     @staticmethod
     def get_all_users(
         user_performing_action: DATestUser | None = None,

backend/tests/integration/common_utils/managers/user.py

@@ -92,7 +92,6 @@ class UserManager:
 
         # Set cookies in the headers
         test_user.headers["Cookie"] = f"fastapiusersauth={session_cookie}; "
-        test_user.cookies = {"fastapiusersauth": session_cookie}
         return test_user
 
     @staticmethod
@@ -103,7 +102,6 @@ class UserManager:
         response = requests.get(
             url=f"{API_SERVER_URL}/me",
             headers=user_to_verify.headers,
-            cookies=user_to_verify.cookies,
         )
 
         if user_to_verify.is_active is False:

backend/tests/integration/common_utils/reset.py

@@ -242,18 +242,6 @@ def reset_postgres_multitenant() -> None:
         schema_name = schema[0]
         cur.execute(f'DROP SCHEMA "{schema_name}" CASCADE')
 
-    # Drop tables in the public schema
-    cur.execute(
-        """
-        SELECT tablename FROM pg_tables
-        WHERE schemaname = 'public'
-        """
-    )
-    public_tables = cur.fetchall()
-    for table in public_tables:
-        table_name = table[0]
-        cur.execute(f'DROP TABLE IF EXISTS public."{table_name}" CASCADE')
-
     cur.close()
     conn.close()
 

backend/tests/integration/common_utils/test_models.py

@@ -44,7 +44,6 @@ class DATestUser(BaseModel):
     headers: dict
     role: UserRole
     is_active: bool
-    cookies: dict = {}
 
 
 class DATestPersonaLabel(BaseModel):

backend/tests/integration/multitenant_tests/syncing/test_search_permissions.py

@@ -4,6 +4,7 @@ from tests.integration.common_utils.managers.cc_pair import CCPairManager
 from tests.integration.common_utils.managers.chat import ChatSessionManager
 from tests.integration.common_utils.managers.document import DocumentManager
 from tests.integration.common_utils.managers.llm_provider import LLMProviderManager
+from tests.integration.common_utils.managers.tenant import TenantManager
 from tests.integration.common_utils.managers.user import UserManager
 from tests.integration.common_utils.test_models import DATestAPIKey
 from tests.integration.common_utils.test_models import DATestCCPair
@@ -12,28 +13,25 @@ from tests.integration.common_utils.test_models import DATestUser
 
 
 def test_multi_tenant_access_control(reset_multitenant: None) -> None:
-    # Creating an admin user (first user created is automatically an admin and also proviions the tenant
-    admin_user1: DATestUser = UserManager.create(
-        email="admin@onyx-test.com",
-    )
-
-    assert UserManager.is_role(admin_user1, UserRole.ADMIN)
+    # Create Tenant 1 and its Admin User
+    TenantManager.create("tenant_dev1", "test1@test.com", "Data Plane Registration")
+    test_user1: DATestUser = UserManager.create(name="test1", email="test1@test.com")
+    assert UserManager.is_role(test_user1, UserRole.ADMIN)
 
     # Create Tenant 2 and its Admin User
-    admin_user2: DATestUser = UserManager.create(
-        email="admin2@onyx-test.com",
-    )
-    assert UserManager.is_role(admin_user2, UserRole.ADMIN)
+    TenantManager.create("tenant_dev2", "test2@test.com", "Data Plane Registration")
+    test_user2: DATestUser = UserManager.create(name="test2", email="test2@test.com")
+    assert UserManager.is_role(test_user2, UserRole.ADMIN)
 
     # Create connectors for Tenant 1
     cc_pair_1: DATestCCPair = CCPairManager.create_from_scratch(
-        user_performing_action=admin_user1,
+        user_performing_action=test_user1,
     )
     api_key_1: DATestAPIKey = APIKeyManager.create(
-        user_performing_action=admin_user1,
+        user_performing_action=test_user1,
     )
-    api_key_1.headers.update(admin_user1.headers)
-    LLMProviderManager.create(user_performing_action=admin_user1)
+    api_key_1.headers.update(test_user1.headers)
+    LLMProviderManager.create(user_performing_action=test_user1)
 
     # Seed documents for Tenant 1
     cc_pair_1.documents = []
@@ -51,13 +49,13 @@ def test_multi_tenant_access_control(reset_multitenant: None) -> None:
 
     # Create connectors for Tenant 2
     cc_pair_2: DATestCCPair = CCPairManager.create_from_scratch(
-        user_performing_action=admin_user2,
+        user_performing_action=test_user2,
     )
     api_key_2: DATestAPIKey = APIKeyManager.create(
-        user_performing_action=admin_user2,
+        user_performing_action=test_user2,
     )
-    api_key_2.headers.update(admin_user2.headers)
-    LLMProviderManager.create(user_performing_action=admin_user2)
+    api_key_2.headers.update(test_user2.headers)
+    LLMProviderManager.create(user_performing_action=test_user2)
 
     # Seed documents for Tenant 2
     cc_pair_2.documents = []
@@ -78,17 +76,17 @@ def test_multi_tenant_access_control(reset_multitenant: None) -> None:
 
     # Create chat sessions for each user
     chat_session1: DATestChatSession = ChatSessionManager.create(
-        user_performing_action=admin_user1
+        user_performing_action=test_user1
     )
     chat_session2: DATestChatSession = ChatSessionManager.create(
-        user_performing_action=admin_user2
+        user_performing_action=test_user2
     )
 
     # User 1 sends a message and gets a response
     response1 = ChatSessionManager.send_message(
         chat_session_id=chat_session1.id,
         message="What is in Tenant 1's documents?",
-        user_performing_action=admin_user1,
+        user_performing_action=test_user1,
     )
     # Assert that the search tool was used
     assert response1.tool_name == "run_search"
@@ -102,16 +100,14 @@ def test_multi_tenant_access_control(reset_multitenant: None) -> None:
     ), "Tenant 2 document IDs should not be in the response"
 
     # Assert that the contents are correct
-    assert any(
-        doc["content"] == "Tenant 1 Document Content"
-        for doc in response1.tool_result or []
-    ), "Tenant 1 Document Content not found in any document"
+    for doc in response1.tool_result or []:
+        assert doc["content"] == "Tenant 1 Document Content"
 
     # User 2 sends a message and gets a response
     response2 = ChatSessionManager.send_message(
         chat_session_id=chat_session2.id,
         message="What is in Tenant 2's documents?",
-        user_performing_action=admin_user2,
+        user_performing_action=test_user2,
     )
     # Assert that the search tool was used
     assert response2.tool_name == "run_search"
@@ -123,18 +119,15 @@ def test_multi_tenant_access_control(reset_multitenant: None) -> None:
     assert not response_doc_ids.intersection(
         tenant1_doc_ids
     ), "Tenant 1 document IDs should not be in the response"
-
     # Assert that the contents are correct
-    assert any(
-        doc["content"] == "Tenant 2 Document Content"
-        for doc in response2.tool_result or []
-    ), "Tenant 2 Document Content not found in any document"
+    for doc in response2.tool_result or []:
+        assert doc["content"] == "Tenant 2 Document Content"
 
     # User 1 tries to access Tenant 2's documents
     response_cross = ChatSessionManager.send_message(
         chat_session_id=chat_session1.id,
         message="What is in Tenant 2's documents?",
-        user_performing_action=admin_user1,
+        user_performing_action=test_user1,
     )
     # Assert that the search tool was used
     assert response_cross.tool_name == "run_search"
@@ -147,7 +140,7 @@ def test_multi_tenant_access_control(reset_multitenant: None) -> None:
     response_cross2 = ChatSessionManager.send_message(
         chat_session_id=chat_session2.id,
         message="What is in Tenant 1's documents?",
-        user_performing_action=admin_user2,
+        user_performing_action=test_user2,
     )
     # Assert that the search tool was used
     assert response_cross2.tool_name == "run_search"

backend/tests/integration/multitenant_tests/tenants/test_tenant_creation.py

@@ -4,12 +4,14 @@ from onyx.db.models import UserRole
 from tests.integration.common_utils.managers.cc_pair import CCPairManager
 from tests.integration.common_utils.managers.connector import ConnectorManager
 from tests.integration.common_utils.managers.credential import CredentialManager
+from tests.integration.common_utils.managers.tenant import TenantManager
 from tests.integration.common_utils.managers.user import UserManager
 from tests.integration.common_utils.test_models import DATestUser
 
 
 # Test flow from creating tenant to registering as a user
 def test_tenant_creation(reset_multitenant: None) -> None:
+    TenantManager.create("tenant_dev", "test@test.com", "Data Plane Registration")
     test_user: DATestUser = UserManager.create(name="test", email="test@test.com")
 
     assert UserManager.is_role(test_user, UserRole.ADMIN)

backend/tests/unit/onyx/chat/test_answer.py

@@ -229,7 +229,7 @@ def test_answer_with_search_call(
         )
 
         # Second call should not include tools (as we're just generating the final answer)
-        # assert "tools" not in second_call.kwargs or not second_call.kwargs["tools"]
+        assert "tools" not in second_call.kwargs or not second_call.kwargs["tools"]
         # Second call should use the returned prompt from build_next_prompt
         assert (
             second_call.kwargs["prompt"]
@@ -237,7 +237,7 @@ def test_answer_with_search_call(
         )
 
         # Verify that tool_definition was called on the mock_search_tool
-        assert mock_search_tool.tool_definition.call_count == 2
+        mock_search_tool.tool_definition.assert_called_once()
     else:
         assert mock_llm.stream.call_count == 1
 
@@ -310,7 +310,7 @@ def test_answer_with_search_no_tool_calling(
     call_args = mock_llm.stream.call_args
 
     # Verify that no tools were passed to the LLM
-    # assert "tools" not in call_args.kwargs or not call_args.kwargs["tools"]
+    assert "tools" not in call_args.kwargs or not call_args.kwargs["tools"]
 
     # Verify that the prompt was built correctly
     assert (

deployment/docker_compose/docker-compose.multitenant-dev.yml

@@ -1,423 +0,0 @@
-services:
-  api_server:
-    image: onyxdotapp/onyx-backend:${IMAGE_TAG:-latest}
-    build:
-      context: ../../backend
-      dockerfile: Dockerfile
-    command: >
-      /bin/sh -c "
-      alembic -n schema_private upgrade head &&
-      echo \"Starting Onyx Api Server\" &&
-      uvicorn onyx.main:app --host 0.0.0.0 --port 8080"
-    depends_on:
-      - relational_db
-      - index
-      - cache
-      - inference_model_server
-    restart: always
-    ports:
-      - "8080:8080"
-    environment:
-      - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=true
-      - MULTI_TENANT=true
-      - LOG_LEVEL=DEBUG
-      - AUTH_TYPE=cloud
-      - REQUIRE_EMAIL_VERIFICATION=false
-      - DISABLE_TELEMETRY=true
-      - IMAGE_TAG=test
-      - DEV_MODE=true
-      # Auth Settings
-      - SESSION_EXPIRE_TIME_SECONDS=${SESSION_EXPIRE_TIME_SECONDS:-}
-      - ENCRYPTION_KEY_SECRET=${ENCRYPTION_KEY_SECRET:-}
-      - VALID_EMAIL_DOMAINS=${VALID_EMAIL_DOMAINS:-}
-      - GOOGLE_OAUTH_CLIENT_ID=${GOOGLE_OAUTH_CLIENT_ID:-}
-      - GOOGLE_OAUTH_CLIENT_SECRET=${GOOGLE_OAUTH_CLIENT_SECRET:-}
-      - SMTP_SERVER=${SMTP_SERVER:-}
-      - SMTP_PORT=${SMTP_PORT:-587}
-      - SMTP_USER=${SMTP_USER:-}
-      - SMTP_PASS=${SMTP_PASS:-}
-      - ENABLE_EMAIL_INVITES=${ENABLE_EMAIL_INVITES:-}
-      - EMAIL_FROM=${EMAIL_FROM:-}
-      - OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID:-}
-      - OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET:-}
-      - OPENID_CONFIG_URL=${OPENID_CONFIG_URL:-}
-      - TRACK_EXTERNAL_IDP_EXPIRY=${TRACK_EXTERNAL_IDP_EXPIRY:-}
-      - CORS_ALLOWED_ORIGIN=${CORS_ALLOWED_ORIGIN:-}
-      # Gen AI Settings
-      - GEN_AI_MAX_TOKENS=${GEN_AI_MAX_TOKENS:-}
-      - QA_TIMEOUT=${QA_TIMEOUT:-}
-      - MAX_CHUNKS_FED_TO_CHAT=${MAX_CHUNKS_FED_TO_CHAT:-}
-      - DISABLE_LLM_CHOOSE_SEARCH=${DISABLE_LLM_CHOOSE_SEARCH:-}
-      - DISABLE_LLM_QUERY_REPHRASE=${DISABLE_LLM_QUERY_REPHRASE:-}
-      - DISABLE_GENERATIVE_AI=${DISABLE_GENERATIVE_AI:-}
-      - DISABLE_LITELLM_STREAMING=${DISABLE_LITELLM_STREAMING:-}
-      - LITELLM_EXTRA_HEADERS=${LITELLM_EXTRA_HEADERS:-}
-      - BING_API_KEY=${BING_API_KEY:-}
-      - DISABLE_LLM_DOC_RELEVANCE=${DISABLE_LLM_DOC_RELEVANCE:-}
-      - GEN_AI_API_KEY=${GEN_AI_API_KEY:-}
-      - TOKEN_BUDGET_GLOBALLY_ENABLED=${TOKEN_BUDGET_GLOBALLY_ENABLED:-}
-      # Query Options
-      - DOC_TIME_DECAY=${DOC_TIME_DECAY:-}
-      - HYBRID_ALPHA=${HYBRID_ALPHA:-}
-      - EDIT_KEYWORD_QUERY=${EDIT_KEYWORD_QUERY:-}
-      - MULTILINGUAL_QUERY_EXPANSION=${MULTILINGUAL_QUERY_EXPANSION:-}
-      - LANGUAGE_HINT=${LANGUAGE_HINT:-}
-      - LANGUAGE_CHAT_NAMING_HINT=${LANGUAGE_CHAT_NAMING_HINT:-}
-      - QA_PROMPT_OVERRIDE=${QA_PROMPT_OVERRIDE:-}
-      # Other services
-      - POSTGRES_HOST=relational_db
-      - POSTGRES_DEFAULT_SCHEMA=${POSTGRES_DEFAULT_SCHEMA:-}
-      - VESPA_HOST=index
-      - REDIS_HOST=cache
-      - WEB_DOMAIN=${WEB_DOMAIN:-}
-      # Don't change the NLP model configs unless you know what you're doing
-      - EMBEDDING_BATCH_SIZE=${EMBEDDING_BATCH_SIZE:-}
-      - DOCUMENT_ENCODER_MODEL=${DOCUMENT_ENCODER_MODEL:-}
-      - DOC_EMBEDDING_DIM=${DOC_EMBEDDING_DIM:-}
-      - NORMALIZE_EMBEDDINGS=${NORMALIZE_EMBEDDINGS:-}
-      - ASYM_QUERY_PREFIX=${ASYM_QUERY_PREFIX:-}
-      - DISABLE_RERANK_FOR_STREAMING=${DISABLE_RERANK_FOR_STREAMING:-}
-      - MODEL_SERVER_HOST=${MODEL_SERVER_HOST:-inference_model_server}
-      - MODEL_SERVER_PORT=${MODEL_SERVER_PORT:-}
-      - LOG_ALL_MODEL_INTERACTIONS=${LOG_ALL_MODEL_INTERACTIONS:-}
-      - LOG_DANSWER_MODEL_INTERACTIONS=${LOG_DANSWER_MODEL_INTERACTIONS:-}
-      - LOG_INDIVIDUAL_MODEL_TOKENS=${LOG_INDIVIDUAL_MODEL_TOKENS:-}
-      - LOG_VESPA_TIMING_INFORMATION=${LOG_VESPA_TIMING_INFORMATION:-}
-      - LOG_ENDPOINT_LATENCY=${LOG_ENDPOINT_LATENCY:-}
-      - LOG_POSTGRES_LATENCY=${LOG_POSTGRES_LATENCY:-}
-      - LOG_POSTGRES_CONN_COUNTS=${LOG_POSTGRES_CONN_COUNTS:-}
-      - CELERY_BROKER_POOL_LIMIT=${CELERY_BROKER_POOL_LIMIT:-}
-      - LITELLM_CUSTOM_ERROR_MESSAGE_MAPPINGS=${LITELLM_CUSTOM_ERROR_MESSAGE_MAPPINGS:-}
-      # Egnyte OAuth Configs
-      - EGNYTE_CLIENT_ID=${EGNYTE_CLIENT_ID:-}
-      - EGNYTE_CLIENT_SECRET=${EGNYTE_CLIENT_SECRET:-}
-      - EGNYTE_LOCALHOST_OVERRIDE=${EGNYTE_LOCALHOST_OVERRIDE:-}
-      # Linear OAuth Configs
-      - LINEAR_CLIENT_ID=${LINEAR_CLIENT_ID:-}
-      - LINEAR_CLIENT_SECRET=${LINEAR_CLIENT_SECRET:-}
-      # Analytics Configs
-      - SENTRY_DSN=${SENTRY_DSN:-}
-      # Chat Configs
-      - HARD_DELETE_CHATS=${HARD_DELETE_CHATS:-}
-      # Enables the use of bedrock models or IAM Auth
-      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}
-      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}
-      - AWS_REGION_NAME=${AWS_REGION_NAME:-}
-      - API_KEY_HASH_ROUNDS=${API_KEY_HASH_ROUNDS:-}
-      # Seeding configuration
-      - USE_IAM_AUTH=${USE_IAM_AUTH:-}
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    logging:
-      driver: json-file
-      options:
-        max-size: "50m"
-        max-file: "6"
-
-  background:
-    image: onyxdotapp/onyx-backend:${IMAGE_TAG:-latest}
-    build:
-      context: ../../backend
-      dockerfile: Dockerfile
-    command: >
-      /bin/sh -c "
-      if [ -f /etc/ssl/certs/custom-ca.crt ]; then
-        update-ca-certificates;
-      fi &&
-      /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf"
-    depends_on:
-      - relational_db
-      - index
-      - cache
-      - inference_model_server
-      - indexing_model_server
-    restart: always
-    environment:
-      - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=true
-      - MULTI_TENANT=true
-      - LOG_LEVEL=DEBUG
-      - AUTH_TYPE=cloud
-      - REQUIRE_EMAIL_VERIFICATION=false
-      - DISABLE_TELEMETRY=true
-      - IMAGE_TAG=test
-      - ENCRYPTION_KEY_SECRET=${ENCRYPTION_KEY_SECRET:-}
-      - JWT_PUBLIC_KEY_URL=${JWT_PUBLIC_KEY_URL:-}
-      # Gen AI Settings (Needed by OnyxBot)
-      - GEN_AI_MAX_TOKENS=${GEN_AI_MAX_TOKENS:-}
-      - QA_TIMEOUT=${QA_TIMEOUT:-}
-      - MAX_CHUNKS_FED_TO_CHAT=${MAX_CHUNKS_FED_TO_CHAT:-}
-      - DISABLE_LLM_CHOOSE_SEARCH=${DISABLE_LLM_CHOOSE_SEARCH:-}
-      - DISABLE_LLM_QUERY_REPHRASE=${DISABLE_LLM_QUERY_REPHRASE:-}
-      - DISABLE_GENERATIVE_AI=${DISABLE_GENERATIVE_AI:-}
-      - GENERATIVE_MODEL_ACCESS_CHECK_FREQ=${GENERATIVE_MODEL_ACCESS_CHECK_FREQ:-}
-      - DISABLE_LITELLM_STREAMING=${DISABLE_LITELLM_STREAMING:-}
-      - LITELLM_EXTRA_HEADERS=${LITELLM_EXTRA_HEADERS:-}
-      - GEN_AI_API_KEY=${GEN_AI_API_KEY:-}
-      - BING_API_KEY=${BING_API_KEY:-}
-      # Query Options
-      - DOC_TIME_DECAY=${DOC_TIME_DECAY:-}
-      - HYBRID_ALPHA=${HYBRID_ALPHA:-}
-      - EDIT_KEYWORD_QUERY=${EDIT_KEYWORD_QUERY:-}
-      - MULTILINGUAL_QUERY_EXPANSION=${MULTILINGUAL_QUERY_EXPANSION:-}
-      - LANGUAGE_HINT=${LANGUAGE_HINT:-}
-      - LANGUAGE_CHAT_NAMING_HINT=${LANGUAGE_CHAT_NAMING_HINT:-}
-      - QA_PROMPT_OVERRIDE=${QA_PROMPT_OVERRIDE:-}
-      # Other Services
-      - POSTGRES_HOST=relational_db
-      - POSTGRES_USER=${POSTGRES_USER:-}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-}
-      - POSTGRES_DB=${POSTGRES_DB:-}
-      - POSTGRES_DEFAULT_SCHEMA=${POSTGRES_DEFAULT_SCHEMA:-}
-      - VESPA_HOST=index
-      - REDIS_HOST=cache
-      - WEB_DOMAIN=${WEB_DOMAIN:-}
-      # Don't change the NLP model configs unless you know what you're doing
-      - DOCUMENT_ENCODER_MODEL=${DOCUMENT_ENCODER_MODEL:-}
-      - DOC_EMBEDDING_DIM=${DOC_EMBEDDING_DIM:-}
-      - NORMALIZE_EMBEDDINGS=${NORMALIZE_EMBEDDINGS:-}
-      - ASYM_QUERY_PREFIX=${ASYM_QUERY_PREFIX:-}
-      - ASYM_PASSAGE_PREFIX=${ASYM_PASSAGE_PREFIX:-}
-      - MODEL_SERVER_HOST=${MODEL_SERVER_HOST:-inference_model_server}
-      - MODEL_SERVER_PORT=${MODEL_SERVER_PORT:-}
-      - INDEXING_MODEL_SERVER_HOST=${INDEXING_MODEL_SERVER_HOST:-indexing_model_server}
-      # Indexing Configs
-      - VESPA_SEARCHER_THREADS=${VESPA_SEARCHER_THREADS:-}
-      - NUM_INDEXING_WORKERS=${NUM_INDEXING_WORKERS:-}
-      - ENABLED_CONNECTOR_TYPES=${ENABLED_CONNECTOR_TYPES:-}
-      - DISABLE_INDEX_UPDATE_ON_SWAP=${DISABLE_INDEX_UPDATE_ON_SWAP:-}
-      - DASK_JOB_CLIENT_ENABLED=${DASK_JOB_CLIENT_ENABLED:-}
-      - CONTINUE_ON_CONNECTOR_FAILURE=${CONTINUE_ON_CONNECTOR_FAILURE:-}
-      - EXPERIMENTAL_CHECKPOINTING_ENABLED=${EXPERIMENTAL_CHECKPOINTING_ENABLED:-}
-      - CONFLUENCE_CONNECTOR_LABELS_TO_SKIP=${CONFLUENCE_CONNECTOR_LABELS_TO_SKIP:-}
-      - JIRA_CONNECTOR_LABELS_TO_SKIP=${JIRA_CONNECTOR_LABELS_TO_SKIP:-}
-      - WEB_CONNECTOR_VALIDATE_URLS=${WEB_CONNECTOR_VALIDATE_URLS:-}
-      - JIRA_API_VERSION=${JIRA_API_VERSION:-}
-      - GONG_CONNECTOR_START_TIME=${GONG_CONNECTOR_START_TIME:-}
-      - NOTION_CONNECTOR_ENABLE_RECURSIVE_PAGE_LOOKUP=${NOTION_CONNECTOR_ENABLE_RECURSIVE_PAGE_LOOKUP:-}
-      - GITHUB_CONNECTOR_BASE_URL=${GITHUB_CONNECTOR_BASE_URL:-}
-      - MAX_DOCUMENT_CHARS=${MAX_DOCUMENT_CHARS:-}
-      - MAX_FILE_SIZE_BYTES=${MAX_FILE_SIZE_BYTES:-}
-      # Egnyte OAuth Configs
-      - EGNYTE_CLIENT_ID=${EGNYTE_CLIENT_ID:-}
-      - EGNYTE_CLIENT_SECRET=${EGNYTE_CLIENT_SECRET:-}
-      - EGNYTE_LOCALHOST_OVERRIDE=${EGNYTE_LOCALHOST_OVERRIDE:-}
-      # Lienar OAuth Configs
-      - LINEAR_CLIENT_ID=${LINEAR_CLIENT_ID:-}
-      - LINEAR_CLIENT_SECRET=${LINEAR_CLIENT_SECRET:-}
-      # Celery Configs (defaults are set in the supervisord.conf file.
-      # prefer doing that to have one source of defaults)
-      - CELERY_WORKER_INDEXING_CONCURRENCY=${CELERY_WORKER_INDEXING_CONCURRENCY:-}
-      - CELERY_WORKER_LIGHT_CONCURRENCY=${CELERY_WORKER_LIGHT_CONCURRENCY:-}
-      - CELERY_WORKER_LIGHT_PREFETCH_MULTIPLIER=${CELERY_WORKER_LIGHT_PREFETCH_MULTIPLIER:-}
-
-      # Onyx SlackBot Configs
-      - DANSWER_BOT_DISABLE_DOCS_ONLY_ANSWER=${DANSWER_BOT_DISABLE_DOCS_ONLY_ANSWER:-}
-      - DANSWER_BOT_FEEDBACK_VISIBILITY=${DANSWER_BOT_FEEDBACK_VISIBILITY:-}
-      - DANSWER_BOT_DISPLAY_ERROR_MSGS=${DANSWER_BOT_DISPLAY_ERROR_MSGS:-}
-      - DANSWER_BOT_RESPOND_EVERY_CHANNEL=${DANSWER_BOT_RESPOND_EVERY_CHANNEL:-}
-      - DANSWER_BOT_DISABLE_COT=${DANSWER_BOT_DISABLE_COT:-} # Currently unused
-      - NOTIFY_SLACKBOT_NO_ANSWER=${NOTIFY_SLACKBOT_NO_ANSWER:-}
-      - DANSWER_BOT_MAX_QPM=${DANSWER_BOT_MAX_QPM:-}
-      - DANSWER_BOT_MAX_WAIT_TIME=${DANSWER_BOT_MAX_WAIT_TIME:-}
-      # Logging
-      # Leave this on pretty please? Nothing sensitive is collected!
-      # https://docs.onyx.app/more/telemetry
-      - DISABLE_TELEMETRY=${DISABLE_TELEMETRY:-}
-      - LOG_LEVEL=${LOG_LEVEL:-info} # Set to debug to get more fine-grained logs
-      - LOG_ALL_MODEL_INTERACTIONS=${LOG_ALL_MODEL_INTERACTIONS:-} # LiteLLM Verbose Logging
-      # Log all of Onyx prompts and interactions with the LLM
-      - LOG_DANSWER_MODEL_INTERACTIONS=${LOG_DANSWER_MODEL_INTERACTIONS:-}
-      - LOG_INDIVIDUAL_MODEL_TOKENS=${LOG_INDIVIDUAL_MODEL_TOKENS:-}
-      - LOG_VESPA_TIMING_INFORMATION=${LOG_VESPA_TIMING_INFORMATION:-}
-
-      # Analytics Configs
-      - SENTRY_DSN=${SENTRY_DSN:-}
-
-      # Enterprise Edition stuff
-      - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false}
-      - USE_IAM_AUTH=${USE_IAM_AUTH:-}
-      - AWS_REGION_NAME=${AWS_REGION_NAME:-}
-      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID-}
-      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY-}
-    # Uncomment the line below to use if IAM_AUTH is true and you are using iam auth for postgres
-    # volumes:
-    #   - ./bundle.pem:/app/bundle.pem:ro
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    logging:
-      driver: json-file
-      options:
-        max-size: "50m"
-        max-file: "6"
-    # Uncomment the following lines if you need to include a custom CA certificate
-    # This section enables the use of a custom CA certificate
-    # If present, the custom CA certificate is mounted as a volume
-    # The container checks for its existence and updates the system's CA certificates
-    # This allows for secure communication with services using custom SSL certificates
-    # Optional volume mount for CA certificate
-    # volumes:
-    #   # Maps to the CA_CERT_PATH environment variable in the Dockerfile
-    #   - ${CA_CERT_PATH:-./custom-ca.crt}:/etc/ssl/certs/custom-ca.crt:ro
-
-  web_server:
-    image: onyxdotapp/onyx-web-server:${IMAGE_TAG:-latest}
-    build:
-      context: ../../web
-      dockerfile: Dockerfile
-      args:
-        - NEXT_PUBLIC_DISABLE_STREAMING=${NEXT_PUBLIC_DISABLE_STREAMING:-false}
-        - NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA=${NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA:-false}
-        - NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS:-}
-        - NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS:-}
-        - NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT:-}
-        - NEXT_PUBLIC_DEFAULT_SIDEBAR_OPEN=${NEXT_PUBLIC_DEFAULT_SIDEBAR_OPEN:-}
-        - NEXT_PUBLIC_FORGOT_PASSWORD_ENABLED=${NEXT_PUBLIC_FORGOT_PASSWORD_ENABLED:-}
-        # Enterprise Edition only
-        - NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME:-}
-        # DO NOT TURN ON unless you have EXPLICIT PERMISSION from Onyx.
-        - NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED=${NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED:-false}
-    depends_on:
-      - api_server
-    restart: always
-    environment:
-      - INTERNAL_URL=http://api_server:8080
-      - WEB_DOMAIN=${WEB_DOMAIN:-}
-      - THEME_IS_DARK=${THEME_IS_DARK:-}
-      - DISABLE_LLM_DOC_RELEVANCE=${DISABLE_LLM_DOC_RELEVANCE:-}
-
-      # Enterprise Edition only
-      - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false}
-      - NEXT_PUBLIC_CUSTOM_REFRESH_URL=${NEXT_PUBLIC_CUSTOM_REFRESH_URL:-}
-
-  inference_model_server:
-    image: onyxdotapp/onyx-model-server:${IMAGE_TAG:-latest}
-    build:
-      context: ../../backend
-      dockerfile: Dockerfile.model_server
-    command: >
-      /bin/sh -c "if [ \"${DISABLE_MODEL_SERVER:-false}\" = \"True\" ]; then
-        echo 'Skipping service...';
-        exit 0;
-      else
-        exec uvicorn model_server.main:app --host 0.0.0.0 --port 9000;
-      fi"
-    restart: on-failure
-    environment:
-      - MIN_THREADS_ML_MODELS=${MIN_THREADS_ML_MODELS:-}
-      # Set to debug to get more fine-grained logs
-      - LOG_LEVEL=${LOG_LEVEL:-info}
-
-      # Analytics Configs
-      - SENTRY_DSN=${SENTRY_DSN:-}
-    volumes:
-      # Not necessary, this is just to reduce download time during startup
-      - model_cache_huggingface:/root/.cache/huggingface/
-    logging:
-      driver: json-file
-      options:
-        max-size: "50m"
-        max-file: "6"
-
-  indexing_model_server:
-    image: onyxdotapp/onyx-model-server:${IMAGE_TAG:-latest}
-    build:
-      context: ../../backend
-      dockerfile: Dockerfile.model_server
-    command: >
-      /bin/sh -c "if [ \"${DISABLE_MODEL_SERVER:-false}\" = \"True\" ]; then
-        echo 'Skipping service...';
-        exit 0;
-      else
-        exec uvicorn model_server.main:app --host 0.0.0.0 --port 9000;
-      fi"
-    restart: on-failure
-    environment:
-      - INDEX_BATCH_SIZE=${INDEX_BATCH_SIZE:-}
-      - MIN_THREADS_ML_MODELS=${MIN_THREADS_ML_MODELS:-}
-      - INDEXING_ONLY=True
-      # Set to debug to get more fine-grained logs
-      - LOG_LEVEL=${LOG_LEVEL:-info}
-      - CLIENT_EMBEDDING_TIMEOUT=${CLIENT_EMBEDDING_TIMEOUT:-}
-
-      # Analytics Configs
-      - SENTRY_DSN=${SENTRY_DSN:-}
-    volumes:
-      # Not necessary, this is just to reduce download time during startup
-      - indexing_huggingface_model_cache:/root/.cache/huggingface/
-    logging:
-      driver: json-file
-      options:
-        max-size: "50m"
-        max-file: "6"
-
-  relational_db:
-    image: postgres:15.2-alpine
-    command: -c 'max_connections=250'
-    restart: always
-    environment:
-      - POSTGRES_USER=${POSTGRES_USER:-postgres}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
-    ports:
-      - "5432:5432"
-    volumes:
-      - db_volume:/var/lib/postgresql/data
-
-  # This container name cannot have an underscore in it due to Vespa expectations of the URL
-  index:
-    image: vespaengine/vespa:8.277.17
-    restart: always
-    ports:
-      - "19071:19071"
-      - "8081:8081"
-    volumes:
-      - vespa_volume:/opt/vespa/var
-    logging:
-      driver: json-file
-      options:
-        max-size: "50m"
-        max-file: "6"
-
-  nginx:
-    image: nginx:1.23.4-alpine
-    restart: always
-    # nginx will immediately crash with `nginx: [emerg] host not found in upstream`
-    # if api_server / web_server are not up
-    depends_on:
-      - api_server
-      - web_server
-    environment:
-      - DOMAIN=localhost
-    ports:
-      - "80:80"
-      - "3000:80" # allow for localhost:3000 usage, since that is the norm
-    volumes:
-      - ../data/nginx:/etc/nginx/conf.d
-    logging:
-      driver: json-file
-      options:
-        max-size: "50m"
-        max-file: "6"
-    # The specified script waits for the api_server to start up.
-    # Without this we've seen issues where nginx shows no error logs but
-    # does not recieve any traffic
-    # NOTE: we have to use dos2unix to remove Carriage Return chars from the file
-    # in order to make this work on both Unix-like systems and windows
-    command: >
-      /bin/sh -c "dos2unix /etc/nginx/conf.d/run-nginx.sh 
-      && /etc/nginx/conf.d/run-nginx.sh app.conf.template.dev"
-
-  cache:
-    image: redis:7.4-alpine
-    restart: always
-    ports:
-      - "6379:6379"
-    # docker silently mounts /data even without an explicit volume mount, which enables
-    # persistence. explicitly setting save and appendonly forces ephemeral behavior.
-    command: redis-server --save "" --appendonly no
-
-volumes:
-  db_volume:
-  vespa_volume: # Created by the container itself
-
-  model_cache_huggingface:
-  indexing_huggingface_model_cache:

web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx

@@ -18,11 +18,7 @@ import AdvancedFormPage from "./pages/Advanced";
 import DynamicConnectionForm from "./pages/DynamicConnectorCreationForm";
 import CreateCredential from "@/components/credentials/actions/CreateCredential";
 import ModifyCredential from "@/components/credentials/actions/ModifyCredential";
-import {
-  ConfigurableSources,
-  oauthSupportedSources,
-  ValidSources,
-} from "@/lib/types";
+import { ConfigurableSources, oauthSupportedSources } from "@/lib/types";
 import {
   Credential,
   credentialTemplates,
@@ -448,7 +444,7 @@ export default function AddConnector({
               <CardSection>
                 <Title className="mb-2 text-lg">Select a credential</Title>
 
-                {connector == ValidSources.Gmail ? (
+                {connector == "gmail" ? (
                   <GmailMain />
                 ) : (
                   <>

web/src/app/chat/ChatPage.tsx

@@ -949,15 +949,15 @@ export function ChatPage({
       // Check if all messages are currently rendered
       if (currentVisibleRange.end < messageHistory.length) {
         // Update visible range to include the last messages
-        updateCurrentVisibleRange({
-          start: Math.max(
-            0,
-            messageHistory.length -
-              (currentVisibleRange.end - currentVisibleRange.start)
-          ),
-          end: messageHistory.length,
-          mostVisibleMessageId: currentVisibleRange.mostVisibleMessageId,
-        });
+        // updateCurrentVisibleRange({
+        //   start: Math.max(
+        //     0,
+        //     messageHistory.length -
+        //       (currentVisibleRange.end - currentVisibleRange.start)
+        //   ),
+        //   end: messageHistory.length,
+        //   mostVisibleMessageId: currentVisibleRange.mostVisibleMessageId,
+        // });
 
         // Wait for the state update and re-render before scrolling
         setTimeout(() => {
@@ -1869,6 +1869,7 @@ export function ChatPage({
     newRange: VisibleRange,
     forceUpdate?: boolean
   ) => {
+    console.log("updateCurrentVisibleRange", newRange);
     if (
       scrollInitialized.current &&
       visibleRange.get(loadedIdSessionRef.current) == undefined &&
@@ -1907,26 +1908,54 @@ export function ChatPage({
       scrollInitialized.current = true;
     }
   };
+  const setVisibleRangeForCurrentSessionId = (newRange: VisibleRange) => {
+    console.log("setVisibleRangeForCurrentSessionId", newRange);
+    setVisibleRange((prevState) => {
+      const newState = new Map(prevState);
+      newState.set(currentSessionId(), newRange);
+      return newState;
+    });
+  };
 
-  const updateVisibleRangeBasedOnScroll = () => {
-    if (!scrollInitialized.current) return;
+  function updateVisibleRangeBasedOnScroll() {
     const scrollableDiv = scrollableDivRef.current;
     if (!scrollableDiv) return;
 
-    const viewportHeight = scrollableDiv.clientHeight;
-    let mostVisibleMessageIndex = -1;
+    const distanceFromBottom =
+      scrollableDiv.scrollHeight -
+      scrollableDiv.scrollTop -
+      scrollableDiv.clientHeight;
 
+    const isNearBottom = distanceFromBottom < 200;
+
+    // If user is near bottom, we treat the last message as "most visible"
+    if (isNearBottom) {
+      const startIndex = Math.max(0, messageHistory.length - BUFFER_COUNT);
+      const endIndex = messageHistory.length;
+      setVisibleRangeForCurrentSessionId({
+        start: startIndex,
+        end: endIndex,
+        mostVisibleMessageId:
+          messageHistory.length > 0
+            ? messageHistory[messageHistory.length - 1].messageId
+            : null,
+      });
+      return;
+    }
+
+    // otherwise do the bounding rect logic:
+    let mostVisibleMessageIndex = -1;
+    const viewportHeight = scrollableDiv.clientHeight;
     messageHistory.forEach((message, index) => {
-      const messageElement = document.getElementById(
-        `message-${message.messageId}`
-      );
-      if (messageElement) {
-        const rect = messageElement.getBoundingClientRect();
-        const isVisible = rect.bottom <= viewportHeight && rect.bottom > 0;
+      const elem = document.getElementById(`message-${message.messageId}`);
+      if (elem) {
+        const rect = elem.getBoundingClientRect();
+        const isVisible = rect.top < viewportHeight && rect.bottom >= 0;
         if (isVisible && index > mostVisibleMessageIndex) {
           mostVisibleMessageIndex = index;
         }
       }
+      // clientScrollToBottom;
     });
 
     if (mostVisibleMessageIndex !== -1) {
@@ -1935,34 +1964,50 @@ export function ChatPage({
         messageHistory.length,
         mostVisibleMessageIndex + BUFFER_COUNT + 1
       );
-
-      updateCurrentVisibleRange({
+      setVisibleRangeForCurrentSessionId({
         start: startIndex,
         end: endIndex,
         mostVisibleMessageId: messageHistory[mostVisibleMessageIndex].messageId,
       });
     }
-  };
+  }
 
   useEffect(() => {
     initializeVisibleRange();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [router, messageHistory]);
 
-  useLayoutEffect(() => {
-    const scrollableDiv = scrollableDivRef.current;
+  useEffect(() => {
+    console.log("useEffect has been called");
+    const scrollEl = scrollableDivRef.current;
+    if (!scrollEl) {
+      console.log("no scrollEl");
+      return;
+    }
 
     const handleScroll = () => {
-      updateVisibleRangeBasedOnScroll();
+      requestAnimationFrame(() => {
+        updateVisibleRangeBasedOnScroll();
+      });
     };
 
-    scrollableDiv?.addEventListener("scroll", handleScroll);
+    const attachScrollListener = () => {
+      if (scrollEl) {
+        scrollEl.addEventListener("scroll", handleScroll);
+      } else {
+        console.log("scrollEl not available, retrying in 100ms");
+        setTimeout(attachScrollListener, 100);
+      }
+    };
+
+    attachScrollListener();
 
     return () => {
-      scrollableDiv?.removeEventListener("scroll", handleScroll);
+      if (scrollEl) {
+        scrollEl.removeEventListener("scroll", handleScroll);
+      }
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [messageHistory]);
+  }, [scrollableDivRef, messageHistory, currentSessionId()]);
 
   const imageFileInMessageHistory = useMemo(() => {
     return messageHistory
@@ -2493,7 +2538,7 @@ export function ChatPage({
                               ? messageHistory
                               : messageHistory.slice(
                                   currentVisibleRange.start,
-                                  currentVisibleRange.end
+                                  currentVisibleRange.end + 2
                                 )
                             ).map((message, fauxIndex) => {
                               const i =

web/src/lib/connectors/connectors.tsx

@@ -772,7 +772,7 @@ For example, specifying .*-support.* as a "channel" will cause the connector to
     advanced_values: [],
   },
   linear: {
-    description: "Configure Linear connector",
+    description: "Configure Dropbox connector",
     values: [],
     advanced_values: [],
   },

web/src/lib/connectors/credentials.ts

@@ -114,7 +114,7 @@ export interface LoopioCredentialJson {
 }
 
 export interface LinearCredentialJson {
-  linear_access_token: string;
+  linear_api_key: string;
 }
 
 export interface HubSpotCredentialJson {
@@ -250,7 +250,7 @@ export const credentialTemplates: Record<ValidSources, any> = {
     gong_access_key_secret: "",
   } as GongCredentialJson,
   zulip: { zuliprc_content: "" } as ZulipCredentialJson,
-  linear: { linear_access_token: "" } as LinearCredentialJson,
+  linear: { linear_api_key: "" } as LinearCredentialJson,
   hubspot: { hubspot_access_token: "" } as HubSpotCredentialJson,
   document360: {
     portal_id: "",
@@ -404,7 +404,7 @@ export const credentialDisplayNames: Record<string, string> = {
   loopio_client_token: "Loopio Client Token",
 
   // Linear
-  linear_access_token: "Linear Access Token",
+  linear_api_key: "Linear API Key",
 
   // HubSpot
   hubspot_access_token: "HubSpot Access Token",