fixes #209

Author: jph00

fastcore/_nbdev.py

@@ -25,6 +25,7 @@
          "basic_repr": "01_basics.ipynb",
          "is_array": "01_basics.ipynb",
          "listify": "01_basics.ipynb",
+         "tuplify": "01_basics.ipynb",
          "true": "01_basics.ipynb",
          "NullType": "01_basics.ipynb",
          "null": "01_basics.ipynb",
@@ -83,6 +84,8 @@
          "first": "01_basics.ipynb",
          "nested_attr": "01_basics.ipynb",
          "nested_idx": "01_basics.ipynb",
+         "val2idx": "01_basics.ipynb",
+         "uniqueify": "01_basics.ipynb",
          "num_methods": "01_basics.ipynb",
          "rnum_methods": "01_basics.ipynb",
          "inum_methods": "01_basics.ipynb",
@@ -129,8 +132,6 @@
          "dict2obj": "03_xtras.ipynb",
          "repr_dict": "03_xtras.ipynb",
          "AttrDict.__repr__": "03_xtras.ipynb",
-         "tuplify": "03_xtras.ipynb",
-         "uniqueify": "03_xtras.ipynb",
          "is_listy": "03_xtras.ipynb",
          "shufflish": "03_xtras.ipynb",
          "mapped": "03_xtras.ipynb",

fastcore/basics.py

@@ -1,17 +1,17 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/01_basics.ipynb (unless otherwise specified).
 
-__all__ = ['defaults', 'ifnone', 'maybe_attr', 'basic_repr', 'is_array', 'listify', 'true', 'NullType', 'null',
-           'tonull', 'get_class', 'mk_class', 'wrap_class', 'ignore_exceptions', 'exec_local', 'risinstance', 'Inf',
-           'in_', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'in_', 'true',
-           'stop', 'gen', 'chunked', 'otherwise', 'custom_dir', 'AttrDict', 'type_hints', 'annotations', 'anno_ret',
-           'argnames', 'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr',
-           'getattrs', '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', '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', 'Stateful', 'PrettyString', 'even_mults', 'num_cpus',
-           'add_props', 'typed']
+__all__ = ['defaults', 'ifnone', 'maybe_attr', 'basic_repr', 'is_array', 'listify', 'tuplify', 'true', 'NullType',
+           'null', 'tonull', 'get_class', 'mk_class', 'wrap_class', 'ignore_exceptions', 'exec_local', 'risinstance',
+           'Inf', 'in_', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'in_',
+           'true', 'stop', 'gen', 'chunked', 'otherwise', 'custom_dir', 'AttrDict', 'type_hints', 'annotations',
+           'anno_ret', 'argnames', 'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel',
+           'class2attr', 'getattrs', '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', 'negate_func', 'argwhere', 'filter_ex',
+           'range_of', 'renumerate', 'first', 'nested_attr', 'nested_idx', 'val2idx', 'uniqueify', 'num_methods',
+           'rnum_methods', 'inum_methods', 'fastuple', 'arg0', 'arg1', 'arg2', 'arg3', 'arg4', 'bind', 'map_ex',
+           'compose', 'maps', 'partialler', 'instantiate', 'using_attr', 'Self', 'Self', 'Stateful', 'PrettyString',
+           'even_mults', 'num_cpus', 'add_props', 'typed']
 
 # Cell
 from .imports import *
@@ -44,13 +44,25 @@ def is_array(x):
     return hasattr(x,'__array__') or hasattr(x,'iloc')
 
 # Cell
-def listify(o):
+def listify(o=None, *rest, use_list=False, match=None):
     "Convert `o` to a `list`"
-    if o is None: return []
-    if isinstance(o, list): return o
-    if isinstance(o, str) or is_array(o): return [o]
-    if is_iter(o): return list(o)
-    return [o]
+    if rest: o = (o,)+rest
+    if use_list: res = list(o)
+    elif o is None: res = []
+    elif isinstance(o, list): res = o
+    elif isinstance(o, str) or is_array(o): res = [o]
+    elif is_iter(o): res = list(o)
+    else: res = [o]
+    if match is not None:
+        if is_coll(match): match = len(match)
+        if len(res)==1: res = res*match
+        else: assert len(res)==match, 'Match length mismatch'
+    return res
+
+# Cell
+def tuplify(o, use_list=False, match=None):
+    "Make `o` a tuple"
+    return tuple(listify(o, use_list=use_list, match=match))
 
 # Cell
 def true(x):
@@ -262,23 +274,25 @@ def _inner(*args, **kwargs):
 
 # Cell
 def _store_attr(self, anno, **attrs):
-    stored = self.__stored_args__
+    stored = getattr(self, '__stored_args__', None)
     for n,v in attrs.items():
         if n in anno: v = anno[n](v)
         setattr(self, n, v)
-        stored[n] = v
+        if stored is not None: stored[n] = v
 
 # Cell
-def store_attr(names=None, self=None, but='', cast=False, **attrs):
+def store_attr(names=None, self=None, but='', cast=False, store_args=None, **attrs):
     "Store params named in comma-separated `names` from calling context into attrs in `self`"
     fr = sys._getframe(1)
     args = argnames(fr, True)
     if self: args = ('self', *args)
     else: self = fr.f_locals[args[0]]
-    if not hasattr(self, '__stored_args__'): self.__stored_args__ = {}
+    if store_args is None: store_args = not hasattr(self,'__slots__')
+    if store_args and not hasattr(self, '__stored_args__'): self.__stored_args__ = {}
     anno = annotations(self) if cast else {}
     if not attrs:
-        ns = re.split(', *', names) if names else args[1:]
+        if names and isinstance(names,str): names = re.split(', *', names)
+        ns = names if names else args[1:]
         attrs = {n:fr.f_locals[n] for n in ns}
     if isinstance(but,str): but = re.split(', *', but)
     attrs = {k:v for k,v in attrs.items() if k not in but}
@@ -492,6 +506,19 @@ def nested_idx(coll, *idxs):
     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
+def val2idx(x):
+    "Dict from value to index"
+    return {v:k for k,v in enumerate(x)}
+
+# Cell
+def uniqueify(x, sort=False, bidir=False, start=None):
+    "Unique elements in `x`, optionally `sort`-ed, optionally return reverse correspondence, optionally prepend with elements."
+    res = list(dict.fromkeys(x))
+    if start is not None: res = listify(start)+res
+    if sort: res.sort()
+    return (res,val2idx(res)) if bidir else res
+
 # Cell
 num_methods = """
     __add__ __sub__ __mul__ __matmul__ __truediv__ __floordiv__ __mod__ __divmod__ __pow__

fastcore/foundation.py

@@ -167,14 +167,8 @@ class L(GetAttr, CollBase, metaclass=_L_Meta):
     "Behaves like a list of `items` but can also index with list of indices or masks"
     _default='items'
     def __init__(self, items=None, *rest, use_list=False, match=None):
-        if rest: items = (items,)+rest
-        if items is None: items = []
         if (use_list is not None) or not is_array(items):
-            items = list(items) if use_list else listify(items)
-        if match is not None:
-            if is_coll(match): match = len(match)
-            if len(items)==1: items = items*match
-            else: assert len(items)==match, 'Match length mismatch'
+            items = listify(items, *rest, use_list=use_list, match=match)
         super().__init__(items)
 
     @property
@@ -228,28 +222,27 @@ def argwhere(self, f, negate=False, **kwargs): return self._new(argwhere(self, f
     def filter(self, f=noop, negate=False, gen=False, **kwargs):
         return self._new(filter_ex(self, f=f, negate=negate, gen=gen, **kwargs))
 
-    def unique(self): return L(dict.fromkeys(self).keys())
     def enumerate(self): return L(enumerate(self))
     def renumerate(self): return L(renumerate(self))
-    def val2idx(self): return {v:k for k,v in self.enumerate()}
+    def unique(self, sort=False, bidir=False, start=None): return L(uniqueify(self, sort=sort, bidir=bidir, start=start))
+    def val2idx(self): return val2idx(self)
+    def cycle(self): return cycle(self)
+    def map_dict(self, f=noop, *args, gen=False, **kwargs): return {k:f(k, *args,**kwargs) for k in self}
+    def map_first(self, f=noop, g=noop, *args, **kwargs):
+        return first(self.map(f, *args, gen=False, **kwargs), g)
+
     def itemgot(self, *idxs):
         x = self
         for idx in idxs: x = x.map(itemgetter(idx))
         return x
-
     def attrgot(self, k, default=None):
         return self.map(lambda o: o.get(k,default) if isinstance(o, dict) else nested_attr(o,k,default))
-    def cycle(self): return cycle(self)
-    def map_dict(self, f=noop, *args, gen=False, **kwargs): return {k:f(k, *args,**kwargs) for k in self}
-    def map_first(self, f=noop, g=noop, *args, **kwargs):
-        return first(self.map(f, *args, gen=False, **kwargs), g)
 
     def starmap(self, f, *args, **kwargs): return self._new(itertools.starmap(partial(f,*args,**kwargs), self))
     def zip(self, cycled=False): return self._new((zip_cycle if cycled else zip)(*self))
     def zipwith(self, *rest, cycled=False): return self._new([self, *rest]).zip(cycled=cycled)
     def map_zip(self, f, *args, cycled=False, **kwargs): return self.zip(cycled=cycled).starmap(f, *args, **kwargs)
-    def map_zipwith(self, f, *rest, cycled=False, **kwargs):
-        return self.zipwith(*rest, cycled=cycled).starmap(f, **kwargs)
+    def map_zipwith(self, f, *rest, cycled=False, **kwargs): return self.zipwith(*rest, cycled=cycled).starmap(f, **kwargs)
     def shuffle(self):
         it = copy(self.items)
         random.shuffle(it)

fastcore/xtras.py

@@ -1,11 +1,11 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/03_xtras.ipynb (unless otherwise specified).
 
-__all__ = ['dict2obj', 'repr_dict', 'tuplify', 'uniqueify', 'is_listy', 'shufflish', 'mapped', 'IterLen',
-           'ReindexCollection', 'open_file', 'save_pickle', 'load_pickle', 'maybe_open', 'image_size', 'bunzip',
-           'join_path_file', 'urlwrap', 'urlopen', 'urlread', 'urljson', 'urlcheck', 'urlclean', 'urlsave', 'urlvalid',
-           'untar_dir', 'repo_details', 'run', 'do_request', 'sort_by_run', 'trace', 'round_multiple', 'modified_env',
-           'ContextManagers', 'str2bool', 'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel',
-           'run_procs', 'parallel_gen', 'threaded']
+__all__ = ['dict2obj', 'repr_dict', 'is_listy', 'shufflish', 'mapped', 'IterLen', 'ReindexCollection', 'open_file',
+           'save_pickle', 'load_pickle', 'maybe_open', 'image_size', 'bunzip', 'join_path_file', 'urlwrap', 'urlopen',
+           'urlread', 'urljson', 'urlcheck', 'urlclean', 'urlsave', 'urlvalid', 'untar_dir', 'repo_details', 'run',
+           'do_request', 'sort_by_run', 'trace', 'round_multiple', 'modified_env', 'ContextManagers', 'str2bool',
+           'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel', 'run_procs', 'parallel_gen',
+           'threaded']
 
 # Cell
 from .imports import *
@@ -49,20 +49,6 @@ def __repr__(self:AttrDict): return repr_dict(self)
 
 AttrDict._repr_markdown_ = AttrDict.__repr__
 
-# Cell
-def tuplify(o, use_list=False, match=None):
-    "Make `o` a tuple"
-    return tuple(L(o, use_list=use_list, match=match))
-
-# Cell
-def uniqueify(x, sort=False, bidir=False, start=None):
-    "Unique elements in `x`, optionally `sort`-ed, optionally return reverse correspondence, optionally prepend with elements."
-    res = L(x).unique()
-    if start is not None: res = start+res
-    if sort: res.sort()
-    if bidir: return res, res.val2idx()
-    return res
-
 # Cell
 def is_listy(x):
     "`isinstance(x, (tuple,list,L,slice,Generator))`"