python-google-weather-api 0.0.5__tar.gz → 0.0.7__tar.gz

{python_google_weather_api-0.0.5/src/python_google_weather_api.egg-info → python_google_weather_api-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-google-weather-api
-Version: 0.0.5
+Version: 0.0.7
 Summary: A python client library for Google Weather API
 Author-email: tronikos <tronikos@gmail.com>
 License-Expression: Apache-2.0
@@ -13,6 +13,8 @@ Requires-Dist: aiohttp>=3.8
 Requires-Dist: mashumaro
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-asyncio; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
 Dynamic: license-file
 
 # python-google-weather-api

{python_google_weather_api-0.0.5 → python_google_weather_api-0.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-google-weather-api"
-version = "0.0.5"
+version = "0.0.7"
 license = "Apache-2.0"
 authors = [
     { name="tronikos", email="tronikos@gmail.com" },
@@ -16,6 +16,8 @@ dependencies = [
 [project.optional-dependencies]
 test = [
     "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
 ]
 
 
@@ -27,6 +29,13 @@ test = [
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+addopts = "--cov=google_weather_api --cov-report=term-missing --cov-fail-under=90"
+
+[tool.coverage.run]
+branch = true
+
 [tool.ruff]
 target-version = "py311"
 line-length = 127
@@ -64,6 +73,7 @@ ignore = [
     "D203",  # 1 blank line required before class docstring
     "D213",  # Multi-line docstring summary should start at the second line
     "PLR0913",  # Too many arguments in function definition
+    "PLR0917",  # Too many positional arguments in function definition
     "PLR1714",  # Consider merging multiple comparisons
     "PLR2004",  # Magic value used in comparison
     "TRY003",  # Avoid specifying long messages outside the exception class

{python_google_weather_api-0.0.5 → python_google_weather_api-0.0.7}/src/google_weather_api/api.py

@@ -53,11 +53,12 @@ class GoogleWeatherApi:
             headers[aiohttp.hdrs.REFERER] = self.referrer
         params = {
             **params,
-            "key": self.api_key,
             "language_code": self.language_code,
             "units_system": self.units_system,
         }
+        # Log before adding the API key so it doesn't end up in debug logs.
         _LOGGER.debug("GET %s with params: %s", url, params)
+        params["key"] = self.api_key
         try:
             async with self.session.get(
                 url,
@@ -68,15 +69,45 @@ class GoogleWeatherApi:
                 res: dict[str, Any] = await resp.json()
                 _LOGGER.debug("Got %s for %s", resp.status, url)
                 if resp.status != HTTPStatus.OK:
+                    error_data = res.get("error", {})
+                    error_msg = error_data.get("message", "Unknown API error")
+
                     if resp.status in (HTTPStatus.UNAUTHORIZED, HTTPStatus.FORBIDDEN):
-                        raise GoogleWeatherApiAuthError(res["error"]["message"])
-                    raise GoogleWeatherApiResponseError(res["error"]["message"])
+                        raise GoogleWeatherApiAuthError(error_msg)
+
+                    # Google APIs often return 400 Bad Request for invalid API keys
+                    if resp.status == HTTPStatus.BAD_REQUEST:
+                        for detail in error_data.get("details", []):
+                            if detail.get("reason") == "API_KEY_INVALID":
+                                raise GoogleWeatherApiAuthError(error_msg)
+
+                    raise GoogleWeatherApiResponseError(error_msg)
                 return res
         except TimeoutError as err:
             raise GoogleWeatherApiConnectionError("Timeout") from err
         except aiohttp.ClientError as err:
             raise GoogleWeatherApiConnectionError(err) from err
 
+    async def _async_get_all_pages(
+        self, endpoint: str, params: dict[str, Any], records_key: str, limit: int
+    ) -> dict[str, Any]:
+        """Perform a GET request, following pagination until `limit` records are collected.
+
+        The API caps the number of records it returns per page (24 for hourly forecasts),
+        regardless of the requested page size, so a single request is not enough.
+        """
+        params = {**params, "page_size": limit}
+        data = await self._async_get(endpoint, params)
+        records: list[Any] = data.get(records_key, [])
+        while len(records) < limit and (page_token := data.get("nextPageToken")):
+            data = await self._async_get(endpoint, {**params, "page_token": page_token})
+            page_records: list[Any] = data.get(records_key, [])
+            if not page_records:
+                break
+            records.extend(page_records)
+        data[records_key] = records[:limit]
+        return data
+
     async def async_get_current_conditions(self, latitude: float, longitude: float) -> CurrentConditionsResponse:
         """Fetch current weather conditions.
 
@@ -96,14 +127,15 @@ class GoogleWeatherApi:
 
         See https://developers.google.com/maps/documentation/weather/reference/rest/v1/forecast.hours/lookup
         """
-        data = await self._async_get(
+        data = await self._async_get_all_pages(
             "forecast/hours:lookup",
             {
                 "location.latitude": latitude,
                 "location.longitude": longitude,
                 "hours": hours,
-                "page_size": hours,
             },
+            "forecastHours",
+            hours,
         )
         return HourlyForecastResponse.from_dict(data)
 
@@ -112,13 +144,14 @@ class GoogleWeatherApi:
 
         See https://developers.google.com/maps/documentation/weather/reference/rest/v1/forecast.days/lookup
         """
-        data = await self._async_get(
+        data = await self._async_get_all_pages(
             "forecast/days:lookup",
             {
                 "location.latitude": latitude,
                 "location.longitude": longitude,
                 "days": days,
-                "page_size": days,
             },
+            "forecastDays",
+            days,
         )
         return DailyForecastResponse.from_dict(data)

{python_google_weather_api-0.0.5 → python_google_weather_api-0.0.7}/src/google_weather_api/exceptions.py

@@ -1,17 +1,17 @@
-"""Exceptions for Google Weather API."""
-
-
-class GoogleWeatherApiError(Exception):
-    """Exception talking to the Google Weather API."""
-
-
-class GoogleWeatherApiConnectionError(GoogleWeatherApiError):
-    """Exception connecting to the Google Weather API."""
-
-
-class GoogleWeatherApiAuthError(GoogleWeatherApiError):
-    """Exception raised for authentication errors in the Google Weather API."""
-
-
-class GoogleWeatherApiResponseError(GoogleWeatherApiError):
-    """Exception raised for errors in the Google Weather API response."""
+"""Exceptions for Google Weather API."""
+
+
+class GoogleWeatherApiError(Exception):
+    """Exception talking to the Google Weather API."""
+
+
+class GoogleWeatherApiConnectionError(GoogleWeatherApiError):
+    """Exception connecting to the Google Weather API."""
+
+
+class GoogleWeatherApiAuthError(GoogleWeatherApiError):
+    """Exception raised for authentication errors in the Google Weather API."""
+
+
+class GoogleWeatherApiResponseError(GoogleWeatherApiError):
+    """Exception raised for errors in the Google Weather API response."""