pymammotion 0.4.0a8__tar.gz → 0.4.0a9__tar.gz

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0a8
+Version: 0.4.0a9
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -25,7 +25,7 @@ Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
 Requires-Dist: numpy (>=1.26.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (==2.1.0)
+Requires-Dist: paho-mqtt (>=2.1.0,<3.0.0)
 Requires-Dist: protobuf (>=4.23.1)
 Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
 Description-Content-Type: text/markdown

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/aliyun/cloud_gateway.py

@@ -5,11 +5,11 @@ import hashlib
 import hmac
 import itertools
 import json
+from logging import getLogger
 import random
 import string
 import time
 import uuid
-from logging import getLogger
 
 from aiohttp import ClientSession
 from alibabacloud_iot_api_gateway.client import Client
@@ -19,14 +19,10 @@ from alibabacloud_tea_util.models import RuntimeOptions
 
 from pymammotion.aliyun.model.aep_response import AepResponse
 from pymammotion.aliyun.model.connect_response import ConnectResponse
-from pymammotion.aliyun.model.dev_by_account_response import (
-    ListingDevByAccountResponse,
-)
+from pymammotion.aliyun.model.dev_by_account_response import ListingDevByAccountResponse
 from pymammotion.aliyun.model.login_by_oauth_response import LoginByOAuthResponse
 from pymammotion.aliyun.model.regions_response import RegionResponse
-from pymammotion.aliyun.model.session_by_authcode_response import (
-    SessionByAuthCodeResponse,
-)
+from pymammotion.aliyun.model.session_by_authcode_response import SessionByAuthCodeResponse
 from pymammotion.const import ALIYUN_DOMAIN, APP_KEY, APP_SECRET, APP_VERSION
 from pymammotion.http.http import MammotionHTTP
 from pymammotion.utility.datatype_converter import DatatypeConverter

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/aliyun/model/aep_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -16,7 +15,7 @@ class DeviceData(DataClassORJSONMixin):
 class AepResponse(DataClassORJSONMixin):
     code: int
     data: DeviceData
-    id: Optional[str] = None
+    id: str | None = None
 
     class Config(BaseConfig):
         omit_default = True

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/aliyun/model/dev_by_account_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -23,11 +22,11 @@ class Device(DataClassORJSONMixin):
     identityId: str
     thingType: str
     status: int
-    nickName: Optional[str] = None
-    description: Optional[str] = None
-    productImage: Optional[str] = None
-    categoryImage: Optional[str] = None
-    productModel: Optional[str] = None
+    nickName: str | None = None
+    description: str | None = None
+    productImage: str | None = None
+    categoryImage: str | None = None
+    productModel: str | None = None
 
     class Config(BaseConfig):
         omit_default = True
@@ -44,5 +43,5 @@ class Data(DataClassORJSONMixin):
 @dataclass
 class ListingDevByAccountResponse(DataClassORJSONMixin):
     code: int
-    data: Optional[Data]
-    id: Optional[str] = None
+    data: Data | None
+    id: str | None = None

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/aliyun/model/login_by_oauth_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -18,7 +17,7 @@ class OpenAccount(DataClassORJSONMixin):
     domainId: int
     enableDevice: str
     status: int
-    country: Optional[str] = None
+    country: str | None = None
 
 
 @dataclass
@@ -54,7 +53,7 @@ class InnerData(DataClassORJSONMixin):
     subCode: int
     message: str
     successful: str
-    deviceId: Optional[str] = None
+    deviceId: str | None = None
 
 
 @dataclass

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/aliyun/model/regions_response.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional, TypeVar
+from typing import TypeVar
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -22,8 +22,8 @@ class RegionResponseData(DataClassORJSONMixin):
 class RegionResponse(DataClassORJSONMixin):
     data: RegionResponseData
     code: int
-    id: Optional[str] = None
-    msg: Optional[str] = None
+    id: str | None = None
+    msg: str | None = None
 
     class Config(BaseConfig):
         omit_default = True

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/aliyun/model/session_by_authcode_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -16,4 +15,4 @@ class SessionOauthToken(DataClassORJSONMixin):
 @dataclass
 class SessionByAuthCodeResponse(DataClassORJSONMixin):
     code: int
-    data: Optional[SessionOauthToken] = None
+    data: SessionOauthToken | None = None

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/aliyun/model/stream_subscription_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import List
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -13,7 +12,7 @@ class Camera(DataClassORJSONMixin):
 @dataclass
 class StreamSubscriptionResponse(DataClassORJSONMixin):
     appid: str
-    cameras: List[Camera]
+    cameras: list[Camera]
     channelName: str
     token: str
     uid: int

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/bluetooth/ble.py

@@ -1,10 +1,7 @@
 from bleak import BleakClient, BleakScanner, BLEDevice
 from bleak.backends.characteristic import BleakGATTCharacteristic
 
-from pymammotion.bluetooth.const import (
-    SERVICE_CHANGED_CHARACTERISTIC,
-    UUID_NOTIFICATION_CHARACTERISTIC,
-)
+from pymammotion.bluetooth.const import SERVICE_CHANGED_CHARACTERISTIC, UUID_NOTIFICATION_CHARACTERISTIC
 from pymammotion.event.event import BleNotificationEvent
 
 

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/bluetooth/ble_message.py

@@ -1,12 +1,11 @@
+from asyncio import sleep
+from io import BytesIO
 import itertools
 import json
 import logging
 import queue
 import sys
 import time
-from asyncio import sleep
-from io import BytesIO
-from typing import Union
 
 from bleak import BleakClient
 from jsonic.serializable import serialize
@@ -17,9 +16,7 @@ from pymammotion.bluetooth.data.framectrldata import FrameCtrlData
 from pymammotion.bluetooth.data.notifydata import BlufiNotifyData
 from pymammotion.bluetooth.model.atomic_integer import AtomicInteger
 from pymammotion.data.model.execute_boarder import ExecuteBorder
-from pymammotion.proto import (
-    dev_net_pb2,
-)
+from pymammotion.proto import dev_net_pb2
 from pymammotion.proto.luba_msg import LubaMsg, MsgAttr, MsgCmdType, MsgDevice
 from pymammotion.utility.constant.device_constant import bleOrderCmd
 
@@ -656,7 +653,7 @@ class BleMessage:
         return byteOS.getvalue()
 
     @staticmethod
-    def calc_crc(initial: int, data: Union[bytes, bytearray]) -> int:
+    def calc_crc(initial: int, data: bytes | bytearray) -> int:
         """Calculate CRC value for given initial value and byte array.
 
         Args:

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/data/model/plan.py

@@ -1,6 +1,3 @@
-from typing import List
-
-
 class Plan:
     def __init__(self) -> None:
         self.pver: int = 0

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/data/model/raw_data.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass, field
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -15,7 +14,7 @@ from pymammotion.proto.mctrl_sys import MctlSys
 
 @dataclass
 class RawMowerData:
-    raw: Optional[LubaMsg] = field(default_factory=LubaMsg)
+    raw: LubaMsg | None = field(default_factory=LubaMsg)
 
     @classmethod
     def from_raw(cls, raw: dict) -> "RawMowerData":

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/data/model/region_data.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -7,14 +6,14 @@ from mashumaro.mixins.orjson import DataClassORJSONMixin
 @dataclass
 class RegionData(DataClassORJSONMixin):
     def __init__(self) -> None:
-        self.hash: Optional[int] = None
+        self.hash: int | None = None
         self.action: int = 0
         self.current_frame: int = 0
-        self.data_hash: Optional[int] = None
+        self.data_hash: int | None = None
         self.data_len: int = 0
-        self.p_hash_a: Optional[int] = None
-        self.p_hash_b: Optional[int] = None
-        self.path: Optional[list[list[float]]] = None
+        self.p_hash_a: int | None = None
+        self.p_hash_b: int | None = None
+        self.path: list[list[float]] | None = None
         self.pver: int = 0
         self.result: int = 0
         self.sub_cmd: int = 0
@@ -72,31 +71,31 @@ class RegionData(DataClassORJSONMixin):
     def set_current_frame(self, current_frame: int) -> None:
         self.current_frame = current_frame
 
-    def get_path(self) -> Optional[list[list[float]]]:
+    def get_path(self) -> list[list[float]] | None:
         return self.path
 
     def set_path(self, path: list[list[float]]) -> None:
         self.path = path
 
-    def get_hash(self) -> Optional[int]:
+    def get_hash(self) -> int | None:
         return self.hash
 
     def set_data_hash(self, data_hash: int) -> None:
         self.data_hash = data_hash
 
-    def get_data_hash(self) -> Optional[int]:
+    def get_data_hash(self) -> int | None:
         return self.data_hash
 
     def set_p_hash_a(self, p_hash_a: int) -> None:
         self.p_hash_a = p_hash_a
 
-    def get_p_hash_a(self) -> Optional[int]:
+    def get_p_hash_a(self) -> int | None:
         return self.p_hash_a
 
     def set_p_hash_b(self, p_hash_b: int) -> None:
         self.p_hash_b = p_hash_b
 
-    def get_p_hash_b(self) -> Optional[int]:
+    def get_p_hash_b(self) -> int | None:
         return self.p_hash_b
 
     def __str__(self) -> str:

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/data/mqtt/properties.py

@@ -116,7 +116,7 @@ Items = Union[
 @dataclass
 class Item:
     time: int
-    value: Union[int, float, str, dict[str, Any]]  # Depending on the type of value
+    value: int | float | str | dict[str, Any]  # Depending on the type of value
 
 
 @dataclass

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/http/encryption.py

@@ -2,7 +2,6 @@ import base64
 import logging
 import secrets
 import string
-from typing import Optional
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import padding, serialization
@@ -50,7 +49,7 @@ class EncryptionUtils:
             private_key_bytes = base64.b64decode(EncryptionUtils.PRIVATE_KEY)
             return serialization.load_der_private_key(private_key_bytes, password=None, backend=default_backend())
         except Exception as e:
-            raise Exception(f"Failed to load private key: {str(e)}")
+            raise Exception(f"Failed to load private key: {e!s}")
 
     @staticmethod
     def load_public_key(is_production: bool = True):
@@ -65,7 +64,7 @@ class EncryptionUtils:
             public_key_bytes = base64.b64decode(key_string)
             return serialization.load_der_public_key(public_key_bytes, backend=default_backend())
         except Exception as e:
-            raise Exception(f"Failed to load public key: {str(e)}")
+            raise Exception(f"Failed to load public key: {e!s}")
 
     @staticmethod
     def encrypt(plaintext: str, key: str, iv: str) -> str:
@@ -104,7 +103,7 @@ class EncryptionUtils:
             return base64.b64encode(encrypted_bytes).decode("utf-8")
 
         except Exception as e:
-            raise Exception(f"Encryption failed: {str(e)}")
+            raise Exception(f"Encryption failed: {e!s}")
 
     def encryption_by_aes(self, text: str) -> str:
         """Encrypt text using AES with class-level key and IV
@@ -123,10 +122,10 @@ class EncryptionUtils:
             return encrypted
 
         except Exception as e:
-            _LOGGER.error(f"Encryption failed: {str(e)}")
+            _LOGGER.error(f"Encryption failed: {e!s}")
             return None
 
-    def encrypt_by_public_key(self) -> Optional[str]:
+    def encrypt_by_public_key(self) -> str | None:
         """Encrypt data using RSA public key.
 
         Args:

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/http/http.py

@@ -4,12 +4,7 @@ from typing import cast
 from aiohttp import ClientSession
 
 from pymammotion.aliyun.model.stream_subscription_response import StreamSubscriptionResponse
-from pymammotion.const import (
-    MAMMOTION_API_DOMAIN,
-    MAMMOTION_CLIENT_ID,
-    MAMMOTION_CLIENT_SECRET,
-    MAMMOTION_DOMAIN,
-)
+from pymammotion.const import MAMMOTION_API_DOMAIN, MAMMOTION_CLIENT_ID, MAMMOTION_CLIENT_SECRET, MAMMOTION_DOMAIN
 from pymammotion.http.encryption import EncryptionUtils
 from pymammotion.http.model.http import ErrorInfo, LoginResponseData, Response
 

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/http/model/http.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Generic, Literal, Optional, TypeVar
+from typing import Generic, Literal, TypeVar
 
 from mashumaro import DataClassDictMixin
 from mashumaro.config import BaseConfig
@@ -83,7 +83,7 @@ class LoginResponseUserInformation(DataClassORJSONMixin):
     userId: str
     userAccount: str
     authType: str
-    email: Optional[str] = None
+    email: str | None = None
 
     class Config(BaseConfig):
         omit_none = True

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/commands/messages/network.py

@@ -1,6 +1,6 @@
 # === sendOrderMsg_Net  ===
-import time
 from abc import ABC
+import time
 
 from pymammotion import logger
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
@@ -193,7 +193,7 @@ class MessageNetwork(AbstractMessage, ABC):
     def wifi_connectinfo_update2(self) -> None:
         hash_map = {"getMsgCmd": 1}
         # self.post_custom_data(self.get_json_string(
-        #     68, hash_map))  # ToDo: Fix this
+        #     68, hash_map))  # TODO: Fix this
 
     def get_record_wifi_list(self) -> bytes:
         build = DevNet(todev_ble_sync=1, todev__wifi_list_upload=DrvWifiList())

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/devices/base.py

@@ -1,7 +1,8 @@
+from abc import abstractmethod
 import asyncio
+from collections.abc import Awaitable, Callable
 import logging
-from abc import abstractmethod
-from typing import Any, Awaitable, Callable
+from typing import Any
 
 import betterproto
 

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/devices/mammotion.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 import asyncio
-import logging
 from enum import Enum
+import logging
 from typing import Any
 
 from bleak.backends.device import BLEDevice
@@ -296,7 +296,9 @@ class Mammotion:
         device = self.get_device_by_name(name)
         if device.preference is ConnectionPreference.WIFI:
             if device.has_cloud():
-                _stream_response = await device.cloud().mqtt.cloud_client.get_stream_subscription(device.cloud().iot_id)
+                _stream_response = await device.cloud().mqtt.cloud_client.mammotion_http.get_stream_subscription(
+                    device.cloud().iot_id
+                )
                 _LOGGER.debug(_stream_response)
                 return _stream_response
 

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mqtt/linkkit/h2client.py

@@ -24,11 +24,10 @@ import os
 import ssl
 import threading
 import time
+from types import TracebackType
 
 import crcmod
 import hyper
-from types import TracebackType
-from typing import Optional, Type
 
 
 def _assert_value(condition, error_msg):
@@ -60,7 +59,9 @@ class StreamHandler:
     def __enter__(self) -> None:
         pass
 
-    def __exit__(self, type: Optional[Type[BaseException]], value: Optional[BaseException], trace: Optional[TracebackType]) -> None:
+    def __exit__(
+        self, type: type[BaseException] | None, value: BaseException | None, trace: TracebackType | None
+    ) -> None:
         pass
 
     def get_content_length(self):
@@ -90,7 +91,9 @@ class FileStreamHandler(StreamHandler):
         self.__f = open(self.__filename, "rb")
         self.__read_size = 0
 
-    def __exit__(self, type: Optional[Type[BaseException]], value: Optional[BaseException], trace: Optional[TracebackType]) -> None:
+    def __exit__(
+        self, type: type[BaseException] | None, value: BaseException | None, trace: TracebackType | None
+    ) -> None:
         if self.__f:
             self.__f.close()
             self.__f = None

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mqtt/linkkit/linkkit.py

@@ -16,6 +16,7 @@
 #
 #
 
+from enum import Enum
 import hashlib
 import hmac
 import json
@@ -31,7 +32,6 @@ import threading
 import time
 import urllib.parse
 import urllib.request
-from enum import Enum
 
 import paho.mqtt.client as mqtt
 from paho.mqtt.enums import CallbackAPIVersion
@@ -1046,7 +1046,7 @@ UxeCp6
             raise LinkKit.StateError("not in INITIALIZED state")
         if port < 1 or port > 65535:
             raise ValueError("port wrong")
-        if protocol != "MQTTv311" and protocol != "MQTTv31":
+        if protocol not in ("MQTTv311", "MQTTv31"):
             raise ValueError("protocol wrong")
         if transport != "TCP":
             raise ValueError("transport wrong")

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.0-alpha8"
+version     = "0.4.0-alpha9"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -26,7 +26,7 @@ bleak = ">=0.21.0"
 protobuf = ">=4.23.1"
 py-jsonic = "^0.0.2"
 aiohttp = "^3.9.1"
-paho-mqtt = "==2.1.0"
+paho-mqtt = "^2.1.0"
 alicloud-gateway-iot = "^1.0.0"
 alibabacloud-apigateway-util = "^0.0.2"
 alibabacloud-iot-api-gateway = "^0.0.4"
@@ -65,7 +65,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.4.0-alpha8"
+current_version = "0.4.0-alpha9"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true
@@ -83,9 +83,13 @@ push            = false
 pymammotion = ["py.typed"]
 
 
-[tool.pylint.MAIN]
+[tool.pylint]
 py-version = "3.12"
-
+ignore = [
+    "tests",
+    "scripts",
+    "pymammotion/proto"
+]
 load-plugins = [
     "pylint.extensions.code_style",
     "pylint.extensions.typing"
@@ -356,11 +360,6 @@ enable = [
     #"useless-suppression",  # temporarily every now and then to clean them up
     "use-symbolic-message-instead",
 ]
-per-file-ignores = [
-    # hass-component-root-import: Tests test non-public APIs
-    # redefined-outer-name: Tests reference fixtures in the test function
-    "/tests/:hass-component-root-import,redefined-outer-name",
-]
 
 [tool.pylint.REPORTS]
 score = false
@@ -378,7 +377,6 @@ expected-line-ending-format = "LF"
 overgeneral-exceptions = [
     "builtins.BaseException",
     "builtins.Exception",
-    # "homeassistant.exceptions.HomeAssistantError",  # too many issues
 ]
 
 [tool.pylint.TYPING]
@@ -390,84 +388,11 @@ max-line-length-suggestions = 120
 
 [tool.ruff]
 required-version = ">=0.4.3"
-exclude = ['pymammotion/proto/*', 'tests/*']
+exclude = ['pymammotion/proto/*', 'tests/*', "scripts"]
 line-length = 120
 
 [tool.ruff.lint]
-select = [
-    "A001", # Variable {name} is shadowing a Python builtin
-    "B002", # Python does not support the unary prefix increment
-    "B005", # Using .strip() with multi-character strings is misleading
-    "B007", # Loop control variable {name} not used within loop body
-    "B014", # Exception handler with duplicate exception
-    "B015", # Pointless comparison. Did you mean to assign a value? Otherwise, prepend assert or remove it.
-    "B017", # pytest.raises(BaseException) should be considered evil
-    "B018", # Found useless attribute access. Either assign it to a variable or remove it.
-    "B023", # Function definition does not bind loop variable {name}
-    "B026", # Star-arg unpacking after a keyword argument is strongly discouraged
-    "B032", # Possible unintentional type annotation (using :). Did you mean to assign (using =)?
-    "B904", # Use raise from to specify exception cause
-    "B905", # zip() without an explicit strict= parameter
-    "BLE",
-    "C", # complexity
-    "COM818", # Trailing comma on bare tuple prohibited
-    "D", # docstrings
-    "DTZ003", # Use datetime.now(tz=) instead of datetime.utcnow()
-    "DTZ004", # Use datetime.fromtimestamp(ts, tz=) instead of datetime.utcfromtimestamp(ts)
-    "E", # pycodestyle
-    "F", # pyflakes/autoflake
-    "FLY", # flynt
-    "G", # flake8-logging-format
-    "I", # isort
-    "INP", # flake8-no-pep420
-    "ISC", # flake8-implicit-str-concat
-    "ICN001", # import concentions; {name} should be imported as {asname}
-    "LOG", # flake8-logging
-    "N804", # First argument of a class method should be named cls
-    "N805", # First argument of a method should be named self
-    "N815", # Variable {name} in class scope should not be mixedCase
-    "PERF", # Perflint
-    "PGH", # pygrep-hooks
-    "PIE", # flake8-pie
-    "PL", # pylint
-    "PT", # flake8-pytest-style
-    "PYI", # flake8-pyi
-    "RET", # flake8-return
-    "RSE", # flake8-raise
-    "RUF005", # Consider iterable unpacking instead of concatenation
-    "RUF006", # Store a reference to the return value of asyncio.create_task
-    "RUF013", # PEP 484 prohibits implicit Optional
-    "RUF018", # Avoid assignment expressions in assert statements
-    "RUF019", # Unnecessary key check before dictionary access
-    # "RUF100", # Unused `noqa` directive; temporarily every now and then to clean them up
-    "S102", # Use of exec detected
-    "S103", # bad-file-permissions
-    "S108", # hardcoded-temp-file
-    "S306", # suspicious-mktemp-usage
-    "S307", # suspicious-eval-usage
-    "S313", # suspicious-xmlc-element-tree-usage
-    "S314", # suspicious-xml-element-tree-usage
-    "S315", # suspicious-xml-expat-reader-usage
-    "S316", # suspicious-xml-expat-builder-usage
-    "S317", # suspicious-xml-sax-usage
-    "S318", # suspicious-xml-mini-dom-usage
-    "S319", # suspicious-xml-pull-dom-usage
-    "S320", # suspicious-xmle-tree-usage
-    "S601", # paramiko-call
-    "S602", # subprocess-popen-with-shell-equals-true
-    "S604", # call-with-shell-equals-true
-    "S608", # hardcoded-sql-expression
-    "S609", # unix-command-wildcard-injection
-    "SIM", # flake8-simplify
-    "SLF", # flake8-self
-    "SLOT", # flake8-slots
-    "T100", # Trace found: {name} used
-    "T20", # flake8-print
-    "TID251", # Banned imports
-    "TRY", # tryceratops
-    "UP", # pyupgrade
-    "W", # pycodestyle
-]
+select = ["ALL"]
 
 ignore = [
     "D202", # No blank lines allowed after function docstring
@@ -510,9 +435,7 @@ ignore = [
     "D206",
     "D300",
     "Q",
-    "COM812",
     "COM819",
-    "ISC001",
 
     # Disabled because ruff does not understand type of __all__ generated by a function
     "PLE0605",
@@ -524,5 +447,49 @@ ignore = [
     "RET502",
     "RET501",
     "TRY002",
-    "TRY301"
+    "TRY301",
+    "ANN401", # Opinioated warning on disallowing dynamically typed expressions
+    "COM812", # Conflicts with formatter
+    "D203", # Conflicts with other rules
+    "D417", # False positives in some occasions
+    "ISC001", # Conflicts with formatter
 ]
+
+[tool.ruff.lint.isort]
+known-first-party = ["pymammotion"]
+force-sort-within-sections = true
+split-on-trailing-comma = false
+combine-as-imports = true
+
+[tool.ruff.lint.mccabe]
+max-complexity = 25
+
+[tool.mypy]
+# Specify the target platform details in config, so your developers are
+# free to run mypy on Windows, Linux, or macOS and get consistent
+# results.
+platform = "linux"
+python_version = "3.12"
+
+# show error messages from unrelated files
+follow_imports = "normal"
+
+# suppress errors about unsatisfied imports
+ignore_missing_imports = true
+
+# be strict
+check_untyped_defs = true
+disallow_any_generics = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+no_implicit_optional = true
+strict_optional = true
+warn_incomplete_stub = true
+warn_no_return = true
+warn_redundant_casts = true
+warn_return_any = true
+warn_unused_configs = true
+warn_unused_ignores = true

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/data/model/generate_route_information.py

@@ -1,5 +1,5 @@
-import logging
 from dataclasses import dataclass
+import logging
 
 logger = logging.getLogger(__name__)
 

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/data/state_manager.py

@@ -1,8 +1,8 @@
 """Manage state from notifications into MowingDevice."""
 
-import logging
 from collections.abc import Awaitable, Callable
 from datetime import datetime
+import logging
 from typing import Any
 
 import betterproto

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/commands/messages/driver.py

@@ -1,7 +1,7 @@
 # === sendOrderMsg_Driver ===
-import time
 from abc import ABC
 from logging import getLogger
+import time
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import mctrl_driver

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/commands/messages/navigation.py

@@ -1,7 +1,7 @@
 # === sendOrderMsg_Nav ===
+from abc import ABC
 import logging
 import time
-from abc import ABC
 
 from pymammotion.data.model import GenerateRouteInformation
 from pymammotion.data.model.plan import Plan

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/commands/messages/system.py

@@ -1,7 +1,7 @@
 # === sendOrderMsg_Sys ===
+from abc import ABC
 import datetime
 import time
-from abc import ABC
 
 from pymammotion import logger
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/commands/messages/video.py

@@ -1,6 +1,6 @@
 # === sendOrderMsg_Video ===
-import time
 from abc import ABC
+import time
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import luba_msg_pb2, luba_mul_pb2

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -1,10 +1,10 @@
 import asyncio
-import base64
-import json
-import logging
 from asyncio import TimerHandle
+import base64
 from collections import deque
 from collections.abc import Awaitable, Callable
+import json
+import logging
 from typing import Any, cast
 
 import betterproto

{pymammotion-0.4.0a8 → pymammotion-0.4.0a9}/pymammotion/mqtt/mammotion_mqtt.py

@@ -2,11 +2,11 @@
 
 import asyncio
 import base64
+from collections.abc import Awaitable, Callable
 import hashlib
 import hmac
 import json
 import logging
-from collections.abc import Awaitable, Callable
 from logging import getLogger
 
 import betterproto