补齐灰度语音配置与订单样本私有导入

deploy/gray_config.py

@@ -114,14 +114,30 @@ server {{
 '''
 
 
-def write_release(directory, config, key):
-    if not key.strip() or any(character in key for character in ('\r', '\n', '\x00')):
-        raise ValueError('The model credential must be a nonempty single line')
+def runtime_environment(key, speech=None):
+    fields = {'DEEPSEEK_API_KEY': key}
+    speech = speech or {}
+    provider = (speech.get('ASR_PROVIDER') or '').strip()
+    if provider:
+        if provider != 'baidu':
+            raise ValueError('Gray speech provider must be baidu or disabled')
+        fields.update(ASR_PROVIDER=provider,
+                      BAIDU_ASR_API_KEY=speech.get('BAIDU_ASR_API_KEY', ''),
+                      BAIDU_ASR_SECRET_KEY=speech.get('BAIDU_ASR_SECRET_KEY', ''))
+    for value in fields.values():
+        if not isinstance(value, str) or not value.strip() or any(c in value for c in ('\r', '\n', '\x00')):
+            raise ValueError('Runtime credentials must be nonempty single lines')
+    def literal(value):
+        return "'" + value.strip().replace('\\', '\\\\').replace("'", "\\'") + "'"
+    return ''.join(name + '=' + literal(value) + '\n' for name, value in fields.items())
+
+
+def write_release(directory, config, key, speech=None):
+    runtime = runtime_environment(key, speech)
     directory.mkdir(parents=True, exist_ok=False)
     (directory / 'release.env').write_text(config.release_environment(), encoding='utf-8')
     (directory / 'site.conf').write_text(config.nginx_config(), encoding='utf-8')
-    escaped = key.strip().replace('\\', '\\\\').replace("'", "\\'")
-    (directory / 'runtime.env').write_text("DEEPSEEK_API_KEY='" + escaped + "'\n", encoding='utf-8')
+    (directory / 'runtime.env').write_text(runtime, encoding='utf-8')
     (directory / 'runtime.env').chmod(0o600)
     source = Path(__file__).resolve().parent
     shutil.copyfile(source / 'compose.gray.yml', directory / 'compose.yml')
@@ -136,7 +152,7 @@ def main():
     args = parser.parse_args()
     try:
         config = GrayConfig.from_environment(os.environ)
-        write_release(args.directory, config, os.environ['DEEPSEEK_API_KEY'])
+        write_release(args.directory, config, os.environ['DEEPSEEK_API_KEY'], os.environ)
     except (KeyError, ValueError) as error:
         parser.exit(2, 'Gray release configuration is incomplete or invalid.\n')
 

deploy/import-gray-order-samples.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+set +x
+set -Eeuo pipefail
+umask 077
+
+: "${ORDER_SNAPSHOT_FILE:?}" "${TRACKING_SNAPSHOT_FILE:?}"
+: "${TARGET_SSH_KEY:?}" "${TARGET_SSH_USER:?}" "${TARGET_SSH_HOST:?}" "${TARGET_SSH_KNOWN_HOSTS:?}"
+: "${GRAY_DEPLOY_DIR:?}" "${SOURCE_COMMIT:?}" "${BUILD_NUMBER:?}"
+[[ "$TARGET_SSH_USER" =~ ^[A-Za-z0-9_.-]+$ && "$TARGET_SSH_HOST" =~ ^[A-Za-z0-9.-]+$ ]] || exit 2
+[[ "$SOURCE_COMMIT" =~ ^[a-f0-9]{40}$ && "$BUILD_NUMBER" =~ ^[1-9][0-9]*$ ]] || exit 2
+root=$GRAY_DEPLOY_DIR
+[[ "$root" == /*/gray-logistics-chat && "$root" != *..* ]] || exit 2
+release_id="${SOURCE_COMMIT:0:12}-b$BUILD_NUMBER"
+release="$root/releases/$release_id"
+order_sha=$(sha256sum "$ORDER_SNAPSHOT_FILE" | awk '{print $1}')
+tracking_sha=$(sha256sum "$TRACKING_SNAPSHOT_FILE" | awk '{print $1}')
+ssh_options=(-i "$TARGET_SSH_KEY" -o BatchMode=yes -o StrictHostKeyChecking=yes
+  -o "UserKnownHostsFile=$TARGET_SSH_KNOWN_HOSTS" -o ConnectTimeout=12)
+target="$TARGET_SSH_USER@$TARGET_SSH_HOST"
+
+# Names are fixed; credentials and snapshot contents never enter the shell log.
+scp "${ssh_options[@]}" "$ORDER_SNAPSHOT_FILE" "$target:$release/order-input.json"
+scp "${ssh_options[@]}" "$TRACKING_SNAPSHOT_FILE" "$target:$release/tracking-input.json"
+ssh "${ssh_options[@]}" "$target" bash -s -- "$root" "$release_id" "$SOURCE_COMMIT" "$order_sha" "$tracking_sha" <<'IMPORT'
+set -Eeuo pipefail
+umask 077
+root=$1
+release_id=$2
+source_commit=$3
+order_sha=$4
+tracking_sha=$5
+[[ "$root" == /*/gray-logistics-chat && "$root" != *..* ]] || exit 2
+[[ "$release_id" =~ ^[a-f0-9]{12}-b[0-9]+$ && "$source_commit" =~ ^[a-f0-9]{40}$ ]] || exit 2
+[[ "$order_sha" =~ ^[a-f0-9]{64}$ && "$tracking_sha" =~ ^[a-f0-9]{64}$ ]] || exit 2
+release="$root/releases/$release_id"
+[[ "$(cat "$root/.project")" == baiyue-logistics-chat-gray && "$(cat "$root/current-release")" == "$release" ]] || exit 2
+container=baiyue-logistics-chat-gray
+[[ "$(docker inspect --format '{{index .Config.Labels "com.docker.compose.project"}}' "$container")" == baiyue-logistics-chat-gray ]] || exit 2
+[[ "$(docker inspect --format '{{index .Config.Labels "org.opencontainers.image.revision"}}' "$container")" == "$source_commit" ]] || exit 2
+printf '%s  %s\n' "$order_sha" "$release/order-input.json" "$tracking_sha" "$release/tracking-input.json" | sha256sum --check --status
+input="$root/data/imports/$release_id"
+[[ ! -e "$input" ]] || { echo 'Existing import input requires inspection.' >&2; exit 2; }
+cleanup() {
+  rm -f -- "$input/orders.json" "$input/tracking.json" "$release/order-input.json" "$release/tracking-input.json"
+  rmdir -- "$input" 2>/dev/null || true
+}
+trap cleanup EXIT
+install -d -m 700 -o 10001 -g 10001 "$root/data/imports" "$input"
+install -m 600 -o 10001 -g 10001 "$release/order-input.json" "$input/orders.json"
+install -m 600 -o 10001 -g 10001 "$release/tracking-input.json" "$input/tracking.json"
+docker exec "$container" python -c 'import pathlib,sqlite3,sys; p=pathlib.Path("/var/lib/baiyue-logistics-chat/backups")/("pre-order-import-"+sys.argv[1]+".db"); assert not p.exists(); source=sqlite3.connect("/var/lib/baiyue-logistics-chat/history.db"); target=sqlite3.connect(str(p)); source.backup(target); target.close(); source.close(); print("Chat SQLite backup completed before sample import.")' "$release_id"
+docker exec "$container" python scripts/import_order_test_data.py \
+  --db /var/lib/baiyue-logistics-chat/history.db --snapshot "/var/lib/baiyue-logistics-chat/imports/$release_id/orders.json"
+docker exec "$container" python scripts/import_order_test_data.py \
+  --db /var/lib/baiyue-logistics-chat/history.db --snapshot "/var/lib/baiyue-logistics-chat/imports/$release_id/tracking.json" --tracking-only
+echo 'Private snapshots imported with existing order fields and nonempty tracking preserved.'
+IMPORT