init

app.py

@@ -22,16 +22,11 @@ Usage:
 """
 
 # 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 SnakeAction, SnakeObservation
-    from .snake_environment import SnakeEnvironment
-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 SnakeAction, SnakeObservation
-    from server.snake_environment import SnakeEnvironment
+# In-repo imports (when running from OpenEnv repository)
+# Standalone imports (when environment is standalone with openenv-core from pip)
+from openenv_core.env_server.http_server import create_app
+from envs.snake_env import SnakeAction, SnakeObservation
+from snake_environment import SnakeEnvironment
 
 # Create the environment instance
 env = SnakeEnvironment()

snake_environment.py

@@ -19,18 +19,13 @@ import marlenv.envs  # Register marlenv environments with gym
 import numpy as np
 
 # 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
+# In-repo imports (when running from OpenEnv repository)
+from core.env_server.interfaces import Environment
+from core.env_server.types import State
+from envs.snake_env import SnakeAction, SnakeObservation
 
-    from ..models import SnakeAction, SnakeObservation
-except ImportError:
-    from models import SnakeAction, SnakeObservation
-
-    # 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 openenv_core.env_server.interfaces import Environment
+# from openenv_core.env_server.types import State
 
 
 class SingleAgentWrapper(gym.Wrapper):
@@ -44,15 +39,15 @@ class SingleAgentWrapper(gym.Wrapper):
     def __init__(self, env):
         super().__init__(env)
         # Unwrap observation and action spaces for single agent
-        if hasattr(env.observation_space, '__getitem__'):
+        if hasattr(env.observation_space, "__getitem__"):
             self.observation_space = env.observation_space[0]
-        if hasattr(env.action_space, '__getitem__'):
+        if hasattr(env.action_space, "__getitem__"):
             self.action_space = env.action_space[0]
 
     def reset(self, **kwargs):
         obs = self.env.reset(**kwargs)
         # Remove first dimension if it's a multi-agent array (num_agents, H, W, C)
-        if hasattr(obs, 'shape') and len(obs.shape) == 4 and obs.shape[0] == 1:
+        if hasattr(obs, "shape") and len(obs.shape) == 4 and obs.shape[0] == 1:
             return obs[0]  # Return (H, W, C)
         # Return first agent's observation if it's a list
         if isinstance(obs, list):
@@ -65,7 +60,7 @@ class SingleAgentWrapper(gym.Wrapper):
 
         # Unwrap returns for single agent
         # Handle observation: remove first dimension if shape is (1, H, W, C)
-        if hasattr(obs, 'shape') and len(obs.shape) == 4 and obs.shape[0] == 1:
+        if hasattr(obs, "shape") and len(obs.shape) == 4 and obs.shape[0] == 1:
             obs = obs[0]  # Convert (1, H, W, C) -> (H, W, C)
         elif isinstance(obs, list):
             obs = obs[0]