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

execnb/__init__.py

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

execnb/_modidx.py

@@ -1,6 +1,6 @@
 # Autogenerated by nbdev
 
-d = { 'settings': { 'branch': 'master',
+d = { 'settings': { 'branch': 'main',
                 'doc_baseurl': '/execnb/',
                 'doc_host': 'https://AnswerDotAI.github.io',
                 'git_url': 'https://github.com/AnswerDotAI/execnb/',
@@ -35,6 +35,7 @@ d = { 'settings': { 'branch': 'master',
                               'execnb.shell.CaptureShell.set_path': ('shell.html#captureshell.set_path', 'execnb/shell.py'),
                               'execnb.shell.ExecutionInfo.__repr__': ('shell.html#executioninfo.__repr__', 'execnb/shell.py'),
                               'execnb.shell.ExecutionResult.__repr__': ('shell.html#executionresult.__repr__', 'execnb/shell.py'),
+                              'execnb.shell.NbResult': ('shell.html#nbresult', 'execnb/shell.py'),
                               'execnb.shell.SmartCompleter': ('shell.html#smartcompleter', 'execnb/shell.py'),
                               'execnb.shell.SmartCompleter.__call__': ('shell.html#smartcompleter.__call__', 'execnb/shell.py'),
                               'execnb.shell.SmartCompleter.__init__': ('shell.html#smartcompleter.__init__', 'execnb/shell.py'),

execnb/shell.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 from fastcore.utils import *
 from fastcore.script import call_parse
-from fastcore.ansi import ansi2html
+from fastcore.ansi import ansi2html, strip_ansi
 
 import multiprocessing,types,traceback,signal
 try:
@@ -17,7 +17,6 @@ except RuntimeError: pass # if re-running cell
 from IPython.core.interactiveshell import InteractiveShell, ExecutionInfo, ExecutionResult
 from IPython.core.displayhook import DisplayHook
 from IPython.utils.capture import capture_output
-from IPython.utils.text import strip_ansi
 from IPython.core.completer import IPCompleter,provisionalcompleter,Completer
 from IPython.core.hooks import CommandChainDispatcher
 from IPython.core.completerlib import module_completer
@@ -33,9 +32,10 @@ except ImportError: set_matplotlib_formats = None
 from .nbio import *
 from .nbio import _dict2obj
 
+
 # %% auto 0
-__all__ = ['CaptureShell', 'format_exc', 'render_outputs', 'find_output', 'out_exec', 'out_stream', 'out_error', 'exec_nb',
-           'SmartCompleter']
+__all__ = ['CaptureShell', 'format_exc', 'NbResult', 'render_outputs', 'find_output', 'out_exec', 'out_stream', 'out_error',
+           'exec_nb', 'SmartCompleter']
 
 # %% ../nbs/02_shell.ipynb
 class _CustDisplayHook(DisplayHook):
@@ -102,6 +102,9 @@ def format_exc(e):
     "Format exception `e` as a string list"
     return traceback.format_exception(type(e), e, e.__traceback__)
 
+# %% ../nbs/02_shell.ipynb
+class NbResult(list): pass
+
 # %% ../nbs/02_shell.ipynb
 def _out_stream(text, name): return dict(name=name, output_type='stream', text=text.splitlines(True))
 def _out_exc(e):
@@ -122,13 +125,15 @@ def _mk_out(data, meta, output_type='display_data'):
     return dict(data=fd, metadata=meta, output_type=output_type)
 
 def _out_nb(o, fmt):
-    res = []
+    res = NbResult()
     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
     for x in o.display_objects: res.append(_mk_out(x.data, x.metadata))
-    if r is not None and not o.quiet:
+    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 'execution_count' not in o: o['execution_count']=None
     for p in res:
@@ -161,33 +166,35 @@ async def run_async(self:CaptureShell,
 def _pre(s, xtra=''): return f"<pre {xtra}><code>{escape(s)}</code></pre>"
 def _strip(s): return strip_ansi(escape(s))
 
-def render_outputs(outputs, ansi_renderer=_strip, include_imgs=True, pygments=False):
+def render_outputs(outputs, ansi_renderer=_strip, include_imgs=True, pygments=False, md_tfm=noop, html_tfm=noop):
     try:
         from mistletoe import markdown, HTMLRenderer
         from mistletoe.contrib.pygments_renderer import PygmentsRenderer
-    except ImportError: return print('mistletoe not found -- please install it')
+    except ImportError: return print('mistletoe not found -- please install it for execnb.shell.render_output')
     renderer = PygmentsRenderer if pygments else HTMLRenderer
+    
     def render_output(out):
         otype = out['output_type']
         if otype == 'stream':
-            txt = ansi_renderer(''.join(out['text']))
+            txt = ansi_renderer(''.join(out["text"]))
             xtra = '' if out['name']=='stdout' else "class='stderr'"
-            return f"<pre {xtra}><code>{txt}</code></pre>"
+            is_err = '<span class' in txt
+            return f"<pre {xtra}><code class='{'nohighlight hljs' if is_err else ''}'>{txt}</code></pre>"
         elif otype in ('display_data','execute_result'):
             data = out['data']
             _g = lambda t: ''.join(data[t]) if t in data else None
-            if d := _g('text/html'): return d
+            if d := _g('text/html'): return html_tfm(d)
             if d := _g('application/javascript'): return f'<script>{d}</script>'
-            if d := _g('text/markdown'): return markdown(d, renderer=renderer)
+            if d := _g('text/markdown'): return md_tfm(markdown(d, renderer=renderer))
             if d := _g('text/latex'): return f'<div class="math">${d}$</div>'
             if include_imgs:
                 if d := _g('image/jpeg'): return f'<img src="data:image/jpeg;base64,{d}"/>'
                 if d := _g('image/png'): return f'<img src="data:image/png;base64,{d}"/>'
+                if d := _g('image/svg+xml'): return d
             if d := _g('text/plain'): return _pre(d)
-            if d := _g('image/svg+xml'): return d
             
         return ''
-    
+
     return '\n'.join(map(render_output, outputs))
 
 # %% ../nbs/02_shell.ipynb
@@ -273,7 +280,7 @@ def prettytb(self:CaptureShell,
     fname = fname if fname else self._fname
     _fence = '='*75
     cell_intro_str = f"While Executing Cell #{self._cell_idx}:" if self._cell_idx else "While Executing:"
-    cell_str = f"\n{cell_intro_str}\n{format_exc(self.exc)}"
+    cell_str = f"\n{cell_intro_str}\n{''.join(format_exc(self.exc))}"
     fname_str = f' in {fname}' if fname else ''
     return f"{type(self.exc).__name__}{fname_str}:\n{_fence}\n{cell_str}\n"
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: execnb
-Version: 0.1.11
+Version: 0.1.13
 Summary: A description of your project
 Home-page: https://github.com/AnswerDotAI/execnb/
 Author: Jeremy Howard
@@ -16,12 +16,25 @@ 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'
-Requires-Dist: mistletoe ; extra == 'dev'
+Requires-Dist: matplotlib; extra == "dev"
+Requires-Dist: Pillow; extra == "dev"
+Requires-Dist: mistletoe; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # execnb
 

execnb-0.1.13.dist-info/RECORD

@@ -0,0 +1,10 @@
+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,,

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

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

execnb-0.1.11.dist-info/RECORD

@@ -1,10 +0,0 @@
-execnb/__init__.py,sha256=nllDrH0jyChMuuYrK0CC55iTBKUNTUjejtcwxyUF2EQ,23
-execnb/_modidx.py,sha256=mGvzO-ucSjMp0NX4t0Ed7XNi2v-gvMPLQUiGQpN1QKU,6211
-execnb/nbio.py,sha256=gs3EGN0sP2j47XUH31rTn2KT57b3wWnBZsn9AoZm2JQ,3677
-execnb/shell.py,sha256=kUZyWBTcEb9iKdH-EoeM1O7TtL_9_Agi7AVjLlU8bGk,13402
-execnb-0.1.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-execnb-0.1.11.dist-info/METADATA,sha256=9vYzXQh7iYtP9cMcYOg23QTb_iGxhPNDa35lm9ixmcw,3313
-execnb-0.1.11.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-execnb-0.1.11.dist-info/entry_points.txt,sha256=jZ8LPZCqnu4hXN_AgQpm05hVnTE-C25YK_4aiVX4i78,84
-execnb-0.1.11.dist-info/top_level.txt,sha256=VGWmzsw8FOlT1r5TdOxaTWIAyRdclcxNdJ2r1hojf5U,7
-execnb-0.1.11.dist-info/RECORD,,