fix: preserve legacy model query ABI

This commit is contained in:
jxxghp
2026-08-23 01:08:01 +08:00
parent 1c457143f7
commit 5395bbff54
7 changed files with 117 additions and 25 deletions
+41 -11
View File
@@ -5,7 +5,7 @@ from sqlalchemy.orm import Mapped, Session, mapped_column
from datetime import datetime
from app.db.base import Base, get_id_column
from app.db.decorators import db_query, async_db_query
from app.db.decorators import async_db_query, db_query, run_legacy_sync_query
def _get_by_user_id_statement(model: type["PassKey"], user_id: int):
@@ -51,11 +51,26 @@ class PassKey(Base):
transports: Mapped[Optional[str]] = mapped_column(String, nullable=True)
@classmethod
def get_by_user_id(cls, db: Session, user_id: int):
"""获取用户的所有PassKey"""
return list(db.execute(
_get_by_user_id_statement(cls, user_id)
).scalars().all())
def get_by_user_id(
cls,
db: Session | int | None = None,
user_id: int | None = None,
):
"""获取用户的所有 PassKey,并保留无 Session 的旧插件调用方式。"""
if user_id is None and isinstance(db, int):
user_id, db = db, None
if user_id is None:
raise TypeError("user_id is required")
def query(session: Session):
"""在给定会话中执行启用凭证查询。"""
return list(session.execute(
_get_by_user_id_statement(cls, user_id)
).scalars().all())
if isinstance(db, Session):
return query(db)
return run_legacy_sync_query(query)
@classmethod
@async_db_query
@@ -67,11 +82,26 @@ class PassKey(Base):
return list(result.scalars().all())
@classmethod
def get_by_credential_id(cls, db: Session, credential_id: str):
"""根据凭证ID获取PassKey"""
return db.execute(
_get_by_credential_id_statement(cls, credential_id)
).scalars().first()
def get_by_credential_id(
cls,
db: Session | str | None = None,
credential_id: str | None = None,
):
"""按凭证 ID 获取 PassKey,并保留无 Session 的旧插件调用方式。"""
if credential_id is None and isinstance(db, str):
credential_id, db = db, None
if credential_id is None:
raise TypeError("credential_id is required")
def query(session: Session):
"""在给定会话中执行启用凭证查询。"""
return session.execute(
_get_by_credential_id_statement(cls, credential_id)
).scalars().first()
if isinstance(db, Session):
return query(db)
return run_legacy_sync_query(query)
@classmethod
@async_db_query