execnb 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

execnb/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

execnb/_modidx.py

@@ -3,7 +3,7 @@
 d = { 'settings': { 'branch': 'master',
                 'doc_baseurl': '/execnb/',
                 'doc_host': 'https://fastai.github.io',
-                'git_url': 'https://github.com/fastai/execnb/tree/master/',
+                'git_url': 'https://github.com/fastai/execnb/',
                 'lib_path': 'execnb'},
   'syms': { 'execnb.fastshell': {},
             'execnb.nbio': { 'execnb.nbio.NbCell': ('nbio.html#nbcell', 'execnb/nbio.py'),
@@ -46,4 +46,8 @@ d = { 'settings': { 'branch': 'master',
                               'execnb.shell._format_mimedata': ('shell.html#_format_mimedata', 'execnb/shell.py'),
                               'execnb.shell._out_exc': ('shell.html#_out_exc', 'execnb/shell.py'),
                               'execnb.shell._out_stream': ('shell.html#_out_stream', 'execnb/shell.py'),
-                              'execnb.shell.exec_nb': ('shell.html#exec_nb', 'execnb/shell.py')}}}
+                              'execnb.shell.exec_nb': ('shell.html#exec_nb', 'execnb/shell.py'),
+                              'execnb.shell.find_output': ('shell.html#find_output', 'execnb/shell.py'),
+                              '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/nbio.py

@@ -28,7 +28,7 @@ class NbCell(AttrDict):
 
     def parsed_(self):
         if self.cell_type!='code' or self.source.strip()[:1] in ['%', '!']: return
-        if '_parsed_' not in self: 
+        if '_parsed_' not in self:
             try: self._parsed_ = ast.parse(self.source).body
             # you can assign the result of ! to a variable in a notebook cell
             # which will result in a syntax error if parsed with the ast module.
@@ -70,6 +70,9 @@ def mk_cell(text,  # `source` attr in cell
     "Create an `NbCell` containing `text`"
     assert cell_type in {'code', 'markdown', 'raw'}
     if 'metadata' not in kwargs: kwargs['metadata']={}
+    if cell_type == 'code':
+        kwargs['outputs']=[]
+        kwargs['execution_count']=0
     return NbCell(0, dict(cell_type=cell_type, source=text, directives_={}, **kwargs))
 
 # %% ../nbs/01_nbio.ipynb 31

execnb/shell.py

@@ -29,7 +29,7 @@ from .nbio import _dict2obj
 from collections.abc import Callable
 
 # %% auto 0
-__all__ = ['CaptureShell', 'exec_nb']
+__all__ = ['CaptureShell', 'find_output', 'out_exec', 'out_stream', 'out_error', 'exec_nb']
 
 # %% ../nbs/02_shell.ipynb 4
 # IPython requires a DisplayHook and DisplayPublisher
@@ -155,7 +155,32 @@ def cell(self:CaptureShell, cell, stdout=True, stderr=True):
         for o in outs:
             if 'execution_count' in o: cell['execution_count'] = o['execution_count']
 
-# %% ../nbs/02_shell.ipynb 28
+# %% ../nbs/02_shell.ipynb 27
+def find_output(outp, # Output from `run`
+                ot='execute_result' # Output_type to find
+               ):
+    "Find first output of type `ot` in `CaptureShell.run` output"
+    return first(o for o in outp if o['output_type']==ot)
+
+# %% ../nbs/02_shell.ipynb 30
+def out_exec(outp):
+    "Get data from execution result in `outp`."
+    out = find_output(outp)
+    if out: return '\n'.join(first(out['data'].values()))
+
+# %% ../nbs/02_shell.ipynb 32
+def out_stream(outp):
+    "Get text from stream in `outp`."
+    out = find_output(outp, 'stream')
+    if out: return ('\n'.join(out['text'])).strip()
+
+# %% ../nbs/02_shell.ipynb 34
+def out_error(outp):
+    "Get traceback from error in `outp`."
+    out = find_output(outp, 'error')
+    if out: return '\n'.join(out['traceback'])
+
+# %% ../nbs/02_shell.ipynb 37
 def _false(o): return False
 
 @patch
@@ -175,7 +200,7 @@ def run_all(self:CaptureShell,
             postproc(cell)
         if self.exc and exc_stop: raise self.exc[1] from None
 
-# %% ../nbs/02_shell.ipynb 42
+# %% ../nbs/02_shell.ipynb 51
 @patch
 def execute(self:CaptureShell,
             src:str|Path, # Notebook path to read from
@@ -196,7 +221,7 @@ def execute(self:CaptureShell,
                  inject_code=inject_code, inject_idx=inject_idx)
     if dest: write_nb(nb, dest)
 
-# %% ../nbs/02_shell.ipynb 46
+# %% ../nbs/02_shell.ipynb 55
 @patch
 def prettytb(self:CaptureShell, 
              fname:str|Path=None): # filename to print alongside the traceback
@@ -208,7 +233,7 @@ def prettytb(self:CaptureShell,
     fname_str = f' in {fname}' if fname else ''
     return f"{type(self.exc[1]).__name__}{fname_str}:\n{_fence}\n{cell_str}\n"
 
-# %% ../nbs/02_shell.ipynb 65
+# %% ../nbs/02_shell.ipynb 74
 @call_parse
 def exec_nb(
     src:str, # Notebook path to read from

{execnb-0.1.5.dist-info → execnb-0.1.6.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: execnb
-Version: 0.1.5
+Version: 0.1.6
 Summary: A description of your project
-Home-page: https://github.com/fastai/execnb/tree/master/
+Home-page: https://github.com/fastai/execnb/
 Author: Jeremy Howard
 Author-email: j@fast.ai
 License: Apache Software License 2.0
@@ -16,14 +16,14 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore (>=1.5.5)
+Requires-Dist: fastcore >=1.5.5
 Requires-Dist: ipython
 Provides-Extra: dev
 Requires-Dist: matplotlib ; extra == 'dev'
 Requires-Dist: Pillow ; extra == 'dev'
 
-execnb
-================
+# execnb
+
 
 <!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->
 

execnb-0.1.6.dist-info/RECORD

@@ -0,0 +1,11 @@
+execnb/__init__.py,sha256=n3oM6B_EMz93NsTI18NNZd-jKFcUPzUkbIKj5VFK5ok,22
+execnb/_modidx.py,sha256=1OsF4WZ4cmkxB9wAj8kWjGMmVVhX4BbH73yWAYGBzCM,5229
+execnb/fastshell.py,sha256=ODng8r7-b74lRiCR2nENHuIMubxnkfArh0Su2VMHMSs,4285
+execnb/nbio.py,sha256=TOOsiO6VAduLfwbXWgCu4k_fXKEpJw6byBq69BCVXek,3660
+execnb/shell.py,sha256=lL1rWX_iCPDPb0hK_UZIoqoRkY-plUL_RU6e4ujnjmE,9782
+execnb-0.1.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+execnb-0.1.6.dist-info/METADATA,sha256=2FLEW9GK9faxUYwHN6g-43CI90xRcwvm2jQE8Pcm01o,3250
+execnb-0.1.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+execnb-0.1.6.dist-info/entry_points.txt,sha256=jZ8LPZCqnu4hXN_AgQpm05hVnTE-C25YK_4aiVX4i78,84
+execnb-0.1.6.dist-info/top_level.txt,sha256=VGWmzsw8FOlT1r5TdOxaTWIAyRdclcxNdJ2r1hojf5U,7
+execnb-0.1.6.dist-info/RECORD,,

{execnb-0.1.5.dist-info → execnb-0.1.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

execnb-0.1.5.dist-info/RECORD

@@ -1,11 +0,0 @@
-execnb/__init__.py,sha256=rPSfWgIeq2YWVPyESOAwCBt8vftsTpIkuLAGDEzyRQc,22
-execnb/_modidx.py,sha256=gpQj6i1HkFABwB73tBR5iaLqNDZNUY3wilOxlO7P5FQ,4833
-execnb/fastshell.py,sha256=ODng8r7-b74lRiCR2nENHuIMubxnkfArh0Su2VMHMSs,4285
-execnb/nbio.py,sha256=9k15675BTHIWDNVbbN_B93g6pCDECBDX4g7HgxHvyys,3568
-execnb/shell.py,sha256=se6sLSEql-zTbHWOH0P_fQ8Qg1WJCEv4s2HCfoaaOfE,8911
-execnb-0.1.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-execnb-0.1.5.dist-info/METADATA,sha256=t5lJC6cUeocujmRxcvQ0nSnMUo4L3VJ8IfbB6lsyfxc,3278
-execnb-0.1.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-execnb-0.1.5.dist-info/entry_points.txt,sha256=jZ8LPZCqnu4hXN_AgQpm05hVnTE-C25YK_4aiVX4i78,84
-execnb-0.1.5.dist-info/top_level.txt,sha256=VGWmzsw8FOlT1r5TdOxaTWIAyRdclcxNdJ2r1hojf5U,7
-execnb-0.1.5.dist-info/RECORD,,