fastcore 2.2.1__tar.gz → 2.2.3__tar.gz

{fastcore-2.2.1/fastcore.egg-info → fastcore-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.1
+Version: 2.2.3
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0

{fastcore-2.2.1 → fastcore-2.2.3}/fastcore/__init__.py

@@ -55,4 +55,4 @@ Modules:
 - `fastcore.xml`: Concise generation of XML.
 - `fastcore.xtras`: Utility functions used in the fastai library"""
 
-__version__ = "2.2.1"
+__version__ = "2.2.3"

{fastcore-2.2.1 → fastcore-2.2.3}/fastcore/_modidx.py

@@ -577,6 +577,7 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.Notebook.summary': ('nbio.html#notebook.summary', 'fastcore/nbio.py'),
                                'fastcore.nbio.Notebook.to_dict': ('nbio.html#notebook.to_dict', 'fastcore/nbio.py'),
                                'fastcore.nbio.Notebook.view_cell': ('nbio.html#notebook.view_cell', 'fastcore/nbio.py'),
+                               'fastcore.nbio._cap_tb': ('nbio.html#_cap_tb', 'fastcore/nbio.py'),
                                'fastcore.nbio._cell_method': ('nbio.html#_cell_method', 'fastcore/nbio.py'),
                                'fastcore.nbio._dict2obj': ('nbio.html#_dict2obj', 'fastcore/nbio.py'),
                                'fastcore.nbio._dir_attrs': ('nbio.html#_dir_attrs', 'fastcore/nbio.py'),
@@ -600,6 +601,7 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio._render_text': ('nbio.html#_render_text', 'fastcore/nbio.py'),
                                'fastcore.nbio._split_cell': ('nbio.html#_split_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio._split_mime': ('nbio.html#_split_mime', 'fastcore/nbio.py'),
+                               'fastcore.nbio._tb_line': ('nbio.html#_tb_line', 'fastcore/nbio.py'),
                                'fastcore.nbio._unparse_dir': ('nbio.html#_unparse_dir', 'fastcore/nbio.py'),
                                'fastcore.nbio.cell2xml': ('nbio.html#cell2xml', 'fastcore/nbio.py'),
                                'fastcore.nbio.cell_edit': ('nbio.html#cell_edit', 'fastcore/nbio.py'),
@@ -623,6 +625,7 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.msgs2outs': ('nbio.html#msgs2outs', 'fastcore/nbio.py'),
                                'fastcore.nbio.nb2dict': ('nbio.html#nb2dict', 'fastcore/nbio.py'),
                                'fastcore.nbio.nb2str': ('nbio.html#nb2str', 'fastcore/nbio.py'),
+                               'fastcore.nbio.nb_frontmatter': ('nbio.html#nb_frontmatter', 'fastcore/nbio.py'),
                                'fastcore.nbio.nb_lang': ('nbio.html#nb_lang', 'fastcore/nbio.py'),
                                'fastcore.nbio.new_nb': ('nbio.html#new_nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.preferred_msg_out': ('nbio.html#preferred_msg_out', 'fastcore/nbio.py'),

{fastcore-2.2.1 → fastcore-2.2.3}/fastcore/nbio.py

@@ -11,16 +11,16 @@ Docs: https://fastcore.fast.ai/nbio.html.md"""
 # %% auto #0
 __all__ = ['langs', 'cell_insert_line', 'cell_str_replace', 'cell_strs_replace', 'cell_replace_lines', 'cell_del_lines',
            'cell_ast_replace', 'IMG_MIMES', 'nb_lang', 'NbCell', 'dict2nb', 'read_nb', 'mk_cell', 'new_nb',
-           'first_code_ln', 'dir_tag', 'nb2dict', 'nb2str', 'write_nb', 'find_id', 'cell_edit', 'view_cell',
-           'validate_cell', 'validate_nb', 'repair_cell', 'repair_nb', 'preferred_out', 'join_out', 'mk_stream',
-           'mk_result', 'mk_display', 'mk_error', 'concat_streams', 'preferred_msg_out', 'render_output',
+           'nb_frontmatter', 'first_code_ln', 'dir_tag', 'nb2dict', 'nb2str', 'write_nb', 'find_id', 'cell_edit',
+           'view_cell', 'validate_cell', 'validate_nb', 'repair_cell', 'repair_nb', 'preferred_out', 'join_out',
+           'mk_stream', 'mk_result', 'mk_display', 'mk_error', 'concat_streams', 'preferred_msg_out', 'render_output',
            'render_outputs', 'render_text', 'item2xml', 'cell2xml', 'cells2xml', 'Notebook', 'CellRow', 'CellRows',
            'summary_nb', 'Found', 'FoundCells', 'find_cells', 'deep_merge', 'update_cell', 'select_cells', 'exec_cell',
            'show_cell', 'msg2out', 'msgs2outs']
 
 # %% ../nbs/13_nbio.ipynb #954ca1aa
 from .basics import *
-from .xtras import rtoken_hex,clean_cli_output,take_lines,str_diff,truncstr
+from .xtras import frontmatter,rtoken_hex,clean_cli_output,take_lines,str_diff,truncstr
 from .imports import *
 from .ansi import ansi2html
 from .meta import delegates,splice_sig
@@ -140,6 +140,13 @@ def new_nb(cells=None, meta=None, nbformat=4, nbformat_minor=5):
     cells = [o if isinstance(o,dict) else mk_cell(o) for o in cells or []]
     return dict2nb(cells=cells or [],metadata=meta or {},nbformat=nbformat,nbformat_minor=nbformat_minor)
 
+# %% ../nbs/13_nbio.ipynb #af62e5ef
+def nb_frontmatter(nb, strvals:bool=False):
+    "Frontmatter mapping from `nb`'s first cell (raw or markdown opening with `---`)"
+    c = first(nb.cells)
+    if c is None or c.cell_type not in ('raw','markdown'): return {}
+    return frontmatter(c.source, strvals=strvals)[0]
+
 # %% ../nbs/13_nbio.ipynb #c2ed0d5e
 def _dir_pre(lang=None): return fr"\s*{langs[lang]}\s*\|"
 _cell_mgc = re.compile(r"^\s*%%\w+")
@@ -541,10 +548,23 @@ def render_outputs(outputs):
     return '\n'.join(render_output(o) for o in concat_streams(outputs))
 
 # %% ../nbs/13_nbio.ipynb #88b0018a
-def _render_text(out, html1st=False):
+def _tb_line(l, maxlen):
+    "One traceback line, capped at `maxlen`; `None` drops it (an over-long anchor line means nothing once cut). `File `/`Cell ` locations are exempt."
+    if len(l) <= maxlen: return l
+    if l.strip() and not (set(l) - set('~^ ')): return None
+    if l.lstrip().startswith(('File ', 'Cell ')): return l
+    return l[:maxlen] + '…'
+
+def _cap_tb(tb, maxlen):
+    "Cap over-long lines in `tb`'s chunks, stripping ANSI first (the cap can sever an escape sequence); the last chunk is the exception message and survives whole"
+    tb = [strip_ansi(c) for c in tb]
+    return ['\n'.join(l for l in (_tb_line(x, maxlen) for x in c.split('\n')) if l is not None) for c in tb[:-1]] + tb[-1:]
+
+def _render_text(out, html1st=False, tb_maxlen=None):
     typ = out['output_type']
+    if typ=='error' and tb_maxlen: out = {**out, 'traceback': _cap_tb(out.get('traceback', []), tb_maxlen)}
     mime,d = preferred_msg_out(out, html1st=html1st, include_imgs=False)
-    d = join_out(d)
+    d = strip_ansi(join_out(d))
     if not d: return None
     attrs = {}
     if typ == 'stream': typ = out.get('name')
@@ -552,10 +572,10 @@ def _render_text(out, html1st=False):
     body = f'\n{d}' if d.endswith('\n') else f'\n{d}\n'
     return d, to_xml(ft(typ, body, **attrs), do_escape=False, indent=False)
 
-def render_text(outputs, html1st=False):
-    "Render notebook outputs to concise text, using XML-ish tags when multiple outputs are present."
+def render_text(outputs, html1st=False, tb_maxlen=None):
+    "Render notebook outputs to concise ANSI-stripped text, using XML-ish tags when multiple outputs are present; `tb_maxlen` caps over-long error-traceback lines"
     if (not isinstance(outputs, (list,tuple))) or (outputs and not isinstance(outputs[0],dict)): return ''
-    items = [o for out in concat_streams(outputs) if (o := _render_text(out, html1st=html1st))]
+    items = [o for out in concat_streams(outputs) if (o := _render_text(out, html1st=html1st, tb_maxlen=tb_maxlen))]
     if not items: return ''
     return items[0][0] if len(items)==1 else '\n'.join(o[1] for o in items)
 

{fastcore-2.2.1 → fastcore-2.2.3}/fastcore/xml.py

@@ -182,7 +182,7 @@ def _to_xml(elm, lvl=0, indent=True, do_escape=True):
     esc_fn = _escape if do_escape else _noescape
     if elm is None: return ''
     if hasattr(elm, '__ft__'): elm = elm.__ft__()
-    if isinstance(elm, tuple): return ''.join(_to_xml(o, lvl=lvl, indent=indent, do_escape=do_escape) for o in elm)
+    if isinstance(elm, (tuple, L)): return ''.join(_to_xml(o, lvl=lvl, indent=indent, do_escape=do_escape) for o in elm)
     if isinstance(elm, bytes): return elm.decode('utf-8')
     if not isinstance(elm, FT): return f'{esc_fn(elm)}'
 
@@ -204,7 +204,7 @@ def _to_xml(elm, lvl=0, indent=True, do_escape=True):
     if not cs:
         if is_void: return f'{sp}{stag_}{nl_end}'
         else: return f'{sp}{stag_}{cltag}{nl_end}'
-    if len(cs) == 1 and not isinstance(cs[0], (list, tuple, FT)) and not hasattr(cs[0], '__ft__'):
+    if len(cs) == 1 and not isinstance(cs[0], (list, tuple, L, FT)) and not hasattr(cs[0], '__ft__'):
         content = esc_fn(cs[0])
         return f'{sp}{stag_}{content}{cltag}{nl_end}'
 
@@ -217,13 +217,12 @@ def _to_xml(elm, lvl=0, indent=True, do_escape=True):
 def to_xml(*elms, lvl=0, indent=True, do_escape=True):
     "Convert `ft` element tree into an XML string"
     def _f(elm):
-        if isinstance(elm, (list,tuple,FT)) or hasattr(elm, '__ft__'):
+        if isinstance(elm, (list,tuple,L,FT)) or hasattr(elm, '__ft__'):
             return _to_xml(elm, lvl, indent, do_escape=do_escape)
         if isinstance(elm, bytes): return elm.decode('utf-8')
         return elm or ''
     return Safe('\n'.join(map(_f, elms)))
 
-
 # %% ../nbs/09_xml.ipynb #dd054392
 @patch
 def __html__(self:FT): return to_xml(self, indent=False)

{fastcore-2.2.1 → fastcore-2.2.3}/fastcore/xtras.py

@@ -43,7 +43,7 @@ from .ansi import strip_ansi
 
 from importlib import import_module
 from functools import wraps
-import string,time,dataclasses,difflib
+import string,time,dataclasses,difflib,json
 from enum import Enum
 from contextlib import contextmanager,ExitStack
 from configparser import ConfigParser
@@ -250,8 +250,6 @@ def bunzip(fn):
 def loads(s, **kw):
     "Same as `json.loads`, but handles `None`"
     if not s: return {}
-    try: import ujson as json
-    except ModuleNotFoundError: import json
     return json.loads(s, **kw)
 
 # %% ../nbs/03_xtras.ipynb #131170f7
@@ -268,10 +266,7 @@ def loads_multi(s:str):
 
 # %% ../nbs/03_xtras.ipynb #ed688ac4
 def dumps(obj, **kw):
-    "Same as `json.dumps`, but uses `ujson` if available"
-    try: import ujson as json
-    except ModuleNotFoundError: import json
-    else: kw['escape_forward_slashes']=False
+    "Same as `json.dumps`"
     return json.dumps(obj, **kw)
 
 # %% ../nbs/03_xtras.ipynb #ac84300c
@@ -741,15 +736,17 @@ def asave_iter(g):
     return _
 
 # %% ../nbs/03_xtras.ipynb #d2757e2a
-def frontmatter(txt:str)->tuple:
+def frontmatter(txt:str, strvals:bool=False)->tuple:
     "Tuple of (dict, body) from frontmatter in `txt`; invalid/missing frontmatter returns ({}, txt)"
     import yaml
     if not txt.startswith('---\n'): return {},txt
-    fm,part,body = txt[4:].partition('\n---\n')
-    if not part: return {},txt
-    try: res = yaml.safe_load(fm)
-    except yaml.parser.ParserError: return {},txt
-    return (res,body) if isinstance(res,dict) else ({},txt)
+    end = min((i for i in (txt.find(f'\n{c}\n', 3) for c in ('---','...')) if i >= 0), default=-1)
+    if end < 0:
+        if not txt.endswith(('\n---','\n...')): return {},txt
+        end = len(txt) - 4
+    try: res = yaml.load(txt[4:end], Loader=yaml.BaseLoader if strvals else yaml.SafeLoader)
+    except yaml.YAMLError: return {},txt
+    return (res,txt[end+5:]) if isinstance(res,dict) else ({},txt)
 
 # %% ../nbs/03_xtras.ipynb #45eb5141
 def clean_cli_output(txt:str, strip:bool=True):

{fastcore-2.2.1 → fastcore-2.2.3/fastcore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.1
+Version: 2.2.3
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0