bokeh 3.4.0.dev6__tar.gz → 3.4.0.dev7__tar.gz

{bokeh-3.4.0.dev6/src/bokeh.egg-info → bokeh-3.4.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bokeh
-Version: 3.4.0.dev6
+Version: 3.4.0.dev7
 Summary: Interactive plots and applications in the browser from Python
 Author: Bokeh Team
 Author-email: info@bokeh.org
@@ -74,7 +74,7 @@ Requires-Dist: packaging>=16.8
 Requires-Dist: pandas>=1.2
 Requires-Dist: pillow>=7.1.0
 Requires-Dist: PyYAML>=3.10
-Requires-Dist: tornado>=5.1
+Requires-Dist: tornado>=6.2
 Requires-Dist: xyzservices>=2021.09.1
 
 <picture>

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     "pandas >=1.2",
     "pillow >=7.1.0",
     "PyYAML >=3.10",
-    "tornado >=5.1",
+    "tornado >=6.2",
     "xyzservices >=2021.09.1",
 ]
 authors = [

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/core/validation/decorators.py

@@ -68,6 +68,8 @@ def _validator(code_or_name: int | str | Issue, validator_type: ValidatorType) -
         Error if validator_type == "error" else Warning
 
     def decorator(func: ValidationFunction) -> Validator:
+        assert func.__name__.startswith("_check"), f"validation function {func.__qualname__} must have '_check' prefix"
+
         def _wrapper(*args: Any, **kwargs: Any) -> list[ValidationIssue]:
             extra = func(*args, **kwargs)
             if extra is None:
@@ -113,7 +115,7 @@ def error(code_or_name: int | str | Issue) -> ValidationDecorator:
     Returns:
         callable : decorator for Bokeh model methods
 
-    The function that is decorated should have a name that starts with
+    The function that is decorated must have a name that starts with
     ``_check``, and return a string message in case a bad condition is
     detected, and ``None`` if no bad condition is detected.
 

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/core/validation/errors.py

@@ -234,6 +234,10 @@ WEIGHTED_STACK_COLOR_MAPPER_LABEL_LENGTH_MISMATCH = Error(
     1030,
     "WEIGHTED_STACK_COLOR_MAPPER_LABEL_LENGTH_MISMATCH",
     "Number of stack labels does not match palette length")
+NON_MATCHING_SCALE_BAR_UNIT = Error(
+    1031,
+    "NON_MATCHING_SCALE_BAR_UNIT",
+    "ScaleBar.unit must be an element of ScaleBar's units of measurement basis")
 EXT = Error(
     9999,
     "EXT",

bokeh-3.4.0.dev7/src/bokeh/models/annotations/dimensional.py

@@ -0,0 +1,213 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2012 - 2024, Anaconda, Inc., and Bokeh Contributors.
+# All rights reserved.
+#
+# The full license is in the file LICENSE.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+'''
+
+'''
+
+#-----------------------------------------------------------------------------
+# Boilerplate
+#-----------------------------------------------------------------------------
+from __future__ import annotations
+
+import logging # isort:skip
+log = logging.getLogger(__name__)
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+# Standard library imports
+from abc import abstractmethod
+from typing import Any
+
+# Bokeh imports
+from ...core.has_props import abstract
+from ...core.properties import (
+    Dict,
+    Either,
+    Float,
+    List,
+    Nullable,
+    Override,
+    Required,
+    String,
+    Tuple,
+)
+from ...model import Model
+
+#-----------------------------------------------------------------------------
+# Globals and constants
+#-----------------------------------------------------------------------------
+
+__all__ = (
+    "Angular",
+    "ImperialLength",
+    "Metric",
+    "MetricLength",
+    "ReciprocalMetric",
+    "ReciprocalMetricLength",
+)
+
+#-----------------------------------------------------------------------------
+# General API
+#-----------------------------------------------------------------------------
+
+@abstract
+class Dimensional(Model):
+    """ A base class for models defining units of measurement.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+    ticks = Required(List(Float), help="""
+    Preferred values to choose from in non-exact mode.
+    """)
+
+    include = Nullable(List(String), default=None, help="""
+    An optional subset of preferred units from the basis.
+    """)
+
+    exclude = List(String, default=[], help="""
+    A subset of units from the basis to avoid.
+    """)
+
+    @abstractmethod
+    def is_known(self, unit: str) -> bool:
+        pass
+
+@abstract
+class CustomDimensional(Dimensional):
+    """ A base class for units of measurement with an explicit basis.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+    basis = Required(Dict(String, Either(Tuple(Float, String), Tuple(Float, String, String))), help="""
+    The basis defining the units of measurement.
+
+    This consists of a mapping between short unit names and their corresponding
+    scaling factors, TeX names and optional long names. For example, the basis
+    for defining angular units of measurement is:
+
+    .. code-block:: python
+
+        basis = {
+            "°":  (1,      "^\\circ",           "degree"),
+            "'":  (1/60,   "^\\prime",          "minute"),
+            "''": (1/3600, "^{\\prime\\prime}", "second"),
+        }
+    """)
+
+    def is_known(self, unit: str) -> bool:
+        return unit in self.basis
+
+class Metric(Dimensional):
+    """ Model for defining metric units of measurement.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+    base_unit = Required(String, help="""
+    The short name of the base unit, e.g. ``"m"`` for meters or ``"eV"`` for electron volts.
+    """)
+
+    full_unit = Nullable(String, default=None, help="""
+    The full name of the base unit, e.g. ``"meter"`` or ``"electronvolt"``.
+    """)
+
+    ticks = Override(default=[1, 2, 5, 10, 15, 20, 25, 50, 75, 100, 125, 150, 200, 250, 500, 750])
+
+    def is_known(self, unit: str) -> bool:
+        prefixes = ["Q", "R", "Y", "Z", "E", "P", "T", "G", "M", "k", "h", "", "d", "c", "m", "µ", "n", "p", "f", "a", "z", "y", "r", "q"]
+        basis = {f"{prefix}{unit}" for prefix in prefixes}
+        return unit in basis
+
+class ReciprocalMetric(Metric):
+    """ Model for defining reciprocal metric units of measurement, e.g. ``m^{-1}``.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+class MetricLength(Metric):
+    """ Metric units of length measurement.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+    base_unit = Override(default="m")
+
+    exclude = Override(default=["dm", "hm"])
+
+class ReciprocalMetricLength(ReciprocalMetric):
+    """ Metric units of reciprocal length measurement.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+    base_unit = Override(default="m")
+
+    exclude = Override(default=["dm", "hm"])
+
+class ImperialLength(CustomDimensional):
+    """ Imperial units of length measurement.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+    basis = Override(default={
+        "in":  ( 1/12, "in",  "inch"   ),
+        "ft":  (    1, "ft",  "foot"   ),
+        "yd":  (    3, "yd",  "yard"   ),
+        "ch":  (   66, "ch",  "chain"  ),
+        "fur": (  660, "fur", "furlong"),
+        "mi":  ( 5280, "mi",  "mile"   ),
+        "lea": (15840, "lea", "league" ),
+    })
+
+    ticks = Override(default=[1, 3, 6, 12, 60])
+
+class Angular(CustomDimensional):
+    """ Units of angular measurement.
+    """
+
+    # explicit __init__ to support Init signatures
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+    basis = Override(default={
+        "°":  (1,      "^\\circ",           "degree"),
+        "'":  (1/60,   "^\\prime",          "minute"),
+        "''": (1/3600, "^{\\prime\\prime}", "second"),
+    })
+
+    ticks = Override(default=[1, 3, 6, 12, 60, 120, 240, 360])
+
+#-----------------------------------------------------------------------------
+# Dev API
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Private API
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Code
+#-----------------------------------------------------------------------------

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/models/annotations/geometry.py

@@ -20,6 +20,9 @@ log = logging.getLogger(__name__)
 # Imports
 #-----------------------------------------------------------------------------
 
+# Standard library imports
+from math import inf
+
 # Bokeh imports
 from ...core.enums import CoordinateUnits, Dimension
 from ...core.properties import (
@@ -30,9 +33,11 @@ from ...core.properties import (
     Include,
     Instance,
     InstanceDefault,
+    NonNegative,
     Null,
     Nullable,
     Override,
+    Positive,
     Seq,
     UnitsSpec,
     field,
@@ -146,6 +151,34 @@ class BoxAnnotation(Annotation):
         This property is experimental and may change at any point.
     """)
 
+    min_width = NonNegative(Float, default=0, help="""
+    Allows to set the minium width of the box.
+
+    .. note::
+        This property is experimental and may change at any point.
+    """)
+
+    min_height = NonNegative(Float, default=0, help="""
+    Allows to set the maximum width of the box.
+
+    .. note::
+        This property is experimental and may change at any point.
+    """)
+
+    max_width = Positive(Float, default=inf, help="""
+    Allows to set the minium height of the box.
+
+    .. note::
+        This property is experimental and may change at any point.
+    """)
+
+    max_height = Positive(Float, default=inf, help="""
+    Allows to set the maximum height of the box.
+
+    .. note::
+        This property is experimental and may change at any point.
+    """)
+
     border_radius = BorderRadius(default=0, help="""
     Allows the box to have rounded corners.
 

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/models/annotations/legends.py

@@ -68,6 +68,7 @@ from ...core.validation import error
 from ...core.validation.errors import (
     BAD_COLUMN_NAME,
     NON_MATCHING_DATA_SOURCES_ON_LEGEND_ITEM_RENDERERS,
+    NON_MATCHING_SCALE_BAR_UNIT,
 )
 from ...model import Model
 from ..formatters import TickFormatter
@@ -525,6 +526,11 @@ class ScaleBar(Annotation):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
+    @error(NON_MATCHING_SCALE_BAR_UNIT)
+    def _check_non_matching_scale_bar_unit(self):
+        if not self.dimensional.is_known(self.unit):
+            return str(self)
+
     range = Either(Instance(Range), Auto, default="auto", help="""
     The range for which to display the scale.
 
@@ -585,8 +591,7 @@ class ScaleBar(Annotation):
 
     * ``@{value}`` The current value. Optionally can provide a number
       formatter with e.g. ``@{value}{%.2f}``.
-    * ``@{unit}`` The unit of measure, by default in the short form.
-      Optionally can provide a format ``@{unit}{short}`` or ``@{unit}{long}``.
+    * ``@{unit}`` The unit of measurement.
 
     """)
 

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/models/layouts.py

@@ -318,7 +318,7 @@ class LayoutDOM(UIElement):
             return str(self)
 
     @error(MIN_PREFERRED_MAX_WIDTH)
-    def _min_preferred_max_width(self):
+    def _check_min_preferred_max_width(self):
         min_width = self.min_width if self.min_width is not None else 0
         width     = self.width     if self.width     is not None else min_width
         max_width = self.max_width if self.max_width is not None else width
@@ -327,7 +327,7 @@ class LayoutDOM(UIElement):
             return str(self)
 
     @error(MIN_PREFERRED_MAX_HEIGHT)
-    def _min_preferred_max_height(self):
+    def _check_min_preferred_max_height(self):
         min_height = self.min_height if self.min_height is not None else 0
         height     = self.height     if self.height     is not None else min_height
         max_height = self.max_height if self.max_height is not None else height

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-api.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-api.min.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-gl.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-gl.min.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-mathjax.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-mathjax.min.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-tables.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-tables.min.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-widgets.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {

{bokeh-3.4.0.dev6 → bokeh-3.4.0.dev7}/src/bokeh/server/static/js/bokeh-widgets.min.js

@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 (function(root, factory) {
-  factory(root["Bokeh"], "3.4.0-dev.6");
+  factory(root["Bokeh"], "3.4.0-dev.7");
 })(this, function(Bokeh, version) {
   let define;
   return (function(modules, entry, aliases, externals) {