Files
knowledge-adapter-service/src/knowledge_adapter/weknora_resource_resolver.py
T
姚章浩 693cd952cd feat(asset): 清理被截断的结尾图片引用,修复整单 502
仓库首次入库(此前仅存在于本地工作区与测试服构建产物中,未上传)。

改动(src/knowledge_adapter/asset_content_processor.py):
- 新增 _TRUNCATED_TRAILING_MARKDOWN_RESOURCE_IMAGE 规则,清除 chunk 末尾被截断的
  ![](resource://xxxx 残片(WeKnora 分块在图片引用中间截断时产生,旧逻辑无法匹配完整引用,
  残留 resource:// 触发 ContentProcessingError,导致整单 502)
- 回归测试 tests/test_asset_content_processor.py::
  test_truncated_trailing_markdown_resource_image_is_removed

验证证据:
- 测试服 120.76.217.51,镜像 knowledge-adapter-service:reviewed-test-aeab4b5fca2d
  (release aeab4b5fca2d8661):KB d015d05c-25c8-4d63-b2ab-e8590d3c2dfb 5 个查询全部
  http=200、records=5、残留 resource:// = 0;KB b9dacd62 无退化;容器日志无 error/exception
- 本地:pytest 141 项全通过、ruff 全通过
- 该文件与 258c31e0fe07fd08 源码的差异经逐文件 md5 比对,为唯一变更文件
2026-09-16 10:01:27 +08:00

101 lines
3.2 KiB
Python

from collections.abc import Mapping
from contextlib import AbstractAsyncContextManager
from dataclasses import dataclass
from typing import Any, Protocol
from knowledge_adapter.resource_locator import (
InvalidResourceLocator,
InvalidResourceReference,
parse_oss_object_key,
parse_resource_reference,
)
_RESOURCE_QUERY = """
SELECT tenant_id, storage_backend_id, provider, physical_path, mime_type
FROM resources
WHERE handle = $1
AND tenant_id = $2
AND storage_backend_id = $3
AND provider = 'oss'
AND state = 'active'
AND deleted_at IS NULL
LIMIT 2
"""
@dataclass(frozen=True, slots=True)
class ResolvedAsset:
object_key: str
content_type: str | None
class ResourceResolutionError(RuntimeError):
pass
class ReadonlyConnection(Protocol):
def transaction(self, *, readonly: bool) -> AbstractAsyncContextManager[None]: ...
async def fetch(self, query: str, *args: object) -> list[Mapping[str, Any]]: ...
class ReadonlyPool(Protocol):
def acquire(self) -> AbstractAsyncContextManager[ReadonlyConnection]: ...
class WeKnoraResourceResolver:
def __init__(
self,
*,
pool: ReadonlyPool,
tenant_id: int,
storage_backend_id: str,
bucket: str,
) -> None:
self._pool = pool
self._tenant_id = tenant_id
self._storage_backend_id = storage_backend_id
self._bucket = bucket
async def resolve(self, source_ref: str) -> ResolvedAsset:
try:
handle = parse_resource_reference(source_ref)
except InvalidResourceReference as error:
raise ResourceResolutionError("resource unavailable") from error
try:
async with self._pool.acquire() as connection:
async with connection.transaction(readonly=True):
rows = await connection.fetch(
_RESOURCE_QUERY,
handle,
self._tenant_id,
self._storage_backend_id,
)
except Exception as error:
raise ResourceResolutionError("resource unavailable") from error
if len(rows) != 1:
raise ResourceResolutionError("resource unavailable")
row = rows[0]
if (
row["tenant_id"] != self._tenant_id
or str(row["storage_backend_id"]) != self._storage_backend_id
or row["provider"] != "oss"
):
raise ResourceResolutionError("resource unavailable")
try:
object_key = parse_oss_object_key(
provider=str(row["provider"]),
physical_path=str(row["physical_path"]),
storage_backend_id=str(row["storage_backend_id"]),
expected_storage_backend_id=self._storage_backend_id,
expected_bucket=self._bucket,
)
except InvalidResourceLocator as error:
raise ResourceResolutionError("resource unavailable") from error
mime_type = row["mime_type"]
return ResolvedAsset(
object_key=object_key,
content_type=str(mime_type) if mime_type else None,
)