09: Build/downloader tool.

Author: pauleveritt

.gitignore

@@ -142,4 +142,6 @@ node_modules/
 /dist/
 /docs/_build/
 /src/psc/pyodide/
+!/src/psc/pyodide/README.md
 /src/psc/pyscript/
+!/src/psc/pyscript/README.md

TODO.md

@@ -0,0 +1,16 @@
+# TODO
+
+## Now
+
+## Eventually
+
+- Upgrade mypy
+- Remove type hints from examples
+- Add another example
+- Get nox to work with downloaded pyodide/pyscript
+- Get rid of Poetry
+
+## Done
+
+- Add a build step for the downloader
+- Upgrade to latest PyScript

poetry.lock

@@ -60,7 +60,7 @@ Jinja2 = "^3.1.2"
 types-requests = "^2.28.10"
 
 [tool.poetry.scripts]
-psc = "psc.__main__:main"
+psc = "psc.__main__:app"
 
 [tool.coverage.paths]
 source = ["src", "*/site-packages"]

pyproject.toml

@@ -1,7 +1,7 @@
 """PyScript Collective."""
 
-__all__ = [
-    "app",
-]
-
-from .app import app
+# __all__ = [
+#     "app",
+# ]
+#
+# from .app import app

src/psc/__init__.py

@@ -1,22 +1,121 @@
 """Command-line interface for PSC."""
+import os
+import tarfile
+from pathlib import Path
+from shutil import copytree
+from tempfile import TemporaryDirectory
 
 import typer
 import uvicorn
+from starlette.testclient import TestClient
+from urllib3 import HTTPResponse
+from urllib3 import PoolManager
+
+from psc.here import HERE
+from psc.resources import get_resources
 
 
 app = typer.Typer()
 
 
+def rmtree(root: Path) -> None:
+    """Recursively remove everything in the target path."""
+    for p in root.iterdir():
+        if p.is_dir():
+            rmtree(p)
+        else:
+            p.unlink()
+
+    root.rmdir()
+
+
+@app.command()
+def download(
+    dry_run: bool = typer.Option(False, "--dry-run")
+) -> None:  # pragma: no cover
+    """Download Pyodide and PyScript distributions into project dir."""
+    # Get Pyodide first
+    pyodide_url_prefix = "https://github.com/pyodide/pyodide/releases/download"
+    pyodide_url = f"{pyodide_url_prefix}/0.21.3/pyodide-build-0.21.3.tar.bz2"
+    http = PoolManager()
+    pyodide_request: HTTPResponse = http.request("GET", pyodide_url)  # type: ignore
+    with TemporaryDirectory() as tmp_dir_name:
+        os.chdir(tmp_dir_name)
+        tmp_dir = Path(tmp_dir_name)
+        temp_file = tmp_dir / "pyodide.tar.bz2"
+        temp_file.write_bytes(pyodide_request.data)
+        tar = tarfile.open(temp_file)
+        tar.extractall()
+        target = HERE / "pyodide"
+        if not dry_run:
+            copytree(tmp_dir / "pyodide", target, dirs_exist_ok=True)
+            print("Downloaded Pyodide")
+
+    # Next, PyScript
+    pyscript_url = "https://pyscript.net/latest/pyscript.js"
+    pyscript_request: HTTPResponse = http.request("GET", pyscript_url)  # type: ignore
+    if not dry_run:
+        target = HERE / "pyscript"
+        if not dry_run:
+            with open(target / "pyscript.js", "wb") as pyscript_output:
+                pyscript_output.write(pyscript_request.data)
+
+        print("Downloaded PyScript")
+
+
+@app.command()
+def build() -> None:  # pragma: no cover
+    """Write the export to a public directory."""
+    print("Building to the public directory")
+
+    # If the target directory exists, remove it, then copy everything
+    # under src/psc to the target
+    public = HERE.parent.parent / "dist/public"
+    if public.exists():
+        rmtree(public)
+    copytree(HERE, public)
+
+    # Setup test client async with our app
+    from psc.app import app as web_app
+
+    with TestClient(web_app) as test_client:
+        # Render the home page then write to the output directory
+        response = test_client.get("/")
+        assert response.status_code == 200
+        html = response.text
+        output = public / "index.html"
+        output.write_text(html)
+
+        # Same for gallery page
+        response = test_client.get("/gallery/index.html")
+        assert response.status_code == 200
+        html = response.text
+        # output = public / "gallery/index.html"
+        with open(public / "gallery/index.html", "w") as f:
+            f.write(html)
+
+        # Now for each page
+        resources = get_resources()
+        for page in resources.pages.values():
+            response = test_client.get(f"/pages/{page.path.stem}.html")
+            output = public / f"pages/{page.path.stem}.html"
+            output.write_text(response.text)
+
+        # And for each example
+        for example in resources.examples.values():
+            url = f"/gallery/examples/{example.path.stem}/index.html"
+            response = test_client.get(url)
+            output = public / f"gallery/examples/{example.path.stem}/index.html"
+            output.write_text(response.text)
+
+
+# @app.callback(invoke_without_command=True)
 @app.command()
-def main(dry_run: bool = typer.Option(False, "--dry-run")) -> None:  # pragma: no cover
+def start(dry_run: bool = typer.Option(False, "--dry-run")) -> None:  # pragma: no cover
     """Default command, used to start the server."""
     # If running from the test, we don't want to actually start server
     if dry_run:
         print("Skipping server startup")
     else:
         print("Starting server")
         uvicorn.run("psc:app", port=3000, log_level="info")  # pragma: no cover
-
-
-if __name__ == "__main__":  # pragma: no cover
-    app()

src/psc/__main__.py

@@ -32,12 +32,14 @@ async def favicon(request: Request) -> FileResponse:
 async def homepage(request: Request) -> _TemplateResponse:
     """Handle the home page."""
     index_file = HERE / "index.html"
+    root_path = "."
 
     return templates.TemplateResponse(
         "homepage.jinja2",
         dict(
             title="Home Page",
             main=index_file.read_text(),
+            root_path=root_path,
             request=request,
         ),
     )
@@ -46,12 +48,14 @@ async def homepage(request: Request) -> _TemplateResponse:
 async def gallery(request: Request) -> _TemplateResponse:
     """Handle the gallery listing page."""
     these_examples: Iterator[Example] = request.app.state.resources.examples.values()
+    root_path = ".."
 
     return templates.TemplateResponse(
         "gallery.jinja2",
         dict(
             title="Gallery",
             examples=these_examples,
+            root_path=root_path,
             request=request,
         ),
     )
@@ -99,10 +103,10 @@ async def content_page(request: Request) -> _TemplateResponse:
     Route("/favicon.png", favicon),
     Route("/gallery/index.html", gallery),
     Route("/gallery", gallery),
-    Route("/gallery/{example_name}/index.html", example),
-    Route("/gallery/{example_name}/", example),
-    Route("/pages/{page_name}", content_page),
-    Mount("/gallery", StaticFiles(directory=HERE / "examples")),
+    Route("/gallery/examples/{example_name}/index.html", example),
+    Route("/gallery/examples/{example_name}/", example),
+    Route("/pages/{page_name}.html", content_page),
+    Mount("/gallery", StaticFiles(directory=HERE / "gallery")),
     Mount("/static", StaticFiles(directory=HERE / "static")),
     Mount("/pyscript", StaticFiles(directory=PYSCRIPT)),
     Mount("/pyodide", StaticFiles(directory=PYODIDE)),

src/psc/app.py

@@ -178,5 +178,5 @@ def _route_handler(route: Route) -> None:
     page.route("**", _route_handler)
 
     # Don't spend 30 seconds on timeout
-    page.set_default_timeout(8000)
+    page.set_default_timeout(12000)
     return page

src/psc/fixtures.py

@@ -0,0 +1 @@
+"""Gallery of examples, contributors, and more."""

src/psc/gallery/__init__.py

@@ -5,34 +5,33 @@
 
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+<head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
     <title>Hello World</title>
-    <meta name="subtitle" content="The classic hello world, but in Python -- in a browser!" >
+    <meta name="subtitle" content="The classic hello world, but in Python -- in a browser!">
 
-    <link rel="icon" type="image/png" href="../../favicon.png">
-    <script defer src="../../pyscript/pyscript.js"></script>
+    <link rel="icon" type="image/png" href="../../../favicon.png">
+    <script defer src="../../../pyscript/pyscript.js"></script>
     <link rel="stylesheet" href="hello_world.css">
     <script defer src="hello_world.js"></script>
-  </head>
+</head>
 
 <body>
 <py-config>
-autoclose_loader: true
-runtimes:
-    - src: "../../pyodide/pyodide.js"
-      name: pyodide-0.20
-      lang: python
+    autoclose_loader = true
+
+    [[runtimes]]
+    src = "../../../pyodide/pyodide.js"
 </py-config>
 <main>
     <h1>Hello ...</h1>
     <div id="output"></div>
 </main>
 <h6>More Info</h6>
 <py-script>
-    pyscript.write("output", "...world")
+        pyscript.write("output", "...world")
 </py-script>
 </body>
 </html>

src/psc/examples/hello_world/hello_world.css renamed to src/psc/gallery/examples/hello_world/hello_world.css

@@ -2,6 +2,6 @@
     <h1>PyScript Collective</h1>
     <h2>Examples</h2>
     <ul>
-        <li><a href="examples/hello_world/index.html">Hello World</a></li>
+        <li><a href="gallery/hello_world/index.html">Hello World</a></li>
     </ul>
 </main>

src/psc/examples/hello_world/hello_world.js renamed to src/psc/gallery/examples/hello_world/hello_world.js

@@ -0,0 +1,2 @@
+The pyodide sources will be downloaded into here when you run the
+download step.

src/psc/examples/hello_world/index.html renamed to src/psc/gallery/examples/hello_world/index.html

@@ -0,0 +1,2 @@
+The pyscript sources will be downloaded into here when you run the
+download step.