From b423bf43917f8d3597608f71118209cb1b44553a Mon Sep 17 00:00:00 2001 From: tangwang Date: Tue, 14 Apr 2026 08:53:16 +0800 Subject: [PATCH] 测试环境配置：关闭reranker，其余的都打开，对接本机es docker内的19200 --- .env | 35 +++++++++++++++++++++++++++++++++++ .env.backup.20260412-test-small-gpu | 44 ++++++++++++++++++++++++++++++++++++++++++++ .env.bak.20260413100641 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ config/environments/test.yaml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/service_ctl.sh | 3 ++- 5 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 .env.backup.20260412-test-small-gpu create mode 100644 .env.bak.20260413100641 create mode 100644 config/environments/test.yaml diff --git a/.env b/.env index 4f5e97e..9d756ff 100644 --- a/.env +++ b/.env @@ -42,3 +42,38 @@ RERANK_DASHSCOPE_API_KEY_CN=sk-c3b8d4db061840aa8effb748df2a997b RERANK_DASHSCOPE_API_KEY_US=sk-482cc3ff37a8467dab134a7a46830556 OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0 + +# ===== test env overrides (2026-04-12) ===== +RUNTIME_ENV=test +ES_INDEX_NAMESPACE=test_ +ES_HOST=http://127.0.0.1:19200 +ES_USERNAME= +ES_PASSWORD= +ES_DOCKER_HTTP_PORT=19200 +ES_DOCKER_CONTAINER_NAME=saas-search-es9-test +HF_CACHE_DIR=/data/tw/.cache/huggingface +TEI_CONTAINER_NAME=saas-search-tei-test +TEI_MAX_BATCH_TOKENS=2048 +TEI_MAX_CLIENT_BATCH_SIZE=8 +BACKEND_PROXY_URL=http://127.0.0.1:6002 + +# ===== test env connectivity overrides (2026-04-12) ===== +REDIS_HOST=127.0.0.1 +REDIS_PORT=6479 +REDIS_PASSWORD=BMfv5aI31kgHWtlx +DB_HOST=120.79.247.228 +DB_PORT=3316 +DB_DATABASE=saas +DB_USERNAME=saas +DB_PASSWORD=pcjY7iwX1C6le1oz +# ===== test env embedding alignment overrides (2026-04-12 23:xx) ===== +TEI_IMAGE=ghcr.m.daocloud.io/huggingface/text-embeddings-inference:cpu-1.9 +TEI_PORT=8080 +TEI_DEVICE=cpu +TEI_DTYPE=float32 +TEI_MODEL_ID=/data/hub/models--BAAI--bge-m3/snapshots/5617a9f61b028005a4858fdac845db406aefb181 +TEI_HEALTH_TIMEOUT_SEC=240 +CNCLIP_DEVICE=cpu +CNCLIP_MODEL_NAME=CN-CLIP/ViT-L-14 +EMBEDDING_VENV=/home/tw/saas-search/.venv-cnclip +TRANSLATOR_VENV=/home/tw/saas-search/.venv diff --git a/.env.backup.20260412-test-small-gpu b/.env.backup.20260412-test-small-gpu new file mode 100644 index 0000000..4f5e97e --- /dev/null +++ b/.env.backup.20260412-test-small-gpu @@ -0,0 +1,44 @@ +# Elasticsearch Configuration +# ES_HOST=http://120.76.41.98:9200 +# ES_USERNAME=essa +ES_HOST=http://localhost:9200 +ES_USERNAME=saas +ES_PASSWORD=4hOaLaf41y2VuI8y + +# Redis Configuration (Optional) - AI 生产 10.200.16.14:6479 +REDIS_HOST=10.200.16.14 +REDIS_PORT=6479 +REDIS_PASSWORD=dxEkegEZ@C5SXWKv + +# DeepL Translation API +DEEPL_AUTH_KEY=c9293ab4-ad25-479b-919f-ab4e63b429ed + +# API Service Configuration +API_HOST=0.0.0.0 +API_PORT=6002 + +# MySQL Database Configuration (Shoplazza) - AI 生产 10.200.16.14:3316 +DB_HOST=10.200.16.14 +DB_PORT=3316 +DB_DATABASE=saas +DB_USERNAME=root +DB_PASSWORD=qY8tgodLoA&KT#yQ + +# Model Directories +TEXT_MODEL_DIR=/data/tw/models/bge-m3 # 已经改为web请求了，不使用本地模型 +IMAGE_MODEL_DIR=/data/tw/models/cn-clip # 已经改为web请求了，不使用本地模型 + +# Cache Directory +CACHE_DIR=.cache + +# Frontend API Base URL +API_BASE_URL=http://43.166.252.75:6002 + + +# 通用 DashScope key（翻译/内容理解等模块） +DASHSCOPE_API_KEY=sk-482cc3ff37a8467dab134a7a46830556 +# Reranker 专用 key（按地域） +RERANK_DASHSCOPE_API_KEY_CN=sk-c3b8d4db061840aa8effb748df2a997b +RERANK_DASHSCOPE_API_KEY_US=sk-482cc3ff37a8467dab134a7a46830556 + +OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0 diff --git a/.env.bak.20260413100641 b/.env.bak.20260413100641 new file mode 100644 index 0000000..081b1ac --- /dev/null +++ b/.env.bak.20260413100641 @@ -0,0 +1,78 @@ +# Elasticsearch Configuration +# ES_HOST=http://120.76.41.98:9200 +# ES_USERNAME=essa +ES_HOST=http://localhost:9200 +ES_USERNAME=saas +ES_PASSWORD=4hOaLaf41y2VuI8y + +# Redis Configuration (Optional) - AI 生产 10.200.16.14:6479 +REDIS_HOST=10.200.16.14 +REDIS_PORT=6479 +REDIS_PASSWORD=dxEkegEZ@C5SXWKv + +# DeepL Translation API +DEEPL_AUTH_KEY=c9293ab4-ad25-479b-919f-ab4e63b429ed + +# API Service Configuration +API_HOST=0.0.0.0 +API_PORT=6002 + +# MySQL Database Configuration (Shoplazza) - AI 生产 10.200.16.14:3316 +DB_HOST=10.200.16.14 +DB_PORT=3316 +DB_DATABASE=saas +DB_USERNAME=root +DB_PASSWORD=qY8tgodLoA&KT#yQ + +# Model Directories +TEXT_MODEL_DIR=/data/tw/models/bge-m3 # 已经改为web请求了，不使用本地模型 +IMAGE_MODEL_DIR=/data/tw/models/cn-clip # 已经改为web请求了，不使用本地模型 + +# Cache Directory +CACHE_DIR=.cache + +# Frontend API Base URL +API_BASE_URL=http://43.166.252.75:6002 + + +# 通用 DashScope key（翻译/内容理解等模块） +DASHSCOPE_API_KEY=sk-482cc3ff37a8467dab134a7a46830556 +# Reranker 专用 key（按地域） +RERANK_DASHSCOPE_API_KEY_CN=sk-c3b8d4db061840aa8effb748df2a997b +RERANK_DASHSCOPE_API_KEY_US=sk-482cc3ff37a8467dab134a7a46830556 + +OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0 + +# ===== test env overrides (2026-04-12) ===== +RUNTIME_ENV=test +ES_INDEX_NAMESPACE=test_ +ES_HOST=http://127.0.0.1:19200 +ES_USERNAME= +ES_PASSWORD= +ES_DOCKER_HTTP_PORT=19200 +ES_DOCKER_CONTAINER_NAME=saas-search-es9-test +HF_CACHE_DIR=/data/tw/.cache/huggingface +TEI_CONTAINER_NAME=saas-search-tei-test +TEI_MAX_BATCH_TOKENS=2048 +TEI_MAX_CLIENT_BATCH_SIZE=8 +BACKEND_PROXY_URL=http://127.0.0.1:6002 + +# ===== test env connectivity overrides (2026-04-12) ===== +REDIS_HOST=127.0.0.1 +REDIS_PORT=6479 +REDIS_PASSWORD=BMfv5aI31kgHWtlx +DB_HOST=120.79.247.228 +DB_PORT=3316 +DB_DATABASE=saas +DB_USERNAME=saas +DB_PASSWORD=pcjY7iwX1C6le1oz +# ===== test env embedding alignment overrides (2026-04-12 23:xx) ===== +TEI_IMAGE=ghcr.m.daocloud.io/huggingface/text-embeddings-inference:cpu-1.9 +TEI_PORT=8080 +TEI_DEVICE=cpu +TEI_DTYPE=float32 +TEI_MODEL_ID=/data/hub/models--BAAI--bge-m3/snapshots/5617a9f61b028005a4858fdac845db406aefb181 +TEI_HEALTH_TIMEOUT_SEC=240 +CNCLIP_DEVICE=cpu +EMBEDDING_VENV=/home/tw/saas-search/.venv-cnclip +TRANSLATOR_VENV=/home/tw/saas-search/.venv diff --git a/config/environments/test.yaml b/config/environments/test.yaml new file mode 100644 index 0000000..1c8a357 --- /dev/null +++ b/config/environments/test.yaml @@ -0,0 +1,54 @@ +query_config: + enable_text_embedding: true + text_embedding_field: title_embedding + zh_to_en_model: deepl + en_to_zh_model: deepl + default_translation_model: deepl + zh_to_en_model__source_not_in_index: deepl + en_to_zh_model__source_not_in_index: deepl + default_translation_model__source_not_in_index: deepl + +infrastructure: + elasticsearch: + host: http://127.0.0.1:19200 + username: null + password: null + +services: + embedding: + provider: http + providers: + http: + text_base_url: http://127.0.0.1:6005 + image_base_url: http://127.0.0.1:6008 + backend: tei + backends: + tei: + base_url: http://127.0.0.1:8080 + model_id: BAAI/bge-m3 + timeout_sec: 60 + max_client_batch_size: 8 + translation: + service_url: http://127.0.0.1:6006 + default_model: deepl + default_scene: general + timeout_sec: 10.0 + capabilities: + qwen-mt: + enabled: false + llm: + enabled: false + deepl: + enabled: true + nllb-200-distilled-600m: + enabled: false + opus-mt-zh-en: + enabled: false + opus-mt-en-zh: + enabled: false + +fine_rank: + enabled: false + +rerank: + enabled: false diff --git a/scripts/service_ctl.sh b/scripts/service_ctl.sh index 93a2aa5..304afe7 100755 --- a/scripts/service_ctl.sh +++ b/scripts/service_ctl.sh @@ -17,7 +17,7 @@ source "${PROJECT_ROOT}/scripts/lib/load_env.sh" CORE_SERVICES=("backend" "indexer" "frontend" "eval-web") # reranker-fine 暂时不用，因此暂时从OPTIONAL_SERVICES中删除 -OPTIONAL_SERVICES=("tei" "cnclip" "embedding" "embedding-image" "translator" "reranker") +OPTIONAL_SERVICES=("tei" "cnclip" "embedding" "embedding-image" "translator") FULL_SERVICES=("${OPTIONAL_SERVICES[@]}" "${CORE_SERVICES[@]}") STOP_ORDER_SERVICES=("frontend" "eval-web" "indexer" "backend" "reranker" "translator" "embedding-image" "embedding" "cnclip" "tei") @@ -976,6 +976,7 @@ main() { ;; esac + case "${action}" in up) for svc in ${targets}; do -- libgit2 0.21.2