Return Self in from_proto() constructors

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

src/frequenz/client/microgrid/_component_data.py

@@ -2,11 +2,11 @@
 # Copyright © 2022 Frequenz Energy-as-a-Service GmbH
 
 """Component data types for data coming from a microgrid."""
-from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
+from typing import Self
 
 # pylint: disable=no-name-in-module
 from frequenz.api.microgrid.battery_pb2 import ComponentState as PbBatteryComponentState
@@ -54,7 +54,7 @@ def _set_raw(self, raw: PbComponentData) -> None:
 
     @classmethod
     @abstractmethod
-    def from_proto(cls, raw: PbComponentData) -> ComponentData:
+    def from_proto(cls, raw: PbComponentData) -> Self:
         """Create ComponentData from a protobuf message.
 
         Args:
@@ -93,7 +93,7 @@ class MeterData(ComponentData):
     """The AC power frequency in Hertz (Hz)."""
 
     @classmethod
-    def from_proto(cls, raw: PbComponentData) -> MeterData:
+    def from_proto(cls, raw: PbComponentData) -> Self:
         """Create MeterData from a protobuf message.
 
         Args:
@@ -206,7 +206,7 @@ class BatteryData(ComponentData):  # pylint: disable=too-many-instance-attribute
     """List of errors in protobuf struct."""
 
     @classmethod
-    def from_proto(cls, raw: PbComponentData) -> BatteryData:
+    def from_proto(cls, raw: PbComponentData) -> Self:
         """Create BatteryData from a protobuf message.
 
         Args:
@@ -316,7 +316,7 @@ class InverterData(ComponentData):  # pylint: disable=too-many-instance-attribut
     """List of errors from the component."""
 
     @classmethod
-    def from_proto(cls, raw: PbComponentData) -> InverterData:
+    def from_proto(cls, raw: PbComponentData) -> Self:
         """Create InverterData from a protobuf message.
 
         Args:
@@ -436,7 +436,7 @@ class EVChargerData(ComponentData):  # pylint: disable=too-many-instance-attribu
     """The state of the ev charger."""
 
     @classmethod
-    def from_proto(cls, raw: PbComponentData) -> EVChargerData:
+    def from_proto(cls, raw: PbComponentData) -> Self:
         """Create EVChargerData from a protobuf message.
 
         Args:

src/frequenz/client/microgrid/_component_states.py

@@ -2,9 +2,9 @@
 # Copyright © 2022 Frequenz Energy-as-a-Service GmbH
 
 """Defines states of components that can be used in a microgrid."""
-from __future__ import annotations
 
 from enum import Enum
+from typing import Self
 
 # pylint: disable=no-name-in-module
 from frequenz.api.microgrid.ev_charger_pb2 import CableState as PbCableState
@@ -35,7 +35,7 @@ class EVChargerCableState(Enum):
     """The cable is plugged into the EV and locked."""
 
     @classmethod
-    def from_pb(cls, evc_state: PbCableState.ValueType) -> EVChargerCableState:
+    def from_pb(cls, evc_state: PbCableState.ValueType) -> Self:
         """Convert a protobuf CableState value to EVChargerCableState enum.
 
         Args:
@@ -45,9 +45,9 @@ def from_pb(cls, evc_state: PbCableState.ValueType) -> EVChargerCableState:
             Enum value corresponding to the protobuf message.
         """
         if not any(t.value == evc_state for t in EVChargerCableState):
-            return cls.UNSPECIFIED
+            return cls(cls.UNSPECIFIED)
 
-        return EVChargerCableState(evc_state)
+        return cls(evc_state)
 
 
 class EVChargerComponentState(Enum):
@@ -81,7 +81,7 @@ class EVChargerComponentState(Enum):
     """The component is interrupted."""
 
     @classmethod
-    def from_pb(cls, evc_state: PbComponentState.ValueType) -> EVChargerComponentState:
+    def from_pb(cls, evc_state: PbComponentState.ValueType) -> Self:
         """Convert a protobuf ComponentState value to EVChargerComponentState enum.
 
         Args:
@@ -91,6 +91,6 @@ def from_pb(cls, evc_state: PbComponentState.ValueType) -> EVChargerComponentSta
             Enum value corresponding to the protobuf message.
         """
         if not any(t.value == evc_state for t in EVChargerComponentState):
-            return cls.UNSPECIFIED
+            return cls(cls.UNSPECIFIED)
 
-        return EVChargerComponentState(evc_state)
+        return cls(evc_state)

src/frequenz/client/microgrid/_retry.py

@@ -3,12 +3,11 @@
 
 """Implementations for retry strategies."""
 
-from __future__ import annotations
-
 import random
 from abc import ABC, abstractmethod
 from collections.abc import Iterator
 from copy import deepcopy
+from typing import Self
 
 DEFAULT_RETRY_INTERVAL = 3.0
 """Default retry interval, in seconds."""
@@ -52,7 +51,7 @@ def reset(self) -> None:
         """
         self._count = 0
 
-    def copy(self) -> RetryStrategy:
+    def copy(self) -> Self:
         """Create a new instance of `self`.
 
         Returns: