bokeh 3.8.0.dev2__tar.gz → 3.8.0.dev4__tar.gz

{bokeh-3.8.0.dev2/src/bokeh.egg-info → bokeh-3.8.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bokeh
-Version: 3.8.0.dev2
+Version: 3.8.0.dev4
 Summary: Interactive plots and applications in the browser from Python
 Author: Bokeh Team
 Author-email: info@bokeh.org

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/pyproject.toml

@@ -73,7 +73,7 @@ dev_template = "{tag}+{ccount}.g{sha}"
 dirty_template = "{tag}+{ccount}.g{sha}.dirty"
 
 [tool.pytest.ini_options]
-timeout = 90
+timeout = 300
 asyncio_mode = "strict"
 norecursedirs = "build _build node_modules tests/support"
 python_files = "*_tests.py *_test.py test_*.py"

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/enums.py

@@ -92,6 +92,7 @@ __all__ = (
     'AngleUnits',
     'Auto',
     'AutosizeMode',
+    'AxisLabelStandoffMode',
     'BuiltinFormatter',
     'ButtonType',
     'CalendarPosition',
@@ -154,6 +155,7 @@ __all__ = (
     'TextAlign',
     'TextBaseline',
     'TextureRepetition',
+    'TimedeltaResolutionType',
     'ToolIcon',
     'ToolName',
     'TooltipAttachment',
@@ -183,16 +185,16 @@ class Enumeration:
     '''
     __slots__ = ()
 
-    _values: list[str]
-    _default: str
+    _values: list[str | int]
+    _default: str | int
     _case_sensitive: bool
     _quote: bool
 
-    def __iter__(self) -> Iterator[str]:
+    def __iter__(self) -> Iterator[str | int]:
         return iter(self._values)
 
-    def __contains__(self, value: str) -> bool:
-        if not self._case_sensitive:
+    def __contains__(self, value: str | int) -> bool:
+        if not self._case_sensitive and isinstance(value, str):
             value = value.lower()
         return value in self._values
 
@@ -216,8 +218,12 @@ def enumeration(*values: Any, case_sensitive: bool = True, quote: bool = False)
         #: Specify the horizontal alignment for rendering text
         TextAlign = enumeration("left", "right", "center")
 
+        #: Specify either ascending or descending item order
+        AscDesc = enumeration(1, -1)
+
     Args:
-        values (str) : string enumeration values, passed as positional arguments
+        values (str | int) : string or integer enumeration values, passed as
+            positional arguments
 
             The order of arguments is the order of the enumeration, and the
             first element will be considered the default value when used
@@ -240,13 +246,15 @@ def enumeration(*values: Any, case_sensitive: bool = True, quote: bool = False)
     if len(values) == 1 and hasattr(values[0], "__args__"):
         values = get_args(values[0])
 
-    if not (values and all(isinstance(value, str) and value for value in values)):
-        raise ValueError(f"expected a non-empty sequence of strings, got {nice_join(values)}")
+    if not (values and
+            (all(isinstance(value, str) and value for value in values) or
+             all(isinstance(value, int) for value in values))):
+        raise ValueError(f"expected a non-empty heterogenous sequence of strings or integers, got {nice_join(values)}")
 
     if len(values) != len(set(values)):
         raise ValueError(f"enumeration items must be unique, got {nice_join(values)}")
 
-    attrs: dict[str, Any] = {value: value for value in values}
+    attrs: dict[str, Any] = {value: value for value in values if isinstance(value, str)}
     attrs.update({
         "_values": list(values),
         "_default": values[0],
@@ -293,6 +301,10 @@ Auto = enumeration(AutoType)
 AutosizeModeType = Literal["fit_columns", "fit_viewport", "force_fit", "none"]
 AutosizeMode = enumeration(AutosizeModeType)
 
+#: Specify the reference point of the ``axis_label_standoff``
+AxisLabelStandoffModeType = Literal["tick_labels", "axis"]
+AxisLabelStandoffMode = enumeration(AxisLabelStandoffModeType)
+
 #: Names of built-in value formatters
 BuiltinFormatterType = Literal["raw", "basic", "numeral", "printf", "datetime"]
 BuiltinFormatter = enumeration(BuiltinFormatterType)
@@ -591,6 +603,10 @@ TextBaseline = enumeration(TextBaselineType)
 TextureRepetitionType = Literal["repeat", "repeat_x", "repeat_y", "no_repeat"]
 TextureRepetition = enumeration(TextureRepetitionType)
 
+#: Specify which resolutions should be used for stripping of leading zeros
+TimedeltaResolutionTypeType = Literal["nanoseconds", "microseconds", "milliseconds", "seconds", "minsec", "minutes", "hourmin", "hours", "days"]
+TimedeltaResolutionType = enumeration(TimedeltaResolutionTypeType)
+
 #: Well known tool icon names
 ToolIconType = Literal[
     "append_mode",

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/has_props.py

@@ -56,7 +56,7 @@ if TYPE_CHECKING:
 # Bokeh imports
 from ..settings import settings
 from ..util.strings import append_docstring, nice_join
-from ..util.warnings import warn
+from ..util.warnings import BokehUserWarning, warn
 from .property.descriptor_factory import PropertyDescriptorFactory
 from .property.descriptors import PropertyDescriptor, UnsetValueError
 from .property.override import Override
@@ -138,7 +138,7 @@ def _generators(class_dict: dict[str, Any]):
     return generators
 
 class _ModelResolver:
-    """ """
+    """ A class responsible for tracking of models and how to resolve them. """
 
     _known_models: dict[str, type[HasProps]]
 
@@ -150,7 +150,8 @@ class _ModelResolver:
             # update the mapping of view model names to classes, checking for any duplicates
             previous = self._known_models.get(cls.__qualified_model__, None)
             if previous is not None and not hasattr(cls, "__implementation__"):
-                raise Warning(f"Duplicate qualified model declaration of '{cls.__qualified_model__}'. Previous definition: {previous}")
+                warn(f"Duplicate qualified model definition of '{cls.__qualified_model__}'. " \
+                     f"Previous definition was {previous} (@{hex(id(previous))}), the new is {cls} (@{hex(id(cls))}).", BokehUserWarning)
             self._known_models[cls.__qualified_model__] = cls
 
     def remove(self, cls: type[HasProps]) -> None:

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/properties.py

@@ -124,6 +124,7 @@ DataSpec Properties
 
 .. autoclass:: AlphaSpec
 .. autoclass:: AngleSpec
+.. autoclass:: BoolSpec
 .. autoclass:: ColorSpec
 .. autoclass:: DataSpec
 .. autoclass:: DistanceSpec
@@ -207,6 +208,7 @@ __all__ = (
     'Array',
     'Auto',
     'Bool',
+    'BoolSpec',
     'Byte',
     'Bytes',
     'CSSLength',
@@ -331,6 +333,7 @@ from .property.container import RestrictedDict
 
 from .property.dataspec import AlphaSpec
 from .property.dataspec import AngleSpec
+from .property.dataspec import BoolSpec
 from .property.dataspec import ColorSpec
 from .property.dataspec import DashPatternSpec
 from .property.dataspec import DataSpec

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/property/bases.py

@@ -267,10 +267,12 @@ class Property(PropertyDescriptorFactory[T]):
             # FYI Numpy can erroneously raise a warning about elementwise
             # comparison here when a timedelta is compared to another scalar.
             # https://github.com/numpy/numpy/issues/10095
-            return new == old
+            # bool() is to handle when new and old cannot be compared
+            # and raises TypeError, an example of this is pd.NA
+            return bool(new == old)
 
         # if the comparison fails for some reason, just punt and return no-match
-        except ValueError:
+        except (ValueError, TypeError):
             return False
 
     def transform(self, value: Any) -> T:
@@ -540,11 +542,12 @@ class PrimitiveProperty(Property[T]):
     """
 
     _underlying_type: ClassVar[tuple[type[Any], ...]]
+    _not_underlying_type: ClassVar[tuple[type[Any], ...]] = ()
 
     def validate(self, value: Any, detail: bool = True) -> None:
         super().validate(value, detail)
 
-        if isinstance(value, self._underlying_type):
+        if isinstance(value, self._underlying_type) and not isinstance(value, self._not_underlying_type):
             return
 
         if not detail:

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/property/color.py

@@ -32,6 +32,7 @@ from .container import Tuple
 from .either import Either
 from .enum import Enum
 from .numeric import Byte, Percent
+from .primitive import Int
 from .singletons import Undefined
 from .string import Regex
 
@@ -134,6 +135,7 @@ class Color(Either):
                        r"\s*?){2}(25[0-5]|2[0-4]\d|1\d{1,2}|\d\d?)\s*?\)"),
                  Tuple(Byte, Byte, Byte),
                  Tuple(Byte, Byte, Byte, Percent),
+                 Int,
                  RGB)
         help = f"{help or ''}\n{COLOR_DEFAULT_HELP}"
         super().__init__(*types, default=default, help=help)

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/property/data_frame.py

@@ -60,7 +60,7 @@ class EagerDataFrame(Property["IntoDataFrame"]):
         super().validate(value, detail)
 
         if nw.dependencies.is_into_dataframe(value):
-            return # type: ignore[unreachable] # https://github.com/bokeh/bokeh/issues/14342
+            return
 
         msg = "" if not detail else f"expected object convertible to Narwhals DataFrame, got {value!r}"
         raise ValueError(msg)
@@ -78,7 +78,7 @@ class EagerSeries(Property["IntoSeries"]):
         super().validate(value, detail)
 
         if nw.dependencies.is_into_series(value):
-            return # type: ignore[unreachable] # https://github.com/bokeh/bokeh/issues/14342
+            return
 
         msg = "" if not detail else f"expected object convertible to Narwhals Series, got {value!r}"
         raise ValueError(msg)

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/property/dataspec.py

@@ -38,6 +38,7 @@ from .instance import Instance
 from .nothing import Nothing
 from .nullable import Nullable
 from .primitive import (
+    Bool,
     Float,
     Int,
     Null,
@@ -71,6 +72,7 @@ if TYPE_CHECKING:
 __all__ = (
     'AlphaSpec',
     'AngleSpec',
+    'BoolSpec',
     'ColorSpec',
     'DashPatternSpec',
     'DataSpec',
@@ -245,6 +247,10 @@ class DataSpec(Either):
 
         return val
 
+class BoolSpec(DataSpec):
+    def __init__(self, default, *, help: str | None = None) -> None:
+        super().__init__(Bool, default=default, help=help)
+
 class IntSpec(DataSpec):
     def __init__(self, default, *, help: str | None = None) -> None:
         super().__init__(Int, default=default, help=help)

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/property/enum.py

@@ -27,8 +27,9 @@ from typing import Any, overload
 from ...util.strings import nice_join
 from .. import enums
 from ._sphinx import model_link, property_link, register_type_link
-from .bases import Init
-from .primitive import String
+from .bases import Init, Property
+from .either import Either
+from .primitive import Int, String
 from .singletons import Intrinsic
 
 #-----------------------------------------------------------------------------
@@ -43,7 +44,7 @@ __all__ = (
 # General API
 #-----------------------------------------------------------------------------
 
-class Enum(String):
+class Enum(Either):
     """ Accept values from enumerations.
 
     The first value in enumeration is used as the default value, unless the
@@ -59,9 +60,13 @@ class Enum(String):
     def __init__(self, enum: enums.Enumeration, *, default: Init[str] = ..., help: str | None = ...) -> None: ...
     @overload
     def __init__(self, enum: str, *values: str, default: Init[str] = ..., help: str | None = ...) -> None: ...
+    @overload
+    def __init__(self, enum: enums.Enumeration, *, default: Init[int] = ..., help: str | None = ...) -> None: ...
+    @overload
+    def __init__(self, enum: int, *values: int, default: Init[int] = ..., help: str | None = ...) -> None: ...
 
-    def __init__(self, enum: str | enums.Enumeration, *values: str, default: Init[str] = Intrinsic, help: str | None = None) -> None:
-        if isinstance(enum, str):
+    def __init__(self, enum: str | int | enums.Enumeration, *values: str | int, default: Init[str | int] = Intrinsic, help: str | None = None) -> None:
+        if isinstance(enum, str | int):
             self._enum = enums.enumeration(enum, *values)
         elif values:
             raise ValueError("unexpected enum values")
@@ -69,9 +74,9 @@ class Enum(String):
             self._enum = enum
 
         default = default if default is not Intrinsic else self._enum._default
-        super().__init__(default=default, help=help)
+        super().__init__(String, Int, default=default, help=help)
 
-    def __call__(self, *, default: Init[str] = Intrinsic, help: str | None = None) -> Enum:
+    def __call__(self, *, default: Init[str | int] = Intrinsic, help: str | None = None) -> Enum:
         """ Clone this property and allow to override ``default`` and ``help``. """
         default = self._default if default is Intrinsic else default
         help = self._help if help is None else help
@@ -86,7 +91,7 @@ class Enum(String):
         return f"{class_name}({allowed_values})"
 
     @property
-    def allowed_values(self) -> list[str]:
+    def allowed_values(self) -> list[str | int]:
         return self._enum._values
 
     def validate(self, value: Any, detail: bool = True) -> None:
@@ -98,6 +103,13 @@ class Enum(String):
         msg = "" if not detail else f"invalid value: {value!r}; allowed values are {nice_join(self.allowed_values)}"
         raise ValueError(msg)
 
+    # override replace so that .replace() doesn't descend this type
+    def replace(self, old: type[Property[Any]], new: Property[Any]) -> Property[Any]:
+        if self.__class__ == old:
+            return new
+        else:
+            return self
+
 #-----------------------------------------------------------------------------
 # Dev API
 #-----------------------------------------------------------------------------

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/property/primitive.py

@@ -108,6 +108,7 @@ class Complex(PrimitiveProperty[complex]):
     """
 
     _underlying_type = (numbers.Complex,)
+    _not_underlying_type = bokeh_bool_types
 
     def __init__(self, default: Init[complex] = 0j, *, help: str | None = None) -> None:
         super().__init__(default=default, help=help)
@@ -141,6 +142,7 @@ class Int(PrimitiveProperty[int]):
     """
 
     _underlying_type = bokeh_integer_types
+    _not_underlying_type = bokeh_bool_types
 
     def __init__(self, default: Init[int] = 0, *, help: str | None = None) -> None:
         super().__init__(default=default, help=help)
@@ -175,6 +177,7 @@ class Float(PrimitiveProperty[float]):
     """
 
     _underlying_type = (numbers.Real,)
+    _not_underlying_type = bokeh_bool_types
 
     def __init__(self, default: Init[float] = 0.0, *, help: str | None = None) -> None:
         super().__init__(default=default, help=help)

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/core/serialization.py

@@ -223,12 +223,14 @@ class Serializer:
 
     _references: dict[ObjID, Ref]
     _deferred: bool
+    _check_circular: bool
     _circular: dict[ObjID, Any]
     _buffers: list[Buffer]
 
-    def __init__(self, *, references: set[Model] = set(), deferred: bool = True) -> None:
+    def __init__(self, *, references: set[Model] = set(), deferred: bool = True, check_circular: bool = False) -> None:
         self._references = {id(obj): obj.ref for obj in references}
         self._deferred = deferred
+        self._check_circular = check_circular
         self._circular = {}
         self._buffers = []
 
@@ -255,14 +257,15 @@ class Serializer:
             return ref
 
         ident = id(obj)
-        if ident in self._circular:
+        if self._check_circular and ident in self._circular:
             self.error("circular reference")
 
         self._circular[ident] = obj
         try:
             return self._encode(obj)
         finally:
-            del self._circular[ident]
+            if ident in self._circular:
+                del self._circular[ident]
 
     def encode_struct(self, **fields: Any) -> dict[str, AnyRep]:
         return {key: self.encode(val) for key, val in fields.items() if val is not Unspecified}

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/document/document.py

@@ -739,7 +739,7 @@ side of a communications channel while it was being removed on the other end.\
             self.callbacks.trigger_on_change(TitleChangedEvent(self, title, setter))
 
     def to_json(self, *, deferred: bool = True) -> DocJson:
-        ''' Convert this document to a JSON-serializble object.
+        ''' Convert this document to a JSON-serializable object.
 
         Return:
             DocJson

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/events.py

@@ -94,6 +94,7 @@ if TYPE_CHECKING:
 __all__ = (
     'AxisClick',
     'ButtonClick',
+    'ClientReconnected',
     'ConnectionLost',
     'DocumentEvent',
     'DocumentReady',
@@ -255,6 +256,13 @@ class ConnectionLost(ConnectionEvent):
         super().__init__()
         self.timestamp = datetime.now()
 
+class ClientReconnected(ConnectionEvent):
+    '''
+    Announce when a connection to the client has been reconnected.
+
+    '''
+    event_name = 'client_reconnected'
+
 class ModelEvent(Event):
     ''' Base class for all Bokeh Model events.
 

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/io/export.py

@@ -40,6 +40,7 @@ if TYPE_CHECKING:
 from ..core.types import PathLike
 from ..document import Document
 from ..embed import file_html
+from ..model import Model
 from ..resources import INLINE, Resources
 from ..themes import Theme
 from ..util.warnings import warn
@@ -297,7 +298,7 @@ def get_svg(obj: UIElement | Document, *, driver: WebDriver | None = None, timeo
         web_driver = driver if driver is not None else webdriver_control.get()
         web_driver.get(f"file://{tmp.path}")
         wait_until_render_complete(web_driver, timeout)
-        svgs = cast(list[str], web_driver.execute_script(_SVG_SCRIPT))
+        svgs = cast(list[str], web_driver.execute_script(_SVG_SCRIPT(obj)))
 
     return svgs
 
@@ -485,14 +486,22 @@ function* collect_svgs(views) {
 return [...collect_svgs(Bokeh.index)]
 """
 
-_SVG_SCRIPT = """\
-function* export_svgs(views) {
-  for (const view of views) {
+def _SVG_SCRIPT(obj: Model | Document) -> str:
+    if isinstance(obj, Document):
+        ids = [root.id for root in obj.roots]
+    else:
+        ids = [obj.id]
+    return f"""\
+const ids = new Set({ids})
+function* export_svgs(views) {{
+  for (const view of views) {{
     // TODO: use to_blob() API in future
-    const {ctx} = view.export("svg")
-    yield ctx.get_serialized_svg(true)
-  }
-}
+    if (ids.has(view.model.id)) {{
+        const {{ctx}} = view.export("svg")
+        yield ctx.get_serialized_svg(true)
+    }}
+  }}
+}}
 
 return [...export_svgs(Bokeh.index)]
 """

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/models/axes.py

@@ -25,7 +25,7 @@ log = logging.getLogger(__name__)
 from typing import Any
 
 # Bokeh imports
-from ..core.enums import Align, LabelOrientation
+from ..core.enums import Align, AxisLabelStandoffMode, LabelOrientation
 from ..core.has_props import abstract
 from ..core.properties import (
     Auto,
@@ -55,6 +55,7 @@ from ..core.property_mixins import (
 )
 from .formatters import (
     CONTEXTUAL_DATETIME_FORMATTER,
+    CONTEXTUAL_TIMEDELTA_FORMATTER,
     BasicTickFormatter,
     CategoricalTickFormatter,
     LogTickFormatter,
@@ -71,6 +72,7 @@ from .tickers import (
     LogTicker,
     MercatorTicker,
     Ticker,
+    TimedeltaTicker,
 )
 
 #-----------------------------------------------------------------------------
@@ -85,6 +87,7 @@ __all__ = (
     'LinearAxis',
     'LogAxis',
     'MercatorAxis',
+    'TimedeltaAxis',
 )
 
 #-----------------------------------------------------------------------------
@@ -101,8 +104,7 @@ class Axis(GuideRenderer):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
-    # TODO: Enum(0, 1) instead of Int
-    dimension = Either(Auto, Int, default="auto", help="""
+    dimension = Either(Auto, Enum(0, 1), default="auto", help="""
     This allows to override the inferred dimensions in contexts that
     support this. This property has no effect when an axes is used
     as a frame axis.
@@ -160,7 +162,11 @@ class Axis(GuideRenderer):
 
     axis_label_standoff = Int(default=5, help="""
     The distance in pixels that the axis labels should be offset
-    from the tick labels.
+    from the tick labels or axis.
+    """)
+
+    axis_label_standoff_mode = Enum(AxisLabelStandoffMode, default="tick_labels", help="""
+    The reference point for the distance of the ``axis_label_standoff``.
     """)
 
     axis_label_orientation = Either(Enum(LabelOrientation), Float)(default="parallel", help="""
@@ -383,6 +389,21 @@ class DatetimeAxis(LinearAxis):
 
     formatter = Override(default=CONTEXTUAL_DATETIME_FORMATTER)
 
+class TimedeltaAxis(LinearAxis):
+    ''' A ``LinearAxis`` that picks nice numbers for tick locations on
+    a timedelta scale. Configured with a ``TimedeltaTickFormatter`` by
+    default.
+
+    '''
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+
+    ticker = Override(default=InstanceDefault(TimedeltaTicker))
+
+    formatter = Override(default=CONTEXTUAL_TIMEDELTA_FORMATTER)
+
 class MercatorAxis(LinearAxis):
     ''' An axis that picks nice numbers for tick locations on a
     Mercator scale. Configured with a ``MercatorTickFormatter`` by default.

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/models/dom.py

@@ -42,6 +42,7 @@ from ..core.property.singletons import Intrinsic
 from ..core.validation import error
 from ..core.validation.errors import NOT_A_PROPERTY_OF
 from ..model import Model, Qualified
+from .callbacks import CustomJS
 from .css import Styles
 from .ui.ui_element import UIElement
 
@@ -227,6 +228,20 @@ class ValueRef(Placeholder):
     .. _DocumentFragment: https://developer.mozilla.org/en-US/docs/Web/API/DocumentFragment
     """)
 
+    filter = Nullable(Either(Instance(CustomJS), List(Instance(CustomJS))), default=None, help="""
+    Allow to filter hover results by a ``CustomJS`` callback.
+
+    .. code::
+
+        ValueRef(filter=
+            CustomJS(code='''
+                export default (args, tool, {value, field, row, data_source, vars}) => {
+                    return value >= 0
+                }
+            ''')
+        ]
+    """)
+
 class ColorRef(ValueRef):
 
     # explicit __init__ to support Init signatures

{bokeh-3.8.0.dev2 → bokeh-3.8.0.dev4}/src/bokeh/models/dom.pyi

@@ -96,6 +96,8 @@ class ValueRef(Placeholder):
 
     formatter: BuiltinFormatter | CustomJS | CustomJSHover = ...
 
+    filter: CustomJS | list[CustomJS] | None = ...
+
 @dataclass
 class ColorRef(ValueRef):