pyVisualCrossing 0.1.15__tar.gz → 1.0.0__tar.gz

{pyVisualCrossing-0.1.15 → pyvisualcrossing-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyVisualCrossing
-Version: 0.1.15
+Version: 1.0.0
 Summary: Gets the weather data from Visual Crossing
 Home-page: https://github.com/briis/pyVisualCrossing
 Author: briis
@@ -12,6 +12,15 @@ Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 # Python Wrapper for Visual Crossing Weather API
 

{pyVisualCrossing-0.1.15 → pyvisualcrossing-1.0.0}/pyVisualCrossing/__init__.py

@@ -1,4 +1,5 @@
 """Python Wrapper for Visual Crossing Weather API."""
+
 from __future__ import annotations
 
 from pyVisualCrossing.api import (
@@ -17,6 +18,19 @@ from pyVisualCrossing.data import (
 from pyVisualCrossing.const import SUPPORTED_LANGUAGES
 
 __title__ = "pyVisualCrossing"
-__version__ = "0.1.15"
+__version__ = "1.0.0"
 __author__ = "briis"
 __license__ = "MIT"
+
+__all__ = [
+    "VisualCrossing",
+    "VisualCrossingBadRequest",
+    "VisualCrossingException",
+    "VisualCrossingInternalServerError",
+    "VisualCrossingUnauthorized",
+    "VisualCrossingTooManyRequests",
+    "ForecastData",
+    "ForecastDailyData",
+    "ForecastHourlyData",
+    "SUPPORTED_LANGUAGES",
+]

{pyVisualCrossing-0.1.15 → pyvisualcrossing-1.0.0}/pyVisualCrossing/api.py

@@ -2,6 +2,7 @@
 
 See: https://www.visualcrossing.com/.
 """
+
 from __future__ import annotations
 
 import abc
@@ -11,11 +12,17 @@ import json
 import logging
 
 from typing import Any
+import urllib.error
 import urllib.request
 
 import aiohttp
 
-from .const import DATE_FORMAT, DATE_TIME_FORMAT, SUPPORTED_LANGUAGES, VISUALCROSSING_BASE_URL
+from .const import (
+    DATE_FORMAT,
+    DATE_TIME_FORMAT,
+    SUPPORTED_LANGUAGES,
+    VISUALCROSSING_BASE_URL,
+)
 from .data import ForecastData, ForecastDailyData, ForecastHourlyData
 
 UTC = datetime.timezone.utc
@@ -46,16 +53,18 @@ class VisualCrossingInternalServerError(Exception):
 class VisualCrossingAPIBase:
     """Baseclass to use as dependency injection pattern for easier automatic testing."""
 
+    session: aiohttp.ClientSession | None = None
+
     @abc.abstractmethod
     def fetch_data(
         self, api_key: str, latitude: float, longitude: float, days: int, language: str
-    ) -> dict[str, Any]:
+    ) -> dict[str, Any] | None:
         """Override this."""
         raise NotImplementedError("users must define fetch_data to use this base class")
 
     @abc.abstractmethod
     async def async_fetch_data(
-        api_key: str, latitude: float, longitude: float, days: int, language: str
+        self, api_key: str, latitude: float, longitude: float, days: int, language: str
     ) -> dict[str, Any]:
         """Override this."""
         raise NotImplementedError("users must define fetch_data to use this base class")
@@ -70,7 +79,7 @@ class VisualCrossingAPI(VisualCrossingAPIBase):
 
     def fetch_data(
         self, api_key: str, latitude: float, longitude: float, days: int, language: str
-    ) -> dict[str, Any]:
+    ) -> dict[str, Any] | None:
         """Get data from API."""
         api_url = f"{VISUALCROSSING_BASE_URL}{latitude},{longitude}/today/next{days}days?unitGroup=metric&key={api_key}&contentType=json&iconSet=icons2&lang={language}"
         _LOGGER.debug("URL: %s", api_url)
@@ -149,8 +158,8 @@ class VisualCrossing:
         longitude: float,
         days: int = 14,
         language: str = "en",
-        session: aiohttp.ClientSession = None,
-        api: VisualCrossingAPIBase = VisualCrossingAPI(),
+        session: aiohttp.ClientSession | None = None,
+        api: VisualCrossingAPIBase | None = None,
     ) -> None:
         """Return data from Weather API."""
         self._api_key = api_key
@@ -158,7 +167,7 @@ class VisualCrossing:
         self._longitude = longitude
         self._days = days
         self._language = language
-        self._api = api
+        self._api = api if api is not None else VisualCrossingAPI()
         self._json_data = None
 
         if days > 14:
@@ -170,7 +179,7 @@ class VisualCrossing:
         if language not in SUPPORTED_LANGUAGES:
             self._language = "en"
 
-    def fetch_data(self) -> list[ForecastData]:
+    def fetch_data(self) -> ForecastData | None:
         """Return list of weather data."""
 
         self._json_data = self._api.fetch_data(
@@ -183,7 +192,7 @@ class VisualCrossing:
 
         return _fetch_data(self._json_data)
 
-    async def async_fetch_data(self) -> list[ForecastData]:
+    async def async_fetch_data(self) -> ForecastData | None:
         """Return list of weather data."""
 
         self._json_data = await self._api.async_fetch_data(
@@ -197,7 +206,7 @@ class VisualCrossing:
         return _fetch_data(self._json_data)
 
 
-def _fetch_data(api_result: dict) -> list[ForecastData]:
+def _fetch_data(api_result: dict[str, Any] | None) -> ForecastData | None:
     """Return result from API to ForecastData List."""
 
     # Return nothing af the Request for data fails
@@ -212,11 +221,10 @@ def _fetch_data(api_result: dict) -> list[ForecastData]:
 
     # Loop Through Records and add Daily and Hourly Forecast Data
     for item in api_result["days"]:
-        # valid_time = datetime.datetime.utcfromtimestamp(item["datetimeEpoch"]).replace(
-        #     tzinfo=UTC
-        # )
         day_str = item["datetime"]
-        day_obj = datetime.datetime.strptime(day_str, DATE_FORMAT).astimezone(timezone.utc)
+        day_obj = datetime.datetime.strptime(day_str, DATE_FORMAT).astimezone(
+            timezone.utc
+        )
         condition = item.get("conditions", None)
         cloudcover = item.get("cloudcover", None)
         icon = item.get("icon", None)
@@ -234,7 +242,6 @@ def _fetch_data(api_result: dict) -> list[ForecastData]:
         wind_bearing = item.get("winddir", None)
 
         day_data = ForecastDailyData(
-            # valid_time,
             day_obj,
             temperature,
             temp_low,
@@ -256,13 +263,11 @@ def _fetch_data(api_result: dict) -> list[ForecastData]:
 
         # Add Hourly data for this day
         for row in item["hours"]:
-            # now = datetime.datetime.now().replace(tzinfo=UTC)
             now = datetime.datetime.now(timezone.utc)
             hour = row["datetime"]
-            day_hour_obj = datetime.datetime.strptime(f"{day_str} {hour}", DATE_TIME_FORMAT).astimezone(timezone.utc)
-            # valid_time = datetime.datetime.utcfromtimestamp(
-            #     row["datetimeEpoch"]
-            # ).replace(tzinfo=UTC)
+            day_hour_obj = datetime.datetime.strptime(
+                f"{day_str} {hour}", DATE_TIME_FORMAT
+            ).astimezone(timezone.utc)
             if day_hour_obj > now:
                 condition = row.get("conditions", None)
                 cloudcover = row.get("cloudcover", None)
@@ -280,7 +285,6 @@ def _fetch_data(api_result: dict) -> list[ForecastData]:
                 wind_bearing = row.get("winddir", None)
 
                 hour_data = ForecastHourlyData(
-                    # valid_time,
                     day_hour_obj,
                     temperature,
                     apparent_temperature,
@@ -306,14 +310,16 @@ def _fetch_data(api_result: dict) -> list[ForecastData]:
 
 
 # pylint: disable=R0914, R0912, W0212, R0915
-def _get_current_data(api_result: dict) -> list[ForecastData]:
+def _get_current_data(api_result: dict[str, Any]) -> ForecastData:
     """Return WeatherFlowForecast list from API."""
 
     item = api_result["currentConditions"]
 
-    valid_time = datetime.datetime.utcfromtimestamp(item["datetimeEpoch"]).replace(
-        tzinfo=UTC
-    )
+    day_str = datetime.datetime.today().strftime(DATE_FORMAT)
+    hour = item["datetime"]
+    day_hour_obj = datetime.datetime.strptime(
+        f"{day_str} {hour}", DATE_TIME_FORMAT
+    ).astimezone(timezone.utc)
     condition = item.get("conditions", None)
     cloudcover = item.get("cloudcover", None)
     icon = item.get("icon", None)
@@ -330,11 +336,11 @@ def _get_current_data(api_result: dict) -> list[ForecastData]:
     wind_speed = item.get("windspeed", None)
     wind_gust_speed = item.get("windgust", None)
     wind_bearing = item.get("winddir", None)
-    location = api_result.get("address", None)
-    description = api_result.get("description", None)
+    location = api_result.get("address", "")
+    description = api_result.get("description", "")
 
     current_condition = ForecastData(
-        valid_time,
+        day_hour_obj,
         apparent_temperature,
         condition,
         cloudcover,

{pyVisualCrossing-0.1.15 → pyvisualcrossing-1.0.0}/pyVisualCrossing/const.py

@@ -1,8 +1,35 @@
 """System Wide constants for Visual Crossing Weather Wrapper."""
+
 from __future__ import annotations
 
 DATE_FORMAT = "%Y-%m-%d"
 DATE_TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
 
-SUPPORTED_LANGUAGES = ["ar", "bg", "cs", "da", "de", "el", "en", "es", "fa", "fi", "fr", "he", "hu", "it", "ja", "ko", "nl", "pl", "pt", "sr", "sv", "tr", "uk", "vi", "zh"]
+SUPPORTED_LANGUAGES = [
+    "ar",
+    "bg",
+    "cs",
+    "da",
+    "de",
+    "el",
+    "en",
+    "es",
+    "fa",
+    "fi",
+    "fr",
+    "he",
+    "hu",
+    "it",
+    "ja",
+    "ko",
+    "nl",
+    "pl",
+    "pt",
+    "sr",
+    "sv",
+    "tr",
+    "uk",
+    "vi",
+    "zh",
+]
 VISUALCROSSING_BASE_URL = "https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/"

{pyVisualCrossing-0.1.15 → pyvisualcrossing-1.0.0}/pyVisualCrossing/data.py

@@ -29,8 +29,8 @@ class ForecastData:
         wind_speed: float,
         location_name: str,
         description: str,
-        forecast_daily: ForecastDailyData = None,
-        forecast_hourly: ForecastHourlyData = None,
+        forecast_daily: list[ForecastDailyData] | None = None,
+        forecast_hourly: list[ForecastHourlyData] | None = None,
     ) -> None:
         """Dataset constructor."""
         self._datetime = datetime
@@ -151,27 +151,27 @@ class ForecastData:
         return self._description
 
     @property
-    def update_time(self) -> datetime:
+    def update_time(self) -> str:
         """Last updated."""
         return datetime.now().isoformat()
 
     @property
-    def forecast_daily(self) -> ForecastDailyData:
+    def forecast_daily(self) -> list[ForecastDailyData] | None:
         """Forecast List."""
         return self._forecast_daily
 
     @forecast_daily.setter
-    def forecast_daily(self, new_forecast):
+    def forecast_daily(self, new_forecast: list[ForecastDailyData]) -> None:
         """Forecast daily new value."""
         self._forecast_daily = new_forecast
 
     @property
-    def forecast_hourly(self) -> ForecastHourlyData:
+    def forecast_hourly(self) -> list[ForecastHourlyData] | None:
         """Forecast List."""
         return self._forecast_hourly
 
     @forecast_hourly.setter
-    def forecast_hourly(self, new_forecast):
+    def forecast_hourly(self, new_forecast: list[ForecastHourlyData]) -> None:
         """Forecast hourly new value."""
         self._forecast_hourly = new_forecast
 

{pyVisualCrossing-0.1.15 → pyvisualcrossing-1.0.0}/pyVisualCrossing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyVisualCrossing
-Version: 0.1.15
+Version: 1.0.0
 Summary: Gets the weather data from Visual Crossing
 Home-page: https://github.com/briis/pyVisualCrossing
 Author: briis
@@ -12,6 +12,15 @@ Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 # Python Wrapper for Visual Crossing Weather API
 

{pyVisualCrossing-0.1.15 → pyvisualcrossing-1.0.0}/setup.py

@@ -7,7 +7,7 @@ with open("README.md") as fh:
 
 setuptools.setup(
     name="pyVisualCrossing",
-    version="0.1.15",
+    version="1.0.0",
     author="briis",
     author_email="bjarne@briis.com",
     description="Gets the weather data from Visual Crossing",