From f04a6573b912dc69a9f8d6103d8f5d97b7c36e4d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 17:01:15 +0200
Subject: [PATCH 1/2] Use package loading benchmarks to improve notebook launch
 time estimate

---
 frontend/components/EditOrRunButton.js | 58 ++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index 77632e0ac4..8204625667 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -1,6 +1,7 @@
 import _ from "../imports/lodash.js"
 import { BackendLaunchPhase } from "../common/Binder.js"
 import { html, useEffect, useState, useRef } from "../imports/Preact.js"
+import { time_estimate, usePackageTimingData } from "../common/InstallTimeEstimate.js"
 
 export const RunLocalButton = ({ show, start_local }) => {
     //@ts-ignore
@@ -71,8 +72,10 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile, noteboo
         }
     }, [start_binder, offer_binder])
 
+    const nbpkg_timingdata = usePackageTimingData()
+
     const recommend_download = notebookfile_ref.current.startsWith("data:")
-    const runtime_str = expected_runtime_str(notebook)
+    const runtime_str = expected_runtime_str(notebook, nbpkg_timingdata)
     return html`<div class="edit_or_run">
         <button
             onClick=${(e) => {
@@ -166,20 +169,59 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile, noteboo
     </div>`
 }
 
-const expected_runtime = (/** @type {import("./Editor.js").NotebookData} */ notebook) => {
-    return ((notebook.nbpkg?.install_time_ns ?? NaN) + _.sum(Object.values(notebook.cell_results).map((c) => c.runtime ?? 0))) / 1e9
+let find_imported_package_names = (/** @type {import("./Editor.js").NotebookData} */ notebook) =>
+    _.uniq(
+        Object.values(notebook.cell_inputs).flatMap((input) => {
+            let { code } = input
+            // import A, B, C
+            const re = /(using|import)(\s*\w+(\.\w+)*)(\s*\,\s*\w+(\.\w+)*)*/g
+
+            return Array.from(code.matchAll(re)).flatMap((import_match) => {
+                const inner = import_match[0].substring(import_match[1].length)
+
+                // find the package name, e.g. `Plot` for `Plot.Extras.coolplot`
+                const inner_re = /(\w+)(\.\w+)*/g
+                return [...inner.matchAll(inner_re)].map((m) => m[1])
+            })
+        })
+    )
+
+const expected_runtime = (
+    /** @type {import("./Editor.js").NotebookData} */ notebook,
+    /** @type {import("../common/InstallTimeEstimate.js").PackageTimingData?} */ nbpkg_timingdata
+) => {
+    let nbpkg_measured = (notebook.nbpkg?.install_time_ns ?? NaN) / 1e9
+
+    let used_packages = notebook.nbpkg?.installed_versions == null ? find_imported_package_names(notebook) : Object.keys(notebook.nbpkg.installed_versions)
+    let nbpkg_estimate_data = nbpkg_timingdata == null ? null : time_estimate(nbpkg_timingdata, used_packages)
+    let nbpkg_estimate = nbpkg_estimate_data == null ? NaN : nbpkg_estimate_data.install + nbpkg_estimate_data.precompile // no load because that is included in cell runtimes
+
+    let nbpkg_best_guess = _.isNaN(nbpkg_measured) ? nbpkg_estimate : _.isNaN(nbpkg_estimate) ? nbpkg_measured : Math.max(nbpkg_measured, nbpkg_estimate)
+
+    let total_cell_runtime = _.sum(Object.values(notebook.cell_results).map((c) => c.runtime ?? 0)) / 1e9
+
+    return {
+        nbpkg_measured,
+        nbpkg_estimate,
+        nbpkg: nbpkg_best_guess,
+        total_cell_runtime,
+    }
 }
 
-const runtime_overhead = 15 // seconds
+const runtime_overhead = 10 // seconds
 const runtime_multiplier = 1.5
 
-const expected_runtime_str = (/** @type {import("./Editor.js").NotebookData} */ notebook) => {
-    const ex = expected_runtime(notebook)
-    if (isNaN(ex)) {
+const expected_runtime_str = (
+    /** @type {import("./Editor.js").NotebookData} */ notebook,
+    /** @type {import("../common/InstallTimeEstimate.js").PackageTimingData?} */ nbpkg_timingdata
+) => {
+    const ex = expected_runtime(notebook, nbpkg_timingdata)
+    console.log("runtime estimate", ex)
+    if (isNaN(ex.nbpkg)) {
         return null
     }
 
-    const sec = _.round(runtime_overhead + ex * runtime_multiplier, -1)
+    const sec = _.round(runtime_overhead + ex.nbpkg + ex.total_cell_runtime * runtime_multiplier, -1)
     return pretty_long_time(sec)
 }
 

From 59c40b0cab9723148dfca3bdf39654803cf0adb5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 19:59:29 +0200
Subject: [PATCH 2/2] Update EditOrRunButton.js

---
 frontend/components/EditOrRunButton.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index a2e45bdcab..87b0058ea6 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -1,9 +1,7 @@
 import _ from "../imports/lodash.js"
-import { html, useEffect, useState, useRef, useLayoutEffect } from "../imports/Preact.js"
-import { BackendLaunchPhase } from "../common/Binder.js"
+import { html, useEffect, useState, useRef } from "../imports/Preact.js"
 import { time_estimate, usePackageTimingData } from "../common/InstallTimeEstimate.js"
 
-import { has_ctrl_or_cmd_pressed } from "../common/KeyboardShortcuts.js"
 import { useDialog } from "../common/useDialog.js"
 
 export const RunLocalButton = ({ show, start_local }) => {