fastcore 2.2.3__tar.gz → 2.2.5__tar.gz

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

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

{fastcore-2.2.3 → fastcore-2.2.5}/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.3"
+__version__ = "2.2.5"

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

@@ -605,17 +605,18 @@ 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'),
                                'fastcore.nbio.dict2nb': ('nbio.html#dict2nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.dir_tag': ('nbio.html#dir_tag', 'fastcore/nbio.py'),
-                               'fastcore.nbio.exec_cell': ('nbio.html#exec_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.find_cells': ('nbio.html#find_cells', 'fastcore/nbio.py'),
                                'fastcore.nbio.find_id': ('nbio.html#find_id', 'fastcore/nbio.py'),
                                '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'),
@@ -636,8 +637,8 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.render_text': ('nbio.html#render_text', 'fastcore/nbio.py'),
                                'fastcore.nbio.repair_cell': ('nbio.html#repair_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.repair_nb': ('nbio.html#repair_nb', 'fastcore/nbio.py'),
+                               'fastcore.nbio.run_cell': ('nbio.html#run_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.select_cells': ('nbio.html#select_cells', 'fastcore/nbio.py'),
-                               'fastcore.nbio.show_cell': ('nbio.html#show_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.summary_nb': ('nbio.html#summary_nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.update_cell': ('nbio.html#update_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.validate_cell': ('nbio.html#validate_cell', 'fastcore/nbio.py'),

{fastcore-2.2.3 → fastcore-2.2.5}/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', 'run_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*\|"
@@ -844,44 +866,28 @@ def select_cells(
     if skip_noeval: sel = [o for o in sel if not _is_noeval(o)]
     return sel
 
-# %% ../nbs/13_nbio.ipynb #b30755db
-async def exec_cell(
-    shell, # An IPython `InteractiveShell` (or compatible: `transform_cell`, `compile`, `user_ns`, `events`)
-    src:str, # Cell source: magics, `!` commands, and top-level `await` all work
-): # The final bare expression's value (None if there is none, or a trailing `;` suppresses it)
-    "Run cell `src` in `shell` as a library call: the value and any exception go to the caller, and only the code's own output is shown"
-    __tracebackhide__ = True
-    xsrc = shell.transform_cell(src)
-    tree,cfname = ast.parse(xsrc),shell.compile.cache(xsrc)
-    expr = tree.body.pop().value if tree.body and isinstance(tree.body[-1], ast.Expr) else None
-    async def _go(node, mode):
-        __tracebackhide__ = "__ipython_bottom__"  # to the debugger: all frames above are host machinery
-        co = compile(ast.fix_missing_locations(node), cfname, mode, flags=ast.PyCF_ALLOW_TOP_LEVEL_AWAIT)
-        r = eval(co, shell.user_global_ns, shell.user_ns)
-        return await r if co.co_flags & inspect.CO_COROUTINE else r
-    shell.events.trigger('pre_execute')
-    r = None
-    try:
-        if tree.body: await _go(tree, 'exec')
-        if expr is not None: r = await _go(ast.Expression(body=expr), 'eval')
-    finally: shell.events.trigger('post_execute')
-    if src.rstrip().endswith(';') and not src.lstrip().startswith('%%'): return
-    return r
-
-# %% ../nbs/13_nbio.ipynb #6b39aa5b
-async def show_cell(
-    shell, # An IPython `InteractiveShell` (or compatible), as `exec_cell`
-    src:str, # Cell source, as `exec_cell`
-    raise_exc:bool=True, # Raise a failing cell's exception? Else display its traceback as the outcome
+# %% ../nbs/13_nbio.ipynb #4c71f592
+async def run_cell(
+    shell, # An `InteractiveShell`-compatible object: `transform_cell`, `run_cell_async`, `events`
+    raw_cell:str, # Python/IPython source for one cell: magics, `!` commands, and top-level `await` all work
+    store_history:bool=False, # Store the cell in the shell's history? (enables native `;` suppression and execution counts)
+    silent:bool=False, # Suppress displayhook and `post_run_cell` event? (the result value stays unset)
+    shell_futures:bool=True, # Share `__future__` imports with the shell?
+    cell_id=None, # Optional cell id, passed through to `run_cell_async`
 ):
-    "Run cell `src` in `shell` and display its result, notebook-style"
-    from IPython.display import display
-    try: r = await exec_cell(shell, src)
+    "Run one cell on `shell`: transform, await `run_cell_async` on the calling loop, and fire the post events; returns the `ExecutionResult`"
+    preprocessing_exc_tuple = None
+    try: transformed_cell = shell.transform_cell(raw_cell)
     except Exception:
-        if raise_exc: raise
-        traceback.print_exc()
-        return
-    if r is not None: display(r)
+        transformed_cell = raw_cell
+        preprocessing_exc_tuple = sys.exc_info()
+    result = None
+    try: result = await shell.run_cell_async(raw_cell, store_history, silent, shell_futures=shell_futures,
+        transformed_cell=transformed_cell, preprocessing_exc_tuple=preprocessing_exc_tuple, cell_id=cell_id)
+    finally:
+        shell.events.trigger('post_execute')
+        if not silent: shell.events.trigger('post_run_cell', result)
+    return result
 
 # %% ../nbs/13_nbio.ipynb #ec976147
 def _msg_type(msg): return msg.get('msg_type') or msg['header']['msg_type']

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

@@ -737,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.3 → fastcore-2.2.5/fastcore.egg-info}/PKG-INFO

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