omlish 0.0.0.dev425__py3-none-any.whl → 0.0.0.dev426__py3-none-any.whl

omlish/lite/asyncs.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP045
 import functools
 import typing as ta
 
@@ -8,6 +9,10 @@ T = ta.TypeVar('T')
 ##
 
 
+async def opt_await(aw: ta.Optional[ta.Awaitable[T]]) -> ta.Optional[T]:
+    return (await aw if aw is not None else None)
+
+
 def as_async(fn: ta.Callable[..., T], *, wrap: bool = False) -> ta.Callable[..., ta.Awaitable[T]]:
     async def inner(*args, **kwargs):
         return fn(*args, **kwargs)

omlish/lite/attrops.py

@@ -0,0 +1,332 @@
+# ruff: noqa: UP006 UP007 UP045
+# @omlish-lite
+"""
+TODO:
+ - dotted paths!
+ - per-attr repr transform / filter
+ - __ne__ ? cases where it still matters
+ - ordering ?
+"""
+import types  # noqa
+import typing as ta
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+@ta.final
+class AttrOps(ta.Generic[T]):
+    @ta.final
+    class Attr:
+        def __init__(
+                self,
+                name: str,
+                *,
+                display: ta.Optional[str] = None,
+
+                repr: bool = True,  # noqa
+                hash: bool = True,  # noqa
+                eq: bool = True,
+        ) -> None:
+            if '.' in name:
+                raise NotImplementedError('Dotted paths not yet supported')
+            if not name.isidentifier() or name.startswith('__'):
+                raise AttributeError(f'Invalid attr: {name!r}')
+            self._name = name
+
+            if display is None:
+                display = name[1:] if name.startswith('_') and len(name) > 1 else name
+            self._display = display
+
+            self._repr = repr
+            self._hash = hash
+            self._eq = eq
+
+        @classmethod
+        def of(
+                cls,
+                o: ta.Union[
+                    str,
+                    ta.Tuple[str, str],
+                    'AttrOps.Attr',
+                ],
+        ) -> 'AttrOps.Attr':
+            if isinstance(o, AttrOps.Attr):
+                return o
+            elif isinstance(o, str):
+                return cls(o)
+            else:
+                name, disp = o
+                return cls(
+                    name,
+                    display=disp,
+                )
+
+        @property
+        def name(self) -> str:
+            return self._name
+
+        @property
+        def display(self) -> str:
+            return self._display
+
+        @property
+        def hash(self) -> bool:
+            return self._hash
+
+        @property
+        def eq(self) -> bool:
+            return self._eq
+
+    @ta.overload
+    def __init__(
+            self,
+            *attrs: ta.Sequence[ta.Union[
+                str,
+                ta.Tuple[str, str],
+                Attr,
+            ]],
+            with_module: bool = False,
+            use_qualname: bool = False,
+            with_id: bool = False,
+            repr_filter: ta.Optional[ta.Callable[[ta.Any], bool]] = None,
+            recursive: bool = False,
+            subtypes_eq: bool = False,
+    ) -> None:
+        ...
+
+    @ta.overload
+    def __init__(
+            self,
+            attrs_fn: ta.Callable[[T], ta.Tuple[ta.Union[
+                ta.Any,
+                ta.Tuple[str, ta.Any],
+                Attr,
+            ], ...]],
+            /,
+            *,
+            with_module: bool = False,
+            use_qualname: bool = False,
+            with_id: bool = False,
+            repr_filter: ta.Optional[ta.Callable[[ta.Any], bool]] = None,
+            recursive: bool = False,
+            subtypes_eq: bool = False,
+    ) -> None:
+        ...
+
+    def __init__(
+            self,
+            *args,
+            with_module=False,
+            use_qualname=False,
+            with_id=False,
+            repr_filter=None,
+            recursive=False,
+            subtypes_eq=False,
+    ) -> None:
+        if args and len(args) == 1 and callable(args[0]):
+            self._attrs: ta.Sequence[AttrOps.Attr] = self._capture_attrs(args[0])
+        else:
+            self._attrs = list(map(AttrOps.Attr.of, args))
+
+        self._with_module: bool = with_module
+        self._use_qualname: bool = use_qualname
+        self._with_id: bool = with_id
+        self._repr_filter: ta.Optional[ta.Callable[[ta.Any], bool]] = repr_filter
+        self._recursive: bool = recursive
+        self._subtypes_eq: bool = subtypes_eq
+
+    @property
+    def attrs(self) -> ta.Sequence[Attr]:
+        return self._attrs
+
+    #
+
+    @ta.final
+    class _AttrCapturer:
+        def __init__(self, fn):
+            self.__fn = fn
+
+        def __getattr__(self, attr):
+            return self.__fn(self, attr)
+
+    @classmethod
+    def _capture_attrs(cls, fn: ta.Callable) -> ta.Sequence[Attr]:
+        def access(parent, attr):
+            dct[(ret := cls._AttrCapturer(access))] = (parent, attr)
+            return ret
+
+        dct: dict = {}
+        raw = fn(root := cls._AttrCapturer(access))
+
+        def rec(cap):  # noqa
+            if cap is root:
+                return
+            parent, attr = dct[cap]
+            yield from rec(parent)
+            yield attr
+
+        attrs: ta.List[AttrOps.Attr] = []
+        for o in raw:
+            if isinstance(o, AttrOps.Attr):
+                attrs.append(o)
+                continue
+
+            if isinstance(o, tuple):
+                disp, cap, = o
+            else:
+                disp, cap = None, o
+
+            path = tuple(rec(cap))
+
+            attrs.append(AttrOps.Attr(
+                '.'.join(path),
+                display=disp,
+            ))
+
+        return attrs
+
+    #
+
+    _repr: ta.Callable[[T], str]
+
+    @property
+    def repr(self) -> ta.Callable[[T], str]:
+        try:
+            return self._repr
+        except AttributeError:
+            pass
+
+        def _repr(o: T) -> str:
+            vs = ', '.join(
+                f'{a._display}={v!r}'  # noqa
+                for a in self._attrs
+                if a._repr  # noqa
+                for v in [getattr(o, a._name)]  # noqa
+                if self._repr_filter is None or self._repr_filter(v)
+            )
+
+            return (
+                f'{o.__class__.__module__ + "." if self._with_module else ""}'
+                f'{o.__class__.__qualname__ if self._use_qualname else o.__class__.__name__}'
+                f'{("@" + hex(id(o))[2:]) if self._with_id else ""}'
+                f'({vs})'
+            )
+
+        if self._recursive:
+            _repr = self._reprlib().recursive_repr()(_repr)
+
+        self._repr = _repr
+        return _repr
+
+    _reprlib_: ta.ClassVar[ta.Any]
+
+    @classmethod
+    def _reprlib(cls) -> ta.Any:
+        try:
+            return cls._reprlib_
+        except AttributeError:
+            pass
+
+        import reprlib  # noqa
+
+        cls._reprlib_ = reprlib
+        return reprlib
+
+    #
+
+    _hash: ta.Callable[[T], int]
+
+    @property
+    def hash(self) -> ta.Callable[[T], int]:
+        try:
+            return self._hash
+        except AttributeError:
+            pass
+
+        def _hash(o: T) -> int:
+            return hash(tuple(
+                getattr(o, a._name)  # noqa
+                for a in self._attrs
+                if a._hash  # noqa
+            ))
+
+        self._hash = _hash
+        return _hash
+
+    #
+
+    _eq: ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']]
+
+    @property
+    def eq(self) -> ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']]:
+        try:
+            return self._eq
+        except AttributeError:
+            pass
+
+        def _eq(o: T, x: ta.Any) -> 'ta.Union[bool, types.NotImplementedType]':
+            if self._subtypes_eq:
+                if not isinstance(x, type(o)):
+                    return NotImplemented
+            else:
+                if type(x) is not type(o):
+                    return NotImplemented
+
+            return all(
+                getattr(o, a._name) == getattr(x, a._name)  # noqa
+                for a in self._attrs
+                if a._eq  # noqa
+            )
+
+        self._eq = _eq
+        return _eq
+
+    #
+
+    @property
+    def hash_eq(self) -> ta.Tuple[
+        ta.Callable[[T], int],
+        ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']],
+    ]:
+        return (self.hash, self.eq)
+
+    @property
+    def repr_hash_eq(self) -> ta.Tuple[
+        ta.Callable[[T], str],
+        ta.Callable[[T], int],
+        ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']],
+    ]:
+        return (self.repr, self.hash, self.eq)
+
+    #
+
+    def install(
+            self,
+            locals_dct: ta.MutableMapping[str, ta.Any],
+            *,
+            all: bool = False,  # noqa
+            repr: bool = False,  # noqa
+            hash: bool = False,  # noqa
+            eq: bool = False,
+    ) -> 'AttrOps[T]':
+        if repr or all:
+            locals_dct.update(__repr__=self.repr)
+        if hash or all:
+            locals_dct.update(__hash__=self.hash)
+        if eq or all:
+            locals_dct.update(__eq__=self.eq)
+        return self
+
+
+attr_ops = AttrOps[ta.Any]
+
+
+##
+
+
+def attr_repr(obj: ta.Any, *attrs: str, **kwargs: ta.Any) -> str:
+    return AttrOps(*attrs, **kwargs).repr(obj)

omlish/lite/cached.py

@@ -21,7 +21,7 @@ class _AbstractCachedNullary:
     def __call__(self, *args, **kwargs):  # noqa
         raise TypeError
 
-    def __get__(self, instance, owner):  # noqa
+    def __get__(self, instance, owner=None):  # noqa
         bound = instance.__dict__[self._fn.__name__] = self.__class__(self._fn.__get__(instance, owner))
         return bound
 

omlish/lite/maybes.py

@@ -148,6 +148,7 @@ class _Maybe(Maybe[T], Abstract):
             return op and not sp
 
 
+@ta.final
 class _JustMaybe(_Maybe[T]):
     __slots__ = ('_v', '_hash')
 
@@ -185,6 +186,7 @@ class _JustMaybe(_Maybe[T]):
         )
 
 
+@ta.final
 class _EmptyMaybe(_Maybe[T]):
     __slots__ = ()
 

omlish/lite/strings.py

@@ -73,13 +73,6 @@ def split_keep_delimiter(s, d):
 ##
 
 
-def attr_repr(obj: ta.Any, *attrs: str) -> str:
-    return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
-
-
-##
-
-
 FORMAT_NUM_BYTES_SUFFIXES: ta.Sequence[str] = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB']
 
 

omlish/lite/timing.py

@@ -1,6 +1,9 @@
+from ..logs.modules import get_module_logger
 from ..logs.utils import LogTimingContext
 from ..logs.utils import log_timing_context
-from .logs import log
+
+
+log = get_module_logger(globals())  # noqa
 
 
 LogTimingContext.DEFAULT_LOG = log

omlish/logs/all.py

@@ -36,6 +36,10 @@ with _lang.auto_proxy_init(globals()):
         NamedLogLevel,
     )
 
+    from .modules import (  # noqa
+        get_module_logger,
+    )
+
     from .protocols import (  # noqa
         LoggerLike,
     )

omlish/logs/modules.py

@@ -0,0 +1,10 @@
+# @omlish-lite
+import logging
+import typing as ta
+
+
+##
+
+
+def get_module_logger(mod_globals: ta.Mapping[str, ta.Any]) -> logging.Logger:
+    return logging.getLogger(mod_globals.get('__name__'))

omlish/logs/times.py

@@ -72,16 +72,13 @@ class UnexpectedLoggingStartTimeWarning(LoggingSetupWarning):
 
 
 def _check_logging_start_time() -> None:
-    x = LoggingTimeFields.get_std_start_time_ns()
-    ns = time.time_ns()
-
-    if x > ns:
+    if (x := LoggingTimeFields.get_std_start_time_ns()) < (t := time.time()):
         import warnings  # noqa
 
         warnings.warn(
             f'Unexpected logging start time detected: '
             f'get_std_start_time_ns={x}, '
-            f'time.time_ns()={ns}',
+            f'time.time()={t}',
             UnexpectedLoggingStartTimeWarning,
         )
 

omlish/os/atomics.py

@@ -7,8 +7,8 @@ import tempfile
 import typing as ta
 
 from ..lite.abstract import Abstract
+from ..lite.attrops import attr_repr
 from ..lite.check import check
-from ..lite.strings import attr_repr
 
 
 AtomicPathSwapKind = ta.Literal['dir', 'file']

omlish/reflect/types.py

@@ -407,6 +407,16 @@ class ReflectTypeError(TypeError):
     pass
 
 
+_TRIVIAL_TYPES: set[ta.Any] = {
+    bool,
+    int,
+    str,
+    float,
+    object,
+    type(None),
+}
+
+
 class Reflector:
     def __init__(
             self,
@@ -448,12 +458,24 @@ class Reflector:
         if obj is ta.Any:
             return ANY
 
+        ##
+        # Trivial
+
+        try:
+            if obj in _TRIVIAL_TYPES:
+                return obj
+        except TypeError:
+            pass
+
         ##
         # Already a Type?
 
         if isinstance(obj, (ta.TypeVar, TypeInfo)):  # noqa
             return obj
 
+        ##
+        # It's a type
+
         oty = type(obj)
 
         ##

{omlish-0.0.0.dev425.dist-info → omlish-0.0.0.dev426.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev425
+Version: 0.0.0.dev426
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -296,7 +296,7 @@ examples are:
 - **wrapt** - For (optionally-enabled) injector circular proxies.
 - **greenlet** - For some gnarly stuff like the
   [sync<->async bridge](https://github.com/wrmsr/omlish/blob/master/omlish/asyncs/bridge.py) and the
-  [io trampoline](https://github.com/wrmsr/omlish/blob/master/omlish/io/trampoline.py).
+  [io trampoline](https://github.com/wrmsr/omlish/blob/master/omextra/io/trampoline.py).
 - **sqlalchemy** - Parts of the codebase use SQLAlchemy for db stuff, but it is being migrated away from in favor of the
   internal api. It will however likely still remain as an optional dep for the api adapter.