chore: sync HF Space from main

.gitattributes

@@ -1,35 +0,0 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tar filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -0,0 +1,4 @@
+构建日志.MD
+重启日志.MD
+Dockerfile例子
+entrypoint例子.sh

Dockerfile

@@ -1,18 +1,85 @@
-FROM ghcr.io/chenyme/grok2api:latest
+FROM python:3.13-alpine AS builder
 
-ENV TZ=Asia/Shanghai \
-    LOG_LEVEL=INFO \
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    TZ=Asia/Shanghai \
+    UV_PROJECT_ENVIRONMENT=/opt/venv
+
+ENV PATH="$UV_PROJECT_ENVIRONMENT/bin:$PATH"
+
+RUN apk add --no-cache \
+    git \
+    tzdata \
+    ca-certificates \
+    build-base \
+    linux-headers \
+    libffi-dev \
+    openssl-dev \
+    curl-dev \
+    cargo \
+    rust
+
+WORKDIR /src
+
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
+ARG GROK2API_REPO=https://github.com/chenyme/grok2api.git
+ARG GROK2API_REF=main
+
+RUN git clone --depth 1 --branch "$GROK2API_REF" "$GROK2API_REPO" /src/grok2api
+
+WORKDIR /src/grok2api
+
+RUN uv sync --frozen --no-dev --no-install-project \
+    && find /opt/venv -type d -name "__pycache__" -prune -exec rm -rf {} + \
+    && find /opt/venv -type f -name "*.pyc" -delete \
+    && find /opt/venv -type d -name "tests" -prune -exec rm -rf {} + \
+    && find /opt/venv -type d -name "test" -prune -exec rm -rf {} + \
+    && find /opt/venv -type d -name "testing" -prune -exec rm -rf {} + \
+    && find /opt/venv -type f -name "*.so" -exec strip --strip-unneeded {} + || true \
+    && rm -rf /root/.cache /tmp/uv-cache
+
+FROM python:3.13-alpine
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    TZ=Asia/Shanghai \
+    VIRTUAL_ENV=/opt/venv \
+    DATA_DIR=/app/data \
+    SERVER_HOST=0.0.0.0 \
     SERVER_PORT=7860 \
-    SERVER_WORKERS=1
+    SERVER_WORKERS=1 \
+    LOG_LEVEL=INFO
+
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+RUN apk add --no-cache \
+    tzdata \
+    ca-certificates \
+    git \
+    libffi \
+    openssl \
+    libgcc \
+    libstdc++ \
+    libcurl
+
+WORKDIR /app
 
-# 基础镜像 python 在 /opt/venv/bin/python3，但无 pip，用 ensurepip 安装后再装依赖
-RUN python3 -m ensurepip --upgrade && \
-    python3 -m pip install --no-cache-dir "huggingface_hub>=0.23.0" "watchdog>=4.0.0"
+COPY --from=builder /opt/venv /opt/venv
+COPY --from=builder /src/grok2api/config.defaults.toml ./
+COPY --from=builder /src/grok2api/app ./app
+COPY --from=builder /src/grok2api/_public ./_public
+COPY --from=builder /src/grok2api/main.py ./
+COPY --from=builder /src/grok2api/scripts ./scripts
 
-RUN mkdir -p /app/data /app/logs && chmod -R 777 /app/data /app/logs
+RUN python3 -m ensurepip --upgrade \
+    && python3 -m pip install --no-cache-dir "huggingface_hub>=0.23.0" "watchdog>=4.0.0" \
+    && mkdir -p /app/data /app/logs \
+    && chmod +x /app/scripts/entrypoint.sh
 
 COPY start.sh /app/start.sh
-RUN sed -i 's/\r$//' /app/start.sh && chmod +x /app/start.sh
+RUN sed -i 's/\r$//' /app/start.sh \
+    && chmod +x /app/start.sh
 
 EXPOSE 7860
 

README.md

@@ -1,10 +1,15 @@
 ---
-title: Grok2api
-emoji: 🐨
-colorFrom: yellow
-colorTo: purple
+title: grok2api
+emoji: 🚀
+colorFrom: gray
+colorTo: indigo
 sdk: docker
+app_port: 7860
 pinned: false
 ---
 
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+# grok2api
+
+This Hugging Face Space is synced from the `huggingface-HFGROK2API-A` directory in the source repository.
+
+It uses Docker mode and builds the latest `chenyme/grok2api` source during Space build.

start.sh

@@ -1,16 +1,22 @@
 #!/bin/sh
-set -e
+set -eu
 
 PYTHON=/opt/venv/bin/python3
+DATA_DIR="${DATA_DIR:-/app/data}"
+CONFIG="$DATA_DIR/config.toml"
+
 echo "[start] using python: $PYTHON"
+echo "[start] data dir: $DATA_DIR"
 
-# ── 1. 从 HF Bucket 恢复 data/ ──────────────────────────────
+# 1. 从 HF Bucket 恢复 data/
 $PYTHON - <<'PYEOF'
-import os, sys
+import os
+import sys
 from huggingface_hub import HfFileSystem
 
 token = os.environ.get("HF_TOKEN", "")
-repo  = os.environ.get("HF_BUCKET_REPO", "")
+repo = os.environ.get("HF_BUCKET_REPO", "")
+local_data = os.environ.get("DATA_DIR", "/app/data")
 
 if not token or not repo:
     print("[bucket_pull] skipped: HF_TOKEN or HF_BUCKET_REPO not set")
@@ -18,111 +24,143 @@ if not token or not repo:
 
 fs = HfFileSystem(token=token)
 bucket_root = f"hf://buckets/{repo}"
-local_data = "/app/data"
 os.makedirs(local_data, exist_ok=True)
 
 try:
     if not fs.exists(bucket_root):
         print(f"[bucket_pull] bucket {bucket_root} not found, skipping")
         sys.exit(0)
-    
+
     files = fs.glob(f"{bucket_root}/**/*")
     pulled = 0
+    prefix = f"hf://buckets/{repo}/"
     for remote_file in files:
         if fs.isfile(remote_file):
-            rel_path = remote_file.replace(f"hf://buckets/{repo}/", "")
+            rel_path = remote_file.replace(prefix, "", 1)
             local_file = os.path.join(local_data, rel_path)
             os.makedirs(os.path.dirname(local_file), exist_ok=True)
             fs.get(remote_file, local_file)
             print(f"[bucket_pull] restored: {rel_path}")
             pulled += 1
     print(f"[bucket_pull] done, {pulled} file(s) restored.")
-except Exception as e:
-    print(f"[bucket_pull] error: {e}")
+except Exception as exc:
+    print(f"[bucket_pull] error: {exc}")
 PYEOF
 
-# ── 2. 初始化存储 ────────────────────────────────────────────
+# 2. 初始化存储
 if [ -f /app/scripts/init_storage.sh ]; then
     /app/scripts/init_storage.sh
 fi
 
-# ── 3. 注入 Secrets 到 config.toml ──────────────────────────
-CONFIG="/app/data/config.toml"
-if [ -n "$APP_KEY" ] && [ -f "$CONFIG" ]; then
+# 3. 注入 Secrets 到 config.toml
+if [ -n "${APP_KEY:-}" ] && [ -f "$CONFIG" ]; then
     sed -i "s|^app_key = .*|app_key = \"$APP_KEY\"|" "$CONFIG"
 fi
-if [ -n "$API_KEY" ] && [ -f "$CONFIG" ]; then
+if [ -n "${API_KEY:-}" ] && [ -f "$CONFIG" ]; then
     sed -i "s|^api_key = .*|api_key = \"$API_KEY\"|" "$CONFIG"
 fi
 
 export SERVER_STORAGE_TYPE="${SERVER_STORAGE_TYPE:-local}"
 export SERVER_STORAGE_URL="${SERVER_STORAGE_URL:-}"
 
-# ── 4. 后台：文件监听（立即推送）+ 兜底定时同步（每5分钟）──
+# 4. 后台：文件监听（防抖推送）+ 兜底定时同步
 $PYTHON - <<'PYEOF' &
-import os, sys, time, threading, glob
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler
+import glob
+import os
+import threading
+import time
 from huggingface_hub import HfFileSystem
+from watchdog.events import FileSystemEventHandler
+from watchdog.observers import Observer
 
 token = os.environ.get("HF_TOKEN", "")
-repo  = os.environ.get("HF_BUCKET_REPO", "")
+repo = os.environ.get("HF_BUCKET_REPO", "")
+data_dir = os.environ.get("DATA_DIR", "/app/data")
+bucket_root = f"hf://buckets/{repo}"
+
 
 def push():
     if not token or not repo:
         return
+
     fs = HfFileSystem(token=token)
-    data_dir = "/app/data"
-    bucket_root = f"hf://buckets/{repo}"
-    
-    files = [f for f in glob.glob(os.path.join(data_dir, "**", "*"), recursive=True) if os.path.isfile(f)]
+    files = [
+        path
+        for path in glob.glob(os.path.join(data_dir, "**", "*"), recursive=True)
+        if os.path.isfile(path)
+    ]
     if not files:
         return
+
     try:
         for local_path in files:
-            rel_path = os.path.relpath(local_path, data_dir)
+            rel_path = os.path.relpath(local_path, data_dir).replace("\\", "/")
             remote_path = f"{bucket_root}/{rel_path}"
             fs.put(local_path, remote_path)
         print(f"[bucket_push] pushed {len(files)} file(s)", flush=True)
-    except Exception as e:
-        print(f"[bucket_push] error: {e}", flush=True)
+    except Exception as exc:
+        print(f"[bucket_push] error: {exc}", flush=True)
+
 
 class Handler(FileSystemEventHandler):
     def __init__(self):
         self._timer = None
         self._lock = threading.Lock()
+
     def _schedule(self):
         with self._lock:
             if self._timer:
                 self._timer.cancel()
             self._timer = threading.Timer(5, push)
             self._timer.start()
-    def on_modified(self, e):
-        if not e.is_directory: self._schedule()
-    def on_created(self, e):
-        if not e.is_directory: self._schedule()
-
-# 文件变化监听
-observer = Observer()
-observer.schedule(Handler(), path="/app/data", recursive=True)
-observer.start()
-print("[bucket_watch] watching /app/data...", flush=True)
-
-# 兜底定时同步
-def periodic():
-    while True:
-        time.sleep(300)
-        push()
-threading.Thread(target=periodic, daemon=True).start()
 
-try:
+    def on_modified(self, event):
+        if not event.is_directory:
+            self._schedule()
+
+    def on_created(self, event):
+        if not event.is_directory:
+            self._schedule()
+
+    def on_deleted(self, event):
+        if not event.is_directory:
+            self._schedule()
+
+    def on_moved(self, event):
+        if not event.is_directory:
+            self._schedule()
+
+
+if token and repo:
+    os.makedirs(data_dir, exist_ok=True)
+    observer = Observer()
+    observer.schedule(Handler(), path=data_dir, recursive=True)
+    observer.start()
+    print(f"[bucket_watch] watching {data_dir}...", flush=True)
+
+    def periodic():
+        while True:
+            time.sleep(300)
+            push()
+
+    threading.Thread(target=periodic, daemon=True).start()
+
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        observer.stop()
+    observer.join()
+else:
+    print("[bucket_watch] skipped: HF_TOKEN or HF_BUCKET_REPO not set", flush=True)
     while True:
-        time.sleep(1)
-except KeyboardInterrupt:
-    observer.stop()
-observer.join()
+        time.sleep(3600)
 PYEOF
 
-# ── 5. 启动应用 ──────────────────────────────────────────────
+# 5. 启动应用
 echo "[start] starting grok2api..."
-exec /opt/venv/bin/granian --interface asgi --host 0.0.0.0 --port 7860 --workers 1 main:app
+exec /opt/venv/bin/granian --interface asgi \
+    --host "${SERVER_HOST:-0.0.0.0}" \
+    --port "${SERVER_PORT:-7860}" \
+    --workers "${SERVER_WORKERS:-1}" \
+    main:app