From 98b58699b66276120602c91cd6e3e98e4a352151 Mon Sep 17 00:00:00 2001 From: burtenshaw Date: Sun, 8 Mar 2026 09:03:24 -0700 Subject: [PATCH 1/2] fix the template imports and types --- src/openenv/cli/templates/openenv_env/client.py | 2 +- .../openenv_env/server/__ENV_NAME___environment.py | 6 +++++- src/openenv/cli/templates/openenv_env/server/app.py | 10 ++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/openenv/cli/templates/openenv_env/client.py b/src/openenv/cli/templates/openenv_env/client.py index 3ee1a0747..720090431 100644 --- a/src/openenv/cli/templates/openenv_env/client.py +++ b/src/openenv/cli/templates/openenv_env/client.py @@ -16,7 +16,7 @@ class __ENV_CLASS_NAME__Env( - EnvClient[__ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation] + EnvClient[__ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation, State] ): """ Client for the __ENV_TITLE_NAME__ Environment. diff --git a/src/openenv/cli/templates/openenv_env/server/__ENV_NAME___environment.py b/src/openenv/cli/templates/openenv_env/server/__ENV_NAME___environment.py index df640f89c..bbde58219 100644 --- a/src/openenv/cli/templates/openenv_env/server/__ENV_NAME___environment.py +++ b/src/openenv/cli/templates/openenv_env/server/__ENV_NAME___environment.py @@ -13,10 +13,14 @@ from uuid import uuid4 -from models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation from openenv.core.env_server.interfaces import Environment from openenv.core.env_server.types import State +try: + from ..models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation +except ImportError: + from models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation + class __ENV_CLASS_NAME__Environment(Environment): """ diff --git a/src/openenv/cli/templates/openenv_env/server/app.py b/src/openenv/cli/templates/openenv_env/server/app.py index 73d26cdec..4ab1e1034 100644 --- a/src/openenv/cli/templates/openenv_env/server/app.py +++ b/src/openenv/cli/templates/openenv_env/server/app.py @@ -35,10 +35,12 @@ "openenv is required for the web interface. Install dependencies with '\n uv sync\n'" ) from e -# Import from local models.py (PYTHONPATH includes /app/env in Docker) -from models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation - -from .__ENV_NAME___environment import __ENV_CLASS_NAME__Environment +try: + from ..models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation + from .__ENV_NAME___environment import __ENV_CLASS_NAME__Environment +except ImportError: + from models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation + from server.__ENV_NAME___environment import __ENV_CLASS_NAME__Environment # Create the app with web interface and README integration From 10066c3f18ac9fd75b6688f4d3f7a521d296e881 Mon Sep 17 00:00:00 2001 From: burtenshaw Date: Thu, 12 Mar 2026 09:07:45 +0100 Subject: [PATCH 2/2] Update src/openenv/cli/templates/openenv_env/server/app.py Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- src/openenv/cli/templates/openenv_env/server/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openenv/cli/templates/openenv_env/server/app.py b/src/openenv/cli/templates/openenv_env/server/app.py index 4ab1e1034..898911a2a 100644 --- a/src/openenv/cli/templates/openenv_env/server/app.py +++ b/src/openenv/cli/templates/openenv_env/server/app.py @@ -38,7 +38,7 @@ try: from ..models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation from .__ENV_NAME___environment import __ENV_CLASS_NAME__Environment -except ImportError: +except ModuleNotFoundError: from models import __ENV_CLASS_NAME__Action, __ENV_CLASS_NAME__Observation from server.__ENV_NAME___environment import __ENV_CLASS_NAME__Environment