update echo_env for the new standard

Author: rycerzes

src/envs/echo_env/client.py

@@ -13,12 +13,19 @@
 
 from typing import Any, Dict
 
-from core.client_types import StepResult
-
-from core.env_server.types import State
-from core.http_env_client import HTTPEnvClient
-
-from .models import EchoAction, EchoObservation
+# Support both in-repo and standalone imports
+try:
+    # In-repo imports (when running from OpenEnv repository)
+    from core.client_types import StepResult
+    from core.env_server.types import State
+    from core.http_env_client import HTTPEnvClient
+    from .models import EchoAction, EchoObservation
+except ImportError:
+    # Standalone imports (when environment is standalone with openenv-core from pip)
+    from openenv_core.client_types import StepResult
+    from openenv_core.env_server.types import State
+    from openenv_core.http_env_client import HTTPEnvClient
+    from models import EchoAction, EchoObservation
 
 
 class EchoEnv(HTTPEnvClient[EchoAction, EchoObservation]):

src/envs/echo_env/models.py

@@ -12,7 +12,13 @@
 
 from dataclasses import dataclass
 
-from core.env_server.types import Action, Observation
+# Support both in-repo and standalone imports
+try:
+    # In-repo imports (when running from OpenEnv repository)
+    from core.env_server.types import Action, Observation
+except ImportError:
+    # Standalone imports (when environment is standalone with openenv-core from pip)
+    from openenv_core.env_server.types import Action, Observation
 
 
 @dataclass(kw_only=True)

src/envs/echo_env/openenv.yaml

@@ -0,0 +1,6 @@
+spec_version: 1
+name: echo_env
+type: space
+runtime: fastapi
+app: server.app:app
+port: 8000

src/envs/echo_env/pyproject.toml

@@ -0,0 +1,41 @@
+# 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.
+
+[build-system]
+requires = ["setuptools>=45", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "openenv-echo-env"
+version = "0.1.0"
+description = "Echo Environment for OpenEnv - simple test environment that echoes back messages"
+requires-python = ">=3.10"
+dependencies = [
+    # Core OpenEnv dependencies (required for server functionality)
+    "openenv-core>=0.1.0",
+    "fastapi>=0.115.0",
+    "pydantic>=2.0.0",
+    "uvicorn>=0.24.0",
+    "requests>=2.31.0",
+    # No additional environment-specific dependencies needed for echo_env
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.0.0",
+    "pytest-cov>=4.0.0",
+]
+
+[project.scripts]
+# Server entry point - enables running via: uv run --project . server
+# or: python -m echo_env.server.app
+server = "echo_env.server.app:main"
+
+[tool.setuptools]
+package-dir = {"" = "."}
+
+[tool.setuptools.packages.find]
+where = ["."]

src/envs/echo_env/server/Dockerfile

@@ -4,22 +4,65 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-# Use the standard openenv base image
-# Built from: docker build -t openenv-base:latest -f src/core/containers/images/Dockerfile .
-# In GitHub Actions, this is overridden to use the GHCR base image
+# Multi-stage build using openenv-base
+# This Dockerfile is flexible and works for both:
+# - In-repo environments (with local src/core)
+# - Standalone environments (with openenv-core from pip)
+# The build script (openenv build) handles context detection and sets appropriate build args.
+
 ARG BASE_IMAGE=openenv-base:latest
+FROM ${BASE_IMAGE} AS builder
+
+WORKDIR /app
+
+# Build argument to control whether we're building standalone or in-repo
+ARG BUILD_MODE=in-repo
+ARG ENV_NAME=echo_env
+
+# Copy environment code (always at root of build context)
+COPY . /app/env
+
+# For in-repo builds, openenv-core is already in the pyproject.toml dependencies
+# For standalone builds, openenv-core will be installed from pip via pyproject.toml
+WORKDIR /app/env
+
+# Install dependencies using uv sync
+# If uv.lock exists, use it; otherwise resolve on the fly
+RUN --mount=type=cache,target=/root/.cache/uv \
+    if [ -f uv.lock ]; then \
+        uv sync --frozen --no-install-project --no-editable; \
+    else \
+        uv sync --no-install-project --no-editable; \
+    fi
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+    if [ -f uv.lock ]; then \
+        uv sync --frozen --no-editable; \
+    else \
+        uv sync --no-editable; \
+    fi
+
+# Final runtime stage
 FROM ${BASE_IMAGE}
 
-# Copy only what's needed for this environment
-COPY src/core/ /app/src/core/
-COPY src/envs/echo_env/ /app/src/envs/echo_env/
+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
+
+# Set PATH to use the virtual environment
+ENV PATH="/app/.venv/bin:$PATH"
 
-# Copy README for web interface documentation
-COPY src/envs/echo_env/README.md /app/README.md
+# Set PYTHONPATH so imports work correctly
+ENV PYTHONPATH="/app/env:$PYTHONPATH"
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:8000/health || exit 1
 
 # Run the FastAPI server
-CMD ["uvicorn", "envs.echo_env.server.app:app", "--host", "0.0.0.0", "--port", "8000"]
+# 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 8000"]

src/envs/echo_env/server/app.py

@@ -12,19 +12,26 @@
 
 Usage:
     # Development (with auto-reload):
-    uvicorn envs.echo_env.server.app:app --reload --host 0.0.0.0 --port 8000
+    uvicorn server.app:app --reload --host 0.0.0.0 --port 8000
 
     # Production:
-    uvicorn envs.echo_env.server.app:app --host 0.0.0.0 --port 8000 --workers 4
+    uvicorn server.app:app --host 0.0.0.0 --port 8000 --workers 4
 
     # Or run directly:
-    python -m envs.echo_env.server.app
+    uv run --project . server
 """
 
-from core.env_server.http_server import create_app
-
-from ..models import EchoAction, EchoObservation
-from .echo_environment import EchoEnvironment
+# Support both in-repo and standalone imports
+try:
+    # In-repo imports (when running from OpenEnv repository)
+    from core.env_server.http_server import create_app
+    from ..models import EchoAction, EchoObservation
+    from .echo_environment import EchoEnvironment
+except ImportError:
+    # Standalone imports (when environment is standalone with openenv-core from pip)
+    from openenv_core.env_server.http_server import create_app
+    from models import EchoAction, EchoObservation
+    from server.echo_environment import EchoEnvironment
 
 # Create the environment instance
 env = EchoEnvironment()

src/envs/echo_env/server/echo_environment.py

@@ -13,10 +13,17 @@
 
 from uuid import uuid4
 
-from core.env_server.interfaces import Environment
-from core.env_server.types import State
-
-from ..models import EchoAction, EchoObservation
+# Support both in-repo and standalone imports
+try:
+    # In-repo imports (when running from OpenEnv repository)
+    from core.env_server.interfaces import Environment
+    from core.env_server.types import State
+    from ..models import EchoAction, EchoObservation
+except ImportError:
+    # Standalone imports (when environment is standalone with openenv-core from pip)
+    from openenv_core.env_server.interfaces import Environment
+    from openenv_core.env_server.types import State
+    from models import EchoAction, EchoObservation
 
 
 class EchoEnvironment(Environment):