Merge pull request #216 from dixneuf19/fix/pydantic-v2

fix: update pydantic to v2

pyproject.toml

@@ -12,6 +12,7 @@ loguru = "==0.7.2"
 requests = "==2.31.0"
 python-engineio = "==4.7.1"
 ruff = "^0.0.292"
+pydantic = ">=2.0.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "==7.4.2"

tests/test_fiftyfifty.py

@@ -7,4 +7,4 @@
 @pytest.mark.asyncio
 async def test_get_current_track_remote():
     radio = Radio5050()
-    assert Track(**radio.get_current_track().dict())
+    assert Track(**radio.get_current_track().model_dump())

tests/test_radio_feelgood_api.py

@@ -32,7 +32,7 @@
 
 @pytest.mark.asyncio
 async def test_get_current_song_remote():
-    assert Track(**RadioFeelGood().get_current_track().dict())
+    assert Track(**RadioFeelGood().get_current_track().model_dump())
 
 
 def test_get_current_song_mocked(mocker):

tests/test_radio_france_api.py

@@ -198,7 +198,7 @@ def test_execute_live_query():
         response = execute_live_query("FIP")
     except LiveUnavailableException:
         return
-    assert Track(**response.dict())
+    assert Track(**response.model_dump())
 
 
 def test_execute_live_query_with_exception(mocker):

tests/test_radio_meuh_api.py

@@ -39,7 +39,7 @@
 
 @pytest.mark.asyncio
 async def test_get_current_song_remote():
-    assert Track(**RadioMeuh().get_current_track().dict())
+    assert Track(**RadioMeuh().get_current_track().model_dump())
 
 
 def test_get_current_song_mocked(mocker):

whats_on_fip/models.py

@@ -5,13 +5,13 @@
 
 class Track(BaseModel):
     title: str
-    album: Optional[str]
+    album: Optional[str] = None
     artist: str
-    year: Optional[int]
-    label: Optional[str]
-    musical_kind: Optional[str]
+    year: Optional[int] = None
+    label: Optional[str] = None
+    musical_kind: Optional[str] = None
     external_urls: Dict[str, str] = {}
-    cover_url: Optional[str]
+    cover_url: Optional[str] = None
 
     def __str__(self) -> str:
         return self.title + f" ({self.year})" if self.year else "" + f" - {self.artist}"
@@ -23,7 +23,7 @@ class Station(BaseModel):
 
 class APIStatus(BaseModel):
     code: int
-    message: Optional[str]
+    message: Optional[str] = None
 
 
 class Message(BaseModel):

whats_on_fip/radio_meuh_api.py

@@ -14,6 +14,7 @@ def __init__(self) -> None:
 
     def get_current_track(self) -> Track:
         r = requests.get(self.url)
+        r.raise_for_status()
         song = r.json()[0]
 
         song = {