Add reset_kc option to reset_execution_trackers, async_execute and execute methods (defaults to False)

Author: davidbrochart

nbclient/client.py

@@ -298,12 +298,13 @@ def __init__(self, nb, km=None, **kw):
         super().__init__(**kw)
         self.nb = nb
         self.km = km
-        self.reset_execution_trackers()
+        self.reset_execution_trackers(reset_kc=True)
 
-    def reset_execution_trackers(self):
+    def reset_execution_trackers(self, reset_kc=False):
         """Resets any per-execution trackers.
         """
-        self.kc = None
+        if reset_kc:
+            self.kc = None
         self.code_cells_executed = 0
         self._display_id_map = {}
         self.widget_state = {}
@@ -412,7 +413,7 @@ async def async_setup_kernel(self, **kwargs):
         """
         Context manager for setting up the kernel to execute a notebook.
 
-        The assigns the Kernel Manager (`self.km`) if missing and Kernel Client(`self.kc`).
+        This assigns the Kernel Manager (`self.km`) if missing and Kernel Client(`self.kc`).
 
         When control returns from the yield it stops the client's zmq channels, and shuts
         down the kernel.
@@ -431,12 +432,23 @@ async def async_execute(self, **kwargs):
         """
         Executes each code cell.
 
+        Parameters
+        ----------
+        kwargs :
+            Any option for `self.kernel_manager_class.start_kernel()`. Because
+            that defaults to AsyncKernelManager, this will likely include options
+            accepted by `AsyncKernelManager.start_kernel()``, which includes `cwd`.
+            If present, `reset_kc` is passed to `self.reset_execution_trackers`:
+            if True, the kernel client will be reset and a new one will be created
+            (default: False).
+
         Returns
         -------
         nb : NotebookNode
             The executed notebook.
         """
-        self.reset_execution_trackers()
+        reset_kc = kwargs.pop('reset_kc', False)
+        self.reset_execution_trackers(reset_kc=reset_kc)
 
         async with self.async_setup_kernel(**kwargs):
             self.log.info("Executing notebook with kernel: %s" % self.kernel_name)