python-weather 1.1.2__tar.gz → 2.0.0__tar.gz

{python-weather-1.1.2/python_weather.egg-info → python-weather-2.0.0}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 1.1.2
+Version: 2.0.0
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT
-Project-URL: changes, https://python-weather.readthedocs.io/en/latest/changelog.html
-Project-URL: homepage, https://python-weather.readthedocs.io/en/latest/
-Project-URL: documentation, https://python-weather.readthedocs.io/en/latest/
-Project-URL: repository, https://github.com/null8626/python-weather
-Project-URL: download_url, https://github.com/null8626/python-weather/archive/1.1.2.tar.gz
+Project-URL: Changelog, https://python-weather.readthedocs.io/en/latest/changelog.html
+Project-URL: Homepage, https://python-weather.readthedocs.io/en/latest/
+Project-URL: Documentation, https://python-weather.readthedocs.io/en/latest/
+Project-URL: Repository, https://github.com/null8626/python-weather
 Keywords: weather,forecast,weather-api,weather-forecast
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: aiohttp
@@ -36,19 +35,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp==3.9.3
 
-# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![Build Status][ci-image]][ci-url] [![Documentation Build Status][doc-ci-image]][doc-ci-url] [![license][github-license-image]][github-license-url] [![BLAZINGLY FAST!!!][blazingly-fast-image]][blazingly-fast-url]
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url]
 
 [pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
 [pypi-url]: https://pypi.org/project/python-weather/
 [downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
-[ci-image]: https://github.com/null8626/python-weather/workflows/CI/badge.svg
-[ci-url]: https://github.com/null8626/python-weather/actions/workflows/CI.yml
-[doc-ci-image]: https://readthedocs.org/projects/python-weather/badge/?version=latest
-[doc-ci-url]: https://python-weather.readthedocs.io/en/latest/?badge=latest
-[github-license-image]: https://img.shields.io/github/license/null8626/python-weather?style=flat-square
-[github-license-url]: https://github.com/null8626/python-weather/blob/main/LICENSE
-[blazingly-fast-image]: https://img.shields.io/badge/speed-BLAZINGLY%20FAST!!!%20%F0%9F%94%A5%F0%9F%9A%80%F0%9F%92%AA%F0%9F%98%8E-brightgreen.svg?style=flat-square
-[blazingly-fast-url]: https://twitter.com/acdlite/status/974390255393505280
 
 A free and asynchronous weather Python API wrapper made in Python, for Python.
 
@@ -76,14 +67,14 @@ async def getweather():
     weather = await client.get('New York')
     
     # returns the current day's forecast temperature (int)
-    print(weather.current.temperature)
+    print(weather.temperature)
     
     # get the weather forecast for a few days
-    for forecast in weather.forecasts:
-      print(forecast)
+    for daily in weather.daily_forecasts:
+      print(daily)
       
       # hourly forecasts
-      for hourly in forecast.hourly:
+      for hourly in daily.hourly_forecasts:
         print(f' --> {hourly!r}')
 
 if __name__ == '__main__':

{python-weather-1.1.2 → python-weather-2.0.0}/README.md

@@ -1,16 +1,8 @@
-# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![Build Status][ci-image]][ci-url] [![Documentation Build Status][doc-ci-image]][doc-ci-url] [![license][github-license-image]][github-license-url] [![BLAZINGLY FAST!!!][blazingly-fast-image]][blazingly-fast-url]
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url]
 
 [pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
 [pypi-url]: https://pypi.org/project/python-weather/
 [downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
-[ci-image]: https://github.com/null8626/python-weather/workflows/CI/badge.svg
-[ci-url]: https://github.com/null8626/python-weather/actions/workflows/CI.yml
-[doc-ci-image]: https://readthedocs.org/projects/python-weather/badge/?version=latest
-[doc-ci-url]: https://python-weather.readthedocs.io/en/latest/?badge=latest
-[github-license-image]: https://img.shields.io/github/license/null8626/python-weather?style=flat-square
-[github-license-url]: https://github.com/null8626/python-weather/blob/main/LICENSE
-[blazingly-fast-image]: https://img.shields.io/badge/speed-BLAZINGLY%20FAST!!!%20%F0%9F%94%A5%F0%9F%9A%80%F0%9F%92%AA%F0%9F%98%8E-brightgreen.svg?style=flat-square
-[blazingly-fast-url]: https://twitter.com/acdlite/status/974390255393505280
 
 A free and asynchronous weather Python API wrapper made in Python, for Python.
 
@@ -38,14 +30,14 @@ async def getweather():
     weather = await client.get('New York')
     
     # returns the current day's forecast temperature (int)
-    print(weather.current.temperature)
+    print(weather.temperature)
     
     # get the weather forecast for a few days
-    for forecast in weather.forecasts:
-      print(forecast)
+    for daily in weather.daily_forecasts:
+      print(daily)
       
       # hourly forecasts
-      for hourly in forecast.hourly:
+      for hourly in daily.hourly_forecasts:
         print(f' --> {hourly!r}')
 
 if __name__ == '__main__':

{python-weather-1.1.2 → python-weather-2.0.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools"]
 
 [project]
 name = "python-weather"
-version = "1.1.2"
+version = "2.0.0"
 description = "A free and asynchronous weather API wrapper made in Python, for Python."
 readme = "README.md"
 license = { text = "MIT" }
@@ -36,8 +36,7 @@ classifiers = [
 requires-python = ">=3.8"
 
 [project.urls]
-changes = "https://python-weather.readthedocs.io/en/latest/changelog.html"
-homepage = "https://python-weather.readthedocs.io/en/latest/"
-documentation = "https://python-weather.readthedocs.io/en/latest/"
-repository = "https://github.com/null8626/python-weather"
-download_url = "https://github.com/null8626/python-weather/archive/1.1.2.tar.gz"
+Changelog = "https://python-weather.readthedocs.io/en/latest/changelog.html"
+Homepage = "https://python-weather.readthedocs.io/en/latest/"
+Documentation = "https://python-weather.readthedocs.io/en/latest/"
+Repository = "https://github.com/null8626/python-weather"

python-weather-2.0.0/python_weather/__init__.py

@@ -0,0 +1,14 @@
+"""
+python-weather
+"""
+
+from .enums import HeatIndex, Kind, Locale, Phase, UltraViolet, WindDirection
+from .constants import METRIC, IMPERIAL
+from .client import Client
+from .errors import Error
+
+__version__ = '2.0.0'
+__all__ = (
+  'METRIC', 'IMPERIAL', 'Client', 'Error', 'HeatIndex', 'Kind', 'Locale',
+  'Phase', 'UltraViolet', 'WindDirection'
+)

{python-weather-1.1.2 → python-weather-2.0.0}/python_weather/base.py

@@ -1,6 +1,6 @@
 from enum import auto, Enum
 
-from .enums import WindDirection, Kind, Locale, Ultraviolet
+from .enums import WindDirection, Kind, Locale, UltraViolet
 from .constants import _Unit
 
 class CustomizableBase:
@@ -60,10 +60,10 @@ class BaseForecast(CustomizableBase):
     super().__init__(unit, locale)
   
   @property
-  def ultraviolet(self) -> Ultraviolet:
-    """The UV (ultraviolet) index."""
+  def ultraviolet(self) -> UltraViolet:
+    """The ultra-violet (UV) index."""
     
-    return Ultraviolet._new(int(self.__inner['uvIndex']))
+    return UltraViolet._new(int(self.__inner['uvIndex']))
   
   @property
   def feels_like(self) -> int:
@@ -81,7 +81,7 @@ class BaseForecast(CustomizableBase):
   
   @property
   def temperature(self) -> int:
-    """The weather temperature in either Celcius or Fahrenheit."""
+    """The temperature in either Celcius or Fahrenheit."""
     
     return int(self.__inner[f'temp_{self._CustomizableBase__unit.temperature}'])
   
@@ -129,13 +129,12 @@ class BaseForecast(CustomizableBase):
   def description(self) -> str:
     """The description regarding the forecast. This can be localized in different languages depending on the localization used."""
     
-    return self.__inner['weatherDesc'][0][
-      'value'
-    ] if self._CustomizableBase__locale == Locale.ENGLISH else self.__inner[
-      f'lang_{self._CustomizableBase__locale.value}'][0]['value']
+    description = self.__inner['weatherDesc'][0]['value'] if self._CustomizableBase__locale == Locale.ENGLISH else self.__inner[f'lang_{self._CustomizableBase__locale.value}'][0]['value'] # yapf: disable
+    
+    return description.strip()
   
   @property
   def kind(self) -> Kind:
-    """The kind of the weather."""
+    """The kind of the forecast."""
     
     return Kind(int(self.__inner['weatherCode']))

{python-weather-1.1.2 → python-weather-2.0.0}/python_weather/client.py

@@ -6,7 +6,7 @@ from enum import auto
 
 from .constants import _Unit, METRIC
 from .base import CustomizableBase
-from .forecast import Weather
+from .forecast import Forecast
 from .errors import Error
 from .enums import Locale
 
@@ -16,7 +16,7 @@ class Client(CustomizableBase):
   
   :param unit: Whether to use the metric or imperial/customary system (``IMPERIAL``). Defaults to ``METRIC``.
   :type unit: Optional[:py:class:`enum.auto`]
-  :param locale: Whether to use a different locale/language as the description for the returned weather events. Defaults to ``Locale.ENGLISH``.
+  :param locale: Whether to use a different locale/language as the description for the returned forecast. Defaults to ``Locale.ENGLISH``.
   :type locale: Optional[Locale]
   :param session: Whether to use an existing aiohttp client session for requesting or not. Defaults to ``None`` (creates a new one instead)
   :type session: Optional[:class:`aiohttp.ClientSession`]
@@ -49,7 +49,7 @@ class Client(CustomizableBase):
     *,
     unit: Optional[auto] = None,
     locale: Optional[Locale] = None
-  ) -> Weather:
+  ) -> Forecast:
     """
     Fetches a weather forecast for a specific location.
     
@@ -63,7 +63,7 @@ class Client(CustomizableBase):
     :exception Error: If the aiohttp client session used by the :class:`Client` object is already closed, if the ``unit`` argument is not ``None`` and it's also not ``METRIC`` or ``IMPERIAL``, if the ``locale`` argument is not ``None`` and it's also not a part of the :class:`Locale` enum, or if the :class:`Client` cannot send a web request to the web server.
     
     :returns: The requested weather forecast.
-    :rtype: Weather
+    :rtype: Forecast
     """
     
     if (not isinstance(location, str)) or (not location):
@@ -89,7 +89,7 @@ class Client(CustomizableBase):
         f'https://{subdomain}wttr.in/{quote_plus(location)}?format=j1'
       ) as resp:
         try:
-          return Weather(await resp.json(), unit, locale)
+          return Forecast(await resp.json(), unit, locale)
         except Exception as e:
           if delay == 4:
             raise e  # okay, that's too much requests - just raise the error

{python-weather-1.1.2 → python-weather-2.0.0}/python_weather/constants.py

@@ -30,4 +30,5 @@ class _Unit:
 METRIC = _Unit('C', 'Kmph', '', 'MM', '', 1)
 IMPERIAL = _Unit('F', 'Miles', 'Inches', 'Inches', 'Miles', 2.54)
 
+WIND_DIRECTION_EMOJIS = ['↓', '↙', '←', '↖', '↑', '↗', '→', '↘']
 LATLON_REGEX = compile(r'^Lat (\-?[\d\.]+) and Lon (\-?[\d\.]+)$')

{python-weather-1.1.2 → python-weather-2.0.0}/python_weather/enums.py

@@ -1,6 +1,7 @@
 from enum import Enum, auto
 from typing import Union
 
+from .constants import WIND_DIRECTION_EMOJIS
 from .errors import Error
 
 class BasicEnum(Enum):
@@ -12,55 +13,22 @@ class BasicEnum(Enum):
   def __str__(self) -> str:
     return self.name.replace('_', ' ').title()
 
-class Ultraviolet(Enum):
-  """Represents UV (ultraviolet) index."""
-  
+class IndexedEnum(Enum):
   __slots__ = ('__index',)
   
-  LOW = 13
-  MODERATE = auto()
-  HIGH = auto()
-  VERY_HIGH = auto()
-  EXTREME = auto()
-  
-  def _new(index: int):
-    enum = Ultraviolet(index)
-    enum.__index = index
-    
-    return enum
-  
-  @classmethod
-  def _missing_(self, index: int):
-    if index <= 2:
-      return self.LOW
-    elif index <= 5:
-      return self.MODERATE
-    elif index <= 7:
-      return self.HIGH
-    elif index <= 10:
-      return self.VERY_HIGH
-    else:
-      return self.EXTREME
-  
-  def __repr__(self) -> str:
-    return f'<{self.__class__.__name__}.{self.name} index={self.__index}>'
-  
-  def __str__(self) -> str:
-    return self.name.replace('_', ' ').title()
-  
-  def __lt__(self, other: Union["Ultraviolet", int, float]) -> bool:
+  def __lt__(self, other: Union["Self", int, float]) -> bool:
     if isinstance(other, self.__class__):
       return self.__index < other.index
     else:
       return self.__index < other
   
-  def __eq__(self, other: Union["Ultraviolet", int, float]) -> bool:
+  def __eq__(self, other: Union["Self", int, float]) -> bool:
     if isinstance(other, self.__class__):
       return self.__index == other.index
     else:
       return self.__index == other
   
-  def __gt__(self, other: Union["Ultraviolet", int, float]) -> bool:
+  def __gt__(self, other: Union["Self", int, float]) -> bool:
     if isinstance(other, self.__class__):
       return self.__index > other.index
     else:
@@ -74,11 +42,68 @@ class Ultraviolet(Enum):
   
   @property
   def index(self) -> int:
-    """The ultraviolet index."""
+    """The index value."""
     
     return self.__index
+  
+  @index.setter
+  def index(self, new_index: int) -> int:
+    self.__index = new_index
+
+class HeatIndex(IndexedEnum):
+  """Represents a heat index."""
+  
+  CAUTION = None
+  EXTREME_CAUTION = None
+  DANGER = None
+  EXTREME_DANGER = None
+  
+  def _new(celcius_index: int, true_index: int):
+    enum = HeatIndex(celcius_index)
+    enum.index = true_index
+    
+    return enum
+  
+  @classmethod
+  def _missing_(self, celcius_index: int):
+    if celcius_index <= 32:
+      return self.CAUTION
+    elif celcius_index <= 39:
+      return self.EXTREME_CAUTION
+    elif celcius_index <= 51:
+      return self.DANGER
+    else:
+      return self.EXTREME_DANGER
+
+class UltraViolet(BasicEnum, IndexedEnum):
+  """Represents ultra-violet (UV) index."""
+  
+  LOW = None
+  MODERATE = None
+  HIGH = None
+  VERY_HIGH = None
+  EXTREME = None
+  
+  def _new(index: int):
+    enum = UltraViolet(index)
+    enum.index = index
+    
+    return enum
+  
+  @classmethod
+  def _missing_(self, index: int):
+    if index <= 2:
+      return self.LOW
+    elif index <= 5:
+      return self.MODERATE
+    elif index <= 7:
+      return self.HIGH
+    elif index <= 10:
+      return self.VERY_HIGH
+    else:
+      return self.EXTREME
 
-class WindDirection(Enum):
+class WindDirection(BasicEnum):
   """Represents a wind direction."""
   
   __slots__ = ('__degrees',)
@@ -106,12 +131,6 @@ class WindDirection(Enum):
     
     return enum
   
-  def __repr__(self) -> str:
-    return f'<{self.__class__.__name__}.{self.name} degrees={self.__degrees!r}>'
-  
-  def __str__(self) -> str:
-    return self.name.replace('_', ' ').title()
-  
   def __contains__(self, other: Union["WindDirection", float, int]) -> bool:
     if isinstance(other, self.__class__):
       other = other.degrees
@@ -149,11 +168,20 @@ class WindDirection(Enum):
     else:
       return 326.25 < other <= 348.75
   
+  def __float__(self) -> float:
+    return self.__degrees
+  
   @property
   def degrees(self) -> int:
     """The wind direction's value in degrees."""
     
     return self.__degrees
+  
+  @property
+  def emoji(self) -> str:
+    """The emoji representing this enum."""
+    
+    return WIND_DIRECTION_EMOJIS[int(((self.__degrees + 22.5) % 360) / 45.0)]
 
 class Locale(Enum):
   """Represents the list of supported locales/languages by this library."""

{python-weather-1.1.2 → python-weather-2.0.0}/python_weather/forecast.py

@@ -1,133 +1,10 @@
-import warnings
 from typing import Iterable, Optional, Tuple
 from datetime import datetime, date, time
 from enum import auto
 
 from .base import BaseForecast, CustomizableBase
+from .enums import Phase, Locale, HeatIndex
 from .constants import _Unit, LATLON_REGEX
-from .enums import Phase, Locale
-
-class Area:
-  """Represents the location of the weather forecast."""
-  
-  __slots__ = ('__inner',)
-  
-  def __init__(self, json: dict):
-    self.__inner = json
-  
-  def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} name={self.name!r} country={self.country!r} region={self.region!r}>'
-  
-  @property
-  def latitude(self) -> float:
-    """The latitude."""
-    
-    return float(self.__inner['latitude'])
-  
-  @property
-  def longitude(self) -> float:
-    """The longitude."""
-    
-    return float(self.__inner['longitude'])
-  
-  @property
-  def population(self) -> int:
-    """The location's population count."""
-    
-    return int(self.__inner['population'])
-  
-  @property
-  def region(self) -> str:
-    """The location's region name."""
-    
-    return self.__inner['region'][0]['value']
-  
-  @property
-  def name(self) -> str:
-    """The location's name."""
-    
-    return self.__inner['areaName'][0]['value']
-  
-  @property
-  def country(self) -> str:
-    """The location's country name."""
-    
-    return self.__inner['country'][0]['value']
-
-class Astronomy:
-  """Represents the astronomical information of said weather forecast."""
-  
-  __slots__ = ('__inner',)
-  
-  def __init__(self, json: dict):
-    self.__inner = json
-  
-  def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} moon_phase="{self.moon_phase!r}" sun_rise={self.sun_rise!r} sun_set={self.sun_set!r}>'
-  
-  @property
-  def moon_illumination(self) -> int:
-    """The percentage of the moon illuminated."""
-    
-    return int(self.__inner['moon_illumination'])
-  
-  @property
-  def moon_phase(self) -> Phase:
-    """The moon's phase."""
-    
-    return Phase(self.__inner['moon_phase'])
-  
-  @property
-  def moon_rise(self) -> Optional[time]:
-    """The local time when the moon rises. This can be ``None``."""
-    
-    try:
-      return datetime.strptime(self.__inner['moonrise'], '%I:%M %p').time()
-    except ValueError:
-      ...
-  
-  @property
-  def moon_set(self) -> time:
-    """The local time when the moon sets. This can be ``None``."""
-    
-    try:
-      return datetime.strptime(self.__inner['moonset'], '%I:%M %p').time()
-    except ValueError:
-      ...
-  
-  @property
-  def sun_rise(self) -> Optional[time]:
-    """The local time when the sun rises. This can be ``None``."""
-    
-    try:
-      return datetime.strptime(self.__inner['sunrise'], '%I:%M %p').time()
-    except ValueError:
-      ...
-  
-  @property
-  def sun_set(self) -> Optional[time]:
-    """The local time when the sun sets. This can be ``None``."""
-    
-    try:
-      return datetime.strptime(self.__inner['sunset'], '%I:%M %p').time()
-    except ValueError:
-      ...
-
-class CurrentForecast(BaseForecast):
-  """Represents a weather forecast of the current day."""
-  
-  __slots__ = ()
-  
-  def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} temperature={self.temperature!r} description={self.description!r} kind="{self.kind!r}">'
-  
-  @property
-  def date(self) -> datetime:
-    """The local date of this weather forecast."""
-    
-    return datetime.strptime(
-      self._BaseForecast__inner['localObsDateTime'], '%Y-%m-%d %I:%M %p'
-    )
 
 class HourlyForecast(BaseForecast):
   """Represents a weather forecast of a specific hour."""
@@ -155,11 +32,14 @@ class HourlyForecast(BaseForecast):
     ) # yapf: disable
   
   @property
-  def heat_index(self) -> int:
+  def heat_index(self) -> HeatIndex:
     """The heat index in either Celcius or Fahrenheit."""
     
-    return int(
-      self._BaseForecast__inner[f'HeatIndex{self._CustomizableBase__unit.temperature}']
+    celcius_index = int(self._BaseForecast__inner['HeatIndexC'])
+    
+    return HeatIndex._new(
+      celcius_index,
+      int(self._BaseForecast__inner[f'HeatIndex{self._CustomizableBase__unit.temperature}'])
     ) # yapf: disable
   
   @property
@@ -190,7 +70,7 @@ class HourlyForecast(BaseForecast):
     return int(self._BaseForecast__inner['chanceoffrost'])
   
   @property
-  def chances_of_hightemp(self) -> int:
+  def chances_of_high_temperature(self) -> int:
     """Chances of a high temperature in percent."""
     
     return int(self._BaseForecast__inner['chanceofhightemp'])
@@ -213,16 +93,6 @@ class HourlyForecast(BaseForecast):
     
     return int(self._BaseForecast__inner['chanceofremdry'])
   
-  @property
-  def chances_of_remdry(self) -> int:
-    """Deprecated, use chances_of_remaining_dry instead."""
-    
-    warnings.warn(
-      'Deprecated as of v1.1.2. Use `chances_of_remaining_dry` instead.',
-      DeprecationWarning
-    )
-    return self.chances_of_remaining_dry
-  
   @property
   def chances_of_snow(self) -> int:
     """Chances of a snow in percent."""
@@ -260,21 +130,64 @@ class HourlyForecast(BaseForecast):
     return time() if len(self._BaseForecast__inner['time']) < 3 else datetime.strptime(self._BaseForecast__inner['time'], '%H%M').time() # yapf: disable
 
 class DailyForecast(CustomizableBase):
-  __slots__ = ('__inner',)
+  __slots__ = ('__inner', '__astronomy')
   
   def __init__(self, json: dict, unit: _Unit, locale: Locale):
+    self.__astronomy = json.pop('astronomy')[0]
     self.__inner = json
     
     super().__init__(unit, locale)
   
   def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} date={self.date!r} astronomy={self.astronomy!r} temperature={self.temperature!r}>'
+    return f'<{self.__class__.__name__} date={self.date!r} temperature={self.temperature!r}>'
+  
+  @property
+  def moon_illumination(self) -> int:
+    """The percentage of the moon illuminated."""
+    
+    return int(self.__astronomy['moon_illumination'])
+  
+  @property
+  def moon_phase(self) -> Phase:
+    """The moon's phase."""
+    
+    return Phase(self.__astronomy['moon_phase'])
+  
+  @property
+  def moonrise(self) -> Optional[time]:
+    """The local time when the moon rises. This can be ``None``."""
+    
+    try:
+      return datetime.strptime(self.__astronomy['moonrise'], '%I:%M %p').time()
+    except ValueError:
+      ...
+  
+  @property
+  def moonset(self) -> Optional[time]:
+    """The local time when the moon sets. This can be ``None``."""
+    
+    try:
+      return datetime.strptime(self.__astronomy['moonset'], '%I:%M %p').time()
+    except ValueError:
+      ...
+  
+  @property
+  def sunrise(self) -> Optional[time]:
+    """The local time when the sun rises. This can be ``None``."""
+    
+    try:
+      return datetime.strptime(self.__astronomy['sunrise'], '%I:%M %p').time()
+    except ValueError:
+      ...
   
   @property
-  def astronomy(self) -> Astronomy:
-    """The astronomical information of said weather forecast."""
+  def sunset(self) -> Optional[time]:
+    """The local time when the sun sets. This can be ``None``."""
     
-    return Astronomy(self.__inner['astronomy'][0])
+    try:
+      return datetime.strptime(self.__astronomy['sunset'], '%I:%M %p').time()
+    except ValueError:
+      ...
   
   @property
   def date(self) -> date:
@@ -321,7 +234,7 @@ class DailyForecast(CustomizableBase):
     ) / self._CustomizableBase__unit.cm_divisor
   
   @property
-  def hourly(self) -> Iterable[HourlyForecast]:
+  def hourly_forecasts(self) -> Iterable[HourlyForecast]:
     """The hourly forecasts of this day."""
     
     return (
@@ -330,37 +243,56 @@ class DailyForecast(CustomizableBase):
       ) for elem in self.__inner['hourly']
     )
 
-class Weather(CustomizableBase):
-  """Represents an entire weather forecast."""
+class Forecast(BaseForecast):
+  """Represents today's weather forecast, alongside daily and hourly weather forecasts."""
   
-  __slots__ = ('__inner',)
+  __slots__ = ('__inner', '__nearest')
   
   def __init__(self, json: dict, unit: _Unit, locale: Locale):
+    current = json['current_condition'][0]
+    self.__nearest = json.pop('nearest_area')[0]
     self.__inner = json
     
-    super().__init__(unit, locale)
+    super().__init__(current, unit, locale)
   
   def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} current={self.current!r} location={self.location!r}>'
+    return f'<{self.__class__.__name__} location={self.location!r} datetime={self.datetime!r} temperature={self.temperature!r}>'
   
   @property
-  def current(self) -> CurrentForecast:
-    """The forecast of the current day."""
+  def local_population(self) -> int:
+    """The local population count."""
     
-    return CurrentForecast(
-      self.__inner['current_condition'][0], self._CustomizableBase__unit,
-      self._CustomizableBase__locale
-    )
+    return int(self.__nearest['population'])
   
   @property
-  def nearest_area(self) -> Area:
-    """The information of the nearest area of the current weather forecast."""
+  def region(self) -> str:
+    """The local region's name."""
     
-    return Area(self.__inner['nearest_area'][0])
+    return self.__nearest['region'][0]['value']
   
   @property
-  def forecasts(self) -> Iterable[DailyForecast]:
-    """Daily forecasts of the current weather forecast."""
+  def location(self) -> str:
+    """The location's name."""
+    
+    return self.__nearest['areaName'][0]['value']
+  
+  @property
+  def country(self) -> str:
+    """The local country's name."""
+    
+    return self.__nearest['country'][0]['value']
+  
+  @property
+  def datetime(self) -> datetime:
+    """The local date and time of this weather forecast."""
+    
+    return datetime.strptime(
+      self._BaseForecast__inner['localObsDateTime'], '%Y-%m-%d %I:%M %p'
+    )
+  
+  @property
+  def daily_forecasts(self) -> Iterable[DailyForecast]:
+    """Daily weather forecasts in this location."""
     
     return (
       DailyForecast(
@@ -369,8 +301,8 @@ class Weather(CustomizableBase):
     )
   
   @property
-  def location(self) -> Optional[Tuple[float, float]]:
-    """A tuple of both latitude and longitude. This can be ``None``."""
+  def coordinates(self) -> Tuple[float, float]:
+    """A tuple of this forecast's latitude and longitude."""
     
     try:
       for req in filter(
@@ -380,4 +312,4 @@ class Weather(CustomizableBase):
         
         return float(lat), float(lon)
     except:
-      ...
+      return float(self.__nearest['latitude']), float(self.__nearest['longitude']) # yapf: disable

{python-weather-1.1.2 → python-weather-2.0.0/python_weather.egg-info}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 1.1.2
+Version: 2.0.0
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT
-Project-URL: changes, https://python-weather.readthedocs.io/en/latest/changelog.html
-Project-URL: homepage, https://python-weather.readthedocs.io/en/latest/
-Project-URL: documentation, https://python-weather.readthedocs.io/en/latest/
-Project-URL: repository, https://github.com/null8626/python-weather
-Project-URL: download_url, https://github.com/null8626/python-weather/archive/1.1.2.tar.gz
+Project-URL: Changelog, https://python-weather.readthedocs.io/en/latest/changelog.html
+Project-URL: Homepage, https://python-weather.readthedocs.io/en/latest/
+Project-URL: Documentation, https://python-weather.readthedocs.io/en/latest/
+Project-URL: Repository, https://github.com/null8626/python-weather
 Keywords: weather,forecast,weather-api,weather-forecast
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: aiohttp
@@ -36,19 +35,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp==3.9.3
 
-# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![Build Status][ci-image]][ci-url] [![Documentation Build Status][doc-ci-image]][doc-ci-url] [![license][github-license-image]][github-license-url] [![BLAZINGLY FAST!!!][blazingly-fast-image]][blazingly-fast-url]
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url]
 
 [pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
 [pypi-url]: https://pypi.org/project/python-weather/
 [downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
-[ci-image]: https://github.com/null8626/python-weather/workflows/CI/badge.svg
-[ci-url]: https://github.com/null8626/python-weather/actions/workflows/CI.yml
-[doc-ci-image]: https://readthedocs.org/projects/python-weather/badge/?version=latest
-[doc-ci-url]: https://python-weather.readthedocs.io/en/latest/?badge=latest
-[github-license-image]: https://img.shields.io/github/license/null8626/python-weather?style=flat-square
-[github-license-url]: https://github.com/null8626/python-weather/blob/main/LICENSE
-[blazingly-fast-image]: https://img.shields.io/badge/speed-BLAZINGLY%20FAST!!!%20%F0%9F%94%A5%F0%9F%9A%80%F0%9F%92%AA%F0%9F%98%8E-brightgreen.svg?style=flat-square
-[blazingly-fast-url]: https://twitter.com/acdlite/status/974390255393505280
 
 A free and asynchronous weather Python API wrapper made in Python, for Python.
 
@@ -76,14 +67,14 @@ async def getweather():
     weather = await client.get('New York')
     
     # returns the current day's forecast temperature (int)
-    print(weather.current.temperature)
+    print(weather.temperature)
     
     # get the weather forecast for a few days
-    for forecast in weather.forecasts:
-      print(forecast)
+    for daily in weather.daily_forecasts:
+      print(daily)
       
       # hourly forecasts
-      for hourly in forecast.hourly:
+      for hourly in daily.hourly_forecasts:
         print(f' --> {hourly!r}')
 
 if __name__ == '__main__':

python-weather-1.1.2/python_weather/__init__.py

@@ -1,14 +0,0 @@
-"""
-python-weather
-"""
-
-from .enums import Kind, Locale, Phase, Ultraviolet, WindDirection
-from .constants import METRIC, IMPERIAL
-from .client import Client
-from .errors import Error
-
-__version__ = '1.0.3'
-__all__ = (
-  'METRIC', 'IMPERIAL', 'Client', 'Error', 'Kind', 'Locale', 'Phase',
-  'Ultraviolet', 'WindDirection'
-)