Merge pull request #1203 from Sage-Bionetworks/SYNPY-1581-async-exception-handling

remove try: except: blocks that log and raise exceptions in async wrappers

Author: SageGJ

synapseclient/core/async_utils.py

@@ -80,23 +80,17 @@ def f(*args, **kwds):
 def wrap_async_to_sync(coroutine: Coroutine[Any, Any, Any], syn: "Synapse") -> Any:
     """Wrap an async function to be called in a sync context."""
     loop = None
+
     try:
-        try:
-            loop = asyncio.get_running_loop()
-        except RuntimeError:
-            pass
-
-        if loop:
-            nest_asyncio.apply(loop=loop)
-            return loop.run_until_complete(coroutine)
-        else:
-            return asyncio.run(coroutine)
-
-    except Exception as ex:
-        syn.logger.exception(
-            f"Error occurred while running {coroutine} in a sync context."
-        )
-        raise ex
+        loop = asyncio.get_running_loop()
+    except RuntimeError:
+        pass
+
+    if loop:
+        nest_asyncio.apply(loop=loop)
+        return loop.run_until_complete(coroutine)
+    else:
+        return asyncio.run(coroutine)
 
 
 # Adapted from
@@ -122,28 +116,17 @@ async def wrapper(*args, **kwargs):
                 return await getattr(self, async_method_name)(*args, **kwargs)
 
             loop = None
+
             try:
-                try:
-                    loop = asyncio.get_running_loop()
-                except RuntimeError:
-                    pass
-
-                if loop:
-                    nest_asyncio.apply(loop=loop)
-                    return loop.run_until_complete(wrapper(*args, **kwargs))
-                else:
-                    return asyncio.run(wrapper(*args, **kwargs))
-
-            except Exception as ex:
-                from synapseclient import Synapse
-
-                synapse_client = Synapse.get_client(
-                    getattr(kwargs, "synapse_client", None)
-                )
-                synapse_client.logger.exception(
-                    f"Error occurred while running {async_method_name} on {self.__class__}."
-                )
-                raise ex
+                loop = asyncio.get_running_loop()
+            except RuntimeError:
+                pass
+
+            if loop:
+                nest_asyncio.apply(loop=loop)
+                return loop.run_until_complete(wrapper(*args, **kwargs))
+            else:
+                return asyncio.run(wrapper(*args, **kwargs))
 
         return newmethod