execnb 0.2.1__tar.gz → 0.2.3__tar.gz

{execnb-0.2.1/execnb.egg-info → execnb-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execnb
-Version: 0.2.1
+Version: 0.2.3
 Summary: A description of your project
 Author-email: Jeremy Howard <j@fast.ai>
 License: Apache-2.0

execnb-0.2.3/execnb/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.3"

{execnb-0.2.1 → execnb-0.2.3}/execnb/_modidx.py

@@ -12,6 +12,8 @@ d = { 'settings': { 'branch': 'main',
                               'execnb.shell.CaptureShell.complete': ('shell.html#captureshell.complete', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.enable_gui': ('shell.html#captureshell.enable_gui', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.execute': ('shell.html#captureshell.execute', 'execnb/shell.py'),
+                              'execnb.shell.CaptureShell.nbopen': ('shell.html#captureshell.nbopen', 'execnb/shell.py'),
+                              'execnb.shell.CaptureShell.nbrun': ('shell.html#captureshell.nbrun', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.prettytb': ('shell.html#captureshell.prettytb', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.run': ('shell.html#captureshell.run', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.run_all': ('shell.html#captureshell.run_all', 'execnb/shell.py'),
@@ -32,6 +34,7 @@ d = { 'settings': { 'branch': 'main',
                                                                                      'execnb/shell.py'),
                               'execnb.shell._false': ('shell.html#_false', 'execnb/shell.py'),
                               'execnb.shell._format_mimedata': ('shell.html#_format_mimedata', 'execnb/shell.py'),
+                              'execnb.shell._is_exported': ('shell.html#_is_exported', 'execnb/shell.py'),
                               'execnb.shell._mk_out': ('shell.html#_mk_out', 'execnb/shell.py'),
                               'execnb.shell._out_exc': ('shell.html#_out_exc', 'execnb/shell.py'),
                               'execnb.shell._out_nb': ('shell.html#_out_nb', 'execnb/shell.py'),
@@ -44,4 +47,5 @@ d = { 'settings': { 'branch': 'main',
                               'execnb.shell.out_error': ('shell.html#out_error', 'execnb/shell.py'),
                               'execnb.shell.out_exec': ('shell.html#out_exec', 'execnb/shell.py'),
                               'execnb.shell.out_stream': ('shell.html#out_stream', 'execnb/shell.py'),
-                              'execnb.shell.render_outputs': ('shell.html#render_outputs', 'execnb/shell.py')}}}
+                              'execnb.shell.render_outputs': ('shell.html#render_outputs', 'execnb/shell.py'),
+                              'execnb.shell.select_cells': ('shell.html#select_cells', 'execnb/shell.py')}}}

{execnb-0.2.1 → execnb-0.2.3}/execnb/shell.py

@@ -1,10 +1,12 @@
-"""A shell for running notebook code without a notebook server"""
+"""A shell for running notebook code without a notebook server
+
+Docs: https://AnswerDotAI.github.io/execnbshell.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_shell.ipynb.
 
 # %% auto #0
 __all__ = ['CaptureShell', 'format_exc', 'NbResult', 'render_outputs', 'find_output', 'out_exec', 'out_stream', 'out_error',
-           'exec_nb', 'SmartCompleter']
+           'select_cells', 'exec_nb', 'SmartCompleter']
 
 # %% ../nbs/00_shell.ipynb #535003cf
 from fastcore.utils import *
@@ -27,9 +29,6 @@ from IPython.display import display as disp, HTML
 
 from base64 import b64encode
 from html import escape
-try: from matplotlib_inline.backend_inline import set_matplotlib_formats
-except ImportError: set_matplotlib_formats = None
-
 
 from fastcore.nbio import *
 from fastcore.nbio import _dict2obj
@@ -58,11 +57,14 @@ class CaptureShell(InteractiveShell):
         self.result,self.exc = None,None
         if path: self.set_path(path)
         self.display_formatter.active = True
-        if not IN_NOTEBOOK: InteractiveShell._instance = self
-        if set_matplotlib_formats:
-            self.enable_matplotlib("inline")
-            self._run("from matplotlib_inline.backend_inline import set_matplotlib_formats")
-            self._run(f"set_matplotlib_formats('{mpl_format}')")
+        if not in_notebook(): InteractiveShell._instance = self
+        if mpl_format:
+            try: from matplotlib_inline.backend_inline import set_matplotlib_formats
+            except ImportError: set_matplotlib_formats = None
+            if set_matplotlib_formats:
+                self.enable_matplotlib("inline")
+                self._run("from matplotlib_inline.backend_inline import set_matplotlib_formats")
+                self._run(f"set_matplotlib_formats('{mpl_format}')")
 
     def _run(self, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
                  stdout=True, stderr=True, display=True, verbose=False):
@@ -73,13 +75,13 @@ class CaptureShell(InteractiveShell):
         return AttrDict(result=result, stdout='' if semic else c.stdout, stderr=c.stderr,
                         display_objects=c.outputs, 
                         exception=result.error_in_exec or result.error_before_exec, quiet=semic)
-    
+
     def set_path(self, path):
         "Add `path` to python path, or `path.parent` if it's a file"
         path = Path(path)
         if path.is_file(): path = path.parent
         self._run(f"import sys; sys.path.insert(0, '{path.as_posix()}')")
-    
+
     def enable_gui(self, gui=None): pass
 
 # %% ../nbs/00_shell.ipynb #93adf867
@@ -234,15 +236,16 @@ def out_error(outp):
 def _false(o): return False
 
 @patch
-def run_all(self:CaptureShell,
-            nb, # A notebook read with `nbclient` or `read_nb`
-            exc_stop:bool=False, # Stop on exceptions?
-            preproc:callable=_false, # Called before each cell is executed
-            postproc:callable=_false, # Called after each cell is executed
-            inject_code:str|None=None, # Code to inject into a cell
-            inject_idx:int=0, # Cell to replace with `inject_code`
-            verbose:bool=False # Show stdout/stderr during execution
-           ):
+def run_all(
+    self:CaptureShell,
+    nb, # A notebook read with `nbclient` or `read_nb`
+    exc_stop:bool=False, # Stop on exceptions?
+    preproc:callable=_false, # Called before each cell is executed
+    postproc:callable=_false, # Called after each cell is executed
+    inject_code:str|None=None, # Code to inject into a cell
+    inject_idx:int=0, # Cell to replace with `inject_code`
+    verbose:bool=False # Show stdout/stderr during execution
+):
     "Run all cells in `nb`, stopping at first exception if `exc_stop`"
     if inject_code is not None: nb.cells[inject_idx].source = inject_code
     for cell in nb.cells:
@@ -285,6 +288,57 @@ def prettytb(self:CaptureShell,
     fname_str = f' in {fname}' if fname else ''
     return f"{type(self.exc).__name__}{fname_str}:\n{_fence}\n{cell_str}\n"
 
+# %% ../nbs/00_shell.ipynb #de6bd9f6
+def _is_exported(src): return bool(re.search(r'^\s*#\|\s*exports?\b', src, flags=re.M))
+
+def select_cells(
+    nb, # A notebook read with `read_nb`
+    msgid:str=None, # Cell id prefix to match
+    above:bool=False, # Include the matched cell and all cells above it?
+    below:bool=False, # Include the matched cell and all cells below it?
+    all:bool=False, # Include all code cells (ignores `msgid`)?
+    exported:bool=False # Only cells with `#| export` or `#| exports`?
+):
+    "Select code cells from `nb` by cell id prefix"
+    cells = [o for o in nb.cells if o.cell_type=='code']
+    if not all:
+        if not msgid: raise ValueError('`msgid` required unless `all=True`')
+        idx = first(i for i,o in enumerate(cells) if str(o.id).startswith(msgid))
+        if idx is None: raise ValueError(f'No code cell id starting with {msgid!r}')
+        if above: cells = cells[:idx+1]
+        elif below: cells = cells[idx:]
+        else: cells = [cells[idx]]
+    if exported: cells = [o for o in cells if _is_exported(o.source)]
+    return cells
+
+# %% ../nbs/00_shell.ipynb #9c16e245
+from fastcore.nbio import render_text
+
+# %% ../nbs/00_shell.ipynb #ec223d10
+@patch
+def nbopen(self:CaptureShell, fname:str|Path):
+    "Set the default notebook for `nbrun`"
+    self._nbrun_fname = Path(fname)
+
+@patch
+def nbrun(
+    self:CaptureShell,
+    msgid:str=None, # Cell id prefix to run
+    fname:str|Path=None, # Notebook path (defaults to last `nbopen`)
+    above:bool=False, # Also run all cells above the match?
+    below:bool=False, # Also run all cells below the match?
+    all:bool=False, # Run all code cells?
+    exported:bool=False # Only cells with `#| export` or `#| exports`?
+):
+    "Run cell(s) from a notebook by id prefix, printing rendered outputs"
+    fname = ifnone(fname, getattr(self,'_nbrun_fname',None))
+    if not fname: raise ValueError('No `fname` passed and no notebook opened with `nbopen`')
+    self.nbopen(fname)
+    nb = read_nb(fname)
+    for cell in select_cells(nb, msgid, above=above, below=below, all=all, exported=exported):
+        res = render_text(self.run(cell.source))
+        if res: print(f'--- {cell.id} ---\n{res}')
+
 # %% ../nbs/00_shell.ipynb #1227c8b1
 @call_parse
 def exec_nb(

{execnb-0.2.1 → execnb-0.2.3/execnb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execnb
-Version: 0.2.1
+Version: 0.2.3
 Summary: A description of your project
 Author-email: Jeremy Howard <j@fast.ai>
 License: Apache-2.0

{execnb-0.2.1 → execnb-0.2.3}/pyproject.toml

@@ -35,8 +35,8 @@ version = {attr = "execnb.__version__"}
 include = ["execnb"]
 
 [tool.nbdev]
-allowed_metadata_keys = ['solveit_dialog_mode', 'solveit_ver']
-allowed_cell_metadata_keys = ["solveit_ai"]
+allowed_metadata_keys = ['solveit']
+allowed_cell_metadata_keys = ['solveit_ai']
 recursive = false
 jupyter_hooks = true
 custom_sidebar = false

execnb-0.2.1/execnb/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"