more ruff fixes

Author: Galarzaa90

pyproject.toml

@@ -112,7 +112,7 @@ select = [
     "T20", # flake8-print
     "TC", # refurb
     "TID", # flake8-tidy-imports
-    "UP", # pyupgrade,
+    "UP", # pyupgrade
     "YTT", # flake8-2020
 ]
 ignore = [
@@ -133,7 +133,6 @@ max-line-length = 120
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 
-
 [tool.ruff.lint.pep8-naming]
 extend-ignore-names = ["assert*"]
 
@@ -158,3 +157,6 @@ exclude_lines = [
     "raise NotImplementedError",
     "if TYPE_CHECKING:"
 ]
+
+[tool.ruff.lint.flake8-tidy-imports.banned-api]
+"typing.Self".msg = "Use typing_extensions.Self instead."

tests/models/test_book.py

@@ -3,7 +3,7 @@
 
 from polyfactory.factories.pydantic_factory import ModelFactory
 
-from tibiawikisql.models import Book, Item, ItemStoreOffer
+from tibiawikisql.models import Book, Item
 from tibiawikisql.schema import BookTable, ItemAttributeTable, ItemSoundTable, ItemStoreOfferTable, ItemTable
 
 

tests/models/test_npc.py

@@ -2,7 +2,7 @@
 import sqlite3
 import unittest
 
-from tibiawikisql.models import Npc, NpcDestination, NpcOffer
+from tibiawikisql.models import Npc
 from tibiawikisql.schema import ItemTable, NpcBuyingTable, NpcDestinationTable, NpcJobTable, NpcRaceTable, \
     NpcSellingTable, NpcSpellTable, \
     NpcTable, \

tibiawikisql/generation.py

@@ -168,9 +168,9 @@ def progress_bar(
         iterable,
         length,
         label,
-        True,  # noqa: FBT003
-        True,  # noqa: FBT003
-        True,  # noqa: FBT003
+        True,
+        True,
+        True,
         item_show_func,
         "█",
         "░",

tibiawikisql/models/imbuement.py

@@ -1,11 +1,9 @@
 import contextlib
-import sqlite3
 from sqlite3 import Connection, Cursor, IntegrityError
-from sqlite3 import Connection, Cursor
 from typing import Any
 
 from pydantic import BaseModel, Field
-from pypika import Parameter, Query, Table
+from pypika import Parameter, Query
 from typing_extensions import Self
 
 from tibiawikisql.api import WikiEntry

tibiawikisql/models/item.py

@@ -1,9 +1,10 @@
 from sqlite3 import Connection, Cursor
-from typing import Any, Self
+from typing import Any
 
 import pydantic
 from pydantic import BaseModel, Field
 from pypika import Parameter, Query, Table
+from typing_extensions import Self
 
 from tibiawikisql.api import WikiEntry
 from tibiawikisql.models.base import RowModel, WithImage, WithStatus, WithVersion

tibiawikisql/models/npc.py

@@ -1,10 +1,11 @@
 import contextlib
 import sqlite3
 from sqlite3 import Connection, Cursor
-from typing import Any, Self
+from typing import Any
 
 from pydantic import BaseModel, Field
 from pypika import Parameter, Query, Table
+from typing_extensions import Self
 
 from tibiawikisql.api import WikiEntry
 from tibiawikisql.models.base import RowModel, WithImage, WithStatus, WithVersion

tibiawikisql/models/outfit.py

@@ -1,10 +1,7 @@
 import contextlib
-import sqlite3
 from sqlite3 import Connection, Cursor, IntegrityError
-from sqlite3 import Connection, Cursor
 from typing import Any
 
-import pydantic
 from pydantic import BaseModel, Field
 from pypika import Parameter, Query, Table
 from typing_extensions import Self

tibiawikisql/models/spell.py

@@ -1,7 +1,8 @@
 from sqlite3 import Connection, Cursor
-from typing import Any, Self
+from typing import Any
 
 from pydantic import BaseModel, Field
+from typing_extensions import Self
 
 from tibiawikisql.api import WikiEntry
 from tibiawikisql.models.base import RowModel, WithImage, WithStatus, WithVersion

tibiawikisql/parsers/creature.py

@@ -105,17 +105,13 @@ def match(k):
     return loot
 
 
-def parse_abilities(value):
+def parse_abilities(value: str) -> list[dict[str, str]]:
     """Parse the abilities of a creature.
 
-    Parameters
-    ----------
-    value: :class:`str`
-        A string containing the creature's abilities definition.
+    Args:
+    value: A string containing the creature's abilities definition.
 
-    Returns
-    -------
-    :class:`list` of :class:`dict`
+    Returns:
         A list of dictionaries with the ability data.
 
     """
@@ -173,26 +169,21 @@ def parse_abilities(value):
     return abilities
 
 
-def parse_monster_walks(value):
+def parse_monster_walks(value: str) -> str | None:
     """Match the values against a regex to filter typos or bad data on the wiki.
 
     Element names followed by any character that is not a comma will be considered unknown and will not be returned.
 
-    Examples
-    --------
+    Examples:
         - ``Poison?, fire`` will return ``fire``.
-        - ``Poison?, fire.`` will return neither.
+        - ``Poison?, fire?.`` will return neither.
         - ``Poison, earth, fire?, [[ice]]`` will return ``poison,earth``.
         - ``No``, ``--``, ``>``, or ``None`` will return ``None``.
 
-    Parameters
-    ----------
-    value: :class:`str`
-        The string containing possible field types.
+    Args:
+        value: The string containing possible field types.
 
-    Returns
-    -------
-    :class:`str`, optional
+    Returns:
         A list of field types, separated by commas.
 
     """