uplot-python 1.0.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

uplot/__init__.py

@@ -2,12 +2,10 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Stéphane Caron
-# Copyright 2023-2024 Inria
 
 """Python wrapper for μPlot time series."""
 
-__version__ = "1.0.0"
+__version__ = "1.1.1"
 
 from .plot import plot
 from .plot2 import plot2

uplot/color_picker.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Stéphane Caron
-# Copyright 2023-2024 Inria
 
 """Pick plot colors from a circular list."""
 
@@ -38,7 +36,7 @@ class ColorPicker:
         Returns:
             Color string.
         """
-        color = self.COLORS[self.__next_color]
+        color = self.COLORS[self.__next_color % len(self.COLORS)]
         self.__next_color += 1
         return color
 

uplot/exceptions.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Stéphane Caron
-# Copyright 2024 Inria
 
 """Project exceptions."""
 

uplot/generate_html.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Stéphane Caron
-# Copyright 2023 Inria
 
 """Generate an HTML page containing the output plot."""
 
@@ -23,6 +21,7 @@ def generate_html(opts: dict, data: List[np.ndarray], resize: bool) -> str:
     Args:
         opts: uPlot option dictionary.
         data: List of NumPy arrays, one for each series in the plot.
+        resize: If set, add a resize event listener to fit the window.
 
     Returns:
         HTML contents of the page.

uplot/plot.py

@@ -2,18 +2,19 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2024 Inria
 
 """Main plot function."""
 
 import webbrowser
-from typing import Iterable, List
+from typing import List
+
+import numpy as np
 
 from .generate_html import generate_html
 from .write_html_tempfile import write_html_tempfile
 
 
-def plot(opts: dict, data: List[Iterable]) -> None:
+def plot(opts: dict, data: List[np.ndarray]) -> None:
     """Plot function with the same API as uPlot's `plot`.
 
     Args:

uplot/plot2.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2024 Inria
 
 """Additional plot function."""
 
@@ -18,7 +17,21 @@ from .utils import js
 from .write_html_tempfile import write_html_tempfile
 
 
-def prepare_data(x, left, right):
+def prepare_data(
+    x: np.ndarray,
+    left: List[np.ndarray],
+    right: Optional[List[np.ndarray]],
+) -> List[np.ndarray]:
+    """Prepare the data list from x-axis, left, and right series.
+
+    Args:
+        x: Values for the x-axis.
+        left: Left y-axis series (single array or list of arrays).
+        right: Optional right y-axis series.
+
+    Returns:
+        Combined list of arrays for all series.
+    """
     if isinstance(left, np.ndarray) and left.ndim == 1:
         left = [left]
     data = [x, *left]
@@ -28,6 +41,11 @@ def prepare_data(x, left, right):
 
 
 def add_default_options(opts: dict) -> None:
+    """Add default cursor and plugin options if not already set.
+
+    Args:
+        opts: uPlot option dictionary to update in place.
+    """
     if "cursor" not in opts:
         opts["cursor"] = {
             "drag": {
@@ -49,6 +67,18 @@ def add_series(
     left_labels: Optional[List[str]],
     right_labels: Optional[List[str]],
 ) -> None:
+    """Build the uPlot series list and attach it to opts.
+
+    Args:
+        opts: uPlot option dictionary to update in place.
+        data: List of data arrays (x-axis followed by series).
+        nb_left: Number of left-axis series.
+        left_labels: Optional labels for left-axis series.
+        right_labels: Optional labels for right-axis series.
+
+    Raises:
+        UplotException: If left_labels has fewer entries than nb_left.
+    """
     if left_labels is not None and len(left_labels) < nb_left:
         raise UplotException(
             f"Not enough labels in left_labels ({len(left_labels)}) "
@@ -95,6 +125,11 @@ def add_series(
 
 
 def add_axes(opts: dict) -> None:
+    """Add default left and right axis definitions to opts.
+
+    Args:
+        opts: uPlot option dictionary to update in place.
+    """
     opts["axes"] = [
         {},
         {
@@ -133,6 +168,8 @@ def plot2(
         timestamped: If set, x-axis values are treated as timestamps.
         width: Plot width in pixels.
         height: Plot height in pixels.
+        left_labels: Labels for the left-axis series, in order.
+        right_labels: Labels for the right-axis series, in order.
         kwargs: Other keyword arguments are forward to uPlot as options.
     """
     data = prepare_data(x, left, right)

uplot/utils.py

@@ -2,7 +2,10 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2024 Inria
+
+"""Array and JavaScript code utilities."""
+
+import json
 
 import numpy as np
 
@@ -16,13 +19,11 @@ def array2string(array: np.ndarray) -> str:
     Returns:
         String representation of the array.
     """
-    array_str = np.array2string(
-        array,
-        precision=64,
-        separator=",",
-        threshold=np.inf,
-    )
-    return array_str.replace("nan", "null")
+    if array.dtype.kind in "iu":
+        return json.dumps(array.tolist())
+    # tolist() unboxes to Python floats; ``v != v`` is true only for NaN.
+    values = array.tolist()
+    return json.dumps([None if v != v else v for v in values])
 
 
 def js(code: str) -> str:

uplot/write_html_tempfile.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Stéphane Caron
-# Copyright 2023-2024 Inria
 
 """Plot time series."""
 

{uplot_python-1.0.0.dist-info → uplot_python-1.1.1.dist-info}/METADATA

@@ -1,32 +1,35 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: uplot-python
-Version: 1.0.0
+Version: 1.1.1
 Summary: Python wrapper for μPlot time series.
 Keywords: json,time,series,plot
 Author-email: Stéphane Caron <stephane.caron@normalesup.org>
 Maintainer-email: Stéphane Caron <stephane.caron@normalesup.org>
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering :: Mathematics
+License-File: LICENSE
 Requires-Dist: ipython >=8.0.1
 Requires-Dist: msgpack >=1.0.4
 Requires-Dist: numpy >=1.15.4
-Project-URL: Changelog, https://github.com/stephane-caron/uplot-python/blob/master/CHANGELOG.md
-Project-URL: Homepage, https://github.com/stephane-caron/uplot-python
-Project-URL: Source, https://github.com/stephane-caron/uplot-python
-Project-URL: Tracker, https://github.com/stephane-caron/uplot-python/issues
+Project-URL: Changelog, https://codeberg.org/stephane-caron/uplot-python/src/branch/main/CHANGELOG.md
+Project-URL: Homepage, https://codeberg.org/stephane-caron/uplot-python
+Project-URL: Source, https://codeberg.org/stephane-caron/uplot-python
+Project-URL: Tracker, https://codeberg.org/stephane-caron/uplot-python/issues
 
 # uplot-python
 
+[![CI](https://ci.codeberg.org/api/badges/17009/status.svg)](https://ci.codeberg.org/repos/17009)
+[![Conda version](https://img.shields.io/conda/vn/conda-forge/uplot-python.svg)](https://anaconda.org/conda-forge/uplot-python)
+[![PyPI version](https://img.shields.io/pypi/v/uplot-python)](https://pypi.org/project/uplot-python/)
+
 Python wrapper for [μPlot](https://github.com/leeoniya/uPlot) 📈
 
 ## Installation
@@ -75,6 +78,7 @@ uplot.plot2(
 ## See also
 
 - [µPlot](https://github.com/leeoniya/uPlot): A small (~45 KB min), fast chart for time series, lines, areas, ohlc & bars.
+- [foxplot](https://codeberg.org/stephane-caron/foxplot):  Plot time series from MessagePack or line-delimited JSON.
 - [Matplotlib](https://matplotlib.org/stable/): Comprehensive library for creating static, animated, and interactive visualizations.
-- [matplotlive](https://github.com/stephane-caron/matplotlive): Stream live plots to a Matplotlib figure.
+- [matplotlive](https://codeberg.org/stephane-caron/matplotlive): Stream live plots to a Matplotlib figure.
 

uplot_python-1.1.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+uplot/__init__.py,sha256=P8nHtlHy0naNFymrwMmGEVksGKV9z1v1QU_nwtffD2s,245
+uplot/color_picker.py,sha256=TgE1o8V5zGor0Znasmm6zggXdgqh0nk9L1I4wtxOpug,920
+uplot/exceptions.py,sha256=8_2xggNkMpMF-pRsfA8kLWT81l_t2cZ4cfOkwbPql_4,192
+uplot/generate_html.py,sha256=NruX2zDzzTIOuJW4lQ6N60kg05MAH61eWEAijcFKhr0,3713
+uplot/plot.py,sha256=MOGxCDlYdH-n6f380_3wmYCdfjwtU438AtcFYZ4gdiQ,643
+uplot/plot2.py,sha256=oZMruYuAMPQL6-FDv5m2wAy_NVa74PmkjXHN1i1Dln8,5723
+uplot/utils.py,sha256=Tl6ZDtMdtE27PuX3Vje_IQjhZZg40BcfmlXcU02o_Nc,880
+uplot/write_html_tempfile.py,sha256=B68PrF3rQ3mC3i6ujKgHy8cf8V64h4D9DxIqkGdLRQI,661
+uplot/static/__init__.py,sha256=1mykIjCDK2TC5EfbjCTNxfOtJx3P-hIFgbHQEtBfM_o,71
+uplot/static/uPlot.iife.js,sha256=ZVvIqjN4Hochxa9rWfFpnAPJvalRqnSmq1GKwgzEMm0,120184
+uplot/static/uPlot.min.css,sha256=PxIc1KmXtjTgeoh2WIUAGOR1wm8L3dh0EJqNOCwZ3oc,1839
+uplot/static/uPlot.mousewheel.js,sha256=p2CcCwxxafvNqXsxw-zrqUUogxZ1URZhxWK59B0-tgw,4543
+uplot_python-1.1.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+uplot_python-1.1.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+uplot_python-1.1.1.dist-info/METADATA,sha256=fixZpQvCiTf3bI1cYRvF2GpRJeLt6QA94gcKxHuATvM,2933
+uplot_python-1.1.1.dist-info/RECORD,,

{uplot_python-1.0.0.dist-info → uplot_python-1.1.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any

uplot_python-1.0.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-uplot/__init__.py,sha256=cNNmW1r6MVagQ85Otp-Ms55B63KoVTutayVYDDt4Q40,306
-uplot/color_picker.py,sha256=tBcc4t1gN2spSBqmy7gY827GvpzPE2u8N8-6xUMv-YY,962
-uplot/exceptions.py,sha256=iMQrMn8yzcU95-g0vL1Lg03M5FB8vo4ckJpZXEb0TyE,248
-uplot/generate_html.py,sha256=CiwaJZtIShSNAufidH74OCzdJB-7lrm9-f4MDi_AR60,3698
-uplot/plot.py,sha256=GugDtmx2nqcxmwZ20LEbaX06lX0Swvncb9-136tTXqM,654
-uplot/plot2.py,sha256=PmEsGyBEFD0vvvfvD5LYah-hV2Lp48saviqhkGqtWDE,4504
-uplot/utils.py,sha256=0cuQ8XWcDCm0hFvhtUHtt2OeLWf6ujwfSvKokTxuiCQ,775
-uplot/write_html_tempfile.py,sha256=gYbp-btAItW4CX1Wjt2ufhcptdlA0ckFK-xFXA92tGw,722
-uplot/static/__init__.py,sha256=1mykIjCDK2TC5EfbjCTNxfOtJx3P-hIFgbHQEtBfM_o,71
-uplot/static/uPlot.iife.js,sha256=ZVvIqjN4Hochxa9rWfFpnAPJvalRqnSmq1GKwgzEMm0,120184
-uplot/static/uPlot.min.css,sha256=PxIc1KmXtjTgeoh2WIUAGOR1wm8L3dh0EJqNOCwZ3oc,1839
-uplot/static/uPlot.mousewheel.js,sha256=p2CcCwxxafvNqXsxw-zrqUUogxZ1URZhxWK59B0-tgw,4543
-uplot_python-1.0.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-uplot_python-1.0.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-uplot_python-1.0.0.dist-info/METADATA,sha256=b9XQy0hZ17t7ks58s_wIYSOGBDqGwNJHGSIEHAOAh4g,2537
-uplot_python-1.0.0.dist-info/RECORD,,