omlish 0.0.0.dev316__py3-none-any.whl → 0.0.0.dev318__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev316'
-__revision__ = 'c32f4122c29baf0486a328e8d6e54beb8c47b3fc'
+__version__ = '0.0.0.dev318'
+__revision__ = 'b80bceb394abe03974e4312775224ac1dbcb5b22'
 
 
 #
@@ -103,7 +103,7 @@ class Project(ProjectBase):
 
             'sqlean.py ~= 3.49',
 
-            'duckdb ~= 1.2',
+            'duckdb ~= 1.3',
         ],
 
         'templates': [

omlish/collections/utils.py

@@ -58,13 +58,33 @@ def unique(
 ##
 
 
+@ta.overload
+def make_map(
+        kvs: ta.Iterable[tuple[K, V]],
+        *,
+        identity: ta.Literal[False] = False,
+        strict: bool = False,
+) -> dict[K, V]:
+    ...
+
+
+@ta.overload
 def make_map(
         kvs: ta.Iterable[tuple[K, V]],
         *,
         identity: bool = False,
         strict: bool = False,
 ) -> ta.MutableMapping[K, V]:
-    d: ta.MutableMapping[K, V] = IdentityKeyDict() if identity else {}
+    ...
+
+
+def make_map(
+        kvs,
+        *,
+        identity=False,
+        strict=False,
+):
+    d: ta.MutableMapping = IdentityKeyDict() if identity else {}
     for k, v in kvs:
         if k in d:
             if strict:
@@ -74,6 +94,21 @@ def make_map(
     return d
 
 
+#
+
+
+@ta.overload
+def make_map_by(
+        fn: ta.Callable[[V], K],
+        vs: ta.Iterable[V],
+        *,
+        identity: ta.Literal[False] = False,
+        strict: bool = False,
+) -> dict[K, V]:
+    ...
+
+
+@ta.overload
 def make_map_by(
         fn: ta.Callable[[V], K],
         vs: ta.Iterable[V],
@@ -81,6 +116,16 @@ def make_map_by(
         identity: bool = False,
         strict: bool = False,
 ) -> ta.MutableMapping[K, V]:
+    ...
+
+
+def make_map_by(
+        fn,
+        vs,
+        *,
+        identity=False,
+        strict=False,
+):
     return make_map(
         ((fn(v), v) for v in vs),
         identity=identity,
@@ -91,9 +136,30 @@ def make_map_by(
 ##
 
 
-def multi_map(kvs: ta.Iterable[tuple[K, V]], *, identity: bool = False) -> ta.MutableMapping[K, list[V]]:
-    d: ta.MutableMapping[K, list[V]] = IdentityKeyDict() if identity else {}
-    l: list[V]
+@ta.overload
+def multi_map(
+        kvs: ta.Iterable[tuple[K, V]],
+        *,
+        identity: ta.Literal[False] = False,
+) -> dict[K, list[V]]:
+    ...
+
+
+@ta.overload
+def multi_map(
+        kvs: ta.Iterable[tuple[K, V]],
+        *,
+        identity: bool = False,
+) -> ta.MutableMapping[K, list[V]]:
+    ...
+
+
+def multi_map(
+        kvs,
+        *,
+        identity=False,
+):
+    d: ta.MutableMapping = IdentityKeyDict() if identity else {}
     for k, v in kvs:
         try:
             l = d[k]
@@ -103,7 +169,35 @@ def multi_map(kvs: ta.Iterable[tuple[K, V]], *, identity: bool = False) -> ta.Mu
     return d
 
 
-def multi_map_by(fn: ta.Callable[[V], K], vs: ta.Iterable[V], *, identity: bool = False) -> ta.MutableMapping[K, list[V]]:  # noqa
+#
+
+
+@ta.overload
+def multi_map_by(
+        fn: ta.Callable[[V], K],
+        vs: ta.Iterable[V],
+        *,
+        identity: ta.Literal[False] = False,
+) -> dict[K, list[V]]:  # noqa
+    ...
+
+
+@ta.overload
+def multi_map_by(
+        fn: ta.Callable[[V], K],
+        vs: ta.Iterable[V],
+        *,
+        identity: bool = False,
+) -> ta.MutableMapping[K, list[V]]:  # noqa
+    ...
+
+
+def multi_map_by(
+        fn,
+        vs,
+        *,
+        identity=False,
+):
     return multi_map(((fn(v), v) for v in vs), identity=identity)
 
 

omlish/dataclasses/api/classes/conversion.py

@@ -12,6 +12,8 @@ from ...specs import FieldSpec
 def std_params_to_class_spec(
         p: StdParams,
         fields: ta.Sequence[FieldSpec],
+        *,
+        metadata: ta.Sequence[ta.Any] | None = None,
 ) -> ClassSpec:
     return ClassSpec(
         fields=fields,
@@ -27,4 +29,6 @@ def std_params_to_class_spec(
         kw_only=check.isinstance(p.kw_only, bool),
         slots=check.isinstance(p.slots, bool),
         weakref_slot=check.isinstance(p.weakref_slot, bool),
+
+        metadata=metadata,
     )

omlish/dataclasses/reflection.py

@@ -3,6 +3,7 @@ import typing as ta
 
 from .. import lang
 from .api.classes.conversion import std_params_to_class_spec
+from .api.classes.metadata import extract_cls_metadata
 from .api.classes.params import get_class_spec
 from .api.fields.conversion import std_field_to_field_spec
 from .concerns.fields import InitFields
@@ -49,9 +50,12 @@ class ClassReflection:
             for f in dc.fields(self._cls)  # noqa
         ]
 
+        cmd = extract_cls_metadata(self._cls, deep=True)
+
         cs = std_params_to_class_spec(
             p,
             fsl,
+            metadata=cmd.user_metadata or None,
         )
 
         return cs

omlish/diag/_pycharm/runhack.py

@@ -59,6 +59,9 @@ class _cached_nullary:  # noqa
 #
 
 
+_repr = repr
+
+
 def _attr_repr(obj, *atts):
     return f'{obj.__class__.__name__}({", ".join(f"{a}={getattr(obj, a)!r}" for a in atts)})'
 
@@ -127,6 +130,109 @@ class AsJson:
 ##
 
 
+class SysModule(AttrsClass, AsJson):
+    def __init__(
+            self,
+            name,  # type: str
+            *,
+            seq=None,  # type: int | None
+            repr=None,  # type: str | None  # noqa
+
+            origin=None,  # type: str | None
+            file=None,  # type: str | None
+    ) -> None:
+        super().__init__()
+
+        self._name = name
+
+        self._seq = seq
+        self._repr = repr
+
+        self._origin = origin
+        self._file = file
+
+    __attrs__ = (
+        'name',
+
+        'seq',
+        'repr',
+
+        'origin',
+        'file',
+    )
+
+    @property
+    def name(self):  # type: () -> str
+        return self._name
+
+    @property
+    def seq(self):  # type: () -> int | None
+        return self._seq
+
+    @property
+    def repr(self):  # type: () -> str | None
+        return self._repr
+
+    @property
+    def origin(self):  # type: () -> str | None
+        return self._origin
+
+    @property
+    def file(self):  # type: () -> str | None
+        return self._file
+
+    def as_json(self):  # type: () -> dict[str, object]
+        return self.attrs_dict()
+
+
+def build_sys_module(
+        name,  # type: str
+        mod,
+        *,
+        seq=None,  # type: int | None
+) -> SysModule:
+    kwargs = dict()  # type: dict
+    kwargs.update(
+        name=name,
+
+        seq=seq,
+        repr=_repr(mod),
+    )
+
+    try:
+        spec = mod.__spec__
+    except AttributeError:
+        pass
+    else:
+        if spec is not None:
+            kwargs.update(origin=spec.origin)
+
+    try:
+        file = mod.__file__
+    except AttributeError:
+        pass
+    else:
+        kwargs.update(file=file)
+
+    return SysModule(**kwargs)
+
+
+def build_sys_modules(dct=None):  # type: (dict[str, object] | None) -> list[SysModule]
+    if dct is None:
+        dct_ = sys.modules
+    else:
+        dct_ = dct  # type: ignore
+
+    lst = []  # type: list[SysModule]
+    for i, (n, m) in enumerate(dct_.items()):
+        lst.append(build_sys_module(n, m, seq=i))
+
+    return lst
+
+
+##
+
+
 class RunEnv(AttrsClass, AsJson):
     def __init__(
             self,
@@ -143,6 +249,7 @@ class RunEnv(AttrsClass, AsJson):
             pycharm_hosted=None,  # type: bool | None
 
             sys_path=None,  # type: list[str] | None
+            sys_modules=None,  # type: list[SysModule] | None
     ) -> None:
         super().__init__()
 
@@ -182,6 +289,10 @@ class RunEnv(AttrsClass, AsJson):
             sys_path = list(sys.path)
         self._sys_path = sys_path
 
+        if sys_modules is None:
+            sys_modules = build_sys_modules()
+        self._sys_modules = sys_modules
+
     __attrs__ = (
         'argv',
         'orig_argv',
@@ -195,6 +306,7 @@ class RunEnv(AttrsClass, AsJson):
         'pycharm_hosted',
 
         'sys_path',
+        'sys_modules',
     )
 
     @property
@@ -233,8 +345,15 @@ class RunEnv(AttrsClass, AsJson):
     def sys_path(self):  # type: () -> list[str]
         return self._sys_path
 
+    @property
+    def sys_modules(self):  # type: () -> list[SysModule]
+        return self._sys_modules
+
     def as_json(self):  # type: () -> dict[str, object]
-        return self.attrs_dict()
+        return {
+            **self.attrs_dict(),
+            'sys_modules': [m.as_json() for m in self.sys_modules],
+        }
 
 
 ##

omlish/formats/json/literals.py

@@ -29,7 +29,7 @@ import typing as ta
 _ESCAPE_PAT = re.compile(r'[\x00-\x1f\\"]')
 _ESCAPE_ASCII_PAT = re.compile(r'([\\"]|[^\ -~])')
 
-_ESCAPE_DCT = {
+ESCAPE_MAP: ta.Mapping[str, str] = {
     **{
         chr(i): f'\\u{i:04x}'
         for i in range(0x20)
@@ -56,19 +56,35 @@ def _convert_to_string(s: str | bytes) -> str:
         return s
 
 
-def encode_string(s: str | bytes, q: str = '"') -> str:
-    """Return a JSON representation of a Python string"""
+def encode_string(
+        s: str | bytes,
+        q: str = '"',
+        *,
+        escape_map: ta.Mapping[str, str] | None = None,
+) -> str:
+    """Return a JSON representation of a Python string."""
+
+    if escape_map is None:
+        escape_map = ESCAPE_MAP
 
     s = _convert_to_string(s)
 
     def replace(m):
-        return _ESCAPE_DCT[m.group(0)]
+        return escape_map[m.group(0)]
 
     return q + _ESCAPE_PAT.sub(replace, s) + q
 
 
-def encode_string_ascii(s: str | bytes, q: str = '"') -> str:
-    """Return an ASCII-only JSON representation of a Python string"""
+def encode_string_ascii(
+        s: str | bytes,
+        q: str = '"',
+        *,
+        escape_map: ta.Mapping[str, str] | None = None,
+) -> str:
+    """Return an ASCII-only JSON representation of a Python string."""
+
+    if escape_map is None:
+        escape_map = ESCAPE_MAP
 
     s = _convert_to_string(s)
 
@@ -76,7 +92,7 @@ def encode_string_ascii(s: str | bytes, q: str = '"') -> str:
         s = m.group(0)
 
         try:
-            return _ESCAPE_DCT[s]
+            return escape_map[s]
 
         except KeyError:
             n = ord(s)
@@ -102,7 +118,7 @@ def _scan_four_digit_hex(
         s: str,
         end: int,
 ):
-    """Scan a four digit hex number from s[end:end + 4]"""
+    """Scan a four digit hex number from s[end:end + 4]."""
 
     msg = 'Invalid \\uXXXX escape sequence'
     esc = s[end: end + 4]
@@ -117,7 +133,7 @@ def _scan_four_digit_hex(
 
 _STRING_CHUNK_PAT = re.compile(r'(.*?)(["\\\x00-\x1f])', re.VERBOSE | re.MULTILINE | re.DOTALL)
 
-_BACKSLASH_MAP = {
+BACKSLASH_MAP: ta.Mapping[str, str] = {
     '"': '"',
     '\\': '\\',
     '/': '/',
@@ -180,7 +196,7 @@ def parse_string(
         # If not a unicode escape sequence, must be in the lookup table
         if esc != 'u':
             try:
-                char = _BACKSLASH_MAP[esc]
+                char = BACKSLASH_MAP[esc]
             except KeyError:
                 msg = 'Invalid \\X escape sequence %r'
                 raise json.JSONDecodeError(msg, s, end) from None

omlish/formats/json/rendering.py

@@ -26,6 +26,7 @@ class AbstractJsonRenderer(lang.Abstract, ta.Generic[I]):
 
     def __init__(
             self,
+            *,
             indent: int | str | None = None,
             separators: tuple[str, str] | None = None,
             sort_keys: bool = False,

omlish/formats/json5/rendering.py

@@ -0,0 +1,44 @@
+import typing as ta
+
+from ..json import Scalar
+from ..json.literals import ESCAPE_MAP
+from ..json.literals import encode_string
+from ..json.literals import encode_string_ascii
+from ..json.rendering import JsonRenderer
+from ..json.rendering import JsonRendererOut
+
+
+##
+
+
+MULTILINE_STRINGS_ESCAPE_MAP = {
+    **ESCAPE_MAP,
+    '\n': '\\n\\\n',
+}
+
+
+class Json5Renderer(JsonRenderer):
+    def __init__(
+            self,
+            out: JsonRendererOut,
+            *,
+            multiline_strings: bool = False,
+            **kwargs: ta.Any,
+    ) -> None:
+        super().__init__(out, **kwargs)
+
+        self._multiline_strings = multiline_strings
+
+    def _format_scalar(self, o: Scalar) -> str:
+        if (
+                self._multiline_strings and
+                isinstance(o, str) and
+                '\n' in o
+        ):
+            if self._ensure_ascii:
+                return encode_string_ascii(o, escape_map=MULTILINE_STRINGS_ESCAPE_MAP)
+            else:
+                return encode_string(o, escape_map=MULTILINE_STRINGS_ESCAPE_MAP)
+
+        else:
+            return super()._format_scalar(o)

omlish/lang/cached/function.py

@@ -22,6 +22,7 @@ TODO:
 import dataclasses as dc
 import functools
 import inspect
+import types
 import typing as ta
 
 from ..classes.abstract import Abstract
@@ -153,6 +154,10 @@ def _make_cache_key_maker(
 ##
 
 
+class _CachedException(ta.NamedTuple):
+    ex: BaseException
+
+
 class _CachedFunction(ta.Generic[T], Abstract):
     @dc.dataclass(frozen=True, kw_only=True)
     class Opts:
@@ -160,6 +165,19 @@ class _CachedFunction(ta.Generic[T], Abstract):
         lock: DefaultLockable = None
         transient: bool = False
         no_wrapper_update: bool = False
+        cache_exceptions: type[BaseException] | tuple[type[BaseException], ...] | None = None
+
+        def __post_init__(self) -> None:
+            if (ce := self.cache_exceptions) is not None:
+                if isinstance(ce, type):
+                    if not issubclass(ce, BaseException):
+                        raise TypeError(ce)
+                elif isinstance(ce, tuple):
+                    for e in ce:
+                        if not issubclass(e, BaseException):
+                            raise TypeError(e)
+                else:
+                    raise TypeError(ce)
 
     def __init__(
             self,
@@ -199,13 +217,33 @@ class _CachedFunction(ta.Generic[T], Abstract):
     def __call__(self, *args, **kwargs) -> T:
         k = self._key_maker(*args, **kwargs)
 
-        try:
-            return self._values[k]
-        except KeyError:
-            pass
+        if (ce := self._opts.cache_exceptions) is None:
+            try:
+                return self._values[k]
+            except KeyError:
+                pass
 
-        def call_value_fn():
-            return self._value_fn(*args, **kwargs)
+        else:
+            try:
+                hit = self._values[k]
+            except KeyError:
+                pass
+            else:
+                if isinstance(hit, _CachedException):
+                    raise hit.ex
+                else:
+                    return hit
+
+        if ce is None:
+            def call_value_fn():
+                return self._value_fn(*args, **kwargs)
+
+        else:
+            def call_value_fn():
+                try:
+                    return self._value_fn(*args, **kwargs)
+                except ce as ex:  # type: ignore[misc]
+                    return _CachedException(ex)
 
         if self._lock is not None:
             with self._lock:
@@ -220,7 +258,11 @@ class _CachedFunction(ta.Generic[T], Abstract):
             value = call_value_fn()
 
         self._values[k] = value
-        return value
+
+        if isinstance(value, _CachedException):
+            raise value.ex
+        else:
+            return value
 
 
 #
@@ -369,12 +411,27 @@ def cached_function(fn=None, **kwargs):  # noqa
 
     opts = _CachedFunction.Opts(**kwargs)
 
+    if isinstance(fn, types.MethodType):
+        return _FreeCachedFunction(
+            fn,
+            opts=opts,
+            key_maker=_make_cache_key_maker(fn, bound=True),
+        )
+
     if isinstance(fn, staticmethod):
-        return _FreeCachedFunction(fn, opts=opts, value_fn=unwrap_func(fn))
+        return _FreeCachedFunction(
+            fn,
+            opts=opts,
+            value_fn=unwrap_func(fn),
+        )
 
     scope = classmethod if isinstance(fn, classmethod) else None
 
-    return _DescriptorCachedFunction(fn, scope, opts=opts)
+    return _DescriptorCachedFunction(
+        fn,
+        scope,
+        opts=opts,
+    )
 
 
 def static_init(fn: CallableT) -> CallableT:

omlish/lite/maybes.py

@@ -166,9 +166,11 @@ class _JustMaybe(_Maybe[T]):
     def __repr__(self) -> str:
         return f'just({self._v!r})'
 
+    _hash: int
+
     def __hash__(self) -> int:
         try:
-            return self._hash  # type: ignore[has-type]
+            return self._hash
         except AttributeError:
             pass
         h = self._hash = hash((_JustMaybe, self._v))

omlish/sockets/ports.py

@@ -16,21 +16,38 @@ DEFAULT_AVAILABLE_PORT_HOST: str = '127.0.0.1'
 
 
 @contextlib.contextmanager
-def get_available_port_context(host: ta.Optional[str] = None) -> ta.Iterator[int]:
+def get_available_port_context(
+        host: ta.Optional[str] = None,
+        family: int = socket.AF_INET,
+        type: int = socket.SOCK_STREAM,  # noqa
+        *,
+        listen: ta.Union[bool, int, None] = False,
+) -> ta.Iterator[int]:
     if host is None:
         host = DEFAULT_AVAILABLE_PORT_HOST
 
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+    if listen is not None:
+        if listen is True:
+            listen = 1
+        elif listen is False:
+            listen = None
+        else:
+            listen = check.isinstance(listen, int)
+
+    with socket.socket(family, type) as sock:
         sock.bind((host, 0))
-        sock.listen(1)
+
+        if listen is not None:
+            sock.listen(listen)
+
         port = sock.getsockname()[1]
+
         yield port
 
 
-def get_available_port(host: ta.Optional[str] = None) -> int:
-    with get_available_port_context(host) as port:
-        pass
-    return port
+def get_available_port(*args: ta.Any, **kwargs: ta.Any) -> int:
+    with get_available_port_context(*args, **kwargs) as port:
+        return port
 
 
 def get_available_ports(

omlish/testing/pytest/plugins/switches.py

@@ -4,29 +4,87 @@ TODO:
  - dynamic registration
  - dynamic switching (skip docker if not running, skip online if not online, ...)
 """
+import dataclasses as dc
 import typing as ta
 
 import pytest
 
 from .... import check
 from .... import collections as col
-from .... import lang
 from ....docker import all as docker
 from ._registry import register
 
 
-Configable = pytest.FixtureRequest | pytest.Config
+Configable: ta.TypeAlias = pytest.FixtureRequest | pytest.Config
 
 
-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,
-}
+##
+
+
+@dc.dataclass(frozen=True, eq=False)
+class Switch:
+    name: str
+    _default_enabled: bool | ta.Callable[[], bool]
+
+    _: dc.KW_ONLY
+
+    add_marks: ta.Sequence[ta.Any] | None = None
+
+    def default_enabled(self) -> bool:
+        if isinstance(e := self._default_enabled, bool):
+            return e
+        elif callable(e):
+            return check.isinstance(e(), bool)
+        else:
+            raise TypeError(e)
+
+    @property
+    def attr(self) -> str:
+        return self.name.replace('-', '_')
+
+
+SWITCHES: ta.Sequence[Switch] = [
+    Switch(
+        'name',
+        docker.has_cli,
+    ),
+
+    Switch(
+        'docker-guest',
+        docker.is_likely_in_docker,
+    ),
+
+    Switch(
+        'online',
+        True,
+    ),
 
-SWITCH_ATTRS = {k.replace('-', '_'): k for k in SWITCHES}
+    Switch(
+        'integration',
+        True,
+    ),
+
+    Switch(
+        'high-mem',
+        True,
+        add_marks=[
+            # https://pytest-xdist.readthedocs.io/en/latest/distribution.html
+            pytest.mark.xdist_group('high-mem'),
+        ],
+    ),
+
+    Switch(
+        'slow',
+        False,
+    ),
+]
+
+
+SWITCHES_BY_NAME: ta.Mapping[str, Switch] = col.make_map_by(lambda sw: sw.name, SWITCHES, strict=True)
+SWITCHES_BY_ATTR: ta.Mapping[str, Switch] = col.make_map_by(lambda sw: sw.attr, SWITCHES, strict=True)
+
+
+##
 
 
 SwitchState: ta.TypeAlias = bool | ta.Literal['only']
@@ -49,7 +107,7 @@ def _get_obj_config(obj: Configable) -> pytest.Config:
 
 def is_disabled(obj: Configable | None, name: str) -> bool:
     check.isinstance(name, str)
-    check.in_(name, SWITCHES)
+    check.in_(name, SWITCHES_BY_NAME)
     return obj is not None and _get_obj_config(obj).getoption(f'--no-{name}')
 
 
@@ -58,17 +116,17 @@ def skip_if_disabled(obj: Configable | None, name: str) -> None:
         pytest.skip(f'{name} disabled')
 
 
-def get_specified_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
-    ret: dict[str, SwitchState] = {}
+def get_specified_switches(obj: Configable) -> dict[Switch, SwitchState]:
+    ret: dict[Switch, SwitchState] = {}
     for sw in SWITCHES:
         sts = {
             st
             for st, pfx in SWITCH_STATE_OPT_PREFIXES.items()
-            if _get_obj_config(obj).getoption(pfx + sw)
+            if _get_obj_config(obj).getoption(pfx + sw.name)
         }
         if sts:
             if len(sts) > 1:
-                raise Exception(f'Multiple switches specified for {sw}')
+                raise Exception(f'Multiple switches specified for {sw.name}')
             ret[sw] = check.single(sts)
     return ret
 
@@ -76,49 +134,50 @@ def get_specified_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
 @register
 class SwitchesPlugin:
     def pytest_configure(self, config):
-        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}')
+        for sw in SWITCHES:
+            config.addinivalue_line('markers', f'{sw.attr}: mark test as {sw.attr}')
+            config.addinivalue_line('markers', f'not_{sw.attr}: mark test as not {sw.attr}')
 
     def pytest_addoption(self, parser):
         for sw in SWITCHES:
-            parser.addoption(f'--no-{sw}', action='store_true', default=False, help=f'disable {sw} tests')
-            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()
-        }
+            parser.addoption(f'--no-{sw.name}', action='store_true', default=False, help=f'disable {sw.name} tests')
+            parser.addoption(f'--{sw.name}', action='store_true', default=False, help=f'enables {sw.name} tests')
+            parser.addoption(f'--only-{sw.name}', action='store_true', default=False, help=f'enables only {sw.name} tests')  # noqa
 
     def pytest_collection_modifyitems(self, config, items):
-        sts = {
-            **self.get_switches(),
+        switch_states: dict[Switch, SwitchState] = {
+            **{
+                sw: sw.default_enabled()
+                for sw in 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'))
+        inv_switch_states: dict[SwitchState, list[Switch]] = col.multi_map((st, sw) for sw, st in switch_states.items())
+        true_switches = frozenset(inv_switch_states.get(True, ()))
+        false_switches = frozenset(inv_switch_states.get(False, ()))
+        only_switches = frozenset(inv_switch_states.get('only', ()))
 
         def process(item):
-            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}
+            item_switches = {sw for sw in SWITCHES if sw.attr in item.keywords}
+            item_not_switches = {sw for sw in SWITCHES if ('not_' + sw.attr) in item.keywords}
+
+            for sw in item_switches:
+                for mk in sw.add_marks or []:
+                    item.add_marker(mk)
 
-            if onlys:
-                if not any(sw in onlys for sw in sws):
-                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {sws}'))
+            if only_switches:
+                if not any(sw in only_switches for sw in item_switches):
+                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {item_switches}'))
                     return
 
-            else:
-                for sw in sws:
-                    if sw in fs:
-                        item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
+            for sw in item_switches:
+                if sw in false_switches:
+                    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 sw in item_not_switches:
+                if sw in true_switches:
+                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
 
         for item in items:
             process(item)

{omlish-0.0.0.dev316.dist-info → omlish-0.0.0.dev318.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev316
+Version: 0.0.0.dev318
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -41,7 +41,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.49; extra == "all"
 Requires-Dist: sqlean.py~=3.49; extra == "all"
-Requires-Dist: duckdb~=1.2; extra == "all"
+Requires-Dist: duckdb~=1.3; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
 Requires-Dist: pytest~=8.3; extra == "all"
@@ -89,7 +89,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.49; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.49; extra == "sqldrivers"
-Requires-Dist: duckdb~=1.2; extra == "sqldrivers"
+Requires-Dist: duckdb~=1.3; extra == "sqldrivers"
 Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"
 Requires-Dist: jinja2~=3.1; extra == "templates"

{omlish-0.0.0.dev316.dist-info → omlish-0.0.0.dev318.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=Lteg-7hW9bBGPlLc6vR48ef4x6Ods9p5RyKlY5-teWw,3478
+omlish/__about__.py,sha256=kisuBtrw4R5wrzm5nluakJkzLD7HYXcYuB7zYWAgrQc,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -87,7 +87,7 @@ omlish/collections/mappings.py,sha256=iXb7oq1rCQak0KgzblgrzWCJLrkfJAYHFvl9lprOVU
 omlish/collections/ordered.py,sha256=7zTbrAt12rf6i33XHkQERKar258fJacaw_WbtGEBgWo,2338
 omlish/collections/ranked.py,sha256=McB8C2UQfUvrbmxGTpBz1-EZuyCLkBFtktzncMdt8_Y,2287
 omlish/collections/unmodifiable.py,sha256=X7kKhPFdZF4m28SfLDxZL-riWlhbZffdPv35aTP30YM,4753
-omlish/collections/utils.py,sha256=voqecDPFuqSLN8IwJDKyy-HnecEU4JYOXxd1HAaEuMY,2900
+omlish/collections/utils.py,sha256=1LED_KLXsEb39Byhql7BD5ObHoSkFn2OyUdnHsKXKNo,4091
 omlish/collections/cache/__init__.py,sha256=D1gO71VcwxFTZP9gAc9isHfg_TEdalwhsJcgGLvS9hg,233
 omlish/collections/cache/descriptor.py,sha256=F9aRsF-xOUcNMzTwIWrUpKTjop1Z-oItQqJDwVaR0FU,5026
 omlish/collections/cache/impl.py,sha256=Y18OcAsNL6dIWuk89UlZBpqq0iBU-P4VDio6eis43Us,14760
@@ -139,12 +139,12 @@ omlish/dataclasses/debug.py,sha256=giBiv6aXvX0IagwNCW64qBzNjfOFr3-VmgDy_KYlb-k,2
 omlish/dataclasses/errors.py,sha256=tyv3WR6az66uGGiq9FIuCHvy1Ef-G7zeMY7mMG6hy2Y,2527
 omlish/dataclasses/inspect.py,sha256=BlpPghVCU3w_YDnONEqqE99YHzJM2q3eoqe39YX25Ko,4596
 omlish/dataclasses/internals.py,sha256=vIGCZnStgD3ef4drYRtVOrxhxmAPa0vJpo4pXcDcQvM,3073
-omlish/dataclasses/reflection.py,sha256=5N4acL27xwSnQJvoks6ts2JseGfwL_P9D2gM9vqtAFM,2243
+omlish/dataclasses/reflection.py,sha256=FSSTiS7pGTmDrYNkS6fZzaMSe8qtSvDv5Pgz0T55qXg,2404
 omlish/dataclasses/specs.py,sha256=r9hpIWy83ODiB1n7wTf7JL5fiCeeT8fWbMvxs7c4e3g,6148
 omlish/dataclasses/utils.py,sha256=gv6za6oJYBr1VaeGd7oXqq9lhBs_sxkpC27XYzJggno,1870
 omlish/dataclasses/api/__init__.py,sha256=k5iS9QOwf_f4iOfGffYhnqDOcmEIwEUUTp00u11kIPM,455
 omlish/dataclasses/api/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/dataclasses/api/classes/conversion.py,sha256=x1Ayo5W3t8lVh10KGH_ZBJ_kK7HqcdI2LdJA6mR_WXQ,810
+omlish/dataclasses/api/classes/conversion.py,sha256=U3g5S-HefJrg4to1BF8XnlEWqMxFeGEqVt8o5OTQK-U,902
 omlish/dataclasses/api/classes/decorator.py,sha256=q-m05j6VhJ9_00TmrXBvwmv0_TFPTD8OURi1KbKo9-4,3933
 omlish/dataclasses/api/classes/make.py,sha256=Q_8ZVjhhFEUstIZA3Ht_vlGptYjTcJqX48qT57W7SZw,2820
 omlish/dataclasses/api/classes/metadata.py,sha256=ocUu75VWOdZA8-R7K95yPhQtS0sFZB1NtqCdzXyDNeQ,2769
@@ -214,7 +214,7 @@ omlish/diag/pycharm.py,sha256=Z2W-Viqw5xq08ZC4z36skpozfYw_qNNhWQx_GYr2D0k,4695
 omlish/diag/pydevd.py,sha256=UN55ZjkWLCVyHxE2CNRRYamuvSKfzWsn0D5oczRTXO4,7536
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/diag/_pycharm/runhack.py,sha256=O37sduvkx99uQaEg_XWLDBJlUxaqgd2LkjmdGaUT6e4,35432
+omlish/diag/_pycharm/runhack.py,sha256=f4R9SOH0nDfO2WqPh0xQ9-45qOLrtTVysS-hSwtbdOA,37864
 omlish/diag/replserver/__init__.py,sha256=uLo6V2aQ29v9z3IMELlPDSlG3_2iOT4-_X8VniF-EgE,235
 omlish/diag/replserver/__main__.py,sha256=LmU41lQ58bm1h4Mx7S8zhE_uEBSC6kPcp9mn5JRpulA,32
 omlish/diag/replserver/console.py,sha256=XzBDVhYlr8FY6ym4OwoaIHuFOHnGK3dTYlMDIOMUUlA,7410
@@ -264,8 +264,8 @@ omlish/formats/json/codecs.py,sha256=E5KErfqsgGZq763ixXLT3qysbk5MIsypT92xG5aSaIs
 omlish/formats/json/consts.py,sha256=A0cTAGGLyjo-gcYIQrL4JIaardI0yPMhQoNmh42BaRg,387
 omlish/formats/json/encoding.py,sha256=iwoYyJePibgvRDZ6e9b2OlXmOBJEczquRNoiffVf3hE,502
 omlish/formats/json/json.py,sha256=Mdqv2vdMi7gp96eV0BIYH5UdWpjWfsh-tSMZeywG-08,331
-omlish/formats/json/literals.py,sha256=NMMBhP43cX2mfpiFsMysQWhbSBc0Ux-zegiah62cSmE,7198
-omlish/formats/json/rendering.py,sha256=rWDIiGvLQ0GkCyOKsPywFSo3FdYJ-pCHyrX6MCqitRs,4556
+omlish/formats/json/literals.py,sha256=MMou9UIoztL9EyX2Zhv3Kzfq8eaKMfGNCFhL16n-fTk,7532
+omlish/formats/json/rendering.py,sha256=0S_ppr5ihkUW7PP0mipZXHr72otqwUCNfanwopcboag,4571
 omlish/formats/json/types.py,sha256=ueO9-uOU2eVWowJf0LH1fHFLjZ6fTIZyq9qybcLQaiQ,147
 omlish/formats/json/backends/__init__.py,sha256=gnaNDCxy_KmmPUPDnjxO5_WjuWxLGbI9FYWx8ZJuQUU,97
 omlish/formats/json/backends/base.py,sha256=WqtyoM82pyM0NyqpPwndrebr1bUVU1QlpmVQNrcAO8c,1114
@@ -287,6 +287,7 @@ omlish/formats/json5/codec.py,sha256=ldnxCRo0JP1fkGLt0mMxJlLvNxqIF_1KUCcSp1HtI-M
 omlish/formats/json5/errors.py,sha256=AHkR9ySjAoQdUrizpqgL8fg0M5oe5mHZkml3KZHEvC4,38
 omlish/formats/json5/literals.py,sha256=rj4-9KFXfgdq5oK_eUkp57cgoMQ8T0gRaG9ga430he4,2429
 omlish/formats/json5/parsing.py,sha256=CWJHfe_FXCQuyDk00a7PI5wOdROq7Tc3fbWrNuwaKCw,2346
+omlish/formats/json5/rendering.py,sha256=Kf-yA4AB3BqyjellBOFTGrMxxpIUsmgHIFzVRSJkQnE,1112
 omlish/formats/json5/_antlr/Json5Lexer.py,sha256=LnURBD0tL35VHNpxqM4DOPrTkE_9oONHtbftRM26tak,23239
 omlish/formats/json5/_antlr/Json5Listener.py,sha256=37Jhzu7tQEw6gLIxtcZtV5Yjn08kS-GkxF7d0KjXyo8,2097
 omlish/formats/json5/_antlr/Json5Parser.py,sha256=YU9bP89nq97A8ZCrjIcbgoBg4z76-N-6IMFGQe_ws54,19679
@@ -426,7 +427,7 @@ omlish/lang/strings.py,sha256=kJmRFd1D36xXcjd9MdB12BCwF_-MVhNr-TpWj7hMi_4,4252
 omlish/lang/sys.py,sha256=b4qOPiJZQru_mbb04FNfOjYWUxlV2becZOoc-yya_rQ,411
 omlish/lang/typing.py,sha256=Zdad9Zv0sa-hIaUXPrzPidT7sDVpRcussAI7D-j-I1c,3296
 omlish/lang/cached/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/lang/cached/function.py,sha256=gXrU4DYO952lCJpNDuSTVb83f0tVjVnaG3BY2Sqab0k,9712
+omlish/lang/cached/function.py,sha256=tch6VlDljfUUFMP61RY0LYXYyNwj1Sy8CAQQQMHCypA,11344
 omlish/lang/cached/property.py,sha256=WHYyg4-6EA86TcNMfbXTjVhjEZPc0kngt9hfY3WN5w8,2768
 omlish/lang/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lang/classes/abstract.py,sha256=n4rDlDraUKxPF0GtOWEFZ6mEzEDmP7Z8LSI6Jww_thw,3715
@@ -452,7 +453,7 @@ omlish/lite/inject.py,sha256=-tTsOqqef-Ix5Tgl2DP_JAsNWJQDFUptERl3lk14Uzs,29007
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
 omlish/lite/marshal.py,sha256=4DCbLoimLwJakihpvMjJ_kpc7v9aZQY8P3-gkoqEGUE,18471
-omlish/lite/maybes.py,sha256=00UUjtI29-gQD3sjgogIqxl74iD395GqdDQB-k0nxm8,4363
+omlish/lite/maybes.py,sha256=hAIzp2pmPccnULwKiA8vaxiTJj6av3dvrqhhDfMLte0,4353
 omlish/lite/pycharm.py,sha256=pUOJevrPClSqTCEOkQBO11LKX2003tfDcp18a03QFrc,1163
 omlish/lite/reflect.py,sha256=pzOY2PPuHH0omdtglkN6DheXDrGopdL3PtTJnejyLFU,2189
 omlish/lite/reprs.py,sha256=QI5VBtvq_TW1TojWL25c04QfOABLi8Smt5jc5J-bArc,2008
@@ -580,7 +581,7 @@ omlish/sockets/addresses.py,sha256=vbVeQBkzI513H4vRv-JS89QtRbr9U8v5zqkm3oODl_s,1
 omlish/sockets/bind.py,sha256=J1SfFFFnVf3H5nqESDX2NGEY8DmjyIMUXZciZM33zQY,8003
 omlish/sockets/handlers.py,sha256=Gj6xZoo4vommge8XvkehYw3B7O4aql2P4qzZIIa0p24,462
 omlish/sockets/io.py,sha256=lfhTkB7NnAIx9kuQhAkwgsEUXY78Mp1_WtYrIQNS_k8,1408
-omlish/sockets/ports.py,sha256=NQYVvd8IBbQkPl8TnBtupTiv-Htqhc6QBIXJJ6GprnQ,1389
+omlish/sockets/ports.py,sha256=6sp1jVTYuhuAGQ9NB12sFklPkygLhhrNMO9Wa9PcFeU,1772
 omlish/sockets/wait.py,sha256=OtLbcoLYzksl4GU0TNbQpzzVWGxp2iRLgo2cGZZfFFM,1559
 omlish/sockets/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/sockets/server/handlers.py,sha256=PPsb1X5oU9dN8jfztaMGsRiqWTyEANT-1aSLbS6bUVg,3867
@@ -748,7 +749,7 @@ omlish/testing/pytest/plugins/pydevd.py,sha256=5moE64LrNRV6gKRaeCuONDiwuh-4UFxJP
 omlish/testing/pytest/plugins/repeat.py,sha256=jiZCI-17042jBvUEbZCxNwqWtr7s3EhTBSeSHh_Uz4E,497
 omlish/testing/pytest/plugins/skips.py,sha256=eMir_n777Kk2BvOwjQzRROKL4iAMYKSHFwWCHJ-bdPI,1040
 omlish/testing/pytest/plugins/spacing.py,sha256=tzq-L-exegHe2BImumkYIsVcUwpUUhLJJOuSrsKDuCU,706
-omlish/testing/pytest/plugins/switches.py,sha256=U8tDP-WSI2yjxwp4hocgZNJEmEv8UO8_CFEv8mXWH3A,3814
+omlish/testing/pytest/plugins/switches.py,sha256=azw-pqSQfZYs7YlKsPK1bzerg20pX55YXejZgIxJu9U,5166
 omlish/testing/pytest/plugins/utils.py,sha256=L5C622UXcA_AUKDcvyh5IMiRfqSGGz0McdhwZWvfMlU,261
 omlish/testing/pytest/plugins/asyncs/__init__.py,sha256=TTNhFmP_krug1973sq_bpWBTIvg68-1nbuVLSs92Z6k,41
 omlish/testing/pytest/plugins/asyncs/consts.py,sha256=0NOCkzV43dOu3u97BqYMQ4mPG8JuFncpWibkOZpCqX4,55
@@ -852,9 +853,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev316.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev316.dist-info/METADATA,sha256=-NOxa8LncyL8kMJ9KG9rdMF4oCf60aY1fALrI0TCdMg,4416
-omlish-0.0.0.dev316.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-omlish-0.0.0.dev316.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev316.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev316.dist-info/RECORD,,
+omlish-0.0.0.dev318.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev318.dist-info/METADATA,sha256=-Nc1DXmiJNc5JokC60eHTE9VTgT6oMoXEf496J6i6UE,4416
+omlish-0.0.0.dev318.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+omlish-0.0.0.dev318.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev318.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev318.dist-info/RECORD,,

{omlish-0.0.0.dev316.dist-info → omlish-0.0.0.dev318.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any