Merge pull request #177 from kaykouo/addpoetry

使用Poetry管理依赖并将其更新到Dockerfile中去

Author: CJackHwang

README.md

@@ -28,7 +28,7 @@ This project is generously sponsored by ZMTO. Visit their website: [https://zmto
 
 ## 系统要求
 
-*   **Python**: 3.9+ (推荐 3.10+ 或 3.11+)
+*   **Python**: >=3.9, <4.0 (由 Poetry 管理)
 *   **操作系统**: Windows, macOS, Linux (完全跨平台支持)
 *   **内存**: 建议 2GB+ 可用内存
 *   **网络**: 稳定的互联网连接访问 Google AI Studio
@@ -158,12 +158,36 @@ python launch_camoufox.py --headless
 
 ### 快速开始
 
-1. **安装**: 参见 [安装指南](docs/installation-guide.md)
-2. **配置**: 参见 [环境变量配置指南](docs/environment-configuration.md) - **推荐先配置**
-3. **首次认证**: 参见 [认证设置指南](docs/authentication-setup.md)
-4. **日常运行**: 参见 [日常运行指南](docs/daily-usage.md)
-5. **API使用**: 参见 [API使用指南](docs/api-usage.md)
-6. **Web界面**: 参见 [Web UI使用指南](docs/webui-guide.md)
+本项目现在使用 [Poetry](https://python-poetry.org/) 进行依赖管理。
+
+1.  **安装 Poetry**:
+    如果您尚未安装 Poetry，请参照其官方文档进行安装：[Poetry Installation](https://python-poetry.org/docs/#installation)。
+
+2.  **克隆项目**:
+    ```bash
+    git clone https://github.com/CJackHwang/AIstudioProxyAPI.git
+    cd AIstudioProxyAPI
+    ```
+
+3.  **安装依赖**:
+    使用 Poetry 安装项目依赖。这会自动创建一个虚拟环境（如果当前没有激活的虚拟环境）。
+    ```bash
+    poetry install
+    ```
+
+4.  **激活虚拟环境 (可选但推荐)**:
+    要激活 Poetry 创建的虚拟环境，请运行：
+    ```bash
+    poetry shell
+    ```
+    之后，您可以直接运行 Python 脚本 (例如 `python gui_launcher.py`)。
+    或者，如果您不想激活 shell，可以在每个命令前加上 `poetry run` (例如 `poetry run python gui_launcher.py`)。
+
+5.  **配置**: 参见 [环境变量配置指南](docs/environment-configuration.md) - **推荐先配置**
+6.  **首次认证**: 参见 [认证设置指南](docs/authentication-setup.md)
+7.  **日常运行**: 参见 [日常运行指南](docs/daily-usage.md) (请使用 `poetry run python launch_camoufox.py` 或在 `poetry shell` 中运行 `python launch_camoufox.py`)
+8.  **API使用**: 参见 [API使用指南](docs/api-usage.md)
+9.  **Web界面**: 参见 [Web UI使用指南](docs/webui-guide.md)
 
 ### 详细文档
 

docker/Dockerfile

@@ -9,11 +9,20 @@ RUN apt-get update && \
     supervisor curl \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
+# Install Poetry
+ENV POETRY_HOME="/opt/poetry"
+ENV POETRY_VERSION=1.8.3
+RUN curl -sSL https://install.python-poetry.org | python3 - --version ${POETRY_VERSION} 
+ENV PATH="${POETRY_HOME}/bin:${PATH}"
+
 WORKDIR /app_builder
-COPY requirements.txt ./
-RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -U "camoufox[geoip]" && \
-    pip install --no-cache-dir -r requirements.txt
+
+# Copy Poetry project files
+COPY pyproject.toml poetry.lock ./
+
+# Configure Poetry to not create virtualenvs and install dependencies
+RUN poetry config virtualenvs.create false --local && \
+    poetry install --no-root --no-dev --no-interaction --no-ansi
 
 FROM python:3.10-slim-bookworm
 
@@ -28,11 +37,17 @@ RUN groupadd -r appgroup && useradd -r -g appgroup -s /bin/bash -d /app appuser
 
 WORKDIR /app
 
+# Copy installed packages and executables from builder stage
 COPY --from=builder /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/
 COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /opt/poetry/bin/poetry /usr/local/bin/poetry
 
+# Copy application code
 COPY . .
 
+# Install Playwright browsers and dependencies, and fetch camoufox
+# Note: poetry is now available in the final image if needed for any build scripts,
+# but dependencies should already be installed.
 RUN camoufox fetch && \
     python -m playwright install firefox && \
     python -m playwright install-deps firefox
@@ -69,7 +84,7 @@ ENV PLAYWRIGHT_BROWSERS_PATH=/home/appuser/.cache/ms-playwright
 
 ENV PYTHONUNBUFFERED=1
 
-# 默认环境变量 (可被 .env 文件或运行时环境变量覆盖)
+# Default environment variables (can be overridden by .env or runtime)
 ENV PORT=8000
 ENV DEFAULT_FASTAPI_PORT=2048
 ENV DEFAULT_CAMOUFOX_PORT=9222
@@ -78,7 +93,7 @@ ENV SERVER_LOG_LEVEL=INFO
 ENV DEBUG_LOGS_ENABLED=false
 ENV AUTO_CONFIRM_LOGIN=true
 
-# 向后兼容的环境变量
+# Backward compatibility
 ENV SERVER_PORT=2048
 ENV INTERNAL_CAMOUFOX_PROXY=""