Jupyter - fix retrieve_nb_from_cache regression

src/resources/jupyter/log.py

@@ -2,6 +2,7 @@
 import sys
 import logging
 import os
+import inspect
 
 TRACE = 25
 
@@ -40,4 +41,5 @@ def log_error(msg, exc_info = False):
    logging.getLogger().log(logging.ERROR, msg, exc_info = exc_info, stack_info = not exc_info)
 
 def trace(msg):
-   log(TRACE, msg)
+   prev_frame = inspect.stack()[1]
+   log(TRACE, "%s:%s - %s" % (prev_frame.filename, prev_frame.lineno, msg))

src/resources/jupyter/notebook.py

@@ -112,7 +112,7 @@ def set_env_vars(options):
       os.environ["QUARTO_FIG_DPI"] = str(options["fig_dpi"])
       os.environ["QUARTO_FIG_FORMAT"] = options["fig_format"]
 
-def retrieve_nb_from_cache(nb, status, **kwargs):
+def retrieve_nb_from_cache(nb, status, input, **kwargs):
    cache = kwargs["cache"]
    # are we using the cache, if so connect to the cache, and then if we aren't in 'refresh'
    # (forced re-execution) mode then try to satisfy the execution request from the cache
@@ -464,22 +464,27 @@ def nb_language_cell(name, kernelspec, resource_dir, allow_empty, **args):
 
 def nb_from_cache(nb, nb_cache, nb_meta = ("kernelspec", "language_info", "widgets")):
    try:
+      trace("nb_from_cache match")
       cache_record = nb_cache.match_cache_notebook(nb)
+      trace("nb_from_cache get buncle")
       cache_bundle = nb_cache.get_cache_bundle(cache_record.pk)
       cache_nb = cache_bundle.nb
       nb = copy.deepcopy(nb)
       # selected (execution-oriented) metadata
+      trace("nb_from_cache processing metadata")
       if nb_meta is None:
          nb.metadata = cache_nb.metadata
       else:
          for key in nb_meta:
             if key in cache_nb.metadata:
                nb.metadata[key] = cache_nb.metadata[key]
       # code cells
+      trace("nb_from_cache processing cells")
       for idx in range(len(nb.cells)):
          if nb.cells[idx].cell_type == "code":
             cache_cell = cache_nb.cells.pop(0)    
             nb.cells[idx] = cache_cell
+      trace("nb_from_cache returning")
       return nb
    except KeyError:
       return None

tests/Pipfile

@@ -15,6 +15,7 @@ ipyleaflet = "*"
 seaborn = "*"
 shiny = "*"
 itables = "*"
+jupyter-cache = "*"
 
 [dev-packages]
 

tests/docs/jupyter/cache/test.qmd

@@ -0,0 +1,8 @@
+---
+title: test1
+cache: true
+---
+
+```{python}
+1+1
+```

tests/smoke/jupyter/cache.test.ts

@@ -0,0 +1,24 @@
+/*
+ * cache.test.ts
+ *
+ * Copyright (C) 2023 Posit Software, PBC
+ */
+import { quarto } from "../../../src/quarto.ts";
+import { test } from "../../test.ts";
+import { assertEquals } from "testing/asserts.ts";
+
+test({
+  name: "jupyter:cache:test-1",
+  context: {},
+  execute: async () => {
+    // return await new Promise((_resolve, reject) => {
+    //   setTimeout(reject, 10000, "timed out after 10 seconds");
+    // })
+    // https://github.com/quarto-dev/quarto-cli/issues/9618
+    // repeated executions to trigger jupyter cache
+    await quarto(["render", "docs/jupyter/cache/test.qmd", "--no-execute-daemon"]);
+    await quarto(["render", "docs/jupyter/cache/test.qmd", "--no-execute-daemon"]);
+  },
+  verify: [],
+  type: "smoke",
+});

tests/test.ts

@@ -176,7 +176,7 @@ export function test(test: TestDescriptor) {
           try {
             await test.execute();
           } catch (e) {
-            logError(e)
+            logError(e);
           }
 
           // Cleanup the output logging