fastcore 2.2.4__tar.gz → 2.2.6__tar.gz

{fastcore-2.2.4/fastcore.egg-info → fastcore-2.2.6}/PKG-INFO

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

{fastcore-2.2.4 → fastcore-2.2.6}/fastcore/__init__.py

@@ -55,4 +55,4 @@ Modules:
 - `fastcore.xml`: Concise generation of XML.
 - `fastcore.xtras`: Utility functions used in the fastai library"""
 
-__version__ = "2.2.4"
+__version__ = "2.2.6"

{fastcore-2.2.4 → fastcore-2.2.6}/fastcore/_modidx.py

@@ -611,7 +611,6 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.deep_merge': ('nbio.html#deep_merge', 'fastcore/nbio.py'),
                                'fastcore.nbio.dict2nb': ('nbio.html#dict2nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.dir_tag': ('nbio.html#dir_tag', 'fastcore/nbio.py'),
-                               'fastcore.nbio.exec_cell': ('nbio.html#exec_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.find_cells': ('nbio.html#find_cells', 'fastcore/nbio.py'),
                                'fastcore.nbio.find_id': ('nbio.html#find_id', 'fastcore/nbio.py'),
                                'fastcore.nbio.first_code_ln': ('nbio.html#first_code_ln', 'fastcore/nbio.py'),
@@ -638,8 +637,8 @@ d = { 'settings': { 'branch': 'main',
                                '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.run_cell': ('nbio.html#run_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.select_cells': ('nbio.html#select_cells', 'fastcore/nbio.py'),
-                               'fastcore.nbio.show_cell': ('nbio.html#show_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.summary_nb': ('nbio.html#summary_nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.update_cell': ('nbio.html#update_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio.validate_cell': ('nbio.html#validate_cell', 'fastcore/nbio.py'),
@@ -689,6 +688,8 @@ d = { 'settings': { 'branch': 'main',
                                    'fastcore.parallel.bg_task': ('parallel.html#bg_task', 'fastcore/parallel.py'),
                                    'fastcore.parallel.parallel': ('parallel.html#parallel', 'fastcore/parallel.py'),
                                    'fastcore.parallel.parallel_async': ('parallel.html#parallel_async', 'fastcore/parallel.py'),
+                                   'fastcore.parallel.parallel_async_dict': ('parallel.html#parallel_async_dict', 'fastcore/parallel.py'),
+                                   'fastcore.parallel.parallel_async_gen': ('parallel.html#parallel_async_gen', 'fastcore/parallel.py'),
                                    'fastcore.parallel.parallelable': ('parallel.html#parallelable', 'fastcore/parallel.py'),
                                    'fastcore.parallel.startproc': ('parallel.html#startproc', 'fastcore/parallel.py'),
                                    'fastcore.parallel.startthread': ('parallel.html#startthread', 'fastcore/parallel.py'),

{fastcore-2.2.4 → fastcore-2.2.6}/fastcore/nbio.py

@@ -16,7 +16,7 @@ __all__ = ['langs', 'cell_insert_line', 'cell_str_replace', 'cell_strs_replace',
            'preferred_out', 'join_out', 'mk_stream', 'mk_result', 'mk_display', 'mk_error', 'concat_streams',
            'preferred_msg_out', 'render_output', 'render_outputs', 'render_text', 'item2xml', 'cell2xml', 'cells2xml',
            'Notebook', 'CellRow', 'CellRows', 'summary_nb', 'Found', 'FoundCells', 'find_cells', 'deep_merge',
-           'update_cell', 'select_cells', 'exec_cell', 'show_cell', 'msg2out', 'msgs2outs']
+           'update_cell', 'select_cells', 'run_cell', 'msg2out', 'msgs2outs']
 
 # %% ../nbs/13_nbio.ipynb #954ca1aa
 from .basics import *
@@ -866,44 +866,28 @@ def select_cells(
     if skip_noeval: sel = [o for o in sel if not _is_noeval(o)]
     return sel
 
-# %% ../nbs/13_nbio.ipynb #b30755db
-async def exec_cell(
-    shell, # An IPython `InteractiveShell` (or compatible: `transform_cell`, `compile`, `user_ns`, `events`)
-    src:str, # Cell source: magics, `!` commands, and top-level `await` all work
-): # The final bare expression's value (None if there is none, or a trailing `;` suppresses it)
-    "Run cell `src` in `shell` as a library call: the value and any exception go to the caller, and only the code's own output is shown"
-    __tracebackhide__ = True
-    xsrc = shell.transform_cell(src)
-    tree,cfname = ast.parse(xsrc),shell.compile.cache(xsrc)
-    expr = tree.body.pop().value if tree.body and isinstance(tree.body[-1], ast.Expr) else None
-    async def _go(node, mode):
-        __tracebackhide__ = "__ipython_bottom__"  # to the debugger: all frames above are host machinery
-        co = compile(ast.fix_missing_locations(node), cfname, mode, flags=ast.PyCF_ALLOW_TOP_LEVEL_AWAIT)
-        r = eval(co, shell.user_global_ns, shell.user_ns)
-        return await r if co.co_flags & inspect.CO_COROUTINE else r
-    shell.events.trigger('pre_execute')
-    r = None
-    try:
-        if tree.body: await _go(tree, 'exec')
-        if expr is not None: r = await _go(ast.Expression(body=expr), 'eval')
-    finally: shell.events.trigger('post_execute')
-    if src.rstrip().endswith(';') and not src.lstrip().startswith('%%'): return
-    return r
-
-# %% ../nbs/13_nbio.ipynb #6b39aa5b
-async def show_cell(
-    shell, # An IPython `InteractiveShell` (or compatible), as `exec_cell`
-    src:str, # Cell source, as `exec_cell`
-    raise_exc:bool=True, # Raise a failing cell's exception? Else display its traceback as the outcome
+# %% ../nbs/13_nbio.ipynb #4c71f592
+async def run_cell(
+    shell, # An `InteractiveShell`-compatible object: `transform_cell`, `run_cell_async`, `events`
+    raw_cell:str, # Python/IPython source for one cell: magics, `!` commands, and top-level `await` all work
+    store_history:bool=False, # Store the cell in the shell's history? (enables native `;` suppression and execution counts)
+    silent:bool=False, # Suppress displayhook and `post_run_cell` event? (the result value stays unset)
+    shell_futures:bool=True, # Share `__future__` imports with the shell?
+    cell_id=None, # Optional cell id, passed through to `run_cell_async`
 ):
-    "Run cell `src` in `shell` and display its result, notebook-style"
-    from IPython.display import display
-    try: r = await exec_cell(shell, src)
+    "Run one cell on `shell`: transform, await `run_cell_async` on the calling loop, and fire the post events; returns the `ExecutionResult`"
+    preprocessing_exc_tuple = None
+    try: transformed_cell = shell.transform_cell(raw_cell)
     except Exception:
-        if raise_exc: raise
-        traceback.print_exc()
-        return
-    if r is not None: display(r)
+        transformed_cell = raw_cell
+        preprocessing_exc_tuple = sys.exc_info()
+    result = None
+    try: result = await shell.run_cell_async(raw_cell, store_history, silent, shell_futures=shell_futures,
+        transformed_cell=transformed_cell, preprocessing_exc_tuple=preprocessing_exc_tuple, cell_id=cell_id)
+    finally:
+        shell.events.trigger('post_execute')
+        if not silent: shell.events.trigger('post_run_cell', result)
+    return result
 
 # %% ../nbs/13_nbio.ipynb #ec976147
 def _msg_type(msg): return msg.get('msg_type') or msg['header']['msg_type']

{fastcore-2.2.4 → fastcore-2.2.6}/fastcore/parallel.py

@@ -8,7 +8,7 @@ Docs: https://fastcore.fast.ai/parallel.html.md"""
 
 # %% auto #0
 __all__ = ['threaded', 'startthread', 'startproc', 'parallelable', 'ThreadPoolExecutor', 'ProcessPoolExecutor', 'parallel',
-           'parallel_async', 'bg_task']
+           'parallel_async_gen', 'parallel_async_dict', 'parallel_async', 'bg_task']
 
 # %% ../nbs/03a_parallel.ipynb #569d18c6
 from .imports import *
@@ -19,7 +19,7 @@ from .xtras import *
 from functools import wraps
 
 import concurrent.futures,time
-from multiprocessing import Process,Queue,Manager,set_start_method,get_all_start_methods,get_context
+from multiprocessing import Process,Manager,set_start_method,get_context
 from threading import Thread,Lock
 try:
     if sys.platform == 'darwin' and IN_NOTEBOOK: set_start_method("fork")
@@ -127,7 +127,7 @@ class ProcessPoolExecutor(concurrent.futures.ProcessPoolExecutor):
 
 # %% ../nbs/03a_parallel.ipynb #529e1bb1
 def parallel(f, items, *args, n_workers=defaults.cpus, total=None, progress=None, pause=0,
-             method=None, threadpool=False, timeout=None, chunksize=1, return_exceptions=False, **kwargs):
+    method=None, threadpool=False, timeout=None, chunksize=1, return_exceptions=False, **kwargs):
     "Applies `func` in parallel to `items`, using `n_workers`"
     kwpool = {}
     if threadpool: pool = ThreadPoolExecutor
@@ -150,25 +150,40 @@ def _add_one(x, a=1):
     time.sleep(random.random()/80)
     return x+a
 
-# %% ../nbs/03a_parallel.ipynb #87a80e04
-async def parallel_async(f, items, *args, n_workers=16, pause=0,
-        timeout=None, chunksize=1, cancel_on_error=False, return_exceptions=False, **kwargs):
-    "Applies `f` to `items` in parallel using asyncio and a semaphore to limit concurrency."
+# %% ../nbs/03a_parallel.ipynb #9a6e2f26
+async def parallel_async_gen(f, items, *args, n_workers=16, pause=0,
+    timeout=None, return_exceptions=False, cancel_on_exit=True, **kwargs):
+    "Yield `(index,result)` pairs as `f` applied to each of `items` completes, in completion order"
     import asyncio
     semaphore = asyncio.Semaphore(n_workers)
     async def limited_task(i, item):
         if pause: await asyncio.sleep(i * pause)
         async with semaphore:
             coro = f(item, *args, **kwargs) if asyncio.iscoroutinefunction(f) else asyncio.to_thread(f, item, *args, **kwargs)
-            return await asyncio.wait_for(coro, timeout) if timeout else await coro
-    if cancel_on_error:
-        tasks = [asyncio.ensure_future(limited_task(i, item)) for i,item in enumerate(items)]
-        try: return await asyncio.gather(*tasks)
-        except BaseException:
+            try: return i, (await asyncio.wait_for(coro, timeout) if timeout else await coro)
+            except Exception as e:
+                if return_exceptions: return i, e
+                raise
+    tasks = [asyncio.ensure_future(limited_task(i, o)) for i,o in enumerate(items)]
+    try:
+        for t in asyncio.as_completed(tasks): yield await t
+    finally:
+        if cancel_on_exit:
             for t in tasks: t.cancel()
             await asyncio.gather(*tasks, return_exceptions=True)
-            raise
-    return await asyncio.gather(*[limited_task(i, item) for i,item in enumerate(items)], return_exceptions=return_exceptions)
+
+# %% ../nbs/03a_parallel.ipynb #7406c085
+@delegates(parallel_async_gen)
+async def parallel_async_dict(f, items, *args, **kwargs):
+    "Apply `f` to `items` in parallel, returning `{index: result}` in completion order"
+    return {i:r async for i,r in parallel_async_gen(f, items, *args, **kwargs)}
+
+# %% ../nbs/03a_parallel.ipynb #87a80e04
+@delegates(parallel_async_dict, but=['cancel_on_exit'])
+async def parallel_async(f, items, *args, cancel_on_error=False, **kwargs):
+    "Applies `f` to `items` in parallel using asyncio and a semaphore to limit concurrency."
+    res = await parallel_async_dict(f, items, *args, cancel_on_exit=cancel_on_error, **kwargs)
+    return L(res[i] for i in range(len(res)))
 
 # %% ../nbs/03a_parallel.ipynb #6748aa27
 def bg_task(coro):

{fastcore-2.2.4 → fastcore-2.2.6/fastcore.egg-info}/PKG-INFO

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