feat(parser): use ParserError in parsers

README.md

@@ -66,7 +66,7 @@ https://api.shmyga.ru/api/schedule/{provider}/{channel_id}/{date}
 | Provider | Site | API sample |
 | :- | :- | :- |
 | matchtv | https://matchtv.ru/tvguide | https://api.shmyga.ru/api/schedule/matchtv/igra/today |
-| yandex | https://tv.yandex.ru | https://api.shmyga.ru/api/schedule/yandex/146/today |
+| yandex | https://tv.yandex.ru | https://api.shmyga.ru/api/schedule/yandex/start-103/today |
 
 ## Demo
 

gallery/painting/gismeteo/parser.py

@@ -1,5 +1,4 @@
 import datetime
-import logging
 import re
 from dataclasses import dataclass
 from typing import Any, Literal
@@ -24,8 +23,6 @@ from gallery.sketch.weather.util import fix_dates_sequence, merge_weather_values
 
 from . import PROVIDER
 
-logger = logging.getLogger(PROVIDER)
-
 
 class LocationNameParser(Parser[str, str]):
     PATTERN = re.compile('{"ru":{"city":{"name":"(.*?)"')
@@ -112,7 +109,7 @@ class SkyParser(TableValueParser[Sky]):
                 values.remove(k)
                 break
         if values:
-            logger.warning("unknown sky values: %s:", values)
+            raise ParseError("Unknown sky values", values)
         return Sky(
             cloudness=cloudness,
             precipitation=precipitation,

gallery/painting/openweather/parser.py

@@ -10,6 +10,7 @@ from gallery.sketch.weather.model import (
 from gallery.sketch.weather.parse.wind import WIND_DIRECTION_PARSER
 from gallery.sketch.weather.util import convert_hPa_to_mmHg
 
+from . import PROVIDER
 from .openweather import Forecast, ForecastItem
 from .openweather import Location as OpenWeatherLocation
 
@@ -71,7 +72,7 @@ class OpenWeatherLocationParser(Parser[list[OpenWeatherLocation], list[Location]
             Location(
                 id=f"{item.lat}:{item.lon}",
                 name=item.name,
-                provider="openweather",
+                provider=PROVIDER,
                 lat=item.lat,
                 lon=item.lon,
                 country=item.country,

gallery/painting/rp5/parser.py

@@ -3,6 +3,7 @@ import re
 
 from bs4 import Tag
 
+from gallery.sketch.parse.core import ParseError
 from gallery.sketch.parse.date import DATE_PARSER
 from gallery.sketch.parse.html import (
     HTMLParser,
@@ -72,6 +73,8 @@ class CloudnessParser(TableValueParser[Cloudness]):
     def extract(self, data: Tag) -> Cloudness:
         onmouseover = data.select_one(".cc_0").next_element.attrs["onmouseover"]
         cloudness_str = re.compile("<b>(.*?)</b>").search(onmouseover).group(1).strip()
+        if cloudness_str not in self.CLOUDNESS_MAP:
+            raise ParseError("Unknown cloudness value", cloudness_str)
         return self.CLOUDNESS_MAP[cloudness_str]
 
 
@@ -95,6 +98,8 @@ class PrecipitationParser(TableValueParser[tuple[Precipitation, float]]):
             precipitation_value = float(precipitation_value_matched.group(1)) * 6
         if " (" in precipitation_str:
             precipitation_str = precipitation_str.split(" (")[0]
+        if precipitation_str not in self.PRECIPITATION_MAP:
+            raise ParseError("Unknown precipitation value", precipitation_str)
         return self.PRECIPITATION_MAP[precipitation_str], precipitation_value
 
 

gallery/painting/yandextv/parser.py

@@ -4,7 +4,7 @@ from typing import Any
 
 from bs4 import Tag
 
-from gallery.sketch.parse.core import ParsedContext
+from gallery.sketch.parse.core import ParsedContext, ParseError
 from gallery.sketch.parse.json import JSONParser
 from gallery.sketch.schedule.model import Channel, Schedule, ScheduleValue
 
@@ -22,7 +22,7 @@ class ScheduleData:
 class YandexTVScheduleParser(HTMLContextParser[ScheduleData, Schedule]):
     def extract(self, data: ParsedContext[ScheduleData, Tag]) -> Schedule:
         if data.data.select_one(".CheckboxCaptcha") is not None:
-            raise RuntimeError("Captcha")
+            raise ParseError("Captcha")
         values = []
         channel_name = data.data.select_one(".channel-header__text").text.strip()
         current_day = datetime.datetime.combine(data.context.date, datetime.datetime.min.time())

gallery/painting/yandexweather/parser.py

@@ -1,9 +1,9 @@
 import datetime
-import logging
 from typing import Any
 
 from bs4 import Tag
 
+from gallery.sketch.parse.core import ParseError
 from gallery.sketch.parse.date import DATE_PARSER
 from gallery.sketch.parse.html import (
     HTMLParser,
@@ -25,8 +25,6 @@ from gallery.sketch.weather.parse.wind import WIND_DIRECTION_PARSER
 
 from . import PROVIDER
 
-logger = logging.getLogger(PROVIDER)
-
 
 class LocationNameParser(TagParser[str]):
     selector = "[class^=Suggest_placeholder]"
@@ -70,28 +68,31 @@ class SkyParser(TableValueParser[Sky]):
     selector = "[style$='-text']"
     model_key = "sky"
 
+    CLOUDNESS_MAP = {
+        "ясно": Cloudness.CLEAR,
+        "облачно с прояснениями": Cloudness.CLOUDY,
+        "малооблачно": Cloudness.CLOUDY,
+        "пасмурно": Cloudness.MAINLY_CLOUDY,
+    }
+
+    PRECIPITATION_MAP = {
+        "небольшой дождь": Precipitation.SMALL_RAIN,
+        "дождь": Precipitation.RAIN,
+        "ливень": Precipitation.SHOWER,
+    }
+
     def extract(self, data: Tag) -> Sky:
         sky = data.text.strip()
         cloudness = Cloudness.CLEAR
         precipitation = Precipitation.NO
         thunder = False
         fog = False
-        if sky == "ясно":
-            pass
-        elif sky == "облачно с прояснениями":
-            cloudness = Cloudness.PARTLY_CLOUDY
-        elif sky == "малооблачно":
-            cloudness = Cloudness.CLOUDY
-        elif sky == "пасмурно":
-            cloudness = Cloudness.MAINLY_CLOUDY
-        elif sky == "небольшой дождь":
-            precipitation = Precipitation.SMALL_RAIN
-        elif sky == "дождь":
-            precipitation = Precipitation.RAIN
-        elif sky == "ливень":
-            precipitation = Precipitation.SHOWER
+        if sky in self.CLOUDNESS_MAP:
+            cloudness = self.CLOUDNESS_MAP[sky]
+        elif sky in self.PRECIPITATION_MAP:
+            precipitation = self.PRECIPITATION_MAP[sky]
         else:
-            logger.warning("unknown sky value: %s", sky)
+            raise ParseError("Unknown sky value", sky)
         return Sky(
             cloudness=cloudness,
             precipitation=precipitation,