A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: mermaid embedded in markdown (#7205)
Myles Scolnickef40b6f11167
diff --git a/examples/markdown/mermaid.py b/examples/markdown/mermaid.pyindex 0814426f84..f41ef773e3 100644--- a/examples/markdown/mermaid.py+++ b/examples/markdown/mermaid.py@@ -7,7 +7,7 @@import marimo-__generated_with = "0.15.5"+__generated_with = "0.17.8"app = marimo.App()@@ -50,15 +50,19 @@ def _(mo):@app.celldef _(graph, mo):- mo.md(- f"""- You can render mermaid directly inside `mo.md`. Using+ mo.mermaid(graph.value).text+ return- `mo.mermaid()`- {mo.mermaid(graph.value)}- """- )+def _(graph, mo):+ mo.md(f"""+ You can render mermaid directly inside `mo.md`. Using++ `mo.mermaid()`++ {mo.mermaid(graph.value).text}+ """)returndiff --git a/examples/misc/bayes_theorem.py b/examples/misc/bayes_theorem.pyindex 8584fde210..b60c5f2d09 100644--- a/examples/misc/bayes_theorem.py+++ b/examples/misc/bayes_theorem.py@@ -8,48 +8,46 @@import marimo-__generated_with = "0.15.5"+__generated_with = "0.17.8"app = marimo.App(width="medium")@app.cell(hide_code=True)def _(mo):- mo.md(- r"""- # Bayes' Theorem+ mo.md(r"""+ # Bayes' Theorem- _This interactive notebook was made with [marimo](https://github.com/marimo-team/marimo), and is [based on an explanation of Bayes' Theorem by Grant Sanderson](https://www.youtube.com/watch?v=HZGCoVF3YvM&list=PLzq7odmtfKQw2KIbQq0rzWrqgifHKkPG1&index=1&t=3s)_.+ _This interactive notebook was made with [marimo](https://github.com/marimo-team/marimo), and is [based on an explanation of Bayes' Theorem by Grant Sanderson](https://www.youtube.com/watch?v=HZGCoVF3YvM&list=PLzq7odmtfKQw2KIbQq0rzWrqgifHKkPG1&index=1&t=3s)_.- Bayes theorem provides a convenient way to calculate the probability- of a hypothesis event $H$ given evidence $E$:+ Bayes theorem provides a convenient way to calculate the probability+ of a hypothesis event $H$ given evidence $E$:- \[- P(H \mid E) = \frac{P(H) P(E \mid H)}{P(E)}.- \]+ \[+ P(H \mid E) = \frac{P(H) P(E \mid H)}{P(E)}.+ \]- **The numerator.** The numerator is the probability of events $E$ and $H$ happening- together; that is,+ **The numerator.** The numerator is the probability of events $E$ and $H$ happening+ together; that is,- \[- P(H) P(E \mid H) = P(E \cap H).- \]+ \[+ P(H) P(E \mid H) = P(E \cap H).+ \]- **The denominator.**- In most calculations, it is helpful to rewrite the denominator $P(E)$ as+ **The denominator.**+ In most calculations, it is helpful to rewrite the denominator $P(E)$ as- \[- P(E) = P(H)P(E \mid H) + P(\neg H) P (E \mid \neg H),- \]+ \[+ P(E) = P(H)P(E \mid H) + P(\neg H) P (E \mid \neg H),+ \]- which in turn can also be written as+ which in turn can also be written as- \[- P(E) = P(E \cap H) + P(E \cap \neg H).- \]- """- ).left()+ \[+ P(E) = P(E \cap H) + P(E \cap \neg H).+ \]+ """)return@@ -115,7 +113,7 @@ def _(mo):@app.cell(hide_code=True)def _(p_e_given_h, p_e_given_not_h, p_h):- p_e = p_h.value*p_e_given_h.value + (1 - p_h.value)*p_e_given_not_h.value+ p_e = p_h.value * p_e_given_h.value + (1 - p_h.value) * p_e_given_not_h.valuebayes_result = p_h.value * p_e_given_h.value / p_ereturn bayes_result, p_e@@ -128,7 +126,7 @@ def _(p_e_given_h, p_e_given_not_h, p_h):plt.axes()# Radius: 1, face-color: red, edge-color: blue- plt.figure(figsize=(6,6))+ plt.figure(figsize=(6, 6))base = plt.Rectangle((0, 0), 1, 1, fc="black", ec="white", alpha=0.25)h = plt.Rectangle((0, 0), p_h.value, 1, fc="yellow", ec="white", label="H")e_given_h = plt.Rectangle(@@ -141,7 +139,12 @@ def _(p_e_given_h, p_e_given_not_h, p_h):label="E",)e_given_not_h = plt.Rectangle(- (p_h.value, 0), 1 - p_h.value, p_e_given_not_h.value, fc="teal", ec="white", alpha=0.5+ (p_h.value, 0),+ 1 - p_h.value,+ p_e_given_not_h.value,+ fc="teal",+ ec="white",+ alpha=0.5,)plt.gca().add_patch(base)plt.gca().add_patch(h)diff --git a/frontend/src/plugins/core/__test__/sanitize.test.ts b/frontend/src/plugins/core/__test__/sanitize.test.tsindex 4754d8af6e..0cffbfe83e 100644--- a/frontend/src/plugins/core/__test__/sanitize.test.ts+++ b/frontend/src/plugins/core/__test__/sanitize.test.ts@@ -141,7 +141,7 @@ describe("sanitizeHtml", () => {const html ="<marimo-mermaid data-diagram='"sequenceDiagram\n Alice->>John\n John-->>Alice\n "'></marimo-mermaid>";expect(sanitizeHtml(html)).toMatchInlineSnapshot(- `"<marimo-mermaid></marimo-mermaid>"`,+ `"<marimo-mermaid data-diagram=""sequenceDiagram\\n Alice->>John\\n John-->>Alice\\n ""></marimo-mermaid>"`,);});diff --git a/frontend/src/plugins/core/sanitize.ts b/frontend/src/plugins/core/sanitize.tsindex 5b7b1fcd18..8629570549 100644--- a/frontend/src/plugins/core/sanitize.ts+++ b/frontend/src/plugins/core/sanitize.ts@@ -80,7 +80,9 @@ export function sanitizeHtml(html: string) {tagNameCheck: /^(marimo-[A-Za-z][\w-]*|iconify-icon)$/,attributeNameCheck: /^[A-Za-z][\w-]*$/,},- SAFE_FOR_XML: html.includes("marimo-mermaid"),+ // This flag means we should sanitize such that is it safe for XML,+ // but this is only used for HTML content.+ SAFE_FOR_XML: !html.includes("marimo-mermaid"),};return DOMPurify.sanitize(html, sanitizationOptions);}