Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
)
from weather_briefing.composition.providers import (
PUBLISHER_BUILDERS,
WEATHER_PROVIDER_BUILDERS,
_build_jma,
_build_nea,
_build_open_meteo,
Expand All @@ -51,7 +50,7 @@
from weather_briefing.composition.providers import weather_provider_metadata as _weather_provider_metadata
from weather_briefing.config import ConfigurationError, Settings
from weather_briefing.models import LocationSpec, ResolvedLocation
from weather_briefing.registries import PublisherName, WeatherProviderName
from weather_briefing.registries import PublisherName
from weather_briefing.state import SQLiteRuntimeDiagnostics, SQLiteStateStore
from weather_briefing.weather import QWeatherProvider

Expand Down Expand Up @@ -1490,8 +1489,7 @@ def test_parse_run_time_returns_now_when_value_is_none(monkeypatch) -> None:
assert result.timezone_name == "Asia/Shanghai"


def test_runtime_provider_builders_cover_declared_configuration_names() -> None:
assert set(WEATHER_PROVIDER_BUILDERS) == set(WeatherProviderName)
Comment thread
qodo-code-review[bot] marked this conversation as resolved.
Resolved
def test_publisher_builders_cover_declared_configuration_names() -> None:
assert set(PUBLISHER_BUILDERS) == set(PublisherName)


Expand Down
17 changes: 4 additions & 13 deletions weather_briefing/composition/providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,16 +258,15 @@ def build_weather_provider(
jma_office_code: str | None = None,
) -> WeatherContextProvider:
"""Build one configured weather provider adapter."""
builder = WEATHER_PROVIDER_BUILDERS.get(name)
if builder is None:
raise ValueError(f"Unsupported weather provider: {name}")
if name == WeatherProviderName.QWEATHER:
return _build_qweather(settings, client, output_language=output_language)
if name == WeatherProviderName.OPEN_METEO:
return _build_open_meteo(settings, client)
if name == WeatherProviderName.NEA_SINGAPORE:
return NEASingaporeNowcastProvider(client, api_key=settings.nea_api_key)
return _build_nea(settings, client)
if name == WeatherProviderName.JMA_JAPAN:
return _build_jma(settings, client, office_code=jma_office_code)
return builder(settings, client)
raise ValueError(f"Unsupported weather provider: {name}")


def _build_qweather(
Expand Down Expand Up @@ -319,11 +318,3 @@ def aqicn_provider(settings: Settings, client: httpx.AsyncClient) -> AirQualityP
if not settings.aqicn_api_token:
return None
return AQICNProvider(client, token=settings.aqicn_api_token)


WEATHER_PROVIDER_BUILDERS: dict[str, Callable[[Settings, httpx.AsyncClient], WeatherContextProvider]] = {
WeatherProviderName.QWEATHER: _build_qweather,
WeatherProviderName.OPEN_METEO: _build_open_meteo,
WeatherProviderName.NEA_SINGAPORE: _build_nea,
WeatherProviderName.JMA_JAPAN: _build_jma,
}