fastcore 2.2.2__tar.gz → 2.2.4__tar.gz

{fastcore-2.2.2/fastcore.egg-info → fastcore-2.2.4}/PKG-INFO

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

{fastcore-2.2.2 → fastcore-2.2.4}/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.2"
+__version__ = "2.2.4"

{fastcore-2.2.2 → fastcore-2.2.4}/fastcore/_modidx.py

@@ -605,6 +605,7 @@ d = { 'settings': { 'branch': 'main',
                                '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'),
+                               'fastcore.nbio.cell_frontmatter': ('nbio.html#cell_frontmatter', 'fastcore/nbio.py'),
                                'fastcore.nbio.cells2xml': ('nbio.html#cells2xml', 'fastcore/nbio.py'),
                                'fastcore.nbio.concat_streams': ('nbio.html#concat_streams', 'fastcore/nbio.py'),
                                'fastcore.nbio.deep_merge': ('nbio.html#deep_merge', 'fastcore/nbio.py'),
@@ -616,6 +617,7 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.first_code_ln': ('nbio.html#first_code_ln', 'fastcore/nbio.py'),
                                'fastcore.nbio.item2xml': ('nbio.html#item2xml', 'fastcore/nbio.py'),
                                'fastcore.nbio.join_out': ('nbio.html#join_out', 'fastcore/nbio.py'),
+                               'fastcore.nbio.md_frontmatter': ('nbio.html#md_frontmatter', 'fastcore/nbio.py'),
                                'fastcore.nbio.mk_cell': ('nbio.html#mk_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.mk_display': ('nbio.html#mk_display', 'fastcore/nbio.py'),
                                'fastcore.nbio.mk_error': ('nbio.html#mk_error', 'fastcore/nbio.py'),

{fastcore-2.2.2 → fastcore-2.2.4}/fastcore/nbio.py

@@ -11,12 +11,12 @@ 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',
-           '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']
+           'cell_frontmatter', 'md_frontmatter', '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 *
@@ -141,11 +141,33 @@ def new_nb(cells=None, meta=None, nbformat=4, nbformat_minor=5):
     return dict2nb(cells=cells or [],metadata=meta or {},nbformat=nbformat,nbformat_minor=nbformat_minor)
 
 # %% ../nbs/13_nbio.ipynb #af62e5ef
+def cell_frontmatter(s:str, strvals:bool=False):
+    "Frontmatter mapping from a cell source that is entirely a literal `---` block, else {}"
+    d,body = frontmatter(s.strip(), strvals=strvals)
+    return d if not body.strip() else {}
+
+def md_frontmatter(s:str):
+    "Frontmatter synthesized from an H1-formatted markdown cell: `# title`, `> description`, and `- key: value` lines"
+    import yaml
+    m = re.search(r'^#\s+(\S.*?)\s*$', s, flags=re.MULTILINE)
+    if not m: return {}
+    res = dict(title=m.group(1))
+    m = re.search(r'^>\s+(\S.*?)\s*$', s, flags=re.MULTILINE)
+    if m: res['description'] = m.group(1)
+    r = re.findall(r'^-\s+(\S.*:.*\S)\s*$', s, flags=re.MULTILINE)
+    if r:
+        try: res.update(yaml.safe_load('\n'.join(r)))
+        except yaml.YAMLError as e: warn(f'Failed to create YAML dict for:\n{r}\n\n{e}\n')
+    return res
+
 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]
+    "Frontmatter from `nb`: its first raw cell plus first markdown cell (literal `---` block, or `# title` synthesis), raw keys winning"
+    raw = first(c for c in nb.cells if c.cell_type=='raw')
+    md  = first(c for c in nb.cells if c.cell_type=='markdown')
+    res = (cell_frontmatter(md.source, strvals=strvals) or md_frontmatter(md.source)) if md else {}
+    if raw: res.update(cell_frontmatter(raw.source, strvals=strvals))
+    return res
+
 
 # %% ../nbs/13_nbio.ipynb #c2ed0d5e
 def _dir_pre(lang=None): return fr"\s*{langs[lang]}\s*\|"

{fastcore-2.2.2 → fastcore-2.2.4}/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.2 → fastcore-2.2.4}/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
@@ -742,15 +737,14 @@ def asave_iter(g):
 
 # %% ../nbs/03_xtras.ipynb #d2757e2a
 def frontmatter(txt:str, strvals:bool=False)->tuple:
-    "Tuple of (dict, body) from frontmatter in `txt`; invalid/missing frontmatter returns ({}, txt)"
+    "Tuple of (dict, body) from frontmatter in `txt`; missing frontmatter returns ({}, txt), malformed YAML raises"
     import yaml
     if not txt.startswith('---\n'): return {},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
+    res = yaml.load(txt[4:end], Loader=yaml.BaseLoader if strvals else yaml.SafeLoader)
     return (res,txt[end+5:]) if isinstance(res,dict) else ({},txt)
 
 # %% ../nbs/03_xtras.ipynb #45eb5141

{fastcore-2.2.2 → fastcore-2.2.4/fastcore.egg-info}/PKG-INFO

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