Merge branch 'dev' into make-targetable-tooltip-interactive

Author: T4rk1n

dash/_callback.py

@@ -1,11 +1,10 @@
 import collections
 import hashlib
+import inspect
 from functools import wraps
 
 from typing import Callable, Optional, Any, List, Tuple, Union, Dict
 
-
-import asyncio
 import flask
 
 from .dependencies import (
@@ -49,7 +48,7 @@ async def _async_invoke_callback(
     func, *args, **kwargs
 ):  # used to mark the frame for the debugger
     # Check if the function is a coroutine function
-    if asyncio.iscoroutinefunction(func):
+    if inspect.iscoroutinefunction(func):
         return await func(*args, **kwargs)  # %% callback invoked %%
     # If the function is not a coroutine, call it directly
     return func(*args, **kwargs)  # %% callback invoked %%
@@ -814,7 +813,7 @@ async def async_add_context(*args, **kwargs):
 
             return jsonResponse
 
-        if asyncio.iscoroutinefunction(func):
+        if inspect.iscoroutinefunction(func):
             callback_map[callback_id]["callback"] = async_add_context
         else:
             callback_map[callback_id]["callback"] = add_context

dash/_jupyter.py

@@ -202,7 +202,7 @@ def capture_event(stream, ident, parent):
         if _jupyter_comm_response_received():
             break
 
-        if asyncio.iscoroutinefunction(kernel.do_one_iteration):
+        if inspect.iscoroutinefunction(kernel.do_one_iteration):
             loop = asyncio.get_event_loop()
             nest_asyncio.apply(loop)
             loop.run_until_complete(kernel.do_one_iteration())

dash/background_callback/managers/celery_manager.py

@@ -1,3 +1,4 @@
+import inspect
 import json
 import traceback
 from contextvars import copy_context
@@ -250,7 +251,7 @@ async def async_run():
                     result_key, json.dumps(user_callback_output, cls=PlotlyJSONEncoder)
                 )
 
-        if asyncio.iscoroutinefunction(fn):
+        if inspect.iscoroutinefunction(fn):
             func = partial(ctx.run, async_run)
             asyncio.run(func())
         else:

dash/background_callback/managers/diskcache_manager.py

@@ -1,3 +1,4 @@
+import inspect
 import traceback
 from contextvars import copy_context
 import asyncio
@@ -296,7 +297,7 @@ async def async_run():
                 except Exception as err:  # pylint: disable=broad-except
                     print(f"Diskcache manager couldn't save output: {err}")
 
-        if asyncio.iscoroutinefunction(fn):
+        if inspect.iscoroutinefunction(fn):
             func = partial(ctx.run, async_run)
             asyncio.run(func())
         else:

dash/dash.py

@@ -2,6 +2,7 @@
 import os
 import sys
 import collections
+import inspect
 import importlib
 import warnings
 from contextvars import copy_context
@@ -220,7 +221,7 @@ def _do_skip(error):
 
 async def execute_async_function(func, *args, **kwargs):
     # Check if the function is a coroutine function
-    if asyncio.iscoroutinefunction(func):
+    if inspect.iscoroutinefunction(func):
         return await func(*args, **kwargs)
     # If the function is not a coroutine, call it directly
     return func(*args, **kwargs)
@@ -837,7 +838,7 @@ async def _parse_body_async():
             return _parse_body_async
 
         for path, func in self.callback_api_paths.items():
-            if asyncio.iscoroutinefunction(func):
+            if inspect.iscoroutinefunction(func):
                 self._add_url(path, make_parse_body_async(func), ["POST"])
             else:
                 self._add_url(path, make_parse_body(func), ["POST"])

dash/dependencies.py

@@ -1,3 +1,4 @@
+from enum import Enum
 from typing import Union, Sequence, Any
 
 from .development.base_component import Component
@@ -9,32 +10,33 @@
 ComponentIdType = Union[str, Component, dict]
 
 
-class _Wildcard:  # pylint: disable=too-few-public-methods
-    def __init__(self, name: str):
-        self._name = name
+class Wildcard(Enum):
+    MATCH = "MATCH"
+    ALL = "ALL"
+    ALLSMALLER = "ALLSMALLER"
 
     def __str__(self):
-        return self._name
+        return self.value
 
     def __repr__(self):
-        return f"<{self}>"
+        return f"<{self.value}>"
 
     def to_json(self) -> str:
         # used in serializing wildcards - arrays are not allowed as
         # id values, so make the wildcards look like length-1 arrays.
-        return f'["{self._name}"]'
+        return f'["{self.value}"]'
 
 
-MATCH = _Wildcard("MATCH")
-ALL = _Wildcard("ALL")
-ALLSMALLER = _Wildcard("ALLSMALLER")
+MATCH = Wildcard.MATCH
+ALL = Wildcard.ALL
+ALLSMALLER = Wildcard.ALLSMALLER
 
 
 class DashDependency:  # pylint: disable=too-few-public-methods
     component_id: ComponentIdType
     allow_duplicate: bool
     component_property: str
-    allowed_wildcards: Sequence[_Wildcard]
+    allowed_wildcards: Sequence[Wildcard]
     allow_optional: bool
 
     def __init__(self, component_id: ComponentIdType, component_property: str):
@@ -95,8 +97,8 @@ def _id_matches(self, other) -> bool:
                 other_v = other_id[k]
                 if v == other_v:
                     continue
-                v_wild = isinstance(v, _Wildcard)
-                other_wild = isinstance(other_v, _Wildcard)
+                v_wild = isinstance(v, Wildcard)
+                other_wild = isinstance(other_v, Wildcard)
                 if v_wild or other_wild:
                     if not (v_wild and other_wild):
                         continue  # one wild, one not
@@ -120,7 +122,7 @@ def has_wildcard(self) -> bool:
         """
         if isinstance(self.component_id, dict):
             for v in self.component_id.values():
-                if isinstance(v, _Wildcard):
+                if isinstance(v, Wildcard):
                     return True
         return False
 

dash/development/_py_components_generation.py

@@ -25,13 +25,10 @@
 from typing_extensions import TypedDict, NotRequired, Literal # noqa: F401
 from dash.development.base_component import Component, _explicitize_args
 {custom_imports}
+ComponentSingleType = typing.Union[str, int, float, Component, None]
 ComponentType = typing.Union[
-    str,
-    int,
-    float,
-    Component,
-    None,
-    typing.Sequence[typing.Union[str, int, float, Component, None]],
+    ComponentSingleType,
+    typing.Sequence[ComponentSingleType],
 ]
 
 NumberType = typing.Union[

dash/development/base_component.py

@@ -454,14 +454,11 @@ def _validate_deprecation(self):
             warnings.warn(DeprecationWarning(textwrap.dedent(deprecation_message)))
 
 
+ComponentSingleType = typing.Union[str, int, float, Component, None]
 # Renderable node type.
 ComponentType = typing.Union[
-    str,
-    int,
-    float,
-    Component,
-    None,
-    typing.Sequence[typing.Union[str, int, float, Component, None]],
+    ComponentSingleType,
+    typing.Sequence[ComponentSingleType],
 ]
 
 ComponentTemplate = typing.TypeVar("ComponentTemplate")