fix openenv-core dep

trade_env/pyproject.toml

@@ -1,45 +1,29 @@
-# 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-trade_env"
+name = "trade-env"
 version = "0.1.0"
-description = "Trade Env environment for OpenEnv"
-requires-python = ">=3.10"
+description = "Retail Trader Behavior Coach - RL agent that intervenes on bad trading behavior"
+requires-python = ">=3.11"
 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",
+    "fastapi>=0.115.0",
+    "uvicorn>=0.24.0",
+    "pydantic>=2.0.0",
+    "torch>=2.0.0",
+    "python-dotenv>=1.0.0",
+    "openai>=1.0.0",
 ]
 
 [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 trade_env.server.app
 server = "trade_env.server.app:main"
 
 [tool.setuptools]
-include-package-data = true
-packages = ["trade_env", "trade_env.server"]
-package-dir = { "trade_env" = ".", "trade_env.server" = "server" }
+packages = ["trade_env", "trade_env.server", "trade_env.env", "trade_env.schemas", "trade_env.agent"]

trade_env/server/__init__.py

@@ -4,8 +4,5 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-"""Trade Env environment server components."""
 
-from .environment import TradeEnvironment
-
-__all__ = ["TradeEnvironment"]
+__all__ = []

trade_env/server/environment.py

@@ -1,104 +1,8 @@
-# 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.
+"""Trade Env Server Environment - wraps CoachEnv for OpenEnv server."""
 
-"""
-Trade Env Environment Implementation.
+from trade_env.env.coach_env import CoachEnv
 
-A simple test environment that echoes back messages sent to it.
-Perfect for testing HTTP server infrastructure.
-"""
+env = CoachEnv()
 
-from uuid import uuid4
-
-from openenv.core.env_server.interfaces import Environment
-from openenv.core.env_server.types import State
-
-try:
-    from ..models import TradeAction, TradeObservation
-except ImportError:
-    from models import TradeAction, TradeObservation
-
-
-class TradeEnvironment(Environment):
-    """
-    A simple echo environment that echoes back messages.
-
-    This environment is designed for testing the HTTP server infrastructure.
-    It maintains minimal state and simply echoes back whatever message it receives.
-
-    Example:
-        >>> env = TradeEnvironment()
-        >>> obs = env.reset()
-        >>> print(obs.echoed_message)  # "Trade Env environment ready!"
-        >>>
-        >>> obs = env.step(TradeAction(message="Hello"))
-        >>> print(obs.echoed_message)  # "Hello"
-        >>> print(obs.message_length)  # 5
-    """
-
-    # Enable concurrent WebSocket sessions.
-    # Set to True if your environment isolates state between instances.
-    # When True, multiple WebSocket clients can connect simultaneously, each
-    # getting their own environment instance (when using factory mode in app.py).
-    SUPPORTS_CONCURRENT_SESSIONS: bool = True
-
-    def __init__(self):
-        """Initialize the trade_env environment."""
-        self._state = State(episode_id=str(uuid4()), step_count=0)
-        self._reset_count = 0
-
-    def reset(self) -> TradeObservation:
-        """
-        Reset the environment.
-
-        Returns:
-            TradeObservation with a ready message
-        """
-        self._state = State(episode_id=str(uuid4()), step_count=0)
-        self._reset_count += 1
-
-        return TradeObservation(
-            echoed_message="Trade Env environment ready!",
-            message_length=0,
-            done=False,
-            reward=0.0,
-        )
-
-    def step(self, action: TradeAction) -> TradeObservation:  # type: ignore[override]
-        """
-        Execute a step in the environment by echoing the message.
-
-        Args:
-            action: TradeAction containing the message to echo
-
-        Returns:
-            TradeObservation with the echoed message and its length
-        """
-        self._state.step_count += 1
-
-        message = action.message
-        length = len(message)
-
-        # Simple reward: longer messages get higher rewards
-        reward = length * 0.1
-
-        return TradeObservation(
-            echoed_message=message,
-            message_length=length,
-            done=False,
-            reward=reward,
-            metadata={"original_message": message, "step": self._state.step_count},
-        )
-
-    @property
-    def state(self) -> State:
-        """
-        Get the current environment state.
-
-        Returns:
-            Current State with episode_id and step_count
-        """
-        return self._state
+def get_env() -> CoachEnv:
+    return env