@stlite/desktop 0.15.0 → 0.16.1

package/bin/dump_artifacts.js

@@ -92,8 +92,43 @@ async function copyStreamlitAppDirectory(options) {
     console.log(`Copy ${options.sourceDir} to ${options.copyTo}`);
     return fs_extra_1.default.copy(options.sourceDir, options.copyTo);
 }
+// Original: packages/sharing-editor/bin/gen-sample-app-manifests-json.ts
+// TODO: Be DRY
+async function readRequirements(requirementsTxtPath) {
+    try {
+        const requirementsTxtData = await promises_1.default.readFile(requirementsTxtPath, {
+            encoding: "utf-8",
+        });
+        return requirementsTxtData
+            .split("\n")
+            .map((r) => r.trim())
+            .filter((r) => r !== "");
+    }
+    catch {
+        console.log(`Failed to read ${requirementsTxtPath}. Use [] as the requirements.`);
+        return [];
+    }
+}
+// Original: kernel/src/requirements.ts
+// TODO: Be DRY
+function verifyRequirements(requirements) {
+    requirements.forEach((req) => {
+        let url;
+        try {
+            url = new URL(req);
+        }
+        catch {
+            // `req` is not a URL -> OK
+            return;
+        }
+        // Ref: The scheme checker in the micropip implementation is https://github.com/pyodide/micropip/blob/v0.1.0/micropip/_compat_in_pyodide.py#L23-L26
+        if (url.protocol === "emfs:" || url.protocol === "file:") {
+            throw new Error(`"emfs:" and "file:" protocols are not allowed for the requirement (${req})`);
+        }
+    });
+}
 (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
-    .command("* <appHomeDirSource>", "Put the user code and data and the snapshot of the required packages into the build artifact.", () => { }, (argv) => {
+    .command("* <appHomeDirSource> [packages..]", "Put the user code and data and the snapshot of the required packages into the build artifact.", () => { }, (argv) => {
     console.info(argv);
 })
     .positional("appHomeDirSource", {
@@ -101,7 +136,13 @@ async function copyStreamlitAppDirectory(options) {
     type: "string",
     demandOption: true,
 })
-    .options("requirements", {
+    .positional("packages", {
+    describe: "Package names to install.",
+    type: "string",
+    array: true,
+})
+    .options("requirement", {
+    describe: "Install from the given requirements file. This option can be used multiple times.",
     array: true,
     type: "string",
     alias: "r",
@@ -128,10 +169,15 @@ async function copyStreamlitAppDirectory(options) {
     catch {
         throw new Error(`${args.appHomeDirSource} does not exist.`);
     }
+    let requirements = args.packages;
+    for (const requirementTxtFilePath of args.requirement) {
+        requirements = requirements.concat(await readRequirements(requirementTxtFilePath));
+    }
+    verifyRequirements(requirements);
     await copyBuildDirectory({ copyTo: destDir, override: args.force });
     await createSitePackagesSnapshot({
         useLocalKernelWheels: args.localKernelWheels,
-        requirements: args.requirements,
+        requirements: requirements,
         saveTo: path_1.default.resolve(destDir, "./site-packages-snapshot.tar.gz"), // This path will be loaded in the `readSitePackagesSnapshot` handler in electron/main.ts.
     });
     await copyStreamlitAppDirectory({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stlite/desktop",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "license": "Apache-2.0",
   "homepage": "./",
   "main": "./build/electron/main.js",
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@craco/craco": "^6.1.2",
-    "@stlite/kernel": "^0.15.0",
+    "@stlite/kernel": "^0.16.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",
     "@types/jest": "^26.0.19",