curryparty 0.1.1__tar.gz → 0.2.2__tar.gz

{curryparty-0.1.1 → curryparty-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: curryparty
-Version: 0.1.1
+Version: 0.2.2
 Summary: Python playground to learn lambda calculus
 Author: Antonin P
 Author-email: Antonin P <antonin.peronnet@telecom-paris.fr>
@@ -62,6 +62,12 @@ If you use a notebook such as jupyternotebook or marimo, you will see something
 
 You can also use `term.show_reduction` to get an animated version.
 
+# Tutorial
+
+`lambda.py` shows a tutorial in marimo format. Click on the button to try it out:
+
+[![Open with marimo](https://marimo.io/shield.svg)](https://marimo.app/github.com/rambip/curryparty/blob/main/lambda.py)
+
 # How it works
 
 Under the wood, all the terms are converted into a list of nodes, that can either be a `lambda`, an `application` (with 2 arguments) or a `variable` (with 0 arguments).

{curryparty-0.1.1 → curryparty-0.2.2}/README.md

@@ -52,6 +52,12 @@ If you use a notebook such as jupyternotebook or marimo, you will see something
 
 You can also use `term.show_reduction` to get an animated version.
 
+# Tutorial
+
+`lambda.py` shows a tutorial in marimo format. Click on the button to try it out:
+
+[![Open with marimo](https://marimo.io/shield.svg)](https://marimo.app/github.com/rambip/curryparty/blob/main/lambda.py)
+
 # How it works
 
 Under the wood, all the terms are converted into a list of nodes, that can either be a `lambda`, an `application` (with 2 arguments) or a `variable` (with 0 arguments).

{curryparty-0.1.1 → curryparty-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "curryparty"
-version = "0.1.1"
+version = "0.2.2"
 description = "Python playground to learn lambda calculus"
 readme = "README.md"
 authors = [

{curryparty-0.1.1 → curryparty-0.2.2}/src/curryparty/__init__.py

@@ -6,10 +6,12 @@ except ImportError:
     raise ImportError(
         "curryparty needs the `polars` library. \n Please install it, typically with `pip install polars`"
     )
-from svg import SVG
+from svg import SVG, Rect
+import uuid
 
 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,
@@ -41,6 +43,12 @@ class Term:
         reduced = beta_reduce(self.nodes, lamb, b)
         return Term(reduced)
 
+    def reduce(self):
+        last_non_reduced = self
+        for term in self.reduction_chain():
+            last_non_reduced = term
+        return last_non_reduced
+
     def reduction_chain(self) -> Iterable["Term"]:
         term = self
         while True:
@@ -49,23 +57,29 @@ class Term:
             if term is None:
                 break
 
-    def show_reduction(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
                 )
@@ -76,28 +90,47 @@ 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()

{curryparty-0.1.1 → curryparty-0.2.2}/src/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-0.1.1 → curryparty-0.2.2}/src/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