plot3 0.8.0__tar.gz → 0.9.0__tar.gz

{plot3-0.8.0 → plot3-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.8.0
+Version: 0.9.0
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24
 Requires-Dist: pandas>=2.0
-Requires-Dist: tidysyntax<0.2,>=0.1
+Requires-Dist: tidy3syntax<0.2,>=0.1.2
 Provides-Extra: pdf
 Requires-Dist: cairosvg>=2.7; extra == "pdf"
 Provides-Extra: dev

plot3-0.9.0/plot3/__version__.py

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

{plot3-0.8.0 → plot3-0.9.0}/plot3/jupyter.py

@@ -4,10 +4,12 @@ from __future__ import annotations
 
 import json
 import shlex
+import dataclasses
 from typing import Any
 
 import numpy as np
 import pandas as pd
+import tidy3syntax.ipython
 
 try:
     from IPython import get_ipython
@@ -17,13 +19,11 @@ except Exception:  # pragma: no cover
 from plot3.io import ssh_bytes
 from plot3.masking import (
     BT_NAME,
+    DIALECT,
     Plot3MaskTransformer,
+    _plot3_names,
     is_backtick_transformer,
     is_mask_transformer,
-    is_tidy3_backtick_transformer,
-    plot3_backtick_transform,
-    plot3_formula_transform,
-    plot3_layer_transform,
 )
 
 # R-style bare-name / backtick masking for aes() / facet_wrap().
@@ -60,34 +60,39 @@ def enable_r_style(ipython: Any | None = None) -> bool:
     if ns is not None:
         # Escape hatch if AST missed a sentinel (still a valid column string).
         ns[BT_NAME] = _bt_fallback
-        # When tidy3 is not loaded, leave tidy3 sentinel unset; plot3 AST
-        # still rewrites __tidy3_bt__ if tidy3's preparser ran first.
 
-    # Source preparser: when tidy3 already rewrites backticks, run only
-    # plot3's own formula rewrites (^ in geom_function, ~ in facets), after it.
+    # The source rewrites (backticks, facet formulas, ^ in geom_function,
+    # + layer lines) go through tidy3syntax's coordinator, one transformer
+    # shared with tidy3, tidy3a and stats3; the AST pass masks aes() names.
+    _remove_own(ipython)
+    tidy3syntax.ipython.register(ipython, _dialect(), ast_transformer=Plot3MaskTransformer())
+    return True
+
+
+def _dialect():
+    """plot3's dialect, with every public plot3 name as a layer a "+" line may add."""
+    return dataclasses.replace(DIALECT, layer_calls=frozenset(_plot3_names()))
+
+
+def _layers_only():
+    """Only the "+" layer lines, for R-style masking turned off."""
+    return dataclasses.replace(
+        _dialect(), formula_calls=(), formula_keywords=(), power_calls=(), unary_formula_calls=()
+    )
+
+
+def _remove_own(ipython: Any) -> None:
+    """An earlier plot3's own transformers, from before the coordinator."""
     for attr in ("input_transformers_cleanup", "input_transformers_post"):
         transformers = getattr(ipython, attr, None)
-        if not isinstance(transformers, list):
-            continue
-        transformers[:] = [
-            t for t in transformers if not is_backtick_transformer(t)
-        ]
-        tidy3_at = [
-            i for i, t in enumerate(transformers) if is_tidy3_backtick_transformer(t)
-        ]
-        if tidy3_at:
-            transformers.insert(tidy3_at[-1] + 1, plot3_formula_transform)
-        else:
-            transformers.insert(0, plot3_backtick_transform)
-
-    # AST pass for bare names inside aes / facet_wrap.
+        if isinstance(transformers, list):
+            transformers[:] = [
+                t for t in transformers
+                if not is_backtick_transformer(t) and getattr(t, "__name__", "") != "plot3_layer_transform"
+            ]
     ast_transformers = getattr(ipython, "ast_transformers", None)
     if isinstance(ast_transformers, list):
-        ast_transformers[:] = [
-            t for t in ast_transformers if not is_mask_transformer(t)
-        ]
-        ast_transformers.append(Plot3MaskTransformer())
-    return True
+        ast_transformers[:] = [t for t in ast_transformers if not is_mask_transformer(t)]
 
 
 def disable_r_style(ipython: Any | None = None) -> None:
@@ -101,17 +106,9 @@ def disable_r_style(ipython: Any | None = None) -> None:
             ipython = None
     if ipython is None:
         return
-    for attr in ("input_transformers_cleanup", "input_transformers_post"):
-        transformers = getattr(ipython, attr, None)
-        if isinstance(transformers, list):
-            transformers[:] = [
-                t for t in transformers if not is_backtick_transformer(t)
-            ]
-    ast_transformers = getattr(ipython, "ast_transformers", None)
-    if isinstance(ast_transformers, list):
-        ast_transformers[:] = [
-            t for t in ast_transformers if not is_mask_transformer(t)
-        ]
+    _remove_own(ipython)
+    # The "+" layer lines stay, as before: only the R-style masking goes.
+    tidy3syntax.ipython.register(ipython, _layers_only())
 
 
 def r_style_enabled() -> bool:
@@ -482,20 +479,20 @@ def enable_layer_lines(ipython: Any | None = None) -> bool:
             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):
+    if ipython is None or not isinstance(getattr(ipython, "input_transformers_cleanup", None), list):
         return False
-    transformers[:] = [
-        t for t in transformers if getattr(t, "__name__", "") != "plot3_layer_transform"
-    ]
-    transformers.append(plot3_layer_transform)
+    # The layer lines are part of plot3's dialect in tidy3syntax's coordinator.
+    if "plot3" not in tidy3syntax.ipython.registered(ipython):
+        tidy3syntax.ipython.register(ipython, _layers_only())
     return True
 
 
-def register_plot3(*, quiet=True, r_style: bool = True) -> bool:
-    if get_ipython is None:
-        return False
-    ip = get_ipython()
+def register_plot3(*, quiet=True, r_style: bool = True, ipython: Any | None = None) -> bool:
+    ip = ipython
+    if ip is None:
+        if get_ipython is None:
+            return False
+        ip = get_ipython()
     if ip is None:
         return False
     ok = False
@@ -546,4 +543,15 @@ def register_plot3(*, quiet=True, r_style: bool = True) -> bool:
 
 
 def load_ipython_extension(ip=None):
-    register_plot3(quiet=True)
+    register_plot3(quiet=True, ipython=ip)
+
+
+def dialect():
+    """plot3's dialect for tidy3syntax (its ``tidy3syntax.dialects`` entry point): the
+    notebook loader, and plot3's bare-name masking for exports."""
+    from plot3.masking import apply_masking, default_known_names
+
+    def mask(source: str, known: frozenset[str]) -> str:
+        return apply_masking(source, known=set(known) | default_known_names(), backticks=False)
+
+    return dataclasses.replace(_dialect(), extension="plot3.jupyter:load_ipython_extension", mask=mask)

{plot3-0.8.0 → plot3-0.9.0}/plot3/masking.py

@@ -36,14 +36,15 @@ import re
 import tokenize
 from typing import Any, Iterable
 
-import tidysyntax
-from tidysyntax import repairs
-from tidysyntax.scanner import Spans, apply
+import tidy3syntax
+from tidy3syntax import repairs
+from tidy3syntax.scanner import Spans, apply
 
 # Sentinels (plot3 own + tidy3 compatibility).
 BT_NAME = "__plot3_bt__"
 TIDY3_BT_NAME = "__tidy3_bt__"
-_BT_SENTINELS = frozenset({BT_NAME, TIDY3_BT_NAME})
+# tidy3syntax's neutral name too: another package's pass (tidy3a's) may rewrite a backtick in aes() first.
+_BT_SENTINELS = frozenset({BT_NAME, TIDY3_BT_NAME, tidy3syntax.NAME})
 
 # Calls whose arguments / keywords are column *selectors* (→ strings).
 _SELECTOR_FUNCS = frozenset(
@@ -116,11 +117,11 @@ _FORMULA_CALLS = frozenset({"geom_function", "geom_vector_field"})
 _FACETS = frozenset({"facet_wrap", "facet_grid"})
 
 # plot3's part of the notebook syntax tidy3, tidy3a, plot3 and stats3 share
-# (tidysyntax). ``drv ~ cyl`` and ``~`my col``` are not Python, so they are
+# (tidy3syntax). ``drv ~ cyl`` and ``~`my col``` are not Python, so they are
 # quoted in any facet call; ``^`` in geom_function (XOR in Python) and ``~cyl``
 # in a facet (bitwise not) are valid Python, so they are rewritten only where
 # the call is plot3's: a notebook's own geom_function keeps XOR.
-DIALECT = tidysyntax.Dialect(
+DIALECT = tidy3syntax.Dialect(
     "plot3",
     formula_calls=_FACETS,
     formula_keywords={"facets"},
@@ -147,13 +148,13 @@ def _session_namespace(namespace: Any) -> dict[str, Any] | None:
 
 
 def _plot3_bt(source: str) -> str:
-    """tidysyntax's ``__r_name__`` placeholder as plot3's ``__plot3_bt__``, outside strings and comments."""
-    if tidysyntax.NAME not in source:
+    """tidy3syntax's ``__r_name__`` placeholder as plot3's ``__plot3_bt__``, outside strings and comments."""
+    if tidy3syntax.NAME not in source:
         return source
     spans = Spans.of(source)
     edits = [
         (m.start(), m.end(), BT_NAME)
-        for m in re.finditer(re.escape(tidysyntax.NAME) + r"(?=\s*\()", source)
+        for m in re.finditer(re.escape(tidy3syntax.NAME) + r"(?=\s*\()", source)
         if m.start() in spans
     ]
     return apply(source, edits)
@@ -178,7 +179,7 @@ def rewrite_facet_formulas(source: str, *, unary: str = "owned", namespace: Any
     source = repairs.quote_formulas(source, [DIALECT])
     if unary == "never":
         return source
-    return tidysyntax.reinterpret(source, [_FACETS_ONLY], _session_namespace(namespace))
+    return tidy3syntax.reinterpret(source, [_FACETS_ONLY], _session_namespace(namespace))
 
 
 def rewrite_formulas(source: str, namespace: Any = _SESSION) -> str:
@@ -188,7 +189,7 @@ def rewrite_formulas(source: str, namespace: Any = _SESSION) -> str:
     ``drv ~ cyl`` is quoted first, since the cell must parse before the
     ownership of ``geom_function`` and ``facet_wrap`` can be read."""
     source = repairs.quote_formulas(source, [DIALECT])
-    return tidysyntax.reinterpret(source, [DIALECT], _session_namespace(namespace))
+    return tidy3syntax.reinterpret(source, [DIALECT], _session_namespace(namespace))
 
 
 def rewrite_formula_carets(source: str, namespace: Any = _SESSION) -> str:
@@ -199,7 +200,7 @@ def rewrite_formula_carets(source: str, namespace: Any = _SESSION) -> str:
     ``geom_function`` is rewritten: in a notebook's own function of that
     name, ``^`` stays XOR.
     """
-    return tidysyntax.reinterpret(source, [_POWER_ONLY], _session_namespace(namespace))
+    return tidy3syntax.reinterpret(source, [_POWER_ONLY], _session_namespace(namespace))
 
 
 def rewrite_backticks(source: str, namespace: Any = _SESSION) -> str:
@@ -211,7 +212,7 @@ def rewrite_backticks(source: str, namespace: Any = _SESSION) -> str:
     not Python goes first, so the cell parses when the ownership of
     ``geom_function`` and ``facet_wrap`` is read.
     """
-    return tidysyntax.reinterpret(_repair(source), [DIALECT], _session_namespace(namespace))
+    return tidy3syntax.reinterpret(_repair(source), [DIALECT], _session_namespace(namespace))
 
 
 def _parse_dedented(source: str) -> tuple[ast.Module, list[int]] | None:
@@ -339,7 +340,7 @@ def join_layer_lines(source: str, namespace: Any = _SESSION) -> str | None:
     if not logical:
         return None
     parsed = _parse_dedented(_repair(source))
-    owners = tidysyntax.Owners(parsed[0], _session_namespace(namespace), [DIALECT]) if parsed is not None else None
+    owners = tidy3syntax.Owners(parsed[0], _session_namespace(namespace), [DIALECT]) if parsed is not None else None
 
     def plot3_name(name: str, row: int) -> bool:
         return owners is not None and DIALECT.owns_module(owners.module(name, (row, 0)))
@@ -359,7 +360,7 @@ def join_layer_lines(source: str, namespace: Any = _SESSION) -> str | None:
         if bound:
             return bound[-1] is None or DIALECT.owns_module(bound[-1])
         if owners.context is not None and name in owners.context:
-            return DIALECT.owns_module(tidysyntax.module_of(owners.context[name]))
+            return DIALECT.owns_module(tidy3syntax.module_of(owners.context[name]))
         return True
 
     def may_join(tokens: list[tokenize.TokenInfo], head: list[tokenize.TokenInfo]) -> bool:
@@ -493,6 +494,22 @@ class Plot3MaskTransformer(ast.NodeTransformer):
 
     def __init__(self, known: set[str] | None = None):
         self._known_static = known
+        self._owners: tidy3syntax.Owners | None = None
+
+    def visit_Module(self, node: ast.Module) -> ast.AST:
+        # Whose aes() or facet_wrap() each call is: a notebook's own function of that name keeps
+        # its arguments as written (tidy3syntax's rule, as for the source rewrites).
+        namespace = None if self._known_static is not None else _session_namespace(_SESSION)
+        self._owners = tidy3syntax.Owners(node, namespace, [DIALECT])
+        try:
+            return self.generic_visit(node)
+        finally:
+            self._owners = None
+
+    def _plot3s(self, func: ast.AST) -> bool:
+        if self._owners is None:
+            return True
+        return self._owners.owner(func, (func.lineno, func.col_offset)) == "plot3"
 
     def _known(self) -> set[str]:
         if self._known_static is not None:
@@ -541,6 +558,8 @@ class Plot3MaskTransformer(ast.NodeTransformer):
             return self.generic_visit(node)
 
         name = node.func.id
+        if (name in _FORMULA_CALLS or name in _SELECTOR_FUNCS) and not self._plot3s(node.func):
+            return self.generic_visit(node)
         if name in _FORMULA_CALLS:
             return self._visit_geom_function(node)
         if name not in _SELECTOR_FUNCS:

{plot3-0.8.0 → plot3-0.9.0}/plot3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.8.0
+Version: 0.9.0
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24
 Requires-Dist: pandas>=2.0
-Requires-Dist: tidysyntax<0.2,>=0.1
+Requires-Dist: tidy3syntax<0.2,>=0.1.2
 Provides-Extra: pdf
 Requires-Dist: cairosvg>=2.7; extra == "pdf"
 Provides-Extra: dev

{plot3-0.8.0 → plot3-0.9.0}/plot3.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ plot3/viewer.py
 plot3.egg-info/PKG-INFO
 plot3.egg-info/SOURCES.txt
 plot3.egg-info/dependency_links.txt
+plot3.egg-info/entry_points.txt
 plot3.egg-info/requires.txt
 plot3.egg-info/top_level.txt
 tests/test_2d_density.py

plot3-0.9.0/plot3.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[tidy3syntax.dialects]
+plot3 = plot3.jupyter:dialect

{plot3-0.8.0 → plot3-0.9.0}/plot3.egg-info/requires.txt

@@ -1,6 +1,6 @@
 numpy>=1.24
 pandas>=2.0
-tidysyntax<0.2,>=0.1
+tidy3syntax<0.2,>=0.1.2
 
 [dev]
 pytest>=7.0

{plot3-0.8.0 → plot3-0.9.0}/pyproject.toml

@@ -24,13 +24,18 @@ dependencies = [
   "pandas>=2.0",
   # The notebook syntax tidy3, tidy3a, plot3 and stats3 share (facet
   # formulas, ^ in geom_function, backtick names). Standard library only.
-  "tidysyntax>=0.1,<0.2",
+  "tidy3syntax>=0.1.2,<0.2",
 ]
 
 [project.optional-dependencies]
 pdf = ["cairosvg>=2.7"]
 dev = ["pytest>=7.0", "polars>=1.0", "contourpy>=1.0"]
 
+# A notebook cell that imports plot3 gets its syntax in that same cell
+# (its dialect names the notebook loader tidy3syntax's coordinator calls).
+[project.entry-points."tidy3syntax.dialects"]
+plot3 = "plot3.jupyter:dialect"
+
 [project.urls]
 Homepage = "https://github.com/rleyvasal/plot3"
 Changelog = "https://github.com/rleyvasal/plot3/blob/main/CHANGELOG.md"

{plot3-0.8.0 → plot3-0.9.0}/tests/test_masking.py

@@ -309,11 +309,10 @@ _fake_tidy3_transform.__module__ = "tidy3.masking"
 _fake_tidy3_transform.__name__ = "tidy3_backtick_transform"
 
 
-def test_formula_rewrites_run_after_tidy3_preparser():
-    # tidy3 imported first: plot3 still rewrites ^ in geom_function and ~ in
-    # facets, after tidy3's backticks, and installs no second backtick pass.
+def test_one_coordinator_ahead_of_other_transformers():
+    # plot3's source rewrites run in tidy3syntax's coordinator, one transformer
+    # for every package, put first; other packages' transformers stay.
     from plot3.jupyter import enable_r_style
-    from plot3.masking import plot3_formula_transform
 
     def other(lines):
         return lines
@@ -321,15 +320,21 @@ def test_formula_rewrites_run_after_tidy3_preparser():
     ip = _shell(_fake_tidy3_transform, other)
     enable_r_style(ip)
     enable_r_style(ip)  # idempotent
-    assert ip.input_transformers_cleanup == [
-        _fake_tidy3_transform, plot3_formula_transform, other,
-    ]
-    out = "".join(plot3_formula_transform(["p = geom_function(y = x^3) + facet_wrap(~cyl)\n"]))
+    coordinator, *rest = ip.input_transformers_cleanup
+    assert getattr(coordinator, "tidy3syntax", False)
+    assert rest == [_fake_tidy3_transform, other]
+    out = "".join(coordinator(["p = geom_function(y = x^3) + facet_wrap(~cyl)\n"]))
     assert out == "p = geom_function(y = x**3) + facet_wrap('~cyl')\n"
+    assert out == "".join(coordinator([out]))  # a second pass changes nothing
 
-    alone = _shell(other)
-    enable_r_style(alone)
-    assert alone.input_transformers_cleanup == [plot3_backtick_transform, other]
+
+def test_a_notebooks_own_aes_keeps_its_arguments():
+    from plot3.masking import Plot3MaskTransformer
+
+    tree = ast.parse("def aes(**kw):\n    return kw\nr = aes(x=wt)")
+    assert "x=wt" in ast.unparse(Plot3MaskTransformer(known=default_known_names()).visit(tree))
+    tree = ast.parse("r = aes(x=wt)")
+    assert "x='wt'" in ast.unparse(Plot3MaskTransformer(known=default_known_names()).visit(tree))
 
 
 # ── Valid Python keeps its meaning outside plot3's calls ─────────────────────
@@ -435,3 +440,8 @@ def test_plot3_calls_still_take_r_syntax_in_a_notebook():
         from IPython.core.interactiveshell import InteractiveShell
 
         InteractiveShell.clear_instance()
+
+
+def test_the_shared_backtick_placeholder_is_a_column_name():
+    # tidy3a's notebook pass may rewrite `First Name` in aes() before plot3's runs.
+    assert _norm("aes(x=__r_name__('First Name'), y=mpg)") == "aes(x='First Name', y='mpg')"

plot3-0.8.0/plot3/__version__.py

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