sqlitexplorer 1.1.2__tar.gz → 1.1.3__tar.gz

{sqlitexplorer-1.1.2/sqlitexplorer.egg-info → sqlitexplorer-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlitexplorer
-Version: 1.1.2
+Version: 1.1.3
 Summary: Explore SQLite databases from the terminal: tables, schema, stats, search, queries, charts, export/import and an interactive shell.
 Author-email: "Carlos A. Planchón" <carlosandresplanchonprestes@gmail.com>
 License-Expression: MIT

{sqlitexplorer-1.1.2 → sqlitexplorer-1.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sqlitexplorer"
-version = "1.1.2"
+version = "1.1.3"
 description = "Explore SQLite databases from the terminal: tables, schema, stats, search, queries, charts, export/import and an interactive shell."
 readme = "README.md"
 license = "MIT"

{sqlitexplorer-1.1.2 → sqlitexplorer-1.1.3}/sqlitexplorer/charts.py

@@ -7,7 +7,7 @@ other column is a numeric series. Histograms use the first column only.
 from __future__ import annotations
 
 import os
-from collections.abc import Iterator, Sequence
+from collections.abc import Callable, Iterator, Sequence
 from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
@@ -18,6 +18,7 @@ import plotille
 import plotilleresample
 
 from sqlitexplorer.core import ExplorerError, ResultSet, RowStream
+from sqlitexplorer.render import strip_ansi
 
 __all__ = [
     "ChartKind",
@@ -33,8 +34,11 @@ __all__ = [
 PALETTE = ("red", "green", "yellow", "blue", "magenta", "cyan")
 # plotille reserves this many characters for the Y axis label.
 AXIS_LABEL_WIDTH = 8
-# Characters taken by the Y axis (ticks, label and separator) next to the canvas.
-AXIS_WIDTH = 12
+# Characters the Y axis takes next to the canvas: ten for the tick, then
+# " | ". plotille writes past the canvas too, which _fit takes care of.
+AXIS_WIDTH = 13
+# Narrowest canvas worth drawing on when the labels ask for too much room.
+MIN_CANVAS = 10
 # A tuple, not bool | int | float: the union would be rebuilt on every call,
 # and this runs once per value of the result.
 _NUMERIC = (bool, int, float)
@@ -226,7 +230,23 @@ def _color_environment(enabled: bool) -> Iterator[None]:
 
 
 def _canvas_width(width: int) -> int:
-    return max(10, width - AXIS_WIDTH)
+    return max(MIN_CANVAS, width - AXIS_WIDTH)
+
+
+def _fit(draw: Callable[[int], str], width: int) -> str:
+    """Draw on the widest canvas whose longest line still fits in *width*.
+
+    plotille writes the X label and the tick numbers past the end of the
+    canvas, by an amount that depends on both, so the only way to know the
+    room they take is to draw and measure.
+    """
+    canvas = _canvas_width(width)
+    while True:
+        drawing = draw(canvas)
+        excess = max(len(strip_ansi(line)) for line in drawing.splitlines()) - width
+        if excess <= 0 or canvas <= MIN_CANVAS:
+            return drawing
+        canvas = max(MIN_CANVAS, canvas - excess)
 
 
 def render_chart(
@@ -240,21 +260,25 @@ def render_chart(
     y_label: str,
 ) -> str:
     """Draw *series* as a line chart or scatter plot, with a legend when there are several."""
-    figure = plotille.Figure()
-    figure.width = _canvas_width(width)
-    figure.height = max(3, height)
-    figure.with_colors = color
-    figure.color_mode = "names"
-    figure.x_label = x_label
-    figure.y_label = y_label[:AXIS_LABEL_WIDTH]
-    for index, item in enumerate(series):
-        line_color = PALETTE[index % len(PALETTE)] if color else None
-        if kind is ChartKind.SCATTER:
-            figure.scatter(item.x, item.y, lc=line_color, label=item.label)
-        else:
-            figure.plot(item.x, item.y, lc=line_color, label=item.label)
-    with _color_environment(color):
-        return figure.show(legend=len(series) > 1)
+
+    def draw(canvas: int) -> str:
+        figure = plotille.Figure()
+        figure.width = canvas
+        figure.height = max(3, height)
+        figure.with_colors = color
+        figure.color_mode = "names"
+        figure.x_label = x_label
+        figure.y_label = y_label[:AXIS_LABEL_WIDTH]
+        for index, item in enumerate(series):
+            line_color = PALETTE[index % len(PALETTE)] if color else None
+            if kind is ChartKind.SCATTER:
+                figure.scatter(item.x, item.y, lc=line_color, label=item.label)
+            else:
+                figure.plot(item.x, item.y, lc=line_color, label=item.label)
+        with _color_environment(color):
+            return figure.show(legend=len(series) > 1)
+
+    return _fit(draw, width)
 
 
 def render_histogram(
@@ -268,13 +292,18 @@ def render_histogram(
     y_label: str,
 ) -> str:
     """Draw the distribution of *values*."""
-    with _color_environment(color):
-        return plotille.histogram(
-            list(values),
-            bins=bins,
-            width=_canvas_width(width),
-            height=max(3, height),
-            X_label=x_label,
-            Y_label=y_label[:AXIS_LABEL_WIDTH],
-            lc=PALETTE[0] if color else None,
-        )
+    numbers = list(values)
+
+    def draw(canvas: int) -> str:
+        with _color_environment(color):
+            return plotille.histogram(
+                numbers,
+                bins=bins,
+                width=canvas,
+                height=max(3, height),
+                X_label=x_label,
+                Y_label=y_label[:AXIS_LABEL_WIDTH],
+                lc=PALETTE[0] if color else None,
+            )
+
+    return _fit(draw, width)

{sqlitexplorer-1.1.2 → sqlitexplorer-1.1.3/sqlitexplorer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlitexplorer
-Version: 1.1.2
+Version: 1.1.3
 Summary: Explore SQLite databases from the terminal: tables, schema, stats, search, queries, charts, export/import and an interactive shell.
 Author-email: "Carlos A. Planchón" <carlosandresplanchonprestes@gmail.com>
 License-Expression: MIT

{sqlitexplorer-1.1.2 → sqlitexplorer-1.1.3}/tests/test_charts.py

@@ -7,7 +7,10 @@ from datetime import datetime
 import pytest
 
 from sqlitexplorer.charts import (
+    AXIS_WIDTH,
+    MIN_CANVAS,
     ChartKind,
+    Series,
     histogram_values,
     render_chart,
     render_histogram,
@@ -16,6 +19,7 @@ from sqlitexplorer.charts import (
     stream_series,
 )
 from sqlitexplorer.core import ExplorerError, ResultSet, RowStream
+from sqlitexplorer.render import strip_ansi
 
 
 def braille(text: str) -> bool:
@@ -227,3 +231,61 @@ def test_series_from_result_can_allow_an_empty_result() -> None:
     series, skipped = series_from_result(ResultSet(columns=("x", "y")), require_rows=False)
     assert [item.label for item in series] == ["y"]
     assert series[0].x == [] and skipped == 0
+
+
+def _widest(drawing: str) -> int:
+    return max(len(strip_ansi(line)) for line in drawing.splitlines())
+
+
+@pytest.mark.parametrize("width", [60, 80, 96, 120, 200])
+@pytest.mark.parametrize("x_label", ["t", "taken_at", "placed_at_utc"])
+def test_render_chart_never_draws_wider_than_the_terminal(width: int, x_label: str) -> None:
+    xs = [float(i) for i in range(400)]
+    series = [
+        Series(label="celsius", x=xs, y=[(i % 17) * 1.37 for i in range(400)]),
+        Series(label="humidity", x=xs, y=[60 - (i % 11) for i in range(400)]),
+    ]
+    for color in (False, True):
+        for one in (series[:1], series):
+            drawing = render_chart(
+                one,
+                kind=ChartKind.LINE,
+                width=width,
+                height=9,
+                color=color,
+                x_label=x_label,
+                y_label="value",
+            )
+            assert _widest(drawing) <= width, (width, x_label, color, len(one))
+
+
+@pytest.mark.parametrize("width", [40, 60, 80, 96, 120, 200])
+def test_render_histogram_never_draws_wider_than_the_terminal(width: int) -> None:
+    drawing = render_histogram(
+        [float(i % 97) for i in range(2000)],
+        bins=10,
+        width=width,
+        height=6,
+        color=False,
+        x_label="celsius",
+        y_label="count",
+    )
+    assert _widest(drawing) <= width
+
+
+def test_render_chart_stops_narrowing_at_the_floor() -> None:
+    # A label wider than the terminal cannot be made to fit, so the canvas
+    # narrows to MIN_CANVAS and stops there instead of shrinking to nothing.
+    series = [Series(label="v", x=[0.0, 1.0, 2.0], y=[0.0, 1.0, 0.5])]
+    drawing = render_chart(
+        series,
+        kind=ChartKind.LINE,
+        width=40,
+        height=5,
+        color=False,
+        x_label="a_label_far_too_long_for_this_terminal",
+        y_label="v",
+    )
+    body = [line for line in drawing.splitlines() if braille(line)]
+    assert body, drawing
+    assert max(len(line) for line in body) == MIN_CANVAS + AXIS_WIDTH