babelplot 2024.5__tar.gz → 2025.1__tar.gz

{babelplot-2024.5 → babelplot-2025.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: babelplot
-Version: 2024.5
+Version: 2025.1
 Summary: A Meta Plotting Library That Speaks Several Backends
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/babelplot/
 Author: Eric Debreuve

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/backend/catalog/bokeh_.py

@@ -32,12 +32,12 @@ backend_frame_t = backend_figure_t
 
 def _NewPlot(
     frame: backend_frame_t,
-    type_: plot_type_h | type(backend_plot_t),
+    type_: plot_type_h | type[backend_plot_t],
     plot_function: h.Callable | None,
     *args,
     title: str | None = None,  # If _, then it is swallowed by kwargs!
     **kwargs,
-) -> tuple[backend_plot_t, type(backend_plot_t)]:
+) -> tuple[backend_plot_t, type[backend_plot_t]]:
     """"""
     if plot_function is None:
         if hasattr(backend_frame_t, type_):

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/backend/catalog/matplotlib_.py

@@ -20,13 +20,14 @@ from babelplot.type.frame import frame_t as base_frame_t
 from babelplot.type.plot import plot_t as base_plot_t
 from logger_36 import LOGGER
 from matplotlib.artist import Artist as backend_plot_t  # noqa
+from matplotlib.container import Container as backend_plots_t  # noqa
 from matplotlib.gridspec import GridSpec as grid_spec_t  # noqa
 from matplotlib.markers import MarkerStyle as marker_style_t  # noqa
 from matplotlib.patches import Polygon as polygon_t  # noqa
 from matplotlib.pyplot import Axes as backend_frame_2d_t  # noqa
 from matplotlib.pyplot import Figure as backend_figure_t  # noqa
 from matplotlib.pyplot import figure as NewBackendFigure  # noqa
-from mpl_toolkits.mplot3d import Axes3D as backend_frame_3d_t
+from mpl_toolkits.mplot3d import Axes3D as backend_frame_3d_t  # noqa
 
 import matplotlib as mlpl  # noqa
 
@@ -39,7 +40,7 @@ backend_frame_h = backend_frame_2d_t | backend_frame_3d_t
 
 def _NewPlot(
     frame: backend_frame_h,
-    type_: plot_type_h | type(backend_plot_h),
+    type_: plot_type_h | type[backend_plot_h],
     plot_function: h.Callable | None,
     *args,
     title: str | None = None,  # /!\ If _, then it is swallowed by kwargs!
@@ -269,7 +270,7 @@ def _ElevationSurface(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plo
     return frame.plot_surface(x, y, elevation, **kwargs)
 
 
-def _Isocontour(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
+def _IsoContour(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
     """"""
     if args.__len__() == 2:
         values, value = args
@@ -284,7 +285,7 @@ def _Isocontour(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
     return output
 
 
-def _Isosurface(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
+def _IsoSurface(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
     """"""
     if "step_size" in kwargs:
         mc_kwargs = {"step_size": kwargs["step_size"]}
@@ -307,7 +308,7 @@ def _Mesh(
     )
 
 
-def _BarH(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
+def _BarH(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plots_t:
     """"""
     if args.__len__() == 1:
         counts = args[0]
@@ -318,7 +319,7 @@ def _BarH(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
     return frame.barh(positions, counts, **kwargs)
 
 
-def _BarV(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
+def _BarV(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plots_t:
     """"""
     if args.__len__() == 1:
         counts = args[0]
@@ -371,7 +372,7 @@ PLOTS[plot_e.SCATTER][1] = backend_frame_2d_t.scatter
 PLOTS[plot_e.POLYLINE][1] = backend_frame_2d_t.plot
 PLOTS[plot_e.POLYGON][1] = _Polygon
 PLOTS[plot_e.ARROWS][1] = _Arrows2
-PLOTS[plot_e.ISOSET][1] = _Isocontour
+PLOTS[plot_e.ISOSET][1] = _IsoContour
 PLOTS[plot_e.BARH][1] = _BarH
 PLOTS[plot_e.BARV][1] = _BarV
 PLOTS[plot_e.PIE][1] = backend_frame_2d_t.pie
@@ -382,7 +383,7 @@ PLOTS[plot_e.SCATTER][2] = backend_frame_3d_t.scatter
 PLOTS[plot_e.POLYLINE][2] = backend_frame_3d_t.plot
 PLOTS[plot_e.ARROWS][2] = _Arrows3
 PLOTS[plot_e.ELEVATION][2] = _ElevationSurface
-PLOTS[plot_e.ISOSET][2] = _Isosurface
+PLOTS[plot_e.ISOSET][2] = _IsoSurface
 PLOTS[plot_e.MESH][2] = _Mesh
 PLOTS[plot_e.BAR3][2] = _Bar3
 PLOTS[plot_e.TEXT][2] = _Text3
@@ -409,8 +410,8 @@ TRANSLATIONS = {
     (_BarV, "color"): "color",
     (_BarV, "offset"): "bottom",
     (_ElevationSurface, "color_face"): "color",
-    (_Isocontour, "color"): "colors",
-    (_Isosurface, "color_face"): "color",
+    (_IsoContour, "color"): "colors",
+    (_IsoSurface, "color_face"): "color",
     (_Mesh, "color_face"): "color",
     (_Polygon, "color_edge"): "edgecolor",
     (_Polygon, "color_face"): "facecolor",

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/backend/catalog/plotly_.py

@@ -10,7 +10,7 @@ import typing as h
 from pathlib import Path as path_t
 
 import numpy as nmpy
-import plotly.figure_factory as fcry
+import plotly.figure_factory as fcry  # noqa
 import plotly.graph_objects as plly  # noqa
 from babelplot.backend.specification.backend import backend_e
 from babelplot.specification.plot import (
@@ -46,12 +46,12 @@ _FIGURE_CONFIG = {
 
 def _NewPlot(
     _: backend_frame_h,
-    type_: plot_type_h | type(backend_plot_t),
+    type_: plot_type_h | type[backend_plot_t],
     plot_function: h.Callable | None,
     *args,
     title: str | None = None,  # If _, then it is swallowed by kwargs!
     **kwargs,
-) -> tuple[backend_plot_t, type(backend_plot_t)]:
+) -> tuple[backend_plot_t, type[backend_plot_t]]:
     """"""
     if plot_function is None:
         if hasattr(plly, type_):
@@ -226,7 +226,7 @@ def _ElevationSurface(*args, **kwargs) -> backend_plot_t:
     return plly.Surface(contours={}, x=x, y=y, z=elevation, **kwargs)
 
 
-def _Isocontour(*args, **kwargs) -> backend_plot_t:
+def _IsoContour(*args, **kwargs) -> backend_plot_t:
     """"""
     parameters = {
         "contours_coloring": "lines",
@@ -252,7 +252,7 @@ def _Isocontour(*args, **kwargs) -> backend_plot_t:
     return plly.Contour(**parameters)
 
 
-def _Isosurface(values: array_t, value: float, *args, **kwargs) -> backend_plot_t:
+def _IsoSurface(values: array_t, value: float, *args, **kwargs) -> backend_plot_t:
     """"""
     if args.__len__() == 3:
         x, y, z = args
@@ -354,7 +354,7 @@ PLOTS[plot_e.SCATTER][1] = _Scatter2
 PLOTS[plot_e.POLYLINE][1] = _Polyline2
 PLOTS[plot_e.POLYGON][1] = _Polygon
 PLOTS[plot_e.ARROWS][1] = _Arrows2
-PLOTS[plot_e.ISOSET][1] = _Isocontour
+PLOTS[plot_e.ISOSET][1] = _IsoContour
 PLOTS[plot_e.BARH][1] = _BarH
 PLOTS[plot_e.BARV][1] = _BarV
 PLOTS[plot_e.PIE][1] = _Pie
@@ -365,7 +365,7 @@ PLOTS[plot_e.SCATTER][2] = _Scatter3
 PLOTS[plot_e.POLYLINE][2] = _Polyline3
 PLOTS[plot_e.ARROWS][2] = _Arrows3
 PLOTS[plot_e.ELEVATION][2] = _ElevationSurface
-PLOTS[plot_e.ISOSET][2] = _Isosurface
+PLOTS[plot_e.ISOSET][2] = _IsoSurface
 PLOTS[plot_e.MESH][2] = _Mesh
 PLOTS[plot_e.TEXT][2] = _Text3
 
@@ -373,7 +373,7 @@ PLOTS[plot_e.TEXT][2] = _Text3
 TRANSLATIONS = {
     "alpha": "opacity",
     "color_face": "surfacecolor",
-    (_Isosurface, "color_face"): UNDEFINED_PARAMETER,
+    (_IsoSurface, "color_face"): UNDEFINED_PARAMETER,
 }
 
 

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/backend/catalog/vedo_.py

@@ -17,6 +17,7 @@ from babelplot.type.figure import figure_t as base_figure_t
 from babelplot.type.frame import frame_t as base_frame_t
 from babelplot.type.plot import plot_t as base_plot_t
 from numpy import ndarray as array_t
+from vedo import Mesh as backend_plot_t  # noqa
 from vedo import Plotter as backend_figure_t  # noqa
 from vedo import Volume as volume_t  # noqa
 
@@ -28,12 +29,12 @@ backend_frame_t = backend_figure_t
 
 def _NewPlot(
     frame: backend_frame_t,
-    type_: plot_type_h | type(backend_plot_h),
+    type_: plot_type_h | type[backend_plot_h],
     plot_function: h.Callable | None,
     *args,
     title: str | None = None,  # If _, then it is swallowed by kwargs!
     **kwargs,
-) -> tuple[backend_plot_h, type(backend_plot_h)]:
+) -> tuple[backend_plot_h, type[backend_plot_h]]:
     """"""
     if plot_function is None:
         if hasattr(vedo, type_):
@@ -89,7 +90,7 @@ figure_t: base_figure_t = type(
 )
 
 
-def _IsoSurface(volume: array_t, iso_value: float, *_, **kwargs) -> None:
+def _IsoSurface(volume: array_t, iso_value: float, *_, **kwargs) -> backend_plot_t:
     """"""
     return volume_t(volume).isosurface(value=[iso_value], **kwargs)
 

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/main.py

@@ -71,7 +71,7 @@ def NewFigure(
 
 
 def NewPlot(
-    type_: plot_type_h | type(backend_plot_h),
+    type_: plot_type_h | type[backend_plot_h],
     *plt_args,
     fig_args=(),
     frm_args=(),

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/specification/plot.py

@@ -139,7 +139,7 @@ KNOWN_PLOT_TYPES = EnumValues(plot_e)
 
 
 plot_type_h = str | plot_e
-backend_plots_per_type_h = tuple[type(UNAVAILABLE_for_this_DIM) | h.Callable, ...]
+backend_plots_per_type_h = tuple[type[UNAVAILABLE_for_this_DIM] | h.Callable, ...]
 backend_plots_h = dict[plot_e, backend_plots_per_type_h]
 
 
@@ -286,7 +286,7 @@ PLOT_DESCRIPTION = {
 
 
 def PlotsFromTemplate() -> (
-    dict[plot_e, list[type(UNAVAILABLE_for_this_DIM) | h.Callable]]
+    dict[plot_e, list[type[UNAVAILABLE_for_this_DIM] | h.Callable]]
 ):
     """"""
     return {_key: 3 * [UNAVAILABLE_for_this_DIM] for _key in PLOT_DESCRIPTION.keys()}

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/type/figure.py

@@ -33,7 +33,7 @@ class figure_t(base_figure_t):
 
     title: str | None = None
     offline_version: bool = False
-    frame_class: type(frame_t) | None = dtcl.field(init=False, default=None)
+    frame_class: type[frame_t] | None = dtcl.field(init=False, default=None)
     frames: list[frame_t] = dtcl.field(init=False, default_factory=list)
     locations: list[tuple[int, int]] = dtcl.field(init=False, default_factory=list)
     shape: list[int] = dtcl.field(init=False, default_factory=_DefaultShape)

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/type/frame.py

@@ -15,7 +15,7 @@ from babelplot.type.base import babelplot_element_t as base_frame_t
 from babelplot.type.base import backend_frame_h, backend_plot_h
 from babelplot.type.plot import BackendPlotFromAny, plot_t
 
-plot_type_w_pbe_h = plot_type_h | type(backend_plot_h)
+plot_type_w_pbe_h = plot_type_h | type[backend_plot_h]
 
 
 @dtcl.dataclass(repr=False, eq=False)
@@ -23,7 +23,7 @@ class frame_t(base_frame_t):
     title: str | None = None
     dim: dim_e | None = None
     frame_dim: int | None = dtcl.field(init=False, default=None)
-    plot_class: type(plot_t) | None = dtcl.field(init=False, default=None)
+    plot_class: type[plot_t] | None = dtcl.field(init=False, default=None)
     plots: list[plot_t] = dtcl.field(init=False, default_factory=list)
 
     def __post_init__(self) -> None:
@@ -90,7 +90,7 @@ class frame_t(base_frame_t):
         *args,
         title: str | None = None,
         **kwargs,
-    ) -> tuple[h.Any, type(backend_plot_h)]:
+    ) -> tuple[h.Any, type[backend_plot_h]]:
         """
         The returned object should be backend_plot_h. However, some backends might not
         have a specific class for each plot type. For example, Matplotlib returns an

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/type/plot.py

@@ -21,7 +21,7 @@ from babelplot.type.base import backend_plot_h
 class plot_t(base_plot_t):
     title: str | None = None
     # See babelplot.type.frame.NewBackendPlot for an explanation
-    backend_type: type(backend_plot_h) | None = dtcl.field(init=False, default=None)
+    backend_type: type[backend_plot_h] | None = dtcl.field(init=False, default=None)
 
 
 def BackendPlotFromPlotE(
@@ -51,7 +51,7 @@ def BackendPlotFromPlotE(
 
 
 def BackendPlotFromAny(
-    spec: plot_type_h | type(backend_plot_h),
+    spec: plot_type_h | type[backend_plot_h],
     frame_dim: int,
     backend: str,
     backend_plots: backend_plots_h,

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot/version.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2022
 SEE COPYRIGHT NOTICE BELOW
 """
 
-__version__ = "2024.5"
+__version__ = "2025.1"
 
 """
 COPYRIGHT NOTICE

{babelplot-2024.5 → babelplot-2025.1}/package/babelplot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: babelplot
-Version: 2024.5
+Version: 2025.1
 Summary: A Meta Plotting Library That Speaks Several Backends
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/babelplot/
 Author: Eric Debreuve