Move Protocol to typing from typing_extensions

d3rlpy/algos/qlearning/torch/utility.py

@@ -1,6 +1,6 @@
+from typing import Protocol
 
 import torch
-from typing_extensions import Protocol
 
 from ....models.torch import (
     ContinuousEnsembleQFunctionForwarder,

d3rlpy/algos/transformer/action_samplers.py

@@ -1,7 +1,6 @@
-from typing import Union
+from typing import Protocol, Union
 
 import numpy as np
-from typing_extensions import Protocol
 
 from ...types import NDArray
 

d3rlpy/dataset/buffers.py

@@ -1,7 +1,5 @@
 from collections import deque
-from typing import Sequence
-
-from typing_extensions import Protocol
+from typing import Protocol, Sequence
 
 from .components import EpisodeBase
 

d3rlpy/dataset/components.py

@@ -1,8 +1,7 @@
 import dataclasses
-from typing import Any, Sequence
+from typing import Any, Protocol, Sequence
 
 import numpy as np
-from typing_extensions import Protocol
 
 from ..constants import ActionSpace
 from ..types import (

d3rlpy/dataset/episode_generator.py

@@ -1,7 +1,6 @@
-from typing import Optional, Sequence
+from typing import Optional, Protocol, Sequence
 
 import numpy as np
-from typing_extensions import Protocol
 
 from ..types import Float32NDArray, NDArray, ObservationSequence
 from .components import Episode, EpisodeBase

d3rlpy/dataset/trajectory_slicers.py

@@ -1,5 +1,6 @@
+from typing import Protocol
+
 import numpy as np
-from typing_extensions import Protocol
 
 from ..types import Float32NDArray, Int32NDArray
 from .components import EpisodeBase, PartialTrajectory

d3rlpy/dataset/transition_pickers.py

@@ -1,7 +1,7 @@
 import dataclasses
+from typing import Protocol
 
 import numpy as np
-from typing_extensions import Protocol
 
 from ..types import Float32NDArray
 from .components import EpisodeBase, Transition

d3rlpy/dataset/writers.py

@@ -1,7 +1,6 @@
-from typing import Any, Sequence, Union
+from typing import Any, Protocol, Sequence, Union
 
 import numpy as np
-from typing_extensions import Protocol
 
 from ..types import NDArray, Observation, ObservationSequence
 from .buffers import BufferProtocol

d3rlpy/interface.py

@@ -1,6 +1,4 @@
-from typing import Optional, Union
-
-from typing_extensions import Protocol
+from typing import Optional, Protocol, Union
 
 from .preprocessing import ActionScaler, ObservationScaler, RewardScaler
 from .types import NDArray, Observation

d3rlpy/logging/logger.py

@@ -2,11 +2,10 @@
 from collections import defaultdict
 from contextlib import contextmanager
 from datetime import datetime
-from typing import Any, Iterator, Optional
+from typing import Any, Iterator, Optional, Protocol
 
 import structlog
 from torch import nn
-from typing_extensions import Protocol
 
 from ..types import Float32NDArray
 

d3rlpy/metrics/evaluators.py

@@ -1,7 +1,6 @@
-from typing import Iterator, Optional, Sequence
+from typing import Iterator, Optional, Protocol, Sequence
 
 import numpy as np
-from typing_extensions import Protocol
 
 from ..dataset import (
     EpisodeBase,

d3rlpy/tokenizers/tokenizers.py

@@ -1,5 +1,6 @@
+from typing import Protocol, runtime_checkable
+
 import numpy as np
-from typing_extensions import Protocol, runtime_checkable
 
 from ..types import Float32NDArray, Int32NDArray, NDArray
 from .utils import mu_law_decode, mu_law_encode

d3rlpy/torch_utility.py

@@ -6,6 +6,7 @@
     Generic,
     Iterator,
     Optional,
+    Protocol,
     Sequence,
     TypeVar,
     Union,
@@ -19,7 +20,7 @@
 from torch.cuda import CUDAGraph
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.optim import Optimizer
-from typing_extensions import Protocol, Self
+from typing_extensions import Self
 
 from .dataclass_utils import asdict_without_copy
 from .dataset import TrajectoryMiniBatch, TransitionMiniBatch

d3rlpy/types.py

@@ -1,12 +1,11 @@
-from typing import Any, Mapping, Sequence, Union
+from typing import Any, Mapping, Protocol, Sequence, Union, runtime_checkable
 
 import gym
 import gymnasium
 import numpy as np
 import numpy.typing as npt
 import torch
 from torch.optim import Optimizer
-from typing_extensions import Protocol, runtime_checkable
 
 __all__ = [
     "NDArray",

ruff.toml

@@ -0,0 +1,25 @@
+line-length = 80
+indent-width = 4
+target-version = "py39"
+unsafe-fixes = true
+
+[lint]
+select = ["E4", "E7", "E9", "F", "UP006", "I", "W"]
+ignore = ["F403"]
+
+# Allow fix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+[format]
+# Like Black, use double quotes for strings.
+quote-style = "double"
+
+# Like Black, indent with spaces, rather than tabs.
+indent-style = "space"
+
+# Like Black, respect magic trailing commas.
+skip-magic-trailing-comma = false
+
+# Like Black, automatically detect the appropriate line ending.
+line-ending = "auto"