From 62c0f46dc4af292ff29effcb52a28ec80bae2a44 Mon Sep 17 00:00:00 2001
From: huanghuoguoguo <1051233107@qq.com>
Date: Tue, 27 Oct 2026 11:19:44 +0800
Subject: [PATCH] perf(persistence): avoid formatting missing SQL attribute
 errors (#2776)

---
 src/langbot/pkg/persistence/tenant_uow.py     | 27 +++++++++++++----
 .../unit_tests/persistence/test_tenant_uow.py | 29 +++++++++++++++++++
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/langbot/pkg/persistence/tenant_uow.py b/src/langbot/pkg/persistence/tenant_uow.py
index e8ca31765..51974d66a 100644
--- a/src/langbot/pkg/persistence/tenant_uow.py
+++ b/src/langbot/pkg/persistence/tenant_uow.py
@@ -235,6 +235,23 @@ _ALLOWED_SCOPED_POST_VALUES_TYPES = (
 )
 
 
+_SQLALCHEMY_COLUMN_GETATTR = sqlalchemy.sql.elements.ColumnElement.__getattr__
+
+
+def _scoped_sql_attribute(value: typing.Any, name: str, default: typing.Any = None) -> typing.Any:
+    """Read live SQL attributes without formatting SQLAlchemy's missing-attribute errors."""
+
+    if getattr(type(value), '__getattr__', None) is not _SQLALCHEMY_COLUMN_GETATTR:
+        return getattr(value, name, default)
+    try:
+        return type(value).__getattribute__(value, name)
+    except AttributeError:
+        try:
+            return getattr(value.comparator, name, default)
+        except AttributeError:
+            return default
+
+
 def _collect_embedded_clause_elements(value: typing.Any) -> list[sqlalchemy.sql.elements.ClauseElement]:
     """Find executable expressions in SQLAlchemy containers omitted by visitors."""
 
@@ -360,7 +377,7 @@ def _iter_scoped_statement_elements(
         children = [
             child for child in element.get_children() if isinstance(child, sqlalchemy.sql.elements.ClauseElement)
         ]
-        post_values_clause = getattr(element, '_post_values_clause', None)
+        post_values_clause = _scoped_sql_attribute(element, '_post_values_clause', None)
         if post_values_clause is not None:
             if not isinstance(post_values_clause, _ALLOWED_SCOPED_POST_VALUES_TYPES):
                 raise ScopedSessionTransactionError(
@@ -368,7 +385,7 @@ def _iter_scoped_statement_elements(
                 )
             children.append(post_values_clause)
 
-        children.extend(_collect_multi_value_elements(getattr(element, '_multi_values', ())))
+        children.extend(_collect_multi_value_elements(_scoped_sql_attribute(element, '_multi_values', ())))
 
         if isinstance(element, _ALLOWED_SCOPED_POST_VALUES_TYPES):
             if getattr(element, 'constraint_target', None) is not None:
@@ -439,12 +456,12 @@ def _validate_scoped_statement_call(args: tuple[typing.Any, ...], kwargs: dict[s
             )
 
         for identifier_attribute in ('name', 'schema', 'collation'):
-            identifier = getattr(element, identifier_attribute, None)
+            identifier = _scoped_sql_attribute(element, identifier_attribute, None)
             if isinstance(identifier, sqlalchemy.sql.elements.quoted_name) and identifier.quote is False:
                 raise ScopedSessionTransactionError('TenantUnitOfWork does not allow forced-unquoted SQL identifiers')
 
         if any(
-            getattr(element, attribute_name, None)
+            _scoped_sql_attribute(element, attribute_name, None)
             for attribute_name in (
                 '_prefixes',
                 '_suffixes',
@@ -526,7 +543,7 @@ def _validate_scoped_statement_call(args: tuple[typing.Any, ...], kwargs: dict[s
                 )
 
         for operator_attribute in ('operator', 'modifier'):
-            operator = getattr(element, operator_attribute, None)
+            operator = _scoped_sql_attribute(element, operator_attribute, None)
             if not isinstance(operator, sqlalchemy.sql.operators.custom_op):
                 continue
             operator_name = str(operator.opstring)
diff --git a/tests/unit_tests/persistence/test_tenant_uow.py b/tests/unit_tests/persistence/test_tenant_uow.py
index 9a8b1c827..44fa30b69 100644
--- a/tests/unit_tests/persistence/test_tenant_uow.py
+++ b/tests/unit_tests/persistence/test_tenant_uow.py
@@ -1219,3 +1219,32 @@ async def test_after_commit_task_is_cancelled_and_coroutine_closed_on_rollback(t
         assert coro.cr_frame is None
     finally:
         await engine.dispose()
+
+
+@pytest.mark.parametrize('source', ['instance', 'comparator'])
+async def test_scoped_statement_revalidates_mutated_optional_attributes(source) -> None:
+    expression = sa.literal(1)
+    statement = sa.select(expression)
+    _validate_scoped_statement_call((statement,), {})
+    if source == 'instance':
+        expression._suffixes = ('unsafe SQL',)
+    else:
+        expression.comparator = SimpleNamespace(_suffixes=('unsafe SQL',))
+    with pytest.raises(ScopedSessionTransactionError, match='textual statement modifiers'):
+        _validate_scoped_statement_call((statement,), {})
+
+
+async def test_scoped_statement_retains_custom_attribute_fallback(monkeypatch) -> None:
+    expression = sa.literal(1)
+    statement = sa.select(expression)
+    _validate_scoped_statement_call((statement,), {})
+    original = sa.sql.elements.ColumnElement.__getattr__
+
+    def changed_attribute(self, name):
+        if name == '_suffixes':
+            return ('unsafe SQL',)
+        return original(self, name)
+
+    monkeypatch.setattr(sa.sql.elements.ColumnElement, '__getattr__', changed_attribute)
+    with pytest.raises(ScopedSessionTransactionError, match='textual statement modifiers'):
+        _validate_scoped_statement_call((statement,), {})