fastcore 2.2.6__tar.gz → 2.2.7__tar.gz

{fastcore-2.2.6/fastcore.egg-info → fastcore-2.2.7}/PKG-INFO

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

{fastcore-2.2.6 → fastcore-2.2.7}/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.6"
+__version__ = "2.2.7"

{fastcore-2.2.6 → fastcore-2.2.7}/fastcore/_modidx.py

@@ -217,6 +217,7 @@ d = { 'settings': { 'branch': 'main',
                                  'fastcore.basics.instantiate': ('basics.html#instantiate', 'fastcore/basics.py'),
                                  'fastcore.basics.is_array': ('basics.html#is_array', 'fastcore/basics.py'),
                                  'fastcore.basics.joins': ('basics.html#joins', 'fastcore/basics.py'),
+                                 'fastcore.basics.kindsort': ('basics.html#kindsort', 'fastcore/basics.py'),
                                  'fastcore.basics.last': ('basics.html#last', 'fastcore/basics.py'),
                                  'fastcore.basics.last_index': ('basics.html#last_index', 'fastcore/basics.py'),
                                  'fastcore.basics.last_match': ('basics.html#last_match', 'fastcore/basics.py'),
@@ -588,7 +589,6 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio._directives_set': ('nbio.html#_directives_set', 'fastcore/nbio.py'),
                                'fastcore.nbio._is_exported': ('nbio.html#_is_exported', 'fastcore/nbio.py'),
                                'fastcore.nbio._is_json_mime': ('nbio.html#_is_json_mime', 'fastcore/nbio.py'),
-                               'fastcore.nbio._is_noeval': ('nbio.html#_is_noeval', 'fastcore/nbio.py'),
                                'fastcore.nbio._is_text': ('nbio.html#_is_text', 'fastcore/nbio.py'),
                                'fastcore.nbio._meta_directives': ('nbio.html#_meta_directives', 'fastcore/nbio.py'),
                                'fastcore.nbio._mkout': ('nbio.html#_mkout', 'fastcore/nbio.py'),
@@ -611,9 +611,11 @@ d = { 'settings': { 'branch': 'main',
                                '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.does_cell_eval': ('nbio.html#does_cell_eval', '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.fm_default_eval': ('nbio.html#fm_default_eval', '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'),
@@ -974,6 +976,7 @@ d = { 'settings': { 'branch': 'main',
                                 'fastcore.xtras.ssh': ('xtras.html#ssh', 'fastcore/xtras.py'),
                                 'fastcore.xtras.str_diff': ('xtras.html#str_diff', 'fastcore/xtras.py'),
                                 'fastcore.xtras.stringfmt_names': ('xtras.html#stringfmt_names', 'fastcore/xtras.py'),
+                                'fastcore.xtras.strloader': ('xtras.html#strloader', 'fastcore/xtras.py'),
                                 'fastcore.xtras.take_lines': ('xtras.html#take_lines', 'fastcore/xtras.py'),
                                 'fastcore.xtras.time_policy': ('xtras.html#time_policy', 'fastcore/xtras.py'),
                                 'fastcore.xtras.timed_cache': ('xtras.html#timed_cache', 'fastcore/xtras.py'),

{fastcore-2.2.6 → fastcore-2.2.7}/fastcore/basics.py

@@ -55,9 +55,9 @@ __all__ = ['defaults', 'null', 'num_methods', 'rnum_methods', 'inum_methods', 'a
            'using_attr', 'negate', 'fail_clean', 'dstar', 'copy_func', 'patch_to', 'patch', 'extend_enum', 'compile_re',
            'ImportEnum', 'StrEnum', 'str_enum', 'ValEnum', 'Stateful', 'NotStr', 'PrettyString', 'even_mults',
            'num_cpus', 'add_props', 'str2bool', 'str2int', 'str2float', 'str2list', 'str2date', 'str2dt', 'to_bool',
-           'to_int', 'to_float', 'to_list', 'to_date', 'typed', 'exec_new', 'exec_import', 'sig_with_params',
-           'fdelegates', 'xdumps', 'revive_dates', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv',
-           'is_', 'is_not', 'mod']
+           'to_int', 'to_float', 'to_list', 'to_date', 'typed', 'exec_new', 'exec_import', 'kindsort',
+           'sig_with_params', 'fdelegates', 'xdumps', 'revive_dates', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub',
+           'mul', 'truediv', 'is_', 'is_not', 'mod']
 
 # %% ../nbs/01_basics.ipynb #0e91ed82
 from .imports import *
@@ -1430,13 +1430,18 @@ def exec_import(mod, sym):
     return exec_new(f'from {mod} import {sym}')
 
 # %% ../nbs/01_basics.ipynb #bf300cb0
+def kindsort(ps):
+    "Params sorted by `Parameter.kind`"
+    return sorted(ps, key=lambda p: p.kind)
+
 def sig_with_params(sig, remove=None, keep=None, **updates):
+    "Copy of `sig` with `remove`d params dropped, `keep` params retained, and `updates` added, kind-sorted"
     sigd = dict(sig.parameters)
     for k in listify(remove): sigd.pop(k, None)
     kept = {k: sigd.pop(k) for k in listify(keep) if k in sigd}
     sigd.update(updates)
-    sigd.update(kept)  # re-add at end
-    return sig.replace(parameters=sigd.values())
+    sigd.update(kept)
+    return sig.replace(parameters=kindsort(sigd.values()))
 
 # %% ../nbs/01_basics.ipynb #b5758ba3
 def fdelegates(to):

{fastcore-2.2.6 → fastcore-2.2.7}/fastcore/meta.py

@@ -108,11 +108,10 @@ def use_kwargs_dict(keep=False, **kwargs):
     def _f(f):
         sig = inspect.signature(f)
         sigd = dict(sig.parameters)
-        k = sigd.pop('kwargs')
+        if not keep: sigd.pop('kwargs')
         s2 = {n:_mk_param(n,d) for n,d in kwargs.items() if n not in sigd}
         sigd.update(s2)
-        if keep: sigd['kwargs'] = k
-        f.__signature__ = sig.replace(parameters=sigd.values())
+        f.__signature__ = sig.replace(parameters=kindsort(sigd.values()))
         return f
     return _f
 
@@ -122,11 +121,10 @@ def use_kwargs(names, keep=False):
     def _f(f):
         sig = inspect.signature(f)
         sigd = dict(sig.parameters)
-        k = sigd.pop('kwargs')
+        if not keep: sigd.pop('kwargs')
         s2 = {n:_mk_param(n) for n in names if n not in sigd}
         sigd.update(s2)
-        if keep: sigd['kwargs'] = k
-        f.__signature__ = sig.replace(parameters=sigd.values())
+        f.__signature__ = sig.replace(parameters=kindsort(sigd.values()))
         return f
     return _f
 
@@ -245,7 +243,7 @@ def splice_sig(wrapper, fn, *skips):
     split = next((i for i, p in enumerate(w_ps) if p.kind==Parameter.VAR_POSITIONAL), len(w_ps))
     pre = w_ps[:split]
     post = [p for p in w_ps[split+1:] if p.kind != Parameter.VAR_KEYWORD]
-    sig = signature(wrapper).replace(parameters=[*pre, *f_ps, *post])
+    sig = signature(wrapper).replace(parameters=kindsort([*pre, *f_ps, *post]))
     wrapper = wraps(fn)(wrapper)
     wrapper.__signature__ = sig  # after `wraps`, which would clobber it if `fn` has its own `__signature__`
     return wrapper

{fastcore-2.2.6 → fastcore-2.2.7}/fastcore/nbio.py

@@ -16,7 +16,7 @@ __all__ = ['langs', 'cell_insert_line', 'cell_str_replace', 'cell_strs_replace',
            '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']
+           'update_cell', 'fm_default_eval', 'does_cell_eval', 'select_cells', 'run_cell', 'msg2out', 'msgs2outs']
 
 # %% ../nbs/13_nbio.ipynb #954ca1aa
 from .basics import *
@@ -146,7 +146,7 @@ def cell_frontmatter(s:str, strvals:bool=False):
     d,body = frontmatter(s.strip(), strvals=strvals)
     return d if not body.strip() else {}
 
-def md_frontmatter(s:str):
+def md_frontmatter(s:str, strvals:bool=False):
     "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)
@@ -156,15 +156,16 @@ def md_frontmatter(s:str):
     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)))
+        try: res.update(frontmatter('---\n' + '\n'.join(r) + '\n---\n', strvals=strvals)[0])
         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 from `nb`: its first raw cell plus first markdown cell (literal `---` block, or `# title` synthesis), raw keys winning"
+    "Frontmatter from `nb`, merged lowest-to-highest from its `metadata.nbdev` mapping (values verbatim), first markdown cell (literal `---` block, or `# title` synthesis), and first raw cell anywhere"
     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 {}
+    res = dict((getattr(nb, 'metadata', None) or {}).get('nbdev') or {})
+    if md: res.update(cell_frontmatter(md.source, strvals=strvals) or md_frontmatter(md.source, strvals=strvals))
     if raw: res.update(cell_frontmatter(raw.source, strvals=strvals))
     return res
 
@@ -840,8 +841,21 @@ def update_cell(
 
 # %% ../nbs/13_nbio.ipynb #4db01b15
 def _is_exported(cell): return cell.has_directive('export') or cell.has_directive('exports')
-def _is_noeval(cell):
-    return 'nbdev_export'+'(' in cell.source or (cell.directive('eval') or '').lower()=='false'
+
+def fm_default_eval(fm, default_eval:bool=True):
+    "Participation default for cells without their own `eval` directive: the notebook-level `eval` directive in frontmatter mapping `fm` if given, else `default_eval`"
+    v = fm.get('eval')
+    if v in (True,'true','True'): return True
+    if v in (False,'false','False'): return False
+    return default_eval
+
+def does_cell_eval(cell, default:bool):
+    "Does `cell` participate in a non-interactive run? Decided by its `eval` directive, or `default` when the directive is absent or unrecognized"
+    if 'nbdev_export'+'(' in cell.source: return False
+    v = cell.directive('eval')
+    if v in ('','true','True'): return True  # '' covers bare `#| eval` and `eval: true`, which parse identically
+    if v in ('false','False'): return False
+    return default
 
 def select_cells(
     nb, # A notebook read with `read_nb`
@@ -850,20 +864,25 @@ def select_cells(
     below:bool=False, # Include each matched cell and all cells below it?
     all:bool=False, # Include all code cells (ignores `msgids`)?
     exported:bool=False, # Only cells with `#| export` or `#| exports`?
-    skip_noeval:bool=False # Skip `#| eval: false` and `nbdev_export` cells (like `nbdev-test`)?
+    default_eval:bool=True, # Participation default when neither the cell nor the notebook has an `eval` directive
+    ignore_eval:bool=False # Skip `eval` filtering entirely: every selected cell runs
 ):
-    "Select code cells from `nb` by cell id or unique prefix, in the order given"
+    "Select code cells from `nb` by cell id or unique prefix, in the order given; cells named in `msgids` always run, others follow the `eval` cascade"
     cells = [o for o in nb.cells if o.cell_type=='code']
+    anchors = set()
     def _one(msgid):
         idxs = [i for i,o in enumerate(cells) if str(o.id).startswith(msgid)]
         if not idxs: raise ValueError(f'No code cell id starting with {msgid!r}')
         if len(idxs)>1: raise ValueError(f'Multiple code cell ids start with {msgid!r}: {", ".join(str(cells[i].id) for i in idxs)}')
         idx = idxs[0]
+        anchors.add(cells[idx].id)
         return cells[:idx+1] if above else cells[idx:] if below else [cells[idx]]
     if not all and not msgids: raise ValueError('`msgids` required unless `all=True`')
     sel = cells if all else [c for m in msgids for c in _one(m)]
     if exported: sel = [o for o in sel if _is_exported(o)]
-    if skip_noeval: sel = [o for o in sel if not _is_noeval(o)]
+    if not ignore_eval:
+        dflt = fm_default_eval(nb_frontmatter(nb), default_eval)
+        sel = [o for o in sel if o.id in anchors or does_cell_eval(o, dflt)]
     return sel
 
 # %% ../nbs/13_nbio.ipynb #4c71f592

{fastcore-2.2.6 → fastcore-2.2.7}/fastcore/xtras.py

@@ -26,7 +26,7 @@ __all__ = ['UNSET', 'spark_chars', 'walk_join', 'walk', 'exttypes', 'globtastic'
            'ssh', 'rsync_multi', 'run', 'open_file', 'save_pickle', 'load_pickle', 'parse_env', 'expand_wildcards',
            'atomic_save', 'load_mod', 'import_no_init', 'save_config_file', 'read_config_file', 'find_file_parents',
            'Config', 'Unset', 'dict2obj', 'obj2dict', 'repr_dict', 'is_listy', 'mapped', 'take_lines', 'IterLen',
-           'ReindexCollection', 'SaveReturn', 'trim_wraps', 'save_iter', 'asave_iter', 'frontmatter',
+           'ReindexCollection', 'SaveReturn', 'trim_wraps', 'save_iter', 'asave_iter', 'strloader', 'frontmatter',
            'clean_cli_output', 'unqid', 'rtoken_hex', 'friendly_name', 'n_friendly_names', 'exec_eval',
            'get_source_link', 'sparkline', 'modify_exception', 'round_multiple', 'set_num_threads', 'join_path_file',
            'autostart', 'EventTimer', 'stringfmt_names', 'PartialFormatter', 'partial_format', 'truncstr', 'fenced',
@@ -736,6 +736,16 @@ def asave_iter(g):
     return _
 
 # %% ../nbs/03_xtras.ipynb #d2757e2a
+def strloader():
+    "`yaml.BaseLoader` extended to resolve `true`/`True`/`false`/`False`, and nothing else, to `bool`"
+    import yaml
+    if not hasattr(strloader, 'ldr'):
+        class StrLoader(yaml.BaseLoader): pass
+        StrLoader.add_constructor('tag:yaml.org,2002:bool', lambda l,n: n.value.lower()=='true')
+        StrLoader.add_implicit_resolver('tag:yaml.org,2002:bool', re.compile(r'^(?:[Tt]rue|[Ff]alse)$'), list('tTfF'))
+        strloader.ldr = StrLoader
+    return strloader.ldr
+
 def frontmatter(txt:str, strvals:bool=False)->tuple:
     "Tuple of (dict, body) from frontmatter in `txt`; missing frontmatter returns ({}, txt), malformed YAML raises"
     import yaml
@@ -744,7 +754,7 @@ def frontmatter(txt:str, strvals:bool=False)->tuple:
     if end < 0:
         if not txt.endswith(('\n---','\n...')): return {},txt
         end = len(txt) - 4
-    res = yaml.load(txt[4:end], Loader=yaml.BaseLoader if strvals else yaml.SafeLoader)
+    res = yaml.load(txt[4:end], Loader=strloader() if strvals else yaml.SafeLoader)
     return (res,txt[end+5:]) if isinstance(res,dict) else ({},txt)
 
 # %% ../nbs/03_xtras.ipynb #45eb5141

{fastcore-2.2.6 → fastcore-2.2.7/fastcore.egg-info}/PKG-INFO

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