Commit b423bf43917f8d3597608f71118209cb1b44553a

Authored by tangwang
1 parent dc22700d

测试环境配置:关闭reranker,其余的都打开,对接本机es docker内的19200

@@ -42,3 +42,38 @@ RERANK_DASHSCOPE_API_KEY_CN=sk-c3b8d4db061840aa8effb748df2a997b @@ -42,3 +42,38 @@ RERANK_DASHSCOPE_API_KEY_CN=sk-c3b8d4db061840aa8effb748df2a997b
42 RERANK_DASHSCOPE_API_KEY_US=sk-482cc3ff37a8467dab134a7a46830556 42 RERANK_DASHSCOPE_API_KEY_US=sk-482cc3ff37a8467dab134a7a46830556
43 43
44 OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0 44 OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0
  45 +
  46 +# ===== test env overrides (2026-04-12) =====
  47 +RUNTIME_ENV=test
  48 +ES_INDEX_NAMESPACE=test_
  49 +ES_HOST=http://127.0.0.1:19200
  50 +ES_USERNAME=
  51 +ES_PASSWORD=
  52 +ES_DOCKER_HTTP_PORT=19200
  53 +ES_DOCKER_CONTAINER_NAME=saas-search-es9-test
  54 +HF_CACHE_DIR=/data/tw/.cache/huggingface
  55 +TEI_CONTAINER_NAME=saas-search-tei-test
  56 +TEI_MAX_BATCH_TOKENS=2048
  57 +TEI_MAX_CLIENT_BATCH_SIZE=8
  58 +BACKEND_PROXY_URL=http://127.0.0.1:6002
  59 +
  60 +# ===== test env connectivity overrides (2026-04-12) =====
  61 +REDIS_HOST=127.0.0.1
  62 +REDIS_PORT=6479
  63 +REDIS_PASSWORD=BMfv5aI31kgHWtlx
  64 +DB_HOST=120.79.247.228
  65 +DB_PORT=3316
  66 +DB_DATABASE=saas
  67 +DB_USERNAME=saas
  68 +DB_PASSWORD=pcjY7iwX1C6le1oz
  69 +# ===== test env embedding alignment overrides (2026-04-12 23:xx) =====
  70 +TEI_IMAGE=ghcr.m.daocloud.io/huggingface/text-embeddings-inference:cpu-1.9
  71 +TEI_PORT=8080
  72 +TEI_DEVICE=cpu
  73 +TEI_DTYPE=float32
  74 +TEI_MODEL_ID=/data/hub/models--BAAI--bge-m3/snapshots/5617a9f61b028005a4858fdac845db406aefb181
  75 +TEI_HEALTH_TIMEOUT_SEC=240
  76 +CNCLIP_DEVICE=cpu
  77 +CNCLIP_MODEL_NAME=CN-CLIP/ViT-L-14
  78 +EMBEDDING_VENV=/home/tw/saas-search/.venv-cnclip
  79 +TRANSLATOR_VENV=/home/tw/saas-search/.venv
.env.backup.20260412-test-small-gpu 0 → 100644
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
  1 +# Elasticsearch Configuration
  2 +# ES_HOST=http://120.76.41.98:9200
  3 +# ES_USERNAME=essa
  4 +ES_HOST=http://localhost:9200
  5 +ES_USERNAME=saas
  6 +ES_PASSWORD=4hOaLaf41y2VuI8y
  7 +
  8 +# Redis Configuration (Optional) - AI 生产 10.200.16.14:6479
  9 +REDIS_HOST=10.200.16.14
  10 +REDIS_PORT=6479
  11 +REDIS_PASSWORD=dxEkegEZ@C5SXWKv
  12 +
  13 +# DeepL Translation API
  14 +DEEPL_AUTH_KEY=c9293ab4-ad25-479b-919f-ab4e63b429ed
  15 +
  16 +# API Service Configuration
  17 +API_HOST=0.0.0.0
  18 +API_PORT=6002
  19 +
  20 +# MySQL Database Configuration (Shoplazza) - AI 生产 10.200.16.14:3316
  21 +DB_HOST=10.200.16.14
  22 +DB_PORT=3316
  23 +DB_DATABASE=saas
  24 +DB_USERNAME=root
  25 +DB_PASSWORD=qY8tgodLoA&KT#yQ
  26 +
  27 +# Model Directories
  28 +TEXT_MODEL_DIR=/data/tw/models/bge-m3 # 已经改为web请求了,不使用本地模型
  29 +IMAGE_MODEL_DIR=/data/tw/models/cn-clip # 已经改为web请求了,不使用本地模型
  30 +
  31 +# Cache Directory
  32 +CACHE_DIR=.cache
  33 +
  34 +# Frontend API Base URL
  35 +API_BASE_URL=http://43.166.252.75:6002
  36 +
  37 +
  38 +# 通用 DashScope key(翻译/内容理解等模块)
  39 +DASHSCOPE_API_KEY=sk-482cc3ff37a8467dab134a7a46830556
  40 +# Reranker 专用 key(按地域)
  41 +RERANK_DASHSCOPE_API_KEY_CN=sk-c3b8d4db061840aa8effb748df2a997b
  42 +RERANK_DASHSCOPE_API_KEY_US=sk-482cc3ff37a8467dab134a7a46830556
  43 +
  44 +OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0
.env.bak.20260413100641 0 → 100644
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
  1 +# Elasticsearch Configuration
  2 +# ES_HOST=http://120.76.41.98:9200
  3 +# ES_USERNAME=essa
  4 +ES_HOST=http://localhost:9200
  5 +ES_USERNAME=saas
  6 +ES_PASSWORD=4hOaLaf41y2VuI8y
  7 +
  8 +# Redis Configuration (Optional) - AI 生产 10.200.16.14:6479
  9 +REDIS_HOST=10.200.16.14
  10 +REDIS_PORT=6479
  11 +REDIS_PASSWORD=dxEkegEZ@C5SXWKv
  12 +
  13 +# DeepL Translation API
  14 +DEEPL_AUTH_KEY=c9293ab4-ad25-479b-919f-ab4e63b429ed
  15 +
  16 +# API Service Configuration
  17 +API_HOST=0.0.0.0
  18 +API_PORT=6002
  19 +
  20 +# MySQL Database Configuration (Shoplazza) - AI 生产 10.200.16.14:3316
  21 +DB_HOST=10.200.16.14
  22 +DB_PORT=3316
  23 +DB_DATABASE=saas
  24 +DB_USERNAME=root
  25 +DB_PASSWORD=qY8tgodLoA&KT#yQ
  26 +
  27 +# Model Directories
  28 +TEXT_MODEL_DIR=/data/tw/models/bge-m3 # 已经改为web请求了,不使用本地模型
  29 +IMAGE_MODEL_DIR=/data/tw/models/cn-clip # 已经改为web请求了,不使用本地模型
  30 +
  31 +# Cache Directory
  32 +CACHE_DIR=.cache
  33 +
  34 +# Frontend API Base URL
  35 +API_BASE_URL=http://43.166.252.75:6002
  36 +
  37 +
  38 +# 通用 DashScope key(翻译/内容理解等模块)
  39 +DASHSCOPE_API_KEY=sk-482cc3ff37a8467dab134a7a46830556
  40 +# Reranker 专用 key(按地域)
  41 +RERANK_DASHSCOPE_API_KEY_CN=sk-c3b8d4db061840aa8effb748df2a997b
  42 +RERANK_DASHSCOPE_API_KEY_US=sk-482cc3ff37a8467dab134a7a46830556
  43 +
  44 +OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0
  45 +
  46 +# ===== test env overrides (2026-04-12) =====
  47 +RUNTIME_ENV=test
  48 +ES_INDEX_NAMESPACE=test_
  49 +ES_HOST=http://127.0.0.1:19200
  50 +ES_USERNAME=
  51 +ES_PASSWORD=
  52 +ES_DOCKER_HTTP_PORT=19200
  53 +ES_DOCKER_CONTAINER_NAME=saas-search-es9-test
  54 +HF_CACHE_DIR=/data/tw/.cache/huggingface
  55 +TEI_CONTAINER_NAME=saas-search-tei-test
  56 +TEI_MAX_BATCH_TOKENS=2048
  57 +TEI_MAX_CLIENT_BATCH_SIZE=8
  58 +BACKEND_PROXY_URL=http://127.0.0.1:6002
  59 +
  60 +# ===== test env connectivity overrides (2026-04-12) =====
  61 +REDIS_HOST=127.0.0.1
  62 +REDIS_PORT=6479
  63 +REDIS_PASSWORD=BMfv5aI31kgHWtlx
  64 +DB_HOST=120.79.247.228
  65 +DB_PORT=3316
  66 +DB_DATABASE=saas
  67 +DB_USERNAME=saas
  68 +DB_PASSWORD=pcjY7iwX1C6le1oz
  69 +# ===== test env embedding alignment overrides (2026-04-12 23:xx) =====
  70 +TEI_IMAGE=ghcr.m.daocloud.io/huggingface/text-embeddings-inference:cpu-1.9
  71 +TEI_PORT=8080
  72 +TEI_DEVICE=cpu
  73 +TEI_DTYPE=float32
  74 +TEI_MODEL_ID=/data/hub/models--BAAI--bge-m3/snapshots/5617a9f61b028005a4858fdac845db406aefb181
  75 +TEI_HEALTH_TIMEOUT_SEC=240
  76 +CNCLIP_DEVICE=cpu
  77 +EMBEDDING_VENV=/home/tw/saas-search/.venv-cnclip
  78 +TRANSLATOR_VENV=/home/tw/saas-search/.venv
config/environments/test.yaml 0 → 100644
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
  1 +query_config:
  2 + enable_text_embedding: true
  3 + text_embedding_field: title_embedding
  4 + zh_to_en_model: deepl
  5 + en_to_zh_model: deepl
  6 + default_translation_model: deepl
  7 + zh_to_en_model__source_not_in_index: deepl
  8 + en_to_zh_model__source_not_in_index: deepl
  9 + default_translation_model__source_not_in_index: deepl
  10 +
  11 +infrastructure:
  12 + elasticsearch:
  13 + host: http://127.0.0.1:19200
  14 + username: null
  15 + password: null
  16 +
  17 +services:
  18 + embedding:
  19 + provider: http
  20 + providers:
  21 + http:
  22 + text_base_url: http://127.0.0.1:6005
  23 + image_base_url: http://127.0.0.1:6008
  24 + backend: tei
  25 + backends:
  26 + tei:
  27 + base_url: http://127.0.0.1:8080
  28 + model_id: BAAI/bge-m3
  29 + timeout_sec: 60
  30 + max_client_batch_size: 8
  31 + translation:
  32 + service_url: http://127.0.0.1:6006
  33 + default_model: deepl
  34 + default_scene: general
  35 + timeout_sec: 10.0
  36 + capabilities:
  37 + qwen-mt:
  38 + enabled: false
  39 + llm:
  40 + enabled: false
  41 + deepl:
  42 + enabled: true
  43 + nllb-200-distilled-600m:
  44 + enabled: false
  45 + opus-mt-zh-en:
  46 + enabled: false
  47 + opus-mt-en-zh:
  48 + enabled: false
  49 +
  50 +fine_rank:
  51 + enabled: false
  52 +
  53 +rerank:
  54 + enabled: false
scripts/service_ctl.sh
@@ -17,7 +17,7 @@ source "${PROJECT_ROOT}/scripts/lib/load_env.sh" @@ -17,7 +17,7 @@ source "${PROJECT_ROOT}/scripts/lib/load_env.sh"
17 17
18 CORE_SERVICES=("backend" "indexer" "frontend" "eval-web") 18 CORE_SERVICES=("backend" "indexer" "frontend" "eval-web")
19 # reranker-fine 暂时不用,因此暂时从OPTIONAL_SERVICES中删除 19 # reranker-fine 暂时不用,因此暂时从OPTIONAL_SERVICES中删除
20 -OPTIONAL_SERVICES=("tei" "cnclip" "embedding" "embedding-image" "translator" "reranker") 20 +OPTIONAL_SERVICES=("tei" "cnclip" "embedding" "embedding-image" "translator")
21 FULL_SERVICES=("${OPTIONAL_SERVICES[@]}" "${CORE_SERVICES[@]}") 21 FULL_SERVICES=("${OPTIONAL_SERVICES[@]}" "${CORE_SERVICES[@]}")
22 STOP_ORDER_SERVICES=("frontend" "eval-web" "indexer" "backend" "reranker" "translator" "embedding-image" "embedding" "cnclip" "tei") 22 STOP_ORDER_SERVICES=("frontend" "eval-web" "indexer" "backend" "reranker" "translator" "embedding-image" "embedding" "cnclip" "tei")
23 23
@@ -976,6 +976,7 @@ main() { @@ -976,6 +976,7 @@ main() {
976 ;; 976 ;;
977 esac 977 esac
978 978
  979 +
979 case "${action}" in 980 case "${action}" in
980 up) 981 up)
981 for svc in ${targets}; do 982 for svc in ${targets}; do