curryparty 0.2.0__py3-none-any.whl → 0.2.3__py3-none-any.whl

curryparty/__init__.py

@@ -6,10 +6,13 @@ except ImportError:
     raise ImportError(
         "curryparty needs the `polars` library. \n Please install it, typically with `pip install polars`"
     )
-from svg import SVG
+import uuid
+
+from svg import SVG, Rect
 
 from .core import SCHEMA, beta_reduce, compose, find_redexes, find_variables, subtree
 from .display import (
+    compute_height,
     compute_svg_frame_final,
     compute_svg_frame_init,
     compute_svg_frame_phase_a,
@@ -55,23 +58,29 @@ class Term:
             if term is None:
                 break
 
-    def show_beta(self):
+    def show_beta(self, x0=-10, width=30):
+        """
+        Generates an HTML representation that toggles visibility between
+        a static state and a SMIL animation on hover using pure CSS.
+        """
         candidates = find_redexes(self.nodes)
         if len(candidates) == 0:
-            return None
+            return self._repr_html_()
+
         _redex, lamb, b = candidates.row(0)
         new_nodes = beta_reduce(self.nodes, lamb, b)
         vars = find_variables(self.nodes, lamb)["id"]
         b_subtree = subtree(self.nodes, b)
+        height = compute_height(self.nodes) + 3
         shapes: dict[int, ShapeAnim] = {}
-        N_STEPS = 8
+        N_STEPS = 6
 
         for t in range(N_STEPS):
-            if t < 2:
+            if t == 0:
                 items = compute_svg_frame_init(self.nodes)
-            elif t == 2 or t == 3:
+            elif t == 1 or t == 2:
                 items = compute_svg_frame_phase_a(self.nodes, lamb, b_subtree, vars)
-            elif t == 4 or t == 5:
+            elif t == 3 or t == 4:
                 items = compute_svg_frame_phase_b(
                     self.nodes, lamb, b_subtree, new_nodes
                 )
@@ -82,33 +91,58 @@ class Term:
                     shapes[k] = ShapeAnim(e)
                 shapes[k].append_frame(t, attributes.items())
 
-        elements = [x.to_element(N_STEPS) for x in shapes.values()]
-        height = 2 + int(0.6 * len(self.nodes))
+        figure_id = uuid.uuid4()
+        box_id = f"lambda_box_{figure_id}".replace("-", "")
+        anim_elements = [
+            x.to_element(N_STEPS, begin=f"{box_id}.click", reset=f"{box_id}.mouseover")
+            for x in shapes.values()
+        ]
+
+        anim_elements.append(
+            Rect(
+                id=box_id,
+                x=str(x0),
+                y="0",
+                width="100%",
+                height="100%",
+                fill="transparent",
+            )
+        )
+
+        anim_svg = SVG(
+            xmlns="http://www.w3.org/2000/svg",
+            viewBox=f"{x0} 0 {width} {height}",
+            height=f"{35 * height}px",
+            elements=anim_elements,
+        ).as_str()
+
         return Html(
-            SVG(
-                xmlns="http://www.w3.org/2000/svg",
-                viewBox=f"-10 0 30 {height}",  # type: ignore
-                height=f"{35 * height}px",  # type: ignore
-                elements=elements,
-            ).as_str()
+            f'<div><div style="margin:5px">click to animate, move away and back to reset</div>{anim_svg}</div>'
         )
 
-    def _repr_html_(self):
+    def _repr_html_(self, x0=-10, width=30):
         frame = compute_svg_frame_init(self.nodes)
         elements = []
-        height = 2 + int(0.6 * len(self.nodes))
+
+        height = compute_height(self.nodes) + 1
         for _, e, attributes in frame:
             for name, v in attributes.items():
                 e.__setattr__(name, v)
             elements.append(e)
         return SVG(
             xmlns="http://www.w3.org/2000/svg",
-            viewBox=f"-10 0 30 {height}",  # type: ignore
+            viewBox=f"{x0} 0 {width} {height}",  # type: ignore
             height=f"{35 * height}px",  # type: ignore
             elements=elements,
         ).as_str()
 
 
+def offset_var(x: Union[int, str], offset: int) -> Union[int, str]:
+    if isinstance(x, int):
+        return x + offset
+    return x
+
+
 class L:
     def __init__(self, *lambda_names):
         self.n = len(lambda_names)
@@ -126,7 +160,7 @@ class L:
         if isinstance(t, L):
             offset = self.n
             for i, x in t.refs:
-                self.refs.append((offset + i, t.lambdas.get(x, x)))
+                self.refs.append((offset + i, offset_var(t.lambdas.get(x, x), offset)))
 
             for i, x in t.args:
                 self.args.append((offset + i, offset + x))
@@ -143,7 +177,10 @@ class L:
 
     def call(self, arg: Union[str, "L"]) -> "L":
         assert self.last_ is not None
-        self.refs = [(i + 1, x) if i >= self.last_ else (i, x) for (i, x) in self.refs]
+        self.refs = [
+            (i + 1, offset_var(x, 1)) if i >= self.last_ else (i, x)
+            for (i, x) in self.refs
+        ]
         self.args = [
             (i + 1, x + 1) if i >= self.last_ else (i, x) for (i, x) in self.args
         ]
@@ -155,7 +192,15 @@ class L:
         return self
 
     def build(self) -> "Term":
-        self.refs = [(i, self.lambdas.get(x, x)) for i, x in self.refs]
+        def bind_var(x: Union[str, int]) -> int:
+            # check that all remaining unbound variables are bound to this lambda
+            if isinstance(x, int):
+                return x
+            if x not in self.lambdas:
+                raise ValueError(f"variable {x} is not bound to any lambda")
+            return self.lambdas[x]
+
+        self.refs = [(i, bind_var(x)) for i, x in self.refs]
         ref = pl.from_records(
             self.refs, orient="row", schema={"id": pl.UInt32, "ref": pl.UInt32}
         )

curryparty/display.py

@@ -38,6 +38,10 @@ def compute_layout(
             y[node] = y[child] | y[node]
     return x, y
 
+def compute_height(nodes: pl.DataFrame):
+    _, y = compute_layout(nodes)
+    return max(interval[1] for interval in y.values() if interval)
+
 
 def draw(
     x: dict[Union[int, tuple[int, int]], Interval],

curryparty/utils.py

@@ -56,7 +56,7 @@ class ShapeAnim:
             self.attributes.add(name)
             self.values[i, name] = v
 
-    def to_element(self, n: int):
+    def to_element(self, n: int, begin: str, reset: str):
         elements = []
 
         visible = [
@@ -74,12 +74,24 @@ class ShapeAnim:
             for i in range(n):
                 if (i, name) not in self.values:
                     self.values[i, name] = non_nulls[0]
+            self.shape.__setattr__(name, non_nulls[0])
+
             elements.append(
                 Animate(
                     attributeName=name,
                     values=";".join(str(self.values[i, name]) for i in range(n)),
                     dur=timedelta(seconds=self.duration),
-                    repeatCount="indefinite",
+                    begin=begin,
+                    fill="freeze",
+                    repeatCount="1",
+                )
+            )
+            elements.append(
+                Animate(
+                    attributeName=name,
+                    values=f"{non_nulls[0]}",
+                    dur=0,
+                    begin=reset,
                 )
             )
         elements.append(
@@ -87,10 +99,21 @@ class ShapeAnim:
                 attributeName="opacity",
                 values=";".join("1" if v else "0" for v in visible),
                 dur=timedelta(seconds=self.duration),
-                repeatCount="indefinite",
+                begin=begin,
+                fill="freeze",
+                repeatCount="1",
+            )
+        )
+        elements.append(
+            Animate(
+                attributeName="opacity",
+                values="1" if visible[0] else "0",
+                dur=0,
+                begin=reset,
             )
         )
 
         assert not self.shape.elements
+        self.shape
         self.shape.elements = elements
         return self.shape

{curryparty-0.2.0.dist-info → curryparty-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: curryparty
-Version: 0.2.0
+Version: 0.2.3
 Summary: Python playground to learn lambda calculus
 Author: Antonin P
 Author-email: Antonin P <antonin.peronnet@telecom-paris.fr>

curryparty-0.2.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+curryparty/__init__.py,sha256=kizUbEeGQbTtKEnv9k2PDfCedyXeQoBTWhlLvgCbG1k,7057
+curryparty/core.py,sha256=9vQJlUeYXJ71SkRV6tUiw1RSu7gUJu4f_e6w2Zt-tLQ,3665
+curryparty/display.py,sha256=3u80YvTYBe3mfexng2fiIiNwNAb_S7eYE5afY08f49M,6925
+curryparty/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+curryparty/utils.py,sha256=XvOGyYiIuMcmi-bnBNLdgSQQ69vT0pJ3qJXgwmfhK28,3494
+curryparty-0.2.3.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
+curryparty-0.2.3.dist-info/METADATA,sha256=0h8jSXKNY3_ECpRJJJEpcqru-7zfNKi56Yx5l38Iro8,2139
+curryparty-0.2.3.dist-info/RECORD,,

{curryparty-0.2.0.dist-info → curryparty-0.2.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.22
+Generator: uv 0.9.27
 Root-Is-Purelib: true
-Tag: py3-none-any
+Tag: py3-none-any

curryparty-0.2.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-curryparty/__init__.py,sha256=VvTj-jDrxDqR9g-tg0IHPx81JAc6xBrRstXzyUpdtu4,5744
-curryparty/core.py,sha256=9vQJlUeYXJ71SkRV6tUiw1RSu7gUJu4f_e6w2Zt-tLQ,3665
-curryparty/display.py,sha256=8PRRP-9ys-q0OEvIhePxM9di_2n0WRkwA13qK5sq4JU,6783
-curryparty/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-curryparty/utils.py,sha256=Q5vYGQ1PvxDPntjF39D-6geAwDDdXz7pVFiAyUGE4WM,2839
-curryparty-0.2.0.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
-curryparty-0.2.0.dist-info/METADATA,sha256=GfshNERaRDxxfFSXbpKcFf7wEmgRLY6N-yQ-0bhw0sI,2139
-curryparty-0.2.0.dist-info/RECORD,,