New ensure_async util function

Author: Archmonger

src/reactpy_django/forms/components.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import asyncio
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, Union, cast
 from uuid import uuid4
@@ -20,6 +19,7 @@
 )
 from reactpy_django.forms.utils import convert_boolean_fields, convert_multiple_choice_fields
 from reactpy_django.types import AsyncFormEvent, FormEventData, SyncFormEvent
+from reactpy_django.utils import ensure_async
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -80,15 +80,9 @@ async def render_form():
             await database_sync_to_async(initialized_form.full_clean)()
             success = not initialized_form.errors.as_data()
             if success and on_success:
-                if asyncio.iscoroutinefunction(on_success):
-                    await on_success(form_event)
-                else:
-                    on_success(form_event)
+                await ensure_async(on_success)(form_event)
             if not success and on_error:
-                if asyncio.iscoroutinefunction(on_error):
-                    await on_error(form_event)
-                else:
-                    on_error(form_event)
+                await ensure_async(on_error)(form_event)
             if success and auto_save and isinstance(initialized_form, ModelForm):
                 await database_sync_to_async(initialized_form.save)()
                 set_submitted_data(None)
@@ -109,21 +103,15 @@ async def on_submit_callback(new_data: dict[str, Any]):
             new_form_event = FormEventData(
                 form=initialized_form, submitted_data=new_data, set_submitted_data=set_submitted_data
             )
-            if asyncio.iscoroutinefunction(on_receive_data):
-                await on_receive_data(new_form_event)
-            else:
-                on_receive_data(new_form_event)
+            await ensure_async(on_receive_data)(new_form_event)
 
         if submitted_data != new_data:
             set_submitted_data(new_data)
 
     async def _on_change(_event):
         """Event that exist solely to allow the user to detect form changes."""
         if on_change:
-            if asyncio.iscoroutinefunction(on_change):
-                await on_change(form_event)
-            else:
-                on_change(form_event)
+            await ensure_async(on_change)(form_event)
 
     if not rendered_form:
         return None

src/reactpy_django/utils.py

@@ -13,7 +13,7 @@
 from fnmatch import fnmatch
 from importlib import import_module
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any, Awaitable, Callable
 from uuid import UUID, uuid4
 
 import dill
@@ -549,3 +549,20 @@ async def __aiter__(self):
         finally:
             if file_opened:
                 file_handle.close()
+
+
+def ensure_async(
+    func: Callable[FuncParams, Inferred], *, thread_sensitive: bool = True
+) -> Callable[FuncParams, Awaitable[Inferred]]:
+    """Ensure the provided function is always an async coroutine. If the provided function is
+    not async, it will be adapted."""
+
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        return (
+            func(*args, **kwargs)
+            if inspect.iscoroutinefunction(func)
+            else database_sync_to_async(func, thread_sensitive=thread_sensitive)(*args, **kwargs)
+        )
+
+    return wrapper