WIP

Author: joshcarp

src/overcooked_demo/README.md

@@ -7,6 +7,9 @@ A web application where humans can play Overcooked with trained AI agents.
 
 * [Installation](#installation)
 * [Usage](#usage)
+  * [Docker Deployment](#docker-deployment)
+  * [Local Run with uv](#local-run-with-uv)
+  * [Command Line](#command-line)
 * [Dependencies](#dependencies)
 * [Using Pre-trained Agents](#using-pre-trained-agents)
 * [Updating](#updating)
@@ -17,8 +20,14 @@ A web application where humans can play Overcooked with trained AI agents.
 
 Building the server image requires [Docker](https://docs.docker.com/get-docker/)
 
+For local development with uv, you'll need:
+- Python 3.7 or later
+- [uv](https://github.com/astral-sh/uv) - Install with `pip install uv`
+
 ## Usage
 
+### Docker Deployment
+
 The server can be deployed locally using the driver script included in the repo. To run the production server, use the command
 ```bash
 ./up.sh production
@@ -36,6 +45,23 @@ In order to kill the production server, run
 ./down.sh
 ```
 
+### Local Run with uv
+
+To run the server locally using uv without Docker, use:
+
+```bash
+./up.sh local
+```
+
+This will:
+1. Create a virtual environment in the server directory if it doesn't exist
+2. Install all dependencies using uv
+3. Start the server on port 5000
+
+After running this command, navigate to http://localhost:5000
+
+### Command Line
+
 You can also start the server via the command line. After installing the `overcooked_ai` via pip, you can start the server by typing
 
 ```

src/overcooked_demo/docker-compose.yml

@@ -1,5 +1,3 @@
-version : '3.7'
-
 services:
     app:
         build:

src/overcooked_demo/server/Dockerfile

@@ -1,43 +1,53 @@
-FROM python:3.7-buster 
+FROM python:3.9-slim 
 
 ARG BUILD_ENV
 ARG OVERCOOKED_BRANCH
 ARG GRAPHICS
 
 WORKDIR /app
 
-# Install non-chai dependencies
-COPY ./requirements.txt ./requirements.txt
-RUN pip install -r requirements.txt
+# Install uv
+RUN pip install uv
 
-# Install eventlet production server if production build
-RUN if [ "$BUILD_ENV" = "production" ] ; then pip install eventlet ; fi
+# Create a virtual environment for uv
+RUN uv venv
+
+# Copy the pyproject.toml for installation
+COPY ./pyproject.toml ./pyproject.toml
+COPY ./dev_helper.py ./dev_helper.py
 
-# Clone chai code
+# Clone chai code for the human_aware_rl module
+RUN apt-get update && apt-get install -y git
 RUN git clone --recursive https://github.com/HumanCompatibleAI/overcooked_ai.git --branch $OVERCOOKED_BRANCH --single-branch /overcooked_ai
 
 # Dummy data_dir so things don't break
 RUN echo "import os; DATA_DIR=os.path.abspath('.')" >> /overcooked_ai/src/human_aware_rl/data_dir.py
 
-# Install chai dependencies
-RUN pip install -e '/overcooked_ai[harl]'
+# Install server dependencies
+RUN . .venv/bin/activate && uv pip install -e .
 
-RUN apt-get -y update
-RUN apt-get install -y libgl1-mesa-dev
+# Install the cloned overcooked_ai in development mode
+RUN . .venv/bin/activate && uv pip install -e /overcooked_ai
+
+# Install eventlet production server if production build
+RUN if [ "$BUILD_ENV" = "production" ] ; then . .venv/bin/activate && uv pip install "eventlet>=0.39.0" ; fi
+
+# Install needed packages
+RUN apt-get update && apt-get install -y \
+    libgl1-mesa-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 # Copy over remaining files
 COPY ./static ./static
 COPY ./*.py ./
 COPY ./graphics/$GRAPHICS ./static/js/graphics.js
 COPY ./config.json ./config.json
 
-
-
 # Set environment variables that will be used by app.py
 ENV HOST 0.0.0.0
 ENV PORT 5000
 ENV CONF_PATH config.json
 
-# Do the thing
+# Expose port and run the app, using dev_helper to ensure proper Python path
 EXPOSE 5000
-CMD ["python", "-u", "app.py"]
+CMD [".venv/bin/python", "-m", "dev_helper", "app.py"]

src/overcooked_demo/server/README.md

@@ -0,0 +1,48 @@
+# Overcooked Demo Server
+
+This directory contains the server code for the Overcooked AI demo.
+
+## Running with uv
+
+The server now uses [uv](https://github.com/astral-sh/uv) for dependency management and running Python code.
+
+### Prerequisites
+
+Install uv:
+
+```bash
+pip install uv
+```
+
+### Running the Server
+
+You can run the server directly using:
+
+```bash
+uv run app.py
+```
+
+Alternatively, use the provided shell script:
+
+```bash
+./run_server.sh
+```
+
+## Docker
+
+The Dockerfile has been updated to use uv as well. Build and run the Docker container with:
+
+```bash
+# Build the container
+docker build -t overcooked-server \
+  --build-arg BUILD_ENV=development \
+  --build-arg OVERCOOKED_BRANCH=master \
+  --build-arg GRAPHICS=js .
+
+# Run the container
+docker run -p 5000:5000 overcooked-server
+```
+
+## Dependencies
+
+Dependencies are now managed through the `pyproject.toml` file. If you need to add or modify dependencies, update this file instead of the legacy `requirements.txt`. 

src/overcooked_demo/server/dev_helper.py

@@ -0,0 +1,29 @@
+"""
+Helper module to add the parent src directory to the Python path.
+This allows importing human_aware_rl and other modules from the main project.
+
+Usage:
+    # At the top of your script (e.g., app.py)
+    import os
+    import sys
+    
+    # Add parent directory to path
+    sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")))
+    
+    # Now you can import from human_aware_rl
+    from human_aware_rl.rllib.rllib import load_agent
+"""
+
+import os
+import sys
+import pathlib
+
+def add_src_to_path():
+    """Add the parent src directory to the Python path."""
+    current_dir = pathlib.Path(__file__).parent.absolute()
+    src_dir = current_dir.parent.parent  # ../.. relative to this file
+    sys.path.insert(0, str(src_dir))
+    print(f"Added {src_dir} to Python path")
+
+# Automatically add to path when imported
+add_src_to_path() 

src/overcooked_demo/server/pyproject.toml

@@ -0,0 +1,42 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "overcooked_server"
+version = "1.0.0"
+description = "Server for Overcooked AI demo"
+requires-python = ">=3.9"
+dependencies = [
+    "dill",
+    "numpy<2.0.0",
+    "certifi>=2020.6.20",
+    "click>=8.0",
+    "dnspython>=1.16.0",
+    "Flask>=2.1.0",
+    "Flask-SocketIO>=4.3.0",
+    "greenlet>=0.4.16",
+    "itsdangerous>=2.0",
+    "Jinja2>=3.1.0",
+    "MarkupSafe>=2.0",
+    "monotonic>=1.5",
+    "python-engineio>=3.13.0",
+    "python-socketio>=4.6.0",
+    "six>=1.15.0",
+    "Werkzeug>=2.0.3",
+    "requests>=2.23.0",
+    "protobuf>=3.19",
+    "eventlet>=0.39.0",
+    "ray[rllib]>=2.5.0",
+]
+
+[project.optional-dependencies]
+tensorflow = [
+    "tensorflow>=2.14.0",
+]
+
+[tool.setuptools]
+py-modules = []
+
+[tool.setuptools.package-dir]
+"" = "../.." 

src/overcooked_demo/server/run_server.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# This script runs the Overcooked server using uv
+
+# Check if uv is installed
+if ! command -v uv &> /dev/null
+then
+    echo "uv could not be found. Please install it first using 'pip install uv'"
+    exit 1
+fi
+
+# Create a venv if it doesn't exist
+if [ ! -d ".venv" ]; then
+    echo "Creating virtual environment..."
+    uv venv
+fi
+
+# Activate the virtual environment
+source .venv/bin/activate
+
+# Install dependencies if needed
+if [ ! -f ".venv/.initialized" ]; then
+    # Install dependencies from pyproject.toml
+    echo "Installing dependencies from pyproject.toml..."
+    uv pip install -e .
+    
+    # Also install root package
+    echo "Ensuring overcooked_ai is installed..."
+    ROOT_DIR="$(realpath "$(dirname "$0")/../..")"
+    uv pip install -e "$ROOT_DIR"
+    
+    # Try to install tensorflow with a fallback
+    echo "Attempting to install tensorflow..."
+    if ! uv pip install -e ".[tensorflow]" 2>/dev/null; then
+        echo "Could not install latest tensorflow. Trying compatible version..."
+        # Try a version known to work on many platforms
+        if ! uv pip install "tensorflow>=2.8.0" 2>/dev/null; then
+            echo "Warning: Could not install tensorflow. The server will run with limited functionality."
+        fi
+    fi
+    
+    # Mark as initialized
+    touch .venv/.initialized
+fi
+
+# Run the server using the Python interpreter from the venv
+echo "Starting server..."
+.venv/bin/python -m dev_helper app.py "$@"