directives

Author: jph00

nbprocess/export.py

@@ -1,7 +1,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/03_export.ipynb.
 
 # %% auto 0
-__all__ = ['ExportModuleProc', 'rm_comments_proc', 'create_modules', 'nb_export', 'nbs_export']
+__all__ = ['ExportModuleProc', 'create_modules', 'nb_export', 'nbs_export']
 
 # %% ../nbs/03_export.ipynb 3
 from .read import *
@@ -14,9 +14,6 @@
 from fastcore.xtras import *
 
 from collections import defaultdict
-from pprint import pformat
-from inspect import signature,Parameter
-import ast,contextlib,copy
 
 # %% ../nbs/03_export.ipynb 5
 class ExportModuleProc:
@@ -29,28 +26,23 @@ def _export_(self, nbp, exp_to=None):
         self.in_all[ifnone(exp_to, '#')].append(nbp.cell)
 
 # %% ../nbs/03_export.ipynb 8
-def rm_comments_proc(cell):
-    "A proc that removes comments from each NB cell source"
-    cell.source = ''.join(cell.source.splitlines(True)[len(cell._comments):])
-
-# %% ../nbs/03_export.ipynb 9
 def create_modules(path, dest, procs=None, debug=False, mod_maker=ModuleMaker):
     "Create module(s) from notebook"
     exp = ExportModuleProc()
-    nb = NBProcessor(path, [exp,rm_comments_proc]+L(procs), debug=debug)
+    nb = NBProcessor(path, [exp]+L(procs), debug=debug)
     nb.process()
     for mod,cells in exp.modules.items():
         all_cells = exp.in_all[mod]
         name = exp.default_exp if mod=='#' else mod
         mm = mod_maker(dest=dest, name=name, nb_path=path, is_new=mod=='#')
         mm.make(cells, all_cells)
 
-# %% ../nbs/03_export.ipynb 16
+# %% ../nbs/03_export.ipynb 15
 def nb_export(nbname, lib_path=None):
     if lib_path is None: lib_path = get_config().lib_path
     create_modules(nbname, lib_path)
 
-# %% ../nbs/03_export.ipynb 17
+# %% ../nbs/03_export.ipynb 16
 @call_parse
 def nbs_export(
     path:str=None, # path or filename

nbprocess/process.py

@@ -1,7 +1,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/02_process.ipynb.
 
 # %% auto 0
-__all__ = ['extract_comments', 'opt_set', 'NBProcessor', 'inject_meta', 'show_meta', 'insert_warning', 'update_tags']
+__all__ = ['extract_directives', 'opt_set', 'NBProcessor']
 
 # %% ../nbs/02_process.ipynb 3
 #|export
@@ -18,31 +18,32 @@
 from inspect import signature,Parameter
 import ast,contextlib,copy
 
+# %% ../nbs/02_process.ipynb 7
+#|export
+def _directive(s):
+    s = (s.strip()[2:]).strip().split()
+    if not s: return None
+    direc,*args = s
+    return direc,args
+
 # %% ../nbs/02_process.ipynb 8
 #|export
-def extract_comments(ss):
-    "Take leading comments from lines of code in `ss`, remove `#|`, and split"
-    ss = ss.splitlines()
+def extract_directives(cell):
+    "Take leading comment directives from lines of code in `ss`, remove `#|`, and split"
+    ss = cell.source.splitlines(True)
     first_code = first(i for i,o in enumerate(ss) if not o.strip() or not re.match(r'\s*#\|', o))
-    return L((s.strip()[2:]).strip().split() for s in ss[:first_code]).filter()
+    if not ss or first_code==0: return {}
+    cell['source'] = ''.join(ss[first_code:])
+    res = L(_directive(s) for s in ss[:first_code]).filter()
+    return {k:v for k,v in res}
 
 # %% ../nbs/02_process.ipynb 11
 #|export
-@functools.lru_cache(maxsize=None)
-def _param_count(f):
-    "Number of parameters accepted by function `f`"
-    params = list(signature(f).parameters.values())
-    # If there's a `*args` then `f` can take as many params as needed
-    if first(params, lambda o: o.kind==Parameter.VAR_POSITIONAL): return 99
-    return len([o for o in params if o.kind in (Parameter.POSITIONAL_ONLY,Parameter.POSITIONAL_OR_KEYWORD)])
-
-# %% ../nbs/02_process.ipynb 12
-#|export
 def opt_set(var, newval):
     "newval if newval else var"
     return newval if newval else var
 
-# %% ../nbs/02_process.ipynb 13
+# %% ../nbs/02_process.ipynb 12
 #|export
 class NBProcessor:
     "Process cells and nbdev comments in a notebook"
@@ -53,15 +54,15 @@ def __init__(self, path=None, procs=None, preprocs=None, postprocs=None, nb=None
 
     def _process_cell(self, cell):
         self.cell = cell
-        if not hasattr(cell, '_comments'): cell._comments = extract_comments(cell.source)
+        cell['_directives'] = extract_directives(cell)
         for proc in self.procs:
-            if cell.cell_type=='code': cell._comments.map(self._process_comment,proc)
+            if cell.cell_type=='code':
+                for cmd,args in cell._directives.items(): self._process_comment(proc, cmd, args)
             if callable(proc): cell = opt_set(cell, proc(cell))
 
-    def _process_comment(self, proc, comment):
-        cmd,*args = comment
+    def _process_comment(self, proc, cmd, args):
         f = getattr(proc, f'_{cmd}_', None)
-        if not f or _param_count(f)-1<len(args): return True
+        if not f: return True
         if self.debug: print(cmd, args, f)
         return f(self, *args)
 
@@ -71,41 +72,3 @@ def process(self):
         for i in range_of(self.nb.cells): self._process_cell(self.nb.cells[i])
         self.nb.cells = [c for c in self.nb.cells if c and getattr(c,'source',None) is not None]
         for proc in self.postprocs: self.nb = opt_set(self.nb, proc(self.nb))
-
-# %% ../nbs/02_process.ipynb 18
-#|export
-_re_meta= r'^\s*#(?:cell_meta|meta):\S+\s*[\n\r]'
-
-def inject_meta(cell):
-    "Inject metadata into a cell for further preprocessing with a comment."
-    _pattern = r'(^\s*#(?:cell_meta|meta):)(\S+)(\s*[\n\r])'
-    if cell.cell_type == 'code' and re.search(_re_meta, cell.source, flags=re.MULTILINE):
-        cell_meta = re.findall(_pattern, cell.source, re.MULTILINE)
-        d = cell.metadata.get('nbprocess', {})
-        for _, m, _ in cell_meta:
-            if '=' in m:
-                k,v = m.split('=')
-                d[k] = v
-            else: print(f"Warning cell_meta:{m} does not have '=' will be ignored.")
-        cell.metadata['nbprocess'] = d
-
-# %% ../nbs/02_process.ipynb 19
-#|export
-def show_meta(cell):
-    "Show cell metadata"
-    meta = cell.metadata.get('nbprocess')
-    if meta: print(meta)
-
-# %% ../nbs/02_process.ipynb 25
-#| export
-def insert_warning(nb):
-    "Insert Autogenerated Warning Into Notebook after the first cell."
-    content = "<!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->"
-    nb.cells.insert(1, AttrDict(cell_type='markdown', metadata={}, source=content))
-
-# %% ../nbs/02_process.ipynb 30
-#|export
-def update_tags(cell):
-    root = cell.metadata.get('nbprocess', {})
-    tags = root.get('tags', root.get('tag')) # allow the singular also
-    if tags: cell.metadata['tags'] = cell.metadata.get('tags', []) + tags.split(',')

nbprocess/processors.py

@@ -0,0 +1,46 @@
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/07_processors.ipynb.
+
+# %% auto 0
+__all__ = ['inject_meta', 'show_meta', 'insert_warning', 'update_tags']
+
+# %% ../nbs/07_processors.ipynb 3
+from .read import *
+from .imports import *
+from .process import *
+
+from fastcore.imports import *
+from fastcore.xtras import *
+
+# %% ../nbs/07_processors.ipynb 7
+_re_meta= r'^\s*#(?:cell_meta|meta):\S+\s*[\n\r]'
+
+def inject_meta(cell):
+    "Inject metadata into a cell for further preprocessing with a comment."
+    _pattern = r'(^\s*#(?:cell_meta|meta):)(\S+)(\s*[\n\r])'
+    if cell.cell_type == 'code' and re.search(_re_meta, cell.source, flags=re.MULTILINE):
+        cell_meta = re.findall(_pattern, cell.source, re.MULTILINE)
+        d = cell.metadata.get('nbprocess', {})
+        for _, m, _ in cell_meta:
+            if '=' in m:
+                k,v = m.split('=')
+                d[k] = v
+            else: print(f"Warning cell_meta:{m} does not have '=' will be ignored.")
+        cell.metadata['nbprocess'] = d
+
+# %% ../nbs/07_processors.ipynb 8
+def show_meta(cell):
+    "Show cell metadata"
+    meta = cell.metadata.get('nbprocess')
+    if meta: print(meta)
+
+# %% ../nbs/07_processors.ipynb 14
+def insert_warning(nb):
+    "Insert Autogenerated Warning Into Notebook after the first cell."
+    content = "<!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->"
+    nb.cells.insert(1, AttrDict(cell_type='markdown', metadata={}, source=content))
+
+# %% ../nbs/07_processors.ipynb 19
+def update_tags(cell):
+    root = cell.metadata.get('nbprocess', {})
+    tags = root.get('tags', root.get('tag')) # allow the singular also
+    if tags: cell.metadata['tags'] = cell.metadata.get('tags', []) + tags.split(',')