nbdev 2.3.25__py3-none-any.whl → 2.4.8__py3-none-any.whl

nbdev/config.py

@@ -1,17 +1,12 @@
-"""Read and write nbdev's `settings.ini` file.
-`get_config` is the main function for reading settings."""
+"""Configuring nbdev and bootstrapping notebook export"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/01_config.ipynb.
 
 # %% auto 0
-__all__ = ['nbdev_create_config', 'get_config', 'config_key', 'create_output', 'show_src', 'update_version', 'add_init',
-           'write_cells']
+__all__ = ['pyproj_tmpl', 'nbdev_create_config', 'get_config', 'config_key', 'is_nbdev', 'create_output', 'show_src',
+           'update_version', 'update_proj', 'add_init', 'write_cells']
 
-# %% ../nbs/api/01_config.ipynb 2
-_doc_ = """Read and write nbdev's `settings.ini` file.
-`get_config` is the main function for reading settings."""
-
-# %% ../nbs/api/01_config.ipynb 3
+# %% ../nbs/api/01_config.ipynb
 from datetime import datetime
 from fastcore.docments import *
 from fastcore.utils import *
@@ -25,16 +20,16 @@ from IPython.display import Markdown
 from execnb.nbio import read_nb,NbCell
 from urllib.error import HTTPError
 
-# %% ../nbs/api/01_config.ipynb 8
+# %% ../nbs/api/01_config.ipynb
 _nbdev_home_dir = 'nbdev' # sub-directory of xdg base dir
 _nbdev_cfg_name = 'settings.ini'
 
-# %% ../nbs/api/01_config.ipynb 9
+# %% ../nbs/api/01_config.ipynb
 def _git_repo():
     try: return repo_details(run('git config --get remote.origin.url'))[1]
     except OSError: return
 
-# %% ../nbs/api/01_config.ipynb 11
+# %% ../nbs/api/01_config.ipynb
 # When adding a named default to the list below, be sure that that name
 # is also added to one of the sections in `_nbdev_cfg_sections` as well,
 # or it won't get written by `nbdev_create_config`:
@@ -54,7 +49,7 @@ def _apply_defaults(
     license='apache2', # License for the package
     copyright:str=None, # Copyright for the package, defaults to '`current_year` onwards, `author`'
     status='3', # Development status PyPI classifier
-    min_python='3.7', # Minimum Python version PyPI classifier
+    min_python='3.9', # Minimum Python version PyPI classifier
     audience='Developers', # Intended audience PyPI classifier
     language='English', # Language PyPI classifier
     recursive:bool_arg=True, # Include subfolders in notebook globs?
@@ -66,7 +61,10 @@ def _apply_defaults(
     jupyter_hooks:bool_arg=False, # Run Jupyter hooks?
     clean_ids:bool_arg=True, # Remove ids from plaintext reprs?
     clear_all:bool_arg=False, # Remove all cell metadata and cell outputs?
+    cell_number:bool_arg=True, # Add cell number to the exported file
     put_version_in_init:bool_arg=True, # Add the version to the main __init__.py in nbdev_export
+    update_pyproject:bool_arg=True, # Create/update pyproject.toml with correct project name
+    skip_procs:str='', # A comma-separated list of processors that you want to skip
 ):
     "Apply default settings where missing in `cfg`."
     if getattr(cfg,'repo',None) is None:
@@ -81,7 +79,7 @@ def _apply_defaults(
         cfg[k] = v
     return cfg
 
-# %% ../nbs/api/01_config.ipynb 12
+# %% ../nbs/api/01_config.ipynb
 def _get_info(owner, repo, default_branch='main', default_kw='nbdev'):
     from ghapi.all import GhApi
     api = GhApi(owner=owner, repo=repo, token=os.getenv('GITHUB_TOKEN'))
@@ -97,7 +95,7 @@ https://nbdev.fast.ai/api/release.html#setup"""]
     
     return r.default_branch, default_kw if not getattr(r, 'topics', []) else ' '.join(r.topics), r.description
 
-# %% ../nbs/api/01_config.ipynb 14
+# %% ../nbs/api/01_config.ipynb
 def _fetch_from_git(raise_err=False):
     "Get information for settings.ini from the user."
     res={}
@@ -113,7 +111,7 @@ def _fetch_from_git(raise_err=False):
     else: res['lib_name'] = res['repo'].replace('-','_')
     return res
 
-# %% ../nbs/api/01_config.ipynb 16
+# %% ../nbs/api/01_config.ipynb
 def _prompt_user(cfg, inferred):
     "Let user input values not in `cfg` or `inferred`."
     res = cfg.copy()
@@ -127,7 +125,7 @@ def _prompt_user(cfg, inferred):
                 print(msg+res[k]+' # Automatically inferred from git')
     return res
 
-# %% ../nbs/api/01_config.ipynb 18
+# %% ../nbs/api/01_config.ipynb
 def _cfg2txt(cfg, head, sections, tail=''):
     "Render `cfg` with commented sections."
     nm = cfg.d.name
@@ -139,13 +137,13 @@ def _cfg2txt(cfg, head, sections, tail=''):
     res += tail
     return res.strip()
 
-# %% ../nbs/api/01_config.ipynb 20
+# %% ../nbs/api/01_config.ipynb
 _nbdev_cfg_head = '''# All sections below are required unless otherwise specified.
-# See https://github.com/fastai/nbdev/blob/master/settings.ini for examples.
+# See https://github.com/AnswerDotAI/nbdev/blob/main/settings.ini for examples.
 
 '''
 _nbdev_cfg_sections = {'Python library': 'repo lib_name version min_python license black_formatting',
-                       'nbdev': 'doc_path lib_path nbs_path recursive tst_flags put_version_in_init',
+                       'nbdev': 'doc_path lib_path nbs_path recursive tst_flags put_version_in_init update_pyproject',
                        'Docs': 'branch custom_sidebar doc_host doc_baseurl git_url title',
                        'PyPI': 'audience author author_email copyright description keywords language status user'}
 _nbdev_cfg_tail = '''### Optional ###
@@ -156,7 +154,7 @@ _nbdev_cfg_tail = '''### Optional ###
 # package_data = 
 '''
 
-# %% ../nbs/api/01_config.ipynb 21
+# %% ../nbs/api/01_config.ipynb
 @call_parse
 @delegates(_apply_defaults, but='cfg')
 def nbdev_create_config(
@@ -182,19 +180,17 @@ def nbdev_create_config(
     cfg_fn = Path(path)/cfg_name
     print(f'{cfg_fn} created.')
 
-# %% ../nbs/api/01_config.ipynb 24
+# %% ../nbs/api/01_config.ipynb
 def _nbdev_config_file(cfg_name=_nbdev_cfg_name, path=None):
-    cfg_path = path = Path.cwd() if path is None else Path(path)
-    while cfg_path != cfg_path.parent and not (cfg_path/cfg_name).exists(): cfg_path = cfg_path.parent
-    if not (cfg_path/cfg_name).exists(): cfg_path = path
-    return cfg_path/cfg_name
+    cfg_path = Path.cwd() if path is None else Path(path)
+    return getattr(Config.find(cfg_name), 'config_file', cfg_path/cfg_name)
 
-# %% ../nbs/api/01_config.ipynb 26
+# %% ../nbs/api/01_config.ipynb
 def _xdg_config_paths(cfg_name=_nbdev_cfg_name):
     xdg_config_paths = reversed([xdg_config_home()]+xdg_config_dirs())
     return [o/_nbdev_home_dir/cfg_name for o in xdg_config_paths]
 
-# %% ../nbs/api/01_config.ipynb 27
+# %% ../nbs/api/01_config.ipynb
 def _type(t): return bool if t==bool_arg else t
 _types = {k:_type(v['anno']) for k,v in docments(_apply_defaults,full=True,returns=False).items() if k != 'cfg'}
 
@@ -206,24 +202,44 @@ def get_config(cfg_name=_nbdev_cfg_name, path=None):
     cfg = Config(cfg_file.parent, cfg_file.name, extra_files=extra_files, types=_types)
     return _apply_defaults(cfg)
 
-# %% ../nbs/api/01_config.ipynb 42
+# %% ../nbs/api/01_config.ipynb
 def config_key(c, default=None, path=True, missing_ok=None):
     "Deprecated: use `get_config().get` or `get_config().path` instead."
     warn("`config_key` is deprecated. Use `get_config().get` or `get_config().path` instead.", DeprecationWarning)
     return get_config().path(c, default) if path else get_config().get(c, default)
 
-# %% ../nbs/api/01_config.ipynb 44
+# %% ../nbs/api/01_config.ipynb
+def is_nbdev(): return _nbdev_config_file().exists()
+
+# %% ../nbs/api/01_config.ipynb
 def create_output(txt, mime):
     "Add a cell output containing `txt` of the `mime` text MIME sub-type"
     return [{"data": { f"text/{mime}": str(txt).splitlines(True) },
              "execution_count": 1, "metadata": {}, "output_type": "execute_result"}]
 
-# %% ../nbs/api/01_config.ipynb 45
+# %% ../nbs/api/01_config.ipynb
 def show_src(src, lang='python'): return Markdown(f'```{lang}\n{src}\n```')
 
-# %% ../nbs/api/01_config.ipynb 48
-_re_version = re.compile('^__version__\s*=.*$', re.MULTILINE)
+# %% ../nbs/api/01_config.ipynb
+pyproj_tmpl = """[build-system]
+requires = ["setuptools>=64.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "FILL_IN"
+requires-python="FILL_IN"
+dynamic = [ "keywords", "description", "version", "dependencies", "optional-dependencies", "readme", "license", "authors", "classifiers", "entry-points", "scripts", "urls"]
+
+[tool.uv]
+cache-keys = [{ file = "pyproject.toml" }, { file = "settings.ini" }, { file = "setup.py" }]
+"""
+
+# %% ../nbs/api/01_config.ipynb
+_re_version = re.compile(r'^__version__\s*=.*$', re.MULTILINE)
+_re_proj = re.compile(r'^name\s*=\s*".*$', re.MULTILINE)
+_re_reqpy = re.compile(r'^requires-python\s*=\s*".*$', re.MULTILINE)
 _init = '__init__.py'
+_pyproj = 'pyproject.toml'
 
 def update_version(path=None):
     "Add or update `__version__` in the main `__init__.py` of the library."
@@ -238,6 +254,15 @@ def update_version(path=None):
 
 def _has_py(fs): return any(1 for f in fs if f.endswith('.py'))
 
+def update_proj(path):
+    "Create or update `pyproject.toml` in the project root."
+    fname = path/_pyproj
+    if not fname.exists(): fname.write_text(pyproj_tmpl)
+    txt = fname.read_text()
+    txt = _re_proj.sub(f'name="{get_config().lib_name}"', txt)
+    txt = _re_reqpy.sub(f'requires-python=">={get_config().min_python}"', txt)
+    fname.write_text(txt)
+
 def add_init(path=None):
     "Add `__init__.py` in all subdirs of `path` containing python files if it's not there already."
     # we add the lowest-level `__init__.py` files first, which ensures _has_py succeeds for parent modules
@@ -249,14 +274,17 @@ def add_init(path=None):
         subds = (os.listdir(r/d) for d in ds)
         if _has_py(fs) or any(filter(_has_py, subds)) and not (r/_init).exists(): (r/_init).touch()
     if get_config().get('put_version_in_init', True): update_version(path)
+    if get_config().get('update_pyproject', True): update_proj(path.parent)
 
-# %% ../nbs/api/01_config.ipynb 51
-def write_cells(cells, hdr, file, offset=0):
+# %% ../nbs/api/01_config.ipynb
+def write_cells(cells, hdr, file, offset=0, cell_number=True, solo_nb=False):
     "Write `cells` to `file` along with header `hdr` starting at index `offset` (mainly for nbdev internal use)."
     for cell in cells:
-        if cell.source.strip(): file.write(f'\n\n{hdr} {cell.idx_+offset}\n{cell.source}')
+        if cell.cell_type=='code' and cell.source.strip():
+            idx = f" {cell.idx_+offset}" if cell_number else ""
+            file.write(f'\n\n{hdr}{idx}\n{cell.source}') if not solo_nb else file.write(f'\n\n{cell.source}')
 
-# %% ../nbs/api/01_config.ipynb 52
+# %% ../nbs/api/01_config.ipynb
 def _basic_export_nb(fname, name, dest=None):
     "Basic exporter to bootstrap nbdev."
     if dest is None: dest = get_config().lib_path

nbdev/diff.py

@@ -0,0 +1,92 @@
+"""Get ipynb diffs by cell"""
+
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/19_diff.ipynb.
+
+# %% auto 0
+__all__ = ['read_nb_from_git', 'nbs_pair', 'changed_cells', 'source_diff', 'cell_diffs']
+
+# %% ../nbs/api/19_diff.ipynb
+import json
+from fastcore.utils import *
+from fastcore.meta import delegates
+from difflib import unified_diff
+from fastgit import Git
+from execnb.nbio import *
+
+# %% ../nbs/api/19_diff.ipynb
+def read_nb_from_git(
+    g:Git, # The git object
+    path, # The path to the notebook (absolute or relative to git root)
+    ref=None # The git ref to read from (e.g. HEAD); None for working dir
+)->AttrDict: # The notebook
+    "Read notebook from git ref (e.g. HEAD) at path, or working dir if ref is None"
+    path = Path(path)
+    if path.is_absolute(): path = path.relative_to(g.top())
+    if ref is None: return read_nb(g.top()/path)
+    raw = g.show(f'{ref}:{path}', split=False)
+    return dict2nb(json.loads(raw))
+
+# %% ../nbs/api/19_diff.ipynb
+def _nb_srcdict(g:Git, nb_path, ref=None, f=noop):
+    "Dict of id->source"
+    nb = read_nb_from_git(g, nb_path, ref)
+    return {c['id']: f(c) for c in nb.cells}
+
+# %% ../nbs/api/19_diff.ipynb
+def nbs_pair(
+    nb_path, # Path to the notebook
+    ref_a='HEAD', # First git ref (None for working dir)
+    ref_b=None, # Second git ref (None for working dir)
+    f=noop  # Function to call on contents
+): # Tuple of two notebooks
+    "NBs at two refs; None means working dir. By default provides HEAD and working dir"
+    nb_path = Path(nb_path).resolve()
+    g = Git(nb_path.parent)
+    return _nb_srcdict(g, nb_path, ref_a, f), _nb_srcdict(g, nb_path, ref_b, f)
+
+# %% ../nbs/api/19_diff.ipynb
+def _cell_changes(
+    nb_path, # Path to the notebook
+    fn, # function to call to get dict values
+    ref_a='HEAD', # First git ref (None for working dir)
+    ref_b=None, # Second git ref (None for working dir)
+    adds=True, # Include cells in b but not in a
+    changes=True, # Include cells with different content
+    dels=False, # Include cells in a but not in b
+    metadata=False, # Consider cell metadata when comparing
+    outputs=False # Consider cell outputs when comparing
+): # Dict of results
+    "Apply fn(cell_id, old_content, new_content) to changed cells between two refs"
+    def cell_content(c):
+        res = c.get('source', '')
+        if metadata: res += '\n# metadata: ' + json.dumps(c.get('metadata', {}), sort_keys=True)
+        if outputs: res += '\n# outputs: ' + json.dumps(c.get('outputs', []), sort_keys=True)
+        return res
+    old,new = nbs_pair(nb_path, ref_a, ref_b, f=cell_content)
+    res = {}
+    if adds: res |= {cid: fn(cid, '', new[cid]) for cid in new if cid not in old}
+    if changes: res |= {cid: fn(cid, old[cid], new[cid]) for cid in new if cid in old and new[cid] != old[cid]}
+    if dels: res |= {cid: fn(cid, old[cid], '') for cid in old if cid not in new}
+    return res
+
+# %% ../nbs/api/19_diff.ipynb
+@delegates(_cell_changes)
+def changed_cells(nb_path, **kwargs):
+    "Return set of cell IDs for changed/added/deleted cells between two refs"
+    def f(cid,o,n): return cid
+    return set(_cell_changes(nb_path, f, **kwargs).keys())
+
+# %% ../nbs/api/19_diff.ipynb
+def source_diff(
+    old_source, # Original source string
+    new_source # New source string
+): # Unified diff string
+    "Return unified diff string for source change"
+    return '\n'.join(unified_diff(old_source.splitlines(), new_source.splitlines(), lineterm=''))
+
+# %% ../nbs/api/19_diff.ipynb
+@delegates(_cell_changes)
+def cell_diffs(nb_path, **kwargs):
+    "{cell_id:diff} for changed/added/deleted cells between two refs"
+    def f(cid,o,n): return source_diff(o,n)
+    return _cell_changes(nb_path, f, **kwargs)

nbdev/doclinks.py

@@ -1,9 +1,11 @@
+"""Generating a documentation index from a module"""
+
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/05_doclinks.ipynb.
 
 # %% auto 0
-__all__ = ['patch_name', 'nbglob', 'nbglob_cli', 'nbdev_export', 'NbdevLookup']
+__all__ = ['typs', 'bset', 'patch_name', 'nbglob', 'nbglob_cli', 'nbdev_export', 'create_index', 'NbdevLookup']
 
-# %% ../nbs/api/05_doclinks.ipynb 2
+# %% ../nbs/api/05_doclinks.ipynb
 from .config import *
 from .maker import *
 from .export import *
@@ -12,16 +14,22 @@ from .imports import *
 from fastcore.script import *
 from fastcore.utils import *
 from fastcore.meta import delegates
+from fastcore.net import urlread
 
-import ast,contextlib
-import pkg_resources,importlib
-from astunparse import unparse
+import ast,builtins,contextlib
+import importlib
 
+from astunparse import unparse
+from io import BytesIO
+from collections import defaultdict
 from pprint import pformat
 from urllib.parse import urljoin
 from functools import lru_cache
+from types import ModuleType
 
-# %% ../nbs/api/05_doclinks.ipynb 5
+from importlib.metadata import entry_points
+
+# %% ../nbs/api/05_doclinks.ipynb
 def _sym_nm(klas, sym): return f'{unparse(klas).strip()}.{sym.name}'
 
 def _binop_leafs(bo, o):
@@ -42,26 +50,32 @@ def patch_name(o):
     else: return o.name
     return _sym_nm(a,o)
 
-# %% ../nbs/api/05_doclinks.ipynb 9
+# %% ../nbs/api/05_doclinks.ipynb
 def _iter_py_cells(p):
     "Yield cells from an exported Python file."
     p = Path(p)
     cells = p.read_text(encoding='utf-8').split("\n# %% ")
+    has_cell_number = get_config().cell_number
     for cell in cells[1:]:
         top,code = cell.split('\n', 1)
         try:
-          *nb,idx = top.split()
-          nb = ' '.join(nb)
+            if has_cell_number:
+                *nb,idx = top.split()
+                nb = ' '.join(nb)
+                idx = int(idx)
+            else:
+                nb = top
+                idx = None
         except ValueError: raise ValueError(f"Unexpected format in '{p}' at cell:\n```\n# %% {cell.strip()}.\n```\n"
                                             "The expected format is: '# %% {nb_path} {cell_idx}'.")
         nb_path = None if nb=='auto' else (p.parent/nb).resolve()  # NB paths are stored relative to .py file
         if code.endswith('\n'): code=code[:-1]
-        yield AttrDict(nb=nb, idx=int(idx), code=code, nb_path=nb_path, py_path=p.resolve())
+        yield AttrDict(nb=nb, idx=idx, code=code, nb_path=nb_path, py_path=p.resolve())
 
-# %% ../nbs/api/05_doclinks.ipynb 11
+# %% ../nbs/api/05_doclinks.ipynb
 def _nbpath2html(p): return p.with_name(re.sub(r'^\d+[a-zA-Z0-9]*_', '', p.name.lower())).with_suffix('.html')
 
-# %% ../nbs/api/05_doclinks.ipynb 13
+# %% ../nbs/api/05_doclinks.ipynb
 def _get_modidx(py_path, code_root, nbs_path):
     "Get module symbol index for a Python source file"
     cfg = get_config()
@@ -71,7 +85,7 @@ def _get_modidx(py_path, code_root, nbs_path):
     _def_types = ast.FunctionDef,ast.AsyncFunctionDef,ast.ClassDef
     d = {}
     for cell in _iter_py_cells(py_path):
-        if cell.nb == 'auto': continue
+        if 'auto' in cell.nb: continue
         loc = _nbpath2html(cell.nb_path.relative_to(nbs_path))
 
         def _stor(nm):
@@ -83,7 +97,7 @@ def _get_modidx(py_path, code_root, nbs_path):
                     if isinstance(t2, _def_types): _stor(f'{tree.name}.{t2.name}')
     return {mod_name: d}
 
-# %% ../nbs/api/05_doclinks.ipynb 15
+# %% ../nbs/api/05_doclinks.ipynb
 def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     "Create _modidx.py"
     if dest is None: dest = get_config().lib_path
@@ -98,11 +112,12 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     res['settings'] = {k:v for k,v in get_config().d.items()
                        if k in ('doc_host','doc_baseurl','lib_path','git_url','branch')}
     code_root = dest.parent.resolve()
-    for file in globtastic(dest, file_glob="*.py", skip_file_re='^_', skip_folder_re="\.ipynb_checkpoints"):
-        res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))
+    for file in globtastic(dest, file_glob="*.py", skip_file_re='^_', skip_folder_re=r"\.ipynb_checkpoints"):
+        try: res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))
+        except ValueError: pass
     idxfile.write_text("# Autogenerated by nbdev\n\nd = "+pformat(res, width=140, indent=2, compact=True)+'\n')
 
-# %% ../nbs/api/05_doclinks.ipynb 20
+# %% ../nbs/api/05_doclinks.ipynb
 @delegates(globtastic)
 def nbglob(path=None, skip_folder_re = '^[_.]', file_glob='*.ipynb', skip_file_re='^[_.]', key='nbs_path', as_path=False, **kwargs):
     "Find all files in a directory matching an extension given a config key."
@@ -112,7 +127,7 @@ def nbglob(path=None, skip_folder_re = '^[_.]', file_glob='*.ipynb', skip_file_r
                      skip_file_re=skip_file_re, recursive=recursive, **kwargs)
     return res.map(Path) if as_path else res
 
-# %% ../nbs/api/05_doclinks.ipynb 21
+# %% ../nbs/api/05_doclinks.ipynb
 def nbglob_cli(
     path:str=None, # Path to notebooks
     symlinks:bool=False, # Follow symlinks?
@@ -126,7 +141,7 @@ def nbglob_cli(
     return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re, folder_re=folder_re,
                   skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, skip_folder_re=skip_folder_re)
 
-# %% ../nbs/api/05_doclinks.ipynb 22
+# %% ../nbs/api/05_doclinks.ipynb
 @call_parse
 @delegates(nbglob_cli)
 def nbdev_export(
@@ -135,19 +150,42 @@ def nbdev_export(
     **kwargs):
     "Export notebooks in `path` to Python modules"
     if os.environ.get('IN_TEST',0): return
+    if not is_nbdev(): raise Exception('`nbdev_export` must be called from a directory within a nbdev project.')
     if procs:
-      import nbdev.export
-      procs = [getattr(nbdev.export, p) for p in L(procs)]
+        import nbdev.export
+        procs = [getattr(nbdev.export, p) for p in L(procs)]
     files = nbglob(path=path, as_path=True, **kwargs).sorted('name')
     for f in files: nb_export(f, procs=procs)
     add_init(get_config().lib_path)
     _build_modidx()
 
-# %% ../nbs/api/05_doclinks.ipynb 25
+# %% ../nbs/api/05_doclinks.ipynb
+typs = 'module','class','method','function'
+bset = set(dir(builtins))
+
+# %% ../nbs/api/05_doclinks.ipynb
+def create_index(url, pre=None):
+    "Create a documentation index from a sphinx inventory file at `url`, with optional prefix `pre`"
+    try: from sphinx.util.inventory import InventoryFile
+    except ImportError: raise ImportError('`sphinx` is a dependency for building indexes. Run `pip install sphinx` to use `create_index`.')
+    pre = ifnone(pre, f"{url}/")
+    invs = urlread(f'{url}/objects.inv', decode=False)
+    idx = InventoryFile.load(stream=BytesIO(invs), uri=pre, joinfunc=urljoin)
+    _get = lambda o: {k:v[2] for k,v in idx[f'py:{o}'].items() if k[0]!='_'}
+    d = {o:_get(o) for o in typs}
+    syms = defaultdict(dict)
+    for o in typs:
+        for k,v in d[o].items():
+            if k.split('.')[0] in bset: k = 'builtins.' + k
+            modparts = k.split(".")[:-2 if o=='method' else -1]
+            if modparts: syms['.'.join(modparts)][k] = v
+    return syms
+
+# %% ../nbs/api/05_doclinks.ipynb
 import importlib,ast
 from functools import lru_cache
 
-# %% ../nbs/api/05_doclinks.ipynb 26
+# %% ../nbs/api/05_doclinks.ipynb
 def _find_mod(mod):
     mp,_,mr = mod.partition('/')
     spec = importlib.util.find_spec(mp)
@@ -157,6 +195,7 @@ def _find_mod(mod):
 
 @lru_cache(None)
 def _get_exps(mod):
+    "Get the line numbers for function and class definitions in module"
     mf = _find_mod(mod)
     if not mf: return {}
     txt = mf.read_text(encoding='utf-8')
@@ -170,8 +209,9 @@ def _get_exps(mod):
 
 def _lineno(sym, fname): return _get_exps(fname).get(sym, None) if fname else None
 
-# %% ../nbs/api/05_doclinks.ipynb 28
+# %% ../nbs/api/05_doclinks.ipynb
 def _qual_sym(s, settings):
+    "Get qualified nb, py, and github paths for a symbol s"
     if not isinstance(s,tuple): return s
     nb,py = s
     nbbase = urljoin(settings["doc_host"]+'/',settings["doc_baseurl"])
@@ -185,35 +225,53 @@ def _qual_syms(entries):
     if 'doc_host' not in settings: return entries
     return {'syms': {mod:_qual_mod(d, settings) for mod,d in entries['syms'].items()}, 'settings':settings}
 
-# %% ../nbs/api/05_doclinks.ipynb 29
-_re_backticks = re.compile(r'`([^`\s]+)`')
+# %% ../nbs/api/05_doclinks.ipynb
+_re_backticks = re.compile(r'`([^`\s]+?)(?:\(\))?`')
 
-# %% ../nbs/api/05_doclinks.ipynb 30
+# %% ../nbs/api/05_doclinks.ipynb
 @lru_cache(None)
+def _build_lookup_table(strip_libs=None, incl_libs=None, skip_mods=None):
+    cfg = get_config()
+    if strip_libs is None:
+        try: strip_libs = cfg.get('strip_libs', cfg.get('lib_path', 'nbdev').name).split()
+        except FileNotFoundError: strip_libs = 'nbdev'
+    skip_mods = setify(skip_mods)
+    strip_libs = L(strip_libs)
+    if incl_libs is not None: incl_libs = (L(incl_libs)+strip_libs).unique()
+    entries = {}
+    try: eps = entry_points(group='nbdev')
+    # Python 3.9 fallback - entry_points() doesn't accept group parameter
+    except TypeError: eps = entry_points().get('nbdev', [])
+    
+    for o in eps:
+        if incl_libs is not None and o.dist.name not in incl_libs: continue
+        try: entries[o.name] = _qual_syms(o.load())
+        except Exception: pass
+    py_syms = merge(*L(o['syms'].values() for o in entries.values()).concat())
+    for m in strip_libs:
+        if m in entries:
+            _d = entries[m]
+            stripped = {}
+            for mod, dets in _d['syms'].items():
+                if mod not in skip_mods:
+                    for k,v in dets.items():
+                        k = remove_prefix(k,f"{mod}.")
+                        if k not in stripped: stripped[k] = v
+            py_syms = merge(stripped, py_syms)
+    return entries,py_syms
+
+# %% ../nbs/api/05_doclinks.ipynb
 class NbdevLookup:
     "Mapping from symbol names to docs and source URLs"
-    def __init__(self, strip_libs=None, incl_libs=None, skip_mods=None):
-        cfg = get_config()
-        if strip_libs is None:
-            try: strip_libs = cfg.get('strip_libs', cfg.get('lib_path', 'nbdev').name).split()
-            except FileNotFoundError: strip_libs = 'nbdev'
-        skip_mods = setify(skip_mods)
-        strip_libs = L(strip_libs)
-        if incl_libs is not None: incl_libs = (L(incl_libs)+strip_libs).unique()
-        # Dict from lib name to _nbdev module for incl_libs (defaults to all)
-        self.entries = {o.name: _qual_syms(o.resolve()) for o in list(pkg_resources.iter_entry_points(group='nbdev'))
-                       if incl_libs is None or o.dist.key in incl_libs}
-        py_syms = merge(*L(o['syms'].values() for o in self.entries.values()).concat())
-        for m in strip_libs:
-            if m in self.entries:
-                _d = self.entries[m]
-                stripped = {remove_prefix(k,f"{mod}."):v
-                            for mod,dets in _d['syms'].items() if mod not in skip_mods
-                            for k,v in dets.items()}
-                py_syms = merge(stripped, py_syms)
-        self.syms = py_syms
-
-    def __getitem__(self, s): return self.syms.get(s, None)
+    def __init__(self, strip_libs=None, incl_libs=None, skip_mods=None, ns=None):
+        self.entries,self.syms = _build_lookup_table(strip_libs, incl_libs, skip_mods)
+        self.aliases = {n:o.__name__ for n,o in (ns or {}).items() if isinstance(o, ModuleType)}
+        
+    def __getitem__(self, s): 
+        if '.' in s:
+            pre,post = s.split('.', 1)
+            if pre in self.aliases: s = f"{self.aliases[pre]}.{post}"
+        return self.syms.get(s, None)
 
     def doc(self, sym):
         "Link to docs for `sym`"
@@ -227,12 +285,13 @@ class NbdevLookup:
         _,py,gh = res
         line = _lineno(sym, py)
         return f'{gh}#L{line}'
-
+    
     def _link_sym(self, m):
         l = m.group(1)
         s = self.doc(l)
         if s is None: return m.group(0)
         l = l.replace('\\', r'\\')
+        if m.group(0).endswith('()`'): l += '()'
         return rf"[`{l}`]({s})"
 
     def link_line(self, l): return _re_backticks.sub(self._link_sym, l)