fixes #271

Author: jph00

examples/test_fastcore.py

@@ -4,7 +4,7 @@
 
 @call_parse
 def main(msg:Param("The message", str),
-         upper:Param("Convert to uppercase?", store_true)):
+         upper:Param("Convert to uppercase?", store_true)=False):
     "Print `msg`, optionally converting to uppercase"
     print(msg.upper() if upper else msg)
 

fastcore/_nbdev.py

@@ -149,6 +149,7 @@
          "bunzip": "03_xtras.ipynb",
          "join_path_file": "03_xtras.ipynb",
          "loads": "03_xtras.ipynb",
+         "loads_multi": "03_xtras.ipynb",
          "untar_dir": "03_xtras.ipynb",
          "repo_details": "03_xtras.ipynb",
          "run": "03_xtras.ipynb",
@@ -175,7 +176,6 @@
          "modified_env": "03_xtras.ipynb",
          "ContextManagers": "03_xtras.ipynb",
          "str2bool": "03_xtras.ipynb",
-         "sort_by_run": "03_xtras.ipynb",
          "threaded": "03a_parallel.ipynb",
          "startthread": "03a_parallel.ipynb",
          "set_num_threads": "03a_parallel.ipynb",

fastcore/xtras.py

@@ -1,10 +1,10 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/03_xtras.ipynb (unless otherwise specified).
 
 __all__ = ['dict2obj', 'obj2dict', 'repr_dict', 'is_listy', 'shufflish', 'mapped', 'IterLen', 'ReindexCollection',
-           'maybe_open', 'image_size', 'bunzip', 'join_path_file', 'loads', 'untar_dir', 'repo_details', 'run',
-           'open_file', 'save_pickle', 'load_pickle', 'truncstr', 'spark_chars', 'sparkline', 'autostart', 'EventTimer',
-           'stringfmt_names', 'PartialFormatter', 'partial_format', 'utc2local', 'local2utc', 'trace', 'round_multiple',
-           'modified_env', 'ContextManagers', 'str2bool', 'sort_by_run']
+           'maybe_open', 'image_size', 'bunzip', 'join_path_file', 'loads', 'loads_multi', 'untar_dir', 'repo_details',
+           'run', 'open_file', 'save_pickle', 'load_pickle', 'truncstr', 'spark_chars', 'sparkline', 'autostart',
+           'EventTimer', 'stringfmt_names', 'PartialFormatter', 'partial_format', 'utc2local', 'local2utc', 'trace',
+           'round_multiple', 'modified_env', 'ContextManagers', 'str2bool']
 
 # Cell
 from .imports import *
@@ -136,6 +136,17 @@ def loads(s, cls=None, object_hook=None, parse_float=None,
     return json.loads(s, cls=cls, object_hook=object_hook, parse_float=parse_float,
           parse_int=parse_int, parse_constant=parse_constant, object_pairs_hook=object_pairs_hook, **kw)
 
+# Cell
+def loads_multi(s:str):
+    "Generator of >=0 decoded json dicts, possibly with non-json ignored text at start and end"
+    _dec = json.JSONDecoder()
+    while s.find('{')>=0:
+        s = s[s.find('{'):]
+        obj,pos = _dec.raw_decode(s)
+        if not pos: raise ValueError(f'no JSON object found at {pos}')
+        yield obj
+        s = s[pos:]
+
 # Cell
 def untar_dir(file, dest):
     with tempfile.TemporaryDirectory(dir='.') as d:
@@ -357,29 +368,4 @@ def __exit__(self, *args, **kwargs): self.stack.__exit__(*args, **kwargs)
 def str2bool(s):
     "Case-insensitive convert string `s` too a bool (`y`,`yes`,`t`,`true`,`on`,`1`->`True`)"
     if not isinstance(s,str): return bool(s)
-    return bool(distutils.util.strtobool(s)) if s else False
-
-# Cell
-def _is_instance(f, gs):
-    tst = [g if type(g) in [type, 'function'] else g.__class__ for g in gs]
-    for g in tst:
-        if isinstance(f, g) or f==g: return True
-    return False
-
-def _is_first(f, gs):
-    for o in L(getattr(f, 'run_after', None)):
-        if _is_instance(o, gs): return False
-    for g in gs:
-        if _is_instance(f, L(getattr(g, 'run_before', None))): return False
-    return True
-
-def sort_by_run(fs):
-    end = L(fs).attrgot('toward_end')
-    inp,res = L(fs)[~end] + L(fs)[end], L()
-    while len(inp):
-        for i,o in enumerate(inp):
-            if _is_first(o, inp):
-                res.append(inp.pop(i))
-                break
-        else: raise Exception("Impossible to sort")
-    return res
+    return bool(distutils.util.strtobool(s)) if s else False

nbs/03_xtras.ipynb

@@ -618,7 +618,7 @@
     {
      "data": {
       "text/plain": [
-       "['a', 'f', 'b', 'g', 'd', 'e', 'h', 'c']"
+       "['b', 'a', 'd', 'e', 'f', 'h', 'g', 'c']"
       ]
      },
      "execution_count": null,
@@ -963,6 +963,42 @@
     "          parse_int=parse_int, parse_constant=parse_constant, object_pairs_hook=object_pairs_hook, **kw)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def loads_multi(s:str):\n",
+    "    \"Generator of >=0 decoded json dicts, possibly with non-json ignored text at start and end\"\n",
+    "    _dec = json.JSONDecoder()\n",
+    "    while s.find('{')>=0:\n",
+    "        s = s[s.find('{'):]\n",
+    "        obj,pos = _dec.raw_decode(s)\n",
+    "        if not pos: raise ValueError(f'no JSON object found at {pos}')\n",
+    "        yield obj\n",
+    "        s = s[pos:]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "tst = \"\"\"\n",
+    "# ignored\n",
+    "{ \"a\":1 }\n",
+    "hello\n",
+    "{\n",
+    "\"b\":2\n",
+    "}\n",
+    "\"\"\"\n",
+    "\n",
+    "test_eq(list(loads_multi(tst)), [{'a': 1}, {'b': 2}])"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1840,76 +1876,6 @@
     "for o in 1,True: assert str2bool(o)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#export\n",
-    "def _is_instance(f, gs):\n",
-    "    tst = [g if type(g) in [type, 'function'] else g.__class__ for g in gs]\n",
-    "    for g in tst:\n",
-    "        if isinstance(f, g) or f==g: return True\n",
-    "    return False\n",
-    "\n",
-    "def _is_first(f, gs):\n",
-    "    for o in L(getattr(f, 'run_after', None)):\n",
-    "        if _is_instance(o, gs): return False\n",
-    "    for g in gs:\n",
-    "        if _is_instance(f, L(getattr(g, 'run_before', None))): return False\n",
-    "    return True\n",
-    "\n",
-    "def sort_by_run(fs):\n",
-    "    end = L(fs).attrgot('toward_end')\n",
-    "    inp,res = L(fs)[~end] + L(fs)[end], L()\n",
-    "    while len(inp):\n",
-    "        for i,o in enumerate(inp):\n",
-    "            if _is_first(o, inp):\n",
-    "                res.append(inp.pop(i))\n",
-    "                break\n",
-    "        else: raise Exception(\"Impossible to sort\")\n",
-    "    return res"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Transforms and callbacks will have run_after/run_before attributes, this function will sort them to respect those requirements (if it's possible). Also, sometimes we want a tranform/callback to be run at the end, but still be able to use run_after/run_before behaviors. For those, the function checks for a toward_end attribute (that needs to be True)."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "class Tst(): pass    \n",
-    "class Tst1(): run_before=[Tst]\n",
-    "class Tst2():\n",
-    "    run_before=Tst\n",
-    "    run_after=Tst1\n",
-    "    \n",
-    "tsts = [Tst(), Tst1(), Tst2()]\n",
-    "test_eq(sort_by_run(tsts), [tsts[1], tsts[2], tsts[0]])\n",
-    "\n",
-    "Tst2.run_before,Tst2.run_after = Tst1,Tst\n",
-    "test_fail(lambda: sort_by_run([Tst(), Tst1(), Tst2()]))\n",
-    "\n",
-    "def tst1(x): return x\n",
-    "tst1.run_before = Tst\n",
-    "test_eq(sort_by_run([tsts[0], tst1]), [tst1, tsts[0]])\n",
-    "    \n",
-    "class Tst1():\n",
-    "    toward_end=True\n",
-    "class Tst2():\n",
-    "    toward_end=True\n",
-    "    run_before=Tst1\n",
-    "tsts = [Tst(), Tst1(), Tst2()]\n",
-    "test_eq(sort_by_run(tsts), [tsts[0], tsts[2], tsts[1]])"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},