reorganizing tools

tools/{03_wiggly.py → 01_wiggly.py}

@@ -9,9 +9,10 @@
 #     "wigglystuff==0.3.1",
 # ]
 # ///
+
 import marimo
 
-__generated_with = "0.20.4"
+__generated_with = "0.23.1"
 app = marimo.App(width="full")
 
 
@@ -20,8 +21,7 @@ def _(mo):
     mo.md(r"""
     # wigglystuff Widgets
 
-    This notebook demonstrates four widgets from the [wigglystuff](https://github.com/koaning/wigglystuff) package:
-    `Slider2D`, `Matrix`, `HoverZoom`, and `TextCompare`.
+    This notebook demonstrates four widgets from [Vincent van Warmerdam](https://koaning.io/)'s [wigglystuff](https://koaning.github.io/wigglystuff/) package. They are useful in their own right, and also show how easy it is to build custom plugins for marimo using [AnyWidget](https://anywidget.dev/) to meet your teaching needs.
     """)
     return
 
@@ -36,12 +36,8 @@ def _():
     matplotlib.use("Agg")
     import matplotlib.pyplot as plt
     from wigglystuff import Slider2D, Matrix, HoverZoom, TextCompare
-    return HoverZoom, Matrix, Slider2D, TextCompare, alt, mo, np, pd, plt
-
 
-# ---------------------------------------------------------------------------
-# Slider2D
-# ---------------------------------------------------------------------------
+    return HoverZoom, Matrix, Slider2D, TextCompare, alt, mo, np, pd, plt
 
 
 @app.cell(hide_code=True)
@@ -76,11 +72,6 @@ def _(mo, slider2d):
     return
 
 
-# ---------------------------------------------------------------------------
-# Matrix
-# ---------------------------------------------------------------------------
-
-
 @app.cell(hide_code=True)
 def _(mo):
     mo.md(r"""
@@ -100,7 +91,7 @@ def _(Matrix, mo, np, pd):
     rgb_df = pd.DataFrame(
         {"r": rgb_mat[:, 0], "g": rgb_mat[:, 1], "b": rgb_mat[:, 2], "color": color}
     )
-    return color, pca_mat, rgb_df, rgb_mat
+    return color, pca_mat, rgb_mat
 
 
 @app.cell
@@ -117,11 +108,6 @@ def _(alt, color, mo, pca_mat, pd, rgb_mat):
     return
 
 
-# ---------------------------------------------------------------------------
-# HoverZoom
-# ---------------------------------------------------------------------------
-
-
 @app.cell(hide_code=True)
 def _(mo):
     mo.md(r"""
@@ -157,11 +143,6 @@ def _(HoverZoom, fig, mo):
     return
 
 
-# ---------------------------------------------------------------------------
-# TextCompare
-# ---------------------------------------------------------------------------
-
-
 @app.cell(hide_code=True)
 def _(mo):
     mo.md(r"""
@@ -188,12 +169,14 @@ def _(TextCompare, mo):
 
     compare = mo.ui.anywidget(TextCompare(text_a=text_a, text_b=text_b, min_match_words=3))
     compare
-    return compare, text_a, text_b
+    return (compare,)
 
 
 @app.cell
 def _(compare, mo):
-    mo.md(f"**Found {len(compare.matches)} matching passages**")
+    mo.md(f"""
+    **Found {len(compare.matches)} matching passages**
+    """)
     return
 
 

tools/{01_widgets.py → 02_formative.py}

@@ -3,7 +3,7 @@
 # dependencies = [
 #     "anywidget",
 #     "marimo",
-#     "marimo-learn",
+#     "marimo-learn==0.13.0",
 # ]
 # ///
 
@@ -16,7 +16,7 @@ Run with: marimo edit demo.py
 
 import marimo
 
-__generated_with = "0.20.4"
+__generated_with = "0.23.1"
 app = marimo.App()
 
 
@@ -24,7 +24,6 @@ app = marimo.App()
 def _():
     import marimo as mo
     from marimo_learn import (
-        Color,
         ConceptMapWidget,
         FlashcardWidget,
         LabelingWidget,
@@ -33,11 +32,9 @@ def _():
         NumericEntryWidget,
         OrderingWidget,
         PredictThenCheckWidget,
-        World,
     )
 
     return (
-        Color,
         ConceptMapWidget,
         FlashcardWidget,
         LabelingWidget,
@@ -46,37 +43,20 @@ def _():
         NumericEntryWidget,
         OrderingWidget,
         PredictThenCheckWidget,
-        World,
+        mo,
     )
 
 
 @app.cell
 def _(mo):
     mo.md("""
-    # Educational Widgets Demo
+    # Formative Assessment Widgets
 
-    This notebook demonstrates widgets in marimo_learn.
+    This notebook demonstrates several widgets from the [marimo-learn](https://pypi.org/project/marimo-learn/) package that you can use to embed formative assessments in your lessons. They also show how easy it is to build custom plugins for the marimo notebook to meet your teaching needs.
     """)
     return
 
 
-# Spiral
-@app.cell
-def _(Color, World, mo):
-    _world = World()
-
-    async def _spiral(world, turtle):
-        colors = list(Color)
-        for i in range(70):
-            if i % 10 == 0:
-                turtle.set_color(colors[(i // 10) % len(colors)])
-            await turtle.forward(i * 2.8)
-            turtle.right(91)
-
-    _world.set_coroutine(_spiral)
-    mo.ui.anywidget(_world)
-
-
 @app.cell
 def _(mo):
     mo.md("""
@@ -288,7 +268,7 @@ def _(MultipleChoiceWidget, mo):
 
 
 @app.cell
-def _(multiple_choice_question, mo):
+def _(mo, multiple_choice_question):
     _val = multiple_choice_question.value.get("value") or {}
     if _val.get("answered"):
         _msg = "Score: 1/1" if _val.get("correct") else "Score: 0/1"
@@ -427,8 +407,8 @@ def _(
     concept_map,
     flashcard_deck,
     matching_question,
-    multiple_choice_question,
     mo,
+    multiple_choice_question,
     numeric_entry_question,
     ordering_question,
     predict_then_check_question,

tools/{02_turtles.py → 03_turtles.py}

@@ -3,7 +3,7 @@
 # dependencies = [
 #     "anywidget",
 #     "marimo",
-#     "marimo-learn",
+#     "marimo-learn==0.13.0",
 # ]
 # ///
 
@@ -13,7 +13,7 @@ Example Marimo Notebook: Turtle Graphics
 
 import marimo
 
-__generated_with = "0.20.4"
+__generated_with = "0.23.1"
 app = marimo.App()
 
 
@@ -25,24 +25,19 @@ def _():
         World,
     )
 
-    return (
-        Color,
-        World,
-    )
+    return Color, World, mo
 
 
 @app.cell
 def _(mo):
     mo.md("""
-    # Turtle Graphics Demo
+    # Turtle Graphics
 
-    This notebook demonstrates turtle graphics in marimo_learn.
-    See [the documentation](https://github.com/gvwilson/marimo_learn) for details.
+    The [marimo-learn](https://pypi.org/project/marimo-learn/) package includes a simple implementation of turtle graphics. Learners can create worlds, and then write functions to make a turtle draw multi-colored shapes. Crucially, this widget was created in only 15 minutes with the assistance of an LLM, which shows just how easy it now is for educators to create tools that meet their specific needs.
     """)
     return
 
 
-# Spiral
 @app.cell
 def _(Color, World, mo):
     _world = World()
@@ -57,6 +52,7 @@ def _(Color, World, mo):
 
     _world.set_coroutine(_spiral)
     mo.ui.anywidget(_world)
+    return
 
 
 if __name__ == "__main__":