Merge pull request #263 from symphony-youri/prepare-2-2-1-release

Prepare 2.2.1 release

Author: symphony-youri

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "symphony_bdk_python"
-version = "2.2.0"
+version = "2.2.1"
 license = "Apache-2.0"
 description = "Symphony Bot Development Kit for Python"
 readme = "README.md"

symphony/bdk/core/retry/strategy.py

@@ -1,4 +1,5 @@
-from aiohttp import ClientConnectorError
+from aiohttp import ClientConnectionError
+from asyncio import TimeoutError
 from tenacity import RetryCallState
 
 from symphony.bdk.core.auth.exception import AuthUnauthorizedError
@@ -14,12 +15,12 @@ def is_client_error(exception: Exception) -> bool:
 
 
 def is_client_timeout_error(exception: Exception):
-    """Checks if the exception is a :py:class:`ClientConnectorError` with a :py:class:`TimeoutError` as cause
+    """Checks if the exception is a client timeout error
 
     :param exception: The exception to be checked
     :return: True if checks the predicate, False otherwise
     """
-    return isinstance(exception, ClientConnectorError) and isinstance(exception.__cause__, TimeoutError)
+    return isinstance(exception, ClientConnectionError) or isinstance(exception, TimeoutError)
 
 
 def can_authentication_be_retried(exception: Exception) -> bool:

tests/core/retry/strategy_test.py

@@ -1,6 +1,7 @@
 import asyncio
 from unittest.mock import Mock, AsyncMock
 
+import aiohttp
 import pytest
 from aiohttp import ClientConnectorError
 
@@ -108,15 +109,16 @@ async def test_should_retry():
     strategies = [TestAuthenticationStrategy(), TestRefreshSessionStrategy(), TestReadDatafeedStrategy()]
     connection_key = Mock()
     connection_key.ssl = "ssl"
-    exception_from_a_timeout = ClientConnectorError(connection_key, TimeoutError())
-    exception_from_a_timeout.__cause__ = TimeoutError()
-    thing = FixedChainedExceptions([ApiException(429), ApiException(500), exception_from_a_timeout])
+    exception_from_client = aiohttp.ClientConnectionError
+    exception_from_a_timeout = asyncio.TimeoutError()
+    thing = FixedChainedExceptions([ApiException(429), ApiException(500),
+                                    exception_from_client, exception_from_a_timeout])
 
     for s in strategies:
-        s._retry_config = minimal_retry_config_with_attempts(4)
+        s._retry_config = minimal_retry_config_with_attempts(5)
 
         value = await s._retryable_coroutine(thing)
 
         assert value is True
-        assert thing.call_count == 4
+        assert thing.call_count == 5
         thing.reset()  # Reset the counters