ci(version): 0.5.1

fix(static): fix bootstrap usage
ci(version): 0.5.0
2026-07-10 15:03:32 +03:00 · 2026-07-10 14:49:35 +03:00 · 2026-07-10 13:33:09 +03:00 · 2026-07-10 13:32:57 +03:00 · 2026-07-10 13:32:13 +03:00 · 2026-07-09 15:18:04 +03:00
52 changed files with 297 additions and 3009 deletions
@@ -4,7 +4,5 @@ DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP"
 VERSION=$(grep -m 1 'version' ./pyproject.toml | grep -oP 'version\s*=\s*"\K[^"]+')
 PYTHON_VERSION=$(grep -m 1 'python' ./pyproject.toml | grep -oP 'python\s*=\s*"\^?\K[^"]+')
 DOCKER_PROJECTS=("gallery")
-DOCKER_TAG="${DOCKER_TAG:-latest}"

-OPENWEATHER_KEY=""
-GISMETEO_AUTH=""
+OPENWEATHER_KEY="<EMPTY>"
@@ -1,2 +0,0 @@
-[presets.python.tasks.setup.playwright]
-commands = [".venv/bin/playwright install chromium --with-deps --only-shell"]
@@ -4,12 +4,23 @@ ignore=.venv
 [MESSAGES CONTROL]
 disable=
    missing-docstring,
-    fixme,
-    invalid-name,
-    duplicate-code,
    too-few-public-methods,
+    too-many-instance-attributes,
+    too-many-arguments,
    too-many-locals,
+    too-many-boolean-expressions,
+    too-many-public-methods,
    no-else-return,
+    singleton-comparison,
+    unused-argument,
+    unspecified-encoding,
+    fixme,
+    duplicate-code,
+
+extension-pkg-allow-list=
+    lxml,
+    GeoIP,
+    pydantic

 [MISCELLANEOUS]
 notes=FIXME,TODO
@@ -9,7 +9,7 @@ COPY pyproject.toml poetry.lock README.md ./
 RUN poetry config virtualenvs.in-project true
 RUN --mount=type=cache,target=/root/.cache/pypoetry/cache \
  --mount=type=cache,target=/root/.cache/pypoetry/artifacts \
-  poetry install --extras app --no-root
+  poetry install --with app --no-root
 COPY locales ./locales
 RUN cd locales/ru/LC_MESSAGES && msgfmt messages.po

@@ -27,12 +27,8 @@ ENV PATH="/app/.venv/bin:$PATH"
 WORKDIR /app

 ENV TZ="Europe/Moscow"
-
 COPY --from=builder /app ./
-RUN .venv/bin/playwright install chromium --with-deps --only-shell
-
 COPY --from=node-builder /app/dist ./static/dist
-
 COPY gallery gallery/
 COPY --from=builder --parents locales/**/*.mo ./

@@ -13,7 +13,6 @@ services:
    environment:
      - REDIS_HOST=redis
      - OPENWEATHER_KEY=$OPENWEATHER_KEY
-      - GISMETEO_AUTH=$GISMETEO_AUTH
      - DEBUG=1
    ports:
      - 8000:80
@@ -1,19 +1,18 @@
-name: gallery-${DOCKER_TAG}
+name: gallery

 services:
  redis:
-    container_name: gallery-${DOCKER_TAG}-redis
+    container_name: gallery-redis
    image: redis:alpine
    stop_grace_period: 3s
    volumes:
      - redis_data:/data
  app:
-    container_name: gallery-${DOCKER_TAG}-app
-    image: ${DOCKER_ROOT}/gallery:${DOCKER_TAG}
+    container_name: gallery-app
+    image: ${DOCKER_ROOT}/gallery
    environment:
      - REDIS_HOST=redis
      - OPENWEATHER_KEY=$OPENWEATHER_KEY
-      - GISMETEO_AUTH=$GISMETEO_AUTH
    depends_on:
      - redis
    ports:
@@ -9,7 +9,6 @@
    "python.testing.unittestEnabled": false,
    "python.testing.pytestEnabled": true,
    "python.terminal.useEnvFile": true,
-    "python.analysis.importFormat": "relative",
    "python-envs.pythonProjects": [
      {
        "path": ".",
@@ -24,7 +24,7 @@ def is_widget(request: Request) -> bool:
 def base_context_processor(request: Request) -> dict:
    return {
        "is_widget": is_widget(request),
-        "provider": request.query_params.get("provider") or request.path_params.get("provider"),
+        "provider": request.query_params.get("provider"),
    }


@@ -19,7 +19,6 @@ locale=request.state.language)}}
     href="../../..">
    <i class="bi bi-arrow-up-square"></i>
  </a>
-  <span class="badge rounded-pill text-bg-secondary fs-6">{{provider}}</span>
  <span>{{response.channel.name}} | {{format_date(response.date, DATE_FORMAT, locale=request.state.language)}}</span>
  <a class="icon-link"
     href="../tag/{{tag_util.create_tag('day', response.date, 1)}}">
@@ -12,7 +12,7 @@ from gallery.sketch.weather.model import WeatherResponse

 from ..common.utils.tag import TagType, TagUtil
 from ..common.utils.template import build_templates
-from .filters import cloudness_icon, weather_icon_svg, wind_direction_icon
+from .filters import cloudness_icon, wind_direction_icon


 def context_procesor(request: AppRequest) -> dict:
@@ -26,7 +26,6 @@ templates = build_templates(
    {
        "wind_direction_icon": wind_direction_icon,
        "cloudness_icon": cloudness_icon,
-        "weather_icon_svg": weather_icon_svg,
    },
    context_procesor,
 )
@@ -1,7 +1,5 @@
 import datetime

-from markupsafe import Markup
-
 from gallery.sketch.weather.model import (
    Cloudness,
    Precipitation,
@@ -9,7 +7,6 @@ from gallery.sketch.weather.model import (
    WindDirection,
    WindDirectionDeg,
 )
-from gallery.util import root_path


 def wind_direction_icon(wind_direction_deg: float) -> str:
@@ -57,25 +54,3 @@ def cloudness_icon(sky: Sky, date: datetime.datetime, period: str) -> list[str]:
            main_icon = f"{day_prefix}-{main_icon}"
    icons = [main_icon]
    return icons
-
-
-class WeatherIconBundle:
-    def __init__(self):
-        self._icon_path = root_path / "static/dist/weather-icons/icons"
-        self._cache = {}
-
-    def _load_icon(self, icon: str) -> Markup:
-        icon_file = self._icon_path / f"wi-{icon}.svg"
-        return Markup(icon_file.read_text())
-
-    def get(self, icon: str) -> Markup:
-        if icon not in self._cache:
-            self._cache[icon] = self._load_icon(icon)
-        return self._cache[icon]
-
-
-WEATHER_ICON_BUNDLE = WeatherIconBundle()
-
-
-def weather_icon_svg(icon: str) -> Markup:
-    return WEATHER_ICON_BUNDLE.get(icon)
@@ -17,7 +17,6 @@
     href="../tag/days-10">
    <i class="bi bi-arrow-up-square"></i>
  </a>
-  <span class="badge rounded-pill text-bg-secondary fs-6">{{provider}}</span>
  <span>{{response.location}} | {{format_date(response.date, DATE_FORMAT, locale=request.state.language)}}</span>
  <a class="icon-link"
     href="../tag/{{tag_util.create_tag('day', response.date, 1)}}">
@@ -25,7 +24,6 @@
  </a>
  {% endif %}
  {% if response.period == 'days' %}
-  <span class="badge rounded-pill text-bg-secondary fs-6">{{provider}}</span>
  <span>{{response.location}} | {{format_date(response.date, DATE_FORMAT, locale=request.state.language)}}</span>
  <span>- {{format_date(response.date + datetime.timedelta(days=(response.values | length - 1)), DATE_FORMAT,
    locale=request.state.language)}}</span>
@@ -68,8 +66,8 @@
            data-bs-toggle="tooltip"
            data-bs-title="{{ value.sky }}">
          {% for icon in value.sky | cloudness_icon(value.date, response.period) %}
-          <div class="wi-svg wi-l wi-border"
-               style="margin: 0 auto;">{{ icon | weather_icon_svg }}</div>
+          <!--<div class="wi wi-{{icon}} wi-xl text-primary"></div>-->
+          <weather-icon icon="{{icon}}"></svg-icon>
          {% endfor %}
        </td>
        {% endfor %}
@@ -105,8 +103,7 @@
        <td class="wind"
            data-bs-toggle="tooltip"
            data-bs-title="{{ value.wind_direction }}">
-          <div class="wi-svg wi-s wi-{{value.wind_direction | wind_direction_icon}}"
-               style="margin: 0 auto;">{{ 'wind-deg' | weather_icon_svg }}</div>
+          <div class="wi wi-wind-deg wi-{{value.wind_direction | wind_direction_icon}} wi-l text-primary"></div>
        </td>
        {% endfor %}
      </tr>
@@ -122,7 +119,7 @@
        <td class="wind"
            style="background-color: rgba(128, 128, 128, {{value.wind_speed * 0.05}});">
          <span class="speed">{{value.wind_speed}}</span>
-          {% if value.wind_gust != value.wind_speed and value.wind_gust > 0 %}
+          {% if value.wind_gust != value.wind_speed %}
          <span class="gust">
            ({{value.wind_gust}})
          </span>
@@ -174,7 +171,7 @@
        {% for value in response.values %}
        <td class="humidity"
            style="background-color: rgba(128, 128, 255, {{value.humidity * 0.005}});">
-          {% if value.humidity > -1%}<span class="value">{{value.humidity}}</span>{% endif %}
+          <span class="value">{{value.humidity}}</span>
        </td>
        {% endfor %}
      </tr>
@@ -8,7 +8,6 @@ from gallery.painting.gismeteo.api import GismeteoApi
 from gallery.painting.matchtv.api import MatchTvApi
 from gallery.painting.openweather.api import OpenWeatherApi
 from gallery.painting.yandextv.api import YandexTvApi
-from gallery.painting.yandexweather.api import YandexWeatherApi
 from gallery.sketch.bundle import ApiBundle
 from gallery.sketch.schedule.cached import CachedScheduleApi
 from gallery.sketch.weather.cached import CachedWeatherApi
@@ -19,7 +18,6 @@ api = ApiBundle(
        CachedScheduleApi(MatchTvApi()),
        CachedWeatherApi(GismeteoApi()),
        CachedWeatherApi(OpenWeatherApi()),
-        CachedWeatherApi(YandexWeatherApi()),
    ]
 )
 app = build_app(api)
@@ -1,7 +1,6 @@
 import datetime
 import json
 import logging
-from os import environ
 from typing import Any

 from bs4 import BeautifulSoup
@@ -10,7 +9,6 @@ from fastapi import HTTPException, status
 from gallery.sketch.source import ApiSource
 from gallery.sketch.weather.api import WeatherApi
 from gallery.sketch.weather.model import Location, WeatherResponse, WeatherValue
-from gallery.sketch.weather.util import merge_weather_values

 from . import datehelp
 from .parser import DAYS_PARSER, LOCATION_PARSER, ONE_DAY_PARSER, ROW_PARSERS
@@ -20,12 +18,21 @@ logger = logging.getLogger("gismeteo")

 class GismeteoApi(WeatherApi):
    PROVIDER = "gismeteo"
-
-    def _build_source(self) -> ApiSource:
-        return ApiSource(
-            "https://www.gismeteo.ru",
-            cookies={"xauth": auth} if (auth := environ.get("GISMETEO_AUTH")) else None,
-        )
+    SOURCE = ApiSource(
+        "https://www.gismeteo.ru",
+        cookies={
+            "cf_clearance": (
+                "zPj8qeaYZWp5BUZsWIRD7kd32s59IDWWaVvD7GGf6b4-1724254262-1.2.1.1-"
+                "R1PaHoqlm4OEgHfrOg6oAJmVmFJ7053JI_QDjIFlCAmbNY0oyw1J4QtgmEkAkTWF4C99X5hpXmZB2en."
+                "9Ey3NL0kzaE10UGBHPli5OLxHNKC3wQ34xmxTxg6GcKouXOPRgqo92lVRpQP7ghvDmvvT_"
+                "S6YXDbRonkamptWhZiAsIhsnIQg2Mt7Lk1fxSEVbaey_RXVQBvaR2ofiFgIavcbQPRFSvJ."
+                "Ct_FujmymTAZWh1XHTptK32kur81NXyPuARThetOKQm8AklaMa855Oom6Bms1a4F9b0yEHSd2inA4j3FR7uauu8hhwO0Z2goa3."
+                "ktpXXAQLz6dm.fBEWIHD7wooda15X57tCcDOely4hxhO4LK2lIH6TbOr."
+                "rZQAiRRhltHiCizP1Ou2SiF_81lb1umoDh739tQD1cnw_USnL."
+                "JwTHvkB00ZnaHRMi4FCBrsKIE0NxJO6kiv1QANqumzf5.8_pSIGRo2cKeO8xCydduDNFbStdOmLR6FU7ZKqVu"
+            )
+        },
+    )

    def _parse_oneday(self, date: datetime.date, data: str) -> WeatherResponse:
        result: list[dict[str, Any]] = []
@@ -38,12 +45,6 @@ class GismeteoApi(WeatherApi):
                    result.append({})
                result[index][parser.KEY] = value
        values = [WeatherValue(**item) for item in result]
-        # group values by 3 hours
-        if len(values) > 8:
-            n = 3
-            values = [
-                merge_weather_values(values[i].date, values[i : i + n], "average") for i in range(0, len(values), n)
-            ]
        return WeatherResponse(
            location=location or "n/a",
            date=date,
@@ -74,7 +75,7 @@ class GismeteoApi(WeatherApi):
        latitude = 52.968498
        longitude = 36.0695
        data = json.loads(
-            await self.source.request(
+            await self.SOURCE.request(
                f"mq/city/q/?q={query}&geo={geo}&latitude={latitude}&longitude={longitude}&limit=10"
            )
        )
@@ -107,9 +108,9 @@ class GismeteoApi(WeatherApi):
            raise HTTPException(
                status_code=status.HTTP_400_BAD_REQUEST, detail={"max_date": max_date.strftime("%Y-%m-%d")}
            )
-        data = await self.source.request(f"weather-{location_id}/{datehelp.dump(date)}")
+        data = await self.SOURCE.request(f"weather-{location_id}/{datehelp.dump(date)}")
        return self._parse_oneday(date, data)

    async def get_days(self, location_id: str, days: int) -> WeatherResponse:
-        data = await self.source.request(f"weather-{location_id}/{days}-days")
+        data = await self.SOURCE.request(f"weather-{location_id}/{days}-days")
        return self._parse_manydays(data)
@@ -11,8 +11,8 @@ from gallery.sketch.weather.model import (
    Precipitation,
    Sky,
    WindDirection,
+    WindDirectionDeg,
 )
-from gallery.sketch.weather.parser import ParseError, parse_wind_direction

 from .core import BaseWidgetParser, RowParser

@@ -46,15 +46,9 @@ class DateParser(RowParser[datetime.datetime]):
                time = datetime.datetime.fromtimestamp(timestamp)
                yield time
        else:
-            month = None
            for item in tag.select(".widget-row.widget-row-date > .row-item"):
                date_str = item.text
                date = dateparser.parse(date_str, languages=["ru"])
-                if date is None:
-                    raise ParseError.invalid_date(date_str)
-                if month and month > date.month:
-                    date = date.replace(month=month)
-                month = date.month
                yield date


@@ -71,7 +65,6 @@ class SkyParser(RowParser[Sky]):

    PRECIPITATION_MAP: dict[str, Precipitation] = {
        "без осадков": Precipitation.NO,
-        "без существенных осадков": Precipitation.NO,
        "небольшой дождь": Precipitation.SMALL_RAIN,
        "сильный дождь": Precipitation.HEAVY_RAIN,
        "очень сильный дождь": Precipitation.HEAVY_RAIN,
@@ -89,13 +82,8 @@ class SkyParser(RowParser[Sky]):
        "град": Precipitation.HAIL,
    }

-    THUNDER = {"гроза"}
-    FOG = {"дымка", "туман"}
-
-    @classmethod
-    def _detect_flag(cls, values: set[str], flag_values: set[str]) -> tuple[set[str], bool]:
-        result_values = values - flag_values
-        return result_values, len(result_values) < len(values)
+    THUNDER = "гроза"
+    FOG = "дымка"

    def parse_row(self, tag: Tag) -> Iterable[Sky]:
        for item in tag.select(".widget-row[data-row=icon-tooltip] > .row-item"):
@@ -103,8 +91,14 @@ class SkyParser(RowParser[Sky]):
            values = {item.strip().lower() for item in sky_str.split(",")}
            cloudness = Cloudness.CLEAR
            precipitation = Precipitation.NO
-            values, thunder = self._detect_flag(values, self.THUNDER)
-            values, fog = self._detect_flag(values, self.FOG)
+            thunder = False
+            fog = False
+            if self.THUNDER in values:
+                thunder = True
+                values.remove(self.THUNDER)
+            if self.FOG in values:
+                fog = True
+                values.remove(self.FOG)
            for k, v in self.CLOUDNESS_MAP.items():
                if k in values:
                    cloudness = v
@@ -153,10 +147,23 @@ class WindGustParser(RowParser[int]):
 class WindDirectionParser(RowParser[WindDirection]):
    KEY = "wind_direction"

+    WIND_DIRECTION_MAP: dict[str, WindDirection] = {
+        "—": WindDirection.CALM,
+        "штиль": WindDirection.CALM,
+        "с": WindDirection.N,
+        "св": WindDirection.NE,
+        "в": WindDirection.E,
+        "юв": WindDirection.SE,
+        "ю": WindDirection.S,
+        "юз": WindDirection.SW,
+        "з": WindDirection.W,
+        "сз": WindDirection.NW,
+    }
+
    def parse_row(self, tag: Tag) -> Iterable[float]:
        for item in tag.select(".widget-row-wind > .row-item > .wind-speed > .wind-direction"):
            wind_direction_str = item.text.lower().strip()
-            yield parse_wind_direction(wind_direction_str)
+            yield WindDirectionDeg.from_direction(self.WIND_DIRECTION_MAP[wind_direction_str]).value


 class PrecipitationParser(RowParser[float]):
@@ -11,13 +11,11 @@ logger = logging.getLogger("matchtv")

 class MatchTvApi(ScheduleApi):
    PROVIDER = "matchtv"
-
-    def _build_source(self) -> ApiSource:
-        return ApiSource("https://matchtv.ru")
+    SOURCE = ApiSource("https://matchtv.ru")

    async def find_channels(self, query: str) -> list[Channel]:
        endpoint = "api/v1/channels"
-        data = json.loads(await self.source.request(endpoint))
+        data = json.loads(await self.SOURCE.request(endpoint))
        result = []
        query = query.lower()
        for item in data["result"]:
@@ -29,7 +27,7 @@ class MatchTvApi(ScheduleApi):

    async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
        endpoint = f"api/v1/channels/{channel_id}/tv-schedule?date={date:%Y%m%d}"
-        data = json.loads(await self.source.request(endpoint))
+        data = json.loads(await self.SOURCE.request(endpoint))
        channel_data = data["result"]["channels"][0]
        channel = Channel(id=channel_data["alias"], name=channel_data["name"], provider=self.provider)
        values = []
@@ -18,11 +18,9 @@ from .parser import FORECAST_ITEM_PARSER
 logger = logging.getLogger("openweather")


-class OpenWeatherApi(WeatherApi[OpenWeather]):
+class OpenWeatherApi(WeatherApi):
    PROVIDER = "openweather"
-
-    def _build_source(self) -> OpenWeather:
-        return OpenWeather(environ["OPENWEATHER_KEY"])
+    SOURCE = OpenWeather(environ["OPENWEATHER_KEY"])

    @classmethod
    def _parse_location(cls, location_id: str) -> tuple[float, float]:
@@ -34,18 +32,18 @@ class OpenWeatherApi(WeatherApi[OpenWeather]):
        ttl=TimeUnit.DAY,
    )
    async def _get_location(self, location_id: str) -> OpenWeatherLocation:
-        return await self.source.get_location(*self._parse_location(location_id))
+        return await self.SOURCE.get_location(*self._parse_location(location_id))

    @cached(
        key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
        alias="redis",
-        ttl=TimeUnit.HOUR,
+        ttl=TimeUnit.DAY,
    )
    async def _get_location_forecast(self, location_id: str) -> Forecast:
-        return await self.source.get_forecast(*self._parse_location(location_id))
+        return await self.SOURCE.get_forecast(*self._parse_location(location_id))

    async def find_locations(self, query: str) -> list[Location]:
-        result = await self.source.find_locations(query)
+        result = await self.SOURCE.find_locations(query)
        return [
            Location(
                id=f"{item.lat}:{item.lon}",
@@ -76,28 +76,28 @@ class Location(Model):
    local_names: dict[str, str] | None = None


-class OpenWeather(ApiSource):
+class OpenWeather:
    BASE_URL = "https://api.openweathermap.org"

    def __init__(self, api_key: str):
        self._api_key = api_key
-        super().__init__(self.BASE_URL)
+        self._source = ApiSource(self.BASE_URL)

    async def get_forecast(self, lat: float, lon: float) -> Forecast:
        endpoint = f"data/2.5/forecast?lat={lat}&lon={lon}&appid={self._api_key}&units=metric"
-        response = await self.request(endpoint)
+        response = await self._source.request(endpoint)
        response_data = json.loads(response)
        return Forecast.model_validate(response_data)

    async def find_locations(self, query: str, limit: int = 5) -> list[Location]:
        endpoint = f"geo/1.0/direct?q={query}&limit={limit}&appid={self._api_key}"
-        response = await self.request(endpoint)
+        response = await self._source.request(endpoint)
        response_data = json.loads(response)
        return [Location.model_validate(item) for item in response_data]

    async def get_location(self, lat: float, lon: float) -> Location:
        limit = 1
        endpoint = f"geo/1.0/reverse?lat={lat}&lon={lon}&limit={limit}&appid={self._api_key}"
-        response = await self.request(endpoint)
+        response = await self._source.request(endpoint)
        response_data = json.loads(response)
        return Location.model_validate(response_data[0])
@@ -29,7 +29,7 @@ class ForecastItemParser:
        # TODO parse temperature interval flag
        value.temperature = [round(item.main.temp)]
        # value.temperature = [round(item.main.temp_max), round(item.main.temp_min)]
-        value.pressure = [round(item.main.pressure * 0.75006)]
+        value.pressure = [round(item.main.pressure / 133.3 * 100)]
        value.humidity = item.main.humidity
        value.wind_speed = round(item.wind.speed)
        value.wind_gust = round(item.wind.gust)
@@ -43,16 +43,14 @@ HEADERS: dict[str, str] = {

 class YandexTvApi(ScheduleApi):
    PROVIDER = "yandextv"
-
-    def _build_source(self) -> ApiSource:
-        return ApiSource("https://tv.yandex.ru", headers=HEADERS)
+    SOURCE = ApiSource("https://tv.yandex.ru", headers=HEADERS)

    async def find_channels(self, query: str) -> list[Channel]:
        url = (
            "https://suggest-multi.yandex.ru/suggest-tv2?"
            f"v=4&uil=ru&lr=10&count_channels=4&count_programs=4&sn=50&part={query}"
        )
-        _, values = json.loads(await self.source.request(url))
+        _, values = json.loads(await self.SOURCE.request(url))
        result = []
        for _, name, content in values:
            if content["label"] == "Каналы":
@@ -62,7 +60,7 @@ class YandexTvApi(ScheduleApi):

    async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
        endpoint = f"channels/{channel_id}?date={date:%Y-%m-%d}"
-        data = await self.source.request(endpoint)
+        data = await self.SOURCE.request(endpoint)
        soup = BeautifulSoup(data, features="html.parser")
        if soup.select_one(".CheckboxCaptcha") is not None:
            raise RuntimeError("Captcha")
@@ -1,75 +0,0 @@
-import datetime
-import json
-import logging
-
-from aiocache import cached
-from bs4 import BeautifulSoup
-
-from gallery.sketch.source import ApiSource
-from gallery.sketch.weather.api import WeatherApi
-from gallery.sketch.weather.model import (
-    Location,
-    WeatherResponse,
-)
-from gallery.sketch.weather.util import merge_weather_values
-from gallery.util import TimeUnit
-
-from .parser import parse_article
-
-logger = logging.getLogger("yandexweather")
-
-
-class YandexWeatherApi(WeatherApi):
-    PROVIDER = "yandex"
-
-    def _build_source(self) -> ApiSource:
-        return ApiSource("https://yandex.ru")
-
-    @cached(
-        key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
-        alias="redis",
-        ttl=TimeUnit.HOUR,
-    )
-    async def _get_location_forecast(self, location_id: str) -> list[WeatherResponse]:
-        endpoint = f"pogoda/ru/{location_id}/details"
-        content = await self.source.request(endpoint, mode="browser")
-        soup = BeautifulSoup(content, features="html.parser")
-        location = soup.select_one("[class^=Suggest_placeholder]").text.strip()
-        articles = soup.select("article[class^=AppForecastDay]")
-        return [parse_article(article, location) for article in articles]
-
-    async def find_locations(self, query: str) -> list[Location]:
-        endpoint = f"weather/api/suggest?part={query}&lang=ru&type=weather"
-        response = await self.source.request(endpoint)
-        data = json.loads(response)
-        return [
-            Location(
-                id=str(item["geoId"]),
-                name=item["title"],
-                provider=self.provider,
-                lat=item["coords"]["lat"],
-                lon=item["coords"]["lon"],
-                country="ru",
-                country_code="ru",
-                district=item["description"],
-                subdistrict="",
-            )
-            for item in data
-        ]
-
-    async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
-        forecast = await self._get_location_forecast(location_id)
-        for response in forecast:
-            if response.date == date:
-                return response
-        raise ValueError(f"Unsupported date: {date}")
-
-    async def get_days(self, location_id: str, days: int) -> WeatherResponse:
-        forecast = await self._get_location_forecast(location_id)
-        values = [merge_weather_values(item.date, item.values) for item in forecast]
-        return WeatherResponse(
-            location=forecast[0].location,
-            date=datetime.date.today(),
-            period="days",
-            values=values,
-        )
@@ -1,91 +0,0 @@
-import logging
-from enum import Enum
-
-import dateparser
-from bs4 import Tag
-
-from gallery.sketch.weather.model import Cloudness, Precipitation, Sky, WeatherResponse
-from gallery.sketch.weather.parser import ParseError, parse_wind_direction
-from gallery.sketch.weather.util import build_weather_value
-
-logger = logging.getLogger("yandexweather")
-
-
-class DayPart(Enum):
-    MORNING = ("Утром", 6)
-    AFTERNOON = ("Днём", 12)
-    EVENING = ("Вечером", 18)
-    NIGHT = ("Ночью", 0)
-
-    def __init__(self, title: str, hour: int):
-        super().__init__()
-        self.title = title
-        self.hour = hour
-
-
-def parse_sky(sky: str) -> Sky:
-    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
-    else:
-        logger.warning("unknown sky value: %s", sky)
-    return Sky(
-        cloudness=cloudness,
-        precipitation=precipitation,
-        thunder=thunder,
-        fog=fog,
-    )
-
-
-def parse_article(article: Tag, location: str) -> WeatherResponse:
-    date_str = article.select_one("[class^=AppForecastDayHeader_dayTitle]").text.split(",")[-1].strip()
-    date = dateparser.parse(date_str, languages=["ru"])
-    if date is None:
-        raise ParseError.invalid_date(date_str)
-    values = []
-    for day_part in DayPart:
-        value = build_weather_value(date.replace(hour=day_part.hour))
-        day_part_tag = article.find(string=day_part.title)
-        temperature_tag = day_part_tag.next_element
-        temperature = int(temperature_tag.text.strip().rstrip("°"))
-        value.temperature.append(temperature)
-        sky_tag = temperature_tag.next_element.next_element.next_element
-        sky_str = sky_tag.text.strip()
-        value.sky = parse_sky(sky_str)
-        temperature_tag = sky_tag.next_element.next_element
-        temperature = int(temperature_tag.text.strip().rstrip("°"))
-        value.temperature.append(temperature)
-        wind_speed_tag = temperature_tag.next_element.next_element
-        wind_speed = int(wind_speed_tag.text.strip())
-        value.wind_speed = wind_speed
-        wind_direction_tag = wind_speed_tag.next_element.next_element.next_element.next_element
-        wind_direction_str = wind_direction_tag.text.strip()
-        value.wind_direction = parse_wind_direction(wind_direction_str)
-        humidity_tag = wind_direction_tag.next_element.next_element.next_element.next_element
-        humidity = int(humidity_tag.text.strip().rstrip("%"))
-        value.humidity = humidity
-        pressure_tag = humidity_tag.next_element.next_element
-        pressure = int(pressure_tag.text.strip())
-        value.pressure.append(pressure)
-        values.append(value)
-    return WeatherResponse(
-        location=location,
-        date=date,
-        period="day",
-        values=values,
-    )
@@ -1,19 +1,10 @@
 from typing import TypeVar

-from .source import ApiSource

-S = TypeVar("S", bound=ApiSource)
-
-
-class Api[S = ApiSource]:
+class Api:
    TYPE: str
    PROVIDER: str

-    _source: S | None = None
-
-    def _build_source(self) -> S:
-        raise NotImplementedError
-
    @property
    def type(self) -> str:
        return self.TYPE
@@ -22,11 +13,5 @@ class Api[S = ApiSource]:
    def provider(self) -> str:
        return self.PROVIDER

-    @property
-    def source(self) -> S:
-        if self._source is None:
-            self._source = self._build_source()
-        return self._source
-

 API = TypeVar("API", bound=Api)
@@ -1,6 +1,5 @@
 from typing import Generic, NamedTuple

-from gallery.sketch.source import ApiSource
 from gallery.util import TimeUnit

 from .api import API, Api
@@ -20,9 +19,6 @@ class CachedApi(Api, Generic[API]):
    def __init__(self, api: API):
        self._api = api

-    def _build_source(self) -> ApiSource:
-        raise RuntimeError("Source not used in CachedApi")
-
    @property
    def provider(self) -> str:
        return self._api.provider
@@ -1,11 +1,10 @@
 import datetime

 from ..api import Api
-from ..source import ApiSource
 from .model import Channel, Schedule


-class ScheduleApi[S = ApiSource](Api[S]):
+class ScheduleApi(Api):
    TYPE = "schedule"

    async def find_channels(self, query: str) -> list[Channel]:
@@ -1,15 +1,9 @@
 import logging
-from typing import Literal

 import aiohttp
-from playwright.async_api import async_playwright

 logger = logging.getLogger("source")

-RequestMode = Literal["base", "browser"]
-
-DEFAULT_REQUEST_MODE: RequestMode = "base"
-

 class ApiSource:
    DEFAULT_USER_AGENT = (
@@ -31,7 +25,12 @@ class ApiSource:
        self._cookies = cookies
        self._headers = headers

-    async def _base_request(self, url: str) -> str:
+    async def request(self, endpoint: str) -> str:
+        if endpoint.startswith("https:"):
+            url = endpoint
+        else:
+            url = f"{self._base_url}/{endpoint}"
+        logger.info(url)
        headers = {"User-Agent": self._user_agent, **(self._headers or {})}
        async with aiohttp.ClientSession(
            headers=headers,
@@ -40,21 +39,3 @@ class ApiSource:
        ) as session:
            async with session.request("GET", url, timeout=self._timeout) as response:
                return await response.text()
-
-    async def _browser_request(self, url: str) -> str:
-        async with async_playwright() as p:
-            browser = await p.chromium.launch()
-            page = await browser.new_page()
-            await page.goto(url, wait_until="networkidle")
-            content = await page.content()
-            await browser.close()
-        return content
-
-    async def request(self, endpoint: str, /, mode: RequestMode = DEFAULT_REQUEST_MODE) -> str:
-        if endpoint.startswith("https:"):
-            url = endpoint
-        else:
-            url = f"{self._base_url}/{endpoint}"
-        logger.info(url)
-        method = getattr(self, f"_{mode}_request")
-        return await method(url)
@@ -1,11 +1,10 @@
 import datetime

 from ..api import Api
-from ..source import ApiSource
 from .model import Location, WeatherResponse


-class WeatherApi[S = ApiSource](Api[S]):
+class WeatherApi(Api):
    TYPE = "weather"

    async def find_locations(self, query: str) -> list[Location]:
@@ -2,7 +2,7 @@ import datetime
 from enum import StrEnum, auto
 from typing import Self

-from pydantic import BaseModel, Field
+from pydantic import BaseModel


 class Model(BaseModel):
@@ -28,11 +28,6 @@ class Cloudness(StrEnum):
    CLOUDY = auto()
    MAINLY_CLOUDY = auto()

-    values: list[Self]
-
-
-Cloudness.values = list(Cloudness)
-

 class Precipitation(StrEnum):
    NO = auto()
@@ -44,11 +39,6 @@ class Precipitation(StrEnum):
    HEAVY_SNOW = auto()
    HAIL = auto()

-    values: list[Self]
-
-
-Precipitation.values = list(Precipitation)
-

 class Sky(Model):
    cloudness: Cloudness
@@ -126,8 +116,8 @@ class WeatherValue(Model):
    wind_gust: int
    wind_direction: float
    precipitation: float
-    pressure: list[int] = Field(default=[])
-    humidity: int = Field(default=-1)
+    pressure: list[int]
+    humidity: int


 class WeatherResponse(Model):
@@ -1,28 +0,0 @@
-from typing import Self
-
-from gallery.sketch.weather.model import WindDirection, WindDirectionDeg
-
-
-class ParseError(Exception):
-    @classmethod
-    def invalid_date(cls, date_str: str) -> Self:
-        return cls("Invalid date string", date_str)
-
-
-WIND_DIRECTION_MAP: dict[str, WindDirection] = {
-    "—": WindDirection.CALM,
-    "": WindDirection.CALM,
-    "штиль": WindDirection.CALM,
-    "с": WindDirection.N,
-    "св": WindDirection.NE,
-    "в": WindDirection.E,
-    "юв": WindDirection.SE,
-    "ю": WindDirection.S,
-    "юз": WindDirection.SW,
-    "з": WindDirection.W,
-    "сз": WindDirection.NW,
-}
-
-
-def parse_wind_direction(value: str) -> WindDirectionDeg:
-    return WindDirectionDeg.from_direction(WIND_DIRECTION_MAP[value.lower()])
@@ -1,11 +1,8 @@
 import datetime
 import statistics
-from typing import Literal

 from .model import Cloudness, Precipitation, Sky, WeatherValue, WindDirectionDeg

-MergeMode = Literal["interval", "average"]
-

 def build_weather_value(date: datetime.datetime) -> WeatherValue:
    return WeatherValue(
@@ -22,19 +19,11 @@ def build_weather_value(date: datetime.datetime) -> WeatherValue:
        wind_direction=WindDirectionDeg(-1),
        precipitation=0,
        pressure=[],
-        humidity=-1,
+        humidity=0,
    )


-def _merge_values(values: list[int], mode: MergeMode) -> list[int]:
-    return [max(values), min(values)] if mode == "interval" else [round(sum(values) / len(values))]
-
-
-def merge_weather_values(
-    date: datetime.datetime,
-    values: list[WeatherValue],
-    mode: MergeMode = "interval",
-) -> WeatherValue:
+def merge_weather_values(date: datetime.datetime, values: list[WeatherValue]) -> WeatherValue:
    result = build_weather_value(date)
    temperatures = []
    pressures = []
@@ -55,17 +44,19 @@ def merge_weather_values(
        cloudnesses.append(value.sky.cloudness)
        precipitations.append(value.sky.precipitation)
        precipitation += value.precipitation
-    result.temperature = _merge_values(temperatures, mode)
-    result.pressure = _merge_values(pressures, mode)
+    result.temperature = [max(temperatures), min(temperatures)]
+    result.pressure = [max(pressures), min(pressures)]
    result.humidity = round(statistics.mean(humidities))
    result.wind_speed = round(statistics.mean(wind_speeds))
    result.wind_gust = round(statistics.mean(wind_gusts))
    result.wind_direction = statistics.mean(wind_directions)
+    # TODO: merge cloudnesses
    for item in cloudnesses:
-        if Cloudness.values.index(item) > Cloudness.values.index(result.sky.cloudness):
+        if item != Cloudness.CLEAR:
            result.sky.cloudness = item
+    # TODO: merge precipitations
    for item in precipitations:
-        if Precipitation.values.index(item) > Precipitation.values.index(result.sky.precipitation):
+        if item != Precipitation.NO:
            result.sky.precipitation = item
    result.precipitation = precipitation
    return result
@@ -1,4 +1,4 @@
 import tomllib
 from pathlib import Path

-__version__ = tomllib.loads((Path(__file__).parent.parent / "pyproject.toml").read_text())["project"]["version"]
+__version__ = tomllib.loads((Path(__file__).parent.parent / "pyproject.toml").read_text())["tool"]["poetry"]["version"]
@@ -192,10 +192,9 @@ frozenlist = ">=1.1.0"
 name = "annotated-doc"
 version = "0.0.4"
 description = "Document parameters, class attributes, return types, and variables inline, with Annotated."
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320"},
    {file = "annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4"},
@@ -207,7 +206,7 @@ version = "0.7.0"
 description = "Reusable constraint types to use with typing.Annotated"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
+groups = ["main", "app"]
 files = [
    {file = "annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53"},
    {file = "annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"},
@@ -217,10 +216,9 @@ files = [
 name = "anyio"
 version = "4.14.1"
 description = "High-level concurrency and networking framework on top of asyncio or Trio"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "anyio-4.14.1-py3-none-any.whl", hash = "sha256:4e5533c5b8ff0a24f5d7a176cbe6877129cd183893f66b537f8f227d10527d72"},
    {file = "anyio-4.14.1.tar.gz", hash = "sha256:8d648a3544c1a700e3ff78615cd679e4c5c3f149904287e73687b2596963629e"},
@@ -260,10 +258,9 @@ files = [
 name = "babel"
 version = "2.18.0"
 description = "Internationalization utilities"
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "babel-2.18.0-py3-none-any.whl", hash = "sha256:e2b422b277c2b9a9630c1d7903c2a00d0830c409c59ac8cae9081c92f1aeba35"},
    {file = "babel-2.18.0.tar.gz", hash = "sha256:b80b99a14bd085fcacfa15c9165f651fbb3406e66cc603abf11c5750937c992d"},
@@ -350,10 +347,9 @@ uvloop = ["uvloop (>=0.15.2) ; sys_platform != \"win32\"", "winloop (>=0.5.0) ;
 name = "certifi"
 version = "2026.6.17"
 description = "Python package for providing Mozilla's CA Bundle."
-optional = true
+optional = false
 python-versions = ">=3.7"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "certifi-2026.6.17-py3-none-any.whl", hash = "sha256:2227dcbaafe0d2f59279d1762ddddc37783ed4354594f194ffc31d20f41fc3db"},
    {file = "certifi-2026.6.17.tar.gz", hash = "sha256:024c88eeec92ca068db80f02b8b07c9cef7b9fe261d1d535abfd5abd6f6af432"},
@@ -365,12 +361,11 @@ version = "8.4.2"
 description = "Composable command line interface toolkit"
 optional = false
 python-versions = ">=3.10"
-groups = ["main", "dev"]
+groups = ["app", "dev"]
 files = [
    {file = "click-8.4.2-py3-none-any.whl", hash = "sha256:e6f9f66136c816745b9d65817da91d61d957fb16e02e4dcd0552553c5a197b76"},
    {file = "click-8.4.2.tar.gz", hash = "sha256:9a6cea6e60b17ebe0a44c5cc636d94f09bd66142c1cd7d8b4cd731c4917a15f6"},
 ]
-markers = {main = "extra == \"app\""}

 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -381,12 +376,12 @@ version = "0.4.6"
 description = "Cross-platform colored terminal text."
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-groups = ["main", "dev", "test"]
+groups = ["app", "dev", "test"]
 files = [
    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
-markers = {main = "extra == \"app\" and (platform_system == \"Windows\" or sys_platform == \"win32\")", dev = "platform_system == \"Windows\" or sys_platform == \"win32\"", test = "sys_platform == \"win32\""}
+markers = {app = "platform_system == \"Windows\" or sys_platform == \"win32\"", dev = "platform_system == \"Windows\" or sys_platform == \"win32\"", test = "sys_platform == \"win32\""}

 [[package]]
 name = "dateparser"
@@ -414,10 +409,9 @@ langdetect = ["langdetect (>=1.0.0)"]
 name = "detect-installer"
 version = "0.1.0"
 description = "Detect how a Python package was installed and get the correct upgrade command"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "detect_installer-0.1.0-py3-none-any.whl", hash = "sha256:034fb20fd665c36e6ba52b8821525ea07fb4f7f938cac459df889fb33801528a"},
    {file = "detect_installer-0.1.0.tar.gz", hash = "sha256:00ad7ba0a36e3cf7d08a40d3643011746dbc112597c7d475cc91c416710ca4e7"},
@@ -443,10 +437,9 @@ profile = ["gprof2dot (>=2022.7.29)"]
 name = "dnspython"
 version = "2.8.0"
 description = "DNS toolkit"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "dnspython-2.8.0-py3-none-any.whl", hash = "sha256:01d9bbc4a2d76bf0db7c1f729812ded6d912bd318d3b1cf81d30c0f845dbf3af"},
    {file = "dnspython-2.8.0.tar.gz", hash = "sha256:181d3c6996452cb1189c4046c61599b84a5a86e099562ffde77d26984ff26d0f"},
@@ -465,10 +458,9 @@ wmi = ["wmi (>=1.5.1) ; platform_system == \"Windows\""]
 name = "email-validator"
 version = "2.3.0"
 description = "A robust email address syntax and deliverability validation library."
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "email_validator-2.3.0-py3-none-any.whl", hash = "sha256:80f13f623413e6b197ae73bb10bf4eb0908faf509ad8362c5edeb0be7fd450b4"},
    {file = "email_validator-2.3.0.tar.gz", hash = "sha256:9fc05c37f2f6cf439ff414f8fc46d917929974a82244c20eb10231ba60c54426"},
@@ -482,10 +474,9 @@ idna = ">=2.0.0"
 name = "fastapi"
 version = "0.139.0"
 description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "fastapi-0.139.0-py3-none-any.whl", hash = "sha256:cf15e1e9e667ddb0ad63811e60bd11390d1aac838ca4a7a23f421807b2308189"},
    {file = "fastapi-0.139.0.tar.gz", hash = "sha256:99ab7b2d92223c76d6cf10757ab3f89d45b38267fc20b2a136cf02f6beac3145"},
@@ -516,10 +507,9 @@ standard-no-fastapi-cloud-cli = ["email-validator (>=2.0.0)", "fastapi-cli[stand
 name = "fastapi-cli"
 version = "0.0.27"
 description = "Run and manage FastAPI apps from the command line with FastAPI CLI. 🚀"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "fastapi_cli-0.0.27-py3-none-any.whl", hash = "sha256:2e389a40f318e29fec8cb1e289f267f17c048876fb82dbfa869a10b16740495d"},
    {file = "fastapi_cli-0.0.27.tar.gz", hash = "sha256:1dffb1e40c0c88f2e0171a8a252a2b615c1e63ff8c05626649e4badd6a84336a"},
@@ -540,10 +530,9 @@ standard-no-fastapi-cloud-cli = ["uvicorn[standard] (>=0.15.0)"]
 name = "fastapi-cloud-cli"
 version = "0.22.0"
 description = "Deploy and manage FastAPI Cloud apps from the command line 🚀"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "fastapi_cloud_cli-0.22.0-py3-none-any.whl", hash = "sha256:799e263140d1b6e679390fc6e90da404556aee6730fd479d3b52475e850073bf"},
    {file = "fastapi_cloud_cli-0.22.0.tar.gz", hash = "sha256:cde14470227fc9275075ff537977d2991e8ce1baf947055d7a4149726de27e08"},
@@ -567,10 +556,9 @@ standard = ["uvicorn[standard] (>=0.15.0)"]
 name = "fastar"
 version = "0.11.0"
 description = "High-level bindings for the Rust tar crate"
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "fastar-0.11.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:e7c906ad371ca365591ebcb7630009923f3eceb20956814494d15591a78e9e46"},
    {file = "fastar-0.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6919497b35fa5bd978d2c26ee117cf1771b90ee5073f7518e44b9bc364b57715"},
@@ -853,107 +841,13 @@ files = [
    {file = "frozenlist-1.8.0.tar.gz", hash = "sha256:3ede829ed8d842f6cd48fc7081d7a41001a56f1f38603f9d49bf3020d59a31ad"},
 ]

-[[package]]
-name = "greenlet"
-version = "3.5.5"
-description = "Lightweight in-process concurrent programming"
-optional = false
-python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "greenlet-3.5.5-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:816230f469381ad0a43abc9fa8dda5a699e32fb78958dde32ded93213b70a667"},
-    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5433cf291e0ef9114bd14d0d824db6e5e4a43033234bca48181a9597acca07b"},
-    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:19d59f068887d8c5907fc177f27683413ace3011b6ed646c0b309266e74a6502"},
-    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:86c5113d698cb8d927b2750bb1f1d59eefe3a37e0e0217491aee29a7f84ef52c"},
-    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9ff00e12102358292087274dfb1669132387ff6e7920ebf9d85f4826ce0d3a56"},
-    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_39_riscv64.whl", hash = "sha256:c69bed34470abfcd456984fdadaa18e62169af4480335c45f3c32d1d9c12e638"},
-    {file = "greenlet-3.5.5-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:523bb8e27614d77101ea7a8cf59f8d91219b72d5c29f6a038c92b50828bfa8d0"},
-    {file = "greenlet-3.5.5-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:f1e2db190db51c17433eee424803818cf0670bf049d9cfe0dd07be111d1aa7c4"},
-    {file = "greenlet-3.5.5-cp310-cp310-win_amd64.whl", hash = "sha256:740e544169527b82695ce76af2f7ad6f030904658f2f3921a1d245771fb88cfc"},
-    {file = "greenlet-3.5.5-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:be63afcbbccfad3dd95a1ba12ada84dab2ef32031973d80b5b92df67fa763a61"},
-    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8a268024ce2d7d2b04694bf1594058981a9fa663d1df4b762dee499211ed7c1c"},
-    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:35cbb8bf55ace57fbccb4fb8622c4521713acd8691e77f4696d416ea7ca527da"},
-    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:abc8bc8d9f935cd685457545b6a53863a877fdc12c2c0f5ee9beee18d9db139c"},
-    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:74cc6df89ec5302337adc9cf096221cbed2510fd444b0e0f1586cf0470740864"},
-    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:3134291427bb0f3526e9d90311988caf336eb43730e95244997a4fb15f45144f"},
-    {file = "greenlet-3.5.5-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6d9b454c5fc48aeaa7c4337813dbf513a6870468e426438a04d922c6d0fe63db"},
-    {file = "greenlet-3.5.5-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:03551ed792cb1b4fc0277a0c60dfd8c343894a0ba06fe60dcd22f568b433da39"},
-    {file = "greenlet-3.5.5-cp311-cp311-win_amd64.whl", hash = "sha256:ab3df3dffb58bf70564e93a5cec7941e4d9faa5a36cc4234a10d3131afe04f53"},
-    {file = "greenlet-3.5.5-cp311-cp311-win_arm64.whl", hash = "sha256:2b70a766135540c472ac1393d57c2e1b4a2eb85bf526a1e41e6d096173a8cee5"},
-    {file = "greenlet-3.5.5-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:49520f0c95a48b42cf55414b8e8479beb274ea70431afc33e3f79903c71f4380"},
-    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:55272212cbc5f43d1d723725ab931f1939969b7e9523882ca58b55061769d053"},
-    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:655bca754a2ef4efcb0eb48a94d3f4593536d0f3d48f8ed44343c01d16a92f95"},
-    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ca5d6ae0739e5764f2cfcfaa562ac5a990cbdaedca93251c5e3cf07c362371f"},
-    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:147b25a42e5ca5be3d42356e8f608b37af715a1c196e9bf9d1627f3341adfe1d"},
-    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:1b5ed9162c0c098e0bbc2cf88a94f433c1b8926f831745252e099e5d83e17759"},
-    {file = "greenlet-3.5.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:27493374cff1d1b7919dc8126547f2aea582737e3046147b434b1e12de56389b"},
-    {file = "greenlet-3.5.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:12e2ee66c2aba86133f10fd99d6a8856c6d351ffb7be0e4d52ef2cc5fbb705b2"},
-    {file = "greenlet-3.5.5-cp312-cp312-win_amd64.whl", hash = "sha256:49ddacd36af37735fab103846f4ee4d18a492dde72730d1699c0c8ebe30d9f18"},
-    {file = "greenlet-3.5.5-cp312-cp312-win_arm64.whl", hash = "sha256:5f1b1ff4828cdc1aba4266aff814085d04a1d07959287219af021b838b265d52"},
-    {file = "greenlet-3.5.5-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:b79fd2a5bc099b5e744f34c4c9a58954a5f4cb7529fb4b6e8446057d61b6edaa"},
-    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:634cf15a233a949136879dd388e25d3296e16f3f1e217d2456797b8579ebc6ed"},
-    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:499adea519f748407fc6806d20eedabac2884fd73b9f38d81236e190ba20dfef"},
-    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:f7278591501941bb2456af102bb9cd59aab48c6cfd6e2dd68fa1290bb0c49a42"},
-    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2eabb980975cba5b93a95f6f69287d05fc05ac955bfd6a320a7c083eeb52c0b0"},
-    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:4dfc7c4470354e7b09184d1a3a985761053a2fd694ddb5b5c80242afc2c8c90b"},
-    {file = "greenlet-3.5.5-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:03115c2e0a371999bf8ae616aa8d653f96641d4705c457aebaa187276e9f7537"},
-    {file = "greenlet-3.5.5-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4441153ffba21b90d3ca89fe3d31f5c093ae6c0bf0cfdfc98f54cde22f95b62e"},
-    {file = "greenlet-3.5.5-cp313-cp313-win_amd64.whl", hash = "sha256:95c5b1f4b3a193f8a0c2de4bfdcb48d119f7f1063941f1de1f2168051b3e52dd"},
-    {file = "greenlet-3.5.5-cp313-cp313-win_arm64.whl", hash = "sha256:1af90aa4bc129883b340cdd6957a3bc74f60528a4993bbd1f53aaebe1d9981cc"},
-    {file = "greenlet-3.5.5-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d4a389a852e392a6366058651a20fa5ba40d979865aa81bea2ccbdc44805070d"},
-    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70b157cd319873e8b544ddc2de158f55bbd0a9b0218c8ce9332039801518e328"},
-    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8bdfd1424abcf26832961e766570cae79efdb9599d709088c9cb6ef82b194926"},
-    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d98ef6f92e67c6dbf299dbfd8facc1b0d2d9cedf91e325e73b3d0373fe4309d8"},
-    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:182de51c6b572a705f2fafaab2e783bcf7d2760940229dfe73086cbae037af3e"},
-    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:159df1942d88e8f784cbb38d6f18bdb365cd11319cfbb3e89623de2b97892d53"},
-    {file = "greenlet-3.5.5-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:8fec3f165dfe332e490c3247c0f6c23b0bfc45f06496ad7f00ddb00e3d35e4dc"},
-    {file = "greenlet-3.5.5-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c6ce25fee6cabc8bf22cb8b52e642cbb821be5b9aec8094d07ff03378141b8e9"},
-    {file = "greenlet-3.5.5-cp314-cp314-win_amd64.whl", hash = "sha256:7dffc5c859fe6059974df1e37d7923d654a83e2ae18fdd616994270e001115e1"},
-    {file = "greenlet-3.5.5-cp314-cp314-win_arm64.whl", hash = "sha256:5e2afcfc4d4305dd715809b03da5cbe437c8984f61d8917751eb5fe4aefa3e07"},
-    {file = "greenlet-3.5.5-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:0e5a7de979d764aea1f5b6e95cf92b5b37741b9823702041f34b126e7f690277"},
-    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fef01bd457f11fc158b130ca0027a3c365693280e8e231b65bdaf57999f39f5b"},
-    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5173a72310725a74afc82c164f0e52cb8ad0de62f2bb623f24f6c0cc07d80272"},
-    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5e9ec2e7c98e895fcea0c5cc57b2606cf86ece6d0a56578f3eb225e2af4f0387"},
-    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:44f08341873200ba8a60a8bc14ace3d91f1754f7fa7bc66157714a8cd420a476"},
-    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:102817506f6090b5176c746a82603341a549b40e5c3d5b72a4c672228a918c41"},
-    {file = "greenlet-3.5.5-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:d246c0db9a2513cd45f019ba178ea4d4d4705bd210ee465e2c15d76a1ab13874"},
-    {file = "greenlet-3.5.5-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:72507285b5caa1d17904a3f7c322ca780823a54170a0e04ec3f37bcc60d4db71"},
-    {file = "greenlet-3.5.5-cp314-cp314t-win_amd64.whl", hash = "sha256:7805655781fb8f28a55d05fe57ed61f5f10f1892fb587673e3bb5264f28041f0"},
-    {file = "greenlet-3.5.5-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:c0db80fcd5b8aece93f66c64f78a786bbb6b96c5fe63ef5a5a4581ecf8bab206"},
-    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b241c32f912ada659808d68e308c568baf577eebf757d15471472de0c18cfad"},
-    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ef6a08349401d8eaf3cb12688ac8557de95788556b8631ef17555a4a173022c0"},
-    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:37faa97daccb6d9f4c2141ce3118d023c3c5506864a7d8bdf726f665018c1f76"},
-    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f2e3d061b8e13aec2f0441689b3c71b244a20e5d274a52cb0f7e31bd1d139552"},
-    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_39_riscv64.whl", hash = "sha256:b18007dc2473a7942fd157366b55f01da6fed7ce85318591005b419e0a439474"},
-    {file = "greenlet-3.5.5-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:9ab5f5b93655e77fe0d6c2dfd22b5eac751bb1f876d8ec21761b7c1fb9266007"},
-    {file = "greenlet-3.5.5-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:f0e5a21bd4452a88cf032fc43c4a5b307ab1380eacb63b5988f9c0317885e773"},
-    {file = "greenlet-3.5.5-cp315-cp315-win_amd64.whl", hash = "sha256:469dbb0a78625642f4a626cfd0c6e8bccc0385b5e49189b6308bbe849ec88a8e"},
-    {file = "greenlet-3.5.5-cp315-cp315-win_arm64.whl", hash = "sha256:2d57406c3efd32d7a81e17a674314e8bd00792cdab49ea3228a49aa1bfb2e769"},
-    {file = "greenlet-3.5.5-cp315-cp315t-macosx_11_0_universal2.whl", hash = "sha256:68184dfcf50ccaa8e864770fe0633a7e27250ea9329f8192ef47ee9ecfd78e1c"},
-    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9ec0dc0e59dc9c61af5c47348365ccbbd7addfafe0a93b00336ff3da2907bdc6"},
-    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e604f58e35833fc46ef20302bcb314dddbfd3fcf33a4f936216d51dd678d63ae"},
-    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2888a3a38bc5ee5bb6c438372197152e815837e4fab7ed7a1f86ef18ffd58ad1"},
-    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:40239b5384f96da3963585cc6d7eaa9b56f8ae67e8d92cc82dd9e202fc847de3"},
-    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_39_riscv64.whl", hash = "sha256:1e8d9391fe77f15649589a907cef972dbbd6352ef7ff7dc0492f658c0c26495f"},
-    {file = "greenlet-3.5.5-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:a1eaccf5c3a1d3e46dead602c72e6836731e8e245c9de6a27764567b6b62d4c0"},
-    {file = "greenlet-3.5.5-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:19e4e026fe20691f333b8eb1a3bc9625eceba8c3f9d62ec5a6f8581afbc6b5a5"},
-    {file = "greenlet-3.5.5-cp315-cp315t-win_amd64.whl", hash = "sha256:712aee154f648bde84634654bb38bb78c69ac640c37a45c9effed800735049d8"},
-    {file = "greenlet-3.5.5-cp315-cp315t-win_arm64.whl", hash = "sha256:7f049911ee81a16a03c33d5450d8d5867d27f596ca5fb201b86f4524e874468b"},
-    {file = "greenlet-3.5.5.tar.gz", hash = "sha256:adb4bae02e91a8e863e48b177e4014bdcac8a6b5e047ea1df687a61534b85e6c"},
-]
-
-[package.extras]
-docs = ["Sphinx", "furo"]
-test = ["objgraph", "psutil", "setuptools"]
-
 [[package]]
 name = "h11"
 version = "0.16.0"
 description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86"},
    {file = "h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1"},
@@ -963,10 +857,9 @@ files = [
 name = "httpcore"
 version = "1.0.9"
 description = "A minimal low-level HTTP client."
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55"},
    {file = "httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8"},
@@ -986,10 +879,9 @@ trio = ["trio (>=0.22.0,<1.0)"]
 name = "httptools"
 version = "0.8.0"
 description = "A collection of framework independent HTTP protocol utils."
-optional = true
+optional = false
 python-versions = ">=3.9"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "httptools-0.8.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:bf3b6f807c8541503cecfbb8a8dffb385640d0d96102f3d112aa8740f9b7c826"},
    {file = "httptools-0.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:da684f2e1aa2ee9bdcb083f3f3a68c5956750b375bc5df864d3a5f0c42a40b77"},
@@ -1047,10 +939,9 @@ files = [
 name = "httpx"
 version = "0.28.1"
 description = "The next generation HTTP client."
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad"},
    {file = "httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc"},
@@ -1075,7 +966,7 @@ version = "3.18"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
 python-versions = ">=3.9"
-groups = ["main"]
+groups = ["main", "app"]
 files = [
    {file = "idna-3.18-py3-none-any.whl", hash = "sha256:7f952cbe720b688055e3f87de14f5c3e5fdaa8bc3928985c4077ca689de849a2"},
    {file = "idna-3.18.tar.gz", hash = "sha256:ffb385a7e039654cef1ab9ef32c6fafe283c0c0467bba1d9029738ce4a14a848"},
@@ -1115,10 +1006,9 @@ colors = ["colorama"]
 name = "jinja2"
 version = "3.1.6"
 description = "A very fast and expressive template engine."
-optional = true
+optional = false
 python-versions = ">=3.7"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67"},
    {file = "jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d"},
@@ -1134,10 +1024,9 @@ i18n = ["Babel (>=2.7)"]
 name = "markdown-it-py"
 version = "4.2.0"
 description = "Python port of markdown-it. Markdown parsing, done right!"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "markdown_it_py-4.2.0-py3-none-any.whl", hash = "sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a"},
    {file = "markdown_it_py-4.2.0.tar.gz", hash = "sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49"},
@@ -1159,10 +1048,9 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions", "pytest-tim
 name = "markupsafe"
 version = "3.0.3"
 description = "Safely add untrusted strings to HTML/XML markup."
-optional = true
+optional = false
 python-versions = ">=3.9"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "markupsafe-3.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f981d352f04553a7171b8e44369f2af4055f888dfb147d55e42d29e29e74559"},
    {file = "markupsafe-3.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e1c1493fb6e50ab01d20a22826e57520f1284df32f2d8601fdd90b6304601419"},
@@ -1271,10 +1159,9 @@ files = [
 name = "mdurl"
 version = "0.1.2"
 description = "Markdown URL utilities"
-optional = true
+optional = false
 python-versions = ">=3.7"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"},
    {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"},
@@ -1489,28 +1376,6 @@ files = [
    {file = "platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7"},
 ]

-[[package]]
-name = "playwright"
-version = "1.62.0"
-description = "A high-level API to automate web browsers"
-optional = false
-python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "playwright-1.62.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:d8da938f3748841a8754f2e1f0216902c1c8f8ae3720de8b32ccf8e6913a7c4f"},
-    {file = "playwright-1.62.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:db755ab27db21a04186f1fe8169888e42356086e439b1059b923ef417f0b6034"},
-    {file = "playwright-1.62.0-py3-none-macosx_11_0_universal2.whl", hash = "sha256:5108bd5b3e87169ddf269feee097da5893af7f8aea4634dfc840518d64c1f1da"},
-    {file = "playwright-1.62.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:ba33bae6a13b3d9d354c751cb618af357d20fe1d57767cbcce52079bbef17ad3"},
-    {file = "playwright-1.62.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:db2d76613a57ad844362ce42f7d0c2fa26b19a4f7a46d4f76b891c631e6e5aff"},
-    {file = "playwright-1.62.0-py3-none-win32.whl", hash = "sha256:e5614fa89355d7081457680324bb219f79f69c423c5cb6fa250e30b0d8aebf1c"},
-    {file = "playwright-1.62.0-py3-none-win_amd64.whl", hash = "sha256:92c0d98ed04eb35af557b709875edba415b1f548bdb22ddb5bb3e1e6c835c2f1"},
-    {file = "playwright-1.62.0-py3-none-win_arm64.whl", hash = "sha256:ea8d3055aa9d5a9f1832ac82517bd8b42c78fac7ebcbebb0107116735c8cb6a1"},
-]
-
-[package.dependencies]
-greenlet = ">=3.1.1,<4.0.0"
-pyee = ">=13,<14"
-
 [[package]]
 name = "pluggy"
 version = "1.6.0"
@@ -1664,7 +1529,7 @@ version = "2.13.4"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.9"
-groups = ["main"]
+groups = ["main", "app"]
 files = [
    {file = "pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba"},
    {file = "pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6"},
@@ -1687,7 +1552,7 @@ version = "2.46.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.9"
-groups = ["main"]
+groups = ["main", "app"]
 files = [
    {file = "pydantic_core-2.46.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:a396dcc17e5a0b164dbe026896245a4fa9ff402edca1dff0be3d53a517f74de4"},
    {file = "pydantic_core-2.46.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:da4b951fe36dc7c3a1ccb4e3cd1747c3542b8c9ceede8fc86cae054e764485f5"},
@@ -1818,10 +1683,9 @@ typing-extensions = ">=4.14.1"
 name = "pydantic-extra-types"
 version = "2.11.1"
 description = "Extra Pydantic types."
-optional = true
+optional = false
 python-versions = ">=3.9"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "pydantic_extra_types-2.11.1-py3-none-any.whl", hash = "sha256:1722ea2bddae5628ace25f2aa685b69978ef533123e5638cfbddb999e0100ec1"},
    {file = "pydantic_extra_types-2.11.1.tar.gz", hash = "sha256:46792d2307383859e923d8fcefa82108b1a141f8a9c0198982b3832ab5ef1049"},
@@ -1845,10 +1709,9 @@ uuid-utils = ["uuid-utils (>=0.6.0) ; python_version < \"3.14\""]
 name = "pydantic-settings"
 version = "2.14.2"
 description = "Settings management using Pydantic"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "pydantic_settings-2.14.2-py3-none-any.whl", hash = "sha256:a20c97b37910b6550d5ea50fbcc2d4187defe58cd57070b73863d069419c9440"},
    {file = "pydantic_settings-2.14.2.tar.gz", hash = "sha256:c19dd64b19097f1de80184f0cc7b0272a13ae6e170cbf240a3e27e381ed14a5f"},
@@ -1866,36 +1729,17 @@ gcp-secret-manager = ["google-cloud-secret-manager (>=2.23.1)"]
 toml = ["tomli (>=2.0.1)"]
 yaml = ["pyyaml (>=6.0.1)"]

-[[package]]
-name = "pyee"
-version = "13.0.1"
-description = "A rough port of Node.js's EventEmitter to Python with a few tricks of its own"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "pyee-13.0.1-py3-none-any.whl", hash = "sha256:af2f8fede4171ef667dfded53f96e2ed0d6e6bd7ee3bb46437f77e3b57689228"},
-    {file = "pyee-13.0.1.tar.gz", hash = "sha256:0b931f7c14535667ed4c7e0d531716368715e860b988770fc7eb8578d1f67fc8"},
-]
-
-[package.dependencies]
-typing-extensions = "*"
-
-[package.extras]
-dev = ["black", "build", "flake8", "flake8-black", "isort", "jupyter-console", "mkdocs", "mkdocs-include-markdown-plugin", "mkdocstrings[python]", "mypy", "pytest", "pytest-asyncio ; python_version >= \"3.4\"", "pytest-trio ; python_version >= \"3.7\"", "sphinx", "toml", "tox", "trio", "trio ; python_version > \"3.6\"", "trio-typing ; python_version > \"3.6\"", "twine", "twisted", "validate-pyproject[all]"]
-
 [[package]]
 name = "pygments"
 version = "2.20.0"
 description = "Pygments is a syntax highlighting package written in Python."
 optional = false
 python-versions = ">=3.9"
-groups = ["main", "test"]
+groups = ["app", "test"]
 files = [
    {file = "pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176"},
    {file = "pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f"},
 ]
-markers = {main = "extra == \"app\""}

 [package.extras]
 windows-terminal = ["colorama (>=0.4.6)"]
@@ -1985,10 +1829,9 @@ six = ">=1.5"
 name = "python-dotenv"
 version = "1.2.2"
 description = "Read key-value pairs from a .env file and set them as environment variables"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "python_dotenv-1.2.2-py3-none-any.whl", hash = "sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a"},
    {file = "python_dotenv-1.2.2.tar.gz", hash = "sha256:2c371a91fbd7ba082c2c1dc1f8bf89ca22564a087c2c287cd9b662adde799cf3"},
@@ -2001,10 +1844,9 @@ cli = ["click (>=5.0)"]
 name = "python-multipart"
 version = "0.0.32"
 description = "A streaming multipart parser for Python"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "python_multipart-0.0.32-py3-none-any.whl", hash = "sha256:ff6d3f776f16878c894e52e107296ffc890e913c611b1a4ec6c44e2821fe2e23"},
    {file = "python_multipart-0.0.32.tar.gz", hash = "sha256:be54b7f3fa167bb83e4fcd936b887b708f4e57fe75911c02aebf53efaf8d938e"},
@@ -2081,10 +1923,9 @@ files = [
 name = "pyyaml"
 version = "6.0.3"
 description = "YAML parser and emitter for Python"
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "PyYAML-6.0.3-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c2514fceb77bc5e7a2f7adfaa1feb2fb311607c9cb518dbc378688ec73d8292f"},
    {file = "PyYAML-6.0.3-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9c57bb8c96f6d1808c030b1687b9b5fb476abaa47f0db9c0101f5e9f394e97f4"},
@@ -2309,10 +2150,9 @@ files = [
 name = "rich"
 version = "15.0.0"
 description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
-optional = true
+optional = false
 python-versions = ">=3.9.0"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "rich-15.0.0-py3-none-any.whl", hash = "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb"},
    {file = "rich-15.0.0.tar.gz", hash = "sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36"},
@@ -2329,10 +2169,9 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"]
 name = "rich-toolkit"
 version = "0.20.1"
 description = "Rich toolkit for building command-line applications"
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "rich_toolkit-0.20.1-py3-none-any.whl", hash = "sha256:2a6d5f8e15759b9eba5a9ee63da10b275359ead20e5a0fc92bd5b4dbae8ce4bf"},
    {file = "rich_toolkit-0.20.1.tar.gz", hash = "sha256:c7336ae281f435c785acecaedc4b71d4b663dc73d9c8079fea96372527e822a4"},
@@ -2347,10 +2186,9 @@ typing-extensions = ">=4.12.2"
 name = "rignore"
 version = "0.7.6"
 description = "Python Bindings for the ignore crate"
-optional = true
+optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "rignore-0.7.6-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:f3c74a7e5ee77aea669c95fdb3933f2a6c7549893700082e759128a29cf67e45"},
    {file = "rignore-0.7.6-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b7202404958f5fe3474bac91f65350f0b1dde1a5e05089f2946549b7e91e79ec"},
@@ -2512,10 +2350,9 @@ files = [
 name = "sentry-sdk"
 version = "2.64.0"
 description = "Python client for Sentry (https://sentry.io)"
-optional = true
+optional = false
 python-versions = ">=3.6"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "sentry_sdk-2.64.0-py3-none-any.whl", hash = "sha256:715ea91ca860a819e8d8a50a7bde3a80d0df3b4ed7b6660a20fb9a2d084188f1"},
    {file = "sentry_sdk-2.64.0.tar.gz", hash = "sha256:68be2c29e14ae310f8a39e1a79916b6d85c6cb41dcce789d14ff05fe293e4c55"},
@@ -2577,10 +2414,9 @@ unleash = ["UnleashClient (>=6.0.1)"]
 name = "shellingham"
 version = "1.5.4"
 description = "Tool to Detect Surrounding Shell"
-optional = true
+optional = false
 python-versions = ">=3.7"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686"},
    {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"},
@@ -2614,10 +2450,9 @@ files = [
 name = "starlette"
 version = "1.3.1"
 description = "The little ASGI library that shines."
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "starlette-1.3.1-py3-none-any.whl", hash = "sha256:c7372aae11c3c3f26a42df7bd626cec2f47d03483d261d369516a615a53714c6"},
    {file = "starlette-1.3.1.tar.gz", hash = "sha256:05d0213193f2fbaae60e2ecb593b4add4262ad4e46536b54abe36f11a71724e0"},
@@ -2645,10 +2480,9 @@ files = [
 name = "typer"
 version = "0.26.8"
 description = "Typer, build great CLIs. Easy to code. Based on Python type hints."
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "typer-0.26.8-py3-none-any.whl", hash = "sha256:3512ca79ac5c11113414b36e80281b872884477722440691c89d1112e321a49c"},
    {file = "typer-0.26.8.tar.gz", hash = "sha256:c244a6bd558886fe3f8780efb6bdd28bb9aff005a94eedebaa5cb32926fe2f7e"},
@@ -2666,7 +2500,7 @@ version = "4.15.0"
 description = "Backported and Experimental Type Hints for Python 3.9+"
 optional = false
 python-versions = ">=3.9"
-groups = ["main"]
+groups = ["main", "app"]
 files = [
    {file = "typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548"},
    {file = "typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466"},
@@ -2678,7 +2512,7 @@ version = "0.4.2"
 description = "Runtime typing introspection tools"
 optional = false
 python-versions = ">=3.9"
-groups = ["main"]
+groups = ["main", "app"]
 files = [
    {file = "typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7"},
    {file = "typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464"},
@@ -2723,10 +2557,9 @@ testing = ["check_manifest", "pyroma", "pytest (>=4.3)", "pytest-cov", "pytest-m
 name = "urllib3"
 version = "2.7.0"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897"},
    {file = "urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c"},
@@ -2742,10 +2575,9 @@ zstd = ["backports-zstd (>=1.0.0) ; python_version < \"3.14\""]
 name = "uvicorn"
 version = "0.49.0"
 description = "The lightning-fast ASGI server."
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "uvicorn-0.49.0-py3-none-any.whl", hash = "sha256:ba3d14c3ee7e41c6c654c46c9eb489d33213cdd30aa1696eab1374337c13f68f"},
    {file = "uvicorn-0.49.0.tar.gz", hash = "sha256:ebf4271aa580d9de97f93192d4595176df6e91f9aae919ca73e4fc07df1e66a3"},
@@ -2769,10 +2601,10 @@ standard = ["colorama (>=0.4) ; sys_platform == \"win32\"", "httptools (>=0.8.0)
 name = "uvloop"
 version = "0.22.1"
 description = "Fast implementation of asyncio event loop on top of libuv"
-optional = true
+optional = false
 python-versions = ">=3.8.1"
-groups = ["main"]
-markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"app\""
+groups = ["app"]
+markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""
 files = [
    {file = "uvloop-0.22.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ef6f0d4cc8a9fa1f6a910230cd53545d9a14479311e87e3cb225495952eb672c"},
    {file = "uvloop-0.22.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7cd375a12b71d33d46af85a3343b35d98e8116134ba404bd657b3b1d15988792"},
@@ -2834,10 +2666,9 @@ test = ["aiohttp (>=3.10.5)", "flake8 (>=6.1,<7.0)", "mypy (>=0.800)", "psutil",
 name = "watchfiles"
 version = "1.2.0"
 description = "Simple, modern and high performance file watching and code reload in python."
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "watchfiles-1.2.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:bb68bf4df85abebe5efddc53cf2075520f243a59868d9b3973278b23e76962a9"},
    {file = "watchfiles-1.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c16cb06dd17d43b9d185094268459eac92c9538356f050e55b54e82cf700e1d4"},
@@ -2955,10 +2786,9 @@ anyio = ">=3.0.0"
 name = "websockets"
 version = "16.0"
 description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
-optional = true
+optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"app\""
+groups = ["app"]
 files = [
    {file = "websockets-16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:04cdd5d2d1dacbad0a7bf36ccbcd3ccd5a30ee188f2560b7a62a30d14107b31a"},
    {file = "websockets-16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8ff32bb86522a9e5e31439a58addbb0166f0204d64066fb955265c4e214160f0"},
@@ -3142,10 +2972,7 @@ idna = ">=2.0"
 multidict = ">=4.0"
 propcache = ">=0.2.1"

-[extras]
-app = ["babel", "fastapi", "jinja2"]
-
 [metadata]
 lock-version = "2.1"
-python-versions = ">=3.14,<4.0"
-content-hash = "b0c7f9c6c9fbb20ada45e7d27601920b0ba42716a1a70b4e317e7295de230376"
+python-versions = "^3.14"
+content-hash = "16dac910366fb78d67f45bac4c8cf19c0f448cb53fccb7e33c13ea22d509783f"
@@ -1,44 +1,42 @@
-[project]
-name = "gallery"
-description = ""
-version = "0.6.1"
-readme = "README.md"
-authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
-requires-python = '>=3.14,<4.0'
-dependencies = [
-  'aiohttp (>=3.14,<4.0)',
-  'beautifulsoup4 (>=4.15,<5.0)',
-  'dateparser (>=1.4,<2.0)',
-  'pydantic (>=2.13,<3.0)',
-  'aiocache[redis] (>=0.12,<0.13)',
-  "playwright (>=1.62.0,<2.0.0)",
-]
-
-[project.optional-dependencies]
-app = [
-  "fastapi[standard] (>=0.139,<0.140)",
-  "jinja2 (>=3.1,<4.0)",
-  "babel (>=2.18,<3.0)",
-]
-
-[dependency-groups]
-test = ["pytest (>=9.1,<10.0)", "pytest-asyncio (>=1.4,<2.0)"]
-dev = ["pylint (>=4.0.6,<5.0.0)", "black (>=26.5,<27.0)", "isort (>=8.0,<9.0)"]
-
-[project.scripts]
-gallery = "gallery.main:run"
-
 [tool.poetry]
+name = "gallery"
+version = "0.5.1"
+description = ""
+authors = ["shmyga <shmyga.z@gmail.com>"]
+readme = "README.md"
 packages = [{ include = "gallery" }]
-requires-poetry = '>=2.0.0,<3.0.0'
+
+[tool.poetry.dependencies]
+python = "^3.14"
+aiohttp = "^3.14"
+beautifulsoup4 = "^4.15"
+dateparser = "^1.4"
+pydantic = "^2.13"
+aiocache = { extras = ["redis"], version = "^0.12" }
+
+[tool.poetry.group.app.dependencies]
+fastapi = {extras = ["standard"], version = "^0.139.0"}
+jinja2 = "^3.1"
+babel = "^2.18"
+
+[tool.poetry.group.test.dependencies]
+pytest = "^9.1"
+pytest-asyncio = "^1.4"
+
+[tool.poetry.group.dev.dependencies]
+pylint = "^4.0"
+black = "^26.5"
+isort = "^8.0"

 [build-system]
-requires = ['poetry-core (>=2.0.0,<3.0.0)']
+requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

+[tool.poetry.scripts]
+gallery = "gallery.main:run"
+
 [tool.black]
 line-length = 120
-target-version = ["py314"]

 [tool.isort]
 profile = "black"
@@ -29,9 +29,9 @@ publish () {
  for PROJECT in "${DOCKER_PROJECTS[@]}"; do
    IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
    docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$VERSION
-    docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG
+    docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:latest
    docker push $DOCKER_ROOT/$PROJECT_NAME:$VERSION
-    docker push $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG
+    docker push $DOCKER_ROOT/$PROJECT_NAME:latest
  done
 }

@@ -11,7 +11,6 @@ source .env
 # python
 poetry env use ${PYTHON_VERSION}
 poetry install
-.venv/bin/playwright install chromium --with-deps --only-shell

 # static
 cd static || exit
@@ -1,6 +1,6 @@
 {
  "name": "gallery",
-  "version": "0.6.1",
+  "version": "0.5.1",
  "type": "module",
  "scripts": {
    "build": "webpack --mode production",
@@ -16,19 +16,12 @@
    "flag-icons": "^7.5.0"
  },
  "devDependencies": {
-    "@babel/core": "^8.0.1",
-    "@babel/preset-env": "^8.0.2",
    "@types/bootstrap": "^5.2.11",
    "@types/node": "^26.1.0",
-    "autoprefixer": "^10.5.4",
-    "babel-loader": "^10.1.1",
    "copy-webpack-plugin": "^14.0.0",
-    "core-js": "^3.49.0",
    "css-loader": "^7.1.4",
    "file-loader": "^6.2.0",
    "mini-css-extract-plugin": "^2.10.2",
-    "postcss": "^8.5.22",
-    "postcss-loader": "^8.2.1",
    "sass": "^1.101.0",
    "sass-loader": "^17.0.0",
    "style-loader": "^4.0.0",
@@ -37,9 +30,5 @@
    "typescript": "^6.0.3",
    "webpack": "^5.108.3",
    "webpack-cli": "^7.1.0"
-  },
-  "browserslist": [
-    "> 0.5%",
-    "last 2 versions"
-  ]
+  }
 }
@@ -1,3 +1,3 @@
 <!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<path id="wind" d="M3.74,14.5c0-2.04,0.51-3.93,1.52-5.66s2.38-3.1,4.11-4.11s3.61-1.51,5.64-1.51c1.52,0,2.98,0.3,4.37,0.89  s2.58,1.4,3.59,2.4s1.81,2.2,2.4,3.6s0.89,2.85,0.89,4.39c0,1.52-0.3,2.98-0.89,4.37s-1.4,2.59-2.4,3.59s-2.2,1.8-3.59,2.39  s-2.84,0.89-4.37,0.89c-1.53,0-3-0.3-4.39-0.89s-2.59-1.4-3.6-2.4s-1.8-2.2-2.4-3.58S3.74,16.03,3.74,14.5z M6.22,14.5  c0,2.37,0.86,4.43,2.59,6.18c1.73,1.73,3.79,2.59,6.2,2.59c1.58,0,3.05-0.39,4.39-1.18s2.42-1.85,3.21-3.2s1.19-2.81,1.19-4.39  s-0.4-3.05-1.19-4.4s-1.86-2.42-3.21-3.21s-2.81-1.18-4.39-1.18s-3.05,0.39-4.39,1.18S8.2,8.75,7.4,10.1S6.22,12.92,6.22,14.5z   M11.11,20.35l3.75-13.11c0.01-0.1,0.06-0.15,0.15-0.15s0.14,0.05,0.15,0.15l3.74,13.11c0.04,0.11,0.03,0.19-0.02,0.25  s-0.13,0.06-0.24,0l-3.47-1.3c-0.1-0.04-0.2-0.04-0.29,0l-3.5,1.3c-0.1,0.06-0.17,0.06-0.21,0S11.09,20.45,11.11,20.35z"/>
+<path d="M3.74,14.5c0-2.04,0.51-3.93,1.52-5.66s2.38-3.1,4.11-4.11s3.61-1.51,5.64-1.51c1.52,0,2.98,0.3,4.37,0.89  s2.58,1.4,3.59,2.4s1.81,2.2,2.4,3.6s0.89,2.85,0.89,4.39c0,1.52-0.3,2.98-0.89,4.37s-1.4,2.59-2.4,3.59s-2.2,1.8-3.59,2.39  s-2.84,0.89-4.37,0.89c-1.53,0-3-0.3-4.39-0.89s-2.59-1.4-3.6-2.4s-1.8-2.2-2.4-3.58S3.74,16.03,3.74,14.5z M6.22,14.5  c0,2.37,0.86,4.43,2.59,6.18c1.73,1.73,3.79,2.59,6.2,2.59c1.58,0,3.05-0.39,4.39-1.18s2.42-1.85,3.21-3.2s1.19-2.81,1.19-4.39  s-0.4-3.05-1.19-4.4s-1.86-2.42-3.21-3.21s-2.81-1.18-4.39-1.18s-3.05,0.39-4.39,1.18S8.2,8.75,7.4,10.1S6.22,12.92,6.22,14.5z   M11.11,20.35l3.75-13.11c0.01-0.1,0.06-0.15,0.15-0.15s0.14,0.05,0.15,0.15l3.74,13.11c0.04,0.11,0.03,0.19-0.02,0.25  s-0.13,0.06-0.24,0l-3.47-1.3c-0.1-0.04-0.2-0.04-0.29,0l-3.5,1.3c-0.1,0.06-0.17,0.06-0.21,0S11.09,20.45,11.11,20.35z"/>
 </svg>
@@ -1,4 +1,3 @@
-# pylint: skip-file
 from pathlib import Path

 from lxml import etree
@@ -18,8 +17,8 @@ def icon_optimizator(file: Path):
    for node in tree.findall(".//{*}path"):
        d = node.attrib["d"]
        node.attrib["d"] = " ".join(map(normalize_value, d.split(" ")))
-    # file = file.parent.parent / "icons.tmp" / file.name
-    # file.parent.mkdir(parents=True, exist_ok=True)
+    #file = file.parent.parent / "icons.tmp" / file.name
+    #file.parent.mkdir(parents=True, exist_ok=True)
    tree.write(file)
    target_size = file.stat().st_size
    print(file.name, source_size, target_size)
@@ -7,7 +7,6 @@ $weather-icons-colors: (
  "moon": #4A4B43,
  "lightning": red,
  "snow": white,
-  "wind": #0d6efd,
 ) !default;
 $weather-icons-included: (
  "wi-cloud",
@@ -1,17 +1,15 @@
@use "variables";

-weather-icon,
-.wi-svg {
+weather-icon {
  display: flex;
  width: 3rem;
-  height: 3rem;

  > svg {
-    width: 3rem;
-    height: 3rem;
-
    path {
      fill: gray;
+      stroke: variables.$weather-icons-stroke-color;
+      stroke-width: 0.5;
+      //paint-order: stroke;
    }
    @each $type, $color in variables.$weather-icons-colors {
      path[id="#{$type}"] {
@@ -22,31 +20,4 @@ weather-icon,
      }
    }
  }
-
-  &.wi-border {
-    > svg path {
-      stroke: variables.$weather-icons-stroke-color;
-      stroke-width: 0.5;
-      //paint-order: stroke;
-    }
-  }
-
-  &.wi-s {
-    width: 2.5rem;
-    height: 2.5rem;
-
-    > svg {
-      width: 2.5rem;
-      height: 2.5rem;
-    }
-  }
-  &.wi-l {
-    width: 3.5rem;
-    height: 3.5rem;
-
-    > svg {
-      width: 3.5rem;
-      height: 3.5rem;
-    }
-  }
 }
@@ -2,4 +2,4 @@
@use "weather-icons-base";
@use "weather-icons-list";
@use "weather-wind-aliases";
-@use "weather-icons-svg";
+@use "weather-icons-colors";
@@ -9,34 +9,26 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

 const config: webpack.Configuration = {
-  target: ["web", "es6"],
  entry: ["./src/index.ts", "./src/main.scss"],
  module: {
    rules: [
      { test: /\.svg$/, use: ["file-loader"] },
      {
        test: /\.tsx?$/,
-        use: [{ loader: "babel-loader" }, { loader: "ts-loader" }],
+        use: {
+          loader: "ts-loader",
+        },
        exclude: /node_modules/,
      },
      {
        test: /\.s[ac]ss$/i,
        use: [
          MiniCssExtractPlugin.loader,
-          { loader: "css-loader", options: { sourceMap: false, url: false } },
-          {
-            loader: "postcss-loader",
-            options: {
-              sourceMap: false,
-              postcssOptions: {
-                plugins: [["autoprefixer", { grid: "autoplace" }]],
-              },
-            },
-          },
+          { loader: "css-loader", options: { sourceMap: true, url: false } },
          {
            loader: "sass-loader",
            options: {
-              sourceMap: false,
+              sourceMap: true,
              sassOptions: { quietDeps: true, silenceDeprecations: ["color-functions", "global-builtin", "import"] },
            },
          },
@@ -1,8 +1,6 @@
 from pathlib import Path
-from typing import TypeVar

-from gallery.sketch.api import Api, S
-from gallery.sketch.source import DEFAULT_REQUEST_MODE, ApiSource, RequestMode
+from gallery.sketch.source import ApiSource


 class MockSource(ApiSource):
@@ -12,19 +10,8 @@ class MockSource(ApiSource):
        self._path = path
        self._mapping = mapping

-    async def request(self, endpoint: str, /, mode: RequestMode = DEFAULT_REQUEST_MODE) -> str:
+    async def request(self, endpoint: str) -> str:
        for pattern, filename in self._mapping.items():
            if pattern in endpoint:
                return (self._path / filename).read_text()
        raise ValueError(endpoint)
-
-
-API = Api[S]
-A = TypeVar("A", bound=API)
-
-
-def create_mock_api(api_type: type[A], mock_source: MockSource) -> A:
-    api = api_type()
-    # pylint: disable=protected-access
-    api._build_source = lambda: mock_source
-    return api
@@ -1,3 +0,0 @@
-from os import environ
-
-environ.setdefault("OPENWEATHER_KEY", "test")
@@ -1,14 +1,8 @@
 from pathlib import Path

-from gallery.painting.openweather.openweather import OpenWeather
 from tests.common.mock import MockSource

-
-class OpenWeatherMockSource(MockSource, OpenWeather):
-    pass
-
-
-OPENWEATHER_MOCK_SOURCE = OpenWeatherMockSource(
+OPENWEATHER_MOCK_SOURCE = MockSource(
    Path(__file__).parent,
    {
        "forecast": "forecast.json",
@@ -1,57 +0,0 @@
-[
-  {
-    "title": "Орёл",
-    "description": "Орёл",
-    "coords": { "lat": 52.97075653, "lon": 36.06435776 },
-    "uri": "//yandex.ru/pogoda?name=%D0%9E%D1%80%D1%91%D0%BB&kind=locality",
-    "geoId": 10,
-    "slug": "10",
-    "kind": "locality",
-    "distance": { "value": null, "text": "" },
-    "url": "//yandex.ru/pogoda?name=%D0%9E%D1%80%D1%91%D0%BB&kind=locality"
-  },
-  {
-    "title": "село Орёл-Изумруд",
-    "description": "Краснодарский край",
-    "coords": { "lat": 43.46733475, "lon": 39.92550659 },
-    "uri": "//yandex.ru/pogoda?name=%D0%9A%D1%80%D0%B0%D1%81%D0%BD%D0%BE%D0%B4%D0%B0%D1%80%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%B3%D0%BE%D1%80%D0%BE%D0%B4%D1%81%D0%BA%D0%BE%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%A1%D0%BE%D1%87%D0%B8%2C+%D1%81%D0%B5%D0%BB%D0%BE+%D0%9E%D1%80%D1%91%D0%BB-%D0%98%D0%B7%D1%83%D0%BC%D1%80%D1%83%D0%B4&kind=locality",
-    "geoId": 211278,
-    "slug": "211278",
-    "kind": "locality",
-    "distance": { "value": null, "text": "" },
-    "url": "//yandex.ru/pogoda?name=%D0%9A%D1%80%D0%B0%D1%81%D0%BD%D0%BE%D0%B4%D0%B0%D1%80%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%B3%D0%BE%D1%80%D0%BE%D0%B4%D1%81%D0%BA%D0%BE%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%A1%D0%BE%D1%87%D0%B8%2C+%D1%81%D0%B5%D0%BB%D0%BE+%D0%9E%D1%80%D1%91%D0%BB-%D0%98%D0%B7%D1%83%D0%BC%D1%80%D1%83%D0%B4&kind=locality"
-  },
-  {
-    "title": "деревня Орёл",
-    "description": "Республика Татарстан (Татарстан)",
-    "coords": { "lat": 55.56605148, "lon": 49.06790161 },
-    "uri": "//yandex.ru/pogoda?name=%D0%A0%D0%B5%D1%81%D0%BF%D1%83%D0%B1%D0%BB%D0%B8%D0%BA%D0%B0+%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD+%28%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD%29%2C+%D0%9B%D0%B0%D0%B8%D1%88%D0%B5%D0%B2%D1%81%D0%BA%D0%B8%D0%B9+%D1%80%D0%B0%D0%B9%D0%BE%D0%BD%2C+%D0%9E%D1%80%D0%BB%D0%BE%D0%B2%D1%81%D0%BA%D0%BE%D0%B5+%D1%81%D0%B5%D0%BB%D1%8C%D1%81%D0%BA%D0%BE%D0%B5+%D0%BF%D0%BE%D1%81%D0%B5%D0%BB%D0%B5%D0%BD%D0%B8%D0%B5%2C+%D0%B4%D0%B5%D1%80%D0%B5%D0%B2%D0%BD%D1%8F+%D0%9E%D1%80%D1%91%D0%BB&kind=locality",
-    "geoId": 140917,
-    "slug": "140917",
-    "kind": "locality",
-    "distance": { "value": null, "text": "" },
-    "url": "//yandex.ru/pogoda?name=%D0%A0%D0%B5%D1%81%D0%BF%D1%83%D0%B1%D0%BB%D0%B8%D0%BA%D0%B0+%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD+%28%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD%29%2C+%D0%9B%D0%B0%D0%B8%D1%88%D0%B5%D0%B2%D1%81%D0%BA%D0%B8%D0%B9+%D1%80%D0%B0%D0%B9%D0%BE%D0%BD%2C+%D0%9E%D1%80%D0%BB%D0%BE%D0%B2%D1%81%D0%BA%D0%BE%D0%B5+%D1%81%D0%B5%D0%BB%D1%8C%D1%81%D0%BA%D0%BE%D0%B5+%D0%BF%D0%BE%D1%81%D0%B5%D0%BB%D0%B5%D0%BD%D0%B8%D0%B5%2C+%D0%B4%D0%B5%D1%80%D0%B5%D0%B2%D0%BD%D1%8F+%D0%9E%D1%80%D1%91%D0%BB&kind=locality"
-  },
-  {
-    "title": "посёлок Орёл",
-    "description": "Пермский край",
-    "coords": { "lat": 59.33684921, "lon": 56.58647919 },
-    "uri": "//yandex.ru/pogoda?name=%D0%9F%D0%B5%D1%80%D0%BC%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%BC%D1%83%D0%BD%D0%B8%D1%86%D0%B8%D0%BF%D0%B0%D0%BB%D1%8C%D0%BD%D1%8B%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%91%D0%B5%D1%80%D0%B5%D0%B7%D0%BD%D0%B8%D0%BA%D0%B8%2C+%D0%BF%D0%BE%D1%81%D1%91%D0%BB%D0%BE%D0%BA+%D0%9E%D1%80%D1%91%D0%BB&kind=locality",
-    "geoId": 135862,
-    "slug": "135862",
-    "kind": "locality",
-    "distance": { "value": null, "text": "" },
-    "url": "//yandex.ru/pogoda?name=%D0%9F%D0%B5%D1%80%D0%BC%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%BC%D1%83%D0%BD%D0%B8%D1%86%D0%B8%D0%BF%D0%B0%D0%BB%D1%8C%D0%BD%D1%8B%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%91%D0%B5%D1%80%D0%B5%D0%B7%D0%BD%D0%B8%D0%BA%D0%B8%2C+%D0%BF%D0%BE%D1%81%D1%91%D0%BB%D0%BE%D0%BA+%D0%9E%D1%80%D1%91%D0%BB&kind=locality"
-  },
-  {
-    "title": "Пуэрто-Франсиско-де-Орельяна",
-    "description": "Провинция Орельяна",
-    "coords": { "lat": -0.4602830112, "lon": -76.99185944 },
-    "uri": "//yandex.ru/pogoda?name=%D0%9F%D1%80%D0%BE%D0%B2%D0%B8%D0%BD%D1%86%D0%B8%D1%8F+%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0%2C+%D0%9F%D1%83%D1%8D%D1%80%D1%82%D0%BE-%D0%A4%D1%80%D0%B0%D0%BD%D1%81%D0%B8%D1%81%D0%BA%D0%BE-%D0%B4%D0%B5-%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0&kind=weather",
-    "geoId": 111891,
-    "slug": "111891",
-    "kind": "weather",
-    "distance": { "value": null, "text": "" },
-    "url": "//yandex.ru/pogoda?name=%D0%9F%D1%80%D0%BE%D0%B2%D0%B8%D0%BD%D1%86%D0%B8%D1%8F+%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0%2C+%D0%9F%D1%83%D1%8D%D1%80%D1%82%D0%BE-%D0%A4%D1%80%D0%B0%D0%BD%D1%81%D0%B8%D1%81%D0%BA%D0%BE-%D0%B4%D0%B5-%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0&kind=weather"
-  }
-]
@@ -3,13 +3,14 @@ import datetime
 import pytest

 from gallery.painting.gismeteo.api import GismeteoApi
-from tests.common.mock import create_mock_api
 from tests.data.gismeteo import GISMETEO_MOCK_SOURCE


@pytest.fixture(name="gismeteo_api", scope="module")
 def gismeteo_api_fixture() -> GismeteoApi:
-    return create_mock_api(GismeteoApi, GISMETEO_MOCK_SOURCE)
+    api = GismeteoApi()
+    api.SOURCE = GISMETEO_MOCK_SOURCE
+    return api


 async def test_search(gismeteo_api: GismeteoApi):
@@ -3,13 +3,14 @@ import datetime
 import pytest

 from gallery.painting.matchtv.api import MatchTvApi
-from tests.common.mock import create_mock_api
 from tests.data.matchtv import MATCHTV_MOCK_SOURCE


@pytest.fixture(name="matchtv_api", scope="module")
 def matchtv_api_fixture() -> MatchTvApi:
-    return create_mock_api(MatchTvApi, MATCHTV_MOCK_SOURCE)
+    api = MatchTvApi()
+    api.SOURCE = MATCHTV_MOCK_SOURCE
+    return api


 async def test_search(matchtv_api: MatchTvApi):
@@ -3,13 +3,20 @@ import datetime
 import pytest

 from gallery.painting.openweather.api import OpenWeatherApi
-from tests.common.mock import create_mock_api
+from gallery.painting.openweather.openweather import OpenWeather
 from tests.data.openweather import OPENWEATHER_MOCK_SOURCE


@pytest.fixture(name="openweather_api", scope="module")
 def openweather_api_fixture() -> OpenWeatherApi:
-    return create_mock_api(OpenWeatherApi, OPENWEATHER_MOCK_SOURCE)
+    class MockOpenWeather(OpenWeather):
+        def __init__(self):
+            super().__init__("")
+            self._source = OPENWEATHER_MOCK_SOURCE
+
+    api = OpenWeatherApi()
+    api.SOURCE = MockOpenWeather()
+    return api


 async def test_search(openweather_api: OpenWeatherApi):
@@ -3,13 +3,14 @@ import datetime
 import pytest

 from gallery.painting.yandextv.api import YandexTvApi
-from tests.common.mock import create_mock_api
 from tests.data.yandextv import YANDEXTV_MOCK_SOURCE


@pytest.fixture(name="yandextv_api", scope="module")
 def yandextv_api_fixture() -> YandexTvApi:
-    return create_mock_api(YandexTvApi, YANDEXTV_MOCK_SOURCE)
+    api = YandexTvApi()
+    api.SOURCE = YANDEXTV_MOCK_SOURCE
+    return api


 async def test_search(yandextv_api: YandexTvApi):
Author	SHA1	Message	Date
shmyga	615d385f14	ci(version): 0.5.1	2026-07-10 15:03:32 +03:00
shmyga	b1bf51c606	fix(static): fix bootstrap usage	2026-07-10 14:49:35 +03:00
shmyga	2d54e0afd0	ci(version): 0.5.0	2026-07-10 13:33:09 +03:00
shmyga	292cdd6037	build(scripts): add save docker action	2026-07-10 13:32:57 +03:00
shmyga	01d0d1eeb8	fix(gismeteo): add heavy_rain variant	2026-07-10 13:32:13 +03:00
shmyga	b85e9ac5f3	feat(static): colorize weather icons	2026-07-09 15:18:04 +03:00
shmyga	8f244455ac	refactor(static): refactor static module	2026-07-06 11:52:55 +03:00
shmyga	820472796b	build(static): fix webpack build warngins	2026-07-06 10:56:07 +03:00
shmyga	d1bdac66c0	refactor(static): refactor weather-icons lib	2026-07-05 20:45:19 +03:00
shmyga	d21e31ca35	feat(static): use webpack instead of vite	2026-07-04 21:04:42 +03:00