feat: docker compose + storage improvements

Author: TQZHR

.dockerignore

@@ -1,4 +1,7 @@
 __pycache__
+.venv
+.wrangler
+node_modules
 *.pyc
 *.pyo
 *.pyd

.env.example

@@ -0,0 +1,46 @@
+# Compose will automatically read `.env` from the project root.
+# Copy this file to `.env` and adjust values as needed.
+
+# ---- Image / Port ----
+GROK2API_PORT=8000
+# GROK2API_IMAGE=ghcr.io/tqzhr/grok2api:latest
+
+# ---- Runtime ----
+TZ=Asia/Shanghai
+LOG_LEVEL=INFO
+SERVER_HOST=0.0.0.0
+SERVER_PORT=8000
+SERVER_WORKERS=1
+
+# ---- Storage (default: local) ----
+SERVER_STORAGE_TYPE=local
+SERVER_STORAGE_URL=
+STORAGE_WAIT_TIMEOUT=60
+
+# ---- Optional profiles (uncomment one) ----
+# COMPOSE_PROFILES=redis
+# COMPOSE_PROFILES=pgsql
+# COMPOSE_PROFILES=mysql
+
+# ---- Redis example ----
+# COMPOSE_PROFILES=redis
+# SERVER_STORAGE_TYPE=redis
+# SERVER_STORAGE_URL=redis://redis:6379/0
+
+# ---- PostgreSQL example ----
+# COMPOSE_PROFILES=pgsql
+# SERVER_STORAGE_TYPE=pgsql
+# PGSQL_DB=grok2api
+# PGSQL_USER=grok2api
+# PGSQL_PASSWORD=change_me
+# SERVER_STORAGE_URL=postgresql+asyncpg://grok2api:change_me@pgsql:5432/grok2api
+
+# ---- MySQL example ----
+# COMPOSE_PROFILES=mysql
+# SERVER_STORAGE_TYPE=mysql
+# MYSQL_DB=grok2api
+# MYSQL_USER=grok2api
+# MYSQL_PASSWORD=change_me
+# MYSQL_ROOT_PASSWORD=change_me
+# SERVER_STORAGE_URL=mysql+aiomysql://grok2api:change_me@mysql:3306/grok2api
+

.github/workflows/cloudflare-workers.yml

@@ -29,6 +29,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:

.github/workflows/docker-ghcr.yml

@@ -0,0 +1,54 @@
+name: Docker (GHCR)
+
+on:
+  push:
+    branches: ["main"]
+    tags: ["v*"]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=tag
+            type=sha,format=short
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+

Dockerfile

@@ -39,4 +39,4 @@ RUN mkdir -p /app/data /app/data/tmp /app/logs
 EXPOSE 8000
 
 ENTRYPOINT ["/app/scripts/entrypoint.sh"]
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["/app/scripts/start.sh"]

README.cloudflare.md

@@ -117,6 +117,12 @@ npx wrangler deploy
 - `GET https://<你的域名或workers.dev>/health`
 - 打开 `https://<你的域名或workers.dev>/login`
 
+（可选）冒烟测试：
+
+```bash
+python scripts/smoke_test.py --base-url https://<你的域名或workers.dev>
+```
+
 默认管理员账号密码：
 - `admin / admin`
 
@@ -138,6 +144,8 @@ npx wrangler deploy
 - `CLOUDFLARE_API_TOKEN`
 - `CLOUDFLARE_ACCOUNT_ID`（必填）
 
+> 提示：`CLOUDFLARE_API_TOKEN` 建议使用 **API Token**（不要用 Global API Key），并确保至少包含 **Workers Scripts / D1 / Workers KV Storage** 的编辑权限；否则工作流可能无法自动创建/复用 D1/KV 或部署 Worker。
+
 然后直接 push 到 `main`（或在 Actions 页面手动 Run workflow）即可一键部署（无需你手动创建/填写 D1 或 KV 的 ID）。
 
 > 注意：此版本不再使用 R2。GitHub Actions 会自动创建/复用 D1 与 KV，但你仍需在 GitHub 配好 `CLOUDFLARE_API_TOKEN` / `CLOUDFLARE_ACCOUNT_ID`。

app/api/v1/image.py

@@ -121,8 +121,7 @@ async def create_image(request: ImageGenerationRequest):
     try:
         token_mgr = await get_token_manager()
         await token_mgr.reload_if_stale()
-        pool_name = ModelService.pool_for_model(request.model)
-        token = token_mgr.get_token(pool_name)
+        token = token_mgr.get_token_for_model(request.model)
     except Exception as e:
         logger.error(f"Failed to get token: {e}")
         try:

app/api/v1/models.py

@@ -2,7 +2,9 @@
 Models API 路由
 """
 
-from fastapi import APIRouter
+import time
+
+from fastapi import APIRouter, HTTPException
 
 from app.services.grok.model import ModelService
 
@@ -13,16 +15,37 @@
 @router.get("/models")
 async def list_models():
     """OpenAI 兼容 models 列表接口"""
+    ts = int(time.time())
     data = [
         {
             "id": m.model_id,
             "object": "model",
-            "created": 0,
+            "created": ts,
             "owned_by": "grok2api",
+            "display_name": m.display_name,
+            "description": m.description,
         }
         for m in ModelService.list()
     ]
     return {"object": "list", "data": data}
 
 
+@router.get("/models/{model_id}")
+async def get_model(model_id: str):
+    """OpenAI compatible: single model detail."""
+    m = ModelService.get(model_id)
+    if not m:
+        raise HTTPException(status_code=404, detail=f"Model '{model_id}' not found")
+
+    ts = int(time.time())
+    return {
+        "id": m.model_id,
+        "object": "model",
+        "created": ts,
+        "owned_by": "grok2api",
+        "display_name": m.display_name,
+        "description": m.description,
+    }
+
+
 __all__ = ["router"]

app/services/grok/chat.py

@@ -211,14 +211,21 @@ def build_payload(
         temporary = get_config("grok.temporary", True)
         if think is None:
             think = get_config("grok.thinking", False)
+
+        # Upstream payload expects image attachments merged into fileAttachments.
+        merged_attachments: List[str] = []
+        if file_attachments:
+            merged_attachments.extend(file_attachments)
+        if image_attachments:
+            merged_attachments.extend(image_attachments)
 
         return {
             "temporary": temporary,
             "modelName": model,
             "modelMode": mode,
             "message": message,
-            "fileAttachments": file_attachments or [],
-            "imageAttachments": image_attachments or [],
+            "fileAttachments": merged_attachments,
+            "imageAttachments": [],
             "disableSearch": False,
             "enableImageGeneration": True,
             "returnImageBytes": False,
@@ -460,8 +467,7 @@ async def completions(
         try:
             token_mgr = await get_token_manager()
             await token_mgr.reload_if_stale()
-            pool_name = ModelService.pool_for_model(model)
-            token = token_mgr.get_token(pool_name)
+            token = token_mgr.get_token_for_model(model)
         except Exception as e:
             logger.error(f"Failed to get token: {e}")
             try:

app/services/grok/media.py

@@ -398,8 +398,7 @@ async def completions(
         try:
             token_mgr = await get_token_manager()
             await token_mgr.reload_if_stale()
-            pool_name = ModelService.pool_for_model(model)
-            token = token_mgr.get_token(pool_name)
+            token = token_mgr.get_token_for_model(model)
         except Exception as e:
             logger.error(f"Failed to get token: {e}")
             try: