fixes #150

Author: jph00

fastcore/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.4"
+__version__ = "1.2.5"

fastcore/_nbdev.py

@@ -58,7 +58,7 @@
          "replicate": "01_basics.ipynb",
          "setify": "01_basics.ipynb",
          "merge": "01_basics.ipynb",
-         "range_of": "02_foundation.ipynb",
+         "range_of": "01_basics.ipynb",
          "groupby": "01_basics.ipynb",
          "last_index": "01_basics.ipynb",
          "filter_dict": "01_basics.ipynb",
@@ -67,10 +67,24 @@
          "cycle": "02_foundation.ipynb",
          "zip_cycle": "02_foundation.ipynb",
          "sorted_ex": "01_basics.ipynb",
+         "negate_func": "01_basics.ipynb",
+         "argwhere": "01_basics.ipynb",
+         "filter_ex": "01_basics.ipynb",
+         "renumerate": "01_basics.ipynb",
+         "first": "01_basics.ipynb",
+         "nested_attr": "01_basics.ipynb",
+         "nested_idx": "01_basics.ipynb",
          "num_methods": "01_basics.ipynb",
          "rnum_methods": "01_basics.ipynb",
          "inum_methods": "01_basics.ipynb",
          "fastuple": "01_basics.ipynb",
+         "arg0": "01_basics.ipynb",
+         "arg1": "01_basics.ipynb",
+         "arg2": "01_basics.ipynb",
+         "arg3": "01_basics.ipynb",
+         "arg4": "01_basics.ipynb",
+         "bind": "01_basics.ipynb",
+         "map_ex": "01_basics.ipynb",
          "compose": "01_basics.ipynb",
          "maps": "01_basics.ipynb",
          "partialler": "01_basics.ipynb",
@@ -90,26 +104,12 @@
          "add_docs": "02_foundation.ipynb",
          "docs": "02_foundation.ipynb",
          "custom_dir": "02_foundation.ipynb",
-         "arg0": "02_foundation.ipynb",
-         "arg1": "02_foundation.ipynb",
-         "arg2": "02_foundation.ipynb",
-         "arg3": "02_foundation.ipynb",
-         "arg4": "02_foundation.ipynb",
          "coll_repr": "02_foundation.ipynb",
          "is_bool": "02_foundation.ipynb",
          "mask2idxs": "02_foundation.ipynb",
          "is_indexer": "02_foundation.ipynb",
-         "negate_func": "02_foundation.ipynb",
          "GetAttr": "02_foundation.ipynb",
          "delegate_attr": "02_foundation.ipynb",
-         "bind": "02_foundation.ipynb",
-         "argwhere": "02_foundation.ipynb",
-         "map_ex": "02_foundation.ipynb",
-         "filter_ex": "02_foundation.ipynb",
-         "listable_types": "02_foundation.ipynb",
-         "renumerate": "02_foundation.ipynb",
-         "first": "02_foundation.ipynb",
-         "nested_attr": "02_foundation.ipynb",
          "CollBase": "02_foundation.ipynb",
          "L": "02_foundation.ipynb",
          "L.__signature__": "02_foundation.ipynb",

fastcore/basics.py

@@ -6,9 +6,10 @@
            'AttrDict', 'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr',
            'hasattrs', 'setattrs', 'try_attrs', 'ShowPrint', 'Int', 'Str', 'Float', 'detuplify', 'replicate', 'setify',
            'merge', 'range_of', 'groupby', 'last_index', 'filter_dict', 'filter_keys', 'filter_values', 'cycle',
-           'zip_cycle', 'sorted_ex', 'num_methods', 'rnum_methods', 'inum_methods', 'fastuple', 'compose', 'maps',
-           'partialler', 'instantiate', 'using_attr', 'Self', 'Self', 'PrettyString', 'even_mults', 'num_cpus',
-           'add_props', 'typed']
+           'zip_cycle', 'sorted_ex', 'negate_func', 'argwhere', 'filter_ex', 'range_of', 'renumerate', 'first',
+           'nested_attr', 'nested_idx', 'num_methods', 'rnum_methods', 'inum_methods', 'fastuple', 'arg0', 'arg1',
+           'arg2', 'arg3', 'arg4', 'bind', 'map_ex', 'compose', 'maps', 'partialler', 'instantiate', 'using_attr',
+           'Self', 'Self', 'PrettyString', 'even_mults', 'num_cpus', 'add_props', 'typed']
 
 # Cell
 from .imports import *
@@ -364,6 +365,61 @@ def sorted_ex(iterable, key=None, reverse=False):
     else: k=key
     return sorted(iterable, key=k, reverse=reverse)
 
+# Cell
+def negate_func(f):
+    "Create new function that negates result of `f`"
+    def _f(*args, **kwargs): return not f(*args, **kwargs)
+    return _f
+
+# Cell
+def argwhere(iterable, f, negate=False, **kwargs):
+    "Like `filter_ex`, but return indices for matching items"
+    if kwargs: f = partial(f,**kwargs)
+    if negate: f = negate_func(f)
+    return [i for i,o in enumerate(iterable) if f(o)]
+
+# Cell
+def filter_ex(iterable, f=noop, negate=False, gen=False, **kwargs):
+    "Like `filter`, but passing `kwargs` to `f`, defaulting `f` to `noop`, and adding `negate` and `gen`"
+    if kwargs: f = partial(f,**kwargs)
+    if negate: f = negate_func(f)
+    res = filter(f, iterable)
+    if gen: return res
+    return list(res)
+
+# Cell
+def range_of(a, b=None, step=None):
+    "All indices of collection `a`, if `a` is a collection, otherwise `range`"
+    if is_coll(a): a = len(a)
+    return list(range(a,b,step) if step is not None else range(a,b) if b is not None else range(a))
+
+# Cell
+def renumerate(iterable, start=0):
+    "Same as `enumerate`, but returns index as 2nd element instead of 1st"
+    return ((o,i) for i,o in enumerate(iterable, start=start))
+
+# Cell
+def first(x):
+    "First element of `x`, or None if missing"
+    try: return next(iter(x))
+    except StopIteration: return None
+
+# Cell
+def nested_attr(o, attr, default=None):
+    "Same as `getattr`, but if `attr` includes a `.`, then looks inside nested objects"
+    try:
+        for a in attr.split("."): o = getattr(o, a)
+    except AttributeError: return default
+    return o
+
+# Cell
+def nested_idx(coll, *idxs):
+    "Index into nested collections, dicts, etc, with `idxs`"
+    if not coll or not idxs: return coll
+    if isinstance(coll,str) or not isinstance(coll, typing.Collection): return None
+    res = coll.get(idxs[0], None) if hasattr(coll, 'get') else coll[idxs[0]] if idxs[0]<len(coll) else None
+    return nested_idx(res, *idxs[1:])
+
 # Cell
 num_methods = """
     __add__ __sub__ __mul__ __matmul__ __truediv__ __floordiv__ __mod__ __divmod__ __pow__
@@ -415,6 +471,40 @@ def _f(self,*args): return self._op(op,*args)
 setattr(fastuple,'max',_get_op(max))
 setattr(fastuple,'min',_get_op(min))
 
+# Cell
+class _Arg:
+    def __init__(self,i): self.i = i
+arg0 = _Arg(0)
+arg1 = _Arg(1)
+arg2 = _Arg(2)
+arg3 = _Arg(3)
+arg4 = _Arg(4)
+
+# Cell
+class bind:
+    "Same as `partial`, except you can use `arg0` `arg1` etc param placeholders"
+    def __init__(self, fn, *pargs, **pkwargs):
+        self.fn,self.pargs,self.pkwargs = fn,pargs,pkwargs
+        self.maxi = max((x.i for x in pargs if isinstance(x, _Arg)), default=-1)
+
+    def __call__(self, *args, **kwargs):
+        args = list(args)
+        kwargs = {**self.pkwargs,**kwargs}
+        for k,v in kwargs.items():
+            if isinstance(v,_Arg): kwargs[k] = args.pop(v.i)
+        fargs = [args[x.i] if isinstance(x, _Arg) else x for x in self.pargs] + args[self.maxi+1:]
+        return self.fn(*fargs, **kwargs)
+
+# Cell
+def map_ex(iterable, f, *args, gen=False, **kwargs):
+    "Like `map`, but use `bind`, and supports `str` and indexing"
+    g = (bind(f,*args,**kwargs) if callable(f)
+         else f.format if isinstance(f,str)
+         else f.__getitem__)
+    res = map(g, iterable)
+    if gen: return res
+    return list(res)
+
 # Cell
 def compose(*funcs, order=None):
     "Create a function that composes all functions in `funcs`, passing along remaining `*args` and `**kwargs` to all"

fastcore/foundation.py

@@ -1,9 +1,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/02_foundation.ipynb (unless otherwise specified).
 
-__all__ = ['copy_func', 'patch_to', 'patch', 'patch_property', 'add_docs', 'docs', 'custom_dir', 'arg0', 'arg1', 'arg2',
-           'arg3', 'arg4', 'coll_repr', 'is_bool', 'mask2idxs', 'cycle', 'zip_cycle', 'is_indexer', 'negate_func',
-           'GetAttr', 'delegate_attr', 'bind', 'argwhere', 'map_ex', 'filter_ex', 'range_of', 'listable_types',
-           'renumerate', 'first', 'nested_attr', 'CollBase', 'L', 'save_config_file', 'read_config_file', 'Config']
+__all__ = ['copy_func', 'patch_to', 'patch', 'patch_property', 'add_docs', 'docs', 'custom_dir', 'coll_repr', 'is_bool',
+           'mask2idxs', 'cycle', 'zip_cycle', 'is_indexer', 'GetAttr', 'delegate_attr', 'CollBase', 'L',
+           'save_config_file', 'read_config_file', 'Config']
 
 # Cell
 from .imports import *
@@ -79,15 +78,6 @@ def custom_dir(c, add:list):
     "Implement custom `__dir__`, adding `add` to `cls`"
     return dir(type(c)) + list(c.__dict__.keys()) + add
 
-# Cell
-class _Arg:
-    def __init__(self,i): self.i = i
-arg0 = _Arg(0)
-arg1 = _Arg(1)
-arg2 = _Arg(2)
-arg3 = _Arg(3)
-arg4 = _Arg(4)
-
 # Cell
 def coll_repr(c, max_n=10):
     "String repr of up to `max_n` items of (possibly lazy) collection `c`"
@@ -126,12 +116,6 @@ def is_indexer(idx):
     "Test whether `idx` will index a single item in a list"
     return isinstance(idx,int) or not getattr(idx,'ndim',1)
 
-# Cell
-def negate_func(f):
-    "Create new function that negates result of `f`"
-    def _f(*args, **kwargs): return not f(*args, **kwargs)
-    return _f
-
 # Cell
 class GetAttr:
     "Inherit from this to have all attr accesses in `self._xtra` passed down to `self.default`"
@@ -157,75 +141,6 @@ def delegate_attr(self, k, to):
     try: return getattr(getattr(self,to), k)
     except AttributeError: raise AttributeError(k) from None
 
-# Cell
-class bind:
-    "Same as `partial`, except you can use `arg0` `arg1` etc param placeholders"
-    def __init__(self, fn, *pargs, **pkwargs):
-        self.fn,self.pargs,self.pkwargs = fn,pargs,pkwargs
-        self.maxi = max((x.i for x in pargs if isinstance(x, _Arg)), default=-1)
-
-    def __call__(self, *args, **kwargs):
-        args = list(args)
-        kwargs = {**self.pkwargs,**kwargs}
-        for k,v in kwargs.items():
-            if isinstance(v,_Arg): kwargs[k] = args.pop(v.i)
-        fargs = [args[x.i] if isinstance(x, _Arg) else x for x in self.pargs] + args[self.maxi+1:]
-        return self.fn(*fargs, **kwargs)
-
-# Cell
-def argwhere(iterable, f, negate=False, **kwargs):
-    "Like `filter_ex`, but return indices for matching items"
-    if kwargs: f = partial(f,**kwargs)
-    if negate: f = negate_func(f)
-    return [i for i,o in enumerate(iterable) if f(o)]
-
-# Cell
-def map_ex(iterable, f, *args, gen=False, **kwargs):
-    "Like `map`, but use `bind`, and supports `str` and indexing"
-    g = (bind(f,*args,**kwargs) if callable(f)
-         else f.format if isinstance(f,str)
-         else f.__getitem__)
-    res = map(g, iterable)
-    if gen: return res
-    return list(res)
-
-# Cell
-def filter_ex(iterable, f=noop, negate=False, gen=False, **kwargs):
-    "Like `filter`, but passing `kwargs` to `f`, defaulting `f` to `noop`, and adding `negate` and `gen`"
-    if kwargs: f = partial(f,**kwargs)
-    if negate: f = negate_func(f)
-    res = filter(f, iterable)
-    if gen: return res
-    return list(res)
-
-# Cell
-def range_of(a, b=None, step=None):
-    "All indices of collection `a`, if `a` is a collection, otherwise `range`"
-    if is_coll(a): a = len(a)
-    return list(range(a,b,step) if step is not None else range(a,b) if b is not None else range(a))
-
-# Cell
-listable_types = typing.Collection,Generator,map,filter,zip
-
-# Cell
-def renumerate(iterable, start=0):
-    "Same as `enumerate`, but returns index as 2nd element instead of 1st"
-    return ((o,i) for i,o in enumerate(iterable, start=start))
-
-# Cell
-def first(x):
-    "First element of `x`, or None if missing"
-    try: return next(iter(x))
-    except StopIteration: return None
-
-# Cell
-def nested_attr(o, attr, default=None):
-    "Same as `getattr`, but if `attr` includes a `.`, then looks inside nested objects"
-    try:
-        for a in attr.split("."): o = getattr(o, a)
-    except AttributeError: return default
-    return o
-
 # Cell
 class CollBase:
     "Base class for composing a list of `items`"