python-weather 2.0.5__tar.gz → 2.0.7__tar.gz

{python_weather-2.0.5/python_weather.egg-info → python_weather-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 2.0.5
+Version: 2.0.7
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT

{python_weather-2.0.5 → python_weather-2.0.7}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools"]
 
 [project]
 name = "python-weather"
-version = "2.0.5"
+version = "2.0.7"
 description = "A free and asynchronous weather API wrapper made in Python, for Python."
 readme = "README.md"
 license = { text = "MIT" }

{python_weather-2.0.5 → python_weather-2.0.7}/python_weather/__init__.py

@@ -31,7 +31,7 @@ __title__ = 'python-weather'
 __author__ = 'null8626'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2021-2024 null8626'
-__version__ = '2.0.5'
+__version__ = '2.0.7'
 __all__ = (
   'METRIC',
   'IMPERIAL',

{python_weather-2.0.5 → python_weather-2.0.7}/python_weather/base.py

@@ -22,7 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
-from enum import auto
 from typing import Tuple
 
 from .errors import Error
@@ -38,7 +37,7 @@ class CustomizableBase:
     self.locale = locale
 
   @property
-  def unit(self) -> auto:
+  def unit(self) -> _Unit:
     """The measuring unit used to display information in this object."""
 
     return self.__unit
@@ -68,9 +67,9 @@ class CustomizableBase:
     """
     Sets the default localization used to display information in this object.
 
-    :param to: The new :class:`Locale` to be used to display information in this object.
+    :param to: The new :class:`~python_weather.enums.Locale` to be used to display information in this object.
     :type to: Locale
-    :exception Error: If the ``to`` argument is not a part of the :class:`Locale` enum.
+    :exception Error: If the ``to`` argument is not a part of the :class:`~python_weather.enums.Locale` enum.
     """
 
     if not isinstance(to, Locale):

{python_weather-2.0.5 → python_weather-2.0.7}/python_weather/client.py

@@ -26,7 +26,6 @@ from aiohttp import ClientSession, ClientTimeout, TCPConnector
 from urllib.parse import quote_plus
 from typing import Optional, Tuple
 from asyncio import sleep
-from enum import auto
 
 from .errors import Error, RequestError
 from .constants import _Unit, METRIC
@@ -40,23 +39,26 @@ class Client(CustomizableBase):
   The class that lets you interact with the API.
 
   :param unit: Whether to use the metric or imperial/customary system (``IMPERIAL``). Defaults to ``METRIC``.
-  :type unit: Optional[:py:class:`enum.auto`]
+  :type unit: _Unit
   :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`]
+  :type locale: 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`]
+  :param max_retries: Maximum amount of retries upon receiving HTTP request failure before raising a :class:`~python_weather.errors.RequestError`. To have infinite retries, use ``-1`` (NOT recommended). Defaults to ``None`` (or 3 retries).
+  :type max_retries: Optional[:class:`int`]
 
-  :raises Error: If ``unit`` is not ``METRIC`` or ``IMPERIAL``, or if ``locale`` is not ``None`` and not a part of the :class:`Locale` enum.
+  :raises Error: If ``unit`` is not ``METRIC`` or ``IMPERIAL``, or if ``locale`` is not ``None`` and not a part of the :class:`~python_weather.enums.Locale` enum.
   """
 
-  __slots__: Tuple[str, ...] = ('__own_session', '__session')
+  __slots__: Tuple[str, ...] = ('__own_session', '__session', '__max_retries')
 
   def __init__(
     self,
     *,
-    unit: Optional[auto] = METRIC,
-    locale: Optional[Locale] = Locale.ENGLISH,
+    unit: _Unit = METRIC,
+    locale: Locale = Locale.ENGLISH,
     session: Optional[ClientSession] = None,
+    max_retries: Optional[int] = None,
   ):
     super().__init__(unit, locale)
 
@@ -65,6 +67,7 @@ class Client(CustomizableBase):
       timeout=ClientTimeout(total=5000.0),
       connector=TCPConnector(verify_ssl=False),
     )
+    self.__max_retries = max_retries or 3
 
   def __repr__(self) -> str:
     return f'<{__class__.__name__} {self.__session!r}>'
@@ -73,7 +76,7 @@ class Client(CustomizableBase):
     self,
     location: str,
     *,
-    unit: Optional[auto] = None,
+    unit: Optional[_Unit] = None,
     locale: Optional[Locale] = None,
   ) -> Forecast:
     """
@@ -82,11 +85,12 @@ class Client(CustomizableBase):
     :param location: The requested location name for said weather forecast.
     :type location: str
     :param unit: Overrides the unit used by this object. Defaults to the one used by this object.
-    :type unit: Optional[:py:class:`enum.auto`]
+    :type unit: Optional[``_Unit``]
     :param locale: Overrides the locale used by this object. Defaults to the one used by this object.
-    :type locale: Optional[Locale]
+    :type locale: Optional[:class:`~python_weather.enums.Locale`]
 
-    :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.
+    :exception Error: If the aiohttp client session used by the :class:`~python_weather.client.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:`~python_weather.enums.Locale` enum.
+    :exception RequestError: If the :class:`~python_weather.client.Client` can't send a web request to the web server.
 
     :returns: The requested weather forecast.
     :rtype: Forecast
@@ -105,6 +109,7 @@ class Client(CustomizableBase):
 
     subdomain = f'{locale.value}.' if locale != Locale.ENGLISH else ''
     delay = 0.5
+    attempts = 0
 
     while True:
       try:
@@ -115,14 +120,15 @@ class Client(CustomizableBase):
 
           return Forecast(await resp.json(), unit, locale)
       except Exception as err:
-        if delay == 4:
+        if attempts == self.__max_retries:
           raise RequestError(err)
 
         await sleep(delay)
+        attempts += 1
         delay *= 2
 
   async def close(self) -> None:
-    """Closes the :class:`Client` object. Nothing will happen if the client uses a pre-existing :class:`aiohttp.ClientSession` or if the session is already closed."""
+    """Closes the :class:`~python_weather.client.Client` object. Nothing will happen if the client uses a pre-existing :class:`~aiohttp.ClientSession` or if the session is already closed."""
 
     if self.__own_session and not self.__session.closed:
       await self.__session.close()
@@ -130,5 +136,5 @@ class Client(CustomizableBase):
   async def __aenter__(self) -> 'Client':
     return self
 
-  async def __aexit__(self, *_, **__):
+  async def __aexit__(self, *_, **__) -> None:
     await self.close()

{python_weather-2.0.5 → python_weather-2.0.7}/python_weather/enums.py

@@ -186,14 +186,17 @@ class WindDirection(BasicEnum):
     else:
       return 326.25 < other <= 348.75
 
+  def __int__(self) -> int:
+    return int(self.degrees)
+
   def __float__(self) -> float:
-    return self.__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)]
+    return WIND_DIRECTION_EMOJIS[int(((self.degrees + 22.5) % 360) / 45.0)]
 
 
 class Locale(Enum):
@@ -308,38 +311,29 @@ class Kind(BasicEnum):
 
   @classmethod
   def _missing_(self, value: int) -> 'Kind':
-    if value == 248 or value == 260:
+    if value in (248, 260):
       return self.FOG
-    elif value == 263 or value == 353:
+    elif value in (263, 353):
       return self.LIGHT_SHOWERS
-    elif value == 362 or value == 365 or value == 374:
+    elif value in (362, 365, 374):
       return self.LIGHT_SLEET_SHOWERS
-    elif (
-      value == 185
-      or value == 281
-      or value == 284
-      or value == 311
-      or value == 314
-      or value == 317
-      or value == 350
-      or value == 377
-    ):
+    elif value in (185, 281, 284, 311, 314, 317, 350, 377):
       return self.LIGHT_SLEET
     elif value == 386:
       return self.THUNDERY_SHOWERS
     elif value == 320:
       return self.LIGHT_SNOW
-    elif value == 329 or value == 332 or value == 338:
+    elif value in (329, 332, 338):
       return self.HEAVY_SNOW
-    elif value == 293 or value == 296:
+    elif value in (293, 296):
       return self.LIGHT_RAIN
-    elif value == 305 or value == 356:
+    elif value in (305, 356):
       return self.HEAVY_SHOWERS
-    elif value == 308 or value == 359:
+    elif value in (308, 359):
       return self.HEAVY_RAIN
-    elif value == 326 or value == 368:
+    elif value in (326, 368):
       return self.LIGHT_SNOW_SHOWERS
-    elif value == 371 or value == 395:
+    elif value in (371, 395):
       return self.HEAVY_SNOW_SHOWERS
 
   @property

{python_weather-2.0.5 → python_weather-2.0.7}/python_weather/errors.py

@@ -32,12 +32,12 @@ class Error(Exception):
 
 
 class RequestError(Error):
-  """Thrown upon HTTP request failure. Extends :class:`Error`."""
+  """Thrown upon HTTP request failure. Extends :class:`~python_weather.errors.Error`."""
 
   __slots__: Tuple[str, ...] = ('source',)
 
   source: Exception
-  """The :class:`Exception` instance causing this exception."""
+  """The :py:class:`Exception` instance causing this exception."""
 
   def __init__(self, source: Exception):
     self.source = source

{python_weather-2.0.5 → python_weather-2.0.7/python_weather.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 2.0.5
+Version: 2.0.7
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT