Skip to content

Commit

Permalink
Ran isort, black, and ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
dcmeglio committed Feb 11, 2024
1 parent f9d42c9 commit 4572097
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 48 deletions.
16 changes: 5 additions & 11 deletions switchbot/__init__.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
"""Library to handle connection with Switchbot."""
from __future__ import annotations

from bleak_retry_connector import (
close_stale_connections,
close_stale_connections_by_address,
get_device,
)
from bleak_retry_connector import (close_stale_connections,
close_stale_connections_by_address,
get_device)

from .adv_parser import SwitchbotSupportedType, parse_advertisement_data
from .const import (
LockStatus,
SwitchbotAccountConnectionError,
SwitchbotAuthenticationError,
SwitchbotModel,
)
from .const import (LockStatus, SwitchbotAccountConnectionError,
SwitchbotAuthenticationError, SwitchbotModel)
from .devices.base_light import SwitchbotBaseLight
from .devices.blind_tilt import SwitchbotBlindTilt
from .devices.bot import Switchbot
Expand Down
4 changes: 2 additions & 2 deletions switchbot/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

from enum import Enum

from .enum import StrEnum

DEFAULT_RETRY_COUNT = 3
DEFAULT_RETRY_TIMEOUT = 1
DEFAULT_SCAN_TIMEOUT = 5

from .enum import StrEnum


class SwitchbotAuthenticationError(RuntimeError):
"""Raised when authentication fails.
Expand Down
7 changes: 3 additions & 4 deletions switchbot/devices/base_cover.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
"""Library to handle connection with Switchbot."""
from __future__ import annotations

from abc import abstractmethod

import logging
from abc import abstractmethod
from typing import Any

from .device import REQ_HEADER, SwitchbotDevice, update_after_operation
Expand Down Expand Up @@ -67,7 +66,7 @@ async def set_position(self, position: int, speed: int = 255) -> bool:
f"{POSITION_KEYS[1]}{speed:02X}{position:02X}",
]
)

@abstractmethod
def get_position(self) -> Any:
"""Return current device position."""
Expand Down Expand Up @@ -115,4 +114,4 @@ async def get_extended_info_adv(self) -> dict[str, Any] | None:
"stateOfCharge": _state_of_charge[_data[6]],
}

return self.ext_info_adv
return self.ext_info_adv
6 changes: 3 additions & 3 deletions switchbot/devices/base_light.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
from __future__ import annotations

import asyncio
import logging
import time
from abc import abstractmethod
from typing import Any

from ..models import SwitchBotAdvertisement
from .device import ColorMode, SwitchbotDevice

_LOGGER = logging.getLogger(__name__)
import asyncio
import time

from ..models import SwitchBotAdvertisement


class SwitchbotBaseLight(SwitchbotDevice):
Expand Down
7 changes: 2 additions & 5 deletions switchbot/devices/blind_tilt.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
import logging
from typing import Any

from switchbot.devices.device import (
REQ_HEADER,
SwitchbotSequenceDevice,
update_after_operation,
)
from switchbot.devices.device import (REQ_HEADER, SwitchbotSequenceDevice,
update_after_operation)

from .base_cover import COVER_COMMAND, COVER_EXT_SUM_KEY, SwitchbotBaseCover

Expand Down
9 changes: 3 additions & 6 deletions switchbot/devices/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
import logging
from typing import Any

from .device import (
DEVICE_SET_EXTENDED_KEY,
DEVICE_SET_MODE_KEY,
SwitchbotDeviceOverrideStateDuringConnection,
update_after_operation,
)
from .device import (DEVICE_SET_EXTENDED_KEY, DEVICE_SET_MODE_KEY,
SwitchbotDeviceOverrideStateDuringConnection,
update_after_operation)

_LOGGER = logging.getLogger(__name__)

Expand Down
7 changes: 4 additions & 3 deletions switchbot/devices/curtain.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@

from switchbot.models import SwitchBotAdvertisement

from .base_cover import SwitchbotBaseCover, COVER_COMMAND, COVER_EXT_SUM_KEY
from .base_cover import COVER_COMMAND, COVER_EXT_SUM_KEY, SwitchbotBaseCover
from .device import REQ_HEADER, update_after_operation


# For second element of open and close arrs we should add two bytes i.e. ff00
# First byte [ff] stands for speed (00 or ff - normal, 01 - slow) *
# * Only for curtains 3. For other models use ff
Expand Down Expand Up @@ -94,7 +93,9 @@ async def stop(self) -> bool:
async def set_position(self, position: int, speed: int = 255) -> bool:
"""Send position command (0-100) to device. Speed 255 - normal, 1 - slow"""
direction_adjusted_position = (100 - position) if self._reverse else position
self._update_motion_direction(True, self._get_adv_value("position"), direction_adjusted_position)
self._update_motion_direction(
True, self._get_adv_value("position"), direction_adjusted_position
)
return await super().set_position(position, speed)

def get_position(self) -> Any:
Expand Down
14 changes: 6 additions & 8 deletions switchbot/devices/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@
from uuid import UUID

from bleak.backends.device import BLEDevice
from bleak.backends.service import BleakGATTCharacteristic, BleakGATTServiceCollection
from bleak.backends.service import (BleakGATTCharacteristic,
BleakGATTServiceCollection)
from bleak.exc import BleakDBusError
from bleak_retry_connector import (
BLEAK_RETRY_EXCEPTIONS,
BleakClientWithServiceCache,
BleakNotFoundError,
ble_device_has_changed,
establish_connection,
)
from bleak_retry_connector import (BLEAK_RETRY_EXCEPTIONS,
BleakClientWithServiceCache,
BleakNotFoundError, ble_device_has_changed,
establish_connection)

from ..const import DEFAULT_RETRY_COUNT, DEFAULT_SCAN_TIMEOUT
from ..discovery import GetSwitchbotDevices
Expand Down
7 changes: 2 additions & 5 deletions switchbot/devices/lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes

from ..api_config import SWITCHBOT_APP_API_BASE_URL, SWITCHBOT_APP_COGNITO_POOL
from ..const import (
LockStatus,
SwitchbotAccountConnectionError,
SwitchbotAuthenticationError,
)
from ..const import (LockStatus, SwitchbotAccountConnectionError,
SwitchbotAuthenticationError)
from .device import SwitchbotDevice, SwitchbotOperationError

COMMAND_HEADER = "57"
Expand Down
3 changes: 2 additions & 1 deletion switchbot/discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
from bleak.backends.scanner import AdvertisementData

from .adv_parser import parse_advertisement_data
from .const import DEFAULT_RETRY_COUNT, DEFAULT_RETRY_TIMEOUT, DEFAULT_SCAN_TIMEOUT
from .const import (DEFAULT_RETRY_COUNT, DEFAULT_RETRY_TIMEOUT,
DEFAULT_SCAN_TIMEOUT)
from .models import SwitchBotAdvertisement

_LOGGER = logging.getLogger(__name__)
Expand Down

0 comments on commit 4572097

Please sign in to comment.