miniworld-maze 1.3.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

miniworld_maze/__init__.py

@@ -25,7 +25,7 @@ if "PYGLET_HEADLESS" not in os.environ:
         "Automatically set PYGLET_HEADLESS=1 for headless rendering. "
         "Set PYGLET_HEADLESS=0 before importing miniworld_maze to override this behavior.",
         UserWarning,
-        stacklevel=2
+        stacklevel=2,
     )
 
 from .core import ObservationLevel
@@ -33,10 +33,6 @@ from .environments.nine_rooms import NineRooms
 from .environments.spiral_nine_rooms import SpiralNineRooms
 from .environments.twenty_five_rooms import TwentyFiveRooms
 
-# Import factory to register environments
-from .environments import factory  # noqa: F401
-
-__version__ = "1.1.0"
 __all__ = [
     "NineRooms",
     "SpiralNineRooms",

miniworld_maze/core/constants.py

@@ -60,6 +60,7 @@ DEFAULT_WARMUP_STEPS: Final[int] = 10
 # TEXTURE THEMES
 # ========================
 
+
 class TextureThemes:
     """Pre-defined texture themes for different environments."""
 
@@ -116,7 +117,6 @@ class TextureThemes:
     ]
 
 
-
 # ========================
 # RENDERING CONSTANTS
 # ========================

miniworld_maze/core/miniworld_gymnasium/unified_env.py

@@ -9,29 +9,71 @@ import gymnasium as gym
 import numpy as np
 import pyglet
 from gymnasium import spaces
-from pyglet.gl import *
-
-from ..observation_types import ObservationLevel
-from .entities import *
-from .math import *
-from .objmesh import *
-from .occlusion_queries import OcclusionQueryManager
-from .opengl import *
-from .params import DEFAULT_PARAMS
-from .random import RandGen
-from .room import Room
+from pyglet.gl import (
+    glEnable,
+    glDeleteLists,
+    glNewList,
+    glLightfv,
+    glShadeModel,
+    glColorMaterial,
+    glCallList,
+    glClearColor,
+    glClearDepth,
+    glClear,
+    glMatrixMode,
+    glLoadIdentity,
+    glOrtho,
+    glLoadMatrixf,
+    glDisable,
+    glBindFramebuffer,
+    glFlush,
+    glEndList,
+    gluPerspective,
+    gluLookAt,
+    GL_DEPTH_TEST,
+    GL_CULL_FACE,
+    GL_COMPILE,
+    GL_LIGHT0,
+    GL_POSITION,
+    GL_AMBIENT,
+    GL_DIFFUSE,
+    GL_SMOOTH,
+    GL_FRONT_AND_BACK,
+    GL_AMBIENT_AND_DIFFUSE,
+    GL_LIGHTING,
+    GL_COLOR_MATERIAL,
+    GL_COLOR_BUFFER_BIT,
+    GL_DEPTH_BUFFER_BIT,
+    GL_PROJECTION,
+    GL_MODELVIEW,
+    GL_TEXTURE_2D,
+    GL_FRAMEBUFFER,
+    GLubyte,
+    GLfloat,
+)
+
+from miniworld_maze.core.observation_types import ObservationLevel
+from miniworld_maze.core.miniworld_gymnasium.entities import Entity, Agent
+from miniworld_maze.core.miniworld_gymnasium.math import Y_VEC, intersect_circle_segs
+from miniworld_maze.core.miniworld_gymnasium.occlusion_queries import (
+    OcclusionQueryManager,
+)
+from miniworld_maze.core.miniworld_gymnasium.opengl import Texture, FrameBuffer, drawBox
+from miniworld_maze.core.miniworld_gymnasium.params import DEFAULT_PARAMS
+from miniworld_maze.core.miniworld_gymnasium.random import RandGen
+from miniworld_maze.core.miniworld_gymnasium.room import Room
 
 # Optional architectural improvements
 try:
-    from .entity_manager import EntityManager
-    from .rendering_engine import RenderingEngine
+    from miniworld_maze.core.miniworld_gymnasium.entity_manager import EntityManager
+    from miniworld_maze.core.miniworld_gymnasium.rendering_engine import RenderingEngine
 
     ARCHITECTURAL_IMPROVEMENTS_AVAILABLE = True
 except ImportError:
     RenderingEngine = None
     EntityManager = None
     ARCHITECTURAL_IMPROVEMENTS_AVAILABLE = False
-from ..constants import (
+from miniworld_maze.core.constants import (
     CARRY_POSITION_OFFSET,
     DEFAULT_DISPLAY_WIDTH,
     DEFAULT_WINDOW_HEIGHT,
@@ -47,6 +89,7 @@ from ..constants import (
     ORTHOGRAPHIC_DEPTH_RANGE,
     PICKUP_RADIUS_MULTIPLIER,
     PICKUP_REACH_MULTIPLIER,
+    POMDP_VIEW_RADIUS,
     PORTAL_CONNECTION_TOLERANCE,
     TEXT_LABEL_WIDTH,
     TEXT_MARGIN_X,
@@ -363,8 +406,6 @@ class UnifiedMiniWorldEnv(gym.Env):
             render_agent: Whether to render the agent in the observation.
                          If None, uses default behavior based on observation level.
         """
-        # Import ObservationLevel here to avoid circular imports
-        from ..observation_types import ObservationLevel
 
         if observation_level == ObservationLevel.TOP_DOWN_PARTIAL:
             if self.agent_mode == "empty":
@@ -1039,9 +1080,6 @@ class UnifiedMiniWorldEnv(gym.Env):
     def _calculate_scene_extents(self, POMDP):
         """Calculate scene extents for rendering."""
         if POMDP:
-            # Import constants for POMDP view radius
-            from ..constants import POMDP_VIEW_RADIUS
-
             agent_x, _, agent_z = self.agent.pos
             min_x = agent_x - POMDP_VIEW_RADIUS
             max_x = agent_x + POMDP_VIEW_RADIUS
@@ -1287,9 +1325,6 @@ class UnifiedMiniWorldEnv(gym.Env):
         if view == "agent":
             img = self.render_obs(self.vis_fb)
         else:
-            # Import ObservationLevel here to avoid circular imports
-            from ..observation_types import ObservationLevel
-
             if self.obs_level == ObservationLevel.TOP_DOWN_PARTIAL:
                 img = self.render_top_view(self.vis_fb, POMDP=True)
             else:

miniworld_maze/environments/__init__.py

@@ -1,9 +1,13 @@
 """Nine Rooms environment implementations."""
 
-from .base_grid_rooms import GridRoomsEnvironment
-from .nine_rooms import NineRooms
-from .spiral_nine_rooms import SpiralNineRooms
-from .twenty_five_rooms import TwentyFiveRooms
+from miniworld_maze.environments.base_grid_rooms import GridRoomsEnvironment
+from miniworld_maze.environments.nine_rooms import NineRooms
+from miniworld_maze.environments.spiral_nine_rooms import SpiralNineRooms
+from miniworld_maze.environments.twenty_five_rooms import TwentyFiveRooms
+
+from gymnasium.envs.registration import register
+from miniworld_maze.core import ObservationLevel
+from miniworld_maze.core.constants import FACTORY_DOOR_SIZE, FACTORY_ROOM_SIZE
 
 __all__ = [
     "GridRoomsEnvironment",
@@ -11,3 +15,40 @@ __all__ = [
     "SpiralNineRooms",
     "TwentyFiveRooms",
 ]
+
+# Register environment variants with factory defaults matching the original wrapper
+register(
+    id="NineRooms-v0",
+    entry_point="miniworld_maze.environments.nine_rooms:NineRooms",
+    max_episode_steps=1000,
+    kwargs={
+        "room_size": FACTORY_ROOM_SIZE,
+        "door_size": FACTORY_DOOR_SIZE,
+        "obs_level": ObservationLevel.TOP_DOWN_PARTIAL,
+        "agent_mode": None,  # becomes "empty" by default
+    },
+)
+
+register(
+    id="SpiralNineRooms-v0",
+    entry_point="miniworld_maze.environments.spiral_nine_rooms:SpiralNineRooms",
+    max_episode_steps=1000,
+    kwargs={
+        "room_size": FACTORY_ROOM_SIZE,
+        "door_size": FACTORY_DOOR_SIZE,
+        "obs_level": ObservationLevel.TOP_DOWN_PARTIAL,
+        "agent_mode": None,
+    },
+)
+
+register(
+    id="TwentyFiveRooms-v0",
+    entry_point="miniworld_maze.environments.twenty_five_rooms:TwentyFiveRooms",
+    max_episode_steps=1000,
+    kwargs={
+        "room_size": FACTORY_ROOM_SIZE,
+        "door_size": FACTORY_DOOR_SIZE,
+        "obs_level": ObservationLevel.TOP_DOWN_PARTIAL,
+        "agent_mode": None,
+    },
+)

miniworld_maze/environments/base_grid_rooms.py

@@ -230,17 +230,20 @@ class GridRoomsEnvironment(UnifiedMiniWorldEnv):
         obs, reward, terminated, truncated, info = super().step(action)
 
         # Check if goal is achieved
-        if self._is_goal_achieved():
+        goal_achieved = self._is_goal_achieved()
+        if goal_achieved:
             terminated = True
             reward = 1.0  # Positive reward for achieving goal
 
+        # Add success indicator to info dictionary
+        info["success"] = 1.0 if goal_achieved else 0.0
+
         # Add agent and goal positions to info dictionary
         agent_pos = self.agent.pos
         info["agent_position"] = np.array([agent_pos[0], agent_pos[2]])  # x, z
 
-        if hasattr(self, "_current_goal_position"):
-            goal_pos = self._current_goal_position
-            info["goal_position"] = np.array([goal_pos[0], goal_pos[2]])  # x, z
+        goal_pos = self._current_goal_position
+        info["goal_position"] = np.array([goal_pos[0], goal_pos[2]])  # x, z
 
         # Return observation as dict
         obs_dict = self._build_observation_dict(obs)
@@ -261,6 +264,8 @@ class GridRoomsEnvironment(UnifiedMiniWorldEnv):
         # Call parent reset
         obs, info = super().reset(seed=seed, options=options, pos=pos)
 
+        info["success"] = 0.0
+
         # Generate goal
         self.desired_goal = self._get_goal()
 
@@ -268,9 +273,8 @@ class GridRoomsEnvironment(UnifiedMiniWorldEnv):
         agent_pos = self.agent.pos
         info["agent_position"] = np.array([agent_pos[0], agent_pos[2]])  # x, z
 
-        if hasattr(self, "_current_goal_position"):
-            goal_pos = self._current_goal_position
-            info["goal_position"] = np.array([goal_pos[0], goal_pos[2]])  # x, z
+        goal_pos = self._current_goal_position
+        info["goal_position"] = np.array([goal_pos[0], goal_pos[2]])  # x, z
 
         # Return observation as dict with desired_goal and achieved_goal
         obs_dict = self._build_observation_dict(obs)
@@ -377,22 +381,24 @@ class GridRoomsEnvironment(UnifiedMiniWorldEnv):
                     goal_positions.append([[center_x, 0.0, center_z]])
                 else:
                     # Two goals per room: center-left and center-right
-                    goal_positions.append([
-                        [center_x - 1.0, 0.0, center_z],  # left goal
-                        [center_x + 1.0, 0.0, center_z],  # right goal
-                    ])
+                    goal_positions.append(
+                        [
+                            [center_x - 1.0, 0.0, center_z],  # left goal
+                            [center_x + 1.0, 0.0, center_z],  # right goal
+                        ]
+                    )
         return goal_positions
 
     def get_extent(self, padding: float = 1.0) -> Tuple[float, float, float, float]:
         """
         Get the scene extent for use with matplotlib imshow.
-        
-        Returns the scene bounds with padding in the format expected by 
+
+        Returns the scene bounds with padding in the format expected by
         matplotlib's imshow(extent=...) parameter: (left, right, bottom, top).
-        
+
         Args:
             padding: Padding to add around environment bounds (default: 1.0)
-            
+
         Returns:
             Tuple[float, float, float, float]: (min_x, max_x, min_z, max_z) with padding
         """
@@ -400,7 +406,7 @@ class GridRoomsEnvironment(UnifiedMiniWorldEnv):
             self.min_x - padding,
             self.max_x + padding,
             self.min_z - padding,
-            self.max_z + padding
+            self.max_z + padding,
         )
 
     def _build_observation_dict(self, obs: np.ndarray) -> dict:

{miniworld_maze-1.3.1.dist-info → miniworld_maze-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: miniworld-maze
-Version: 1.3.1
+Version: 1.4.0
 Summary: Multi-room maze environments from the DrStrategy paper. Provides NineRooms-v0, SpiralNineRooms-v0, and TwentyFiveRooms-v0 gymnasium environments.
 Keywords: reinforcement-learning,environment,gymnasium,multi-room-maze,drstrategy,maze-navigation,partial-observability,3d-environments
 Author: Tim Joseph

{miniworld_maze-1.3.1.dist-info → miniworld_maze-1.4.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-miniworld_maze/__init__.py,sha256=Dfq3558bJ5kgxDZxPxvlHu1531zfBhtiDfKbVL_4zCE,1430
+miniworld_maze/__init__.py,sha256=gbc4Bqlu9HiqbIIZEQ-3mcuceaoKR9al7Ekl6KhSUtk,1318
 miniworld_maze/core/__init__.py,sha256=5BA4WKXQjrG55TNaEid2JGrnf1KQniJZ1HhRqovM1Q0,293
-miniworld_maze/core/constants.py,sha256=UXqmuvsT9ww1GljW74lWPPP9XxVmvti-8JfM_RBSoWQ,4314
+miniworld_maze/core/constants.py,sha256=IjU4t7Nhlm8EOHQ8KVA351oOmTrR0R76M0kgmUXoo1Y,4314
 miniworld_maze/core/miniworld_gymnasium/README.md,sha256=kkZgkRKBdgixpot3uHuiBFlRIKRFIVBVfXwu68XTEv0,74
 miniworld_maze/core/miniworld_gymnasium/__init__.py,sha256=ALOqr4SCVk9I9bmxyoU0Du8LUPE_57jIyZuV4QhOcBc,159
 miniworld_maze/core/miniworld_gymnasium/base_env.py,sha256=K2L5r4gG2k4fEknFqRJ7f-b2S0Uj5QhanS-MLi6ncVc,1927
@@ -260,18 +260,16 @@ miniworld_maze/core/miniworld_gymnasium/textures/white_1.png,sha256=wRrgs92I_Ids
 miniworld_maze/core/miniworld_gymnasium/textures/wood_1.png,sha256=XRZyIN34HFo14olbxRcsHGrzCAFqUlowc6nLR22IFBE,184713
 miniworld_maze/core/miniworld_gymnasium/textures/wood_2.png,sha256=qSDHB-ZO11JJLQuiQse-0edpbuTg1YO-eIBhdTvNUhc,93121
 miniworld_maze/core/miniworld_gymnasium/textures/wood_planks_1.png,sha256=E4SNN1s4yOtkLfZFQy905eip6KvDWnnPUrpS82FxMAg,847259
-miniworld_maze/core/miniworld_gymnasium/unified_env.py,sha256=_xkznGIzXQpZOULgK-XFZaXZbhsouEupByf-4cfZLZc,46607
+miniworld_maze/core/miniworld_gymnasium/unified_env.py,sha256=XWKKic2KGRJ4vTrN5D9VNt6Qaglvo-t8wtIKsh6KSDo,47424
 miniworld_maze/core/miniworld_gymnasium/utils.py,sha256=9cfpg4qYz-Esxvu8nTMPFJc-Tl0TRxTrX6cfg0YuK_o,1007
 miniworld_maze/core/miniworld_gymnasium/wrappers.py,sha256=cD0nGSJYNU96zoWv63aEiKd986POhtHfGGEpNpRL5ec,122
 miniworld_maze/core/observation_types.py,sha256=Co8mEIXzIgk0MLx6tqeBd1EE0PuZOL1gbZwobiEde08,1316
-miniworld_maze/environments/__init__.py,sha256=DKld5MQU7x9eNL6BlxIettA44bCiIn2zIpYECDCNxoQ,331
-miniworld_maze/environments/base_grid_rooms.py,sha256=--tm6t9cHn444xJX9N3Md-4YApK38a2dQi7mnggevbI,14885
-miniworld_maze/environments/factory.py,sha256=Zk26JawsMgSLMgvSnQxFhQCD8yMH76HgqFtogzWFfqY,1333
+miniworld_maze/environments/__init__.py,sha256=KPmY72EA2Q0Xyuy75MZ7RZjJ4SUjlg4QvGR0WXu--78,1717
+miniworld_maze/environments/base_grid_rooms.py,sha256=zlHEw_hlG9hoqrZWUN-QacS0vq8vvNW1U_h2j4RGHFk,14972
 miniworld_maze/environments/nine_rooms.py,sha256=Ct96cKtSt1_nLNI5RBUhwqdNUQq1rHfBJ3aB5Igbdow,1794
 miniworld_maze/environments/spiral_nine_rooms.py,sha256=a_pUuv-ghez8h76Z7YsHkQoLXsQ-w9azKLjEjO4uKmA,1749
 miniworld_maze/environments/twenty_five_rooms.py,sha256=MewKPDHDilscQGTT3aGRrSHvo4uFgHHAOrnJMrHaezQ,2598
-miniworld_maze/tools/__init__.py,sha256=XiReXrJIcBKvDVyPZrKPq1mckJs0_WC7q_RmdXXcKHs,55
 miniworld_maze/utils.py,sha256=HTOkfRq72oOC844gVXjWMH1ox7wdSxfCS6oTrWBw05Q,7523
-miniworld_maze-1.3.1.dist-info/WHEEL,sha256=NHRAbdxxzyL9K3IO2LjmlNqKSyPZnKv2BD16YYVKo18,79
-miniworld_maze-1.3.1.dist-info/METADATA,sha256=P-TEotub0dhvLm08sS1HWkRQWqF3HDzXOlUpVEPyPQs,9657
-miniworld_maze-1.3.1.dist-info/RECORD,,
+miniworld_maze-1.4.0.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+miniworld_maze-1.4.0.dist-info/METADATA,sha256=rBLhLTs-PyS6I8tEji41pAEt1MDuUh9ymNfoyMyX8kM,9657
+miniworld_maze-1.4.0.dist-info/RECORD,,

{miniworld_maze-1.3.1.dist-info → miniworld_maze-1.4.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.14
+Generator: uv 0.8.15
 Root-Is-Purelib: true
 Tag: py3-none-any

miniworld_maze/environments/factory.py

@@ -1,42 +0,0 @@
-"""Gymnasium environment registrations for Nine Rooms environment variants."""
-
-from gymnasium.envs.registration import register
-from ..core import ObservationLevel
-from ..core.constants import FACTORY_DOOR_SIZE, FACTORY_ROOM_SIZE
-
-# Register environment variants with factory defaults matching the original wrapper
-register(
-    id="NineRooms-v0",
-    entry_point="miniworld_maze.environments.nine_rooms:NineRooms",
-    max_episode_steps=1000,
-    kwargs={
-        "room_size": FACTORY_ROOM_SIZE,
-        "door_size": FACTORY_DOOR_SIZE,
-        "obs_level": ObservationLevel.TOP_DOWN_PARTIAL,
-        "agent_mode": None,  # becomes "empty" by default
-    },
-)
-
-register(
-    id="SpiralNineRooms-v0", 
-    entry_point="miniworld_maze.environments.spiral_nine_rooms:SpiralNineRooms",
-    max_episode_steps=1000,
-    kwargs={
-        "room_size": FACTORY_ROOM_SIZE,
-        "door_size": FACTORY_DOOR_SIZE,
-        "obs_level": ObservationLevel.TOP_DOWN_PARTIAL,
-        "agent_mode": None,
-    },
-)
-
-register(
-    id="TwentyFiveRooms-v0",
-    entry_point="miniworld_maze.environments.twenty_five_rooms:TwentyFiveRooms", 
-    max_episode_steps=1000,
-    kwargs={
-        "room_size": FACTORY_ROOM_SIZE,
-        "door_size": FACTORY_DOOR_SIZE,
-        "obs_level": ObservationLevel.TOP_DOWN_PARTIAL,
-        "agent_mode": None,
-    },
-)

miniworld_maze/tools/__init__.py

@@ -1,3 +0,0 @@
-"""Tools for Nine Rooms environments."""
-
-__all__ = []