Overhaul Docker build: single-stage, system pip, explicit deps

Dockerfile

@@ -1,77 +1,44 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree.
 
-# Multi-stage build using openenv-base
-# This Dockerfile is flexible and works for both:
-# - In-repo environments (with local OpenEnv sources)
-# - Standalone environments (with openenv from PyPI/Git)
-# The build script (openenv build) handles context detection and sets appropriate build args.
-
-ARG BASE_IMAGE=ghcr.io/meta-pytorch/openenv-base:latest
-FROM ${BASE_IMAGE} AS builder
+FROM ghcr.io/meta-pytorch/openenv-base:latest
 
 WORKDIR /app
 
-# Ensure git is available (required for installing dependencies from VCS)
+# Ensure git and curl are available
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends git && \
+    apt-get install -y --no-install-recommends git curl && \
     rm -rf /var/lib/apt/lists/*
 
-# Build argument to control whether we're building standalone or in-repo
-ARG BUILD_MODE=in-repo
-ARG ENV_NAME=AutoMathReasoner
+# Install uv explicitly to ensure we have the latest version for pip install
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
+    mv /root/.local/bin/uv /usr/local/bin/uv && \
+    mv /root/.local/bin/uvx /usr/local/bin/uvx
 
-# Copy environment code (always at root of build context)
+# Copy the entire project to /app/env
 COPY . /app/env
-
-# For in-repo builds, openenv is already vendored in the build context
-# For standalone builds, openenv will be installed via pyproject.toml
 WORKDIR /app/env
 
-# Ensure uv is available (for local builds where base image lacks it)
-RUN if ! command -v uv >/dev/null 2>&1; then \
-        curl -LsSf https://astral.sh/uv/install.sh | sh && \
-        mv /root/.local/bin/uv /usr/local/bin/uv && \
-        mv /root/.local/bin/uvx /usr/local/bin/uvx; \
-    fi
-    
-# Install dependencies using uv sync
-# Bypass Windows generated lock files to securely build native Linux wheels on HF Spaces
-RUN --mount=type=cache,target=/root/.cache/uv \
-    rm -f uv.lock && \
-    uv sync --no-install-project --no-editable
-
-RUN --mount=type=cache,target=/root/.cache/uv \
-    rm -f uv.lock && \
-    uv sync --no-editable
-
-# Final runtime stage
-FROM ${BASE_IMAGE}
-
-WORKDIR /app
-
-# Copy the virtual environment from builder
-COPY --from=builder /app/env/.venv /app/.venv
-
-# Copy the environment code
-COPY --from=builder /app/env /app/env
+# Install dependencies globally into the container (--system) to avoid venv migration issues.
+# We remove uv.lock because it may contain platform-specific pins that conflict with Linux.
+# "openenv-core" and other dependencies from pyproject.toml are installed here.
+RUN rm -f uv.lock && \
+    uv pip install --system --no-cache .
 
-# Set PATH to use the virtual environment
-ENV PATH="/app/.venv/bin:$PATH"
-
-# Set PYTHONPATH so imports work correctly
+# Set PYTHONPATH so that 'import AutoMathReasoner' works correctly.
+# The project layout has the AutoMathReasoner namespace mapped to the root directory.
 ENV PYTHONPATH="/app/env:$PYTHONPATH"
 
-#Enable Web Interface
+# Enable Web Interface for OpenEnv
 ENV ENABLE_WEB_INTERFACE=true
 
+# Hugging Face Spaces dynamically assigns a port, but usually expects 7860
+ENV PORT=7860
+
 # Health check
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:7860/health || exit 1
 
-# Run the FastAPI server
-# The module path is constructed to work with the /app/env structure
-CMD ["sh", "-c", "cd /app/env && uvicorn server.app:app --host 0.0.0.0 --port 7860"]
+# Launch the FastAPI server.
+# We use the module string to ensure the setup-tools mapped namespace is used.
+CMD ["uvicorn", "AutoMathReasoner.server.app:app", "--host", "0.0.0.0", "--port", "7860"]

pyproject.toml

@@ -14,18 +14,11 @@ version = "0.1.0"
 description = "Automathreasoner environment for OpenEnv"
 requires-python = ">=3.10"
 dependencies = [
-    # Core OpenEnv runtime (provides FastAPI server + HTTP client types)
-    # install from github
-    # "openenv-core[core] @ git+https://github.com/meta-pytorch/OpenEnv.git",
-    "openenv-core[core]>=0.2.2",
-    # Environment-specific dependencies
-    # Add all dependencies needed for your environment here
-    # Examples:
-    # "numpy>=1.19.0",
-    # "torch>=2.0.0",
-    # "gymnasium>=0.29.0",
-    # "openspiel>=1.0.0",
-    # "smolagents>=1.22.0,<2",
+    "openenv-core>=0.2.2",
+    "numpy>=1.24.0",
+    "pytest>=8.0.0",
+    "fastapi>=0.100.0",
+    "uvicorn>=0.22.0",
 ]
 
 [project.optional-dependencies]