refactor(channel repos): 拆分sqlalchemy导入并简化多行语句
1. 将分散的sqlalchemy导入拆分为单独行,统一导入格式 2. 简化channel_outbox_repository中的多行select语句为一行 3. 删除无用的空行注释
This commit is contained in:
parent
d38f325577
commit
6d3cf3fedd
@ -30,7 +30,9 @@ from __future__ import annotations
|
|||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from sqlalchemy import delete as sa_delete, func, select, update as sa_update
|
from sqlalchemy import delete as sa_delete
|
||||||
|
from sqlalchemy import func, select
|
||||||
|
from sqlalchemy import update as sa_update
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
from yuxi.utils.datetime_utils import utc_now_naive
|
from yuxi.utils.datetime_utils import utc_now_naive
|
||||||
|
|||||||
@ -6,7 +6,8 @@ from __future__ import annotations
|
|||||||
import datetime as dt
|
import datetime as dt
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from sqlalchemy import delete as sa_delete, func, select
|
from sqlalchemy import delete as sa_delete
|
||||||
|
from sqlalchemy import func, select
|
||||||
|
|
||||||
from yuxi.repositories.channels.base import BaseRepository
|
from yuxi.repositories.channels.base import BaseRepository
|
||||||
from yuxi.storage.postgres.models_channels import ChannelAuditLog
|
from yuxi.storage.postgres.models_channels import ChannelAuditLog
|
||||||
|
|||||||
@ -6,7 +6,8 @@ from __future__ import annotations
|
|||||||
import datetime as dt
|
import datetime as dt
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from sqlalchemy import delete as sa_delete, select, update
|
from sqlalchemy import delete as sa_delete
|
||||||
|
from sqlalchemy import select, update
|
||||||
|
|
||||||
from yuxi.repositories.channels.base import BaseRepository
|
from yuxi.repositories.channels.base import BaseRepository
|
||||||
from yuxi.storage.postgres.models_channels import ChannelIdempotency
|
from yuxi.storage.postgres.models_channels import ChannelIdempotency
|
||||||
|
|||||||
@ -235,11 +235,7 @@ class ChannelOutboxRepository(BaseRepository):
|
|||||||
limit: 返回数量上限。
|
limit: 返回数量上限。
|
||||||
before: 仅返回 ``updated_at`` 早于此时间的条目(可选)。
|
before: 仅返回 ``updated_at`` 早于此时间的条目(可选)。
|
||||||
"""
|
"""
|
||||||
stmt = (
|
stmt = select(ChannelOutboxEntry).where(ChannelOutboxEntry.status == "failed").where(self._not_deleted())
|
||||||
select(ChannelOutboxEntry)
|
|
||||||
.where(ChannelOutboxEntry.status == "failed")
|
|
||||||
.where(self._not_deleted())
|
|
||||||
)
|
|
||||||
if before is not None:
|
if before is not None:
|
||||||
stmt = stmt.where(ChannelOutboxEntry.updated_at < before)
|
stmt = stmt.where(ChannelOutboxEntry.updated_at < before)
|
||||||
stmt = stmt.order_by(ChannelOutboxEntry.updated_at.asc()).limit(limit)
|
stmt = stmt.order_by(ChannelOutboxEntry.updated_at.asc()).limit(limit)
|
||||||
|
|||||||
@ -12,7 +12,6 @@ from yuxi.repositories.channels.base import BaseRepository
|
|||||||
from yuxi.storage.postgres.models_channels import ChannelAccount, ChannelSession
|
from yuxi.storage.postgres.models_channels import ChannelAccount, ChannelSession
|
||||||
from yuxi.utils.datetime_utils import utc_now_naive
|
from yuxi.utils.datetime_utils import utc_now_naive
|
||||||
|
|
||||||
|
|
||||||
# 僵尸会话阈值:最近消息时间早于该天数视为僵尸会话(仅未关闭)
|
# 僵尸会话阈值:最近消息时间早于该天数视为僵尸会话(仅未关闭)
|
||||||
_ZOMBIE_SESSION_DAYS = 7
|
_ZOMBIE_SESSION_DAYS = 7
|
||||||
|
|
||||||
|
|||||||
@ -4,10 +4,10 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from datetime import UTC, datetime
|
from datetime import UTC, datetime
|
||||||
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from sqlalchemy import case, delete as sa_delete, func, select
|
from sqlalchemy import case, func, select
|
||||||
|
from sqlalchemy import delete as sa_delete
|
||||||
|
|
||||||
from yuxi.repositories.channels.base import BaseRepository
|
from yuxi.repositories.channels.base import BaseRepository
|
||||||
from yuxi.storage.postgres.models_channels import ChannelContentReviewRecord
|
from yuxi.storage.postgres.models_channels import ChannelContentReviewRecord
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user