apply ruff check --fix

Author: njzjz

deepmd/dpmodel/modifier/base_modifier.py

@@ -12,13 +12,14 @@
     PluginVariant,
     make_plugin_registry,
 )
+from typing_extensions import Self
 
 
 def make_base_modifier() -> type[object]:
     class BaseModifier(ABC, PluginVariant, make_plugin_registry("modifier")):
         """Base class for data modifier."""
 
-        def __new__(cls, *args: Any, **kwargs: Any) -> "BaseModifier":
+        def __new__(cls, *args: Any, **kwargs: Any) -> Self:
             if cls is BaseModifier:
                 cls = cls.get_class_by_type(kwargs["type"])
             return super().__new__(cls)

deepmd/infer/deep_eval.py

@@ -22,6 +22,7 @@
 from deepmd.utils.batch_size import (
     AutoBatchSize,
 )
+from typing_extensions import Self
 
 if TYPE_CHECKING:
     import ase.neighborlist
@@ -91,7 +92,7 @@ def __init__(
 
     def __new__(
         cls, model_file: str, *args: object, **kwargs: object
-    ) -> "DeepEvalBackend":
+    ) -> Self:
         if cls is DeepEvalBackend:
             backend = Backend.detect_backend_by_model(model_file)
             return super().__new__(backend().deep_eval)
@@ -384,7 +385,7 @@ class DeepEval(ABC):
         Keyword arguments.
     """
 
-    def __new__(cls, model_file: str, *args: object, **kwargs: object) -> "DeepEval":
+    def __new__(cls, model_file: str, *args: object, **kwargs: object) -> Self:
         if cls is DeepEval:
             deep_eval = DeepEvalBackend(
                 model_file,

deepmd/pd/model/descriptor/descriptor.py

@@ -32,6 +32,7 @@
 from deepmd.utils.plugin import (
     make_plugin_registry,
 )
+from typing_extensions import Self
 
 log = logging.getLogger(__name__)
 
@@ -44,7 +45,7 @@ class DescriptorBlock(paddle.nn.Layer, ABC, make_plugin_registry("DescriptorBloc
 
     local_cluster = False
 
-    def __new__(cls, *args: Any, **kwargs: Any) -> "DescriptorBlock":
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
         if cls is DescriptorBlock:
             try:
                 descrpt_type = kwargs["type"]

deepmd/pd/model/task/fitting.py

@@ -44,6 +44,7 @@
 from deepmd.utils.path import (
     DPPath,
 )
+from typing_extensions import Self
 
 dtype = env.GLOBAL_PD_FLOAT_PRECISION
 device = env.DEVICE
@@ -54,7 +55,7 @@
 class Fitting(paddle.nn.Layer, BaseFitting):
     # plugin moved to BaseFitting
 
-    def __new__(cls, *args: Any, **kwargs: Any) -> "Fitting":
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
         if cls is Fitting:
             return BaseFitting.__new__(BaseFitting, *args, **kwargs)
         return super().__new__(cls)

deepmd/pt/model/descriptor/descriptor.py

@@ -32,6 +32,7 @@
 from deepmd.utils.plugin import (
     make_plugin_registry,
 )
+from typing_extensions import Self
 
 log = logging.getLogger(__name__)
 
@@ -44,7 +45,7 @@ class DescriptorBlock(torch.nn.Module, ABC, make_plugin_registry("DescriptorBloc
 
     local_cluster = False
 
-    def __new__(cls, *args: Any, **kwargs: Any) -> "DescriptorBlock":
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
         if cls is DescriptorBlock:
             try:
                 descrpt_type = kwargs["type"]

deepmd/pt/model/task/fitting.py

@@ -48,6 +48,7 @@
 from deepmd.utils.path import (
     DPPath,
 )
+from typing_extensions import Self
 
 dtype = env.GLOBAL_PT_FLOAT_PRECISION
 device = env.DEVICE
@@ -58,7 +59,7 @@
 class Fitting(torch.nn.Module, BaseFitting):
     # plugin moved to BaseFitting
 
-    def __new__(cls, *args: Any, **kwargs: Any) -> "Fitting":
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
         if cls is Fitting:
             return BaseFitting.__new__(BaseFitting, *args, **kwargs)
         return super().__new__(cls)

deepmd/utils/path.py

@@ -21,6 +21,7 @@
 from wcmatch.glob import (
     globfilter,
 )
+from typing_extensions import Self
 
 
 class DPPath(ABC):
@@ -34,7 +35,7 @@ class DPPath(ABC):
         mode, by default "r"
     """
 
-    def __new__(cls, path: str, mode: str = "r") -> "DPPath":
+    def __new__(cls, path: str, mode: str = "r") -> Self:
         if cls is DPPath:
             if os.path.isdir(path):
                 return super().__new__(DPOSPath)

pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
     'scipy',
     'pyyaml',
     'dargs >= 0.4.7',
-    'typing_extensions; python_version < "3.8"',
+    'typing_extensions>=4.0.0',
     'importlib_metadata>=1.4; python_version < "3.8"',
     'h5py',
     "h5py>=3.6.0,!=3.11.0; platform_system=='Linux' and platform_machine=='aarch64'",