fastcore 2.1.0__tar.gz → 2.1.2__tar.gz

{fastcore-2.1.0/fastcore.egg-info → fastcore-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.1.0
+Version: 2.1.2
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0

fastcore-2.1.2/fastcore/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.1.2"

{fastcore-2.1.0 → fastcore-2.1.2}/fastcore/_modidx.py

@@ -119,6 +119,7 @@ d = { 'settings': { 'branch': 'main',
                                  'fastcore.basics._eval_type': ('basics.html#_eval_type', 'fastcore/basics.py'),
                                  'fastcore.basics._get_op': ('basics.html#_get_op', 'fastcore/basics.py'),
                                  'fastcore.basics._ispy3_10': ('basics.html#_ispy3_10', 'fastcore/basics.py'),
+                                 'fastcore.basics._json_default': ('basics.html#_json_default', 'fastcore/basics.py'),
                                  'fastcore.basics._mk_op': ('basics.html#_mk_op', 'fastcore/basics.py'),
                                  'fastcore.basics._nested_idx': ('basics.html#_nested_idx', 'fastcore/basics.py'),
                                  'fastcore.basics._oper': ('basics.html#_oper', 'fastcore/basics.py'),
@@ -258,6 +259,7 @@ d = { 'settings': { 'branch': 'main',
                                  'fastcore.basics.ver2tuple': ('basics.html#ver2tuple', 'fastcore/basics.py'),
                                  'fastcore.basics.with_cast': ('basics.html#with_cast', 'fastcore/basics.py'),
                                  'fastcore.basics.wrap_class': ('basics.html#wrap_class', 'fastcore/basics.py'),
+                                 'fastcore.basics.xdumps': ('basics.html#xdumps', 'fastcore/basics.py'),
                                  'fastcore.basics.zip_cycle': ('basics.html#zip_cycle', 'fastcore/basics.py')},
             'fastcore.dispatch': {},
             'fastcore.docments': { 'fastcore.docments.DocmentList': ('docments.html#docmentlist', 'fastcore/docments.py'),
@@ -370,11 +372,13 @@ d = { 'settings': { 'branch': 'main',
                                      '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'),
                                      'fastcore.foundation.L.__invert__': ('foundation.html#l.__invert__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__iter__': ('foundation.html#l.__iter__', 'fastcore/foundation.py'),
+                                     'fastcore.foundation.L.__json__': ('foundation.html#l.__json__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__mul__': ('foundation.html#l.__mul__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__radd__': ('foundation.html#l.__radd__', 'fastcore/foundation.py'),
                                      'fastcore.foundation.L.__repr__': ('foundation.html#l.__repr__', 'fastcore/foundation.py'),
@@ -479,7 +483,13 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.NbCell.__eq__': ('nbio.html#nbcell.__eq__', 'fastcore/nbio.py'),
                                'fastcore.nbio.NbCell.__hash__': ('nbio.html#nbcell.__hash__', 'fastcore/nbio.py'),
                                'fastcore.nbio.NbCell.__init__': ('nbio.html#nbcell.__init__', 'fastcore/nbio.py'),
+                               'fastcore.nbio.NbCell.__setattr__': ('nbio.html#nbcell.__setattr__', 'fastcore/nbio.py'),
+                               'fastcore.nbio.NbCell.__setitem__': ('nbio.html#nbcell.__setitem__', 'fastcore/nbio.py'),
+                               'fastcore.nbio.NbCell._partition': ('nbio.html#nbcell._partition', 'fastcore/nbio.py'),
+                               'fastcore.nbio.NbCell.directive': ('nbio.html#nbcell.directive', 'fastcore/nbio.py'),
+                               'fastcore.nbio.NbCell.has_directive': ('nbio.html#nbcell.has_directive', 'fastcore/nbio.py'),
                                'fastcore.nbio.NbCell.parsed_': ('nbio.html#nbcell.parsed_', 'fastcore/nbio.py'),
+                               'fastcore.nbio.NbCell.remove_directives': ('nbio.html#nbcell.remove_directives', 'fastcore/nbio.py'),
                                'fastcore.nbio.NbCell.set_source': ('nbio.html#nbcell.set_source', 'fastcore/nbio.py'),
                                'fastcore.nbio.Notebook': ('nbio.html#notebook', 'fastcore/nbio.py'),
                                'fastcore.nbio.Notebook.__contains__': ('nbio.html#notebook.__contains__', 'fastcore/nbio.py'),
@@ -502,8 +512,14 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.Notebook.save': ('nbio.html#notebook.save', 'fastcore/nbio.py'),
                                'fastcore.nbio.Notebook.view': ('nbio.html#notebook.view', 'fastcore/nbio.py'),
                                'fastcore.nbio._dict2obj': ('nbio.html#_dict2obj', 'fastcore/nbio.py'),
+                               'fastcore.nbio._dir_line': ('nbio.html#_dir_line', 'fastcore/nbio.py'),
+                               'fastcore.nbio._dir_pre': ('nbio.html#_dir_pre', 'fastcore/nbio.py'),
+                               'fastcore.nbio._directive': ('nbio.html#_directive', 'fastcore/nbio.py'),
+                               'fastcore.nbio._directives_get': ('nbio.html#_directives_get', 'fastcore/nbio.py'),
+                               'fastcore.nbio._directives_set': ('nbio.html#_directives_set', 'fastcore/nbio.py'),
                                'fastcore.nbio._is_json_mime': ('nbio.html#_is_json_mime', 'fastcore/nbio.py'),
                                'fastcore.nbio._join': ('nbio.html#_join', 'fastcore/nbio.py'),
+                               'fastcore.nbio._meta_directives': ('nbio.html#_meta_directives', 'fastcore/nbio.py'),
                                'fastcore.nbio._mkout': ('nbio.html#_mkout', 'fastcore/nbio.py'),
                                'fastcore.nbio._read_json': ('nbio.html#_read_json', 'fastcore/nbio.py'),
                                'fastcore.nbio._rejoin_cell': ('nbio.html#_rejoin_cell', 'fastcore/nbio.py'),
@@ -511,10 +527,12 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio._render_text': ('nbio.html#_render_text', 'fastcore/nbio.py'),
                                'fastcore.nbio._split_cell': ('nbio.html#_split_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio._split_mime': ('nbio.html#_split_mime', 'fastcore/nbio.py'),
+                               'fastcore.nbio._unparse_dir': ('nbio.html#_unparse_dir', 'fastcore/nbio.py'),
                                'fastcore.nbio.cell2xml': ('nbio.html#cell2xml', 'fastcore/nbio.py'),
                                'fastcore.nbio.cells2xml': ('nbio.html#cells2xml', 'fastcore/nbio.py'),
                                'fastcore.nbio.concat_streams': ('nbio.html#concat_streams', 'fastcore/nbio.py'),
                                'fastcore.nbio.dict2nb': ('nbio.html#dict2nb', 'fastcore/nbio.py'),
+                               'fastcore.nbio.first_code_ln': ('nbio.html#first_code_ln', 'fastcore/nbio.py'),
                                'fastcore.nbio.mk_cell': ('nbio.html#mk_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.mk_display': ('nbio.html#mk_display', 'fastcore/nbio.py'),
                                'fastcore.nbio.mk_error': ('nbio.html#mk_error', 'fastcore/nbio.py'),
@@ -522,6 +540,7 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.mk_stream': ('nbio.html#mk_stream', 'fastcore/nbio.py'),
                                'fastcore.nbio.nb2dict': ('nbio.html#nb2dict', 'fastcore/nbio.py'),
                                'fastcore.nbio.nb2str': ('nbio.html#nb2str', 'fastcore/nbio.py'),
+                               'fastcore.nbio.nb_lang': ('nbio.html#nb_lang', 'fastcore/nbio.py'),
                                'fastcore.nbio.new_nb': ('nbio.html#new_nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.preferred_msg_out': ('nbio.html#preferred_msg_out', 'fastcore/nbio.py'),
                                'fastcore.nbio.preferred_out': ('nbio.html#preferred_out', 'fastcore/nbio.py'),
@@ -529,6 +548,10 @@ d = { 'settings': { 'branch': 'main',
                                '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.repair_cell': ('nbio.html#repair_cell', 'fastcore/nbio.py'),
+                               'fastcore.nbio.repair_nb': ('nbio.html#repair_nb', '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'),
@@ -536,7 +559,9 @@ d = { 'settings': { 'branch': 'main',
                               'fastcore.net._SafeRedirectHandler.redirect_request': ( 'net.html#_saferedirecthandler.redirect_request',
                                                                                       'fastcore/net.py'),
                               'fastcore.net._socket_det': ('net.html#_socket_det', 'fastcore/net.py'),
+                              'fastcore.net._waitfor': ('net.html#_waitfor', 'fastcore/net.py'),
                               'fastcore.net.http_response': ('net.html#http_response', 'fastcore/net.py'),
+                              'fastcore.net.is_port_free': ('net.html#is_port_free', 'fastcore/net.py'),
                               'fastcore.net.recv_once': ('net.html#recv_once', 'fastcore/net.py'),
                               'fastcore.net.start_client': ('net.html#start_client', 'fastcore/net.py'),
                               'fastcore.net.start_server': ('net.html#start_server', 'fastcore/net.py'),
@@ -551,7 +576,11 @@ d = { 'settings': { 'branch': 'main',
                               'fastcore.net.urlretrieve': ('net.html#urlretrieve', 'fastcore/net.py'),
                               'fastcore.net.urlsave': ('net.html#urlsave', 'fastcore/net.py'),
                               'fastcore.net.urlvalid': ('net.html#urlvalid', 'fastcore/net.py'),
-                              'fastcore.net.urlwrap': ('net.html#urlwrap', 'fastcore/net.py')},
+                              'fastcore.net.urlwrap': ('net.html#urlwrap', 'fastcore/net.py'),
+                              'fastcore.net.wait_port_free': ('net.html#wait_port_free', 'fastcore/net.py'),
+                              'fastcore.net.wait_port_free_async': ('net.html#wait_port_free_async', 'fastcore/net.py'),
+                              'fastcore.net.waitfor': ('net.html#waitfor', 'fastcore/net.py'),
+                              'fastcore.net.waitfor_async': ('net.html#waitfor_async', 'fastcore/net.py')},
             'fastcore.parallel': { 'fastcore.parallel.ProcessPoolExecutor': ('parallel.html#processpoolexecutor', 'fastcore/parallel.py'),
                                    'fastcore.parallel.ProcessPoolExecutor.__init__': ( 'parallel.html#processpoolexecutor.__init__',
                                                                                        'fastcore/parallel.py'),
@@ -646,22 +675,16 @@ d = { 'settings': { 'branch': 'main',
                                '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'),
@@ -706,6 +729,7 @@ d = { 'settings': { 'branch': 'main',
                               'fastcore.xml.dict2xml': ('xml.html#dict2xml', 'fastcore/xml.py'),
                               'fastcore.xml.ft': ('xml.html#ft', 'fastcore/xml.py'),
                               'fastcore.xml.highlight': ('xml.html#highlight', 'fastcore/xml.py'),
+                              'fastcore.xml.item2xml': ('xml.html#item2xml', 'fastcore/xml.py'),
                               'fastcore.xml.mk_getattr': ('xml.html#mk_getattr', 'fastcore/xml.py'),
                               'fastcore.xml.showtags': ('xml.html#showtags', 'fastcore/xml.py'),
                               'fastcore.xml.to_xml': ('xml.html#to_xml', 'fastcore/xml.py'),
@@ -849,7 +873,9 @@ d = { 'settings': { 'branch': 'main',
                                 '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.take_lines': ('xtras.html#take_lines', '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.xtras.trace': ('xtras.html#trace', 'fastcore/xtras.py'),

{fastcore-2.1.0 → fastcore-2.1.2}/fastcore/basics.py

@@ -22,12 +22,12 @@ __all__ = ['defaults', 'null', 'num_methods', 'rnum_methods', 'inum_methods', 'a
            'fail_clean', 'dstar', 'copy_func', 'patch_to', 'patch', 'extend_enum', 'compile_re', 'ImportEnum',
            'StrEnum', 'str_enum', 'ValEnum', 'Stateful', 'NotStr', 'PrettyString', 'even_mults', 'num_cpus',
            'add_props', 'str2bool', 'str2int', 'str2float', 'str2list', 'str2date', 'to_bool', 'to_int', 'to_float',
-           'to_list', 'to_date', 'typed', 'exec_new', 'exec_import', 'sig_with_params', 'fdelegates', 'lt', 'gt', 'le',
-           'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'mod']
+           'to_list', 'to_date', 'typed', 'exec_new', 'exec_import', 'sig_with_params', 'fdelegates', 'xdumps', 'lt',
+           'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'mod']
 
 # %% ../nbs/01_basics.ipynb #0e91ed82
 from .imports import *
-import builtins,types,typing
+import builtins,types,typing,json
 from functools import cmp_to_key,wraps
 from copy import copy
 from datetime import date
@@ -1394,3 +1394,16 @@ def fdelegates(to):
         f.__signature__ = sig_with_params(sig, remove=['kwargs'], **new_params)
         return f
     return _f
+
+# %% ../nbs/01_basics.ipynb #3e6f50e5
+def _json_default(o, default=None):
+    f = getattr(o, '__json__', None)
+    if f: return f()
+    if default: return default(o)
+    raise TypeError(f'Object of type {type(o).__name__} is not JSON serializable')
+
+def xdumps(o, **kwargs):
+    "`json.dumps`, using `__json__` methods when available"
+    default = kwargs.pop('default', None)
+    return json.dumps(o, default=partial(_json_default, default=default), **kwargs)
+

{fastcore-2.1.0 → fastcore-2.1.2}/fastcore/foundation.py

@@ -153,6 +153,7 @@ class L(GetAttr, CollBase, metaclass=_L_Meta):
         return all_equal(b,self)
 
     def __iter__(self): return iter(self.items.itertuples() if hasattr(self.items,'iloc') else self.items)
+    def __json__(self): return list(self)
     def __contains__(self,b): return b in self.items
     def __reversed__(self): return self._new(reversed(self.items))
     def __invert__(self): return self._new(not i for i in self)
@@ -362,6 +363,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-2.1.0 → fastcore-2.1.2}/fastcore/nbio.py

@@ -5,18 +5,20 @@ Docs: https://fastcore.fast.ai/nbio.html.md"""
 # 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',
+__all__ = ['langs', 'nb_lang', 'NbCell', 'dict2nb', 'read_nb', 'mk_cell', 'new_nb', 'first_code_ln', 'nb2dict', 'nb2str',
+           'write_nb', 'validate_cell', 'validate_nb', 'repair_cell', 'repair_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 *
-from .xtras import rtoken_hex,clean_cli_output
+from .xtras import rtoken_hex,clean_cli_output,take_lines
 from .imports import *
 from .ansi import ansi2html
 from .meta import delegates
 
 import ast,functools
+from collections import defaultdict
 from pprint import pformat,pprint
 from json import loads,dumps
 
@@ -42,18 +44,39 @@ def _rejoin_cell(c):
             if o.get('output_type') in ('execute_result','display_data'): _rejoin_mime(o.get('data', {}))
             elif o.get('output_type')=='stream' and isinstance(o.get('text'), list): o['text'] = ''.join(o['text'])
 
+# %% ../nbs/13_nbio.ipynb #e13f61b8
+# from https://github.com/quarto-dev/quarto-cli/blob/main/src/resources/jupyter/notebook.py
+langs = defaultdict(
+    lambda: '#',  r = "#", python = "#", julia = "#", scala = "//", matlab = "%", csharp = "//", fsharp = "//",
+    c = ["/*","*/"], css = ["/*","*/"], sas = ["*",";"], powershell = "#", bash = "#", sql = "--", mysql = "--", psql = "--",
+    lua = "--", cpp = "//", cc = "//", stan = "#", octave = "#", fortran = "!", fortran95 = "!", awk = "#", gawk = "#", stata = "*",
+    java = "//", groovy = "//", sed = "#", perl = "#", ruby = "#", tikz = "%", javascript = "//", js = "//", d3 = "//", node = "//",
+    sass = "//", coffee = "#", go = "//", asy = "//", haskell = "--", dot = "//", apl = "⍝")
+
+def nb_lang(nb): return nested_attr(nb, 'metadata.kernelspec.language', 'python')
+
 # %% ../nbs/13_nbio.ipynb #49d7bf89
 class NbCell(AttrDict):
-    def __init__(self, idx, cell):
+    def __init__(self, idx, cell, lang='python'):
         super().__init__(cell)
         self.idx_ = idx
+        self.lang_ = nested_attr(self, 'metadata.language', lang)
         if 'id' not in self: self.id = rtoken_hex(4)
         if 'source' in self: self.set_source(self.source)
         _rejoin_cell(self)
 
-    def set_source(self, source):
-        self.source = ''.join(source)
-        if '_parsed_' in self: del(self['_parsed_'])
+    def __setattr__(self, k, v):
+        prop = getattr(type(self), k, None)
+        if isinstance(prop, property) and prop.fset: prop.fset(self, v)
+        else: super().__setattr__(k, v)
+
+    def __setitem__(self, k, v):
+        super().__setitem__(k, v)
+        if k in ('source','metadata'):
+            for c in ('_parsed_','_directives_','_meta_names_'):
+                if c in self: del(self[c])
+
+    def set_source(self, source): self.source = ''.join(source)
 
     def parsed_(self):
         if self.cell_type!='code' or self.source.strip()[:1] in ['%', '!']: return
@@ -77,7 +100,7 @@ def _dict2obj(d, list_func=list, dict_func=AttrDict):
 def dict2nb(js=None, **kwargs):
     "Convert dict `js` to an `AttrDict`, "
     nb = _dict2obj(js or kwargs)
-    nb.cells = [NbCell(*o) for o in enumerate(nb.cells)]
+    nb.cells = [NbCell(i, o, nb_lang(nb)) for i,o in enumerate(nb.cells)]
     return nb
 
 # %% ../nbs/13_nbio.ipynb #0626f06e
@@ -104,9 +127,94 @@ def mk_cell(
 # %% ../nbs/13_nbio.ipynb #e7af3290
 def new_nb(cells=None, meta=None, nbformat=4, nbformat_minor=5):
     "Returns an empty new notebook"
-    cells = [o if isinstance(o,dict) else mk_cell(o) for o in cells]
+    cells = [o if isinstance(o,dict) else mk_cell(o) for o in cells or []]
     return dict2nb(cells=cells or [],metadata=meta or {},nbformat=nbformat,nbformat_minor=nbformat_minor)
 
+# %% ../nbs/13_nbio.ipynb #c2ed0d5e
+def _dir_pre(lang=None): return fr"\s*{langs[lang]}\s*\|"
+_cell_mgc = re.compile(r"^\s*%%\w+")
+
+def first_code_ln(code_list, re_pattern=None, lang='python'):
+    "get first line number where code occurs, where `code_list` is a list of code"
+    if re_pattern is None: re_pattern = _dir_pre(lang)
+    return first(i for i,o in enumerate(code_list) if o.strip() != '' and not re.match(re_pattern, o) and not _cell_mgc.match(o))
+
+# %% ../nbs/13_nbio.ipynb #b0cc33c0
+def _directive(s, lang='python'):
+    "Parse a directive line into `(name, value)`; None if `s` is not a directive line"
+    if not re.match(_dir_pre(lang), s): return None
+    s = re.sub('^'+_dir_pre(lang), '', s).strip()
+    m = re.match(r'([^\s:]+)\s*:?\s?(.*?)\s*$', s, flags=re.S)
+    if not m: return None
+    name,v = m.groups()
+    return name, ('' if v=='true' else v)
+
+# %% ../nbs/13_nbio.ipynb #16c08410
+def _meta_directives(cell):
+    "Directives from the `nbdev` dict in cell metadata, as `{name: value}`"
+    def _v(v):
+        if isinstance(v,bool): return '' if v else 'false'
+        if isinstance(v,(list,tuple)): return ' '.join(map(str,v))
+        return '' if v=='true' else str(v)
+    return {k:_v(v) for k,v in cell.get('metadata',{}).get('nbdev',{}).items()}
+
+def _unparse_dir(v):
+    "Inverse of `_meta_directives` value parsing: value string back to a metadata value"
+    if v=='': return True
+    if v=='false': return False
+    return v
+
+def _dir_line(k, v, lang='python', quarto=False):
+    "A canonical directive comment line; with `quarto`, bare directives render as `: true`"
+    if quarto and not v: v = 'true'
+    return f"{langs[lang]}| {k}" + (f": {v}" if v else '') + '\n'
+
+# %% ../nbs/13_nbio.ipynb #428ecb6a
+@patch
+def _partition(self:NbCell):
+    "Split source into leading directive lines (with magics and blanks) and the rest"
+    dirs = take_lines(self.source, fr'^({_dir_pre(self.lang_)}|\s*%%\w+|\s*$)')
+    return dirs.splitlines(True), self.source[len(dirs):].splitlines(True)
+
+def _directives_get(self):
+    "Directives from leading comments and the metadata `nbdev` key; comments win. Assign a modified copy back to update the cell."
+    if '_directives_' not in self:
+        dirs,_ = self._partition()
+        cmts = dict(t for t in (_directive(s, self.lang_) for s in dirs) if t)
+        meta = _meta_directives(self)
+        self['_meta_names_'] = set(meta) - set(cmts)
+        self['_directives_'] = cmts | {k:v for k,v in meta.items() if k not in cmts}
+    return dict(self['_directives_'])
+
+def _directives_set(self, d):
+    if d == self.directives: return
+    mnames = self['_meta_names_']
+    meta = {k:_unparse_dir(v) for k,v in d.items() if k in mnames}
+    lines = [_dir_line(k, v, self.lang_) for k,v in d.items() if k not in mnames]
+    if meta: self.setdefault('metadata', AttrDict())['nbdev'] = meta
+    elif 'nbdev' in self.get('metadata', {}): del self.metadata['nbdev']
+    dirs,code = self._partition()
+    self.set_source(''.join([o for o in dirs if _cell_mgc.match(o)] + lines + code))
+
+NbCell.directives = property(_directives_get, _directives_set)
+
+# %% ../nbs/13_nbio.ipynb #281f7f8a
+@patch
+def directive(self:NbCell, name, default=None):
+    "Value of directive `name` (`''` if bare), or `default` if absent"
+    return self.directives.get(name, default)
+
+@patch
+def has_directive(self:NbCell, name): return self.directive(name) is not None
+
+@patch
+def remove_directives(self:NbCell, quarto=False):
+    "Strip directives from source, keeping cell magics; with `quarto`, instead materialize every directive (metadata included) as a Quarto option line"
+    dirs,code = self._partition()
+    keep = [o for o in dirs if _cell_mgc.match(o)]
+    if quarto: keep += [_dir_line(k, v, self.lang_, quarto=True) for k,v in self.directives.items()]
+    self.set_source(''.join(keep + code))
+
 # %% ../nbs/13_nbio.ipynb #7c7bab22
 def _split_mime(data):
     "Copy of mimebundle `data` with multiline text split to lists of lines, like nbformat's `split_lines`"
@@ -147,8 +255,73 @@ 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 #d38902eb
+def repair_cell(cell, idx=None):
+    "Fix deterministic structural problems in `cell`, returning a list of repairs made"
+    res,where = [],f"cell {cell.get('id', idx)}"
+    src = cell.get('source', '')
+    if not (isinstance(src,str) or (isinstance(src,list) and all(isinstance(o,str) for o in src))):
+        cell['source'] = ''.join(map(str, listify(src)))
+        res.append(f"{where}: coerced source to text")
+    if not isinstance(cell.get('metadata', {}), dict):
+        cell['metadata'] = {}
+        res.append(f"{where}: reset non-dict metadata")
+    if cell.get('cell_type')=='code':
+        if not isinstance(cell.get('outputs'), list):
+            cell['outputs'] = []
+            res.append(f"{where}: added outputs list")
+        if 'execution_count' not in cell:
+            cell['execution_count'] = None
+            res.append(f"{where}: added execution_count")
+    else:
+        for k in ('outputs','execution_count'):
+            if k in cell:
+                del cell[k]
+                res.append(f"{where}: removed {k}")
+    return res
+
+def repair_nb(nb):
+    "Fix deterministic structural problems in `nb`, returning a list of repairs made"
+    res = []
+    for k,v in dict(cells=[], metadata={}, nbformat=4).items():
+        if k not in nb:
+            nb[k] = v
+            res.append(f"added notebook {k}")
+    for i,c in enumerate(nb['cells']): res += repair_cell(c, i)
+    seen = set()
+    for c in nb['cells']:
+        if (i := c.get('id')) in seen:
+            c['id'] = rtoken_hex(4)
+            res.append(f"cell {i}: duplicate id, regenerated as {c['id']}")
+        seen.add(c.get('id'))
+    return res
+
 # %% ../nbs/13_nbio.ipynb #530b9cd1
-from .xml import Code,Markdown,Raw,NB,Source,Out,to_xml,ft
+from .xml import NB,to_xml,ft,item2xml
 
 # %% ../nbs/13_nbio.ipynb #9f22b923
 def preferred_out(data, html1st=True, include_imgs=False):
@@ -252,15 +425,10 @@ def render_text(outputs, html1st=False):
     return items[0][0] if len(items)==1 else '\n'.join(o[1] for o in items)
 
 # %% ../nbs/13_nbio.ipynb #ca73be1c
-_ctfuns_nb = dict(code=Code, markdown=Markdown, raw=Raw)
-
 def cell2xml(cell, ids=True, incl_out=True):
     "Convert NbCell to concise XML format"
-    f = _ctfuns_nb[cell.cell_type]
-    kw = dict(id=cell.id) if ids else {}
-    output = getattr(cell, 'outputs', None) if incl_out else None
-    if not output: return f(cell.source, **kw)
-    return f(Source(cell.source), Out(render_text(output)), **kw)
+    outputs = getattr(cell, 'outputs', None) if incl_out else None
+    return item2xml(cell.cell_type, cell.source, render_text(outputs) if outputs else '', id=cell.id if ids else None)
 
 def cells2xml(cells, wrap=NB, ids=True, incl_out=True, **kw):
     "Convert notebook cells to XML format"

{fastcore-2.1.0 → fastcore-2.1.2}/fastcore/net.py

@@ -7,7 +7,8 @@ Docs: https://fastcore.fast.ai/net.html.md"""
 # %% auto #0
 __all__ = ['url_default_headers', 'ExceptionsHTTP', 'urlquote', 'urlwrap', 'HTTP4xxClientError', 'HTTP5xxServerError',
            'urlopener', 'urlopen', 'urlread', 'urljson', 'urlclean', 'urlretrieve', 'urldest', 'urlsave', 'urlvalid',
-           'start_server', 'start_client', 'tobytes', 'http_response', 'recv_once', 'HTTP400BadRequestError',
+           'start_server', 'start_client', 'tobytes', 'http_response', 'recv_once', 'waitfor', 'waitfor_async',
+           'is_port_free', 'wait_port_free', 'wait_port_free_async', 'HTTP400BadRequestError',
            'HTTP401UnauthorizedError', 'HTTP402PaymentRequiredError', 'HTTP403ForbiddenError', 'HTTP404NotFoundError',
            'HTTP405MethodNotAllowedError', 'HTTP406NotAcceptableError', 'HTTP407ProxyAuthRequiredError',
            'HTTP408RequestTimeoutError', 'HTTP409ConflictError', 'HTTP410GoneError', 'HTTP411LengthRequiredError',
@@ -23,7 +24,7 @@ from .utils import *
 from .parallel import *
 
 import json,urllib,contextlib,tempfile
-import socket,urllib.request,urllib,asyncio,threading
+import socket,urllib.request,urllib,asyncio,threading,time
 from contextlib import contextmanager
 from urllib.request import Request,urlretrieve
 from urllib.error import HTTPError,URLError
@@ -240,3 +241,39 @@ def recv_once(host:str='localhost', port:int=8000):
     res = conn.recv(1024)
     conn.sendall(http_response(res))
     return res
+
+# %% ../nbs/03b_net.ipynb #8896fe36
+def _waitfor(f, timeout, msg):
+    end = time.time()+timeout
+    while not f():
+        if time.time()>end: raise TimeoutError(msg or f"Timeout after {timeout}s")
+        yield 0.1
+
+def waitfor(f, timeout=20, msg=None):
+    "Call `f` every 0.1s until it returns truthy, raising `TimeoutError` with `msg` after `timeout` secs"
+    for d in _waitfor(f, timeout, msg): time.sleep(d)
+
+async def waitfor_async(f, timeout=20, msg=None):
+    "Async version of `waitfor`"
+    for d in _waitfor(f, timeout, msg): await asyncio.sleep(d)
+
+# %% ../nbs/03b_net.ipynb #38a94895
+def is_port_free(port, host='localhost'):
+    "Is `port` free on `host`?"
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    try:
+        sock.bind((host,port))
+        sock.listen(1)
+        return True
+    except OSError: return False
+    finally: sock.close()
+
+# %% ../nbs/03b_net.ipynb #e0a7369a
+def wait_port_free(port, host='localhost', max_wait=20):
+    "Wait for `port` to be free on `host`"
+    waitfor(partial(is_port_free, port, host), max_wait, f"Port {host}:{port} not free after {max_wait}s")
+
+async def wait_port_free_async(port, host='localhost', max_wait=20):
+    "Async wait for `port` to be free on `host`"
+    await waitfor_async(partial(is_port_free, port, host), max_wait, f"Port {host}:{port} not free after {max_wait}s")