Py310 fix (#6)

* Revert "add activity loop retry"

This reverts commit 6e3112a.

* added asyncio.CancelledError to retry exception handling

* sepereated CancelledError from normal Exception in retry decorator

* minor syntax update

* catch gaierror exception as well

Co-authored-by: Osama Maharmeh <[email protected]>

temporal/activity_loop.py

@@ -9,7 +9,7 @@
 from temporal.activity import ActivityContext, ActivityTask, complete_exceptionally, complete
 from temporal.api.taskqueue.v1 import TaskQueue, TaskQueueMetadata
 from temporal.converter import get_fn_args_type_hints
-from temporal.retry import RetryException, retry
+from temporal.retry import retry
 from temporal.service_helpers import get_identity
 from temporal.worker import Worker, StopRequestedException
 from temporal.api.workflowservice.v1 import WorkflowServiceStub as WorkflowService, PollActivityTaskQueueRequest, \
@@ -93,4 +93,3 @@ async def activity_task_loop_func(worker: Worker):
     finally:
         worker.notify_thread_stopped()
         logger.info("Activity loop ended")
-        raise RetryException('sleep')

temporal/retry.py

@@ -1,14 +1,13 @@
 import asyncio
 import calendar
+from socket import gaierror
 import time
 
 INITIAL_DELAY_SECONDS = 3
 BACK_OFF_MULTIPLIER = 2
 MAX_DELAY_SECONDS = 5 * 60
 RESET_DELAY_AFTER_SECONDS = 10 * 60
 
-class RetryException(Exception):
-    pass
 
 def retry(logger=None):
     def wrapper(fp):
@@ -19,8 +18,8 @@ async def retry_loop(*args, **kwargs):
                     await fp(*args, **kwargs)
                     logger.debug("@retry decorated function %s exited, ending retry loop", fp.__name__)
                     break
-                except RetryException:
-                    logger.info('sleeping...')
+                except (asyncio.CancelledError, gaierror) as err:
+                    logger.info(f"{fp.__name__} raised {err}, retrying...")
                     await asyncio.sleep(INITIAL_DELAY_SECONDS)
                 except Exception as ex:
                     now = calendar.timegm(time.gmtime())