plot3 0.6.5__tar.gz → 0.6.6__tar.gz

{plot3-0.6.5 → plot3-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.6.5
+Version: 0.6.6
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT
@@ -260,6 +260,17 @@ In notebooks, bare column names work as in R: `aes(x=dose, y=response)`.
 - **Jupyter / SolveIt**: bare column names and backticks work in `aes()`,
   `facet_wrap()`, and `facet_grid()` (`aes(x=`First Name`)`). Toggle with
   `enable_r_style()` / `disable_r_style()`. `.py` files keep quoted strings.
+- **Layers on their own lines**, as in R, with no parentheses:
+
+  ```text
+  ggplot(gapminder, aes(x=gdpPercap, y=lifeExp, colour=continent))
+  + geom_point(alpha=0.7)       # comments are fine
+  + scale_x_log10()
+  ```
+
+  A line starting with `+` and a plot3 function continues the plot above
+  it. Import plot3 in an earlier cell: IPython reads a whole cell before
+  running any of it. `.py` files keep the outer parentheses.
 - **SolveIt** draws figures inline and hides their HTML from the model's
   context (`autohide(False)` to opt out).
 - **VS Code notebooks** block WebGL in output cells, so plot3 opens figures

{plot3-0.6.5 → plot3-0.6.6}/README.md

@@ -233,6 +233,17 @@ In notebooks, bare column names work as in R: `aes(x=dose, y=response)`.
 - **Jupyter / SolveIt**: bare column names and backticks work in `aes()`,
   `facet_wrap()`, and `facet_grid()` (`aes(x=`First Name`)`). Toggle with
   `enable_r_style()` / `disable_r_style()`. `.py` files keep quoted strings.
+- **Layers on their own lines**, as in R, with no parentheses:
+
+  ```text
+  ggplot(gapminder, aes(x=gdpPercap, y=lifeExp, colour=continent))
+  + geom_point(alpha=0.7)       # comments are fine
+  + scale_x_log10()
+  ```
+
+  A line starting with `+` and a plot3 function continues the plot above
+  it. Import plot3 in an earlier cell: IPython reads a whole cell before
+  running any of it. `.py` files keep the outer parentheses.
 - **SolveIt** draws figures inline and hides their HTML from the model's
   context (`autohide(False)` to opt out).
 - **VS Code notebooks** block WebGL in output cells, so plot3 opens figures

plot3-0.6.6/plot3/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.6.6"

{plot3-0.6.5 → plot3-0.6.6}/plot3/jupyter.py

@@ -22,6 +22,7 @@ from plot3.masking import (
     is_mask_transformer,
     is_tidy3_backtick_transformer,
     plot3_backtick_transform,
+    plot3_layer_transform,
 )
 
 # R-style bare-name / backtick masking for aes() / facet_wrap().
@@ -463,6 +464,28 @@ def run_plot3_from_magic(line: str = ""):
 # ═════════════════════════════════════════════════════════════════════════════
 
 
+def enable_layer_lines(ipython: Any | None = None) -> bool:
+    """Let ``+ geom_point()`` lines continue the ggplot above them in a cell.
+
+    ``ggplot(df, aes(...))`` then ``+ geom_point()`` on the next lines, with
+    no parentheses, as in R. Only a ``+`` followed by a plot3 name joins, so
+    ordinary Python is never rewritten.
+    """
+    if ipython is None:
+        try:
+            ipython = get_ipython() if get_ipython is not None else None
+        except Exception:
+            ipython = None
+    transformers = getattr(ipython, "input_transformers_cleanup", None)
+    if not isinstance(transformers, list):
+        return False
+    transformers[:] = [
+        t for t in transformers if getattr(t, "__name__", "") != "plot3_layer_transform"
+    ]
+    transformers.append(plot3_layer_transform)
+    return True
+
+
 def register_plot3(*, quiet=True, r_style: bool = True) -> bool:
     if get_ipython is None:
         return False
@@ -495,6 +518,12 @@ def register_plot3(*, quiet=True, r_style: bool = True) -> bool:
             ns[name] = getattr(plot3_pkg, name)
     except Exception:
         pass
+    # ggplot(...) then "+ geom_point()" lines, without parentheses
+    try:
+        enable_layer_lines(ip)
+    except Exception as e:
+        if not quiet:
+            print(f"plot3: multi-line layers not enabled: {e}")
     # R-style bare names / backticks in aes() (ggplot2 parity with tidy3)
     if r_style:
         try:

{plot3-0.6.5 → plot3-0.6.6}/plot3/masking.py

@@ -179,6 +179,138 @@ def plot3_backtick_transform(lines: list[str]) -> list[str]:
     return parts or [out]
 
 
+_OPENERS = frozenset("([{")
+_CLOSERS = frozenset(")]}")
+_SKIP_TOKENS = frozenset({
+    tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE, tokenize.INDENT,
+    tokenize.DEDENT, tokenize.ENCODING, tokenize.ENDMARKER,
+})
+
+
+def _plot3_names() -> set[str]:
+    try:
+        import plot3
+
+        return {str(name) for name in getattr(plot3, "__all__", ())}
+    except Exception:
+        return set()
+
+
+def _logical_lines(text: str) -> list[list[tokenize.TokenInfo]] | None:
+    """Token lists, one per logical line; ``None`` if *text* cannot tokenize."""
+    lines: list[list[tokenize.TokenInfo]] = []
+    current: list[tokenize.TokenInfo] = []
+    try:
+        for token in tokenize.generate_tokens(io.StringIO(text).readline):
+            if token.type in _SKIP_TOKENS:
+                if token.type == tokenize.NEWLINE and current:
+                    lines.append(current)
+                    current = []
+                continue
+            current.append(token)
+    except (tokenize.TokenError, IndentationError, SyntaxError):
+        return None
+    if current:
+        lines.append(current)
+    return lines
+
+
+def _value_start(tokens: list[tokenize.TokenInfo]) -> tuple[int, int]:
+    """Where the expression starts: after a top-level ``=``, else the start."""
+    depth = 0
+    for index, token in enumerate(tokens):
+        if token.string in _OPENERS:
+            depth += 1
+        elif token.string in _CLOSERS:
+            depth -= 1
+        elif depth == 0 and token.type == tokenize.OP and token.string == "=":
+            if index + 1 < len(tokens):
+                return tokens[index + 1].start
+    return tokens[0].start
+
+
+def join_layer_lines(source: str) -> str | None:
+    """Join ``+`` lines that add plot3 layers to the statement above them.
+
+    In a notebook, ``ggplot(df, aes(...))`` followed by lines that start
+    with ``+ geom_point()`` reads like R, but to Python each ``+`` line is
+    a statement of its own (unary plus, or an IndentationError when
+    indented). A line whose first token is ``+`` followed by a plot3 name
+    continues the top-level statement above it, across comments and blank
+    lines; the expression gets parentheses on the lines as typed, so error
+    line numbers still match. Returns ``None`` when nothing needs joining,
+    or when the result would not parse. Pipes (``>>``) are tidy3's.
+    """
+    if not source or "+" not in source:
+        return None
+    raw = source.split("\n")
+    if not any(line.lstrip().startswith("+") for line in raw):
+        return None
+    names = _plot3_names()
+    # Indented "+ geom_point()" lines must not trip the tokenizer.
+    shift = [len(line) - len(line.lstrip()) if line.lstrip().startswith("+") else 0 for line in raw]
+    analysed = "\n".join(line[n:] for line, n in zip(raw, shift))
+    logical = _logical_lines(analysed)
+    if not logical:
+        return None
+
+    def is_layer(tokens: list[tokenize.TokenInfo]) -> bool:
+        return (
+            len(tokens) > 1
+            and tokens[0].type == tokenize.OP
+            and tokens[0].string == "+"
+            and tokens[1].type == tokenize.NAME
+            and tokens[1].string in names
+        )
+
+    groups: list[list[list[tokenize.TokenInfo]]] = []
+    for tokens in logical:
+        previous = groups[-1] if groups else None
+        head = previous[0][0] if previous else None
+        if (
+            previous is not None
+            and is_layer(tokens)
+            and head.start[1] == 0
+            and head.type != tokenize.OP
+            and head.string not in {"if", "for", "while", "with", "def", "class", "try", "elif", "else", "except", "finally", "return", "import", "from"}
+        ):
+            previous.append(tokens)
+        else:
+            groups.append([tokens])
+
+    edits: list[tuple[int, int, str]] = []
+    for group in groups:
+        if len(group) < 2:
+            continue
+        opening = _value_start(group[0])
+        closing = group[-1][-1].end
+        edits.append((opening[0], opening[1] + shift[opening[0] - 1], "("))
+        edits.append((closing[0], closing[1] + shift[closing[0] - 1], ")"))
+    if not edits:
+        return None
+    lines = list(raw)
+    for row, col, piece in sorted(edits, reverse=True):
+        line = lines[row - 1]
+        lines[row - 1] = line[:col] + piece + line[col:]
+    rewritten = "\n".join(lines)
+    try:
+        ast.parse(rewrite_backticks(rewritten))
+    except SyntaxError:
+        return None
+    return rewritten
+
+
+def plot3_layer_transform(lines: list[str]) -> list[str]:
+    """IPython input transformer: ``+`` lines continue a ggplot (see join_layer_lines)."""
+    if not lines:
+        return lines
+    source = "".join(lines)
+    out = join_layer_lines(source)
+    if out is None:
+        return lines
+    return out.splitlines(keepends=True)
+
+
 def _is_bt_call(node: ast.AST) -> bool:
     return (
         isinstance(node, ast.Call)

{plot3-0.6.5 → plot3-0.6.6}/plot3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.6.5
+Version: 0.6.6
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT
@@ -260,6 +260,17 @@ In notebooks, bare column names work as in R: `aes(x=dose, y=response)`.
 - **Jupyter / SolveIt**: bare column names and backticks work in `aes()`,
   `facet_wrap()`, and `facet_grid()` (`aes(x=`First Name`)`). Toggle with
   `enable_r_style()` / `disable_r_style()`. `.py` files keep quoted strings.
+- **Layers on their own lines**, as in R, with no parentheses:
+
+  ```text
+  ggplot(gapminder, aes(x=gdpPercap, y=lifeExp, colour=continent))
+  + geom_point(alpha=0.7)       # comments are fine
+  + scale_x_log10()
+  ```
+
+  A line starting with `+` and a plot3 function continues the plot above
+  it. Import plot3 in an earlier cell: IPython reads a whole cell before
+  running any of it. `.py` files keep the outer parentheses.
 - **SolveIt** draws figures inline and hides their HTML from the model's
   context (`autohide(False)` to opt out).
 - **VS Code notebooks** block WebGL in output cells, so plot3 opens figures

{plot3-0.6.5 → plot3-0.6.6}/tests/test_masking.py

@@ -197,3 +197,44 @@ def test_aes_expression_over_columns_passes_whole():
     # Notebook variables and modules keep the old behaviour.
     assert apply_masking("aes(x=np.log(x))", known=known) == "aes(x=np.log('x'))"
     assert apply_masking("aes(x=wt)", known=known) == "aes(x='wt')"
+
+
+def test_plus_lines_continue_a_ggplot():
+    # ggplot(...) then "+ geom_point()" lines, as in R: to Python each "+"
+    # line is its own statement (unary plus, or an IndentationError).
+    import ast
+
+    from plot3.masking import join_layer_lines
+
+    cell = (
+        'ggplot(df, aes(x="a", y="b"))\n'
+        ' + geom_point(alpha=0.7)\n'
+        ' + scale_x_log10()'
+    )
+    joined = join_layer_lines(cell)
+    assert joined == (
+        '(ggplot(df, aes(x="a", y="b"))\n'
+        ' + geom_point(alpha=0.7)\n'
+        ' + scale_x_log10())'
+    )
+    tree = ast.parse(joined)
+    assert len(tree.body) == 1
+
+    # An assignment, with comments and a blank line between layers.
+    cell = 'p = ggplot(df)   # base\n# layers\n+ geom_point()  # points\n\n+ theme_bw()\np'
+    joined = join_layer_lines(cell)
+    assert joined.startswith("p = (ggplot(df)") and "+ theme_bw())" in joined
+    assert len(ast.parse(joined).body) == 2
+
+    # patchwork: a composition takes "+ plot_layout(...)" lines too.
+    assert join_layer_lines("fig = (a | b)\n+ plot_layout(widths=[3, 2])").startswith("fig = ((a | b)")
+
+
+def test_plus_lines_leave_other_python_alone():
+    from plot3.masking import join_layer_lines
+
+    assert join_layer_lines("x = 1\n+2") is None                      # unary plus
+    assert join_layer_lines("y = 1\n+ foo(2)") is None                # not a plot3 name
+    assert join_layer_lines("df\n>> ggplot()\n+ geom_point()") is None  # tidy3's pipe
+    assert join_layer_lines("for i in r:\n    p = ggplot(df)\n    + geom_point()") is None
+    assert join_layer_lines("p = ggplot(df) + geom_point()") is None  # already one line

plot3-0.6.5/plot3/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.6.5"