fix: API 全部改用显式两步走 await session.execute + result.scalars()

之前 (await ...).scalars() 链式在 SQLAlchemy 2.0 async 下报
'coroutine' has no attribute 'scalars' 错误。改为先 await 拿 result
再 .scalars(),这是 SQLAlchemy 2.0 推荐的 async 写法。
This commit is contained in:
Mavis
2026-06-07 23:22:56 +08:00
parent 2e75985a3c
commit 5109d6f824
8 changed files with 147 additions and 36 deletions

View File

@@ -29,7 +29,9 @@ router = APIRouter(prefix="/admin", tags=["admin"], dependencies=[Depends(requir
# === Source CRUD ===
@router.get("/sources", response_model=list[SourceOut])
async def list_sources_all(session: AsyncSession = Depends(get_session)):
rows = (await session.execute(select(Source).order_by(Source.id))).scalars()
result = await session.execute(select(Source).order_by(Source.id))
rows = result.scalars()
return [SourceOut.model_validate(s) for s in rows]
@@ -65,7 +67,7 @@ async def update_source(
body: SourceUpdate,
session: AsyncSession = Depends(get_session),
):
src = (await session.execute(select(Source).where(Source.id == source_id))).scalar_one_or_none()
result = await session.execute(select(Source).where(Source.id == source_id))).scalar_one_or_none()
if not src:
raise HTTPException(status.HTTP_404_NOT_FOUND, "Source not found")
for k, v in body.model_dump(exclude_unset=True).items():
@@ -155,7 +157,8 @@ class HealthOut(BaseModel):
@router.get("/health", response_model=list[HealthOut])
async def health(session: AsyncSession = Depends(get_session)):
rows = (await session.execute(select(Source).order_by(Source.priority.desc()))).scalars()
result = await session.execute(select(Source).order_by(Source.priority.desc()))
rows = result.scalars()
out: list[HealthOut] = []
for s in rows:
c24 = (

View File

@@ -34,11 +34,8 @@ def _pair_for(user: User) -> TokenPair:
@router.post("/login", response_model=TokenPair)
async def login(body: LoginRequest, session: AsyncSession = Depends(get_session)):
user = (
await session.execute(select(User).where(User.username == body.username))
.scalars()
.first()
)
result = await session.execute(select(User).where(User.username == body.username))
user = result.scalars().first()
if not user or not user.is_active or not verify_password(body.password, user.password_hash):
raise HTTPException(status.HTTP_401_UNAUTHORIZED, "Invalid credentials")
user.last_login_at = datetime.now(timezone.utc)
@@ -55,11 +52,8 @@ async def refresh(body: RefreshRequest, session: AsyncSession = Depends(get_sess
uid = int(payload["sub"])
except (InvalidTokenError, KeyError, ValueError):
raise HTTPException(status.HTTP_401_UNAUTHORIZED, "Invalid refresh token")
user = (
await session.execute(select(User).where(User.id == uid, User.is_active.is_(True)))
.scalars()
.first()
)
result = await session.execute(select(User).where(User.id == uid, User.is_active.is_(True)))
user = result.scalars().first()
if not user:
raise HTTPException(status.HTTP_401_UNAUTHORIZED, "User not found")
return _pair_for(user)

View File

@@ -65,9 +65,8 @@ async def list_mine(
user: User = Depends(get_current_user),
session: AsyncSession = Depends(get_session),
):
rows = (
await session.execute(
select(Bookmark).where(Bookmark.user_id == user.id).order_by(Bookmark.created_at.desc())
)
).scalars()
result = await session.execute(
select(Bookmark).where(Bookmark.user_id == user.id).order_by(Bookmark.created_at.desc())
)
rows = result.scalars()
return [BookmarkOut.model_validate(b) for b in rows]

View File

@@ -19,7 +19,6 @@ async def list_sources(
user: User = Depends(get_current_user), # noqa: ARG001
session: AsyncSession = Depends(get_session),
):
rows = (
await session.execute(select(Source).order_by(Source.priority.desc(), Source.name))
).scalars()
result = await session.execute(select(Source).order_by(Source.priority.desc(), Source.name))
rows = result.scalars()
return [SourceOut.model_validate(s) for s in rows]

View File

@@ -38,13 +38,12 @@ async def list_mine(
user: User = Depends(get_current_user),
session: AsyncSession = Depends(get_session),
):
rows = (
await session.execute(
select(Subscription)
.where(Subscription.user_id == user.id)
.order_by(Subscription.created_at.desc())
)
).scalars()
result = await session.execute(
select(Subscription)
.where(Subscription.user_id == user.id)
.order_by(Subscription.created_at.desc())
)
rows = result.scalars()
return [SubscriptionOut.model_validate(s) for s in rows]