chore: migrate to new cli

Author: Lawhy

src/envs/websearch_env/__init__.py

@@ -4,10 +4,9 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-"""WebSearch Env Environment - A simple test environment for HTTP server."""
+"""WebSearch Env Environment - A web search environment that uses Google Search API (via Serper.dev)."""
 
 from .client import WebSearchEnv
 from .models import WebSearchAction, WebSearchObservation
 
 __all__ = ["WebSearchAction", "WebSearchObservation", "WebSearchEnv"]
-

src/envs/websearch_env/client.py

@@ -13,9 +13,9 @@
 
 from typing import Dict
 
-from core.client_types import StepResult
-from core.env_server.types import State
-from core.http_env_client import HTTPEnvClient
+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 WebSearchAction, WebSearchObservation
 

src/envs/websearch_env/models.py

@@ -7,15 +7,15 @@
 """
 Data models for the WebSearch Env Environment.
 
-The WebSearch_env environment is a simple test environment that echoes back messages.
+The WebSearch Env environment is an environment that searches the web with Google Search API (via Serper API).
 """
 
 from __future__ import annotations
 
 # Use pydantic dataclass for validation
 from pydantic.dataclasses import dataclass
 from pydantic import Field
-from core.env_server.types import Action, Observation
+from openenv_core.env_server.types import Action, Observation
 
 
 @dataclass(kw_only=True)

src/envs/websearch_env/server/__init__.py

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

src/envs/websearch_env/server/app.py

@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 """
-FastAPI application for the WebSearch Env Environment.
+FastAPI application for the Websearch Env Environment.
 
 This module creates an HTTP server that exposes the WebSearchEnvironment
 over HTTP endpoints, making it compatible with HTTPEnvClient.
@@ -22,24 +22,49 @@
 """
 
 try:
-    from core.env_server.http_server import create_app
+    from openenv_core.env_server.http_server import create_app
 except Exception as e:  # pragma: no cover
     raise ImportError(
-        "openenv_core is required for the web interface. Install template deps with '\n"
-        "    pip install -r server/requirements.txt\n'"
+        "openenv_core is required for the web interface. Install dependencies with '\n"
+        "    uv sync\n'"
     ) from e
 
 from .websearch_env_environment import WebSearchEnvironment
-from ..models import WebSearchAction, WebSearchObservation
+from models import WebSearchAction, WebSearchObservation
 
 # Create the environment instance
 env = WebSearchEnvironment()
 
 # Create the app with web interface and README integration
-app = create_app(env, WebSearchAction, WebSearchObservation, env_name="websearch_env")
+app = create_app(
+    env,
+    WebSearchAction,
+    WebSearchObservation,
+    env_name="websearch_env",
+)
 
 
-if __name__ == "__main__":
+def main(host: str = "0.0.0.0", port: int = 8000):
+    """
+    Entry point for direct execution via uv run or python -m.
+
+    This function enables running the server without Docker:
+        uv run --project . server
+        uv run --project . server --port 8001
+        python -m websearch_env.server.app
+
+    Args:
+        host: Host address to bind to (default: "0.0.0.0")
+        port: Port number to listen on (default: 8000)
+
+    For production deployments, consider using uvicorn directly with
+    multiple workers:
+        uvicorn websearch_env.server.app:app --workers 4
+    """
     import uvicorn
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
+
+
+if __name__ == "__main__":
+    main()

src/envs/websearch_env/server/websearch_env_environment.py

@@ -5,22 +5,20 @@
 # LICENSE file in the root directory of this source tree.
 
 """
-WebSearch Env Environment Implementation (inspired by Search-R1).
+Websearch Env Environment Implementation.
 
-A web search environment that uses the google search API (via Serper.dev) to search the web.
-It maintains minimal state and simply returns the search results.
+A web search environment that uses the google search API (via Serper API) to search the web.
 """
 
 from __future__ import annotations
 import asyncio
 import os
 from uuid import uuid4
 
-from core.env_server.interfaces import Environment
-from core.env_server.types import State
-
-from ..models import WebSearchAction, WebSearchObservation
-from .websearch_tool import WebSearchTool
+from models import WebSearchAction, WebSearchObservation
+from openenv_core.env_server.interfaces import Environment
+from openenv_core.env_server.types import State
+from websearch_tool import WebSearchTool
 
 
 class WebSearchEnvironment(Environment):

src/envs/websearch_env/server/websearch_tool.py

@@ -20,7 +20,7 @@
 import aiohttp
 import chardet
 
-from ..models import WebContent, WebSearchAction, WebSearchObservation
+from models import WebContent, WebSearchAction, WebSearchObservation
 
 
 class WebSearchTool: