feat: ruff for lint

p1p1daster · p1p1daster · commit 1fef71910a1c · 2025-07-11T23:45:04.000+03:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/pybotx/bot/bot.py b/pybotx/bot/bot.py
@@ -235,7 +235,6 @@
 from pybotx.models.bot_catalog import BotsListItem
 from pybotx.models.chats import ChatInfo, ChatListItem
 from pybotx.models.commands import (
-    BotAPICommand,
     BotAPISystemEvent,
     BotAPIIncomingMessage,
     BotCommand,
@@ -322,7 +321,9 @@ def async_execute_raw_bot_command(
             if command_type == BotAPICommandTypes.USER:
                 bot_api_command = BotAPIIncomingMessage.model_validate(raw_bot_command)
             else:
-                bot_api_command = TypeAdapter(BotAPISystemEvent).validate_python(raw_bot_command)
+                bot_api_command = TypeAdapter(BotAPISystemEvent).validate_python(
+                    raw_bot_command
+                )
         except ValidationError as validation_exc:
             raise ValueError("Bot command validation error") from validation_exc
 
@@ -393,7 +394,9 @@ async def raw_get_status(
             self._verify_request(request_headers, trusted_issuers=trusted_issuers)
 
         try:
-            bot_api_status_recipient = BotAPIStatusRecipient.model_validate(query_params)
+            bot_api_status_recipient = BotAPIStatusRecipient.model_validate(
+                query_params
+            )
         except ValidationError as exc:
             raise ValueError("Status request validation error") from exc
 
@@ -551,7 +554,7 @@ async def answer_message(
         :return: Notification sync_id.
         """
 
-        try:  # noqa: WPS229
+        try:
             bot_id = bot_id_var.get()
             chat_id = chat_id_var.get()
         except LookupError as exc:
@@ -2069,7 +2072,7 @@ async def collect_metric(
         )
         await method.execute(payload)
 
-    def _verify_request(  # noqa: WPS231, WPS238
+    def _verify_request(
         self,
         headers: Optional[Mapping[str, str]],
         *,
diff --git a/pybotx/bot/bot_accounts_storage.py b/pybotx/bot/bot_accounts_storage.py
@@ -25,7 +25,7 @@ def iter_bot_accounts(self) -> Iterator[BotAccountWithSecret]:
 
     def get_cts_url(self, bot_id: UUID) -> str:
         bot_account = self.get_bot_account(bot_id)
-        return bot_account.cts_url
+        return str(bot_account.cts_url)
 
     def set_token(self, bot_id: UUID, token: str) -> None:
         self._auth_tokens[bot_id] = token
diff --git a/pybotx/client/botx_method.py b/pybotx/client/botx_method.py
@@ -155,9 +155,9 @@ async def _process_callback(
         callback_timeout: Optional[float],
         default_callback_timeout: float,
     ) -> Optional[BotXMethodCallback]:
-        assert (
-            self._callbacks_manager is not None
-        ), "CallbackManager hasn't been passed to this method"
+        assert self._callbacks_manager is not None, (
+            "CallbackManager hasn't been passed to this method"
+        )
 
         await self._callbacks_manager.create_botx_method_callback(sync_id)
 
diff --git a/pybotx/client/chats_api/chat_info.py b/pybotx/client/chats_api/chat_info.py
@@ -45,7 +45,9 @@ class BotXAPIChatInfoResult(VerifiedPayloadBaseModel):
 
     @field_validator("members", mode="before")
     @classmethod
-    def validate_members(cls, value: List[Union[BotXAPIChatInfoMember, Dict[str, Any]]]) -> List[Union[BotXAPIChatInfoMember, Dict[str, Any]]]:
+    def validate_members(
+        cls, value: List[Union[BotXAPIChatInfoMember, Dict[str, Any]]]
+    ) -> List[Union[BotXAPIChatInfoMember, Dict[str, Any]]]:
         parsed: List[Union[BotXAPIChatInfoMember, Dict[str, Any]]] = []
         for item in value:
             if isinstance(item, dict):
@@ -64,7 +66,9 @@ class BotXAPIChatInfoResponsePayload(VerifiedPayloadBaseModel):
 
     def to_domain(self) -> ChatInfo:
         if any(isinstance(member, dict) for member in self.result.members):
-            logger.warning("One or more unsupported user types skipped")  # pragma: no cover
+            logger.warning(
+                "One or more unsupported user types skipped"
+            )  # pragma: no cover
 
         members = [
             ChatInfoMember(
diff --git a/pybotx/client/chats_api/list_chats.py b/pybotx/client/chats_api/list_chats.py
@@ -27,7 +27,9 @@ class BotXAPIListChatResponsePayload(VerifiedPayloadBaseModel):
 
     @field_validator("result", mode="before")
     @classmethod
-    def validate_result(cls, value: List[Union[BotXAPIListChatResult, Dict[str, Any]]]) -> List[Union[BotXAPIListChatResult, Dict[str, Any]]]:
+    def validate_result(
+        cls, value: List[Union[BotXAPIListChatResult, Dict[str, Any]]]
+    ) -> List[Union[BotXAPIListChatResult, Dict[str, Any]]]:
         parsed: List[Union[BotXAPIListChatResult, Dict[str, Any]]] = []
         for item in value:
             if isinstance(item, dict):
@@ -56,7 +58,9 @@ def to_domain(self) -> List[ChatListItem]:
         ]
 
         if len(chats_list) != len(self.result):
-            logger.warning("One or more unsupported chat types skipped")  # pragma: no cover
+            logger.warning(
+                "One or more unsupported chat types skipped"
+            )  # pragma: no cover
 
         return chats_list
 
diff --git a/pybotx/client/events_api/message_status_event.py b/pybotx/client/events_api/message_status_event.py
@@ -42,7 +42,6 @@ class BotXAPIMessageStatusResponsePayload(VerifiedPayloadBaseModel):
     result: BotXAPIMessageStatusResult
 
     def to_domain(self) -> MessageStatus:
-
         return MessageStatus(
             group_chat_id=self.result.group_chat_id,
             sent_to=self.result.sent_to,
diff --git a/pybotx/models/bot_account.py b/pybotx/models/bot_account.py
@@ -18,10 +18,10 @@ class BotAccountWithSecret(BaseModel):
     cts_url: AnyHttpUrl
     secret_key: str
 
-    model_config = ConfigDict()
+    model_config = ConfigDict(frozen=True)
 
     def __setattr__(self, name: str, value: object) -> None:  # pragma: no cover
-        if not self.Config.allow_mutation and name in self.model_fields:
+        if not getattr(self.model_config, "frozen", True) and name in self.model_fields:
             raise TypeError("BotAccountWithSecret is immutable")  # pragma: no cover
         super().__setattr__(name, value)  # pragma: no cover
 
@@ -33,10 +33,3 @@ def host(self) -> str:
             raise ValueError("Could not parse host from cts_url.")
 
         return hostname
-
-
-class _Config:
-    allow_mutation = False
-
-
-BotAccountWithSecret.Config = _Config
diff --git a/pybotx/models/commands.py b/pybotx/models/commands.py
@@ -1,9 +1,18 @@
-from typing import Union
+from typing import List, Union
 
 from pybotx.models.message.incoming_message import (
     BotAPIIncomingMessage,
     IncomingMessage,
 )
+
+__all__: List[str] = [
+    "BotAPIIncomingMessage",
+    "IncomingMessage",
+    "BotAPISystemEvent",
+    "BotAPICommand",
+    "SystemEvent",
+    "BotCommand",
+]
 from pybotx.models.system_events.added_to_chat import (
     AddedToChatEvent,
     BotAPIAddedToChat,
diff --git a/pybotx/models/message/incoming_message.py b/pybotx/models/message/incoming_message.py
@@ -156,7 +156,6 @@ def convert_bot_api_entity_to_domain(api_entity: BotAPIEntity) -> Entity:
         return _convert_bot_api_mention_to_domain(api_entity.data)
 
     if api_entity.type == BotAPIEntityTypes.FORWARD:
-
         return Forward(
             chat_id=api_entity.data.group_chat_id,
             author_id=api_entity.data.sender_huid,
@@ -167,7 +166,6 @@ def convert_bot_api_entity_to_domain(api_entity: BotAPIEntity) -> Entity:
         )
 
     if api_entity.type == BotAPIEntityTypes.REPLY:
-
         mentions = MentionList()
         for api_mention_data in api_entity.data.mentions:
             mentions.append(_convert_bot_api_mention_to_domain(api_mention_data))
@@ -200,8 +198,12 @@ class BotAPIIncomingMessage(BotAPIBaseCommand):
 
     @field_validator("attachments", "entities", mode="before")
     @classmethod
-    def validate_items(cls, value, info):  # pragma: no cover
-        item_model = BotAPIAttachment if info.field_name == "attachments" else BotAPIEntity
+    def validate_items(
+        cls, value: List[Union[Dict[str, Any], Any]], info: Any
+    ) -> List[Any]:  # pragma: no cover
+        item_model = (
+            BotAPIAttachment if info.field_name == "attachments" else BotAPIEntity
+        )
         parsed = []
         for item in value:
             if isinstance(item, dict):
diff --git a/pybotx/models/message/markup.py b/pybotx/models/message/markup.py
@@ -186,7 +186,9 @@ class BotXAPIButton(UnverifiedPayloadBaseModel):
 class BotXAPIMarkup(RootModel[List[List[BotXAPIButton]]]):
     def json(self) -> str:  # type: ignore [override]
         clean_dict = _remove_undefined(self.model_dump())  # pragma: no cover
-        return json.dumps(clean_dict, default=to_jsonable_python, ensure_ascii=False)  # pragma: no cover
+        return json.dumps(
+            clean_dict, default=to_jsonable_python, ensure_ascii=False
+        )  # pragma: no cover
 
     def jsonable_dict(self) -> Dict[str, Any]:
         return cast(Dict[str, Any], json.loads(self.json()))  # pragma: no cover
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,13 +28,8 @@ pyjwt = ">=2.0.0,<3.0.0"
 mypy-extensions = ">=0.2.0,<=1.1.0"
 
 [tool.poetry.group.dev.dependencies]
-add-trailing-comma = "3.1.0"
-autoflake = "2.3.1"
-black = "25.1.0"
-isort = "6.0.1"
 mypy = "1.15.0"
 typing-extensions = ">=3.7.4,<5.0.0"
-wemake-python-styleguide = "0.19.2"
 bandit = "1.8.3"  # https://github.com/PyCQA/bandit/issues/837
 
 pytest = "8.3.5"
@@ -48,6 +43,7 @@ deepdiff = "^8.5.0,<=9.0.0"
 fastapi = "0.115.12 "
 starlette = "0.46.2"  # TODO: Drop dependency after updating end-to-end test
 uvicorn = "0.34.2"
+ruff = "0.12.3"
 
 [build-system]
 requires = ["poetry>=1.2.0"]
@@ -73,3 +69,7 @@ markers = [
 filterwarnings = [
   "ignore:Pydantic serializer warnings:UserWarning",
 ]
+
+[tool.ruff]
+target-version = "py39"
+line-length = 88
diff --git a/scripts/docs-lint b/scripts/docs-lint
@@ -14,9 +14,7 @@ while IFS= read -d '' -r snippet || [[ -n "${snippet}" ]]; do
   snippet_number=$((snippet_number+1))
 done < <(grep -Pzo '(?s)(?<=```python\n).*?(?=```)' README.md);
 
-isort --profile black --check-only "${snippets_dir_path}"
-black --check --diff "${snippets_dir_path}"
 mypy "${snippets_dir_path}"
-flake8 "${snippets_dir_path}"
+ruff "${snippets_dir_path}"
 
 rm -rf "${snippets_dir_path}"
diff --git a/scripts/format b/scripts/format
@@ -2,20 +2,5 @@
 
 set -ex
 
-autoflake --recursive --in-place \
-  --remove-all-unused-imports \
-  --ignore-init-module-imports \
-  pybotx tests
-isort --profile black pybotx tests
-black pybotx tests
-
-find pybotx -type f -name "*.py" | xargs add-trailing-comma --py36-plus --exit-zero-even-if-changed
-find tests -type f -name "*.py" | xargs add-trailing-comma --py36-plus --exit-zero-even-if-changed
-
-# This `black` is needed again in order to transfer parameters/arguments to new lines
-# after inserting commas.
-# The first `black` won't be able to transfer parameters/arguments to new lines because
-# there is no comma at the end of the line.
-# Inserting commas must be after the first `black`, so that there is one new line break,
-# if the line is out of max-line-length.
-black pybotx tests > /dev/null
+ruff format pybotx tests
+ruff check --fix pybotx tests
diff --git a/scripts/lint b/scripts/lint
@@ -2,10 +2,7 @@
 
 set -ex
 
-black --check --diff pybotx tests
-isort --profile black --check-only pybotx tests
-
 mypy pybotx tests
-flake8 pybotx tests
+ruff check pybotx tests
 
 ./scripts/wip-marks
diff --git a/setup.cfg b/setup.cfg
diff --git a/tests/models/test_bot_account.py b/tests/models/test_bot_account.py
