[esp32] gpio type improvements (#14517)

esphome/components/esp32/gpio.py

@@ -88,8 +88,8 @@ def _translate_pin(value):
 
 @dataclass
 class ESP32ValidationFunctions:
-    pin_validation: Callable[[Any], Any]
+    pin_validation: Callable[[int], int]
-    usage_validation: Callable[[Any], Any]
+    usage_validation: Callable[[dict[str, Any]], dict[str, Any]]
 
 
 _esp32_validations = {

esphome/components/esp32/gpio_esp32.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import (
@@ -22,7 +23,7 @@ _ESP32_STRAPPING_PINS = {0, 2, 5, 12, 15}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_validate_gpio_pin(value):
+def esp32_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 39:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-39)")
     if value in _ESP_SDIO_PINS:
@@ -41,7 +42,7 @@ def esp32_validate_gpio_pin(value):
     return value
 
 
-def esp32_validate_supports(value):
+def esp32_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_c2.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER
@@ -9,14 +10,14 @@ _ESP32C2_STRAPPING_PINS = {8, 9}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_c2_validate_gpio_pin(value):
+def esp32_c2_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 20:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-20)")
 
     return value
 
 
-def esp32_c2_validate_supports(value):
+def esp32_c2_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_c3.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER
@@ -18,7 +19,7 @@ _ESP32C3_STRAPPING_PINS = {2, 8, 9}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_c3_validate_gpio_pin(value):
+def esp32_c3_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 21:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-21)")
     if value in _ESP32C3_SPI_PSRAM_PINS:
@@ -29,7 +30,7 @@ def esp32_c3_validate_gpio_pin(value):
     return value
 
 
-def esp32_c3_validate_supports(value):
+def esp32_c3_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_c5.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER, CONF_SCL, CONF_SDA
@@ -22,7 +23,7 @@ _ESP32C5_STRAPPING_PINS = {2, 7, 27, 28}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_c5_validate_gpio_pin(value):
+def esp32_c5_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 28:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-28)")
     if value in _ESP32C5_SPI_PSRAM_PINS:
@@ -33,7 +34,7 @@ def esp32_c5_validate_gpio_pin(value):
     return value
 
 
-def esp32_c5_validate_supports(value):
+def esp32_c5_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_c6.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER, CONF_SCL, CONF_SDA
@@ -22,7 +23,7 @@ _ESP32C6_STRAPPING_PINS = {8, 9, 15}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_c6_validate_gpio_pin(value):
+def esp32_c6_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 23:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-23)")
     if value in _ESP32C6_SPI_PSRAM_PINS:
@@ -33,7 +34,7 @@ def esp32_c6_validate_gpio_pin(value):
     return value
 
 
-def esp32_c6_validate_supports(value):
+def esp32_c6_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_c61.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER
@@ -20,7 +21,7 @@ _ESP32C61_STRAPPING_PINS = {8, 9}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_c61_validate_gpio_pin(value):
+def esp32_c61_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 29:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-29)")
     if value in _ESP32C61_SPI_PSRAM_PINS:
@@ -31,7 +32,7 @@ def esp32_c61_validate_gpio_pin(value):
     return value
 
 
-def esp32_c61_validate_supports(value):
+def esp32_c61_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_h2.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER
@@ -13,7 +14,7 @@ _ESP32H2_STRAPPING_PINS = {2, 3, 8, 9, 25}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_h2_validate_gpio_pin(value):
+def esp32_h2_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 27:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-27)")
     if value in _ESP32H2_SPI_FLASH_PINS:
@@ -33,7 +34,7 @@ def esp32_h2_validate_gpio_pin(value):
     return value
 
 
-def esp32_h2_validate_supports(value):
+def esp32_h2_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_p4.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER, CONF_SCL, CONF_SDA
@@ -14,7 +15,7 @@ _ESP32P4_STRAPPING_PINS = {34, 35, 36, 37, 38}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_p4_validate_gpio_pin(value):
+def esp32_p4_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 54:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-54)")
     if value in _ESP32P4_USB_JTAG_PINS:
@@ -27,7 +28,7 @@ def esp32_p4_validate_gpio_pin(value):
     return value
 
 
-def esp32_p4_validate_supports(value):
+def esp32_p4_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_s2.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import (
@@ -26,7 +27,7 @@ _ESP32S2_STRAPPING_PINS = {0, 45, 46}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_s2_validate_gpio_pin(value):
+def esp32_s2_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 46:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-46)")
 
@@ -43,7 +44,7 @@ def esp32_s2_validate_gpio_pin(value):
     return value
 
 
-def esp32_s2_validate_supports(value):
+def esp32_s2_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]

esphome/components/esp32/gpio_esp32_s3.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER
@@ -27,7 +28,7 @@ _ESP_32S3_STRAPPING_PINS = {0, 3, 45, 46}
 _LOGGER = logging.getLogger(__name__)
 
 
-def esp32_s3_validate_gpio_pin(value):
+def esp32_s3_validate_gpio_pin(value: int) -> int:
     if value < 0 or value > 48:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-48)")
 
@@ -49,7 +50,7 @@ def esp32_s3_validate_gpio_pin(value):
     return value
 
 
-def esp32_s3_validate_supports(value):
+def esp32_s3_validate_supports(value: dict[str, Any]) -> dict[str, Any]:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]