fix: remove language and region on /images

leandcesar · Jul 23, 2024 · 7879120 · 7879120
1 parent ddffec0
commit 7879120
Show file tree

Hide file tree

Showing 29 changed files with 66 additions and 93 deletions.
diff --git a/setup.py b/setup.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
 from setuptools import find_packages, setup
 
 with open("README.rst", "r", encoding="utf-8") as readme_file:

diff --git a/tests/routes_async/test_async_collections.py b/tests/routes_async/test_async_collections.py
@@ -42,8 +42,6 @@ async def test_collection_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/collection/{collection_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_async/test_async_companies.py b/tests/routes_async/test_async_companies.py
@@ -65,8 +65,6 @@ async def test_company_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/company/{company_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_async/test_async_episodes.py b/tests/routes_async/test_async_episodes.py
@@ -129,8 +129,6 @@ async def test_episode_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/tv/{tv_id}/season/{season_id}/episode/{episode_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_async/test_async_movies.py b/tests/routes_async/test_async_movies.py
@@ -145,8 +145,6 @@ async def test_movie_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/movie/{movie_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_async/test_async_networks.py b/tests/routes_async/test_async_networks.py
@@ -65,8 +65,6 @@ async def test_network_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/network/{network_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_async/test_async_people.py b/tests/routes_async/test_async_people.py
@@ -98,8 +98,6 @@ async def test_person_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/person/{person_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_async/test_async_seasons.py b/tests/routes_async/test_async_seasons.py
@@ -148,8 +148,6 @@ async def test_season_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/tv/{tv_id}/season/{season_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_async/test_async_tv.py b/tests/routes_async/test_async_tv.py
@@ -211,8 +211,6 @@ async def test_tv_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/tv/{tv_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_collections.py b/tests/routes_sync/test_sync_collections.py
@@ -38,8 +38,6 @@ def test_collection_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/collection/{collection_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_companies.py b/tests/routes_sync/test_sync_companies.py
@@ -60,8 +60,6 @@ def test_company_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/company/{company_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_episodes.py b/tests/routes_sync/test_sync_episodes.py
@@ -124,8 +124,6 @@ def test_episode_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/tv/{tv_id}/season/{season_id}/episode/{episode_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_movies.py b/tests/routes_sync/test_sync_movies.py
@@ -137,8 +137,6 @@ def test_movie_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/movie/{movie_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_networks.py b/tests/routes_sync/test_sync_networks.py
@@ -60,8 +60,6 @@ def test_network_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/network/{network_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_people.py b/tests/routes_sync/test_sync_people.py
@@ -92,8 +92,6 @@ def test_person_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/person/{person_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_seasons.py b/tests/routes_sync/test_sync_seasons.py
@@ -142,8 +142,6 @@ def test_season_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/tv/{tv_id}/season/{season_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/tests/routes_sync/test_sync_tv.py b/tests/routes_sync/test_sync_tv.py
@@ -200,8 +200,6 @@ def test_tv_images(get_data, assert_data):
             f"https://api.themoviedb.org/3/tv/{tv_id}/images",
             params={
                 "api_key": "TEST_TMDB_KEY",
-                "language": "TEST_TMDB_LANGUAGE",
-                "region": "TEST_TMDB_REGION",
                 "watch_region": "TEST_TMDB_REGION",
             },
         )

diff --git a/themoviedb/__init__.py b/themoviedb/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 from themoviedb.aiotmdb import aioTMDb  # noqa: F401
+from themoviedb.schemas import *  # noqa: F401, F403
 from themoviedb.tmdb import TMDb  # noqa: F401
diff --git a/themoviedb/routes_async/_base.py b/themoviedb/routes_async/_base.py
@@ -80,6 +80,9 @@ async def request(self, path: str, method: str = "GET", **kwargs) -> Dict[str, A
             if v is not None
         }
         params = {**self._params, **params}
+        if path.endswith("/images"):
+            params.pop("region")
+            params.pop("language")
 
         if self.session is not None:
             if json is None:

diff --git a/themoviedb/routes_sync/_base.py b/themoviedb/routes_sync/_base.py
@@ -76,6 +76,9 @@ def request(self, path: str, method: str = "GET", **kwargs) -> Dict[str, Any]:
         json = kwargs.pop("json", None)
         params = {k.replace("__", "."): v for k, v in kwargs.items() if v is not None}
         params = {**self._params, **params}
+        if path.endswith("/images"):
+            params.pop("region")
+            params.pop("language")
 
         if self.session is not None:
             if json is None:

diff --git a/themoviedb/schemas/_partial.py b/themoviedb/schemas/_partial.py
@@ -15,8 +15,8 @@ class PartialCompany:
     def __str__(self) -> str:
         return self.name or ""
 
-    def logo_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.logo_path}" if self.logo_path else None
+    def logo_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.logo_path}" if self.logo_path else None
 
 
 @dataclass
@@ -29,11 +29,11 @@ class PartialCollection:
     def __str__(self) -> str:
         return self.name or ""
 
-    def backdrop_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.backdrop_path}" if self.backdrop_path else None
+    def backdrop_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.backdrop_path}" if self.backdrop_path else None
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass
@@ -61,7 +61,7 @@ class PartialMovie:
     vote_count: Optional[int] = None
     video: Optional[bool] = None
     vote_average: Optional[float] = None
-    media_type: Optional[MediaType] = MediaType.movie
+    media_type: MediaType = MediaType.movie
 
     def __str__(self) -> str:
         return self.title or self.original_title or ""
@@ -70,11 +70,11 @@ def __str__(self) -> str:
     def year(self) -> Optional[int]:
         return self.release_date.year if self.release_date else None
 
-    def backdrop_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.backdrop_path}" if self.backdrop_path else None
+    def backdrop_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.backdrop_path}" if self.backdrop_path else None
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass
@@ -87,8 +87,8 @@ class PartialNetwork:
     def __str__(self) -> str:
         return self.name or ""
 
-    def logo_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.logo_path}" if self.logo_path else None
+    def logo_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.logo_path}" if self.logo_path else None
 
 
 @dataclass
@@ -107,7 +107,7 @@ class PartialTV:
     vote_count: Optional[int] = None
     name: Optional[str] = None
     original_name: Optional[str] = None
-    media_type: Optional[MediaType] = MediaType.tv
+    media_type: MediaType = MediaType.tv
 
     def __str__(self) -> str:
         return self.name or self.original_name or ""
@@ -116,11 +116,11 @@ def __str__(self) -> str:
     def year(self) -> Optional[int]:
         return self.first_air_date.year if self.first_air_date else None
 
-    def backdrop_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.backdrop_path}" if self.backdrop_path else None
+    def backdrop_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.backdrop_path}" if self.backdrop_path else None
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass
@@ -136,8 +136,8 @@ class PartialSeason:
     def __str__(self) -> str:
         return self.name or ""
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass
@@ -159,8 +159,8 @@ class PartialEpisode:
     def __str__(self) -> str:
         return self.name or ""
 
-    def still_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.still_path}" if self.still_path else None
+    def still_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.still_path}" if self.still_path else None
 
 
 @dataclass
@@ -179,10 +179,10 @@ class PartialPerson:
     name: Optional[str] = None
     original_name: Optional[str] = None
     popularity: Optional[float] = None
-    media_type: Optional[MediaType] = MediaType.person
+    media_type: MediaType = MediaType.person
 
     def __str__(self) -> str:
         return self.name or self.original_name or ""
 
-    def profile_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.profile_path}" if self.profile_path else None
+    def profile_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.profile_path}" if self.profile_path else None
diff --git a/themoviedb/schemas/credits.py b/themoviedb/schemas/credits.py
@@ -40,8 +40,8 @@ class Cast:
     def __str__(self) -> str:
         return self.name or self.original_name or ""
 
-    def profile_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.profile_path}" if self.profile_path else None
+    def profile_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.profile_path}" if self.profile_path else None
 
 
 @dataclass
@@ -64,8 +64,8 @@ class Crew:
     def __str__(self) -> str:
         return self.name or self.original_name or ""
 
-    def profile_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.profile_path}" if self.profile_path else None
+    def profile_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.profile_path}" if self.profile_path else None
 
 
 @dataclass
@@ -114,11 +114,11 @@ class CastMovie:
     def __str__(self) -> str:
         return self.title or ""
 
-    def backdrop_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.backdrop_path}" if self.backdrop_path else None
+    def backdrop_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.backdrop_path}" if self.backdrop_path else None
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass
@@ -145,11 +145,11 @@ class CrewMovie:
     def __str__(self) -> str:
         return self.title or ""
 
-    def backdrop_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.backdrop_path}" if self.backdrop_path else None
+    def backdrop_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.backdrop_path}" if self.backdrop_path else None
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass
@@ -183,11 +183,11 @@ class CastTV:
     def __str__(self) -> str:
         return self.name or self.original_name or ""
 
-    def backdrop_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.backdrop_path}" if self.backdrop_path else None
+    def backdrop_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.backdrop_path}" if self.backdrop_path else None
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass
@@ -215,11 +215,11 @@ class CrewTV:
     def __str__(self) -> str:
         return self.name or self.original_name or ""
 
-    def backdrop_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.backdrop_path}" if self.backdrop_path else None
+    def backdrop_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.backdrop_path}" if self.backdrop_path else None
 
-    def poster_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.poster_path}" if self.poster_path else None
+    def poster_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.poster_path}" if self.poster_path else None
 
 
 @dataclass

diff --git a/themoviedb/schemas/episodes.py b/themoviedb/schemas/episodes.py
@@ -15,5 +15,5 @@ class Episode(PartialEpisode):
     def __str__(self) -> str:
         return self.name or ""
 
-    def still_url(self, size: Optional[SizeType] = SizeType.original) -> Optional[str]:
-        return f"https://image.tmdb.org/t/p/{size}{self.still_path}" if self.still_path else None
+    def still_url(self, size: SizeType = SizeType.original) -> Optional[str]:
+        return f"https://image.tmdb.org/t/p/{size.value}{self.still_path}" if self.still_path else None