fixes #114

Author: jph00

fastcore/_nbdev.py

@@ -53,9 +53,16 @@
          "wrap_class": "02_utils.ipynb",
          "ignore_exceptions": "02_utils.ipynb",
          "exec_local": "02_utils.ipynb",
+         "Inf": "02_utils.ipynb",
+         "in_": "02_utils.ipynb",
+         "operator.in_": "02_utils.ipynb",
+         "true": "02_utils.ipynb",
          "stop": "02_utils.ipynb",
+         "gen": "02_utils.ipynb",
+         "chunked": "02_utils.ipynb",
          "AttrDict": "02_utils.ipynb",
          "dict2obj": "02_utils.ipynb",
+         "with_cast": "02_utils.ipynb",
          "store_attr": "02_utils.ipynb",
          "attrdict": "02_utils.ipynb",
          "properties": "02_utils.ipynb",
@@ -85,12 +92,6 @@
          "rnum_methods": "02_utils.ipynb",
          "inum_methods": "02_utils.ipynb",
          "fastuple": "02_utils.ipynb",
-         "Inf": "02_utils.ipynb",
-         "in_": "02_utils.ipynb",
-         "operator.in_": "02_utils.ipynb",
-         "true": "02_utils.ipynb",
-         "gen": "02_utils.ipynb",
-         "chunked": "02_utils.ipynb",
          "trace": "02_utils.ipynb",
          "compose": "02_utils.ipynb",
          "maps": "02_utils.ipynb",

fastcore/utils.py

@@ -1,15 +1,16 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/02_utils.ipynb (unless otherwise specified).
 
 __all__ = ['ifnone', 'maybe_attr', 'basic_repr', 'get_class', 'mk_class', 'wrap_class', 'ignore_exceptions',
-           'exec_local', 'stop', 'AttrDict', 'dict2obj', 'store_attr', 'attrdict', 'properties', 'camel2snake',
-           'snake2camel', 'class2attr', 'hasattrs', 'setattrs', 'ShowPrint', 'Int', 'Str', 'Float', 'tuplify',
-           'detuplify', 'replicate', 'uniqueify', 'setify', 'merge', 'is_listy', 'range_of', 'groupby', 'last_index',
-           'shufflish', 'IterLen', 'ReindexCollection', 'num_methods', 'rnum_methods', 'inum_methods', 'fastuple',
-           'Inf', 'in_', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'in_',
-           'true', 'gen', 'chunked', 'trace', 'compose', 'maps', 'partialler', 'mapped', 'instantiate', 'using_attr',
-           'Self', 'Self', 'remove_patches_path', 'bunzip', 'join_path_file', 'urlread', 'urljson', 'run', 'do_request',
-           'sort_by_run', 'PrettyString', 'round_multiple', 'even_mults', 'num_cpus', 'add_props', 'ContextManagers',
-           'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel', 'run_procs', 'parallel_gen']
+           'exec_local', 'Inf', 'in_', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_',
+           'is_not', 'in_', 'true', 'stop', 'gen', 'chunked', 'AttrDict', 'dict2obj', 'with_cast', 'store_attr',
+           'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr', 'hasattrs', 'setattrs', 'ShowPrint',
+           'Int', 'Str', 'Float', 'tuplify', 'detuplify', 'replicate', 'uniqueify', 'setify', 'merge', 'is_listy',
+           'range_of', 'groupby', 'last_index', 'shufflish', 'IterLen', 'ReindexCollection', 'num_methods',
+           'rnum_methods', 'inum_methods', 'fastuple', 'trace', 'compose', 'maps', 'partialler', 'mapped',
+           'instantiate', 'using_attr', 'Self', 'Self', 'remove_patches_path', 'bunzip', 'join_path_file', 'urlread',
+           'urljson', 'run', 'do_request', 'sort_by_run', 'PrettyString', 'round_multiple', 'even_mults', 'num_cpus',
+           'add_props', 'ContextManagers', 'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel',
+           'run_procs', 'parallel_gen']
 
 # Cell
 from .imports import *
@@ -94,11 +95,73 @@ def exec_local(code, var_name):
     exec(code, globals(), loc)
     return loc[var_name]
 
+# Cell
+#hide
+class _InfMeta(type):
+    @property
+    def count(self): return itertools.count()
+    @property
+    def zeros(self): return itertools.cycle([0])
+    @property
+    def ones(self):  return itertools.cycle([1])
+    @property
+    def nones(self): return itertools.cycle([None])
+
+# Cell
+class Inf(metaclass=_InfMeta):
+    "Infinite lists"
+    pass
+
+# Cell
+def _oper(op,a,b=float('nan')): return (lambda o:op(o,a)) if b!=b else op(a,b)
+
+def _mk_op(nm, mod):
+    "Create an operator using `oper` and add to the caller's module"
+    op = getattr(operator,nm)
+    def _inner(a,b=float('nan')): return _oper(op, a,b)
+    _inner.__name__ = _inner.__qualname__ = nm
+    _inner.__doc__ = f'Same as `operator.{nm}`, or returns partial if 1 arg'
+    mod[nm] = _inner
+
+# Cell
+def in_(x, a):
+    "`True` if `x in a`"
+    return x in a
+
+operator.in_ = in_
+
+# Cell
+#nbdev_comment _all_ = ['lt','gt','le','ge','eq','ne','add','sub','mul','truediv','is_','is_not','in_']
+
+# Cell
+for op in ['lt','gt','le','ge','eq','ne','add','sub','mul','truediv','is_','is_not','in_']: _mk_op(op, globals())
+
+# Cell
+def true(*args, **kwargs):
+    "Predicate: always `True`"
+    return True
+
 # Cell
 def stop(e=StopIteration):
     "Raises exception `e` (by default `StopException`)"
     raise e
 
+# Cell
+def gen(func, seq, cond=true):
+    "Like `(func(o) for o in seq if cond(func(o)))` but handles `StopIteration`"
+    return itertools.takewhile(cond, map(func,seq))
+
+# Cell
+def chunked(it, chunk_sz=None, drop_last=False, n_chunks=None):
+    "Return batches from iterator `it` of size `chunk_sz` (or return `n_chunks` total)"
+    assert bool(chunk_sz) ^ bool(n_chunks)
+    if n_chunks: chunk_sz = math.ceil(len(it)/n_chunks)
+    if not isinstance(it, Iterator): it = iter(it)
+    while True:
+        res = list(itertools.islice(it, chunk_sz))
+        if res and (len(res)==chunk_sz or not drop_last): yield res
+        if len(res)<chunk_sz: return
+
 # Cell
 class AttrDict(dict):
     "`dict` subclass that also provides access to keys as attrs"
@@ -114,22 +177,39 @@ def dict2obj(d):
     return AttrDict(**{k:dict2obj(v) for k,v in d.items()})
 
 # Cell
-def _store_attr(self, **attrs):
+def with_cast(f):
+    "Decorator which uses any parameter annotations as preprocessing functions"
+    anno = f.__annotations__
+    params = f.__code__.co_varnames
+    def _inner(*args, **kwargs):
+        args = list(args)
+        for i,v in enumerate(params):
+            if v in anno:
+                c = anno[v]
+                if v in kwargs: kwargs[v] = c(kwargs[v])
+                elif i<len(args): args[i] = c(args[i])
+        return f(*args, **kwargs)
+    return _inner
+
+# Cell
+def _store_attr(self, anno, **attrs):
     for n,v in attrs.items():
+        if n in anno: v = anno[n](v)
         setattr(self, n, v)
         self.__stored_args__[n] = v
 
 # Cell
-def store_attr(names=None, self=None, but=None, **attrs):
+def store_attr(names=None, self=None, but=None, cast=False, **attrs):
     "Store params named in comma-separated `names` from calling context into attrs in `self`"
     fr = sys._getframe(1)
     args = fr.f_code.co_varnames[:fr.f_code.co_argcount]
     if self: args = ('self', *args)
     else: self = fr.f_locals[args[0]]
     if not hasattr(self, '__stored_args__'): self.__stored_args__ = {}
-    if attrs: return _store_attr(self, **attrs)
+    anno = self.__class__.__init__.__annotations__ if cast else {}
+    if attrs: return _store_attr(self, anno, **attrs)
     ns = re.split(', *', names) if names else args[1:]
-    _store_attr(self, **{n:fr.f_locals[n] for n in ns if n not in L(but)})
+    _store_attr(self, anno, **{n:fr.f_locals[n] for n in ns if n not in L(but)})
 
 # Cell
 def attrdict(o, *ks):
@@ -158,10 +238,9 @@ def snake2camel(s):
 
 # Cell
 def class2attr(self, cls_name):
-    "Return the snake-cased name of the class.  Additionally, remove the substring `cls_name` only if it is a substring at the **end** of the string."
+    "Return the snake-cased name of the class; strip ending `cls_name` if it exists."
     return camel2snake(re.sub(rf'{cls_name}$', '', self.__class__.__name__) or cls_name.lower())
 
-
 # Cell
 def hasattrs(o,attrs):
     "Test whether `o` contains all `attrs`"
@@ -334,68 +413,6 @@ def _f(self,*args): return self._op(op,*args)
 setattr(fastuple,'max',_get_op(max))
 setattr(fastuple,'min',_get_op(min))
 
-# Cell
-#hide
-class _InfMeta(type):
-    @property
-    def count(self): return itertools.count()
-    @property
-    def zeros(self): return itertools.cycle([0])
-    @property
-    def ones(self):  return itertools.cycle([1])
-    @property
-    def nones(self): return itertools.cycle([None])
-
-# Cell
-class Inf(metaclass=_InfMeta):
-    "Infinite lists"
-    pass
-
-# Cell
-def _oper(op,a,b=float('nan')): return (lambda o:op(o,a)) if b!=b else op(a,b)
-
-def _mk_op(nm, mod):
-    "Create an operator using `oper` and add to the caller's module"
-    op = getattr(operator,nm)
-    def _inner(a,b=float('nan')): return _oper(op, a,b)
-    _inner.__name__ = _inner.__qualname__ = nm
-    _inner.__doc__ = f'Same as `operator.{nm}`, or returns partial if 1 arg'
-    mod[nm] = _inner
-
-# Cell
-def in_(x, a):
-    "`True` if `x in a`"
-    return x in a
-
-operator.in_ = in_
-
-# Cell
-#nbdev_comment _all_ = ['lt','gt','le','ge','eq','ne','add','sub','mul','truediv','is_','is_not','in_']
-
-# Cell
-for op in ['lt','gt','le','ge','eq','ne','add','sub','mul','truediv','is_','is_not','in_']: _mk_op(op, globals())
-
-# Cell
-def true(*args, **kwargs):
-    "Predicate: always `True`"
-    return True
-
-# Cell
-def gen(func, seq, cond=true):
-    "Like `(func(o) for o in seq if cond(func(o)))` but handles `StopIteration`"
-    return itertools.takewhile(cond, map(func,seq))
-
-# Cell
-def chunked(it, chunk_sz=None, drop_last=False, n_chunks=None):
-    "Return batches from iterator `it` of size `chunk_sz` (or return `n_chunks` total)"
-    assert bool(chunk_sz) ^ bool(n_chunks)
-    if n_chunks: chunk_sz = math.ceil(len(it)/n_chunks)
-    if not isinstance(it, Iterator): it = iter(it)
-    while True:
-        res = list(itertools.islice(it, chunk_sz))
-        if res and (len(res)==chunk_sz or not drop_last): yield res
-        if len(res)<chunk_sz: return
-
 # Cell
 def trace(f):
     "Add `set_trace` to an existing function `f`"