fixes #854

Author: jph00

fastcore/_modidx.py

@@ -370,6 +370,7 @@
                                      'fastcore.foundation.L.__add__': ('foundation.html#l.__add__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__addi__': ('foundation.html#l.__addi__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__contains__': ('foundation.html#l.__contains__', 'fastcore/foundation.py'),
+                                     'fastcore.foundation.L.__copy__': ('foundation.html#l.__copy__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__eq__': ('foundation.html#l.__eq__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__getitem__': ('foundation.html#l.__getitem__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__init__': ('foundation.html#l.__init__', 'fastcore/foundation.py'),
@@ -529,6 +530,8 @@
                                'fastcore.nbio.render_output': ('nbio.html#render_output', 'fastcore/nbio.py'),
                                'fastcore.nbio.render_outputs': ('nbio.html#render_outputs', 'fastcore/nbio.py'),
                                'fastcore.nbio.render_text': ('nbio.html#render_text', 'fastcore/nbio.py'),
+                               'fastcore.nbio.validate_cell': ('nbio.html#validate_cell', 'fastcore/nbio.py'),
+                               'fastcore.nbio.validate_nb': ('nbio.html#validate_nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.write_nb': ('nbio.html#write_nb', 'fastcore/nbio.py')},
             'fastcore.net': { 'fastcore.net.HTTP4xxClientError': ('net.html#http4xxclienterror', 'fastcore/net.py'),
                               'fastcore.net.HTTP5xxServerError': ('net.html#http5xxservererror', 'fastcore/net.py'),
@@ -646,22 +649,16 @@
                                'fastcore.test.test_shuffled': ('test.html#test_shuffled', 'fastcore/test.py'),
                                'fastcore.test.test_stdout': ('test.html#test_stdout', 'fastcore/test.py'),
                                'fastcore.test.test_warns': ('test.html#test_warns', 'fastcore/test.py')},
-            'fastcore.tools': { 'fastcore.tools._fmt_path': ('tools.html#_fmt_path', 'fastcore/tools.py'),
-                                'fastcore.tools._load_valid_paths': ('tools.html#_load_valid_paths', 'fastcore/tools.py'),
-                                'fastcore.tools.create': ('tools.html#create', 'fastcore/tools.py'),
-                                'fastcore.tools.ensure': ('tools.html#ensure', 'fastcore/tools.py'),
-                                'fastcore.tools.explain_exc': ('tools.html#explain_exc', 'fastcore/tools.py'),
-                                'fastcore.tools.get_callable': ('tools.html#get_callable', 'fastcore/tools.py'),
-                                'fastcore.tools.insert': ('tools.html#insert', 'fastcore/tools.py'),
-                                'fastcore.tools.move_lines': ('tools.html#move_lines', 'fastcore/tools.py'),
+            'fastcore.tools': { 'fastcore.tools._norm_lines': ('tools.html#_norm_lines', 'fastcore/tools.py'),
+                                'fastcore.tools.ast_replace': ('tools.html#ast_replace', 'fastcore/tools.py'),
+                                'fastcore.tools.del_lines': ('tools.html#del_lines', 'fastcore/tools.py'),
+                                'fastcore.tools.file_create': ('tools.html#file_create', 'fastcore/tools.py'),
+                                'fastcore.tools.file_edit': ('tools.html#file_edit', 'fastcore/tools.py'),
+                                'fastcore.tools.file_view': ('tools.html#file_view', 'fastcore/tools.py'),
+                                'fastcore.tools.insert_line': ('tools.html#insert_line', 'fastcore/tools.py'),
                                 'fastcore.tools.replace_lines': ('tools.html#replace_lines', 'fastcore/tools.py'),
-                                'fastcore.tools.rg': ('tools.html#rg', 'fastcore/tools.py'),
-                                'fastcore.tools.run_cmd': ('tools.html#run_cmd', 'fastcore/tools.py'),
-                                'fastcore.tools.sed': ('tools.html#sed', 'fastcore/tools.py'),
                                 'fastcore.tools.str_replace': ('tools.html#str_replace', 'fastcore/tools.py'),
-                                'fastcore.tools.strs_replace': ('tools.html#strs_replace', 'fastcore/tools.py'),
-                                'fastcore.tools.valid_path': ('tools.html#valid_path', 'fastcore/tools.py'),
-                                'fastcore.tools.view': ('tools.html#view', 'fastcore/tools.py')},
+                                'fastcore.tools.strs_replace': ('tools.html#strs_replace', 'fastcore/tools.py')},
             'fastcore.transform': {},
             'fastcore.utils': {},
             'fastcore.xdg': { 'fastcore.xdg._path_from_env': ('xdg.html#_path_from_env', 'fastcore/xdg.py'),
@@ -849,6 +846,7 @@
                                 'fastcore.xtras.shufflish': ('xtras.html#shufflish', 'fastcore/xtras.py'),
                                 'fastcore.xtras.sparkline': ('xtras.html#sparkline', 'fastcore/xtras.py'),
                                 '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.time_policy': ('xtras.html#time_policy', 'fastcore/xtras.py'),
                                 'fastcore.xtras.timed_cache': ('xtras.html#timed_cache', 'fastcore/xtras.py'),

fastcore/foundation.py

@@ -362,6 +362,10 @@ def copy(self:L):
     "Same as `list.copy`, but returns an `L`"
     return self._new(self.items.copy())
 
+# %% ../nbs/02_foundation.ipynb #0becb556
+@patch
+def __copy__(self:L): return self.copy()
+
 # %% ../nbs/02_foundation.ipynb #7b2691d6
 @patch
 def shuffle(self:L):

fastcore/nbio.py

@@ -5,9 +5,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/13_nbio.ipynb.
 
 # %% auto #0
-__all__ = ['NbCell', 'dict2nb', 'read_nb', 'mk_cell', 'new_nb', 'nb2dict', 'nb2str', 'write_nb', 'preferred_out', 'mk_stream',
-           'mk_result', 'mk_display', 'mk_error', 'concat_streams', 'preferred_msg_out', 'render_output',
-           'render_outputs', 'render_text', 'cell2xml', 'cells2xml', 'Notebook']
+__all__ = ['NbCell', 'dict2nb', 'read_nb', 'mk_cell', 'new_nb', 'nb2dict', 'nb2str', 'write_nb', 'validate_cell', 'validate_nb',
+           'preferred_out', 'mk_stream', 'mk_result', 'mk_display', 'mk_error', 'concat_streams', 'preferred_msg_out',
+           'render_output', 'render_outputs', 'render_text', 'cell2xml', 'cells2xml', 'Notebook']
 
 # %% ../nbs/13_nbio.ipynb #954ca1aa
 from .basics import *
@@ -147,6 +147,30 @@ def write_nb(nb, path):
     if new!=old:
         with open(path, 'w', encoding='utf-8') as f: f.write(new)
 
+# %% ../nbs/13_nbio.ipynb #86453c0f
+def validate_cell(cell, idx=None):
+    "Raise `ValueError` for structural problems in notebook cell dict `cell`; returns it unchanged if fine"
+    where = f"cell {cell.get('id', idx)}"
+    ct = cell.get('cell_type')
+    if ct not in ('code','markdown','raw'): raise ValueError(f"{where}: unknown cell_type {ct!r}")
+    src = cell.get('source', '')
+    if not (isinstance(src,str) or (isinstance(src,list) and all(isinstance(o,str) for o in src))):
+        raise ValueError(f"{where}: source must be str or list of str")
+    if not isinstance(cell.get('metadata', {}), dict): raise ValueError(f"{where}: metadata must be a dict")
+    if ct=='code':
+        if not isinstance(cell.get('outputs'), list): raise ValueError(f"{where}: code cell requires an outputs list")
+        if 'execution_count' not in cell: raise ValueError(f"{where}: code cell requires execution_count")
+    elif k := first(k for k in ('outputs','execution_count') if k in cell): raise ValueError(f"{where}: {k} not allowed in a {ct} cell")
+    return cell
+
+def validate_nb(nb):
+    "Raise `ValueError` for structural problems in notebook `nb`; returns it unchanged if fine"
+    if k := first(k for k in ('cells','metadata','nbformat') if k not in nb): raise ValueError(f"notebook requires {k!r}")
+    for i,c in enumerate(nb['cells']): validate_cell(c, i)
+    ids = [c.get('id') for c in nb['cells'] if c.get('id')]
+    if dups := {o for o in ids if ids.count(o)>1}: raise ValueError(f"duplicate cell id(s): {', '.join(sorted(dups))}")
+    return nb
+
 # %% ../nbs/13_nbio.ipynb #530b9cd1
 from .xml import Code,Markdown,Raw,NB,Source,Out,to_xml,ft