fastcore 2.2.17__tar.gz → 2.2.18__tar.gz

{fastcore-2.2.17/fastcore.egg-info → fastcore-2.2.18}/PKG-INFO

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

{fastcore-2.2.17 → fastcore-2.2.18}/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.17"
+__version__ = "2.2.18"

{fastcore-2.2.17 → fastcore-2.2.18}/fastcore/_modidx.py

@@ -31,7 +31,8 @@ d = { 'settings': { 'branch': 'main',
                               'fastcore.aio.reawaitable': ('aio.html#reawaitable', 'fastcore/aio.py'),
                               'fastcore.aio.run_sync': ('aio.html#run_sync', 'fastcore/aio.py'),
                               'fastcore.aio.then': ('aio.html#then', 'fastcore/aio.py'),
-                              'fastcore.aio.to_aiter': ('aio.html#to_aiter', 'fastcore/aio.py')},
+                              'fastcore.aio.to_aiter': ('aio.html#to_aiter', 'fastcore/aio.py'),
+                              'fastcore.aio.wait_until': ('aio.html#wait_until', 'fastcore/aio.py')},
             'fastcore.all': {},
             'fastcore.ansi': {},
             'fastcore.apisurface': { 'fastcore.apisurface.OpGroup': ('apisurface.html#opgroup', 'fastcore/apisurface.py'),
@@ -745,6 +746,7 @@ d = { 'settings': { 'branch': 'main',
                                  'fastcore.script._is_script_run': ('script.html#_is_script_run', 'fastcore/script.py'),
                                  'fastcore.script._is_union': ('script.html#_is_union', 'fastcore/script.py'),
                                  'fastcore.script._pkg_version': ('script.html#_pkg_version', 'fastcore/script.py'),
+                                 'fastcore.script._pos_split': ('script.html#_pos_split', 'fastcore/script.py'),
                                  'fastcore.script._run_cli': ('script.html#_run_cli', 'fastcore/script.py'),
                                  'fastcore.script._union_parser': ('script.html#_union_parser', 'fastcore/script.py'),
                                  'fastcore.script._union_type': ('script.html#_union_type', 'fastcore/script.py'),

{fastcore-2.2.17 → fastcore-2.2.18}/fastcore/aio.py

@@ -16,8 +16,8 @@ Docs: https://fastcore.fast.ai/aio.html.md"""
 
 # %% auto #0
 __all__ = ['run_sync', 'iter_sync', 'ctx_sync', 'athreaded', 'maybe_await', 'then', 'acache', 'CachedAwaitable', 'reawaitable',
-           'is_async_callable', 'to_aiter', 'maybe_aiter', 'mapa', 'noopa', 'Debounce', 'enable_async_magics',
-           'disable_async_magics']
+           'is_async_callable', 'to_aiter', 'maybe_aiter', 'mapa', 'noopa', 'wait_until', 'Debounce',
+           'enable_async_magics', 'disable_async_magics']
 
 # %% ../nbs/03c_aio.ipynb #7e2193be
 import asyncio,contextvars,threading
@@ -160,6 +160,20 @@ async def noopa(x=None, *args, **kwargs):
     "Do nothing (async)"
     return x
 
+# %% ../nbs/03c_aio.ipynb #959bd288
+async def wait_until(
+    probe, # Sync or async callable; falsy result means keep waiting
+    what:str=None, # Named in the `TimeoutError`; `probe`'s name if None
+    timeout:float=10, # Seconds to wait before raising
+    sleep:float=0.2, # Seconds between probes
+):
+    "Call `probe` until truthy, returning its first truthy result"
+    deadline = asyncio.get_running_loop().time() + timeout
+    while asyncio.get_running_loop().time() < deadline:
+        if (r := await maybe_await(probe())): return r
+        await asyncio.sleep(sleep)
+    raise TimeoutError(f'Timed out waiting for {what or getattr(probe, "__name__", probe)}')
+
 # %% ../nbs/03c_aio.ipynb #5eaf5cd7
 class Debounce:
     "Coalesce a burst of calls into one run of `f`, `wait` secs after calls stop (or `max_wait` secs after they start)"

{fastcore-2.2.17 → fastcore-2.2.18}/fastcore/script.py

@@ -55,7 +55,7 @@ A capital letter in a parameter name declares a short flag: the capitalized lett
 
 ## Positional params
 
-Parameters without a default are positional, and the rest are flags. Pass `pos` to `call_parse` (or to `anno_parser`) to keep named parameters positional even when they have a default, in which case they are optional on the command line and take the default when omitted. Command line order follows the signature, not the order of the names in `pos`. Naming a bool parameter in `pos` raises, since a flag takes no value.
+Parameters without a default are positional, and the rest are flags. A `*args` parameter is a variadic positional, taking zero or more values, and since Python makes any params after it keyword-only, they are flags. A `**kwargs` parameter is skipped: a CLI run passes nothing for it. Pass `pos` to `call_parse` (or to `anno_parser`) to keep named parameters positional even when they have a default, in which case they are optional on the command line and take the default when omitted. Command line order follows the signature, not the order of the names in `pos`. Naming a bool parameter in `pos` raises, since a flag takes no value.
 
 ## Param types
 
@@ -213,9 +213,13 @@ def anno_parser(func, prog:str=None, pos:list=None):
     "Look at params (with type/docments/`Annotated` annotations) in func and return an `ArgumentParser`"
     p = argparse.ArgumentParser(description=func.__doc__, prog=prog, formatter_class=_HelpFormatter, epilog=_pkg_version(func))
     for k,v in docments(func, full=True, returns=False, eval_str=True).items():
+        if v.kind is inspect.Parameter.VAR_KEYWORD: continue
         anno,meta = ann_parts(v.anno)
         extra = next((o for o in meta if isinstance(o,dict)), {})
-        if pos and k in pos:
+        if v.kind is inspect.Parameter.VAR_POSITIONAL:
+            if anno in (bool,store_true,store_false): raise ValueError(f"variadic param {k!r} can't be a bool: a flag takes no value")
+            extra = merge({'opt':False, 'nargs':'*'}, extra)
+        elif pos and k in pos:
             if anno in (bool,store_true,store_false): raise ValueError(f"positional param {k!r} can't be a bool: a flag takes no value")
             extra = merge({'opt':False}, {'nargs':'?'} if v.default is not inspect.Parameter.empty else {}, extra)
         mv = anno2str(anno)
@@ -260,6 +264,15 @@ def _is_script_run(frame):
     if g.get('__name__')!='__main__' or not g.get('__file__'): return False
     return Path(g['__file__']).resolve()==Path(frame.f_code.co_filename).resolve()
 
+# %% ../nbs/06_script.ipynb #d9a3f93c
+def _pos_split(func, args):
+    "Pop values for params up to a `*args` param from `args` in signature order, to pass positionally"
+    ks = []
+    for k,v in inspect.signature(func).parameters.items():
+        if v.kind is inspect.Parameter.VAR_POSITIONAL: return [args.pop(o) for o in ks]+list(args.pop(k)), args
+        ks.append(k)
+    return [],args
+
 # %% ../nbs/06_script.ipynb #dee5e259
 _cli_func = ContextVar('_cli_func', default=None)
 
@@ -273,7 +286,8 @@ def _run_cli(func, nested, pos=None):
         args = args.__dict__
         xtra = otherwise(args.pop('xtra', ''), eq(1), p.prog)
         tfunc = trace(func) if args.pop('pdb', False) else func
-        res = tfunc(**merge(args, args_from_prog(func, xtra)))
+        pargs,args = _pos_split(func, merge(args, args_from_prog(func, xtra)))
+        res = tfunc(*pargs, **args)
         return asyncio.run(res) if inspect.isawaitable(res) else res
 
 def call_parse(func=None, nested=False, pos:list=None):

{fastcore-2.2.17 → fastcore-2.2.18/fastcore.egg-info}/PKG-INFO

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