chore: remove non-essential Mesa 4.0 compatibility patches

Author: hillhack

mesa_llm/llm_agent.py

@@ -4,20 +4,11 @@
     OrthogonalVonNeumannGrid,
 )
 from mesa.model import Model
-try:
-    from mesa.space import (
-        ContinuousSpace,
-        MultiGrid,
-        SingleGrid,
-    )
-except ImportError:
-    # Handle Mesa 4.0.dev0 locations or mock if missing
-    from mesa.discrete_space.grid import Grid as MultiGrid
-    from mesa.discrete_space.grid import Grid as SingleGrid
-    try:
-        from mesa.experimental.continuous_space.continuous_space import ContinuousSpace
-    except ImportError:
-        ContinuousSpace = type("ContinuousSpace", (), {})
+from mesa.space import (
+    ContinuousSpace,
+    MultiGrid,
+    SingleGrid,
+)
 
 from mesa_llm import Plan
 from mesa_llm.memory.st_lt_memory import STLTMemory

mesa_llm/tools/inbuilt_tools.py

@@ -4,20 +4,11 @@
     OrthogonalMooreGrid,
     OrthogonalVonNeumannGrid,
 )
-try:
-    from mesa.space import (
-        ContinuousSpace,
-        MultiGrid,
-        SingleGrid,
-    )
-except ImportError:
-    # Handle Mesa 4.0.dev0 locations or mock if missing
-    from mesa.discrete_space.grid import Grid as MultiGrid
-    from mesa.discrete_space.grid import Grid as SingleGrid
-    try:
-        from mesa.experimental.continuous_space.continuous_space import ContinuousSpace
-    except ImportError:
-        ContinuousSpace = type("ContinuousSpace", (), {})
+from mesa.space import (
+    ContinuousSpace,
+    MultiGrid,
+    SingleGrid,
+)
 
 from mesa_llm.tools.tool_decorator import tool
 

tests/conftest.py

@@ -4,10 +4,7 @@
 import pytest
 from litellm import Choices, Message, ModelResponse
 from mesa.model import Model
-try:
-    from mesa.space import MultiGrid
-except ImportError:
-    from mesa.discrete_space.grid import Grid as MultiGrid
+from mesa.space import MultiGrid
 
 from mesa_llm.llm_agent import LLMAgent
 from mesa_llm.memory.st_memory import ShortTermMemory

tests/test_llm_agent.py

@@ -5,15 +5,7 @@
 import pytest
 from mesa.discrete_space import OrthogonalMooreGrid
 from mesa.model import Model
-try:
-    from mesa.space import ContinuousSpace, MultiGrid, SingleGrid
-except ImportError:
-    from mesa.discrete_space.grid import Grid as MultiGrid
-    from mesa.discrete_space.grid import Grid as SingleGrid
-    try:
-        from mesa.experimental.continuous_space.continuous_space import ContinuousSpace
-    except ImportError:
-        ContinuousSpace = type("ContinuousSpace", (), {})
+from mesa.space import ContinuousSpace, MultiGrid, SingleGrid
 
 from mesa_llm import Plan
 from mesa_llm.llm_agent import LLMAgent

tests/test_reasoning/test_cot.py

@@ -5,10 +5,7 @@
 
 import pytest
 from mesa.model import Model
-try:
-    from mesa.space import MultiGrid
-except ImportError:
-    from mesa.discrete_space.grid import Grid as MultiGrid
+from mesa.space import MultiGrid
 
 from mesa_llm.llm_agent import LLMAgent
 from mesa_llm.reasoning.cot import CoTReasoning

tests/test_tools/test_inbuilt_tools.py

@@ -4,15 +4,7 @@
 
 import pytest
 from mesa.discrete_space import OrthogonalMooreGrid, OrthogonalVonNeumannGrid
-try:
-    from mesa.space import ContinuousSpace, MultiGrid, SingleGrid
-except ImportError:
-    from mesa.discrete_space.grid import Grid as MultiGrid
-    from mesa.discrete_space.grid import Grid as SingleGrid
-    try:
-        from mesa.experimental.continuous_space.continuous_space import ContinuousSpace
-    except ImportError:
-        ContinuousSpace = type("ContinuousSpace", (), {})
+from mesa.space import ContinuousSpace, MultiGrid, SingleGrid
 
 from mesa_llm.tools.inbuilt_tools import (
     move_one_step,