Add pretext init --system to reinstall pretext resources for current version (#1001)

* use shutil.which to find npm in mjsr npm install

* add You are using the latest version of pretext, 2.19.4.

PreTeXt-CLI version: 2.19.4

�[33mwarning: �[0mNo project.ptx manifest found in current workspace.  Using global configuration specified in '~/.ptx/2.19.4/project.ptx'.
Reinstalling system resources...
Deleting existing resources at /home/oscar/.ptx/2.19.4
Installing core resources
Installing templates
Installing rs_cache files
Installing pelican files
Installing npm packages

added 51 packages, and audited 52 packages in 1s

11 packages are looking for funding
  run `npm fund` for details

found 0 vulnerabilities
System resources reinstalled successfully. to reinstall pretext resources for current version

* update changelog

* try to fix types

Author: oscarlevin

CHANGELOG.md

@@ -9,6 +9,10 @@ Instructions: Add a subsection under `[Unreleased]` for additions, fixes, change
 
 ## [Unreleased]
 
+### Added
+
+- Sometimes something goes wrong with the pretext resources in `~/.ptx`.  You can now run `pretext init --system` to reinstall these resources for the current version.  This will also try to run `npm install` for the css themes.
+
 ## [2.19.3] - 2025-06-14
 
 Includes updates to core through commit: [1b65b63](https://github.com/PreTeXtBook/pretext/commit/1b65b63c3a83292c22b46cf1e12795c4dd519cc0)

pretext/cli.py

@@ -375,8 +375,14 @@ def new(template: str, directory: Path, url_template: str) -> None:
     multiple=True,
     type=click.Choice([r for r in constants.PROJECT_RESOURCES], case_sensitive=False),
 )
+@click.option(
+    "-s",
+    "--system",
+    is_flag=True,
+    help="Reinstall's the system's pretext resources, including the core pretext script, templates, and other resources (including npm installs).  Useful if something is broken or after initial installation or upgrade.",
+)
 @nice_errors
-def init(refresh: bool, files: List[str]) -> None:
+def init(refresh: bool, files: List[str], system: bool) -> None:
     """
     Generates/updates CLI-specific files for the current version of PreTeXt-CLI.
     This feature is mainly intended for updating existing PreTeXt projects to use this CLI,
@@ -388,6 +394,11 @@ def init(refresh: bool, files: List[str]) -> None:
 
     Note: `pretext init -r` is does the same thing as `pretext update -f`.
     """
+    if system:
+        log.info("Reinstalling system resources...")
+        resources.install(reinstall=True, npm_install=True)
+        log.info("System resources reinstalled successfully.")
+        return
     project_path = utils.project_path()
     if project_path is None:
         project = Project()

pretext/resources/__init__.py

@@ -1,8 +1,10 @@
 import importlib.resources
 import json
 import logging
+import os
 from pathlib import Path
 import shutil
+import subprocess
 import zipfile
 
 from .. import VERSION, CORE_COMMIT
@@ -12,7 +14,7 @@
 _RESOURCE_BASE_PATH = Path.home() / ".ptx" / VERSION
 
 
-def install(reinstall: bool = False) -> None:
+def install(reinstall: bool = False, npm_install: bool = False) -> None:
     if _RESOURCE_BASE_PATH.exists():
         if reinstall:
             log.info(f"Deleting existing resources at {_RESOURCE_BASE_PATH}")
@@ -56,6 +58,23 @@ def install(reinstall: bool = False) -> None:
         with zipfile.ZipFile(static_zip, "r") as zip:
             zip.extractall(path=_RESOURCE_BASE_PATH / "pelican")
 
+    if npm_install:
+        log.info("Installing npm packages")
+        # Look for node_modules and install if we can.  This is a simplified version of the more robust utils.css_node_modules_install, which we cannot use here due to circular imports.
+        os.chdir(_RESOURCE_BASE_PATH / "core" / "script" / "cssbuilder")
+        try:
+            npm_cmd = shutil.which("npm")
+            if npm_cmd is None:
+                log.warning(
+                    "Cannot find npm.  Will try to use prebuilt CSS files instead."
+                )
+                raise FileNotFoundError
+            subprocess.run([npm_cmd, "install", "--engine-strict=true"])
+        except Exception as e:
+            log.warning(f"Unable to install npm packages for theme building: {e}")
+            log.debug(e, exc_info=True)
+            return
+
 
 def resource_base_path() -> Path:
     if not _RESOURCE_BASE_PATH.exists():

pretext/resources/resource_hash_table.json

@@ -272,5 +272,17 @@
     "installPandoc.sh": "023b47421a5c9e787649c75b1257d417b5e359c6a176e14621a7831d6f95d2ae",
     "installLatex.sh": "e2ff5b661ed273e82ea58b290978564015eebff3d632d3013321f805548d2887",
     "installSage.sh": "d167efbf07ea099aba56864e21eeb7c13462203d0a38cafbbef15e34379732de"
+  },
+  "2.19.4": {
+    "project.ptx": "2dc2900025b5cd39b0f7c8890c1debc2cf2102875bed5b3634aa0e9b151b1711",
+    "codechat_config.yaml": "89dc598ea7db1c91ec8882e2737aff9d683d7123187c288e16f1617a39f9d9e3",
+    ".gitignore": "721a3a2c412782db41cb72441eaef2b9bffdb6d927fde87f67ada1f44a78af90",
+    "devcontainer.json": "5695d90f4194164b092038133b6675544c81d5ea2cf4c5eeec8075e26890998d",
+    "pretext-cli.yml": "e2d6d3a23cd2a955c998ec5cb4005d4cd67cc3d3a2cafc6af618bf5ce0b64009",
+    "pretext-deploy.yml": "4aa427a79fac24030f5a21f49a0a75c333f62f2c0bd44d2d403126eaca0e8ea3",
+    "installPretext.sh": "99676bf6224335cd1dfd8efebd0835ce255366bf3aa10d04388d5fda8134a44e",
+    "installPandoc.sh": "67f9a2418ca80b79fa796d31c77b6f230dba4a496021c6fcf39b67ddba35f013",
+    "installLatex.sh": "51905c51e0b3c95121caab413de37b670aedf712f432bfcdd38c1fe8f312dbc6",
+    "installSage.sh": "1c4b41cba70577b78552884755674fcc91cb2a039aafa63915fc6e7b7165345f"
   }
 }

pretext/utils.py

@@ -497,7 +497,13 @@ def mjsre_npm_install() -> None:
     ):
         log.info("Attempting to install/update required node packages.")
         try:
-            subprocess.run("npm install", shell=True)
+            npm_cmd = shutil.which("npm")
+            if npm_cmd is None:
+                log.warning(
+                    "Cannot find npm.  Will try to use prebuilt CSS files instead."
+                )
+                raise FileNotFoundError
+            subprocess.run([npm_cmd, "install", "--engine-strict=true"])
         except Exception as e:
             log.critical(
                 "Unable to install required npm packages.  Please see the documentation."

templates/.gitignore

@@ -1,4 +1,4 @@
-# This file was automatically generated with PreTeXt 2.18.4.
+# This file was automatically generated with PreTeXt 2.19.4.
 # If you modify this file, PreTeXt will no longer automatically update it.
 #
 # Boilerplate list of files in a PreTeXt project for git to ignore

templates/codechat_config.yaml

@@ -1,4 +1,4 @@
-# This file was automatically generated with PreTeXt 2.18.4.
+# This file was automatically generated with PreTeXt 2.19.4.
 # If you modify this file, PreTeXt will no longer automatically update it.
 #
 #############################################################

templates/devcontainer.json

@@ -1,4 +1,4 @@
-// This file was automatically generated with PreTeXt 2.18.4.
+// This file was automatically generated with PreTeXt 2.19.4.
 // If you modify this file, PreTeXt will no longer automatically update it.
 //
 //////////////////////////////////////////////////////////////

templates/installLatex.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This file was automatically generated with PreTeXt 2.18.4.
+# This file was automatically generated with PreTeXt 2.19.4.
 # If you modify this file, PreTeXt will no longer automatically update it.
 
 # We use TinyTeX (https://yihui.org/tinytex/)

templates/installPandoc.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This file was automatically generated with PreTeXt 2.18.4.
+# This file was automatically generated with PreTeXt 2.19.4.
 # If you modify this file, PreTeXt will no longer automatically update it.
 
 wget https://github.com/jgm/pandoc/releases/download/3.6.4/pandoc-3.6.4-1-amd64.deb -O pandoc.deb