omlish 0.0.0.dev30__py3-none-any.whl → 0.0.0.dev31__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev30'
-__revision__ = '1378b0a61f7d3ec16204c06bc87e5215b062d378'
+__version__ = '0.0.0.dev31'
+__revision__ = 'bd655a8d18c1cc31ce2c9d79fedaec771c5e1593'
 
 
 #
@@ -30,7 +30,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'async': [
-            'anyio ~= 4.5',
+            'anyio ~= 4.6',
             'sniffio ~= 1.3',
 
             'greenlet ~= 3.1',

omlish/asyncs/anyio.py

@@ -4,7 +4,7 @@ TODO:
   - owned lock
   - async once
 
-lookit:
+See:
  - https://github.com/davidbrochart/sqlite-anyio/blob/a3ba4c6ef0535b14a5a60071fcd6ed565a514963/sqlite_anyio/sqlite.py
  - https://github.com/rafalkrupinski/ratelimit-anyio/blob/2910a8a3d6fa54ed17ee6ba457686c9f7a4c4beb/src/ratelimit_anyio/__init__.py
  - https://github.com/nekitdev/async-extensions/tree/main/async_extensions

omlish/asyncs/bridge.py

@@ -12,8 +12,9 @@ TODO:
 See:
  - https://greenback.readthedocs.io/en/latest/
 """
+import functools  # noqa
 import itertools
-import sys
+import sys  # noqa
 import types
 import typing as ta
 import weakref
@@ -90,7 +91,7 @@ class UnexpectedBridgeNestingError(Exception):
 
 
 _DEBUG_PRINT: ta.Callable[..., None] | None = None
-# _DEBUG_PRINT = print  # noqa
+# _DEBUG_PRINT = functools.partial(print, file=sys.stderr)  # noqa
 
 _TRACK_TRANSITION_OBJS = False
 
@@ -253,8 +254,8 @@ def s_to_a(fn, *, require_await=False):
                 switch_occurred = True
                 try:
                     value = yield result
-                except BaseException:  # noqa
-                    result = g.throw(*sys.exc_info())
+                except BaseException as e:  # noqa
+                    result = g.throw(e)
                 else:
                     result = g.switch(value)
 
@@ -302,15 +303,22 @@ def a_to_s(fn):
 
             cr = gate()
             sv = None
+            he = False
             try:
                 while True:
-                    try:
-                        sv = cr.send(sv)
-                    except StopIteration:
-                        break
+                    if not he:
+                        try:
+                            sv = cr.send(sv)
+                        except StopIteration:
+                            break
+                    he = False
 
                     if ret is missing or cr.cr_await is not None or cr.cr_running:
-                        sv = s_to_a_await(sv)
+                        try:
+                            sv = s_to_a_await(sv)  # type: ignore
+                        except BaseException as e:  # noqa
+                            sv = cr.throw(e)
+                            he = True
 
             finally:
                 cr.close()

omlish/asyncs/trio.py

@@ -1,5 +1,5 @@
 """
-lookit:
+See:
  - https://github.com/oremanj/trio-monitor
  - https://github.com/python-trio/trio-monitor/tree/master
  - https://github.com/python-trio/triopg

omlish/bootstrap/main.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - -x / --exec - os.exec entrypoint
+  - refuse to install non-exec-relevant Bootstraps when chosen
+"""
 # ruff: noqa: UP006 UP007
 import argparse
 import dataclasses as dc

omlish/concurrent/threadlets.py

@@ -48,7 +48,7 @@ class Threadlet(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def throw(self, ex: Exception) -> ta.Any:
+    def throw(self, ex: BaseException) -> ta.Any:
         raise NotImplementedError
 
 
@@ -84,7 +84,7 @@ class GreenletThreadlet(Threadlet):
     def switch(self, *args: ta.Any, **kwargs: ta.Any) -> ta.Any:
         return self.g.switch(*args, **kwargs)
 
-    def throw(self, ex: Exception) -> ta.Any:
+    def throw(self, ex: BaseException) -> ta.Any:
         return self.g.throw(ex)
 
 

omlish/docker.py

@@ -107,6 +107,15 @@ def cli_inspect(ids: list[str]) -> list[Inspect]:
     return msh.unmarshal(json.loads(o.decode()), list[Inspect])
 
 
+def has_cli() -> bool:
+    try:
+        proc = subprocess.run(['docker', '--version'])  # noqa
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return False
+    else:
+        return not proc.returncode
+
+
 ##
 
 

omlish/logs/noisy.py

@@ -5,6 +5,7 @@ NOISY_LOGGERS: set[str] = {
     'boto3.resources.action',
     'datadog.dogstatsd',
     'elasticsearch',
+    'httpx',
     'kazoo.client',
     'requests.packages.urllib3.connectionpool',
 }

omlish/matchfns.py

@@ -130,7 +130,7 @@ def multi(*children: MatchFn[P, T], strict: bool = False) -> MultiMatchFn:  # Mu
 ##
 
 
-class CachedMultiFn(MatchFn[P, T]):
+class CachedMatchFn(MatchFn[P, T]):
     @staticmethod
     def _default_key(*args, **kwargs):
         return (args, tuple(sorted(kwargs.items(), key=lambda t: t[0])))
@@ -187,7 +187,7 @@ class CachedMultiFn(MatchFn[P, T]):
         return self.__class__(self._f.__get__(instance, owner), key=self._key)  # noqa
 
 
-cached = CachedMultiFn
+cached = CachedMatchFn
 
 
 ##

omlish/testing/pytest/plugins/switches.py

@@ -10,19 +10,24 @@ import pytest
 
 from .... import check
 from .... import collections as col
+from .... import docker
+from .... import lang
 from ._registry import register
 
 
 Configable = pytest.FixtureRequest | pytest.Config
 
 
-SWITCHES = {
-    'docker': True,
+SWITCHES: ta.Mapping[str, bool | ta.Callable[[], bool]] = {
+    'docker': docker.has_cli,
+    'docker-guest': docker.is_likely_in_docker,
     'online': True,
     'integration': True,
     'slow': False,
 }
 
+SWITCH_ATTRS = {k.replace('-', '_'): k for k in SWITCHES}
+
 
 SwitchState: ta.TypeAlias = bool | ta.Literal['only']
 
@@ -53,9 +58,9 @@ def skip_if_disabled(obj: Configable | None, name: str) -> None:
         pytest.skip(f'{name} disabled')
 
 
-def get_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
+def get_specified_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
     ret: dict[str, SwitchState] = {}
-    for sw, d in SWITCHES.items():
+    for sw in SWITCHES:
         sts = {
             st
             for st, pfx in SWITCH_STATE_OPT_PREFIXES.items()
@@ -65,8 +70,6 @@ def get_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
             if len(sts) > 1:
                 raise Exception(f'Multiple switches specified for {sw}')
             ret[sw] = check.single(sts)
-        else:
-            ret[sw] = d
     return ret
 
 
@@ -74,8 +77,9 @@ def get_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
 class SwitchesPlugin:
 
     def pytest_configure(self, config):
-        for sw in SWITCHES:
+        for sw in SWITCH_ATTRS:
             config.addinivalue_line('markers', f'{sw}: mark test as {sw}')
+            config.addinivalue_line('markers', f'not_{sw}: mark test as not {sw}')
 
     def pytest_addoption(self, parser):
         for sw in SWITCHES:
@@ -83,13 +87,25 @@ class SwitchesPlugin:
             parser.addoption(f'--{sw}', action='store_true', default=False, help=f'enables {sw} tests')
             parser.addoption(f'--only-{sw}', action='store_true', default=False, help=f'enables only {sw} tests')
 
+    @lang.cached_function
+    def get_switches(self) -> ta.Mapping[str, SwitchState]:
+        return {
+            k: v() if callable(v) else v
+            for k, v in SWITCHES.items()
+        }
+
     def pytest_collection_modifyitems(self, config, items):
-        sts = get_switches(config)
+        sts = {
+            **self.get_switches(),
+            **get_specified_switches(config),
+        }
+
         stx = col.multi_map(map(reversed, sts.items()))  # type: ignore
         ts, fs, onlys = (stx.get(k, ()) for k in (True, False, 'only'))
 
         def process(item):
-            sws = {sw for sw in SWITCHES if sw in item.keywords}
+            sws = {sw for swa, sw in SWITCH_ATTRS.items() if swa in item.keywords}
+            nsws = {sw for swa, sw in SWITCH_ATTRS.items() if ('not_' + swa) in item.keywords}
 
             if onlys:
                 if not any(sw in onlys for sw in sws):
@@ -101,5 +117,9 @@ class SwitchesPlugin:
                     if sw in fs:
                         item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
 
+                for nsw in nsws:
+                    if nsw in ts:
+                        item.add_marker(pytest.mark.skip(reason=f'skipping switches {nsw}'))
+
         for item in items:
             process(item)

{omlish-0.0.0.dev30.dist-info → omlish-0.0.0.dev31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev30
+Version: 0.0.0.dev31
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
 Provides-Extra: all
-Requires-Dist: anyio ~=4.5 ; extra == 'all'
+Requires-Dist: anyio ~=4.6 ; extra == 'all'
 Requires-Dist: sniffio ~=1.3 ; extra == 'all'
 Requires-Dist: greenlet ~=3.1 ; extra == 'all'
 Requires-Dist: trio ~=0.26 ; extra == 'all'
@@ -42,7 +42,7 @@ Requires-Dist: python-snappy ~=0.7 ; (python_version < "3.13") and extra == 'all
 Requires-Dist: asyncpg ~=0.29 ; (python_version < "3.13") and extra == 'all'
 Requires-Dist: sqlean.py ~=3.45 ; (python_version < "3.13") and extra == 'all'
 Provides-Extra: async
-Requires-Dist: anyio ~=4.5 ; extra == 'async'
+Requires-Dist: anyio ~=4.6 ; extra == 'async'
 Requires-Dist: sniffio ~=1.3 ; extra == 'async'
 Requires-Dist: greenlet ~=3.1 ; extra == 'async'
 Requires-Dist: trio ~=0.26 ; extra == 'async'

{omlish-0.0.0.dev30.dist-info → omlish-0.0.0.dev31.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
-omlish/__about__.py,sha256=fDFLSSMSxswk3iOzGDNumjsP4JcRrkaXRbp8w77f4ok,2709
+omlish/__about__.py,sha256=G5PhHDsjnmH0v-N3l7GO0RtaA0iLAw7M9ihGEGPM0x4,2709
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=QRQmX9G0-L_nATkFtGHvpd4qrpYzKATdjuFLbBqzJPM,6224
 omlish/c3.py,sha256=W5EwYx9Por3rWYLkKUitJ6OoRMLLgVTfLTyroOz41Y0,8047
@@ -7,33 +7,33 @@ omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
 omlish/check.py,sha256=3qp1_W8uRp23I26nWvG_c7YFxdTwJAZEFxmY8Bfw50Y,10078
 omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=T3bq_7h_tO3nDB5RAFBn7DkdeQgqheXzkFColbOHZko,4890
-omlish/docker.py,sha256=wipM7Xsx7rUv7-PoBTTT2v0uk3JVan0USljgm2QesXg,6227
+omlish/docker.py,sha256=uRVJUJwGtTFYhm4XeztrVEYk93f0NI5VpjEKQaN_5uY,6453
 omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
 omlish/fnpairs.py,sha256=hVuLqQFdRNNze3FYH2cAQO3GC7nK5yQP_GWPUSbL7nE,10601
 omlish/fnpipes.py,sha256=AJkgz9nvRRm7oqw7ZgYyz21klu276LWi54oYCLg-vOg,2196
 omlish/genmachine.py,sha256=LCMiqvK32dAWtrlB6lKw9tXdQFiXC8rRdk4TMQYIroU,1603
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
 omlish/libc.py,sha256=u0481imCiTFqP_e-v9g0pD-0WD249j5vYzhtn-fnNkY,15308
-omlish/matchfns.py,sha256=ygqbqthRxgF9I1PJaw9Xl7FoZnAVMmnKBrYgimKQ0ag,6152
+omlish/matchfns.py,sha256=I1IlQGfEyk_AcFSy6ulVS3utC-uwyZM2YfUXYHc9Bw0,6152
 omlish/multiprocessing.py,sha256=QZT4C7I-uThCAjaEY3xgUYb-5GagUlnE4etN01LDyU4,5186
 omlish/os.py,sha256=vO1sZCzAhVxo46tDFLrD52q2KuMFWQwu5MPJgSsnliI,3107
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/sync.py,sha256=AqwIfIuCMVHLwlJUa7dmaSjfA4sM5AYPCD5-nsz3XVQ,1516
 omlish/term.py,sha256=NEmxqAhicyInGtmFamZAizI2xdu819MzFYPEp0Fx97M,6111
 omlish/asyncs/__init__.py,sha256=uUz9ziKh4_QrgmdhKFMgq6j7mFbiZd3LiogguDCQsGI,587
-omlish/asyncs/anyio.py,sha256=Hqdi1iCopKoaAWGx-AYTRLEwnavLWx1esfJISK1IVF0,8024
+omlish/asyncs/anyio.py,sha256=gfpx-D8QGmUfhnQxHEaHXcAP8zSMQjcGw4COFTGNnHI,8021
 omlish/asyncs/asyncio.py,sha256=JfM59QgB3asgEbrps0zoVbNjWD4kL2XdsEkRMEIoFos,971
 omlish/asyncs/asyncs.py,sha256=Tf7ZodTGepkM7HAuFcDNh9lLzzrMw6rELWvopGmFkh4,2035
-omlish/asyncs/bridge.py,sha256=fkMQWG2TNmPB9BfIxtXrE50W5FJw0ma44GleOXbcSKw,8628
+omlish/asyncs/bridge.py,sha256=bcTEhsBJOWAMixu_fCxkDedLP3NEitAfwaHYTu26sQE,8980
 omlish/asyncs/flavors.py,sha256=1mNxGNRVmjUHzA13K5ht8vdJv4CLEmzYTQ6BZXr1520,4866
-omlish/asyncs/trio.py,sha256=GKG3wgelFr7gIKKHZhcflvMyCvxXHNZe862KB0Xw2uA,370
+omlish/asyncs/trio.py,sha256=fmZ5b_lKdVV8NQ3euCUutWgnkqTFzSnOjvJSA_jvmrE,367
 omlish/asyncs/trio_asyncio.py,sha256=oqdOHy0slj9PjVxaDf3gJkq9AAgg7wYZbB469jOftVw,1327
 omlish/bootstrap/__init__.py,sha256=-Rtsg7uPQNhh1dIT9nqrz96XlqizwoLnWf-FwOEstJI,730
 omlish/bootstrap/__main__.py,sha256=d23loR_cKfTYZwYiqpt_CmKI7dd5WcYFgIYzqMep75E,68
 omlish/bootstrap/base.py,sha256=koELbK6UmsZaRj-6Bng5_zPVmEBqDpFCduEdR5BddOs,1077
 omlish/bootstrap/diag.py,sha256=x_BKS_uhfW8QFk1NeH_VIocHif-A6FVTZ37262qCgZ0,5052
 omlish/bootstrap/harness.py,sha256=pIeSXKfMsF7-3ZkU0gGpde-PtLAKKcVrWaxcin7Xzy0,2041
-omlish/bootstrap/main.py,sha256=9ZbgXaRNZwt_hXdg8W4YjpP0v0Si_qqlfu86jfgRz04,5215
+omlish/bootstrap/main.py,sha256=u-TfxO4GkAK3LbRweQERogtO4kT0z3gqXRjnXvtJzC8,5328
 omlish/bootstrap/marshal.py,sha256=qKewGVs-3i2p5W9nywkXSo1pcbVxmOAlTvfLjyo0xpo,554
 omlish/bootstrap/sys.py,sha256=U0MFxO9tLFV3cdN5Y-Zrink6_45sFvzPUYQXyBk7-ns,8741
 omlish/collections/__init__.py,sha256=tGUzvS_ZjiqALsLRy7JX3h4KZRQX2CmtdAfTRD7UwMk,1677
@@ -60,7 +60,7 @@ omlish/collections/cache/types.py,sha256=yNjwd6CGyTJQdxN2CQxFqqBAlcs1Z7vvNV-aU1K
 omlish/concurrent/__init__.py,sha256=9p-s8MvBEYDqHIoYU3OYoe-Nni22QdkW7nhZGEukJTM,197
 omlish/concurrent/executors.py,sha256=FYKCDYYuj-OgMa8quLsA47SfFNX3KDJvRENVk8NDsrA,1292
 omlish/concurrent/futures.py,sha256=J2s9wYURUskqRJiBbAR0PNEAp1pXbIMYldOVBTQduQY,4239
-omlish/concurrent/threadlets.py,sha256=eQLJBJwT6iOt4jOm67BberSKLPhaEYJTStHK0LCo2v4,2374
+omlish/concurrent/threadlets.py,sha256=0fl0_Q_joTLtFYhR2kpKu45BW-win-le0rCuXPBtjko,2382
 omlish/configs/__init__.py,sha256=3uh09ezodTwkMI0nRmAMP0eEuJ_0VdF-LYyNmPjHiCE,77
 omlish/configs/classes.py,sha256=GLbB8xKjHjjoUQRCUQm3nEjM8z1qNTx9gPV7ODSt5dg,1317
 omlish/configs/flattening.py,sha256=AOlRpBHm449MxwMp3CiIRGunStOC1DUNs1f3CLou0wc,4731
@@ -212,7 +212,7 @@ omlish/logs/_abc.py,sha256=UgrCUQVUi_PvT3p1CEkb3P74CFrFcZq2AFby3GEUv9M,5974
 omlish/logs/configs.py,sha256=EE0jlNaXJbGnM7V-y4xS5VwyTBSTzFzc0BYaVjg0JmA,1283
 omlish/logs/formatters.py,sha256=q79nMnR2mRIStPyGrydQHpYTXgC5HHptt8lH3W2Wwbs,671
 omlish/logs/handlers.py,sha256=nyuFgmO05By_Xwq7es58ClzS51-F53lJL7gD0x5IqAg,228
-omlish/logs/noisy.py,sha256=8JORjI1dH38yU2MddM54OB6qt32Xozfocdb88vY4wro,335
+omlish/logs/noisy.py,sha256=Ubc-eTH6ZbGYsLfUUi69JAotwuUwzb-SJBeGo_0dIZI,348
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
 omlish/marshal/__init__.py,sha256=RkZGfdp7x9KU8nEpb8hYBGANK-P_9AXMyjBXCrdYMmc,1757
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
@@ -307,7 +307,7 @@ omlish/testing/pytest/plugins/pydevd.py,sha256=u1fxfCgFw4wGKBkMV_H_l9WI8JoUwlRff
 omlish/testing/pytest/plugins/repeat.py,sha256=flSQzE9GFOWksVKz-mUGnpxJpv3yRqn1G4K8pW7JHs0,498
 omlish/testing/pytest/plugins/skips.py,sha256=EoZDg1uWccgbAegmzqI85c7RliycD1e2J4Y7vfDRhwM,1041
 omlish/testing/pytest/plugins/spacing.py,sha256=JQQhi9q3c523Ro1a_K_9RGAb7HotiO74N8bYX2VESFE,707
-omlish/testing/pytest/plugins/switches.py,sha256=9FtN5qtPBoS-teEp54OHPF6jlZJakRJdq4pnLJpPj_A,3001
+omlish/testing/pytest/plugins/switches.py,sha256=hqFYM6tCcr-6fAPg8DBI-TJn762Kq4EUFt6gjXgiAQQ,3802
 omlish/testing/pytest/plugins/utils.py,sha256=L5C622UXcA_AUKDcvyh5IMiRfqSGGz0McdhwZWvfMlU,261
 omlish/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/asdl.py,sha256=3v5UocAfxan_d9drkGNdH3AMfx_FFBpQu3ULGL4M6VM,16865
@@ -315,8 +315,8 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev30.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev30.dist-info/METADATA,sha256=IwpExBB3pJdmS4yOOGHNJjwusV5Xj5KOyW5aY9cHxV8,3694
-omlish-0.0.0.dev30.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev30.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev30.dist-info/RECORD,,
+omlish-0.0.0.dev31.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev31.dist-info/METADATA,sha256=ONRqZOyFknW_WO5Hntonm5hY10yIlv645eKTmoXhhyY,3694
+omlish-0.0.0.dev31.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev31.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev31.dist-info/RECORD,,