execnb 0.1.13__py3-none-any.whl → 0.1.15__py3-none-any.whl

execnb/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.13"
+__version__ = "0.1.15"

execnb/shell.py

@@ -67,10 +67,10 @@ class CaptureShell(InteractiveShell):
             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):
+                 stdout=True, stderr=True, display=True, verbose=False):
         # TODO what if there's a comment?
         semic = raw_cell.rstrip().endswith(';')
-        with capture_output(display=display, stdout=stdout, stderr=stderr) as c:
+        with capture_output(display=display, stdout=stdout and not verbose, stderr=stderr and not verbose) as c:
             result = super().run_cell(raw_cell, store_history, silent, shell_futures=shell_futures, cell_id=cell_id)
         return AttrDict(result=result, stdout='' if semic else c.stdout, stderr=c.stderr,
                         display_objects=c.outputs, exception=result.error_in_exec, quiet=semic)
@@ -86,14 +86,14 @@ class CaptureShell(InteractiveShell):
 # %% ../nbs/02_shell.ipynb
 @patch
 def run_cell(self:CaptureShell, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
-             stdout=True, stderr=True, display=True, timeout=None):
+             stdout=True, stderr=True, display=True, timeout=None, verbose=False):
     if not timeout: timeout = self.timeout
     if timeout:
         def handler(*args): raise TimeoutError()
         signal.signal(signal.SIGALRM, handler)
         signal.alarm(timeout)
     try: return self._run(raw_cell, store_history, silent, shell_futures, cell_id=cell_id,
-                          stdout=stdout, stderr=stderr, display=display)
+                          stdout=stdout, stderr=stderr, display=display, verbose=verbose)
     finally:
         if timeout: signal.alarm(0)
 
@@ -129,12 +129,10 @@ def _out_nb(o, fmt):
     if o.stdout: res.append(_out_stream(o.stdout, 'stdout'))
     if o.stderr: res.append(_out_stream(o.stderr, 'stderr'))
     if o.exception: res.append(_out_exc(o.exception))
-    r = o.result.result
-    if hasattr(r, '__ft__'): r = r.__ft__()
-    res.result = r
+    res.result = o.result.result
     for x in o.display_objects: res.append(_mk_out(x.data, x.metadata))
-    if r is not None and not o.quiet and not isinstance_str(r, 'FT'):
-        res.append(_mk_out(*fmt.format(r), 'execute_result'))
+    if res.result is not None and not o.quiet:
+        res.append(_mk_out(*fmt.format(res.result), 'execute_result'))
     if 'execution_count' not in o: o['execution_count']=None
     for p in res:
         if p["output_type"]=="execute_result": p['execution_count'] = o['execution_count']
@@ -146,9 +144,10 @@ def run(self:CaptureShell,
         code:str, # Python/IPython code to run
         stdout=True, # Capture stdout and save as output?
         stderr=True, # Capture stderr and save as output?
-       timeout:Optional[int]=None): # Shell command will time out after {timeout} seconds
+        timeout:Optional[int]=None, # Shell command will time out after {timeout} seconds
+        verbose:bool=False): # Show stdout/stderr during execution
     "Run `code`, returning a list of all outputs in Jupyter notebook format"
-    res = self.run_cell(code, stdout=stdout, stderr=stderr, timeout=timeout)
+    res = self.run_cell(code, stdout=stdout, stderr=stderr, timeout=timeout, verbose=verbose)
     self.result = res.result.result
     self.exc = res.exception
     return _out_nb(res, self.display_formatter)
@@ -159,8 +158,9 @@ async def run_async(self:CaptureShell,
         code: str,  # Python/IPython code to run
         stdout=True,  # Capture stdout and save as output?
         stderr=True,  # Capture stderr and save as output?
-        timeout:Optional[int]=None): # Shell command will time out after {timeout} seconds
-    return self.run(code, stdout=stdout, stderr=stderr, timeout=timeout)
+        timeout:Optional[int]=None, # Shell command will time out after {timeout} seconds
+        verbose:bool=False): # Show stdout/stderr during execution
+    return self.run(code, stdout=stdout, stderr=stderr, timeout=timeout, verbose=verbose)
 
 # %% ../nbs/02_shell.ipynb
 def _pre(s, xtra=''): return f"<pre {xtra}><code>{escape(s)}</code></pre>"
@@ -199,11 +199,11 @@ def render_outputs(outputs, ansi_renderer=_strip, include_imgs=True, pygments=Fa
 
 # %% ../nbs/02_shell.ipynb
 @patch
-def cell(self:CaptureShell, cell, stdout=True, stderr=True):
+def cell(self:CaptureShell, cell, stdout=True, stderr=True, verbose=False):
     "Run `cell`, skipping if not code, and store outputs back in cell"
     if cell.cell_type!='code': return
     self._cell_idx = cell.idx_ + 1
-    outs = self.run(cell.source)
+    outs = self.run(cell.source, verbose=verbose)
     if outs: cell.outputs = _dict2obj(outs)
 
 # %% ../nbs/02_shell.ipynb
@@ -241,13 +241,14 @@ def run_all(self:CaptureShell,
             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`
+            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:
         if not preproc(cell):
-            self.cell(cell)
+            self.cell(cell, verbose=verbose)
             postproc(cell)
         if self.exc and exc_stop: raise self.exc from None
 
@@ -261,7 +262,8 @@ def execute(self:CaptureShell,
             postproc:callable=_false, # Called after each cell is executed
             inject_code:str|None=None, # Code to inject into a cell
             inject_path:str|Path|None=None, # Path to file containing code to inject into a cell
-            inject_idx:int=0 # Cell to replace with `inject_code`
+            inject_idx:int=0, # Cell to replace with `inject_code`
+            verbose:bool=False # Show stdout/stderr during execution
 ):
     "Execute notebook from `src` and save with outputs to `dest"
     nb = read_nb(src)
@@ -269,7 +271,7 @@ def execute(self:CaptureShell,
     self.set_path(Path(src).parent.resolve())
     if inject_path is not None: inject_code = Path(inject_path).read_text()
     self.run_all(nb, exc_stop=exc_stop, preproc=preproc, postproc=postproc,
-                 inject_code=inject_code, inject_idx=inject_idx)
+                 inject_code=inject_code, inject_idx=inject_idx, verbose=verbose)
     if dest: write_nb(nb, dest)
 
 # %% ../nbs/02_shell.ipynb
@@ -292,11 +294,12 @@ def exec_nb(
     exc_stop:bool=False, # Stop on exceptions?
     inject_code:str=None, # Code to inject into a cell
     inject_path:str=None, # Path to file containing code to inject into a cell
-    inject_idx:int=0 # Cell to replace with `inject_code`
+    inject_idx:int=0, # Cell to replace with `inject_code`
+    verbose:bool=False # Show stdout/stderr during execution
 ):
     "Execute notebook from `src` and save with outputs to `dest`"
     CaptureShell().execute(src, dest, exc_stop=exc_stop, inject_code=inject_code,
-                           inject_path=inject_path, inject_idx=inject_idx)
+                           inject_path=inject_path, inject_idx=inject_idx, verbose=verbose)
 
 # %% ../nbs/02_shell.ipynb
 class SmartCompleter(IPCompleter):

{execnb-0.1.13.dist-info → execnb-0.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execnb
-Version: 0.1.13
+Version: 0.1.15
 Summary: A description of your project
 Home-page: https://github.com/AnswerDotAI/execnb/
 Author: Jeremy Howard
@@ -102,6 +102,7 @@ You can also execute notebooks from the command line with
 
     usage: exec_nb [-h] [--dest DEST] [--exc_stop] [--inject_code INJECT_CODE]
                    [--inject_path INJECT_PATH] [--inject_idx INJECT_IDX]
+                   [--verbose]
                    src
 
     Execute notebook from `src` and save with outputs to `dest`
@@ -116,3 +117,4 @@ You can also execute notebooks from the command line with
       --inject_code INJECT_CODE  Code to inject into a cell
       --inject_path INJECT_PATH  Path to file containing code to inject into a cell
       --inject_idx INJECT_IDX    Cell to replace with `inject_code` (default: 0)
+      --verbose                  Show stdout/stderr during execution (default: False)

execnb-0.1.15.dist-info/RECORD

@@ -0,0 +1,10 @@
+execnb/__init__.py,sha256=qb0TalpSt1CbprnFyeLUKqgrqNtmnk9IoQQ7umAoXVY,23
+execnb/_modidx.py,sha256=5VB9uTJiRMiFNsXUWcd2J5p1jvvV36vsmQPUCWuqzrE,6308
+execnb/nbio.py,sha256=gs3EGN0sP2j47XUH31rTn2KT57b3wWnBZsn9AoZm2JQ,3677
+execnb/shell.py,sha256=x9qzwKQ4dGp-u96GDAbJb-nKiPAbAcv91BlXiH1Xlpw,14186
+execnb-0.1.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+execnb-0.1.15.dist-info/METADATA,sha256=uVAHDOqtDORbwPOFxFRtrVpgP3JWA5IMVkDY1TtyLLg,3704
+execnb-0.1.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+execnb-0.1.15.dist-info/entry_points.txt,sha256=jZ8LPZCqnu4hXN_AgQpm05hVnTE-C25YK_4aiVX4i78,84
+execnb-0.1.15.dist-info/top_level.txt,sha256=VGWmzsw8FOlT1r5TdOxaTWIAyRdclcxNdJ2r1hojf5U,7
+execnb-0.1.15.dist-info/RECORD,,

{execnb-0.1.13.dist-info → execnb-0.1.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

execnb-0.1.13.dist-info/RECORD

@@ -1,10 +0,0 @@
-execnb/__init__.py,sha256=khDKUuWafURKVs5EAZkpOMiUHI2-V7axlqrWLPUpuZo,23
-execnb/_modidx.py,sha256=5VB9uTJiRMiFNsXUWcd2J5p1jvvV36vsmQPUCWuqzrE,6308
-execnb/nbio.py,sha256=gs3EGN0sP2j47XUH31rTn2KT57b3wWnBZsn9AoZm2JQ,3677
-execnb/shell.py,sha256=lL0I5vMYjhaeD3WFKwXekyAAAb-4kjosA1PFd-IrpKE,13723
-execnb-0.1.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-execnb-0.1.13.dist-info/METADATA,sha256=Uotcx1EkHSBT6yFY6T4Qpg0gZ1X2SPnNBif6yZetQw8,3587
-execnb-0.1.13.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-execnb-0.1.13.dist-info/entry_points.txt,sha256=jZ8LPZCqnu4hXN_AgQpm05hVnTE-C25YK_4aiVX4i78,84
-execnb-0.1.13.dist-info/top_level.txt,sha256=VGWmzsw8FOlT1r5TdOxaTWIAyRdclcxNdJ2r1hojf5U,7
-execnb-0.1.13.dist-info/RECORD,,