Skip to content

Commit 3658f76

Browse files
authored
[RLlib] LINT: Enable ruff imports for offline/, tests/, callbacks/ and env/ in rllib (#56744)
1 parent 0e9a15a commit 3658f76

File tree

96 files changed

+341
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+341
-304
lines changed

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ afterray = ["psutil", "setproctitle"]
7474
"rllib/algorithms/*" = ["I"]
7575
# "rllib/core/*" = ["I"]
7676
# "rllib/examples/*" = ["I"]
77-
"rllib/offline/*" = ["I"]
78-
"rllib/tests/*" = ["I"]
79-
"rllib/callbacks/*" = ["I"]
80-
"rllib/env/*" = ["I"]
77+
# "rllib/offline/*" = ["I"]
78+
# "rllib/tests/*" = ["I"]
79+
# "rllib/callbacks/*" = ["I"]
80+
# "rllib/env/*" = ["I"]
8181
# "rllib/execution/*" = ["I"]
8282
# "rllib/policy/*" = ["I"]
8383
# "rllib/tuned_examples/*" = ["I"]

rllib/callbacks/callbacks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
from ray.rllib.policy.sample_batch import SampleBatch
1818
from ray.rllib.utils.annotations import (
1919
OldAPIStack,
20-
override,
2120
OverrideToImplementCustomLogic,
2221
PublicAPI,
22+
override,
2323
)
2424
from ray.rllib.utils.metrics.metrics_logger import MetricsLogger
2525
from ray.rllib.utils.typing import AgentID, EnvType, EpisodeType, PolicyID

rllib/callbacks/tests/test_callbacks_old_api_stack.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from collections import Counter
21
import unittest
2+
from collections import Counter
33

44
import ray
55
from ray.rllib.algorithms.callbacks import DefaultCallbacks, make_multi_callbacks
@@ -209,7 +209,8 @@ def test_on_episode_created(self):
209209

210210

211211
if __name__ == "__main__":
212-
import pytest
213212
import sys
214213

214+
import pytest
215+
215216
sys.exit(pytest.main(["-v", __file__]))

rllib/callbacks/tests/test_callbacks_on_algorithm.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import ray
66
from ray import tune
7-
from ray.rllib.callbacks.callbacks import RLlibCallback
87
from ray.rllib.algorithms.ppo import PPOConfig
8+
from ray.rllib.callbacks.callbacks import RLlibCallback
99
from ray.rllib.examples.envs.classes.cartpole_crashing import CartPoleCrashing
1010
from ray.rllib.utils.test_utils import check
1111

@@ -108,7 +108,8 @@ def test_on_init_and_checkpoint_loaded(self):
108108

109109

110110
if __name__ == "__main__":
111-
import pytest
112111
import sys
113112

113+
import pytest
114+
114115
sys.exit(pytest.main(["-v", __file__]))

rllib/callbacks/tests/test_callbacks_on_env_runner.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
from collections import Counter
21
import unittest
2+
from collections import Counter
33

44
import gymnasium as gym
55

66
import ray
77
from ray import tune
8-
from ray.rllib.callbacks.callbacks import RLlibCallback
98
from ray.rllib.algorithms.ppo import PPOConfig
9+
from ray.rllib.callbacks.callbacks import RLlibCallback
1010
from ray.rllib.env.env_runner import EnvRunner
1111
from ray.rllib.env.vector.vector_multi_agent_env import VectorMultiAgentEnv
1212
from ray.rllib.examples.envs.classes.multi_agent import MultiAgentCartPole
@@ -237,7 +237,8 @@ def test_tune_trial_id_visible_in_callbacks(self):
237237

238238

239239
if __name__ == "__main__":
240-
import pytest
241240
import sys
242241

242+
import pytest
243+
243244
sys.exit(pytest.main(["-v", __file__]))

rllib/callbacks/tests/test_multicallback.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import unittest
2+
23
import ray
34
from ray.rllib.algorithms import PPOConfig
45
from ray.rllib.callbacks.callbacks import RLlibCallback
@@ -141,7 +142,8 @@ def test_single_callback_validation_error(self):
141142

142143

143144
if __name__ == "__main__":
144-
import pytest
145145
import sys
146146

147+
import pytest
148+
147149
sys.exit(pytest.main(["-v", __file__]))

rllib/env/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
from ray.rllib.env.policy_client import PolicyClient
77
from ray.rllib.env.remote_base_env import RemoteBaseEnv
88
from ray.rllib.env.vector_env import VectorEnv
9-
10-
from ray.rllib.env.wrappers.dm_env_wrapper import DMEnv
119
from ray.rllib.env.wrappers.dm_control_wrapper import DMCEnv
10+
from ray.rllib.env.wrappers.dm_env_wrapper import DMEnv
1211
from ray.rllib.env.wrappers.group_agents_wrapper import GroupAgentsWrapper
13-
from ray.rllib.env.wrappers.pettingzoo_env import PettingZooEnv
14-
from ray.rllib.env.wrappers.pettingzoo_env import ParallelPettingZooEnv
12+
from ray.rllib.env.wrappers.pettingzoo_env import ParallelPettingZooEnv, PettingZooEnv
1513
from ray.rllib.env.wrappers.unity3d_env import Unity3DEnv
1614

1715
INPUT_ENV_SPACES = "__env__"

rllib/env/base_env.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import logging
2-
from typing import Callable, Tuple, Optional, List, Dict, Any, TYPE_CHECKING, Union, Set
2+
from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Set, Tuple, Union
33

44
import gymnasium as gym
5+
56
import ray
67
from ray.rllib.utils.annotations import OldAPIStack
78
from ray.rllib.utils.typing import AgentID, EnvID, EnvType, MultiEnvDict
@@ -368,9 +369,9 @@ def convert_to_base_env(
368369
The resulting BaseEnv object.
369370
"""
370371

371-
from ray.rllib.env.remote_base_env import RemoteBaseEnv
372372
from ray.rllib.env.external_env import ExternalEnv
373373
from ray.rllib.env.multi_agent_env import MultiAgentEnv
374+
from ray.rllib.env.remote_base_env import RemoteBaseEnv
374375
from ray.rllib.env.vector_env import VectorEnv, VectorEnvWrapper
375376

376377
if remote_envs and num_envs == 1:

rllib/env/env_runner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import abc
22
import logging
3-
from typing import Any, Dict, Optional, Tuple, TYPE_CHECKING
3+
from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple
44

55
import gymnasium as gym
66
import tree # pip install dm_tree
@@ -15,7 +15,7 @@
1515
from ray.rllib.utils.metrics.metrics_logger import MetricsLogger
1616
from ray.rllib.utils.torch_utils import convert_to_torch_tensor
1717
from ray.rllib.utils.typing import StateDict, TensorType
18-
from ray.util.annotations import PublicAPI, DeveloperAPI
18+
from ray.util.annotations import DeveloperAPI, PublicAPI
1919
from ray.util.metrics import Counter
2020

2121
if TYPE_CHECKING:

rllib/env/env_runner_group.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import gymnasium as gym
2-
import logging
31
import importlib.util
2+
import logging
43
import os
54
from typing import (
5+
TYPE_CHECKING,
66
Any,
77
Callable,
88
Collection,
@@ -11,12 +11,17 @@
1111
Optional,
1212
Tuple,
1313
Type,
14-
TYPE_CHECKING,
1514
TypeVar,
1615
Union,
1716
)
1817

18+
import gymnasium as gym
19+
1920
import ray
21+
from ray._common.deprecation import (
22+
DEPRECATED_VALUE,
23+
deprecation_warning,
24+
)
2025
from ray.actor import ActorHandle
2126
from ray.exceptions import RayActorError
2227
from ray.rllib.core import (
@@ -28,18 +33,14 @@
2833
from ray.rllib.core.learner import LearnerGroup
2934
from ray.rllib.core.rl_module import validate_module_id
3035
from ray.rllib.core.rl_module.rl_module import RLModuleSpec
31-
from ray.rllib.evaluation.rollout_worker import RolloutWorker
3236
from ray.rllib.env.base_env import BaseEnv
3337
from ray.rllib.env.env_context import EnvContext
3438
from ray.rllib.env.env_runner import EnvRunner
39+
from ray.rllib.evaluation.rollout_worker import RolloutWorker
3540
from ray.rllib.offline import get_dataset_and_shards
3641
from ray.rllib.policy.policy import Policy, PolicyState
3742
from ray.rllib.utils.actor_manager import FaultTolerantActorManager
3843
from ray.rllib.utils.annotations import OldAPIStack
39-
from ray._common.deprecation import (
40-
deprecation_warning,
41-
DEPRECATED_VALUE,
42-
)
4344
from ray.rllib.utils.framework import try_import_tf
4445
from ray.rllib.utils.metrics import NUM_ENV_STEPS_SAMPLED_LIFETIME, WEIGHTS_SEQ_NO
4546
from ray.rllib.utils.typing import (

0 commit comments

Comments
 (0)