create-windy 0.6.5 → 0.6.6

package/dist/cli.js

@@ -2991,6 +2991,8 @@ ${starterServerBuild}
     build:
       context: .
       dockerfile: apps/agent-server/Dockerfile
+      args:
+        WINDY_PYPI_INDEX_URL: \${WINDY_PYPI_INDEX_URL:-http://mirrors.cloud.tencent.com/pypi/simple}
     environment:
       AGENT_SERVER_INTERNAL_TOKEN: \${AGENT_SERVER_INTERNAL_TOKEN:-}
       AGENT_RUN_STORE_PATH: /app/data/agent/runs.sqlite3
@@ -7777,6 +7779,11 @@ var recipes = [
     id: "starter-0.6.4-to-0.6.5",
     from: "0.6.4",
     to: "0.6.5"
+  },
+  {
+    id: "starter-0.6.5-to-0.6.6",
+    from: "0.6.5",
+    to: "0.6.6"
   }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-windy",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "创建单组织、单租户、私有部署优先的 Windy 企业 Dashboard Starter",
   "type": "module",
   "bin": {

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "464b1ea58e7c3a582cde26308d5e802bfe1eec1b",
-  "generatorVersion": "0.6.5",
+  "templateCommit": "aebc81cd3a97d7bc3f13c600afb7dc13bbf9c3d0",
+  "generatorVersion": "0.6.6",
   "modules": [
     {
       "name": "system",

package/template/apps/agent-server/Dockerfile

@@ -3,13 +3,19 @@
 FROM python:3.12-slim AS runtime
 WORKDIR /app/apps/agent-server
 
-RUN pip install --no-cache-dir uv==0.9.27 \
+ARG WINDY_PYPI_INDEX_URL=http://mirrors.cloud.tencent.com/pypi/simple
+ARG WINDY_PYPI_TOTAL_TIMEOUT_SECONDS=180
+
+COPY apps/agent-server/install-python-dependencies.sh /usr/local/bin/windy-agent-python-install
+RUN chmod 0755 /usr/local/bin/windy-agent-python-install \
+  && windy-agent-python-install install-uv \
   && useradd --create-home --uid 10001 windy
 COPY apps/agent-server/pyproject.toml apps/agent-server/uv.lock ./
-RUN uv sync --frozen --no-dev --no-install-project
+RUN windy-agent-python-install lock
+RUN windy-agent-python-install sync --frozen --no-dev --no-install-project
 COPY apps/agent-server/src ./src
 COPY apps/agent-server/adk_web_agents ./adk_web_agents
-RUN uv sync --frozen --no-dev
+RUN windy-agent-python-install sync --frozen --no-dev
 
 ENV PATH="/app/apps/agent-server/.venv/bin:${PATH}"
 ENV PYTHONUNBUFFERED=1

package/template/apps/agent-server/install-python-dependencies.sh

@@ -0,0 +1,92 @@
+#!/bin/sh
+set -eu
+
+index_url="${WINDY_PYPI_INDEX_URL:-}"
+total_timeout_seconds="${WINDY_PYPI_TOTAL_TIMEOUT_SECONDS:-}"
+
+case "$index_url" in
+  http://* | https://*) ;;
+  *)
+    echo "Agent Server Python index 必须是 credential-free HTTP(S) URL" >&2
+    exit 64
+    ;;
+esac
+case "$index_url" in
+  *"@"* | *"?"* | *"#"*)
+    echo "Agent Server Python index 不得内嵌 credential、query 或 fragment" >&2
+    exit 64
+    ;;
+esac
+
+index_address="${index_url#*://}"
+index_host="${index_address%%/*}"
+case "$index_address" in
+  "" | *[!A-Za-z0-9._~:/%-]*)
+    echo "Agent Server Python index 含有不安全字符" >&2
+    exit 64
+    ;;
+esac
+case "$index_host" in
+  "" | *[!A-Za-z0-9.:-]*)
+    echo "Agent Server Python index host 无效" >&2
+    exit 64
+    ;;
+esac
+case "$total_timeout_seconds" in
+  "" | *[!0-9]*)
+    echo "WINDY_PYPI_TOTAL_TIMEOUT_SECONDS 必须是 1 到 600 的整数" >&2
+    exit 64
+    ;;
+esac
+if [ "$total_timeout_seconds" -lt 1 ] || [ "$total_timeout_seconds" -gt 600 ]; then
+  echo "WINDY_PYPI_TOTAL_TIMEOUT_SECONDS 必须是 1 到 600 的整数" >&2
+  exit 64
+fi
+
+trusted_host=""
+insecure_host=""
+case "$index_url" in
+  http://*)
+    trusted_host="$index_host"
+    insecure_host="$index_host"
+    ;;
+esac
+
+run_uv_network() {
+  operation="$1"
+  shift
+  if ! timeout --kill-after=5s "${total_timeout_seconds}s" env \
+    UV_DEFAULT_INDEX="$index_url" \
+    UV_INSECURE_HOST="$insecure_host" \
+    UV_CONCURRENT_DOWNLOADS=1 \
+    UV_HTTP_TIMEOUT=30 \
+    UV_HTTP_RETRIES=2 \
+    UV_NO_PROGRESS=1 \
+    sh -c 'attempt=1; while [ "$attempt" -le 3 ]; do "$@" && exit 0; if [ "$attempt" -lt 3 ]; then echo "[windy] Python 网络操作失败，2 秒后重试" >&2; sleep 2; fi; attempt=$((attempt + 1)); done; exit 1' windy-python "$@"; then
+    echo "Agent Server Python index 不可用或总时限已到：${operation}失败" >&2
+    exit 70
+  fi
+}
+
+case "${1:-}" in
+  install-uv)
+    if ! timeout --kill-after=5s "${total_timeout_seconds}s" env \
+      PIP_INDEX_URL="$index_url" \
+      PIP_TRUSTED_HOST="$trusted_host" \
+      pip install --no-cache-dir --timeout 30 --retries 2 uv==0.9.27; then
+      echo "Agent Server Python index 不可用或总时限已到：无法安装 uv" >&2
+      exit 70
+    fi
+    ;;
+  lock)
+    run_uv_network "lock index 刷新" uv lock
+    ;;
+  sync)
+    shift
+    run_uv_network "依赖同步" uv sync "$@"
+    ;;
+  *)
+    echo "未知的 Agent Server Python 安装阶段" >&2
+    exit 64
+    ;;
+esac

package/template/docker-compose.agent-debug.yml

@@ -11,6 +11,8 @@ services:
     build:
       context: .
       dockerfile: apps/agent-server/Dockerfile
+      args:
+        WINDY_PYPI_INDEX_URL: ${WINDY_PYPI_INDEX_URL:-http://mirrors.cloud.tencent.com/pypi/simple}
     environment:
       ADK_DEBUG_PLATFORM_URL: http://server:9747
       ADK_DEBUG_PLATFORM_TOKEN: ${ADK_DEBUG_PLATFORM_TOKEN:?请先由 create-windy doctor 修复本地调试 Token}

package/template/docker-compose.yml

@@ -158,6 +158,8 @@ services:
     build:
       context: .
       dockerfile: apps/agent-server/Dockerfile
+      args:
+        WINDY_PYPI_INDEX_URL: ${WINDY_PYPI_INDEX_URL:-http://mirrors.cloud.tencent.com/pypi/simple}
     environment:
       AGENT_SERVER_INTERNAL_TOKEN: ${AGENT_SERVER_INTERNAL_TOKEN:-}
       AGENT_RUN_STORE_PATH: /app/data/agent/runs.sqlite3