fastai fixes

Author: jph00

nbdev/_modidx.py

@@ -48,7 +48,7 @@
                 'nbs_path': 'nbs',
                 'recursive': 'False',
                 'repo': 'nbdev',
-                'requirements': 'fastcore>=1.5.5 execnb',
+                'requirements': 'fastcore>=1.5.5 execnb astunparse',
                 'status': '2',
                 'title': 'nbdev',
                 'tst_flags': 'notest',
@@ -63,6 +63,7 @@
                            'nbdev.cli.FilterDefaults.base_postprocs': 'https://nbdev.fast.ai/cli#FilterDefaults.base_postprocs',
                            'nbdev.cli.FilterDefaults.base_preprocs': 'https://nbdev.fast.ai/cli#FilterDefaults.base_preprocs',
                            'nbdev.cli.FilterDefaults.base_procs': 'https://nbdev.fast.ai/cli#FilterDefaults.base_procs',
+                           'nbdev.cli.FilterDefaults.nb_proc': 'https://nbdev.fast.ai/cli#FilterDefaults.nb_proc',
                            'nbdev.cli.FilterDefaults.postprocs': 'https://nbdev.fast.ai/cli#FilterDefaults.postprocs',
                            'nbdev.cli.FilterDefaults.preprocs': 'https://nbdev.fast.ai/cli#FilterDefaults.preprocs',
                            'nbdev.cli.FilterDefaults.procs': 'https://nbdev.fast.ai/cli#FilterDefaults.procs',

nbdev/cli.py

@@ -55,9 +55,11 @@ def nbdev_sidebar(
     skip_file_re:str='^[_.]', # Skip files matching regex
     skip_folder_re:str='(?:^[_.]|^www$)', # Skip folders matching regex
     printit:bool=False,  # Print YAML for debugging
+    force:bool=False,  # Create sidebar even if settings.ini custom_sidebar=False
     returnit:bool=False  # Return list of files found
 ):
     "Create sidebar.yml"
+    if not force and str2bool(config_key('custom_sidebar', path=False)): return
     path = config_key("nbs_path") if not path else Path(path)
     files = nbglob(path, func=_f, symlinks=symlinks, file_re=file_re, folder_re=folder_re, file_glob=file_glob,
                    skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, skip_folder_re=skip_folder_re).sorted(key=_sort)
@@ -101,27 +103,34 @@ def preprocs(self):
     def postprocs(self):
         "Postprocessors for export"
         return self.base_postprocs() + self.xtra_postprocs()
+    
+    def nb_proc(self, nb):
+        "Get an `NBProcessor` with these processors"
+        return NBProcessor(nb=nb, procs=self.procs(), preprocs=self.preprocs(), postprocs=self.postprocs())
 
 # %% ../nbs/10_cli.ipynb 11
 @call_parse
 def nbdev_filter(
-    nb_txt:str=None  # Notebook text (uses stdin if not provided)
+    nb_txt:str=None,  # Notebook text (uses stdin if not provided)
+    fname:str=None,  # Notebook to read (uses `nb_txt` if not provided)
 ):
     "A notebook filter for Quarto"
     os.environ["IN_TEST"] = "1"
     filt = get_config().get('exporter', FilterDefaults)()
     printit = False
-    if not nb_txt: nb_txt,printit = sys.stdin.read(),True
+    if fname: nb_txt = Path(fname).read_text()
+    elif not nb_txt: nb_txt,printit = sys.stdin.read(),True
     nb = dict2nb(loads(nb_txt))
-    with open(os.devnull, 'w') as dn:
-        with redirect_stdout(dn):
-            NBProcessor(nb=nb, procs=filt.procs(), preprocs=filt.preprocs(), postprocs=filt.postprocs()).process()
+    if printit:
+        with open(os.devnull, 'w') as dn:
+            with redirect_stdout(dn): filt.nb_proc(nb).process()
+    else: filt.nb_proc(nb).process()
     res = nb2str(nb)
     del os.environ["IN_TEST"]
     if printit: print(res, flush=True)
     else: return res
 
-# %% ../nbs/10_cli.ipynb 13
+# %% ../nbs/10_cli.ipynb 14
 _re_version = re.compile('^__version__\s*=.*$', re.MULTILINE)
 
 def update_version():
@@ -153,11 +162,11 @@ def nbdev_bump_version(
     update_version()
     print(f'New version: {cfg.version}')
 
-# %% ../nbs/10_cli.ipynb 15
+# %% ../nbs/10_cli.ipynb 16
 def extract_tgz(url, dest='.'): 
     with urlopen(url) as u: tarfile.open(mode='r:gz', fileobj=u).extractall(dest)
 
-# %% ../nbs/10_cli.ipynb 16
+# %% ../nbs/10_cli.ipynb 17
 def _get_info(owner, repo, default_branch='main', default_kw='nbdev'):
     try: from ghapi.all import GhApi
     except: 
@@ -180,7 +189,7 @@ def _get_info(owner, repo, default_branch='main', default_kw='nbdev'):
 
     return r.default_branch, default_kw if not r.topics else ' '.join(r.topics), r.description
 
-# %% ../nbs/10_cli.ipynb 18
+# %% ../nbs/10_cli.ipynb 19
 def prompt_user(**kwargs):
     config_vals = kwargs
     print('================ nbdev Configuration ================\n')
@@ -193,7 +202,7 @@ def prompt_user(**kwargs):
     print(f"\n`settings.ini` updated with configuration values.")
     return config_vals
 
-# %% ../nbs/10_cli.ipynb 19
+# %% ../nbs/10_cli.ipynb 20
 def _fetch_from_git(raise_err=False):
     "Get information for settings.ini from the user."
     try:
@@ -208,7 +217,7 @@ def _fetch_from_git(raise_err=False):
     return dict(lib_name=repo.replace('-', '_'), user=owner, branch=branch, author=author, 
                 author_email=email, keywords=keywords, description=descrip, repo=repo)
 
-# %% ../nbs/10_cli.ipynb 21
+# %% ../nbs/10_cli.ipynb 22
 _quarto_yml="""ipynb-filters: [nbdev_filter]
 
 project:
@@ -258,7 +267,7 @@ def refresh_quarto_yml():
     yml=_quarto_yml.format(**vals)
     p.write_text(yml)
 
-# %% ../nbs/10_cli.ipynb 22
+# %% ../nbs/10_cli.ipynb 23
 @call_parse
 def nbdev_new():
     "Create a new project from the current git repo"
@@ -285,7 +294,7 @@ def nbdev_new():
     settings_path.write_text(settings)
     refresh_quarto_yml()
 
-# %% ../nbs/10_cli.ipynb 24
+# %% ../nbs/10_cli.ipynb 25
 @call_parse
 def nbdev_quarto(
     path:str=None, # Path to notebooks

nbdev/doclinks.py

@@ -17,6 +17,7 @@
 
 import ast,contextlib
 import pkg_resources,importlib
+from astunparse import unparse
 
 from pprint import pformat
 from urllib.parse import urljoin
@@ -52,9 +53,9 @@ def write_nbdev_idx(self:DocLinks):
 # %% ../nbs/04b_doclinks.ipynb 15
 def _binop_leafs(bo, o):
     if isinstance(bo.left, ast.BinOp): left = _binop_leafs(bo.left, o)
-    else: left = [f'{_id_or_attr(bo.left)}.{o.name}']
+    else: left = [f'{unparse(bo.left).strip()}.{o.name}']
     if isinstance(bo.right, ast.BinOp): right = _binop_leafs(bo.right, o)
-    else: right = [f'{_id_or_attr(bo.right)}.{o.name}']
+    else: right = [f'{unparse(bo.right).strip()}.{o.name}']
     return concat(left + right)
 
 # %% ../nbs/04b_doclinks.ipynb 16
@@ -79,10 +80,9 @@ def get_patch_name(o):
     if nm=='patch': 
         a = o.args.args[0].annotation
         if isinstance(a, ast.BinOp): return _binop_leafs(a, o)
-        else: pre = _id_or_attr(a)
-    elif nm=='patch_to': pre = o.decorator_list[0].args[0].id
+    elif nm=='patch_to': a = o.decorator_list[0].args[0]
     else: return
-    return f'{pre}.{o.name}'
+    return f'{unparse(a).strip()}.{o.name}'
 
 # %% ../nbs/04b_doclinks.ipynb 19
 def _exp_meths(tree):

nbdev/migrate.py

@@ -82,7 +82,6 @@ def _repl_directives(code_str):
     def _fmt(x): return f"#|{x.group(2).replace('-', '_')}"
     return _re_v1().sub(_fmt, code_str)
 
-
 # %% ../nbs/15_migrate.ipynb 28
 def _repl_v1dir(nb):
     "Replace nbdev v1 with v2 directives."

nbdev/processors.py

@@ -142,9 +142,7 @@ def __call__(self, cell):
         flags = getattr(cell.nb, '_nbflags', [])
         if 'skip_showdoc' in flags: return
         if _do_eval(cell): self.k.cell(cell)
-        if self.k.exc: 
-            sys.stderr.write(f'Error in cell {cell.idx_}:\n{cell.source}')
-            raise self.k.exc[1] from None
+        if self.k.exc: raise Exception(f'Error: cell {cell.idx_}:\n{cell.source}') from self.k.exc[1]
 
 # %% ../nbs/09_processors.ipynb 37
 def populate_language(nb):
@@ -166,7 +164,9 @@ def _def_names(cell, shown):
 
 def _get_nm(tree):
     i = tree.value.args[0]
-    return f'{i.value.id}.{i.attr}' if isinstance(i, ast.Attribute) else i.id
+    if hasattr(i, 'id'): val = i.id
+    else: val = try_attrs(i.value, 'id', 'func', 'attr')
+    return f'{val}.{i.attr}' if isinstance(i, ast.Attribute) else i.id
 
 # %% ../nbs/09_processors.ipynb 45
 def add_show_docs(nb):

nbdev/test.py

@@ -29,7 +29,7 @@ def test_nb(fn, skip_flags=None, force_flags=None, do_print=False, showerr=True)
 
     def _no_eval(cell):
         if cell.cell_type != 'code': return True
-        if 'nbdev_export' in cell.source: return True
+        if 'nbdev_export'+'(' in cell.source: return True
         direc = getattr(cell, 'directives_', {}) or {}
         if direc.get('eval:', [''])[0].lower() == 'false': return True
         return flags & direc.keys()

nbs/01_read.ipynb

@@ -313,7 +313,7 @@
    "outputs": [],
    "source": [
     "#|hide\n",
-    "#|eval: false\n",
+    "#| eval: false\n",
     "path = Path('../nbdev')\n",
     "(path/'read.py').unlink(missing_ok=True)\n",
     "\n",