fix nbdev export

Author: jph00

nbdev/_modidx.py

@@ -30,8 +30,11 @@
                            'nbdev.cli.watch_export': ('api/cli.html#watch_export', 'nbdev/cli.py')},
             'nbdev.config': { 'nbdev.config.ConfigToml': ('api/config.html#configtoml', 'nbdev/config.py'),
                               'nbdev.config.ConfigToml.__getattr__': ('api/config.html#configtoml.__getattr__', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.__getitem__': ('api/config.html#configtoml.__getitem__', 'nbdev/config.py'),
                               'nbdev.config.ConfigToml.__init__': ('api/config.html#configtoml.__init__', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.d': ('api/config.html#configtoml.d', 'nbdev/config.py'),
                               'nbdev.config.ConfigToml.get': ('api/config.html#configtoml.get', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.path': ('api/config.html#configtoml.path', 'nbdev/config.py'),
                               'nbdev.config._basic_export_nb': ('api/config.html#_basic_export_nb', 'nbdev/config.py'),
                               'nbdev.config._fetch_from_git': ('api/config.html#_fetch_from_git', 'nbdev/config.py'),
                               'nbdev.config._find_nbdev_pyproject': ('api/config.html#_find_nbdev_pyproject', 'nbdev/config.py'),

nbdev/config.py

@@ -193,13 +193,20 @@ def __init__(self, d, proj, cfg_file):
         self.doc_baseurl = (u.path or '/').rstrip('/') or '/'
         if 'lib_path' not in self: self['lib_path'] = self.lib_name.replace('-', '_')
 
-    def __getattr__(self, k):
-        v = super().__getattr__(k)
-        return self.config_path / v if k in _path_keys else v
+    @property
+    def d(self): return {k:v for k,v in super().items()}
+
+    def __getattr__(self, k): return stop(AttributeError(k)) if k=='d' or k not in self.d else self.get(k)
+    def __getitem__(self, k): return stop(IndexError(k)) if k not in self.d else self.get(k)
 
     def get(self, k, default=None):
-        v = super().get(k, default)
-        return self.config_path / v if k in _path_keys and v else v
+        v = self.d.get(k, default)
+        if v is None: return None
+        return self.config_path / v if k in _path_keys else v
+
+    def path(self, k, default=None):
+        v = self.d.get(k, default)
+        return v if v is None else self.config_path / v
 
 # %% ../nbs/api/01_config.ipynb #6fed9c91
 def _user_config():

nbdev/doclinks.py

@@ -107,8 +107,7 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     with contextlib.suppress(FileNotFoundError): idxfile.unlink()
     if idxfile.exists(): res = exec_local(idxfile.read_text(encoding='utf-8'), 'd')
     else: res = dict(syms={}, settings={}) 
-    cfg = get_config()
-    res['settings'] = {k:cfg[k] for k in ('doc_host','doc_baseurl','lib_path','git_url','branch') if k in cfg}
+    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=r"\.ipynb_checkpoints"):
         try: res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))

nbs/api/01_config.ipynb

@@ -389,13 +389,20 @@
     "        self.doc_baseurl = (u.path or '/').rstrip('/') or '/'\n",
     "        if 'lib_path' not in self: self['lib_path'] = self.lib_name.replace('-', '_')\n",
     "\n",
-    "    def __getattr__(self, k):\n",
-    "        v = super().__getattr__(k)\n",
-    "        return self.config_path / v if k in _path_keys else v\n",
+    "    @property\n",
+    "    def d(self): return {k:v for k,v in super().items()}\n",
+    "\n",
+    "    def __getattr__(self, k): return stop(AttributeError(k)) if k=='d' or k not in self.d else self.get(k)\n",
+    "    def __getitem__(self, k): return stop(IndexError(k)) if k not in self.d else self.get(k)\n",
     "\n",
     "    def get(self, k, default=None):\n",
-    "        v = super().get(k, default)\n",
-    "        return self.config_path / v if k in _path_keys and v else v"
+    "        v = self.d.get(k, default)\n",
+    "        if v is None: return None\n",
+    "        return self.config_path / v if k in _path_keys else v\n",
+    "\n",
+    "    def path(self, k, default=None):\n",
+    "        v = self.d.get(k, default)\n",
+    "        return v if v is None else self.config_path / v"
    ]
   },
   {

nbs/api/05_doclinks.ipynb

@@ -265,8 +265,7 @@
     "    with contextlib.suppress(FileNotFoundError): idxfile.unlink()\n",
     "    if idxfile.exists(): res = exec_local(idxfile.read_text(encoding='utf-8'), 'd')\n",
     "    else: res = dict(syms={}, settings={}) \n",
-    "    cfg = get_config()\n",
-    "    res['settings'] = {k:cfg[k] for k in ('doc_host','doc_baseurl','lib_path','git_url','branch') if k in cfg}\n",
+    "    res['settings'] = {k:v for k,v in get_config().d.items() if k in ('doc_host','doc_baseurl','lib_path','git_url','branch')}\n",
     "    code_root = dest.parent.resolve()\n",
     "    for file in globtastic(dest, file_glob=\"*.py\", skip_file_re='^_', skip_folder_re=r\"\\.ipynb_checkpoints\"):\n",
     "        try: res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))\n",