fix: save and sync partner cookie failed

2026-04-02 06:01:49 +00:00 · 2026-04-01 23:47:02 +08:00
10 changed files with 247 additions and 172 deletions
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -19,7 +19,6 @@ from typing_extensions import TypedDict
 from core.helper.encrypter import batch_decrypt_token, encrypt_token, obfuscated_token
 from core.ops.entities.config_entity import (
    OPS_FILE_PATH,
-    BaseTracingConfig,
    TracingProviderEnum,
 )
 from core.ops.entities.trace_entity import (
@@ -196,15 +195,8 @@ def _lookup_llm_credential_info(
        return None, ""


-class TracingProviderConfigEntry(TypedDict):
-    config_class: type[BaseTracingConfig]
-    secret_keys: list[str]
-    other_keys: list[str]
-    trace_instance: type[Any]
-
-
-class OpsTraceProviderConfigMap(collections.UserDict[str, TracingProviderConfigEntry]):
-    def __getitem__(self, provider: str) -> TracingProviderConfigEntry:
+class OpsTraceProviderConfigMap(collections.UserDict[str, dict[str, Any]]):
+    def __getitem__(self, provider: str) -> dict[str, Any]:
        match provider:
            case TracingProviderEnum.LANGFUSE:
                from core.ops.entities.config_entity import LangfuseConfig
@@ -593,8 +585,8 @@ class OpsTraceManager:
            provider_config_map[tracing_provider]["config_class"],
            provider_config_map[tracing_provider]["trace_instance"],
        )
-        config = config_type(**tracing_config)
-        return trace_instance(config).api_check()
+        tracing_config = config_type(**tracing_config)
+        return trace_instance(tracing_config).api_check()

    @staticmethod
    def get_trace_config_project_key(tracing_config: dict, tracing_provider: str):
@@ -608,8 +600,8 @@ class OpsTraceManager:
            provider_config_map[tracing_provider]["config_class"],
            provider_config_map[tracing_provider]["trace_instance"],
        )
-        config = config_type(**tracing_config)
-        return trace_instance(config).get_project_key()
+        tracing_config = config_type(**tracing_config)
+        return trace_instance(tracing_config).get_project_key()

    @staticmethod
    def get_trace_config_project_url(tracing_config: dict, tracing_provider: str):
@@ -623,8 +615,8 @@ class OpsTraceManager:
            provider_config_map[tracing_provider]["config_class"],
            provider_config_map[tracing_provider]["trace_instance"],
        )
-        config = config_type(**tracing_config)
-        return trace_instance(config).get_project_url()
+        tracing_config = config_type(**tracing_config)
+        return trace_instance(tracing_config).get_project_url()


 class TraceTask:
--- a/api/services/message_service.py
+++ b/api/services/message_service.py
@@ -3,7 +3,6 @@ from typing import Union

 from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import TypeAdapter
-from sqlalchemy import select
 from sqlalchemy.orm import sessionmaker

 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
@@ -76,15 +75,17 @@ class MessageService:
        fetch_limit = limit + 1

        if first_id:
-            first_message = db.session.scalar(
-                select(Message).where(Message.conversation_id == conversation.id, Message.id == first_id).limit(1)
+            first_message = (
+                db.session.query(Message)
+                .where(Message.conversation_id == conversation.id, Message.id == first_id)
+                .first()
            )

            if not first_message:
                raise FirstMessageNotExistsError()

-            history_messages = db.session.scalars(
-                select(Message)
+            history_messages = (
+                db.session.query(Message)
                .where(
                    Message.conversation_id == conversation.id,
                    Message.created_at < first_message.created_at,
@@ -92,14 +93,16 @@ class MessageService:
                )
                .order_by(Message.created_at.desc())
                .limit(fetch_limit)
-            ).all()
+                .all()
+            )
        else:
-            history_messages = db.session.scalars(
-                select(Message)
+            history_messages = (
+                db.session.query(Message)
                .where(Message.conversation_id == conversation.id)
                .order_by(Message.created_at.desc())
                .limit(fetch_limit)
-            ).all()
+                .all()
+            )

        has_more = False
        if len(history_messages) > limit:
@@ -126,7 +129,7 @@ class MessageService:
        if not user:
            return InfiniteScrollPagination(data=[], limit=limit, has_more=False)

-        stmt = select(Message)
+        base_query = db.session.query(Message)

        fetch_limit = limit + 1

@@ -135,27 +138,28 @@ class MessageService:
                app_model=app_model, user=user, conversation_id=conversation_id
            )

-            stmt = stmt.where(Message.conversation_id == conversation.id)
+            base_query = base_query.where(Message.conversation_id == conversation.id)

        # Check if include_ids is not None and not empty to avoid WHERE false condition
        if include_ids is not None:
            if len(include_ids) == 0:
                return InfiniteScrollPagination(data=[], limit=limit, has_more=False)
-            stmt = stmt.where(Message.id.in_(include_ids))
+            base_query = base_query.where(Message.id.in_(include_ids))

        if last_id:
-            last_message = db.session.scalar(stmt.where(Message.id == last_id).limit(1))
+            last_message = base_query.where(Message.id == last_id).first()

            if not last_message:
                raise LastMessageNotExistsError()

-            history_messages = db.session.scalars(
-                stmt.where(Message.created_at < last_message.created_at, Message.id != last_message.id)
+            history_messages = (
+                base_query.where(Message.created_at < last_message.created_at, Message.id != last_message.id)
                .order_by(Message.created_at.desc())
                .limit(fetch_limit)
-            ).all()
+                .all()
+            )
        else:
-            history_messages = db.session.scalars(stmt.order_by(Message.created_at.desc()).limit(fetch_limit)).all()
+            history_messages = base_query.order_by(Message.created_at.desc()).limit(fetch_limit).all()

        has_more = False
        if len(history_messages) > limit:
@@ -210,20 +214,21 @@ class MessageService:
    def get_all_messages_feedbacks(cls, app_model: App, page: int, limit: int):
        """Get all feedbacks of an app"""
        offset = (page - 1) * limit
-        feedbacks = db.session.scalars(
-            select(MessageFeedback)
+        feedbacks = (
+            db.session.query(MessageFeedback)
            .where(MessageFeedback.app_id == app_model.id)
            .order_by(MessageFeedback.created_at.desc(), MessageFeedback.id.desc())
            .limit(limit)
            .offset(offset)
-        ).all()
+            .all()
+        )

        return [record.to_dict() for record in feedbacks]

    @classmethod
    def get_message(cls, app_model: App, user: Union[Account, EndUser] | None, message_id: str):
-        message = db.session.scalar(
-            select(Message)
+        message = (
+            db.session.query(Message)
            .where(
                Message.id == message_id,
                Message.app_id == app_model.id,
@@ -231,7 +236,7 @@ class MessageService:
                Message.from_end_user_id == (user.id if isinstance(user, EndUser) else None),
                Message.from_account_id == (user.id if isinstance(user, Account) else None),
            )
-            .limit(1)
+            .first()
        )

        if not message:
@@ -277,10 +282,10 @@ class MessageService:
            )
        else:
            if not conversation.override_model_configs:
-                app_model_config = db.session.scalar(
-                    select(AppModelConfig)
+                app_model_config = (
+                    db.session.query(AppModelConfig)
                    .where(AppModelConfig.id == conversation.app_model_config_id, AppModelConfig.app_id == app_model.id)
-                    .limit(1)
+                    .first()
                )
            else:
                conversation_override_model_configs = _app_model_config_adapter.validate_json(
--- a/api/services/ops_service.py
+++ b/api/services/ops_service.py
@@ -1,7 +1,7 @@
-from sqlalchemy import select
+from typing import Any

 from core.ops.entities.config_entity import BaseTracingConfig
-from core.ops.ops_trace_manager import OpsTraceManager, TracingProviderConfigEntry, provider_config_map
+from core.ops.ops_trace_manager import OpsTraceManager, provider_config_map
 from extensions.ext_database import db
 from models.model import App, TraceAppConfig

@@ -15,17 +15,17 @@ class OpsService:
        :param tracing_provider: tracing provider
        :return:
        """
-        trace_config_data: TraceAppConfig | None = db.session.scalar(
-            select(TraceAppConfig)
+        trace_config_data: TraceAppConfig | None = (
+            db.session.query(TraceAppConfig)
            .where(TraceAppConfig.app_id == app_id, TraceAppConfig.tracing_provider == tracing_provider)
-            .limit(1)
+            .first()
        )

        if not trace_config_data:
            return None

        # decrypt_token and obfuscated_token
-        app = db.session.get(App, app_id)
+        app = db.session.query(App).where(App.id == app_id).first()
        if not app:
            return None
        tenant_id = app.tenant_id
@@ -148,7 +148,7 @@ class OpsService:
        except KeyError:
            return {"error": f"Invalid tracing provider: {tracing_provider}"}

-        provider_config: TracingProviderConfigEntry = provider_config_map[tracing_provider]
+        provider_config: dict[str, Any] = provider_config_map[tracing_provider]
        config_class: type[BaseTracingConfig] = provider_config["config_class"]
        other_keys: list[str] = provider_config["other_keys"]

@@ -182,17 +182,17 @@ class OpsService:
            project_url = None

        # check if trace config already exists
-        trace_config_data: TraceAppConfig | None = db.session.scalar(
-            select(TraceAppConfig)
+        trace_config_data: TraceAppConfig | None = (
+            db.session.query(TraceAppConfig)
            .where(TraceAppConfig.app_id == app_id, TraceAppConfig.tracing_provider == tracing_provider)
-            .limit(1)
+            .first()
        )

        if trace_config_data:
            return None

        # get tenant id
-        app = db.session.get(App, app_id)
+        app = db.session.query(App).where(App.id == app_id).first()
        if not app:
            return None
        tenant_id = app.tenant_id
@@ -224,17 +224,17 @@ class OpsService:
            raise ValueError(f"Invalid tracing provider: {tracing_provider}")

        # check if trace config already exists
-        current_trace_config = db.session.scalar(
-            select(TraceAppConfig)
+        current_trace_config = (
+            db.session.query(TraceAppConfig)
            .where(TraceAppConfig.app_id == app_id, TraceAppConfig.tracing_provider == tracing_provider)
-            .limit(1)
+            .first()
        )

        if not current_trace_config:
            return None

        # get tenant id
-        app = db.session.get(App, app_id)
+        app = db.session.query(App).where(App.id == app_id).first()
        if not app:
            return None
        tenant_id = app.tenant_id
@@ -261,10 +261,10 @@ class OpsService:
        :param tracing_provider: tracing provider
        :return:
        """
-        trace_config = db.session.scalar(
-            select(TraceAppConfig)
+        trace_config = (
+            db.session.query(TraceAppConfig)
            .where(TraceAppConfig.app_id == app_id, TraceAppConfig.tracing_provider == tracing_provider)
-            .limit(1)
+            .first()
        )

        if not trace_config:
--- a/api/tests/unit_tests/services/test_message_service.py
+++ b/api/tests/unit_tests/services/test_message_service.py
@@ -151,7 +151,12 @@ class TestMessageServicePaginationByFirstId:
            for i in range(5)
        ]

-        mock_db.session.scalars.return_value.all.return_value = messages
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = messages

        # Act
        result = MessageService.pagination_by_first_id(
@@ -191,7 +196,12 @@ class TestMessageServicePaginationByFirstId:
            for i in range(5)
        ]

-        mock_db.session.scalars.return_value.all.return_value = messages
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = messages

        # Act
        result = MessageService.pagination_by_first_id(
@@ -236,8 +246,31 @@ class TestMessageServicePaginationByFirstId:
            for i in range(5)
        ]

-        mock_db.session.scalar.return_value = first_message
-        mock_db.session.scalars.return_value.all.return_value = history_messages
+        # Setup query mocks
+        mock_query_first = MagicMock()
+        mock_query_history = MagicMock()
+
+        query_calls = []
+
+        def query_side_effect(*args):
+            if args[0] == Message:
+                query_calls.append(args)
+                if len(query_calls) == 1:
+                    return mock_query_first
+                else:
+                    return mock_query_history
+
+        mock_db.session.query.side_effect = [mock_query_first, mock_query_history]
+
+        # Setup first message query
+        mock_query_first.where.return_value = mock_query_first
+        mock_query_first.first.return_value = first_message
+
+        # Setup history messages query
+        mock_query_history.where.return_value = mock_query_history
+        mock_query_history.order_by.return_value = mock_query_history
+        mock_query_history.limit.return_value = mock_query_history
+        mock_query_history.all.return_value = history_messages

        # Act
        result = MessageService.pagination_by_first_id(
@@ -252,6 +285,8 @@ class TestMessageServicePaginationByFirstId:
        # Assert
        assert len(result.data) == 5
        assert result.has_more is False
+        mock_query_first.where.assert_called_once()
+        mock_query_history.where.assert_called_once()

    # Test 06: First message not found
    @patch("services.message_service.db")
@@ -265,7 +300,10 @@ class TestMessageServicePaginationByFirstId:

        mock_conversation_service.get_conversation.return_value = conversation

-        mock_db.session.scalar.return_value = None  # Message not found
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.first.return_value = None  # Message not found

        # Act & Assert
        with pytest.raises(FirstMessageNotExistsError):
@@ -298,7 +336,12 @@ class TestMessageServicePaginationByFirstId:
            for i in range(11)
        ]

-        mock_db.session.scalars.return_value.all.return_value = messages
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = messages

        # Act
        result = MessageService.pagination_by_first_id(
@@ -326,7 +369,12 @@ class TestMessageServicePaginationByFirstId:

        mock_conversation_service.get_conversation.return_value = conversation

-        mock_db.session.scalars.return_value.all.return_value = []
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = []

        # Act
        result = MessageService.pagination_by_first_id(
@@ -395,7 +443,12 @@ class TestMessageServicePaginationByLastId:
            for i in range(5)
        ]

-        mock_db.session.scalars.return_value.all.return_value = messages
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = messages

        # Act
        result = MessageService.pagination_by_last_id(
@@ -432,8 +485,22 @@ class TestMessageServicePaginationByLastId:
            for i in range(6, 10)
        ]

-        mock_db.session.scalar.return_value = last_message
-        mock_db.session.scalars.return_value.all.return_value = new_messages
+        # Setup base query mock that returns itself for chaining
+        mock_base_query = MagicMock()
+        mock_db.session.query.return_value = mock_base_query
+
+        # First where() call for last_id lookup
+        mock_query_last = MagicMock()
+        mock_query_last.first.return_value = last_message
+
+        # Second where() call for history messages
+        mock_query_history = MagicMock()
+        mock_query_history.order_by.return_value = mock_query_history
+        mock_query_history.limit.return_value = mock_query_history
+        mock_query_history.all.return_value = new_messages
+
+        # Setup where() to return different mocks on consecutive calls
+        mock_base_query.where.side_effect = [mock_query_last, mock_query_history]

        # Act
        result = MessageService.pagination_by_last_id(
@@ -455,7 +522,10 @@ class TestMessageServicePaginationByLastId:
        app = factory.create_app_mock()
        user = factory.create_end_user_mock()

-        mock_db.session.scalar.return_value = None  # Message not found
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.first.return_value = None  # Message not found

        # Act & Assert
        with pytest.raises(LastMessageNotExistsError):
@@ -487,7 +557,12 @@ class TestMessageServicePaginationByLastId:
            for i in range(5)
        ]

-        mock_db.session.scalars.return_value.all.return_value = messages
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = messages

        # Act
        result = MessageService.pagination_by_last_id(
@@ -501,6 +576,8 @@ class TestMessageServicePaginationByLastId:
        # Assert
        assert len(result.data) == 5
        assert result.has_more is False
+        # Verify conversation_id was used in query
+        mock_query.where.assert_called()
        mock_conversation_service.get_conversation.assert_called_once()

    # Test 14: Pagination with include_ids filter
@@ -517,7 +594,12 @@ class TestMessageServicePaginationByLastId:
            factory.create_message_mock(message_id="msg-003"),
        ]

-        mock_db.session.scalars.return_value.all.return_value = messages
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = messages

        # Act
        result = MessageService.pagination_by_last_id(
@@ -550,7 +632,12 @@ class TestMessageServicePaginationByLastId:
            for i in range(11)
        ]

-        mock_db.session.scalars.return_value.all.return_value = messages
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.all.return_value = messages

        # Act
        result = MessageService.pagination_by_last_id(
@@ -656,13 +743,17 @@ class TestMessageServiceGetMessage:
        user = factory.create_end_user_mock(user_id="end-user-123")
        message = factory.create_message_mock()

-        mock_db.session.scalar.return_value = message
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.first.return_value = message

        # Act
        result = MessageService.get_message(app_model=app, user=user, message_id="msg-123")

        # Assert
        assert result == message
+        mock_query.where.assert_called_once()

    # Test 21: get_message success for Account (Admin)
    @patch("services.message_service.db")
@@ -676,7 +767,10 @@ class TestMessageServiceGetMessage:
        user.id = "account-123"
        message = factory.create_message_mock()

-        mock_db.session.scalar.return_value = message
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.first.return_value = message

        # Act
        result = MessageService.get_message(app_model=app, user=user, message_id="msg-123")
@@ -692,7 +786,10 @@ class TestMessageServiceGetMessage:
        app = factory.create_app_mock()
        user = factory.create_end_user_mock()

-        mock_db.session.scalar.return_value = None
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.first.return_value = None

        # Act & Assert
        with pytest.raises(MessageNotExistsError):
@@ -802,13 +899,21 @@ class TestMessageServiceFeedback:
        feedback = MagicMock()
        feedback.to_dict.return_value = {"id": "fb-1"}

-        mock_db.session.scalars.return_value.all.return_value = [feedback]
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.order_by.return_value = mock_query
+        mock_query.limit.return_value = mock_query
+        mock_query.offset.return_value = mock_query
+        mock_query.all.return_value = [feedback]

        # Act
        result = MessageService.get_all_messages_feedbacks(app_model=app, page=1, limit=10)

        # Assert
        assert result == [{"id": "fb-1"}]
+        mock_query.limit.assert_called_with(10)
+        mock_query.offset.assert_called_with(0)


 class TestMessageServiceSuggestedQuestions:
@@ -910,7 +1015,10 @@ class TestMessageServiceSuggestedQuestions:
        app_model_config.suggested_questions_after_answer_dict = {"enabled": True}
        app_model_config.model_dict = {"provider": "openai", "name": "gpt-4"}

-        mock_db.session.scalar.return_value = app_model_config
+        mock_query = MagicMock()
+        mock_db.session.query.return_value = mock_query
+        mock_query.where.return_value = mock_query
+        mock_query.first.return_value = app_model_config

        mock_llm_gen.generate_suggested_questions_after_answer.return_value = ["Q1?"]

@@ -921,6 +1029,7 @@ class TestMessageServiceSuggestedQuestions:

        # Assert
        assert result == ["Q1?"]
+        mock_query.first.assert_called_once()
        mock_llm_gen.generate_suggested_questions_after_answer.assert_called_once()

    # Test 30: get_suggested_questions_after_answer - Disabled Error
--- a/api/tests/unit_tests/services/test_ops_service.py
+++ b/api/tests/unit_tests/services/test_ops_service.py
@@ -12,27 +12,28 @@ class TestOpsService:
    @patch("services.ops_service.OpsTraceManager")
    def test_get_tracing_app_config_no_config(self, mock_ops_trace_manager, mock_db):
        # Arrange
-        mock_db.session.scalar.return_value = None
+        mock_db.session.query.return_value.where.return_value.first.return_value = None

        # Act
        result = OpsService.get_tracing_app_config("app_id", "arize")

        # Assert
        assert result is None
+        mock_db.session.query.assert_called_with(TraceAppConfig)

    @patch("services.ops_service.db")
    @patch("services.ops_service.OpsTraceManager")
    def test_get_tracing_app_config_no_app(self, mock_ops_trace_manager, mock_db):
        # Arrange
        trace_config = MagicMock(spec=TraceAppConfig)
-        mock_db.session.scalar.return_value = trace_config
-        mock_db.session.get.return_value = None
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [trace_config, None]

        # Act
        result = OpsService.get_tracing_app_config("app_id", "arize")

        # Assert
        assert result is None
+        assert mock_db.session.query.call_count == 2

    @patch("services.ops_service.db")
    @patch("services.ops_service.OpsTraceManager")
@@ -42,8 +43,7 @@ class TestOpsService:
        trace_config.tracing_config = None
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = trace_config
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [trace_config, app]

        # Act & Assert
        with pytest.raises(ValueError, match="Tracing config cannot be None."):
@@ -72,8 +72,7 @@ class TestOpsService:
        trace_config.to_dict.return_value = {"tracing_config": {"project_url": default_url}}
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = trace_config
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [trace_config, app]

        mock_ops_trace_manager.decrypt_tracing_config.return_value = {}
        mock_ops_trace_manager.obfuscated_decrypt_token.return_value = {}
@@ -98,8 +97,7 @@ class TestOpsService:
        trace_config.to_dict.return_value = {"tracing_config": {"project_url": "success_url"}}
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = trace_config
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [trace_config, app]

        mock_ops_trace_manager.decrypt_tracing_config.return_value = {}
        mock_ops_trace_manager.obfuscated_decrypt_token.return_value = {}
@@ -120,8 +118,7 @@ class TestOpsService:
        trace_config.to_dict.return_value = {"tracing_config": {"project_url": "https://api.langfuse.com/project/key"}}
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = trace_config
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [trace_config, app]

        mock_ops_trace_manager.decrypt_tracing_config.return_value = {"host": "https://api.langfuse.com"}
        mock_ops_trace_manager.obfuscated_decrypt_token.return_value = {"host": "https://api.langfuse.com"}
@@ -142,8 +139,7 @@ class TestOpsService:
        trace_config.to_dict.return_value = {"tracing_config": {"project_url": "https://api.langfuse.com/"}}
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = trace_config
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [trace_config, app]

        mock_ops_trace_manager.decrypt_tracing_config.return_value = {"host": "https://api.langfuse.com"}
        mock_ops_trace_manager.obfuscated_decrypt_token.return_value = {"host": "https://api.langfuse.com"}
@@ -193,7 +189,7 @@ class TestOpsService:
        mock_ops_trace_manager.check_trace_config_is_effective.return_value = True
        mock_ops_trace_manager.get_trace_config_project_url.side_effect = Exception("error")
        mock_ops_trace_manager.get_trace_config_project_key.side_effect = Exception("error")
-        mock_db.session.scalar.return_value = MagicMock(spec=TraceAppConfig)
+        mock_db.session.query.return_value.where.return_value.first.return_value = MagicMock(spec=TraceAppConfig)

        # Act
        result = OpsService.create_tracing_app_config("app_id", provider, config)
@@ -210,8 +206,7 @@ class TestOpsService:
        mock_ops_trace_manager.get_trace_config_project_key.return_value = "key"
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = None
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [None, app]
        mock_ops_trace_manager.encrypt_tracing_config.return_value = {}

        # Act
@@ -228,7 +223,7 @@ class TestOpsService:
        # Arrange
        provider = TracingProviderEnum.ARIZE
        mock_ops_trace_manager.check_trace_config_is_effective.return_value = True
-        mock_db.session.scalar.return_value = MagicMock(spec=TraceAppConfig)
+        mock_db.session.query.return_value.where.return_value.first.return_value = MagicMock(spec=TraceAppConfig)

        # Act
        result = OpsService.create_tracing_app_config("app_id", provider, {})
@@ -242,8 +237,7 @@ class TestOpsService:
        # Arrange
        provider = TracingProviderEnum.ARIZE
        mock_ops_trace_manager.check_trace_config_is_effective.return_value = True
-        mock_db.session.scalar.return_value = None
-        mock_db.session.get.return_value = None
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [None, None]

        # Act
        result = OpsService.create_tracing_app_config("app_id", provider, {})
@@ -259,8 +253,7 @@ class TestOpsService:
        mock_ops_trace_manager.check_trace_config_is_effective.return_value = True
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = None
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [None, app]
        mock_ops_trace_manager.encrypt_tracing_config.return_value = {}

        # Act
@@ -281,8 +274,7 @@ class TestOpsService:
        mock_ops_trace_manager.get_trace_config_project_url.return_value = "http://project_url"
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = None
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [None, app]
        mock_ops_trace_manager.encrypt_tracing_config.return_value = {"encrypted": "config"}

        # Act
@@ -305,7 +297,7 @@ class TestOpsService:
    def test_update_tracing_app_config_no_config(self, mock_ops_trace_manager, mock_db):
        # Arrange
        provider = TracingProviderEnum.ARIZE
-        mock_db.session.scalar.return_value = None
+        mock_db.session.query.return_value.where.return_value.first.return_value = None

        # Act
        result = OpsService.update_tracing_app_config("app_id", provider, {})
@@ -319,8 +311,7 @@ class TestOpsService:
        # Arrange
        provider = TracingProviderEnum.ARIZE
        current_config = MagicMock(spec=TraceAppConfig)
-        mock_db.session.scalar.return_value = current_config
-        mock_db.session.get.return_value = None
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [current_config, None]

        # Act
        result = OpsService.update_tracing_app_config("app_id", provider, {})
@@ -336,8 +327,7 @@ class TestOpsService:
        current_config = MagicMock(spec=TraceAppConfig)
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = current_config
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [current_config, app]
        mock_ops_trace_manager.decrypt_tracing_config.return_value = {}
        mock_ops_trace_manager.check_trace_config_is_effective.return_value = False

@@ -354,8 +344,7 @@ class TestOpsService:
        current_config.to_dict.return_value = {"some": "data"}
        app = MagicMock(spec=App)
        app.tenant_id = "tenant_id"
-        mock_db.session.scalar.return_value = current_config
-        mock_db.session.get.return_value = app
+        mock_db.session.query.return_value.where.return_value.first.side_effect = [current_config, app]
        mock_ops_trace_manager.decrypt_tracing_config.return_value = {}
        mock_ops_trace_manager.check_trace_config_is_effective.return_value = True

@@ -369,7 +358,7 @@ class TestOpsService:
    @patch("services.ops_service.db")
    def test_delete_tracing_app_config_no_config(self, mock_db):
        # Arrange
-        mock_db.session.scalar.return_value = None
+        mock_db.session.query.return_value.where.return_value.first.return_value = None

        # Act
        result = OpsService.delete_tracing_app_config("app_id", "arize")
@@ -381,7 +370,7 @@ class TestOpsService:
    def test_delete_tracing_app_config_success(self, mock_db):
        # Arrange
        trace_config = MagicMock(spec=TraceAppConfig)
-        mock_db.session.scalar.return_value = trace_config
+        mock_db.session.query.return_value.where.return_value.first.return_value = trace_config

        # Act
        result = OpsService.delete_tracing_app_config("app_id", "arize")
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -60,7 +60,7 @@ wheels = [

 [[package]]
 name = "aiohttp"
-version = "3.13.4"
+version = "3.13.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "aiohappyeyeballs" },
@@ -71,42 +71,42 @@ dependencies = [
    { name = "propcache" },
    { name = "yarl" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/45/4a/064321452809dae953c1ed6e017504e72551a26b6f5708a5a80e4bf556ff/aiohttp-3.13.4.tar.gz", hash = "sha256:d97a6d09c66087890c2ab5d49069e1e570583f7ac0314ecf98294c1b6aaebd38", size = 7859748, upload-time = "2026-03-28T17:19:40.6Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/50/42/32cf8e7704ceb4481406eb87161349abb46a57fee3f008ba9cb610968646/aiohttp-3.13.3.tar.gz", hash = "sha256:a949eee43d3782f2daae4f4a2819b2cb9b0c5d3b7f7a927067cc84dafdbb9f88", size = 7844556, upload-time = "2026-01-03T17:33:05.204Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d4/7e/cb94129302d78c46662b47f9897d642fd0b33bdfef4b73b20c6ced35aa4c/aiohttp-3.13.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8ea0c64d1bcbf201b285c2246c51a0c035ba3bbd306640007bc5844a3b4658c1", size = 760027, upload-time = "2026-03-28T17:15:33.022Z" },
-    { url = "https://files.pythonhosted.org/packages/5e/cd/2db3c9397c3bd24216b203dd739945b04f8b87bb036c640da7ddb63c75ef/aiohttp-3.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6f742e1fa45c0ed522b00ede565e18f97e4cf8d1883a712ac42d0339dfb0cce7", size = 508325, upload-time = "2026-03-28T17:15:34.714Z" },
-    { url = "https://files.pythonhosted.org/packages/36/a3/d28b2722ec13107f2e37a86b8a169897308bab6a3b9e071ecead9d67bd9b/aiohttp-3.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6dcfb50ee25b3b7a1222a9123be1f9f89e56e67636b561441f0b304e25aaef8f", size = 502402, upload-time = "2026-03-28T17:15:36.409Z" },
-    { url = "https://files.pythonhosted.org/packages/fa/d6/acd47b5f17c4430e555590990a4746efbcb2079909bb865516892bf85f37/aiohttp-3.13.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3262386c4ff370849863ea93b9ea60fd59c6cf56bf8f93beac625cf4d677c04d", size = 1771224, upload-time = "2026-03-28T17:15:38.223Z" },
-    { url = "https://files.pythonhosted.org/packages/98/af/af6e20113ba6a48fd1cd9e5832c4851e7613ef50c7619acdaee6ec5f1aff/aiohttp-3.13.4-cp311-cp311-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:473bb5aa4218dd254e9ae4834f20e31f5a0083064ac0136a01a62ddbae2eaa42", size = 1731530, upload-time = "2026-03-28T17:15:39.988Z" },
-    { url = "https://files.pythonhosted.org/packages/81/16/78a2f5d9c124ad05d5ce59a9af94214b6466c3491a25fb70760e98e9f762/aiohttp-3.13.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e56423766399b4c77b965f6aaab6c9546617b8994a956821cc507d00b91d978c", size = 1827925, upload-time = "2026-03-28T17:15:41.944Z" },
-    { url = "https://files.pythonhosted.org/packages/2a/1f/79acf0974ced805e0e70027389fccbb7d728e6f30fcac725fb1071e63075/aiohttp-3.13.4-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8af249343fafd5ad90366a16d230fc265cf1149f26075dc9fe93cfd7c7173942", size = 1923579, upload-time = "2026-03-28T17:15:44.071Z" },
-    { url = "https://files.pythonhosted.org/packages/af/53/29f9e2054ea6900413f3b4c3eb9d8331f60678ec855f13ba8714c47fd48d/aiohttp-3.13.4-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bc0a5cf4f10ef5a2c94fdde488734b582a3a7a000b131263e27c9295bd682d9", size = 1767655, upload-time = "2026-03-28T17:15:45.911Z" },
-    { url = "https://files.pythonhosted.org/packages/f3/57/462fe1d3da08109ba4aa8590e7aed57c059af2a7e80ec21f4bac5cfe1094/aiohttp-3.13.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5c7ff1028e3c9fc5123a865ce17df1cb6424d180c503b8517afbe89aa566e6be", size = 1630439, upload-time = "2026-03-28T17:15:48.11Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/4b/4813344aacdb8127263e3eec343d24e973421143826364fa9fc847f6283f/aiohttp-3.13.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ba5cf98b5dcb9bddd857da6713a503fa6d341043258ca823f0f5ab7ab4a94ee8", size = 1745557, upload-time = "2026-03-28T17:15:50.13Z" },
-    { url = "https://files.pythonhosted.org/packages/d4/01/1ef1adae1454341ec50a789f03cfafe4c4ac9c003f6a64515ecd32fe4210/aiohttp-3.13.4-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:d85965d3ba21ee4999e83e992fecb86c4614d6920e40705501c0a1f80a583c12", size = 1741796, upload-time = "2026-03-28T17:15:52.351Z" },
-    { url = "https://files.pythonhosted.org/packages/22/04/8cdd99af988d2aa6922714d957d21383c559835cbd43fbf5a47ddf2e0f05/aiohttp-3.13.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:49f0b18a9b05d79f6f37ddd567695943fcefb834ef480f17a4211987302b2dc7", size = 1805312, upload-time = "2026-03-28T17:15:54.407Z" },
-    { url = "https://files.pythonhosted.org/packages/fb/7f/b48d5577338d4b25bbdbae35c75dbfd0493cb8886dc586fbfb2e90862239/aiohttp-3.13.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7f78cb080c86fbf765920e5f1ef35af3f24ec4314d6675d0a21eaf41f6f2679c", size = 1621751, upload-time = "2026-03-28T17:15:56.564Z" },
-    { url = "https://files.pythonhosted.org/packages/bc/89/4eecad8c1858e6d0893c05929e22343e0ebe3aec29a8a399c65c3cc38311/aiohttp-3.13.4-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:67a3ec705534a614b68bbf1c70efa777a21c3da3895d1c44510a41f5a7ae0453", size = 1826073, upload-time = "2026-03-28T17:15:58.489Z" },
-    { url = "https://files.pythonhosted.org/packages/f5/5c/9dc8293ed31b46c39c9c513ac7ca152b3c3d38e0ea111a530ad12001b827/aiohttp-3.13.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d6630ec917e85c5356b2295744c8a97d40f007f96a1c76bf1928dc2e27465393", size = 1760083, upload-time = "2026-03-28T17:16:00.677Z" },
-    { url = "https://files.pythonhosted.org/packages/1e/19/8bbf6a4994205d96831f97b7d21a0feed120136e6267b5b22d229c6dc4dc/aiohttp-3.13.4-cp311-cp311-win32.whl", hash = "sha256:54049021bc626f53a5394c29e8c444f726ee5a14b6e89e0ad118315b1f90f5e3", size = 439690, upload-time = "2026-03-28T17:16:02.902Z" },
-    { url = "https://files.pythonhosted.org/packages/0c/f5/ac409ecd1007528d15c3e8c3a57d34f334c70d76cfb7128a28cffdebd4c1/aiohttp-3.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:c033f2bc964156030772d31cbf7e5defea181238ce1f87b9455b786de7d30145", size = 463824, upload-time = "2026-03-28T17:16:05.058Z" },
-    { url = "https://files.pythonhosted.org/packages/1e/bd/ede278648914cabbabfdf95e436679b5d4156e417896a9b9f4587169e376/aiohttp-3.13.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:ee62d4471ce86b108b19c3364db4b91180d13fe3510144872d6bad5401957360", size = 752158, upload-time = "2026-03-28T17:16:06.901Z" },
-    { url = "https://files.pythonhosted.org/packages/90/de/581c053253c07b480b03785196ca5335e3c606a37dc73e95f6527f1591fe/aiohttp-3.13.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c0fd8f41b54b58636402eb493afd512c23580456f022c1ba2db0f810c959ed0d", size = 501037, upload-time = "2026-03-28T17:16:08.82Z" },
-    { url = "https://files.pythonhosted.org/packages/fa/f9/a5ede193c08f13cc42c0a5b50d1e246ecee9115e4cf6e900d8dbd8fd6acb/aiohttp-3.13.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4baa48ce49efd82d6b1a0be12d6a36b35e5594d1dd42f8bfba96ea9f8678b88c", size = 501556, upload-time = "2026-03-28T17:16:10.63Z" },
-    { url = "https://files.pythonhosted.org/packages/d6/10/88ff67cd48a6ec36335b63a640abe86135791544863e0cfe1f065d6cef7a/aiohttp-3.13.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d738ebab9f71ee652d9dbd0211057690022201b11197f9a7324fd4dba128aa97", size = 1757314, upload-time = "2026-03-28T17:16:12.498Z" },
-    { url = "https://files.pythonhosted.org/packages/8b/15/fdb90a5cf5a1f52845c276e76298c75fbbcc0ac2b4a86551906d54529965/aiohttp-3.13.4-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:0ce692c3468fa831af7dceed52edf51ac348cebfc8d3feb935927b63bd3e8576", size = 1731819, upload-time = "2026-03-28T17:16:14.558Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/df/28146785a007f7820416be05d4f28cc207493efd1e8c6c1068e9bdc29198/aiohttp-3.13.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8e08abcfe752a454d2cb89ff0c08f2d1ecd057ae3e8cc6d84638de853530ebab", size = 1793279, upload-time = "2026-03-28T17:16:16.594Z" },
-    { url = "https://files.pythonhosted.org/packages/10/47/689c743abf62ea7a77774d5722f220e2c912a77d65d368b884d9779ef41b/aiohttp-3.13.4-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5977f701b3fff36367a11087f30ea73c212e686d41cd363c50c022d48b011d8d", size = 1891082, upload-time = "2026-03-28T17:16:18.71Z" },
-    { url = "https://files.pythonhosted.org/packages/b0/b6/f7f4f318c7e58c23b761c9b13b9a3c9b394e0f9d5d76fbc6622fa98509f6/aiohttp-3.13.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:54203e10405c06f8b6020bd1e076ae0fe6c194adcee12a5a78af3ffa3c57025e", size = 1773938, upload-time = "2026-03-28T17:16:21.125Z" },
-    { url = "https://files.pythonhosted.org/packages/aa/06/f207cb3121852c989586a6fc16ff854c4fcc8651b86c5d3bd1fc83057650/aiohttp-3.13.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:358a6af0145bc4dda037f13167bef3cce54b132087acc4c295c739d05d16b1c3", size = 1579548, upload-time = "2026-03-28T17:16:23.588Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/58/e1289661a32161e24c1fe479711d783067210d266842523752869cc1d9c2/aiohttp-3.13.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:898ea1850656d7d61832ef06aa9846ab3ddb1621b74f46de78fbc5e1a586ba83", size = 1714669, upload-time = "2026-03-28T17:16:25.713Z" },
-    { url = "https://files.pythonhosted.org/packages/96/0a/3e86d039438a74a86e6a948a9119b22540bae037d6ba317a042ae3c22711/aiohttp-3.13.4-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:7bc30cceb710cf6a44e9617e43eebb6e3e43ad855a34da7b4b6a73537d8a6763", size = 1754175, upload-time = "2026-03-28T17:16:28.18Z" },
-    { url = "https://files.pythonhosted.org/packages/f4/30/e717fc5df83133ba467a560b6d8ef20197037b4bb5d7075b90037de1018e/aiohttp-3.13.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4a31c0c587a8a038f19a4c7e60654a6c899c9de9174593a13e7cc6e15ff271f9", size = 1762049, upload-time = "2026-03-28T17:16:30.941Z" },
-    { url = "https://files.pythonhosted.org/packages/e4/28/8f7a2d4492e336e40005151bdd94baf344880a4707573378579f833a64c1/aiohttp-3.13.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:2062f675f3fe6e06d6113eb74a157fb9df58953ffed0cdb4182554b116545758", size = 1570861, upload-time = "2026-03-28T17:16:32.953Z" },
-    { url = "https://files.pythonhosted.org/packages/78/45/12e1a3d0645968b1c38de4b23fdf270b8637735ea057d4f84482ff918ad9/aiohttp-3.13.4-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:3d1ba8afb847ff80626d5e408c1fdc99f942acc877d0702fe137015903a220a9", size = 1790003, upload-time = "2026-03-28T17:16:35.468Z" },
-    { url = "https://files.pythonhosted.org/packages/eb/0f/60374e18d590de16dcb39d6ff62f39c096c1b958e6f37727b5870026ea30/aiohttp-3.13.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b08149419994cdd4d5eecf7fd4bc5986b5a9380285bcd01ab4c0d6bfca47b79d", size = 1737289, upload-time = "2026-03-28T17:16:38.187Z" },
-    { url = "https://files.pythonhosted.org/packages/02/bf/535e58d886cfbc40a8b0013c974afad24ef7632d645bca0b678b70033a60/aiohttp-3.13.4-cp312-cp312-win32.whl", hash = "sha256:fc432f6a2c4f720180959bc19aa37259651c1a4ed8af8afc84dd41c60f15f791", size = 434185, upload-time = "2026-03-28T17:16:40.735Z" },
-    { url = "https://files.pythonhosted.org/packages/1e/1a/d92e3325134ebfff6f4069f270d3aac770d63320bd1fcd0eca023e74d9a8/aiohttp-3.13.4-cp312-cp312-win_amd64.whl", hash = "sha256:6148c9ae97a3e8bff9a1fc9c757fa164116f86c100468339730e717590a3fb77", size = 461285, upload-time = "2026-03-28T17:16:42.713Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/4c/a164164834f03924d9a29dc3acd9e7ee58f95857e0b467f6d04298594ebb/aiohttp-3.13.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5b6073099fb654e0a068ae678b10feff95c5cae95bbfcbfa7af669d361a8aa6b", size = 746051, upload-time = "2026-01-03T17:29:43.287Z" },
+    { url = "https://files.pythonhosted.org/packages/82/71/d5c31390d18d4f58115037c432b7e0348c60f6f53b727cad33172144a112/aiohttp-3.13.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cb93e166e6c28716c8c6aeb5f99dfb6d5ccf482d29fe9bf9a794110e6d0ab64", size = 499234, upload-time = "2026-01-03T17:29:44.822Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/c9/741f8ac91e14b1d2e7100690425a5b2b919a87a5075406582991fb7de920/aiohttp-3.13.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:28e027cf2f6b641693a09f631759b4d9ce9165099d2b5d92af9bd4e197690eea", size = 494979, upload-time = "2026-01-03T17:29:46.405Z" },
+    { url = "https://files.pythonhosted.org/packages/75/b5/31d4d2e802dfd59f74ed47eba48869c1c21552c586d5e81a9d0d5c2ad640/aiohttp-3.13.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3b61b7169ababd7802f9568ed96142616a9118dd2be0d1866e920e77ec8fa92a", size = 1748297, upload-time = "2026-01-03T17:29:48.083Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/3e/eefad0ad42959f226bb79664826883f2687d602a9ae2941a18e0484a74d3/aiohttp-3.13.3-cp311-cp311-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:80dd4c21b0f6237676449c6baaa1039abae86b91636b6c91a7f8e61c87f89540", size = 1707172, upload-time = "2026-01-03T17:29:49.648Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/3a/54a64299fac2891c346cdcf2aa6803f994a2e4beeaf2e5a09dcc54acc842/aiohttp-3.13.3-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:65d2ccb7eabee90ce0503c17716fc77226be026dcc3e65cce859a30db715025b", size = 1805405, upload-time = "2026-01-03T17:29:51.244Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/70/ddc1b7169cf64075e864f64595a14b147a895a868394a48f6a8031979038/aiohttp-3.13.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5b179331a481cb5529fca8b432d8d3c7001cb217513c94cd72d668d1248688a3", size = 1899449, upload-time = "2026-01-03T17:29:53.938Z" },
+    { url = "https://files.pythonhosted.org/packages/a1/7e/6815aab7d3a56610891c76ef79095677b8b5be6646aaf00f69b221765021/aiohttp-3.13.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d4c940f02f49483b18b079d1c27ab948721852b281f8b015c058100e9421dd1", size = 1748444, upload-time = "2026-01-03T17:29:55.484Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/f2/073b145c4100da5511f457dc0f7558e99b2987cf72600d42b559db856fbc/aiohttp-3.13.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f9444f105664c4ce47a2a7171a2418bce5b7bae45fb610f4e2c36045d85911d3", size = 1606038, upload-time = "2026-01-03T17:29:57.179Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/c1/778d011920cae03ae01424ec202c513dc69243cf2db303965615b81deeea/aiohttp-3.13.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:694976222c711d1d00ba131904beb60534f93966562f64440d0c9d41b8cdb440", size = 1724156, upload-time = "2026-01-03T17:29:58.914Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/cb/3419eabf4ec1e9ec6f242c32b689248365a1cf621891f6f0386632525494/aiohttp-3.13.3-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:f33ed1a2bf1997a36661874b017f5c4b760f41266341af36febaf271d179f6d7", size = 1722340, upload-time = "2026-01-03T17:30:01.962Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/e5/76cf77bdbc435bf233c1f114edad39ed4177ccbfab7c329482b179cff4f4/aiohttp-3.13.3-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e636b3c5f61da31a92bf0d91da83e58fdfa96f178ba682f11d24f31944cdd28c", size = 1783041, upload-time = "2026-01-03T17:30:03.609Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/d4/dd1ca234c794fd29c057ce8c0566b8ef7fd6a51069de5f06fa84b9a1971c/aiohttp-3.13.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5d2d94f1f5fcbe40838ac51a6ab5704a6f9ea42e72ceda48de5e6b898521da51", size = 1596024, upload-time = "2026-01-03T17:30:05.132Z" },
+    { url = "https://files.pythonhosted.org/packages/55/58/4345b5f26661a6180afa686c473620c30a66afdf120ed3dd545bbc809e85/aiohttp-3.13.3-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:2be0e9ccf23e8a94f6f0650ce06042cefc6ac703d0d7ab6c7a917289f2539ad4", size = 1804590, upload-time = "2026-01-03T17:30:07.135Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/06/05950619af6c2df7e0a431d889ba2813c9f0129cec76f663e547a5ad56f2/aiohttp-3.13.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9af5e68ee47d6534d36791bbe9b646d2a7c7deb6fc24d7943628edfbb3581f29", size = 1740355, upload-time = "2026-01-03T17:30:09.083Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/80/958f16de79ba0422d7c1e284b2abd0c84bc03394fbe631d0a39ffa10e1eb/aiohttp-3.13.3-cp311-cp311-win32.whl", hash = "sha256:a2212ad43c0833a873d0fb3c63fa1bacedd4cf6af2fee62bf4b739ceec3ab239", size = 433701, upload-time = "2026-01-03T17:30:10.869Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/f2/27cdf04c9851712d6c1b99df6821a6623c3c9e55956d4b1e318c337b5a48/aiohttp-3.13.3-cp311-cp311-win_amd64.whl", hash = "sha256:642f752c3eb117b105acbd87e2c143de710987e09860d674e068c4c2c441034f", size = 457678, upload-time = "2026-01-03T17:30:12.719Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/be/4fc11f202955a69e0db803a12a062b8379c970c7c84f4882b6da17337cc1/aiohttp-3.13.3-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:b903a4dfee7d347e2d87697d0713be59e0b87925be030c9178c5faa58ea58d5c", size = 739732, upload-time = "2026-01-03T17:30:14.23Z" },
+    { url = "https://files.pythonhosted.org/packages/97/2c/621d5b851f94fa0bb7430d6089b3aa970a9d9b75196bc93bb624b0db237a/aiohttp-3.13.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a45530014d7a1e09f4a55f4f43097ba0fd155089372e105e4bff4ca76cb1b168", size = 494293, upload-time = "2026-01-03T17:30:15.96Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/43/4be01406b78e1be8320bb8316dc9c42dbab553d281c40364e0f862d5661c/aiohttp-3.13.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:27234ef6d85c914f9efeb77ff616dbf4ad2380be0cda40b4db086ffc7ddd1b7d", size = 493533, upload-time = "2026-01-03T17:30:17.431Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/a8/5a35dc56a06a2c90d4742cbf35294396907027f80eea696637945a106f25/aiohttp-3.13.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d32764c6c9aafb7fb55366a224756387cd50bfa720f32b88e0e6fa45b27dcf29", size = 1737839, upload-time = "2026-01-03T17:30:19.422Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/62/4b9eeb331da56530bf2e198a297e5303e1c1ebdceeb00fe9b568a65c5a0c/aiohttp-3.13.3-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:b1a6102b4d3ebc07dad44fbf07b45bb600300f15b552ddf1851b5390202ea2e3", size = 1703932, upload-time = "2026-01-03T17:30:21.756Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/f6/af16887b5d419e6a367095994c0b1332d154f647e7dc2bd50e61876e8e3d/aiohttp-3.13.3-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c014c7ea7fb775dd015b2d3137378b7be0249a448a1612268b5a90c2d81de04d", size = 1771906, upload-time = "2026-01-03T17:30:23.932Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/83/397c634b1bcc24292fa1e0c7822800f9f6569e32934bdeef09dae7992dfb/aiohttp-3.13.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2b8d8ddba8f95ba17582226f80e2de99c7a7948e66490ef8d947e272a93e9463", size = 1871020, upload-time = "2026-01-03T17:30:26Z" },
+    { url = "https://files.pythonhosted.org/packages/86/f6/a62cbbf13f0ac80a70f71b1672feba90fdb21fd7abd8dbf25c0105fb6fa3/aiohttp-3.13.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9ae8dd55c8e6c4257eae3a20fd2c8f41edaea5992ed67156642493b8daf3cecc", size = 1755181, upload-time = "2026-01-03T17:30:27.554Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/87/20a35ad487efdd3fba93d5843efdfaa62d2f1479eaafa7453398a44faf13/aiohttp-3.13.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:01ad2529d4b5035578f5081606a465f3b814c542882804e2e8cda61adf5c71bf", size = 1561794, upload-time = "2026-01-03T17:30:29.254Z" },
+    { url = "https://files.pythonhosted.org/packages/de/95/8fd69a66682012f6716e1bc09ef8a1a2a91922c5725cb904689f112309c4/aiohttp-3.13.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:bb4f7475e359992b580559e008c598091c45b5088f28614e855e42d39c2f1033", size = 1697900, upload-time = "2026-01-03T17:30:31.033Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/66/7b94b3b5ba70e955ff597672dad1691333080e37f50280178967aff68657/aiohttp-3.13.3-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:c19b90316ad3b24c69cd78d5c9b4f3aa4497643685901185b65166293d36a00f", size = 1728239, upload-time = "2026-01-03T17:30:32.703Z" },
+    { url = "https://files.pythonhosted.org/packages/47/71/6f72f77f9f7d74719692ab65a2a0252584bf8d5f301e2ecb4c0da734530a/aiohttp-3.13.3-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:96d604498a7c782cb15a51c406acaea70d8c027ee6b90c569baa6e7b93073679", size = 1740527, upload-time = "2026-01-03T17:30:34.695Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/b4/75ec16cbbd5c01bdaf4a05b19e103e78d7ce1ef7c80867eb0ace42ff4488/aiohttp-3.13.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:084911a532763e9d3dd95adf78a78f4096cd5f58cdc18e6fdbc1b58417a45423", size = 1554489, upload-time = "2026-01-03T17:30:36.864Z" },
+    { url = "https://files.pythonhosted.org/packages/52/8f/bc518c0eea29f8406dcf7ed1f96c9b48e3bc3995a96159b3fc11f9e08321/aiohttp-3.13.3-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:7a4a94eb787e606d0a09404b9c38c113d3b099d508021faa615d70a0131907ce", size = 1767852, upload-time = "2026-01-03T17:30:39.433Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/f2/a07a75173124f31f11ea6f863dc44e6f09afe2bca45dd4e64979490deab1/aiohttp-3.13.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:87797e645d9d8e222e04160ee32aa06bc5c163e8499f24db719e7852ec23093a", size = 1722379, upload-time = "2026-01-03T17:30:41.081Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/4a/1a3fee7c21350cac78e5c5cef711bac1b94feca07399f3d406972e2d8fcd/aiohttp-3.13.3-cp312-cp312-win32.whl", hash = "sha256:b04be762396457bef43f3597c991e192ee7da460a4953d7e647ee4b1c28e7046", size = 428253, upload-time = "2026-01-03T17:30:42.644Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/b7/76175c7cb4eb73d91ad63c34e29fc4f77c9386bba4a65b53ba8e05ee3c39/aiohttp-3.13.3-cp312-cp312-win_amd64.whl", hash = "sha256:e3531d63d3bdfa7e3ac5e9b27b2dd7ec9df3206a98e0b3445fa906f233264c57", size = 455407, upload-time = "2026-01-03T17:30:44.195Z" },
 ]

 [[package]]
--- a/web/app/components/billing/partner-stack/tests/cookie-recorder.spec.tsx
+++ b/web/app/components/billing/partner-stack/tests/cookie-recorder.spec.tsx
@@ -2,8 +2,6 @@ import { render } from '@testing-library/react'
 import PartnerStackCookieRecorder from '../cookie-recorder'

 let isCloudEdition = true
-let psPartnerKey: string | undefined
-let psClickId: string | undefined

 const saveOrUpdate = vi.fn()

@@ -15,8 +13,6 @@ vi.mock('@/config', () => ({

 vi.mock('../use-ps-info', () => ({
  default: () => ({
-    psPartnerKey,
-    psClickId,
    saveOrUpdate,
  }),
 }))
@@ -25,8 +21,6 @@ describe('PartnerStackCookieRecorder', () => {
  beforeEach(() => {
    vi.clearAllMocks()
    isCloudEdition = true
-    psPartnerKey = undefined
-    psClickId = undefined
  })

  it('should call saveOrUpdate once on mount when running in cloud edition', () => {
@@ -48,16 +42,4 @@ describe('PartnerStackCookieRecorder', () => {

    expect(container.innerHTML).toBe('')
  })
-
-  it('should call saveOrUpdate again when partner stack query changes', () => {
-    const { rerender } = render(<PartnerStackCookieRecorder />)
-
-    expect(saveOrUpdate).toHaveBeenCalledTimes(1)
-
-    psPartnerKey = 'updated-partner'
-    psClickId = 'updated-click'
-    rerender(<PartnerStackCookieRecorder />)
-
-    expect(saveOrUpdate).toHaveBeenCalledTimes(2)
-  })
 })
--- a/web/app/components/billing/partner-stack/cookie-recorder.tsx
+++ b/web/app/components/billing/partner-stack/cookie-recorder.tsx
@@ -5,13 +5,13 @@ import { IS_CLOUD_EDITION } from '@/config'
 import usePSInfo from './use-ps-info'

 const PartnerStackCookieRecorder = () => {
-  const { psPartnerKey, psClickId, saveOrUpdate } = usePSInfo()
+  const { saveOrUpdate } = usePSInfo()

  useEffect(() => {
    if (!IS_CLOUD_EDITION)
      return
    saveOrUpdate()
-  }, [psPartnerKey, psClickId, saveOrUpdate])
+  }, [saveOrUpdate])

  return null
 }
--- a/web/app/components/billing/partner-stack/index.tsx
+++ b/web/app/components/billing/partner-stack/index.tsx
@@ -6,7 +6,7 @@ import { IS_CLOUD_EDITION } from '@/config'
 import usePSInfo from './use-ps-info'

 const PartnerStack: FC = () => {
-  const { psPartnerKey, psClickId, saveOrUpdate, bind } = usePSInfo()
+  const { saveOrUpdate, bind } = usePSInfo()
  useEffect(() => {
    if (!IS_CLOUD_EDITION)
      return
@@ -14,7 +14,7 @@ const PartnerStack: FC = () => {
    saveOrUpdate()
    // bind PartnerStack info after user logged in
    bind()
-  }, [psPartnerKey, psClickId, saveOrUpdate, bind])
+  }, [saveOrUpdate, bind])

  return null
 }
--- a/web/app/components/billing/partner-stack/use-ps-info.ts
+++ b/web/app/components/billing/partner-stack/use-ps-info.ts
@@ -27,8 +27,6 @@ const usePSInfo = () => {
  const domain = globalThis.location?.hostname.replace('cloud', '')

  const saveOrUpdate = useCallback(() => {
-    if (hasBind)
-      return
    if (!psPartnerKey || !psClickId)
      return
    if (!isPSChanged)
@@ -41,7 +39,7 @@ const usePSInfo = () => {
      path: '/',
      domain,
    })
-  }, [psPartnerKey, psClickId, isPSChanged, domain, hasBind])
+  }, [psPartnerKey, psClickId, isPSChanged, domain])

  const bind = useCallback(async () => {
    if (psPartnerKey && psClickId && !hasBind) {