try to fix issue on windows for automatic classes

Signed-off-by: DONNOT Benjamin <[email protected]>

Author: BDonnot

.github/workflows/main.yml

@@ -197,7 +197,7 @@ jobs:
           path: dist/*.tar.gz
 
   auto_class_in_file:
-    name: Test ${{ matrix.config.name }} OS can handle automatic class generation
+    name: Test ${{ matrix.config.name }} OS can handle automatic class generation for python ${{matrix.python.version}}
     runs-on: ${{ matrix.config.os }}
     strategy:
       matrix:
@@ -238,10 +238,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade wheel
-          python -m pip install --upgrade setuptools
-          python -m pip install --upgrade gymnasium "numpy<2"
+          python -m pip install --upgrade pip wheel setuptools gymnasium
 
       - name: Build wheel
         run: python setup.py bdist_wheel
@@ -254,7 +251,7 @@ jobs:
 
       - name: Test the automatic generation of classes in the env folder
         run: |
-          python -m unittest grid2op/tests/automatic_classes.py -f
+          python -m unittest grid2op/tests/automatic_classes.py -v -f
   
   package:
     name: Test install

grid2op/VoltageControler/BaseVoltageController.py

@@ -7,10 +7,9 @@
 # This file is part of Grid2Op, Grid2Op a testbed platform to model sequential decision making in power systems.
 from abc import ABC, abstractmethod
 import numpy as np
-import copy
 
 from grid2op.dtypes import dt_int
-from grid2op.Action import VoltageOnlyAction, ActionSpace
+from grid2op.Action import VoltageOnlyAction
 from grid2op.Rules import AlwaysLegal
 from grid2op.Space import RandomObject
 

grid2op/tests/automatic_classes.py

@@ -8,12 +8,13 @@
 
 import os
 import multiprocessing as mp
-from typing import Optional
+from typing import Optional, Type
 import warnings
 import unittest
 import importlib
 import numpy as np
-from gymnasium.vector import AsyncVectorEnv
+from grid2op.Space import GridObjects
+from gymnasium.vector import AsyncVectorEnv # type: ignore
 
 import grid2op
 from grid2op._glop_platform_info import _IS_WINDOWS
@@ -75,7 +76,7 @@ def act(self, observation: BaseObservation, reward: float, done: bool = False) -
             this_class_act = getattr(this_module, self._name_cls_act)
         else:
             raise RuntimeError(f"class {self._name_cls_act} not found")
-        res = super().act(observation, reward, done)
+        res = self.action_space()
         assert isinstance(res, this_class_act)
         return res
 
@@ -85,7 +86,9 @@ class AutoClassMakeTester(unittest.TestCase):
     def test_in_make(self):
         with warnings.catch_warnings():
             warnings.filterwarnings("ignore")
-            env = grid2op.make("l2rpn_case14_sandbox", test=True, class_in_file=False)
+            env = grid2op.make("l2rpn_case14_sandbox",
+                               test=True,
+                               class_in_file=False)
         assert env._read_from_local_dir is None
         assert not env.classes_are_in_files()
 
@@ -117,7 +120,9 @@ def _aux_make_env(self, env: Optional[Environment]=None):
         if env is None:
             with warnings.catch_warnings():
                 warnings.filterwarnings("ignore")
-                env = grid2op.make(self.get_env_name(), test=True, class_in_file=True)
+                env = grid2op.make(self.get_env_name(),
+                                   test=True,
+                                   class_in_file=True)
         assert env.classes_are_in_files()
         return env
 
@@ -176,7 +181,7 @@ def test_all_classes_from_file(self,
         for name_cls, name_attr in zip(names_cls, names_attr):
             this_module = importlib.import_module(f"{module_nm}.{name_cls}_file", super_module)
             if hasattr(this_module, name_cls):
-                this_class = getattr(this_module, name_cls)
+                this_class : Type[GridObjects]= getattr(this_module, name_cls)
             else:
                 raise RuntimeError(f"class {name_cls} not found")
             if name_attr is not None:
@@ -382,7 +387,30 @@ def test_all_classes_from_file_runner_1ep(self, env: Optional[Environment]=None)
                    env_seeds=[0],
                    episode_id=[0])
 
-    def test_all_classes_from_file_runner_2ep_seq(self, env: Optional[Environment]=None):
+    def _aux_test_rewards(self, res, _mix_id):
+        if issubclass(AutoClassInFileTester, type(self)):
+            ref = [645.702087, 648.907958]
+        elif issubclass(TOEnvAutoClassTester, type(self)):
+            ref = [645.702087, 648.907958]
+        elif issubclass(MaskedEnvAutoClassTester, type(self)):
+            ref = [645.702087, 648.907958]
+        elif issubclass(MultiMixEnvAutoClassTester, type(self)):
+            if _mix_id == 0:
+                ref = [119.103179, 112.700851]
+            elif _mix_id == 1:
+                ref = [119.113189, 112.687309]
+            else:
+                raise RuntimeError("Unknown mix id")
+        elif issubclass(ForEnvAutoClassTester, type(self)):
+            ref = [53.9044303, 53.9044303]
+        else:
+            raise RuntimeError("Unknown test suite")
+        assert abs(res[0][2] - ref[0]) <= 1e-5, f"{res[0][2]} vs {ref[0]}"
+        assert abs(res[1][2] - ref[1]) <= 1e-5, f"{res[1][2]} vs {ref[1]}"
+        
+    def test_all_classes_from_file_runner_2ep_seq(self,
+                                                  env: Optional[Environment]=None,
+                                                  _mix_id=None):
         """this test that the runner is able to "run" (one other type of run), but the tests on the classes 
         are much lighter than in test_all_classes_from_file_env_runner"""
         if not self._do_test_runner():
@@ -396,14 +424,19 @@ def test_all_classes_from_file_runner_2ep_seq(self, env: Optional[Environment]=N
         runner = Runner(**env.get_params_for_runner(),
                         agentClass=None,
                         agentInstance=this_agent)
+        
         res = runner.run(nb_episode=2,
                          max_iter=self.max_iter,
+                         agent_seeds=[2, 3],
                          env_seeds=[0, 0],
                          episode_id=[0, 1])
         assert res[0][4] == self.max_iter
         assert res[1][4] == self.max_iter
-    
-    def test_all_classes_from_file_runner_2ep_par_fork(self, env: Optional[Environment]=None):
+        self._aux_test_rewards(res, _mix_id)
+        
+    def test_all_classes_from_file_runner_2ep_par_fork(self,
+                                                       env: Optional[Environment]=None,
+                                                       _mix_id=None):
         """this test that the runner is able to "run" (one other type of run), but the tests on the classes 
         are much lighter than in test_all_classes_from_file_env_runner"""
         if not self._do_test_runner():
@@ -428,8 +461,11 @@ def test_all_classes_from_file_runner_2ep_par_fork(self, env: Optional[Environme
                          episode_id=[0, 1])
         assert res[0][4] == self.max_iter
         assert res[1][4] == self.max_iter
+        self._aux_test_rewards(res, _mix_id)
 
-    def test_all_classes_from_file_runner_2ep_par_spawn(self, env: Optional[Environment]=None):
+    def test_all_classes_from_file_runner_2ep_par_spawn(self,
+                                                        env: Optional[Environment]=None,
+                                                        _mix_id=None):
         """this test that the runner is able to "run" (one other type of run), but the tests on the classes 
         are much lighter than in test_all_classes_from_file_env_runner"""
         if not self._do_test_runner():
@@ -452,6 +488,7 @@ def test_all_classes_from_file_runner_2ep_par_spawn(self, env: Optional[Environm
                          episode_id=[0, 1])
         assert res[0][4] == self.max_iter
         assert res[1][4] == self.max_iter
+        self._aux_test_rewards(res, _mix_id)
 
 
 class MaskedEnvAutoClassTester(AutoClassInFileTester):
@@ -656,7 +693,8 @@ def test_all_classes_from_file(self,
                                                )
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multi mix
-                for mix in env:
+                for mix_name in sorted(env.all_names):
+                    mix = env[mix_name]
                     super().test_all_classes_from_file(mix,
                                                        classes_name=classes_name,
                                                        name_complete_obs_cls=name_complete_obs_cls,
@@ -675,7 +713,8 @@ def test_all_classes_from_file_env_after_reset(self, env: Optional[Environment]=
             super().test_all_classes_from_file_env_after_reset(env)
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
+                for mix_name in sorted(env.all_names):
+                    mix = env[mix_name]
                     super().test_all_classes_from_file_env_after_reset(mix)
         finally:
             if env_orig is None:
@@ -689,7 +728,8 @@ def test_all_classes_from_file_obsenv(self, env: Optional[Environment]=None):
             super().test_all_classes_from_file_obsenv(env)
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
+                for mix_name in sorted(env.all_names):
+                    mix = env[mix_name]
                     super().test_all_classes_from_file_obsenv(mix)
         finally:
             if env_orig is None:
@@ -703,7 +743,8 @@ def test_all_classes_from_file_env_cpy(self, env: Optional[Environment]=None):
             super().test_all_classes_from_file_env_cpy(env)
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
+                for mix_name in sorted(env.all_names):
+                    mix = env[mix_name]
                     super().test_all_classes_from_file_env_cpy(mix)
         finally:
             if env_orig is None:
@@ -716,7 +757,8 @@ def test_all_classes_from_file_env_runner(self, env: Optional[Environment]=None)
         try:
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
+                for mix_name in sorted(env.all_names):
+                    mix = env[mix_name]
                     super().test_all_classes_from_file_env_runner(mix)
             else:
                 # runner does not handle multimix
@@ -732,7 +774,8 @@ def test_all_classes_from_file_runner_1ep(self, env: Optional[Environment]=None)
         try:
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
+                for mix_name in sorted(env.all_names):
+                    mix = env[mix_name]
                     super().test_all_classes_from_file_runner_1ep(mix)
             else:
                 # runner does not handle multimix
@@ -748,8 +791,9 @@ def test_all_classes_from_file_runner_2ep_seq(self, env: Optional[Environment]=N
         try:
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
-                    super().test_all_classes_from_file_runner_2ep_seq(mix)
+                for mix_id, mix_name in enumerate(sorted(env.all_names)):
+                    mix = env[mix_name]
+                    super().test_all_classes_from_file_runner_2ep_seq(mix, mix_id)
             else:
                 # runner does not handle multimix
                 super().test_all_classes_from_file_runner_2ep_seq(env)  
@@ -766,8 +810,9 @@ def test_all_classes_from_file_runner_2ep_par_fork(self, env: Optional[Environme
         try:
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
-                    super().test_all_classes_from_file_runner_2ep_par_fork(mix)
+                for mix_id, mix_name in enumerate(sorted(env.all_names)):
+                    mix = env[mix_name]
+                    super().test_all_classes_from_file_runner_2ep_par_fork(mix, mix_id)
             else:
                 # runner does not handle multimix
                 super().test_all_classes_from_file_runner_2ep_par_fork(env)  
@@ -782,8 +827,9 @@ def test_all_classes_from_file_runner_2ep_par_spawn(self, env: Optional[Environm
         try:
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
-                    super().test_all_classes_from_file_runner_2ep_par_spawn(mix)
+                for mix_id, mix_name in enumerate(sorted(env.all_names)):
+                    mix = env[mix_name]
+                    super().test_all_classes_from_file_runner_2ep_par_spawn(mix, mix_id)
             else:
                 # runner does not handle multimix
                 super().test_all_classes_from_file_runner_2ep_par_spawn(env)  
@@ -798,8 +844,9 @@ def test_forecast_env_basic(self, env: Optional[Environment]=None):
         try:
             if isinstance(env, MultiMixEnvironment):
                 # test each mix of a multimix
-                for mix in env:
-                    obs = mix.reset()
+                for mix_id, mix_name in enumerate(sorted(env.all_names)):
+                    mix = env[mix_name]
+                    obs = mix.reset(seed=0, options={"time serie id": 0})
                     for_env = obs.get_forecast_env()
                     super().test_all_classes_from_file(for_env)
         finally: