merge main: 解决 .gitignore 冲突(合并部署文档忽略规则)

This commit is contained in:
2026-10-11 13:47:47 +08:00
3 changed files with 10 additions and 7 deletions
+3
View File
@@ -54,3 +54,6 @@ review_service/data/reformat_jobs/
review_service/tools/tectonic
review_service/data/tectonic-cache/
review_service/data/format_cache/
# 部署方案文档(含主机凭据,不入库)
docs/DEPLOY_PAPER_176.md
+5 -5
View File
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# 渲染 active_library.env:读 <库目录>/manifest.yaml,输出五触点 env。
# 用法: render_active_library_env.sh <manifest.yaml> <输出文件>
# config 类路径:manifest 值为相对路径(如 configs/rag/entity_alias.yaml)时渲染为 $QA_ROOT/<值>;
# 为空时回退 $QA_ROOT/configs/rag/<缺省文件名>。registry_path 为空则整行省略。
# config 类路径:manifest 值为相对路径(如 configs/rag/entity_alias.yaml)时渲染为 $GENE_FAMILY_ROOT/<值>;
# 为空时回退 $GENE_FAMILY_ROOT/configs/rag/<缺省文件名>。registry_path 为空则整行省略。
set -euo pipefail
MANIFEST="$1"; OUT="$2"
release_id="$(awk -F': *' '/^release_id:/ {gsub(/[" ]/, "", $2); print $2; exit}' "$MANIFEST")"
@@ -15,8 +15,8 @@ tmp="$OUT.tmp"
{
echo "NORMALIZED_RELEASE_ID=$release_id"
echo "V15_QDRANT_COLLECTION=${collection:-$release_id}"
[ -n "$alias_cfg" ] && echo "QA_V1_ALIAS_CONFIG=\$QA_ROOT/$alias_cfg" || echo "QA_V1_ALIAS_CONFIG=\$QA_ROOT/configs/rag/entity_alias.yaml"
[ -n "$tax_cfg" ] && echo "QA_V1_TAXONOMY_CONFIG=\$QA_ROOT/$tax_cfg" || echo "QA_V1_TAXONOMY_CONFIG=\$QA_ROOT/configs/rag/relation_taxonomy.yaml"
[ -n "$registry" ] && echo "QA_PAPER_METADATA_REGISTRY=\$QA_ROOT/$registry"
[ -n "$alias_cfg" ] && echo "QA_V1_ALIAS_CONFIG=\$GENE_FAMILY_ROOT/$alias_cfg" || echo "QA_V1_ALIAS_CONFIG=\$GENE_FAMILY_ROOT/configs/rag/entity_alias.yaml"
[ -n "$tax_cfg" ] && echo "QA_V1_TAXONOMY_CONFIG=\$GENE_FAMILY_ROOT/$tax_cfg" || echo "QA_V1_TAXONOMY_CONFIG=\$GENE_FAMILY_ROOT/configs/rag/relation_taxonomy.yaml"
[ -n "$registry" ] && echo "QA_PAPER_METADATA_REGISTRY=\$GENE_FAMILY_ROOT/$registry"
} > "$tmp"
mv "$tmp" "$OUT"
+2 -2
View File
@@ -57,7 +57,7 @@ export const STAGE_PHASE = {
export const BENCH_TABS = [
{ key: 'retrieval', label: '检索过程' },
{ key: 'sources', label: '文献来源' },
{ key: 'extract', label: '提取任务' },
{ key: 'extract', label: '上传文献' },
{ key: 'kg', label: '知识图谱' },
];
@@ -124,7 +124,7 @@ export const T = {
citationError: '引用校验失败,请重试',
qaDown: '知识问答服务当前不可用,请稍后重试',
kgDown: '知识图谱服务离线,实体搜索与邻域浏览暂不可用',
extractionDown: '提取任务服务离线',
extractionDown: '上传文献服务离线',
sourcesTitle: '文献来源',
sourceEmpty: '本次检索未命中文献',
retrievalEmpty: '发起提问后,这里会实时展示检索过程',