[HNT-1898] Add summary property to hourly forecasts response (#1327)

* [HNT-1898] Add summary property to hourly forecasts response

* remove todo comment

* minor refactor and new unit test

* refactor to bump cache key version and remove try except and unit test

* fix lint after rebase

Author: Herraj

merino/jobs/cli.py

@@ -18,9 +18,7 @@
 # Include your new jobs module here.
 
 # NOTE: `pretty_exceptions_show_locals` argument is set to False to avoid api_key and secrets exposure.
-cli = typer.Typer(
-    no_args_is_help=True, add_completion=False, pretty_exceptions_show_locals=False
-)
+cli = typer.Typer(no_args_is_help=True, add_completion=False, pretty_exceptions_show_locals=False)
 
 # Add the wikipedia-indexer subcommands
 cli.add_typer(indexer_cmd, no_args_is_help=True)

merino/providers/suggest/weather/backends/accuweather/backend.py

@@ -318,9 +318,9 @@ def cache_key_for_accuweather_request(
                     hasher.update(key.encode("utf-8") + value.encode("utf-8"))
             extra_identifiers = hasher.hexdigest()
 
-            return f"{self.__class__.__name__}:v7:{url}:{extra_identifiers}"
+            return f"{self.__class__.__name__}:v8:{url}:{extra_identifiers}"
 
-        return f"{self.__class__.__name__}:v7:{url}"
+        return f"{self.__class__.__name__}:v8:{url}"
 
     @functools.cache
     def cache_key_template(self, dt: WeatherDataType, language: str) -> str:
@@ -980,6 +980,7 @@ async def _get_hourly_forecasts_from_cache(
         if not hourly_forecasts_cached or ttl_cached == REDIS_EXPIRED_KEY_TTL:
             return None
 
+        # cache hit.
         self.metrics_client.increment("accuweather.cache.hit.hourly_forecasts")
 
         # convert binary json from cache to regular json.

merino/providers/suggest/weather/backends/accuweather/utils.py

@@ -238,6 +238,7 @@ def process_hourly_forecast_response(response: Any) -> dict[str, list[dict[str,
                         "temperature_unit": temperature_unit,
                         "temperature_value": temperature_value,
                         "icon_id": forecast["WeatherIcon"],
+                        "summary": forecast["IconPhrase"],
                         "url": url,
                     }
                 )
@@ -269,6 +270,7 @@ def create_hourly_forecasts_from_json(
             epoch_date_time=forecast["epoch_date_time"],
             temperature=temperature,
             icon_id=forecast["icon_id"],
+            summary=forecast["summary"],
             url=HttpUrl(forecast["url"]),
         )
 

merino/providers/suggest/weather/backends/protocol.py

@@ -62,6 +62,7 @@ class HourlyForecast(BaseModel):
     temperature: Temperature
     icon_id: int
     url: HttpUrl
+    summary: str
 
 
 class HourlyForecastsWithTTL(NamedTuple):

tests/integration/api/v1/weather/conftest.py

@@ -54,6 +54,7 @@ def fixture_hourly_forecasts_with_ttl() -> HourlyForecastsWithTTL:
             epoch_date_time=1708281600 + (i * 3600),
             temperature=Temperature(f=60 + i),
             icon_id=6,
+            summary="Sunny",
             url=HttpUrl(
                 f"http://www.accuweather.com/en/us/san-francisco/94105/"
                 f"hourly-weather-forecast/39376?day=1&hbhhour={14+i}&lang=en-us"

tests/integration/providers/suggest/weather/backends/test_accuweather.py

@@ -347,6 +347,7 @@ def fixture_accuweather_hourly_forecast_response() -> bytes:
                 "EpochDateTime": base_time + (i * 3600),
                 "Temperature": {"Unit": "F", "Value": 60 + i},
                 "WeatherIcon": 6,
+                "IconPhrase": "Sunny",
                 "Link": f"http://www.accuweather.com/en/us/san-francisco/94105/hourly-weather-forecast/39376?day=1&hbhhour={hour}&lang=en-us",
             }
         )

tests/unit/providers/suggest/weather/backends/test_accuweather.py

@@ -769,6 +769,7 @@ def fixture_accuweather_hourly_forecast_response() -> bytes:
                 "EpochDateTime": base_time + (i * 3600),
                 "Temperature": {"Unit": "F", "Value": 60 + i},
                 "WeatherIcon": 6,
+                "IconPhrase": "Sunny",
                 "Link": f"http://www.accuweather.com/en/us/san-francisco/94105/hourly-weather-forecast/39376?day=1&hbhhour={hour}&lang=en-us",
             }
         )
@@ -2057,16 +2058,16 @@ async def test_get_forecast_error(accuweather: AccuweatherBackend, language: str
     [
         (
             {"q": "asdfg", "apikey": "filter_me_out"},
-            f"AccuweatherBackend:v7:localhost:"
+            f"AccuweatherBackend:v8:localhost:"
             f"{hashlib.blake2s('q'.encode('utf-8') + 'asdfg'.encode('utf-8')).hexdigest()}",
         ),
         (
             {},
-            "AccuweatherBackend:v7:localhost",
+            "AccuweatherBackend:v8:localhost",
         ),
         (
             {"q": "asdfg"},
-            f"AccuweatherBackend:v7:localhost:"
+            f"AccuweatherBackend:v8:localhost:"
             f"{hashlib.blake2s('q'.encode('utf-8') + 'asdfg'.encode('utf-8')).hexdigest()}",
         ),
     ],
@@ -2817,6 +2818,7 @@ async def test_get_hourly_forecasts(
     assert first_forecast.temperature.f == 60
     assert first_forecast.temperature.c == 16
     assert first_forecast.icon_id == 6
+    assert first_forecast.summary == "Sunny"
     assert "hourly-weather-forecast/39376?day=1&hbhhour=14" in str(first_forecast.url)
 
     metrics_called = [call_arg[0][0] for call_arg in statsd_mock.increment.call_args_list]

tests/unit/providers/suggest/weather/test_provider.py

@@ -252,6 +252,7 @@ def fixture_hourly_forecasts_with_ttl() -> HourlyForecastsWithTTL:
                 epoch_date_time=1708281600,
                 temperature=Temperature(f=60, c=16),
                 icon_id=6,
+                summary="Sunny",
                 url=HttpUrl(
                     "http://www.accuweather.com/en/us/san-francisco/94105/"
                     "hourly-weather-forecast/39376"