Улучшены аннотации типов

generate_async_version.py

@@ -7,7 +7,7 @@
 REQUEST_METHODS = ('_request_wrapper', 'get', 'post', 'retrieve', 'download')
 
 
-def gen_request(output_request_filename):
+def gen_request(output_request_filename: str) -> None:
     with open('yandex_music/utils/request.py', 'r', encoding='UTF-8') as f:
         code = f.read()
 
@@ -47,7 +47,7 @@ def gen_request(output_request_filename):
         f.write(code)
 
 
-def gen_client(output_client_filename):
+def gen_client(output_client_filename: str) -> None:
     with open('yandex_music/client.py', 'r', encoding='UTF-8') as f:
         code = f.read()
 

generate_camel_case_aliases.py

@@ -32,7 +32,7 @@ def convert_snake_case_to_camel_case(string: str) -> str:
     return camel_case[0].lower() + camel_case[1:]
 
 
-def _generate_code(function_name: str, intent=0) -> str:
+def _generate_code(function_name: str, intent: int = 0) -> str:
     camel_case_name = convert_snake_case_to_camel_case(function_name)
     code = ALIAS_TEMPLATE.format(name=function_name, camel_case_name=camel_case_name)
 
@@ -85,7 +85,7 @@ def _process_file(file: str) -> None:
         f.write(new_file_code)
 
 
-def main():
+def main() -> None:
     for root, _, files in os.walk(SOURCE_FOLDER):
         for file in files:
             if file.endswith('.py') and file != '__init__.py':

ruff.toml

@@ -8,7 +8,7 @@ extend-select = [
     "Q",  # flake8-quotes
     "S",  # flake8-bandit
     "ASYNC", # flake8-async
-    #    "ANN", # flake8-annotations. Not all resolved yet
+    "ANN", # annotations
     "C",
     "BLE",
     "ERA",
@@ -37,13 +37,14 @@ ignore = [
 ]
 
 [per-file-ignores]
-"examples/*.py" = ["T201", "S311", "ERA001", "INP001", "S106", "BLE001", "S603"]
+"examples/*.py" = ["T201", "S311", "ERA001", "INP001", "S106", "BLE001", "S603", "ANN"]
 "docs/source/conf.py" = ["INP001"]
-"tests/*.py" = ["S101"] # Use of assert
+"tests/*.py" = ["S101", "ANN"] # Use of assert
 "tests/__init__.py" = ["F401"] # Unused import
 "yandex_music/__init__.py" = ["I001"] # Import sort
 "yandex_music/client*.py" = ["T201"] # print
 "test.py" = ["S101", "ERA001", "T201", "E501", "F401", "F841"]
+"yandex_music/utils/request*.py" = ["ANN"]  # TODO(MarshalX): annotate and remove this ignore
 
 [flake8-quotes]
 docstring-quotes = "double"

setup.py

@@ -6,7 +6,7 @@
 
 
 class PyTest(test):
-    def run_tests(self):
+    def run_tests(self) -> None:
         import pytest
 
         sys.exit(pytest.main(['tests']))

yandex_music/account/account.py

@@ -49,7 +49,7 @@ class Account(YandexMusicObject):
     child: bool = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         if self.uid:
             self._id_attrs = (self.uid,)
 

yandex_music/account/alert.py

@@ -37,7 +37,7 @@ class Alert(YandexMusicObject):
     close_button: bool
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.alert_id,)
 
     @classmethod

yandex_music/account/alert_button.py

@@ -25,7 +25,7 @@ class AlertButton(YandexMusicObject):
     uri: str
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.text, self.uri)
 
     @classmethod

yandex_music/account/auto_renewable.py

@@ -33,7 +33,7 @@ class AutoRenewable(YandexMusicObject):
     order_id: Optional[int] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.expires, self.vendor, self.vendor_help_url, self.product, self.finished)
 
     @classmethod

yandex_music/account/deactivation.py

@@ -24,7 +24,7 @@ class Deactivation(YandexMusicObject):
     instructions: Optional[str] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.method, self.instructions)
 
     @classmethod

yandex_music/account/non_auto_renewable.py

@@ -21,7 +21,7 @@ class NonAutoRenewable(YandexMusicObject):
     end: str
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.start, self.end)
 
     @classmethod

yandex_music/account/operator.py

@@ -29,7 +29,7 @@ class Operator(YandexMusicObject):
     suspended: bool
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.product_id, self.phone)
 
     @classmethod

yandex_music/account/passport_phone.py

@@ -19,7 +19,7 @@ class PassportPhone(YandexMusicObject):
     phone: str
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.phone,)
 
     @classmethod

yandex_music/account/permissions.py

@@ -23,7 +23,7 @@ class Permissions(YandexMusicObject):
     default: List[str]
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.until, self.values, self.default)
 
     @classmethod

yandex_music/account/plus.py

@@ -21,7 +21,7 @@ class Plus(YandexMusicObject):
     is_tutorial_completed: bool
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.has_plus, self.is_tutorial_completed)
 
     @classmethod

yandex_music/account/price.py

@@ -21,7 +21,7 @@ class Price(YandexMusicObject):
     currency: str
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.amount, self.currency)
 
     @classmethod

yandex_music/account/product.py

@@ -76,7 +76,7 @@ class Product(YandexMusicObject):
     payment_method_types: List[str] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (
             self.product_id,
             self.type,

yandex_music/account/renewable_remainder.py

@@ -22,7 +22,7 @@ class RenewableRemainder(YandexMusicObject):
     days: int
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.days,)
 
     @classmethod

yandex_music/account/status.py

@@ -51,7 +51,7 @@ class Status(YandexMusicObject):
     userhash: Optional[str] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.account, self.permissions)
 
     @classmethod

yandex_music/account/subscription.py

@@ -35,7 +35,7 @@ class Subscription(YandexMusicObject):
     end: Optional[str] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.non_auto_renewable_remainder, self.auto_renewable, self.family_auto_renewable)
 
     @classmethod

yandex_music/account/user_settings.py

@@ -61,7 +61,7 @@ class UserSettings(YandexMusicObject):
     show_disk_tracks_in_library: Optional[bool] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (
             self.uid,
             self.last_fm_scrobbling_enabled,

yandex_music/album/album.py

@@ -120,7 +120,7 @@ class Album(YandexMusicObject):
     available_for_options: Optional[List[str]] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.id,)
 
     def with_tracks(self, *args, **kwargs) -> Optional['Album']:

yandex_music/album/deprecation.py

@@ -23,7 +23,7 @@ class Deprecation(YandexMusicObject):
     done: Optional[bool]
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.target_album_id, self.status, self.done)
 
     @classmethod

yandex_music/album/label.py

@@ -21,7 +21,7 @@ class Label(YandexMusicObject):
     name: str
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.id, self.name)
 
     @classmethod

yandex_music/album/track_position.py

@@ -26,7 +26,7 @@ class TrackPosition(YandexMusicObject):
     index: int
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.volume, self.index)
 
     @classmethod

yandex_music/artist/artist.py

@@ -78,7 +78,7 @@ class Artist(YandexMusicObject):
     ya_money_id: Optional[str] = None
     client: 'Client' = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.id, self.name, self.cover)
 
     def get_op_image_url(self, size: str = '200x200') -> str:
@@ -223,28 +223,32 @@ async def dislike_async(self, *args, **kwargs) -> bool:
         """
         return await self.client.users_likes_artists_remove(self.id, self.client.me.account.uid, *args, **kwargs)
 
-    def get_tracks(self, page=0, page_size=20, *args, **kwargs) -> Optional['ArtistTracks']:
+    def get_tracks(self, page: int = 0, page_size: int = 20, *args, **kwargs) -> Optional['ArtistTracks']:
         """Сокращение для::
 
         client.artists_tracks(artist.id, page, page_size, *args, **kwargs)
         """
         return self.client.artists_tracks(self.id, page, page_size, *args, **kwargs)
 
-    async def get_tracks_async(self, page=0, page_size=20, *args, **kwargs) -> Optional['ArtistTracks']:
+    async def get_tracks_async(self, page: int = 0, page_size: int = 20, *args, **kwargs) -> Optional['ArtistTracks']:
         """Сокращение для::
 
         await client.artists_tracks(artist.id, page, page_size, *args, **kwargs)
         """
         return await self.client.artists_tracks(self.id, page, page_size, *args, **kwargs)
 
-    def get_albums(self, page=0, page_size=20, sort_by='year', *args, **kwargs) -> Optional['ArtistAlbums']:
+    def get_albums(
+        self, page: int = 0, page_size: int = 20, sort_by: str = 'year', *args, **kwargs
+    ) -> Optional['ArtistAlbums']:
         """Сокращение для::
 
         client.artists_direct_albums(artist.id, page, page_size, sort_by, *args, **kwargs)
         """
         return self.client.artists_direct_albums(self.id, page, page_size, sort_by, *args, **kwargs)
 
-    async def get_albums_async(self, page=0, page_size=20, sort_by='year', *args, **kwargs) -> Optional['ArtistAlbums']:
+    async def get_albums_async(
+        self, page: int = 0, page_size: int = 20, sort_by: str = 'year', *args, **kwargs
+    ) -> Optional['ArtistAlbums']:
         """Сокращение для::
 
         await client.artists_direct_albums(artist.id, page, page_size, sort_by, *args, **kwargs)

yandex_music/artist/artist_albums.py

@@ -21,10 +21,10 @@ class ArtistAlbums(YandexMusicObject):
     pager: Optional['Pager']
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.pager, self.albums)
 
-    def __getitem__(self, item) -> 'Album':
+    def __getitem__(self, item: int) -> 'Album':
         return self.albums[item]
 
     def __iter__(self) -> Iterator['Album']:

yandex_music/artist/artist_tracks.py

@@ -21,10 +21,10 @@ class ArtistTracks(YandexMusicObject):
     pager: Optional['Pager']
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.pager, self.tracks)
 
-    def __getitem__(self, item) -> 'Track':
+    def __getitem__(self, item: int) -> 'Track':
         return self.tracks[item]
 
     def __iter__(self) -> Iterator['Track']:

yandex_music/artist/brief_info.py

@@ -47,7 +47,7 @@ class BriefInfo(YandexMusicObject):
     tracks_in_chart: List['Chart'] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (
             self.artist,
             self.albums,

yandex_music/artist/counts.py

@@ -29,7 +29,7 @@ class Counts(YandexMusicObject):
     also_tracks: int
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.tracks, self.direct_albums, self.also_albums, self.also_tracks)
 
     @classmethod

yandex_music/artist/description.py

@@ -25,7 +25,7 @@ class Description(YandexMusicObject):
     uri: str
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.text, self.uri)
 
     @classmethod

yandex_music/artist/link.py

@@ -28,7 +28,7 @@ class Link(YandexMusicObject):
     social_network: Optional[str] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.title, self.href, self.type)
 
     @classmethod

yandex_music/artist/ratings.py

@@ -23,7 +23,7 @@ class Ratings(YandexMusicObject):
     day: Optional[int] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (self.week, self.month)
 
     @classmethod

yandex_music/artist/vinyl.py

@@ -34,7 +34,7 @@ class Vinyl(YandexMusicObject):
     picture: Optional[str] = None
     client: Optional['Client'] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._id_attrs = (
             self.title,
             self.price,