Skip to content

send jupyter errors through ansi processing #7813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2023
Merged

send jupyter errors through ansi processing #7813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions src/core/jupyter/jupyter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ export async function jupyterKernelspecFromMarkdown(
}).`,
),
);
} else if (typeof (yamlJupyter) === "string") {
} else if (typeof yamlJupyter === "string") {
const kernel = yamlJupyter;
const kernelspec = await jupyterKernelspec(kernel);
if (kernelspec) {
Expand All @@ -521,7 +521,7 @@ export async function jupyterKernelspecFromMarkdown(
),
);
}
} else if (typeof (yamlJupyter) === "object") {
} else if (typeof yamlJupyter === "object") {
const jupyter = { ...yamlJupyter } as Record<string, unknown>;
if (isJupyterKernelspec(jupyter.kernelspec)) {
const kernelspec = jupyter.kernelspec;
Expand Down Expand Up @@ -1345,7 +1345,7 @@ async function mdFromCodeCell(
// deno-lint-ignore no-explicit-any
let value = (cellOptions as any)[key];
if (value !== undefined) {
if (typeof (value) !== "string") {
if (typeof value !== "string") {
value = JSON.stringify(value);
}
value = value.replaceAll("'", `\\'`);
Expand Down Expand Up @@ -1567,7 +1567,7 @@ async function mdFromCodeCell(
md.push(mdOutputStream(stream));
}
} else if (output.output_type === "error") {
md.push(mdOutputError(output as JupyterOutputError));
md.push(await mdOutputError(output as JupyterOutputError, options));
} else if (isDisplayData(output)) {
const fixedOutput = cleanJupyterOutputDisplayData(output);
if (Object.keys(fixedOutput.data).length > 0) {
Expand Down Expand Up @@ -1719,8 +1719,22 @@ function mdOutputStream(output: JupyterOutputStream) {
return mdCodeOutput(output.text.map(colors.stripColor));
}

function mdOutputError(output: JupyterOutputError) {
return mdCodeOutput([output.ename + ": " + output.evalue]);
async function mdOutputError(
output: JupyterOutputError,
options: JupyterToMarkdownOptions,
) {
if (!options.toHtml || !hasAnsiEscapeCodes(output.evalue)) {
return mdCodeOutput([output.ename + ": " + output.evalue]);
}
const html = await convertToHtmlSpans(output.evalue);
console.log(output.evalue);
return mdMarkdownOutput(
[
"\n::: {.ansi-escaped-output}\n```{=html}\n<pre>",
html,
"</pre>\n```\n:::\n",
],
);
}

async function mdOutputDisplayData(
Expand Down
51 changes: 35 additions & 16 deletions src/resources/formats/html/_quarto-rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,9 @@ div.ansi-escaped-output {
*
* ansi colors from IPython notebook's
*
* we also add `bright-[color]-` synonyms for the `-[color]-intense` classes since
* that seems to be what ansi_up emits
*
*/
/* CSS font colors for translated ANSI escape sequences */
/* The color values are a mix of
Expand All @@ -454,10 +457,12 @@ div.ansi-escaped-output {
.ansi-black-bg {
background-color: #3e424d;
}
.ansi-black-intense-fg {
.ansi-black-intense-black,
.ansi-bright-black-fg {
color: #282c36;
}
.ansi-black-intense-bg {
.ansi-black-intense-black,
.ansi-bright-black-bg {
background-color: #282c36;
}
.ansi-red-fg {
Expand All @@ -466,10 +471,12 @@ div.ansi-escaped-output {
.ansi-red-bg {
background-color: #e75c58;
}
.ansi-red-intense-fg {
.ansi-red-intense-red,
.ansi-bright-red-fg {
color: #b22b31;
}
.ansi-red-intense-bg {
.ansi-red-intense-red,
.ansi-bright-red-bg {
background-color: #b22b31;
}
.ansi-green-fg {
Expand All @@ -478,10 +485,12 @@ div.ansi-escaped-output {
.ansi-green-bg {
background-color: #00a250;
}
.ansi-green-intense-fg {
.ansi-green-intense-green,
.ansi-bright-green-fg {
color: #007427;
}
.ansi-green-intense-bg {
.ansi-green-intense-green,
.ansi-bright-green-bg {
background-color: #007427;
}
.ansi-yellow-fg {
Expand All @@ -490,10 +499,12 @@ div.ansi-escaped-output {
.ansi-yellow-bg {
background-color: #ddb62b;
}
.ansi-yellow-intense-fg {
.ansi-yellow-intense-yellow,
.ansi-bright-yellow-fg {
color: #b27d12;
}
.ansi-yellow-intense-bg {
.ansi-yellow-intense-yellow,
.ansi-bright-yellow-bg {
background-color: #b27d12;
}
.ansi-blue-fg {
Expand All @@ -502,10 +513,12 @@ div.ansi-escaped-output {
.ansi-blue-bg {
background-color: #208ffb;
}
.ansi-blue-intense-fg {
.ansi-blue-intense-blue,
.ansi-bright-blue-fg {
color: #0065ca;
}
.ansi-blue-intense-bg {
.ansi-blue-intense-blue,
.ansi-bright-blue-bg {
background-color: #0065ca;
}
.ansi-magenta-fg {
Expand All @@ -514,10 +527,12 @@ div.ansi-escaped-output {
.ansi-magenta-bg {
background-color: #d160c4;
}
.ansi-magenta-intense-fg {
.ansi-magenta-intense-magenta,
.ansi-bright-magenta-fg {
color: #a03196;
}
.ansi-magenta-intense-bg {
.ansi-magenta-intense-magenta,
.ansi-bright-magenta-bg {
background-color: #a03196;
}
.ansi-cyan-fg {
Expand All @@ -526,10 +541,12 @@ div.ansi-escaped-output {
.ansi-cyan-bg {
background-color: #60c6c8;
}
.ansi-cyan-intense-fg {
.ansi-cyan-intense-cyan,
.ansi-bright-cyan-fg {
color: #258f8f;
}
.ansi-cyan-intense-bg {
.ansi-cyan-intense-cyan,
.ansi-bright-cyan-bg {
background-color: #258f8f;
}
.ansi-white-fg {
Expand All @@ -538,10 +555,12 @@ div.ansi-escaped-output {
.ansi-white-bg {
background-color: #c5c1b4;
}
.ansi-white-intense-fg {
.ansi-white-intense-white,
.ansi-bright-white-fg {
color: #a1a6b2;
}
.ansi-white-intense-bg {
.ansi-white-intense-white,
.ansi-bright-white-bg {
background-color: #a1a6b2;
}
.ansi-default-inverse-fg {
Expand Down