style: auto-format with ruff [skip ci]

This commit is contained in:
GitHub Actions 2026-04-24 11:42:53 +00:00
parent 743b5b03c4
commit a3dd2c96fe
2 changed files with 13 additions and 20 deletions

View File

@ -21,9 +21,7 @@ def _ensure_punkt_tab() -> None:
try:
nltk.data.find("tokenizers/punkt_tab")
except LookupError as e:
raise RuntimeError(
"缺少 NLTK 资源 punkt_tab。请先执行: python -m nltk.downloader punkt_tab"
) from e
raise RuntimeError("缺少 NLTK 资源 punkt_tab。请先执行: python -m nltk.downloader punkt_tab") from e
_punkt_checked = True
@ -122,7 +120,10 @@ def find_best_num_clusters(embeddings: Any, min_clusters: int = 2, max_clusters:
def semantic_chunking_with_auto_clusters(
text: str, embed_fn: Callable[[list[str]], Any] | None, token_count_fn: Callable[[str], int], max_chunk_size: int = 512
text: str,
embed_fn: Callable[[list[str]], Any] | None,
token_count_fn: Callable[[str], int],
max_chunk_size: int = 512,
) -> list[str]:
"""
对传入的文本进行语义切分过程中会自动选择最佳的聚集数量

View File

@ -475,10 +475,7 @@ async def find_user_by_oidc_sub(db, sub: str) -> User | None:
# 方法1: 检查是否有用户的 user_id 直接等于 "oidc:{sub}"(标准 OIDC 用户)
standard_oidc_user_id = f"oidc:{sub}"
# 占位绑定记录会被标记为 is_deleted=1但我们仍需要查询它们来获取绑定关系
result = await db.execute(select(User).filter(
User.user_id == standard_oidc_user_id,
User.is_deleted == 0
))
result = await db.execute(select(User).filter(User.user_id == standard_oidc_user_id, User.is_deleted == 0))
user = result.scalar_one_or_none()
if user:
return user
@ -486,10 +483,9 @@ async def find_user_by_oidc_sub(db, sub: str) -> User | None:
# 方法2: 检查是否有绑定占位用户格式: "oidc:{sub}:{target_user_id}"use_raw_username 绑定记录)
# 绑定占位用户被标记为 is_deleted=1需要包括deleted来查询
legacy_result = await db.execute(
select(User).filter(
User.user_id.like(f"{standard_oidc_user_id}:%"),
User.is_deleted.in_([0, 1])
).order_by(User.id.asc())
select(User)
.filter(User.user_id.like(f"{standard_oidc_user_id}:%"), User.is_deleted.in_([0, 1]))
.order_by(User.id.asc())
)
legacy_users = list(legacy_result.scalars().all())
if legacy_users:
@ -528,10 +524,7 @@ async def find_deleted_oidc_user_by_sub(db, sub: str) -> User | None:
# 检查绑定占位格式 oidc:{sub}:{target_user_id}占位本身是deleted需要查询目标用户
legacy_result = await db.execute(
select(User).filter(
User.user_id.like(f"{oidc_user_id}:%"),
User.is_deleted == 1
).order_by(User.id.asc())
select(User).filter(User.user_id.like(f"{oidc_user_id}:%"), User.is_deleted == 1).order_by(User.id.asc())
)
legacy_users = list(legacy_result.scalars().all())
if legacy_users:
@ -585,6 +578,7 @@ async def _create_oidc_binding_placeholder(db, sub: str, target_user: User) -> N
# username 使用 oidc-binding-{sub_hash} 避免冲突sub_hash 基于完整 sub 生成
import hashlib
sub_hash = hashlib.sha256(sub.encode()).hexdigest()[:8]
username = f"oidc-binding-{sub_hash}"
@ -604,8 +598,7 @@ async def _create_oidc_binding_placeholder(db, sub: str, target_user: User) -> N
db.add(placeholder_user)
await db.commit()
logger.info(
f"Created OIDC binding placeholder (deleted) for sub {sub} -> "
f"user {target_user.id} ({target_user.user_id})"
f"Created OIDC binding placeholder (deleted) for sub {sub} -> user {target_user.id} ({target_user.user_id})"
)
except IntegrityError:
# 并发创建冲突,回滚后忽略
@ -661,8 +654,7 @@ async def create_oidc_user(db, user_info: dict, department_id: int | None = None
if user_by_sub and user_by_sub.id == existing_user.id:
# sub 已经正确绑定到该用户,允许返回
logger.info(
f"User with raw username {user_id} already exists and "
f"bound to sub {sub}, returning existing user"
f"User with raw username {user_id} already exists and bound to sub {sub}, returning existing user"
)
return existing_user
elif user_by_sub is None: