babelplot 2024.3__tar.gz → 2024.5__tar.gz

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

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

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

@@ -35,7 +35,7 @@ def _NewPlot(
     type_: plot_type_h | type(backend_plot_t),
     plot_function: h.Callable | None,
     *args,
-    title: str = None,  # If _, then it is swallowed by kwargs!
+    title: str | None = None,  # If _, then it is swallowed by kwargs!
     **kwargs,
 ) -> tuple[backend_plot_t, type(backend_plot_t)]:
     """"""
@@ -53,7 +53,7 @@ def _NewFrame(
     __: int,
     ___: int,
     *args,
-    title: str = None,
+    title: str | None = None,
     dim: dim_e = dim_e.XY,  # If _, then it is swallowed by kwargs!
     **kwargs,
 ) -> backend_frame_t:

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

@@ -42,7 +42,7 @@ def _NewPlot(
     type_: plot_type_h | type(backend_plot_h),
     plot_function: h.Callable | None,
     *args,
-    title: str = None,  # /!\ If _, then it is swallowed by kwargs!
+    title: str | None = None,  # /!\ If _, then it is swallowed by kwargs!
     **kwargs,
 ) -> tuple[h.Any, h.Callable]:
     """"""
@@ -65,7 +65,7 @@ def _NewFrame(
     _: int,
     __: int,
     *args,
-    title: str = None,
+    title: str | None = None,
     dim: dim_e = dim_e.XY,
     **kwargs,
 ) -> backend_frame_h:

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

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

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

@@ -31,7 +31,7 @@ def _NewPlot(
     type_: plot_type_h | type(backend_plot_h),
     plot_function: h.Callable | None,
     *args,
-    title: str = None,  # If _, then it is swallowed by kwargs!
+    title: str | None = None,  # If _, then it is swallowed by kwargs!
     **kwargs,
 ) -> tuple[backend_plot_h, type(backend_plot_h)]:
     """"""
@@ -52,7 +52,7 @@ def _NewFrame(
     _: int,
     __: int,
     *___,
-    title: str = None,
+    title: str | None = None,
     dim: dim_e = dim_e.XY,  # If _, then it is swallowed by kwargs!
     **____,
 ) -> backend_frame_t:

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

@@ -23,9 +23,9 @@ from logger_36 import LOGGER
 
 def NewFigure(
     *args,
-    title: str = None,
+    title: str | None = None,
     offline_version: bool = False,
-    pbe: str | path_t | backend_e = None,
+    pbe: str | path_t | backend_e | None = None,
     **kwargs,
 ) -> figure_t | None:
     """
@@ -75,24 +75,24 @@ def NewPlot(
     *plt_args,
     fig_args=(),
     frm_args=(),
-    fig_kwargs: dict[str, h.Any] = None,
-    frm_kwargs: dict[str, h.Any] = None,
-    fig_title: str = None,
-    frm_title: str = None,
-    plt_title: str = None,
+    fig_kwargs: dict[str, h.Any] | None = None,
+    frm_kwargs: dict[str, h.Any] | None = None,
+    fig_title: str | None = None,
+    frm_title: str | None = None,
+    plt_title: str | None = None,
     dim: str | dim_e = dim_e.XY,
-    pbe: str | path_t | backend_e = None,
+    pbe: str | path_t | backend_e | None = None,
     should_show: bool = True,
     modal: bool = True,
     **plt_kwargs,
 ) -> tuple[figure_t, frame_t, plot_t] | None:
     """"""
     if fig_kwargs is None:
-        fig_kwargs = ({},)
+        fig_kwargs = {}
     if frm_kwargs is None:
-        frm_kwargs = ({},)
+        frm_kwargs = {}
     if plt_kwargs is None:
-        plt_kwargs = ({},)
+        plt_kwargs = {}
 
     figure = NewFigure(
         *fig_args,

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

@@ -31,9 +31,9 @@ def _DefaultShape() -> list[int]:
 @dtcl.dataclass(repr=False, eq=False)
 class figure_t(base_figure_t):
 
-    title: str = None
+    title: str | None = None
     offline_version: bool = False
-    frame_class: type(frame_t) = 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)
@@ -46,7 +46,7 @@ class figure_t(base_figure_t):
     def AddFrame(
         self,
         *args,
-        title: str = None,
+        title: str | None = None,
         dim: str | dim_e = dim_e.XY,
         row: int = 0,
         col: int = 0,
@@ -185,7 +185,7 @@ class figure_t(base_figure_t):
         row: int,
         col: int,
         *args,
-        title: str = None,
+        title: str | None = None,
         dim: dim_e = dim_e.XY,
         **kwargs,
     ) -> backend_frame_h:

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

@@ -5,11 +5,12 @@ SEE COPYRIGHT NOTICE BELOW
 """
 
 import dataclasses as dtcl
+import difflib as diff
 import typing as h
 
 from babelplot.backend.specification.runtime import BackendPlots, BackendTranslations
 from babelplot.specification.dimension import FRAME_DIM_FOR_DATA_DIM, dim_e
-from babelplot.specification.plot import TranslatedArguments, plot_type_h
+from babelplot.specification.plot import KNOWN_PLOT_TYPES, TranslatedArguments, plot_type_h
 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
@@ -19,10 +20,10 @@ plot_type_w_pbe_h = plot_type_h | type(backend_plot_h)
 
 @dtcl.dataclass(repr=False, eq=False)
 class frame_t(base_frame_t):
-    title: str = None
-    dim: dim_e = None
-    frame_dim: int = dtcl.field(init=False, default=None)
-    plot_class: type(plot_t) = dtcl.field(init=False, default=None)
+    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)
     plots: list[plot_t] = dtcl.field(init=False, default_factory=list)
 
     def __post_init__(self) -> None:
@@ -33,10 +34,20 @@ class frame_t(base_frame_t):
         self,
         type_: plot_type_w_pbe_h,
         *args,
-        title: str = None,
+        title: str | None = None,
         **kwargs,
     ) -> plot_t:
         """"""
+        if isinstance(type_, str):
+            closest = diff.get_close_matches(type_.lower(), KNOWN_PLOT_TYPES, n=1)
+            if closest.__len__() == 0:
+                raise ValueError(
+                    f"{type_}: Unknown plot type. Valid options: "
+                    f"{str(KNOWN_PLOT_TYPES)[1:-1]}."
+                )
+
+            type_ = closest[0]
+
         plot_function = BackendPlotFromAny(
             type_, self.frame_dim, self.pbe, BackendPlots(self.pbe)
         )
@@ -77,7 +88,7 @@ class frame_t(base_frame_t):
         type_: plot_type_w_pbe_h,
         plot_function: h.Callable | None,
         *args,
-        title: str = None,
+        title: str | None = None,
         **kwargs,
     ) -> tuple[h.Any, type(backend_plot_h)]:
         """

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

@@ -19,9 +19,9 @@ from babelplot.type.base import backend_plot_h
 
 @dtcl.dataclass(repr=False, eq=False)
 class plot_t(base_plot_t):
-    title: str = None
+    title: str | None = None
     # See babelplot.type.frame.NewBackendPlot for an explanation
-    backend_type: type(backend_plot_h) = dtcl.field(init=False, default=None)
+    backend_type: type(backend_plot_h) | None = dtcl.field(init=False, default=None)
 
 
 def BackendPlotFromPlotE(

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

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

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

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