bokeh 3.10.0.dev2__tar.gz → 3.10.0.dev3__tar.gz

{bokeh-3.10.0.dev2/src/bokeh.egg-info → bokeh-3.10.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bokeh
-Version: 3.10.0.dev2
+Version: 3.10.0.dev3
 Summary: Interactive plots and applications in the browser from Python
 Author: Bokeh Team
 Author-email: info@bokeh.org
@@ -38,15 +38,23 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: Jinja2>=2.9
-Requires-Dist: contourpy>=1.2
+Requires-Dist: jinja2>=2.9
 Requires-Dist: narwhals>=1.13
 Requires-Dist: numpy>=1.16
 Requires-Dist: packaging>=16.8
 Requires-Dist: pillow>=7.1.0
-Requires-Dist: PyYAML>=3.10
+Requires-Dist: pyyaml>=3.10
 Requires-Dist: tornado>=6.2; sys_platform != "emscripten"
 Requires-Dist: xyzservices>=2021.09.1
+Provides-Extra: sampledata
+Requires-Dist: bokeh_sampledata>=2025.0; extra == "sampledata"
+Provides-Extra: extra
+Requires-Dist: contourpy>=1.2; extra == "extra"
+Requires-Dist: pandas>=2.0; extra == "extra"
+Provides-Extra: export
+Requires-Dist: selenium~=4.2; extra == "export"
+Provides-Extra: all
+Requires-Dist: bokeh[export,extra,sampledata]; extra == "all"
 Dynamic: license-file
 
 <picture>

{bokeh-3.10.0.dev2 → bokeh-3.10.0.dev3}/pyproject.toml

@@ -9,13 +9,12 @@ description = "Interactive plots and applications in the browser from Python"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "Jinja2 >=2.9",
-    "contourpy >=1.2",
+    "jinja2 >=2.9",
     "narwhals>=1.13",
     "numpy >=1.16",
     "packaging >=16.8",
     "pillow >=7.1.0",
-    "PyYAML >=3.10",
+    "pyyaml >=3.10",
     "tornado >=6.2; sys_platform != 'emscripten'",
     "xyzservices >=2021.09.1",
 ]
@@ -55,6 +54,21 @@ classifiers = [
     "Topic :: Utilities",
 ]
 
+[project.optional-dependencies]
+sampledata = [
+    "bokeh_sampledata >=2025.0",
+]
+extra = [
+    "contourpy >=1.2",
+    "pandas >=2.0",
+]
+export = [
+    "selenium ~=4.2",
+]
+all = [
+    "bokeh[sampledata,extra,export]",
+]
+
 [project.urls]
 homepage = "https://bokeh.org"
 documentation = "https://docs.bokeh.org"
@@ -180,7 +194,6 @@ lint.ignore = [
     'TID252', # Prefer absolute imports over relative imports from parent modules
 ]
 line-length = 165
-target-version = "py310"
 
 # For now enable each typed module individually.
 [[tool.mypy.overrides]]
@@ -281,3 +294,8 @@ module = [
     "tests.unit.bokeh.test_layouts__typing",
 ]
 ignore_errors = false
+
+# TODO remove when we drop Python 3.11
+[[tool.mypy.overrides]]
+module = ["sphinx.*"]
+follow_imports = "skip"

{bokeh-3.10.0.dev2 → bokeh-3.10.0.dev3}/src/bokeh/core/has_props.py

@@ -373,6 +373,9 @@ class HasProps(Serializable, metaclass=MetaHasProps):
         self._raise_attribute_error_with_matches(name, properties)
 
     def _raise_attribute_error_with_matches(self, name: str, properties: Iterable[str]) -> NoReturn:
+        if not settings.perform_error_diagnostics():
+            raise AttributeError(f"unexpected attribute {name!r} to {self.__class__.__name__}")
+
         matches, text = difflib.get_close_matches(name.lower(), properties), "similar"
 
         if not matches:

{bokeh-3.10.0.dev2 → bokeh-3.10.0.dev3}/src/bokeh/models/widgets/sliders.py

@@ -22,7 +22,7 @@ log = logging.getLogger(__name__)
 
 # Standard library imports
 import numbers
-from datetime import date, datetime, timezone
+from datetime import UTC, date, datetime
 from typing import Any
 
 # Bokeh imports
@@ -234,7 +234,7 @@ class DateSlider(NumericalSlider):
             return None
 
         if isinstance(self.value, numbers.Number):
-            return datetime.fromtimestamp(self.value / 1000, tz=timezone.utc)
+            return datetime.fromtimestamp(self.value / 1000, tz=UTC)
 
         return self.value
 
@@ -248,7 +248,7 @@ class DateSlider(NumericalSlider):
             return None
 
         if isinstance(self.value, numbers.Number):
-            dt = datetime.fromtimestamp(self.value / 1000, tz=timezone.utc)
+            dt = datetime.fromtimestamp(self.value / 1000, tz=UTC)
             return date(*dt.timetuple()[:3])
 
         return self.value
@@ -293,11 +293,11 @@ class DateRangeSlider(NumericalSlider):
             return None
         v1, v2 = self.value
         if isinstance(v1, numbers.Number):
-            d1 = datetime.fromtimestamp(v1 / 1000, tz=timezone.utc)
+            d1 = datetime.fromtimestamp(v1 / 1000, tz=UTC)
         else:
             d1 = v1
         if isinstance(v2, numbers.Number):
-            d2 = datetime.fromtimestamp(v2 / 1000, tz=timezone.utc)
+            d2 = datetime.fromtimestamp(v2 / 1000, tz=UTC)
         else:
             d2 = v2
         return d1, d2
@@ -313,12 +313,12 @@ class DateRangeSlider(NumericalSlider):
             return None
         v1, v2 = self.value
         if isinstance(v1, numbers.Number):
-            dt = datetime.fromtimestamp(v1 / 1000, tz=timezone.utc)
+            dt = datetime.fromtimestamp(v1 / 1000, tz=UTC)
             d1 = date(*dt.timetuple()[:3])
         else:
             d1 = v1
         if isinstance(v2, numbers.Number):
-            dt = datetime.fromtimestamp(v2 / 1000, tz=timezone.utc)
+            dt = datetime.fromtimestamp(v2 / 1000, tz=UTC)
             d2 = date(*dt.timetuple()[:3])
         else:
             d2 = v2
@@ -362,11 +362,11 @@ class DatetimeRangeSlider(NumericalSlider):
             return None
         v1, v2 = self.value
         if isinstance(v1, numbers.Number):
-            d1 = datetime.fromtimestamp(v1 / 1000, tz=timezone.utc)
+            d1 = datetime.fromtimestamp(v1 / 1000, tz=UTC)
         else:
             d1 = v1
         if isinstance(v2, numbers.Number):
-            d2 = datetime.fromtimestamp(v2 / 1000, tz=timezone.utc)
+            d2 = datetime.fromtimestamp(v2 / 1000, tz=UTC)
         else:
             d2 = v2
         return d1, d2

{bokeh-3.10.0.dev2 → bokeh-3.10.0.dev3}/src/bokeh/plotting/_renderer.py

@@ -26,7 +26,7 @@ from typing import TYPE_CHECKING, Any, TypeAlias
 import numpy as np
 
 # Bokeh imports
-from ..core.property.dataspec import ColorSpec
+from ..core.property.dataspec import ColorSpec, DashPattern, DashPatternSpec
 from ..models import ColumnarDataSource, ColumnDataSource, GlyphRenderer
 from ._legends import pop_legend_kwarg, update_legend
 
@@ -258,47 +258,65 @@ def _pop_renderer_args(kwargs: Attrs) -> Attrs:
     result['data_source'] = kwargs.pop('source') if 'source' in kwargs else ColumnDataSource()
     return result
 
+def _is_scalar_dash_pattern(val: Any) -> bool:
+    """Check if value should be treated as a scalar dash pattern (not per-glyph data)."""
+    if isinstance(val, np.ndarray):
+        return val.ndim == 1 and val.dtype.kind in ('i', 'u')
+    elif isinstance(val, (list, tuple)):
+        return len(val) > 0 and all(isinstance(v, int) for v in val)
+    return False
+
+def _validate_color_array(val: np.ndarray, var: str) -> None:
+    """Validate numpy array for ColorSpec properties."""
+    valid_formats = [
+        val.dtype == "uint32" and val.ndim == 1,   # 0xRRGGBBAA
+        val.dtype == "uint8" and val.ndim == 1,    # greys
+        val.dtype.kind == "U" and val.ndim == 1,   # CSS strings
+        (val.dtype == "uint8" or val.dtype.kind == "f") and val.ndim == 2 and val.shape[1] in (3, 4),  # RGB/RGBA
+    ]
+    if not any(valid_formats):
+        raise RuntimeError(
+            f"Color columns need to be of type uint32[N], uint8[N] or uint8/float[N, {{3, 4}}] "
+            f"({var} is {val.dtype}[{', '.join(map(str, val.shape))}])",
+        )
+
 def _process_sequence_literals(glyphclass: type[Glyph], kwargs: Attrs, source: ColumnarDataSource, is_user_source: bool) -> list[str]:
     incompatible_literal_spec_values: list[str] = []
     dataspecs = glyphclass.dataspecs()
+    all_properties = glyphclass.properties(_with_props=True)
 
     for var, val in kwargs.items():
-        # ignore things that are not iterable
-        if not isinstance(val, Iterable):
+        # Skip non-iterables and dicts
+        if not isinstance(val, Iterable) or isinstance(val, dict):
             continue
 
-        # pass dicts (i.e., values or fields) on as-is
-        if isinstance(val, dict):
-            continue
+        # Handle dash patterns specially to avoid list ambiguity
+        # DashPattern/DashPatternSpec should treat integer sequences like [6, 3] as scalar patterns
+        if var in all_properties and isinstance(all_properties[var], (DashPatternSpec, DashPattern)):
+            if _is_scalar_dash_pattern(val):
+                # Convert numpy arrays to lists for serialization
+                if isinstance(val, np.ndarray):
+                    kwargs[var] = val.tolist()
+                continue
 
-        # let any non-dataspecs do their own validation (e.g., line_dash properties)
+        # Let non-dataspecs handle their own validation
         if var not in dataspecs:
             continue
 
-        # strings sequences are handled by the dataspec as-is
+        # Strings and color tuples are handled by dataspecs as-is
         if isinstance(val, str):
             continue
-
-        # similarly colorspecs handle color tuple sequences as-is
         if isinstance(dataspecs[var], ColorSpec) and dataspecs[var].is_color_tuple_shape(val):
             continue
 
+        # Validate numpy arrays
         if isinstance(val, np.ndarray):
             if isinstance(dataspecs[var], ColorSpec):
-                if val.dtype == "uint32" and val.ndim == 1:   # 0xRRGGBBAA
-                    pass # TODO: handle byteorder
-                elif val.dtype == "uint8" and val.ndim == 1:  # greys
-                    pass
-                elif val.dtype.kind == "U" and val.ndim == 1: # CSS strings
-                    pass # TODO: currently this gets converted to list[str] in the serializer
-                elif (val.dtype == "uint8" or val.dtype.kind == "f") and val.ndim == 2 and val.shape[1] in (3, 4): # RGB/RGBA
-                    pass
-                else:
-                    raise RuntimeError("Color columns need to be of type uint32[N], uint8[N] or uint8/float[N, {3, 4}]"
-                                       f" ({var} is {val.dtype}[{', '.join(map(str, val.shape))}]")
+                _validate_color_array(val, var)
             elif val.ndim != 1:
                 raise RuntimeError(f"Columns need to be 1D ({var} is not)")
 
+        # Add sequence to data source or mark as incompatible
         if is_user_source:
             incompatible_literal_spec_values.append(var)
         else:

{bokeh-3.10.0.dev2 → bokeh-3.10.0.dev3}/src/bokeh/server/server.py

@@ -53,6 +53,8 @@ from ..core.property.container import List
 from ..core.property.nullable import Nullable
 from ..core.property.primitive import Bool, Int, String
 from ..resources import DEFAULT_SERVER_PORT, server_url
+from ..server.auth_provider import AuthModule, AuthProvider, NullAuth
+from ..settings import settings
 from ..util.options import Options
 from .tornado import DEFAULT_WEBSOCKET_MAX_MESSAGE_SIZE_BYTES, BokehTornado
 from .util import bind_sockets, create_hosts_allowlist
@@ -465,6 +467,110 @@ class Server(BaseServer):
 
         super().__init__(io_loop, tornado_app, http_server)
 
+    @classmethod
+    def from_settings(
+            cls,
+            applications: Mapping[str, Application | ModifyDoc] | Application | ModifyDoc,
+            io_loop: IOLoop | None = None,
+            http_server_kwargs: dict[str, Any] | None = None,
+            *,
+            auth_provider: AuthProvider | None = None,
+            secret_key: bytes | None = None,
+            sign_sessions: bool | None = None,
+            ssl_certfile: str | None = None,
+            ssl_keyfile: str | None = None,
+            ssl_password: str | None = None,
+            cookie_secret: str | None = None,
+            xsrf_cookies: bool | None = None,
+            ico_path: str | None = None,
+            **kwargs: Any,
+        ) -> Server:
+        ''' Create a ``Server`` instance, applying any relevant ``Server`` settings from the global
+        settings module, if they were not explicitly passed as keyword arguments.
+
+        Args:
+            applications (dict[str, Application] or Application or callable) :
+                See :class:`~bokeh.server.server.Server`.
+
+            io_loop (IOLoop, optional) :
+                See :class:`~bokeh.server.server.Server`.
+
+            http_server_kwargs (dict, optional) :
+                See :class:`~bokeh.server.server.Server`.
+
+            auth_provider (AuthProvider, optional) :
+                An :class:`~bokeh.server.auth_provider.AuthProvider` instance. Defaults to
+                an ``AuthModule`` loaded from the path in ``settings.auth_module()``, or
+                ``NullAuth`` if no module path is configured.
+
+            secret_key (bytes, optional) :
+                Secret key bytes used to sign sessions. Defaults to ``settings.secret_key_bytes()``.
+
+            sign_sessions (bool, optional) :
+                Whether to cryptographically sign session IDs. Defaults to ``settings.sign_sessions()``.
+
+            ssl_certfile (str, optional) :
+                Path to the SSL certificate file. Defaults to ``settings.ssl_certfile()``.
+
+            ssl_keyfile (str, optional) :
+                Path to the SSL key file. Defaults to ``settings.ssl_keyfile()``.
+
+            ssl_password (str, optional) :
+                Password for the SSL key file. Defaults to ``settings.ssl_password()``.
+
+            cookie_secret (str, optional) :
+                Secret used for signing cookies. Defaults to ``settings.cookie_secret()``.
+
+            xsrf_cookies (bool, optional) :
+                Whether to enable XSRF cookie protection. Defaults to ``settings.xsrf_cookies()``.
+
+            ico_path (str, optional) :
+                Path to a custom favicon ``.ico`` file. Defaults to ``settings.ico_path()``.
+
+        Any additional keyword arguments are passed directly to
+        :class:`~bokeh.server.server.Server`.
+
+        Returns:
+            Server
+
+        Raises:
+            ValueError
+                If ``sign_sessions`` is True but no ``secret_key`` is available.
+
+        '''
+
+        # --- auth_provider ---
+        if auth_provider is None:
+            auth_module_path = settings.auth_module()
+
+            # `settings.auth_module()`` yields a path string, but `Server` expects an AuthProvider instance.
+            kwargs['auth_provider'] = AuthModule(auth_module_path) if auth_module_path else NullAuth()
+        else:
+            kwargs['auth_provider'] = auth_provider
+
+        # --- session signing ---
+
+        kwargs['sign_sessions'] = sign_sessions if sign_sessions is not None else settings.sign_sessions()
+        # Note: the setting name doesn't match accessor method name on this one:
+        kwargs['secret_key'] = secret_key if secret_key is not None else settings.secret_key_bytes()
+
+        if sign_sessions and not secret_key:
+            raise ValueError("A 'secret_key' must be set when 'sign_sessions' is enabled.")
+
+        # --- SSL ---
+        kwargs['ssl_certfile'] = ssl_certfile if ssl_certfile is not None else settings.ssl_certfile()
+        kwargs['ssl_keyfile'] = ssl_keyfile if ssl_keyfile is not None else settings.ssl_keyfile()
+        kwargs['ssl_password'] = ssl_password if ssl_password is not None else settings.ssl_password()
+
+        # --- cookie / XSRF ---
+        kwargs['cookie_secret'] = cookie_secret if cookie_secret is not None else settings.cookie_secret()
+        kwargs['xsrf_cookies'] = xsrf_cookies if xsrf_cookies is not None else settings.xsrf_cookies()
+
+        # --- misc ---
+        kwargs['ico_path'] = ico_path if ico_path is not None else settings.ico_path()
+
+        return cls(applications, io_loop=io_loop, http_server_kwargs=http_server_kwargs, **kwargs)
+
     @property
     def port(self) -> int | None:
         ''' The configured port number that the server listens on for HTTP