livebook-dev/livebook
1
1
Fork 0
mirror of https://github.com/livebook-dev/livebook.git synced 2025-09-10 23:14:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove TODO

Browse source
This commit is contained in:
Jonatan Kłosko 2024-06-19 17:53:29 +07:00
parent b279a8fee7
commit 6f7a8e3e79
2 changed files with 45 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/livebook/live_markdown/export.ex
View file

@ -28,19 +28,18 @@ defmodule Livebook.LiveMarkdown.Export do
for( for(
section <- notebook.sections, section <- notebook.sections,
%{outputs: outputs} <- section.cells, %{outputs: outputs} <- section.cells,
{_idx, %{type: :js, js_view: js_view, export: export}} <- outputs, {_idx, %{type: :js, js_view: js_view, export: true}} <- outputs,
export == true or is_map(export), do: {js_view.ref, js_view.pid},
do: {js_view.ref, js_view.pid, export},
uniq: true uniq: true
) )
|> Enum.map(fn {ref, pid, export} -> |> Enum.map(fn {ref, pid} ->
Task.async(fn -> {ref, get_js_output_export(pid, ref, export)} end) Task.async(fn -> {ref, get_js_output_export(pid, ref)} end)
end) end)
|> Task.await_many(:infinity) |> Task.await_many(:infinity)
|> Map.new() |> Map.new()
end end
defp get_js_output_export(pid, ref, true) do defp get_js_output_export(pid, ref) do
send(pid, {:export, self(), %{ref: ref}}) send(pid, {:export, self(), %{ref: ref}})
monitor_ref = Process.monitor(pid) monitor_ref = Process.monitor(pid)
@ -56,27 +55,6 @@ defmodule Livebook.LiveMarkdown.Export do
data data
end end
# TODO: remove on Livebook v0.13
# Handle old flow for backward compatibility with Kino <= 0.10.0
defp get_js_output_export(pid, ref, %{info_string: info_string, key: key}) do
send(pid, {:connect, self(), %{origin: inspect(self()), ref: ref}})
monitor_ref = Process.monitor(pid)
data =
receive do
{:connect_reply, data, %{ref: ^ref}} -> data
{:DOWN, ^monitor_ref, :process, _pid, _reason} -> nil
end
Process.demonitor(monitor_ref, [:flush])
if data do
payload = if key && is_map(data), do: data[key], else: data
{info_string, payload}
end
end
defp render_notebook(notebook, ctx) do defp render_notebook(notebook, ctx) do
%{setup_section: %{cells: [setup_cell]}} = notebook %{setup_section: %{cells: [setup_cell]}} = notebook

205
test/livebook/live_markdown/export_test.exs
View file

@ -701,7 +701,7 @@ defmodule Livebook.LiveMarkdown.ExportTest do
type: :js, type: :js,
js_view: %{ js_view: %{
ref: "1", ref: "1",
pid: spawn_widget_with_data("1", "data"), pid: spawn_widget_with_export("1", {"json", "{}"}),
assets: %{archive_path: "", hash: "abcd", js_path: "main.js"} assets: %{archive_path: "", hash: "abcd", js_path: "main.js"}
}, },
export: false export: false
@ -779,168 +779,51 @@ defmodule Livebook.LiveMarkdown.ExportTest do
assert expected_document == document assert expected_document == document
end end
end
test "includes js output with legacy export info" do test "ignores js output with legacy export info" do
notebook = %{ notebook = %{
Notebook.new() Notebook.new()
| name: "My Notebook", | name: "My Notebook",
sections: [ sections: [
%{ %{
Notebook.Section.new() Notebook.Section.new()
| name: "Section 1", | name: "Section 1",
cells: [ cells: [
%{ %{
Notebook.Cell.new(:code) Notebook.Cell.new(:code)
| source: ":ok", | source: ":ok",
outputs: [ outputs: [
{0, {0,
%{ %{
type: :js, type: :js,
js_view: %{ js_view: %{
ref: "1", ref: "1",
pid: spawn_widget_with_data("1", "graph TD;\nA-->B;"), pid: spawn_widget_with_export("1", {"json", "{}"}),
assets: %{archive_path: "", hash: "abcd", js_path: "main.js"} assets: %{archive_path: "", hash: "abcd", js_path: "main.js"}
}, },
export: %{info_string: "mermaid", key: nil} export: %{info_string: "mermaid", key: nil}
}} }}
] ]
} }
] ]
} }
] ]
} }
expected_document = """ expected_document = """
# My Notebook # My Notebook
## Section 1 ## Section 1
```elixir ```elixir
:ok :ok
``` ```
"""
<!-- livebook:{"output":true} --> {document, []} = Export.notebook_to_livemd(notebook, include_outputs: true)
```mermaid assert expected_document == document
graph TD;
A-->B;
```
"""
{document, []} = Export.notebook_to_livemd(notebook, include_outputs: true)
assert expected_document == document
end
test "serializes js output data to JSON if not binary" do
notebook = %{
Notebook.new()
| name: "My Notebook",
sections: [
%{
Notebook.Section.new()
| name: "Section 1",
cells: [
%{
Notebook.Cell.new(:code)
| source: ":ok",
outputs: [
{0,
%{
type: :js,
js_view: %{
ref: "1",
pid: spawn_widget_with_data("1", %{height: 50, width: 50}),
assets: %{archive_path: "", hash: "abcd", js_path: "main.js"}
},
export: %{info_string: "box", key: nil}
}}
]
}
]
}
]
}
expected_document = """
# My Notebook
## Section 1
```elixir
:ok
```
<!-- livebook:{"output":true} -->
```box
{"height":50,"width":50}
```
"""
{document, []} = Export.notebook_to_livemd(notebook, include_outputs: true)
assert expected_document == document
end
test "exports partial js output data when export_key is set" do
notebook = %{
Notebook.new()
| name: "My Notebook",
sections: [
%{
Notebook.Section.new()
| name: "Section 1",
cells: [
%{
Notebook.Cell.new(:code)
| source: ":ok",
outputs: [
{0,
%{
type: :js,
js_view: %{
ref: "1",
pid:
spawn_widget_with_data("1", %{
spec: %{
"height" => 50,
"width" => 50,
"data" => %{"x" => 1, "y" => 1, "date" => ~D[2024-05-24]}
},
datasets: []
}),
assets: %{archive_path: "", hash: "abcd", js_path: "main.js"}
},
export: %{info_string: "vega-lite", key: :spec}
}}
]
}
]
}
]
}
expected_document = """
# My Notebook
## Section 1
```elixir
:ok
```
<!-- livebook:{"output":true} -->
```vega-lite
{"data":{"date":"2024-05-24","x":1,"y":1},"height":50,"width":50}
```
"""
{document, []} = Export.notebook_to_livemd(notebook, include_outputs: true)
assert expected_document == document
end
end end
test "includes only the first tabs output that can be exported" do test "includes only the first tabs output that can be exported" do
@ -1422,12 +1305,4 @@ defmodule Livebook.LiveMarkdown.ExportTest do
end end
end) end)
end end
defp spawn_widget_with_data(ref, data) do
spawn(fn ->
receive do
{:connect, pid, %{ref: ^ref}} -> send(pid, {:connect_reply, data, %{ref: ref}})
end
end)
end
end end