Parse the body and change the pyconfig src to point at correct TOML file.

pauleveritt · pauleveritt · commit b5efe2f091fe · 2022-11-19T10:52:51.000-05:00
diff --git a/TODO.md b/TODO.md
@@ -11,7 +11,7 @@
 
 ## Eventually
 
-- Get nox to work with downloaded pyodide/pyscript
+- Get numpy, pandas, etc. downloaded into local dir
 - Get rid of Poetry
 
 ## Done
diff --git a/docs/developers/cdn_mode.md b/docs/developers/cdn_mode.md
@@ -82,11 +82,12 @@ We'll just look for the `src/pyscript` and `src/pyodide` directory.
 If they exist, then someone downloaded the assets.
 That's a good flag for whether to point at those directories.
 
+What is the action to take?
+The `py_config.local.toml` file has a `runtimes.src` entry pointing to the local `pyodide.js`.
+The `py_config.cdn.toml` file points at the CDN version.
+
 ## Actions
 
 - Remove the timeout
 - Test/implementation that calls a `is_local` function to detect the correct mode
-- Test/implementation which wires that into the HTML munger
-- Make a `pyscript_path` which is passed into the `example.jinja2` template
-- E2E test which detects correct case
-- Revisit if `fake` and interceptor are needed
+- Test/implementation which wires that into the HTML munger
diff --git a/src/psc/gallery/examples/py_config.cdn.toml b/src/psc/gallery/examples/py_config.cdn.toml
@@ -0,0 +1,4 @@
+autoclose_loader = true
+
+[[runtimes]]
+src = "https://cdn.jsdelivr.net/pyodide/v0.21.3/full/pyodide.js"
diff --git a/src/psc/gallery/examples/py_config.local.toml b/src/psc/gallery/examples/py_config.local.toml
diff --git a/src/psc/resources.py b/src/psc/resources.py
@@ -51,9 +51,17 @@ def is_local(test_path: Path | None = PYODIDE) -> bool:
     return test_path.exists()
 
 
-def get_body_content(s: BeautifulSoup) -> str:
+def get_body_content(s: BeautifulSoup, test_path: Path | None = PYODIDE) -> str:
     """Get the body node but raise an exception if not present."""
+
+    # Choose the correct TOML file for local vs remote.
+    toml_name = "local" if is_local(test_path) else "cdn"
+    src = f"../py_config.{toml_name}.toml"
+
+    # Get the body and patch the py_config src
     body_element = s.select_one("body")
+    py_config = body_element.find("py-config")
+    py_config["src"] = src
     return f"{body_element.decode_contents()}"
 
 
diff --git a/tests/test_generic_example.py b/tests/test_generic_example.py
@@ -38,15 +38,3 @@ def test_hello_world_js(test_client: TestClient) -> None:
     """Test the static assets for Hello World."""
     response = test_client.get("/gallery/examples/hello_world/hello_world.js")
     assert response.status_code == 200
-
-
-#
-#
-# @pytest.mark.full
-# def test_hello_world_full(fake_page: Page) -> None:
-#     """Use Playwright to do a test on Hello World."""
-#     # Use `PWDEBUG=1` to run "head-ful" in Playwright test app
-#     url = "http://fake/gallery/examples/hello_world/index.html"
-#     fake_page.goto(url)
-#     title = fake_page.title()
-#     assert title == "Hello World Python"
diff --git a/tests/test_resources.py b/tests/test_resources.py
@@ -54,11 +54,34 @@ def test_get_no_head_nodes() -> None:
 
 
 def test_get_main() -> None:
-    """Return the main node from an example."""
-    example_html = '<body><main class="content">Hello <em>world</em></main></body>'
+    """Return the body nodes from an example."""
+    example_html = '<body><py-config src="../x.toml">abc</py-config></body>'
     soup = BeautifulSoup(example_html, "html5lib")
     body = get_body_content(soup)
-    assert body == '<main class="content">Hello <em>world</em></main>'
+    assert body == '<py-config src="../py_config.local.toml">abc</py-config>'
+
+
+def test_get_py_config_local() -> None:
+    """Return the main node and test setting py-config src."""
+    example_html = '<body><py-config src="../x.toml">abc</py-config></body>'
+    soup = BeautifulSoup(example_html, "html5lib")
+    body = get_body_content(soup)
+    body_soup = BeautifulSoup(body, "html5lib")
+    py_config = body_soup.find("py-config")
+    actual = py_config["src"]
+    assert "../py_config.local.toml" == actual
+
+
+def test_get_py_config_cdn() -> None:
+    """Return the main node and test setting py-config src."""
+    example_html = '<body><py-config src="../x.toml">abc</py-config></body>'
+    soup = BeautifulSoup(example_html, "html5lib")
+    test_path = Path("/x")
+    body = get_body_content(soup, test_path=test_path)
+    body_soup = BeautifulSoup(body, "html5lib")
+    py_config = body_soup.find("py-config")
+    actual = py_config["src"]
+    assert "../py_config.cdn.toml" == actual
 
 
 def test_example_bad_path() -> None:
@@ -136,6 +159,6 @@ def test_is_local_no_path() -> None:
 
 def test_is_local_broken_path() -> None:
     """Test the local case where a directory will not exist."""
-    test_path = Path("/xxxxxx")
+    test_path = Path("/xxx")
     actual = is_local(test_path)
     assert not actual
