From a949ac663441e8bbf900bd34a76b28fff68db426 Mon Sep 17 00:00:00 2001 From: David Mulcahey Date: Mon, 21 Oct 2024 09:27:56 -0400 Subject: [PATCH] fix imports for typing --- zha/websocket/server/api/platforms/api.py | 7 ++++--- zha/websocket/server/gateway.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zha/websocket/server/api/platforms/api.py b/zha/websocket/server/api/platforms/api.py index 537b2e9b..43ffe5df 100644 --- a/zha/websocket/server/api/platforms/api.py +++ b/zha/websocket/server/api/platforms/api.py @@ -11,7 +11,7 @@ from zha.websocket.server.api.platforms import PlatformEntityCommand if TYPE_CHECKING: - from zha.websocket.client import Client + from zha.websocket.server.client import Client from zha.websocket.server.gateway import WebSocketGateway as Server _LOGGER = logging.getLogger(__name__) @@ -48,10 +48,10 @@ async def execute_platform_entity_command( try: action = getattr(platform_entity, method_name) arg_spec = inspect.getfullargspec(action) - if arg_spec.varkw: # the only argument is self + if arg_spec.varkw: await action(**command.model_dump(exclude_none=True)) else: - await action() + await action() # the only argument is self except Exception as err: _LOGGER.exception("Error executing command: %s", method_name, exc_info=err) @@ -84,6 +84,7 @@ async def refresh_state( await execute_platform_entity_command(server, client, command, "async_update") +# pylint: disable=import-outside-toplevel def load_platform_entity_apis(server: Server) -> None: """Load the ws apis for all platform entities types.""" from zha.websocket.server.api.platforms.alarm_control_panel.api import ( diff --git a/zha/websocket/server/gateway.py b/zha/websocket/server/gateway.py index 115e6b2c..834129e6 100644 --- a/zha/websocket/server/gateway.py +++ b/zha/websocket/server/gateway.py @@ -22,7 +22,7 @@ from zha.websocket.server.gateway_api import load_api as load_zigbee_controller_api if TYPE_CHECKING: - from zha.websocket.client import Client + from zha.websocket.server.client import Client BLOCK_LOG_TIMEOUT: Final[int] = 60 _LOGGER = logging.getLogger(__name__) @@ -159,6 +159,7 @@ async def __aexit__( def _register_api_commands(self) -> None: """Load server API commands.""" + # pylint: disable=import-outside-toplevel from zha.websocket.server.client import load_api as load_client_api register_api_command(self, stop_server)