sync update from LAN repo (source dhk-1 @ 3e87be55)
This commit is contained in:
1 parent
ab6068a7c1
commit
42f2a26fa8
1482 files changed
+227759
-9584
No files matched your search
@@ -319,9 +319,17 @@ async def list_wiki_pages(
|
||||
page_type: str | None = Query(default=None),
|
||||
limit: int = Query(default=100, ge=1, le=500),
|
||||
offset: int = Query(default=0, ge=0),
|
||||
include_content: bool = Query(default=True),
|
||||
) -> dict[str, Any]:
|
||||
await _actor(request)
|
||||
pages = await _store(request).list_pages(base_id=base_id, query=q, page_type=page_type, limit=limit + 1, offset=offset)
|
||||
pages = await _store(request).list_pages(
|
||||
base_id=base_id,
|
||||
query=q,
|
||||
page_type=page_type,
|
||||
limit=limit + 1,
|
||||
offset=offset,
|
||||
include_content=include_content,
|
||||
)
|
||||
return {"pages": pages[:limit], "total": min(len(pages), limit), "next_offset": offset + limit if len(pages) > limit else None}
|
||||
|
||||
|
||||
@@ -534,9 +542,22 @@ async def import_weknora_package_file(
|
||||
assistant_base_id: str | None = Form(default=None),
|
||||
) -> dict[str, Any]:
|
||||
actor = await _actor(request, admin=True)
|
||||
store = _store(request)
|
||||
target_base = await store.get_base(assistant_base_id)
|
||||
if target_base is not None:
|
||||
active_jobs = await store.list_jobs(limit=100, base_id=target_base["id"])
|
||||
if any(
|
||||
job.get("trigger") == "manual_package_upload"
|
||||
and job.get("status") in {"queued", "running"}
|
||||
for job in active_jobs
|
||||
):
|
||||
raise HTTPException(
|
||||
status_code=409,
|
||||
detail="当前助手知识库已有数据包导入任务,请等待任务完成;无需再次上传",
|
||||
)
|
||||
upload_id = str(uuid4())
|
||||
filename = (file.filename or "weknora-assistant-knowledge.jsonl").strip()
|
||||
job = await _store(request).create_queued_import_job(
|
||||
job = await store.create_queued_import_job(
|
||||
source_type="weknora",
|
||||
source_key=f"upload:{upload_id}",
|
||||
source_name=filename,
|
||||
@@ -563,12 +584,12 @@ async def import_weknora_package_file(
|
||||
size += len(chunk)
|
||||
await asyncio.to_thread(handle.write, chunk)
|
||||
except Exception as exc:
|
||||
await _store(request).update_import_job(str(job["id"]), status="failed", phase="upload_failed", error=str(exc), completed=True)
|
||||
await store.update_import_job(str(job["id"]), status="failed", phase="upload_failed", error=str(exc), completed=True)
|
||||
raise
|
||||
finally:
|
||||
await file.close()
|
||||
if size <= 0:
|
||||
await _store(request).update_import_job(
|
||||
await store.update_import_job(
|
||||
str(job["id"]),
|
||||
status="failed",
|
||||
phase="failed",
|
||||
@@ -576,7 +597,7 @@ async def import_weknora_package_file(
|
||||
completed=True,
|
||||
)
|
||||
raise HTTPException(status_code=422, detail="上传文件为空")
|
||||
await _store(request).update_import_job(
|
||||
await store.update_import_job(
|
||||
str(job["id"]),
|
||||
status="queued",
|
||||
phase="queued",
|
||||
@@ -821,8 +842,16 @@ async def _ensure_local_wiki_vectors_for_export(
|
||||
) -> None:
|
||||
mapping_id = str(mapping.get("id") or mapping.get("knowledge_base_id") or "")
|
||||
service = getattr(request.app.state, "llmwiki_sync_service", None)
|
||||
if service is None or not mapping_id:
|
||||
if not mapping_id:
|
||||
raise RuntimeError("请先配置 Wiki 编码模型并启用本地向量索引,再生成向量数据包")
|
||||
if service is None:
|
||||
# Exporting an existing snapshot does not require an encoder. The
|
||||
# snapshot already records its model fingerprint and dimensions, so a
|
||||
# deployment that encoded online (or later disabled the encoder) can
|
||||
# still package those vectors without silently re-encoding them.
|
||||
if await _has_local_wiki_vectors_for_export(request, mapping_id):
|
||||
return
|
||||
raise RuntimeError("当前知识库没有可导出的本地 Wiki 向量;请先完成向量同步")
|
||||
# Refresh remote metadata/content hashes even when the previous generation
|
||||
# was complete. Unchanged articles reuse their existing vectors.
|
||||
sync_mapping = dict(mapping)
|
||||
@@ -857,6 +886,17 @@ async def _import_package_file_for_job(
|
||||
created_by=actor,
|
||||
mirror_to_global=True,
|
||||
)
|
||||
except asyncio.CancelledError:
|
||||
await asyncio.shield(
|
||||
store.update_import_job(
|
||||
job_id,
|
||||
status="failed",
|
||||
phase="interrupted",
|
||||
error="服务停止,数据包导入已中断,请重新发起",
|
||||
completed=True,
|
||||
)
|
||||
)
|
||||
raise
|
||||
except Exception as exc: # noqa: BLE001
|
||||
logger.exception("Assistant knowledge package import failed: job=%s", job_id)
|
||||
await store.update_import_job(
|
||||
@@ -900,6 +940,17 @@ async def _export_weknora_then_import_for_job(
|
||||
)
|
||||
await store.update_import_job(job_id, status="running", phase="package_ready", counts=counts)
|
||||
await _import_package_file_for_job(request=request, job_id=job_id, path=path, actor=actor)
|
||||
except asyncio.CancelledError:
|
||||
await asyncio.shield(
|
||||
store.update_import_job(
|
||||
job_id,
|
||||
status="failed",
|
||||
phase="interrupted",
|
||||
error="服务停止,知识库导出已中断,请重新发起",
|
||||
completed=True,
|
||||
)
|
||||
)
|
||||
raise
|
||||
except Exception as exc: # noqa: BLE001
|
||||
logger.exception("Assistant knowledge WeKnora export failed: job=%s", job_id)
|
||||
await store.update_import_job(
|
||||
@@ -984,6 +1035,15 @@ async def _export_weknora_package_only_job(
|
||||
phase="package_ready",
|
||||
counts=counts,
|
||||
)
|
||||
except asyncio.CancelledError:
|
||||
_write_export_manifest(
|
||||
job_id=job_id,
|
||||
mapping_id=mapping_id,
|
||||
status="failed",
|
||||
phase="interrupted",
|
||||
error="服务停止,数据包导出已中断,请重新发起",
|
||||
)
|
||||
raise
|
||||
except Exception as exc: # noqa: BLE001
|
||||
logger.exception("WeKnora vectorized export package failed: mapping=%s job=%s", mapping_id, job_id)
|
||||
_write_export_manifest(
|
||||
|
||||
Reference in new issue
Block a user