dataplot 0.1.6__tar.gz → 0.1.7__tar.gz

{dataplot-0.1.6 → dataplot-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataplot
-Version: 0.1.6
+Version: 0.1.7
 Summary: Provides plotting tools useful in datascience.
 Project-URL: Documentation, https://github.com/Chitaoji/dataplot/blob/main/README.md
 Project-URL: Repository, https://github.com/Chitaoji/dataplot/
@@ -10,7 +10,7 @@ License-Expression: BSD-3-Clause
 License-File: LICENSE
 Keywords: plot
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Requires-Dist: lazyr
 Requires-Dist: matplotlib
@@ -51,6 +51,11 @@ seaborn
 This project falls under the BSD 3-Clause License.
 
 ## History
+### v0.1.7
+* `dp.data(...)` can accept `PlotDataSet` objects now.
+* `FigWrapper.__enter__()` now returns a copy safely via `_entered_copy`.
+* Internal maintenance and stability refinements.
+
 ### v0.1.6
 * New method `PlotDataSet.scatter()` to draw true scatter charts while keeping `PlotDataSet.plot()` as line chart behavior.
 * Improved automatic label inference for `dp.data(...)`, plotting labels, and x-axis labels in interactive contexts.

{dataplot-0.1.6 → dataplot-0.1.7}/README.md

@@ -28,6 +28,11 @@ seaborn
 This project falls under the BSD 3-Clause License.
 
 ## History
+### v0.1.7
+* `dp.data(...)` can accept `PlotDataSet` objects now.
+* `FigWrapper.__enter__()` now returns a copy safely via `_entered_copy`.
+* Internal maintenance and stability refinements.
+
 ### v0.1.6
 * New method `PlotDataSet.scatter()` to draw true scatter charts while keeping `PlotDataSet.plot()` as line chart behavior.
 * Improved automatic label inference for `dp.data(...)`, plotting labels, and x-axis labels in interactive contexts.

{dataplot-0.1.6 → dataplot-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dataplot"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
     "validating",
     "lazyr",
@@ -28,7 +28,7 @@ license-files = ["LICENSE"]
 keywords = ["plot"]
 classifiers = [
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.12"
+  "Programming Language :: Python :: 3.13"
 ]
 
 [project.urls]

{dataplot-0.1.6 → dataplot-0.1.7}/src/dataplot/container.py

@@ -96,10 +96,10 @@ class FigWrapper(PlotSettable):
     nrows: int = 1
     ncols: int = 1
     active: bool = attr(repr=False, default=True)
-    entered: bool = attr(init=False, repr=False, default=False)
     fig: Figure = attr(init=False, repr=False)
     axes: list[AxesWrapper] = attr(init=False, repr=False)
     artists: "list[Artist]" = attr(default_factory=list, init=False, repr=False)
+    _entered_copy: "FigWrapper | None" = attr(init=False, repr=False, default=None)
 
     def __enter__(self) -> Self:
         """
@@ -111,53 +111,61 @@ class FigWrapper(PlotSettable):
             An instance of self.
 
         """
-        if not self.active:
-            return self
-        if self.entered:
+        if self._entered_copy is not None:
             raise DoubleEnteredError(
                 f"can't enter an instance of {self.__class__.__name__!r} for twice; "
                 "please do all the operations in one single context manager"
             )
 
-        self.set_default(
+        figw = self.copy()
+        if not figw.active:
+            self._entered_copy = figw
+            return figw
+
+        figw.set_default(
             style="seaborn-v0_8-darkgrid",
-            figsize=(10 * self.ncols, 5 * self.nrows),
+            figsize=(10 * figw.ncols, 5 * figw.nrows),
             subplots_adjust={"hspace": 0.5},
             fontdict={"fontsize": "x-large"},
         )
-        plt.style.use(self.settings.style)
-        self.fig, axes = plt.subplots(self.nrows, self.ncols)
-        self.axes: list[AxesWrapper] = [AxesWrapper(x) for x in np.reshape(axes, -1)]
-        self.entered = True
-        return self
+        plt.style.use(figw.settings.style)
+        figw.fig, axes = plt.subplots(figw.nrows, figw.ncols)
+        figw.axes = [AxesWrapper(x) for x in np.reshape(axes, -1)]
+        self._entered_copy = figw
+        return figw
 
     def __exit__(self, *args) -> None:
         """
         Set various properties for the figure and paint it.
 
         """
-        if not self.active:
+        figw = self._entered_copy
+        if figw is None:
+            figw = self
+
+        if not figw.active:
+            self._entered_copy = None
             return
 
-        if len(self.axes) > 1:
-            self.fig.suptitle(self.settings.title, **self.settings.fontdict)
+        if len(figw.axes) > 1:
+            figw.fig.suptitle(figw.settings.title, **figw.settings.fontdict)
         else:
-            self.axes[0].ax.set_title(self.settings.title, **self.settings.fontdict)
+            figw.axes[0].ax.set_title(figw.settings.title, **figw.settings.fontdict)
 
-        self.fig.set_size_inches(*self.settings.figsize)
-        self.fig.subplots_adjust(**self.settings.subplots_adjust)
-        self.fig.set_dpi(self.get_setting("dpi", 100))
+        figw.fig.set_size_inches(*figw.settings.figsize)
+        figw.fig.subplots_adjust(**figw.settings.subplots_adjust)
+        figw.fig.set_dpi(figw.get_setting("dpi", 100))
 
-        for ax in self.axes:
+        for ax in figw.axes:
             ax.exit()
             if not ax.ax.has_data():
-                self.fig.delaxes(ax.ax)
+                figw.fig.delaxes(ax.ax)
 
         plt.show()
-        plt.close(self.fig)
+        plt.close(figw.fig)
         plt.style.use("default")
 
-        self.entered = False
+        self._entered_copy = None
 
     def __repr__(self) -> str:
         with self as fig:
@@ -191,13 +199,25 @@ class FigWrapper(PlotSettable):
         self._set(inplace=True, **kwargs)
 
     def setting_check(self, key: SettingKey, value: Any) -> None:
-        if self.entered and key == "style":
+        entered = self._entered_copy is not None
+        if entered and key == "style":
             logging.warning(
                 "setting the '%s' of a figure has no effect unless it's done "
                 "before invoking context manager",
                 key,
             )
 
+    def copy(self) -> Self:
+        obj = self.customize(
+            self.__class__,
+            nrows=self.nrows,
+            ncols=self.ncols,
+            active=self.active,
+        )
+        obj.artists = self.artists
+        obj._entered_copy = None
+        return obj
+
 
 class DoubleEnteredError(Exception):
     """Raised when entering a Figwrapper for twice."""

{dataplot-0.1.6 → dataplot-0.1.7}/src/dataplot/core.py

@@ -126,21 +126,43 @@ def data(*x: Any, label: Optional[str | list[str]] = None) -> PlotDataSet:
     if not x:
         raise ValueError("at least one dataset should be provided")
 
-    if len(x) > 1:
+    expanded_data: list[Any] = []
+    expanded_names: list[Optional[str]] = []
+    inferred_names = _infer_var_names(*x)
+    for i, value in enumerate(x):
+        if isinstance(value, PlotDataSets):
+            expanded_data.extend(value.__multiobjects__)
+            expanded_names.extend([None] * len(value.__multiobjects__))
+        else:
+            expanded_data.append(value)
+            expanded_names.append(inferred_names[i])
+
+    normalized_data: list[np.ndarray] = []
+    for value in expanded_data:
+        if isinstance(value, PlotDataSet):
+            normalized_data.append(np.array(value.data))
+        else:
+            normalized_data.append(np.array(value))
+
+    if len(expanded_data) > 1:
         if label is None:
-            label = [
-                lb if lb is not None else f"x{i}"
-                for i, lb in enumerate(_infer_var_names(*x), start=1)
-            ]
+            label = []
+            for i, (d, inferred_name) in enumerate(
+                zip(expanded_data, expanded_names), start=1
+            ):
+                if isinstance(d, PlotDataSet):
+                    label.append(d.formatted_label())
+                else:
+                    label.append(
+                        inferred_name if inferred_name is not None else f"x{i}"
+                    )
         elif isinstance(label, str):
             raise ValueError(
                 "for multiple datasets, please provide labels as a list of strings"
             )
-        elif len(label) != len(x):
-            raise ValueError(
-                f"label should have the same length as x ({len(x)}), got {len(label)}"
-            )
-        datas = [PlotDataSet(np.array(d), lb) for d, lb in zip(x, label)]
+        elif len(label) != len(expanded_data):
+            raise ValueError(f"expected {len(expanded_data)} labels, got {len(label)}")
+        datas = [PlotDataSet(d, lb) for d, lb in zip(normalized_data, label)]
         return PlotDataSets(*datas)
 
     if isinstance(label, list):
@@ -149,8 +171,13 @@ def data(*x: Any, label: Optional[str | list[str]] = None) -> PlotDataSet:
             "the data has only one dimension"
         )
     if label is None:
-        label = _infer_assigned_name() or _infer_var_names(x[0])[0] or "x1"
-    return PlotDataSet(np.array(x[0]), label=label)
+        original_label = (
+            expanded_data[0].label
+            if isinstance(expanded_data[0], PlotDataSet)
+            else None
+        )
+        label = original_label or _infer_assigned_name() or expanded_names[0] or "x1"
+    return PlotDataSet(normalized_data[0], label=label)
 
 
 def figure(