python-google-weather-api 0.0.9__py3-none-any.whl → 0.0.10__py3-none-any.whl

google_weather_api/__init__.py

@@ -4,6 +4,7 @@ from .api import GoogleWeatherApi
 from .exceptions import (
     GoogleWeatherApiAuthError,
     GoogleWeatherApiConnectionError,
+    GoogleWeatherApiConnectionTimeoutError,
     GoogleWeatherApiError,
     GoogleWeatherApiResponseError,
 )
@@ -50,6 +51,7 @@ __all__ = [
     "GoogleWeatherApi",
     "GoogleWeatherApiAuthError",
     "GoogleWeatherApiConnectionError",
+    "GoogleWeatherApiConnectionTimeoutError",
     "GoogleWeatherApiError",
     "GoogleWeatherApiResponseError",
     "HourlyForecastResponse",

google_weather_api/api.py

@@ -11,6 +11,7 @@ import aiohttp
 from .exceptions import (
     GoogleWeatherApiAuthError,
     GoogleWeatherApiConnectionError,
+    GoogleWeatherApiConnectionTimeoutError,
     GoogleWeatherApiResponseError,
 )
 from .model import (
@@ -71,28 +72,33 @@ class GoogleWeatherApi:
                 headers=headers,
                 timeout=self.timeout,
             ) as resp:
-                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(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
+                status_code = resp.status
+                body = None if status_code == HTTPStatus.GATEWAY_TIMEOUT else await resp.json()
         except TimeoutError as err:
-            raise GoogleWeatherApiConnectionError("Timeout") from err
+            raise GoogleWeatherApiConnectionTimeoutError("Timeout") from err
         except aiohttp.ClientError as err:
             raise GoogleWeatherApiConnectionError(err) from err
 
+        if status_code == HTTPStatus.GATEWAY_TIMEOUT:
+            raise GoogleWeatherApiConnectionTimeoutError("Timeout")
+        res: dict[str, Any] = body if isinstance(body, dict) else {}
+        if status_code != HTTPStatus.OK:
+            error_data = res.get("error", {})
+            error_msg = error_data.get("message", "Unknown API error")
+
+            if status_code in (HTTPStatus.UNAUTHORIZED, HTTPStatus.FORBIDDEN):
+                raise GoogleWeatherApiAuthError(error_msg)
+
+            # Google APIs often return 400 Bad Request for invalid API keys
+            if status_code == 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
+
     async def _async_get_all_pages(
         self,
         endpoint: str,

google_weather_api/exceptions.py

@@ -9,6 +9,10 @@ class GoogleWeatherApiConnectionError(GoogleWeatherApiError):
     """Exception connecting to the Google Weather API."""
 
 
+class GoogleWeatherApiConnectionTimeoutError(GoogleWeatherApiConnectionError, TimeoutError):
+    """Exception raised when a request to the Google Weather API times out."""
+
+
 class GoogleWeatherApiAuthError(GoogleWeatherApiError):
     """Exception raised for authentication errors in the Google Weather API."""
 

google_weather_api/model.py

@@ -42,6 +42,7 @@ class BaseModel(DataClassJSONMixin):
 
         serialize_by_alias = True
         allow_deserialization_not_by_alias = True
+        omit_none = True
 
 
 @dataclass
@@ -523,12 +524,12 @@ class ForecastDay(BaseModel):
 class DailyForecastResponse(BaseModel):
     """Response model for the forecast.days.lookup method."""
 
-    forecast_days: list[ForecastDay] = field(metadata={"alias": "forecastDays"})
-    """The daily forecast records."""
-
     time_zone: TimeZone = field(metadata={"alias": "timeZone"})
     """The time zone at the requested location."""
 
+    forecast_days: list[ForecastDay] = field(default_factory=list, metadata={"alias": "forecastDays"})
+    """The daily forecast records."""
+
     next_page_token: str | None = field(default=None, metadata={"alias": "nextPageToken"})
     """The token to retrieve the next page."""
 
@@ -631,12 +632,12 @@ class ForecastHour(BaseModel):
 class HourlyForecastResponse(BaseModel):
     """Response model for the forecast.hours.lookup method."""
 
-    forecast_hours: list[ForecastHour] = field(metadata={"alias": "forecastHours"})
-    """The hourly forecast records."""
-
     time_zone: TimeZone = field(metadata={"alias": "timeZone"})
     """The time zone at the requested location."""
 
+    forecast_hours: list[ForecastHour] = field(default_factory=list, metadata={"alias": "forecastHours"})
+    """The hourly forecast records."""
+
     next_page_token: str | None = field(default=None, metadata={"alias": "nextPageToken"})
     """The token to retrieve the next page."""
 

{python_google_weather_api-0.0.9.dist-info → python_google_weather_api-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-google-weather-api
-Version: 0.0.9
+Version: 0.0.10
 Summary: A python client library for Google Weather API
 Author-email: tronikos <tronikos@gmail.com>
 License-Expression: Apache-2.0

python_google_weather_api-0.0.10.dist-info/RECORD

@@ -0,0 +1,10 @@
+google_weather_api/__init__.py,sha256=sOOI0Muwa4HERSM6W1OCtumAasjuV_7WkCFKEDm3T8c,1691
+google_weather_api/api.py,sha256=K2G4kh7JN8E9h1HJ4EBDGKBd6DyoryTKyQ7qaZZmSNw,7707
+google_weather_api/exceptions.py,sha256=z4rKXfRZLhkFLt1MISki1-nTxV_5Uc14ppjW7qu0ZNQ,708
+google_weather_api/model.py,sha256=Mj7eOhu696KXFpuEEXxobQeMUG2aKDjO2D3lGPLugP0,24927
+google_weather_api/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_google_weather_api-0.0.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+python_google_weather_api-0.0.10.dist-info/METADATA,sha256=KgAggQCD2_viCLkwk283XyosqwN2mOi00yRB2rOIay4,1413
+python_google_weather_api-0.0.10.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+python_google_weather_api-0.0.10.dist-info/top_level.txt,sha256=ZkFbtKDHz3vUJhH6DGEPVLj3PPeNpR9-Wg0f4HqGD78,19
+python_google_weather_api-0.0.10.dist-info/RECORD,,

python_google_weather_api-0.0.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-google_weather_api/__init__.py,sha256=Su4PjNcbIJFYoFCEH4wwdtT-M2HSMtLNLvF-TWGHiNo,1601
-google_weather_api/api.py,sha256=4_Y8TN6Mtrf4JDGoBOVm6W0uedxe5sPxMVx-ktD2kCI,7478
-google_weather_api/exceptions.py,sha256=AHHzb-cbE0bgzp4PH2IC5s3jHAJHONbL9iw5b-_MvoU,534
-google_weather_api/model.py,sha256=2Dx6VGh5Uaotb3McZSNs0BT6iJTrr5spYEUUC-IlXiA,24858
-google_weather_api/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_google_weather_api-0.0.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-python_google_weather_api-0.0.9.dist-info/METADATA,sha256=SvCCnXAfToJfdwSvgBJ1D41y3lR3IsJGxgBwl_WJY5E,1412
-python_google_weather_api-0.0.9.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-python_google_weather_api-0.0.9.dist-info/top_level.txt,sha256=ZkFbtKDHz3vUJhH6DGEPVLj3PPeNpR9-Wg0f4HqGD78,19
-python_google_weather_api-0.0.9.dist-info/RECORD,,