refactor: harmonize imports

onyx_client/authorizer/__init__.py

@@ -1,14 +1,13 @@
 """Onyx Client authorizer."""
-
 import logging
-from typing import Optional
-
 import aiohttp
 
-from onyx_client.client import OnyxClient
-from onyx_client.configuration.configuration import Configuration
-from onyx_client.utils.const import API_URL, API_HEADERS
-from onyx_client.utils.response import check
+from typing import Optional
+
+from ..client import OnyxClient
+from ..configuration.configuration import Configuration
+from ..utils.const import API_URL, API_HEADERS
+from ..utils.response import check
 
 _LOGGER = logging.getLogger(__name__)
 

onyx_client/client.py

@@ -1,24 +1,24 @@
 """Onyx Client API class."""
 import json
 import logging
-from typing import Optional
-from random import uniform
-
 import aiohttp
 import asyncio
 
-from onyx_client.configuration.configuration import Configuration
-from onyx_client.data.date_information import DateInformation
-from onyx_client.data.device_command import DeviceCommand
-from onyx_client.data.supported_versions import SupportedVersions
-from onyx_client.device.device import Device
-from onyx_client.enum.action import Action
-from onyx_client.enum.device_type import DeviceType
-from onyx_client.group.group import Group
-from onyx_client.helpers.url import UrlHelper
-from onyx_client.utils.const import API_VERSION
-from onyx_client.utils.filter import present
-from onyx_client.utils.mapper import init_device
+from typing import Optional
+from random import uniform
+
+from .configuration.configuration import Configuration
+from .data.date_information import DateInformation
+from .data.device_command import DeviceCommand
+from .data.supported_versions import SupportedVersions
+from .device.device import Device
+from .enum.action import Action
+from .enum.device_type import DeviceType
+from .group.group import Group
+from .helpers.url import UrlHelper
+from .utils.const import API_VERSION
+from .utils.filter import present
+from .utils.mapper import init_device
 
 _LOGGER = logging.getLogger(__name__)
 

onyx_client/data/animation_value.py

@@ -1,7 +1,7 @@
 """Animation Values of Onyx devices."""
 from typing import Optional
 
-from onyx_client.data.animation_keyframe import AnimationKeyframe
+from ..data.animation_keyframe import AnimationKeyframe
 
 
 class AnimationValue:

onyx_client/data/device_command.py

@@ -1,6 +1,6 @@
 """Device Command for an Onyx device."""
-from onyx_client.enum.action import Action
-from onyx_client.exception.invalid_command import InvalidCommandException
+from ..enum.action import Action
+from ..exception.invalid_command import InvalidCommandException
 
 
 class DeviceCommand:

onyx_client/data/device_mode.py

@@ -1,5 +1,5 @@
 """Device Mode for an Onyx device."""
-from onyx_client.enum.device_type import DeviceType
+from ..enum.device_type import DeviceType
 
 
 class DeviceMode:

onyx_client/data/numeric_value.py

@@ -1,7 +1,7 @@
 """Numeric Values of Onyx devices."""
 from typing import Optional
 
-from onyx_client.data.animation_value import AnimationValue
+from ..data.animation_value import AnimationValue
 
 
 class NumericValue:

onyx_client/device/click.py

@@ -1,7 +1,7 @@
 """Click class."""
-from onyx_client.data.device_mode import DeviceMode
-from onyx_client.device.device import Device
-from onyx_client.enum.device_type import DeviceType
+from ..data.device_mode import DeviceMode
+from ..device.device import Device
+from ..enum.device_type import DeviceType
 
 
 class Click(Device):

onyx_client/device/device.py

@@ -1,9 +1,9 @@
 """Device class."""
 from typing import Optional
 
-from onyx_client.data.device_mode import DeviceMode
-from onyx_client.enum.device_type import DeviceType
-from onyx_client.exception.update_exception import UpdateException
+from ..data.device_mode import DeviceMode
+from ..enum.device_type import DeviceType
+from ..exception.update_exception import UpdateException
 
 
 class Device:

onyx_client/device/light.py

@@ -1,10 +1,10 @@
 """Light class."""
 from typing import Optional
 
-from onyx_client.data.device_mode import DeviceMode
-from onyx_client.data.numeric_value import NumericValue
-from onyx_client.device.device import Device
-from onyx_client.enum.device_type import DeviceType
+from ..data.device_mode import DeviceMode
+from ..data.numeric_value import NumericValue
+from ..device.device import Device
+from ..enum.device_type import DeviceType
 
 
 class Light(Device):

onyx_client/device/shutter.py

@@ -1,10 +1,10 @@
 """Shutter class."""
 from typing import Optional
 
-from onyx_client.data.device_mode import DeviceMode
-from onyx_client.data.numeric_value import NumericValue
-from onyx_client.device.device import Device
-from onyx_client.enum.device_type import DeviceType
+from ..data.device_mode import DeviceMode
+from ..data.numeric_value import NumericValue
+from ..device.device import Device
+from ..enum.device_type import DeviceType
 
 
 # not mapped properties:

onyx_client/device/switch.py

@@ -1,9 +1,9 @@
 """Switch class."""
 from typing import Optional
 
-from onyx_client.data.device_mode import DeviceMode
-from onyx_client.device.device import Device
-from onyx_client.enum.device_type import DeviceType
+from ..data.device_mode import DeviceMode
+from ..device.device import Device
+from ..enum.device_type import DeviceType
 
 
 class Switch(Device):

onyx_client/device/weather.py

@@ -1,10 +1,10 @@
 """Weather class."""
 from typing import Optional
 
-from onyx_client.data.device_mode import DeviceMode
-from onyx_client.data.numeric_value import NumericValue
-from onyx_client.device.device import Device
-from onyx_client.enum.device_type import DeviceType
+from ..data.device_mode import DeviceMode
+from ..data.numeric_value import NumericValue
+from ..device.device import Device
+from ..enum.device_type import DeviceType
 
 
 class Weather(Device):

onyx_client/helpers/url.py

@@ -1,11 +1,11 @@
 """Onyx Client URL helper."""
-from typing import Optional, Any
-
 import aiohttp
 
-from onyx_client.configuration.configuration import Configuration
-from onyx_client.utils.const import API_URL, API_HEADERS, API_VERSION
-from onyx_client.utils.response import check
+from typing import Optional, Any
+
+from ..configuration.configuration import Configuration
+from ..utils.const import API_URL, API_HEADERS, API_VERSION
+from ..utils.response import check
 
 
 class UrlHelper:

onyx_client/utils/device_type.py

@@ -1,12 +1,12 @@
 """Onyx Client device type utils."""
 from typing import Optional
 
-from onyx_client.device.click import Click
-from onyx_client.device.light import Light
-from onyx_client.device.shutter import Shutter
-from onyx_client.device.switch import Switch
-from onyx_client.device.weather import Weather
-from onyx_client.enum.device_type import DeviceType
+from ..device.click import Click
+from ..device.light import Light
+from ..device.shutter import Shutter
+from ..device.switch import Switch
+from ..device.weather import Weather
+from ..enum.device_type import DeviceType
 
 
 def is_shutter(device_type: DeviceType, properties: dict) -> bool:

onyx_client/utils/mapper.py

@@ -1,15 +1,15 @@
 """Onyx Client mapper utils."""
-from onyx_client.data.boolean_value import BooleanValue
-from onyx_client.data.device_mode import DeviceMode
-from onyx_client.data.numeric_value import NumericValue
-from onyx_client.device.click import Click
-from onyx_client.device.device import Device
-from onyx_client.device.light import Light
-from onyx_client.device.shutter import Shutter
-from onyx_client.device.switch import Switch
-from onyx_client.device.weather import Weather
-from onyx_client.enum.device_type import DeviceType
-from onyx_client.utils.device_type import (
+from ..data.boolean_value import BooleanValue
+from ..data.device_mode import DeviceMode
+from ..data.numeric_value import NumericValue
+from ..device.click import Click
+from ..device.device import Device
+from ..device.light import Light
+from ..device.shutter import Shutter
+from ..device.switch import Switch
+from ..device.weather import Weather
+from ..enum.device_type import DeviceType
+from ..utils.device_type import (
     is_click,
     is_light,
     is_weather,

onyx_client/utils/response.py

@@ -1,6 +1,5 @@
 """Onyx Client response utils."""
 import logging
-
 import aiohttp
 
 _LOGGER = logging.getLogger(__name__)

tests/authorizer/test_init.py

@@ -1,8 +1,8 @@
 """Tests for __init__."""
-from unittest.mock import patch
-
 import aiohttp
 import pytest
+
+from unittest.mock import patch
 from aioresponses import aioresponses
 
 from onyx_client.authorizer import exchange_code, authorize

tests/group/test_group.py

@@ -1,5 +1,4 @@
 """Tests for the Group class."""
-
 from onyx_client.group.group import Group
 
 

tests/helpers/test_url.py

@@ -1,8 +1,8 @@
 """Tests for the Onyx Client URL helper."""
-
 import aiohttp
 import pytest
 import pytest_asyncio
+
 from aioresponses import aioresponses
 
 from onyx_client.configuration.configuration import Configuration

tests/test_client.py

@@ -1,10 +1,10 @@
 """Tests for the Onyx Client."""
-from unittest.mock import patch
-
 import aiohttp
 import pytest
 import pytest_asyncio
 import asyncio
+
+from unittest.mock import patch
 from aioresponses import aioresponses
 
 from onyx_client.client import create, OnyxClient

tests/utils/test_filter.py

@@ -1,5 +1,4 @@
 """Tests for the filters."""
-
 from onyx_client.utils.filter import present
 
 

tests/utils/test_mapper.py

@@ -1,5 +1,4 @@
 """Tests for mapper utils."""
-
 from onyx_client.data.boolean_value import BooleanValue
 from onyx_client.data.numeric_value import NumericValue
 from onyx_client.device.click import Click