feat(weather): add weather location search

gallery/painting/gismeteo/api.py

@@ -1,13 +1,13 @@
 import datetime
+import json
 import logging
-from typing import Any, Dict, List
+from typing import Any
 
 from bs4 import BeautifulSoup
 
 from gallery.sketch.source import ApiSource
 from gallery.sketch.weather.api import WeatherApi
-from gallery.sketch.weather.catalog import LocationId
-from gallery.sketch.weather.model import WeatherResponse, WeatherValue
+from gallery.sketch.weather.model import Location, WeatherResponse, WeatherValue
 
 from . import datehelp
 from .parser import DAYS_PARSER, LOCATION_PARSER, ONE_DAY_PARSER, ROW_PARSERS
@@ -34,7 +34,7 @@ class GismeteoApi(WeatherApi):
     )
 
     def _parse_oneday(self, date: datetime.date, data: str) -> WeatherResponse:
-        result: List[Dict[str, Any]] = []
+        result: list[dict[str, Any]] = []
         soup = BeautifulSoup(data, features="html.parser")
         location = LOCATION_PARSER.parse_location(data)
         widget = ONE_DAY_PARSER.parse_widget(soup)
@@ -52,7 +52,7 @@ class GismeteoApi(WeatherApi):
         )
 
     def _parse_manydays(self, data: str) -> WeatherResponse:
-        result: List[Dict[str, Any]] = []
+        result: list[dict[str, Any]] = []
         soup = BeautifulSoup(data, features="html.parser")
         location = LOCATION_PARSER.parse_location(data)
         widget = DAYS_PARSER.parse_widget(soup)
@@ -69,11 +69,29 @@ class GismeteoApi(WeatherApi):
             values=values,
         )
 
-    async def get_locations(self) -> list[str]:
-        return [
-            LocationId.OREL,
-            LocationId.ZMIYEVKA,
-        ]
+    async def find_locations(self, query: str) -> list[Location]:
+        geo = "ru"
+        latitude = 52.968498
+        longitude = 36.0695
+        data = json.loads(
+            await self.SOURCE.request(
+                f"mq/city/q/?q={query}&geo={geo}&latitude={latitude}&longitude={longitude}&limit=10"
+            )
+        )
+        result = []
+        for item in data["data"]:
+            result.append(
+                Location(
+                    id=f"{item['slug']}-{item['id']}",
+                    name=item["translations"]["kk"]["city"]["name"],
+                    lat=item["coordinates"]["latitude"],
+                    lon=item["coordinates"]["longitude"],
+                    country=item["translations"]["kk"]["country"]["name"],
+                    district=item["translations"]["kk"]["district"]["name"],
+                    subdistrict=item["translations"]["kk"]["subdistrict"]["name"],
+                )
+            )
+        return result
 
     async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
         data = await self.SOURCE.request(f"weather-{location_id}/{datehelp.dump(date)}")

gallery/painting/gismeteo/mock/__init__.py

@@ -1,5 +0,0 @@
-from pathlib import Path
-
-from gallery.sketch.mock import MockData
-
-GISMETEO_MOCK_DATA = MockData(Path(__file__).parent / "data")

gallery/painting/matchtv/mock/__init__.py

@@ -1,5 +0,0 @@
-from pathlib import Path
-
-from gallery.sketch.mock import MockData
-
-MATCHTV_MOCK_DATA = MockData(Path(__file__).parent / "data")

gallery/painting/openweather/api.py

@@ -5,8 +5,7 @@ from collections import defaultdict
 from aiocache import cached
 
 from gallery.sketch.weather.api import WeatherApi
-from gallery.sketch.weather.catalog import BUNDLE, LocationId
-from gallery.sketch.weather.model import WeatherResponse, WeatherValue
+from gallery.sketch.weather.model import Location, WeatherResponse, WeatherValue
 from gallery.sketch.weather.util import merge_weather_values
 from gallery.util import TimeUnit
 
@@ -20,11 +19,9 @@ class OpenWeatherApi(WeatherApi):
     PROVIDER = "openweather"
     SOURCE = OpenWeather("517a6bccceaa1c48127f6199ec3fb7cf")
 
-    async def get_locations(self) -> list[str]:
-        return [
-            LocationId.OREL,
-            LocationId.ZMIYEVKA,
-        ]
+    @classmethod
+    def _parse_location(cls, location_id: str) -> tuple[float, float]:
+        return tuple(map(float, location_id.split(":", maxsplit=2)))
 
     @cached(
         key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
@@ -32,8 +29,10 @@ class OpenWeatherApi(WeatherApi):
         ttl=TimeUnit.DAY,
     )
     async def _get_location_forecast(self, location_id: str) -> Forecast:
-        location = BUNDLE.get_item(location_id)
-        return await self.SOURCE.get_forecast(location.lat, location.lon)
+        return await self.SOURCE.get_forecast(*self._parse_location(location_id))
+
+    async def find_locations(self, query: str) -> list[Location]:
+        raise NotImplementedError
 
     async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
         data: Forecast = await self._get_location_forecast(location_id)
@@ -42,9 +41,8 @@ class OpenWeatherApi(WeatherApi):
             value = FORECAST_ITEM_PARSER.parse(item)
             if value.date.date() == date:
                 values.append(value)
-        location = BUNDLE.get_item(location_id)
         return WeatherResponse(
-            location=location.name,
+            location=location_id,
             date=date,
             period="day",
             values=values,
@@ -61,9 +59,8 @@ class OpenWeatherApi(WeatherApi):
             merge_weather_values(date, values)
             for date, values in values_by_date.items()
         ]
-        location = BUNDLE.get_item(location_id)
         return WeatherResponse(
-            location=location.name,
+            location=location_id,
             date=datetime.date.today(),
             period="days",
             values=list(sorted(values, key=lambda item: item.date)),

gallery/painting/yandextv/mock/__init__.py

@@ -1,5 +0,0 @@
-from pathlib import Path
-
-from gallery.sketch.mock import MockData
-
-YANDEXTV_MOCK_DATA = MockData(Path(__file__).parent / "data")