omlish 0.0.0.dev428__tar.gz → 0.0.0.dev430__tar.gz

{omlish-0.0.0.dev428/omlish.egg-info → omlish-0.0.0.dev430}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev428
+Version: 0.0.0.dev430
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev428'
-__revision__ = '302f3506177c6fb44a3b8786e8125ee75d322b0e'
+__version__ = '0.0.0.dev430'
+__revision__ = '36144d896de4a99623dc872d90d16dfe60a47934'
 
 
 #

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/collections/cache/impl.py

@@ -10,12 +10,12 @@ TODO:
 import collections
 import contextlib
 import functools
-import logging
 import time
 import typing as ta
 import weakref
 
 from ... import lang
+from ...logs import all as logs
 from .types import Cache
 from .types import Eviction
 from .types import OverweightError
@@ -27,7 +27,7 @@ V = ta.TypeVar('V')
 V2 = ta.TypeVar('V2')
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/daemons/daemon.py

@@ -16,13 +16,13 @@ TODO:
  - pickle protocol, revision / venv check, multiprocessing manager support
 """
 import itertools
-import logging
 import os.path
 import time
 
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
+from ..logs import all as logs
 from ..os.pidfiles.pidfile import Pidfile
 from .launching import Launcher
 from .spawning import Spawning
@@ -31,7 +31,7 @@ from .waiting import Wait
 from .waiting import waiter_for
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/daemons/launching.py

@@ -5,12 +5,12 @@ TODO:
 """
 import contextlib
 import functools
-import logging
 import threading
 import typing as ta
 
 from .. import check
 from .. import lang
+from ..logs import all as logs
 from ..os.pidfiles.manager import open_inheritable_pidfile
 from ..os.pidfiles.pidfile import Pidfile
 from .reparent import reparent_process
@@ -23,7 +23,7 @@ from .targets import Target
 from .targets import target_runner_for
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/diag/procfs.py

@@ -3,7 +3,6 @@ TODO:
  - dataclasses
 """
 import argparse
-import logging
 import os
 import re
 import resource
@@ -14,11 +13,12 @@ import typing as ta
 from .. import iterators as it
 from .. import lang
 from ..formats import json
+from ..logs import all as logs
 from ..os.sizes import PAGE_SIZE
 from .procstats import ProcStats
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 PidLike = int | str

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/diag/replserver/console.py

@@ -17,7 +17,6 @@ def _attach(repl):
 import ast
 import codeop
 import errno
-import logging
 import socket as sock
 import sys
 import threading
@@ -26,9 +25,10 @@ import types
 import typing as ta
 
 from ... import check
+from ...logs import all as logs
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/diag/replserver/server.py

@@ -22,7 +22,6 @@ socat - UNIX-CONNECT:repl.sock
 """
 import contextlib
 import functools
-import logging
 import os
 import socket as sock
 import threading
@@ -31,10 +30,11 @@ import weakref
 
 from ... import check
 from ... import dataclasses as dc
+from ...logs import all as logs
 from .console import InteractiveSocketConsole
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/http/asgi.py

@@ -1,14 +1,14 @@
 import abc
-import logging
 import typing as ta
 import urllib.parse
 
 from .. import check
 from .. import lang
+from ..logs import all as logs
 from . import consts
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/inject/impl/injector.py

@@ -16,12 +16,12 @@ TODO:
 import contextlib
 import functools
 import itertools
-import logging
 import typing as ta
 import weakref
 
 from ... import check
 from ... import lang
+from ...logs import all as logs
 from ..elements import Elements
 from ..errors import CyclicDependencyError
 from ..errors import UnboundKeyError
@@ -42,7 +42,7 @@ from .scopes import ScopeImpl
 from .scopes import make_scope_impl
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/lang/asyncs.py

@@ -19,9 +19,7 @@ def as_async(fn: ta.Callable[P, T], *, wrap: bool = False) -> ta.Callable[P, ta.
 ##
 
 
-async def async_list(
-        ai: ta.AsyncIterable[T],
-) -> list[T]:
+async def async_list(ai: ta.AsyncIterable[T]) -> list[T]:
     """Simply eagerly reads the full contents of a function call returning an async iterator."""
 
     return [v async for v in ai]
@@ -30,9 +28,7 @@ async def async_list(
 ##
 
 
-def sync_await(
-        aw: ta.Awaitable[T],
-) -> T:
+def sync_await(aw: ta.Awaitable[T]) -> T:
     """
     Allows for the synchronous execution of async functions which will never actually *externally* await anything. These
     functions are allowed to await any number of other functions - including contextmanagers and generators - so long as

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/lite/attrops.py

@@ -285,8 +285,6 @@ class AttrOps(ta.Generic[T]):
         self._eq = _eq
         return _eq
 
-    #
-
     @property
     def hash_eq(self) -> ta.Tuple[
         ta.Callable[[T], int],
@@ -294,6 +292,8 @@ class AttrOps(ta.Generic[T]):
     ]:
         return (self.hash, self.eq)
 
+    #
+
     @property
     def repr_hash_eq(self) -> ta.Tuple[
         ta.Callable[[T], str],
@@ -304,20 +304,25 @@ class AttrOps(ta.Generic[T]):
 
     #
 
+    class NOT_SET:  # noqa
+        def __new__(cls, *args, **kwargs):  # noqa
+            raise TypeError
+
     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,
+            repr: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,  # noqa
+            hash: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,  # noqa
+            eq: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,
     ) -> 'AttrOps[T]':
-        if repr or all:
+        if all(a is self.NOT_SET for a in (repr, hash, eq)):
+            repr = hash = eq = True  # noqa
+        if repr:
             locals_dct.update(__repr__=self.repr)
-        if hash or all:
+        if hash:
             locals_dct.update(__hash__=self.hash)
-        if eq or all:
+        if eq:
             locals_dct.update(__eq__=self.eq)
         return self
 

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/all.py

@@ -17,6 +17,10 @@ with _lang.auto_proxy_init(globals()):
         JsonLoggingFormatter,
     )
 
+    from .std.loggers import (  # noqa
+        StdLogger,
+    )
+
     from .std.noisy import (  # noqa
         silence_noisy_loggers,
     )
@@ -26,10 +30,39 @@ with _lang.auto_proxy_init(globals()):
         ProxyLoggingHandler,
     )
 
+    from .std.records import (  # noqa
+        LoggingContextLogRecord,
+    )
+
+    from .base import (  # noqa
+        AnyLogger,
+        Logger,
+        AsyncLogger,
+
+        AnyNopLogger,
+        NopLogger,
+        AsyncNopLogger,
+    )
+
     from .callers import (  # noqa
         LoggingCaller,
     )
 
+    from .contexts import (  # noqa
+        LoggingExcInfoTuple,
+        LoggingExcInfo,
+
+        LoggingContext,
+    )
+
+    from .infos import (  # noqa
+        LoggingSourceFileInfo,
+        LoggingThreadInfo,
+        LoggingProcessInfo,
+        LoggingMultiprocessingInfo,
+        LoggingAsyncioTaskInfo,
+    )
+
     from .levels import (  # noqa
         LogLevel,
 
@@ -59,3 +92,7 @@ with _lang.auto_proxy_init(globals()):
 
         error_logging,
     )
+
+    from .warnings import (  # noqa
+        LoggingSetupWarning,
+    )

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/base.py

@@ -22,7 +22,7 @@ LoggingMsgFn = ta.Callable[[], ta.Union[str, tuple]]  # ta.TypeAlias
 
 class AnyLogger(Abstract, ta.Generic[T]):
     def is_enabled_for(self, level: LogLevel) -> bool:
-        return self.get_effective_level() >= level
+        return level >= self.get_effective_level()
 
     @abc.abstractmethod
     def get_effective_level(self) -> LogLevel:
@@ -219,7 +219,7 @@ class AsyncLogger(AnyLogger[ta.Awaitable[None]], Abstract):
 class AnyNopLogger(AnyLogger[T], Abstract):
     @ta.final
     def get_effective_level(self) -> LogLevel:
-        return 999
+        return -999
 
 
 @ta.final

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/callers.py

@@ -7,13 +7,15 @@ import traceback
 import types
 import typing as ta
 
-from .infos import LoggingContextInfo
+from .infos import logging_context_info
 
 
 ##
 
 
-class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingCaller(ta.NamedTuple):
     file_path: str
     line_no: int
     name: str
@@ -66,8 +68,8 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
                 sinfo = sinfo[:-1]
 
         return cls(
-            f.f_code.co_filename,
-            f.f_lineno or 0,
-            f.f_code.co_name,
-            sinfo,
+            file_path=f.f_code.co_filename,
+            line_no=f.f_lineno or 0,
+            name=f.f_code.co_name,
+            stack_info=sinfo,
         )

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/infos.py

@@ -9,19 +9,16 @@ import typing as ta
 ##
 
 
-class _LoggingContextInfo:
-    def __mro_entries__(self, bases):
-        return ()
-
-
-LoggingContextInfo: type = ta.cast(ta.Any, _LoggingContextInfo())
+def logging_context_info(cls):
+    return cls
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingSourceFileInfo(ta.NamedTuple):
     file_name: str
     module: str
 
@@ -38,16 +35,17 @@ class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[
             return None
 
         return cls(
-            file_name,
-            module,
+            file_name=file_name,
+            module=module,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingThreadInfo(ta.NamedTuple):
     ident: int
     native_id: ta.Optional[int]
     name: str
@@ -55,31 +53,33 @@ class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
     @classmethod
     def build(cls) -> 'LoggingThreadInfo':
         return cls(
-            threading.get_ident(),
-            threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
-            threading.current_thread().name,
+            ident=threading.get_ident(),
+            native_id=threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
+            name=threading.current_thread().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingProcessInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingProcessInfo(ta.NamedTuple):
     pid: int
 
     @classmethod
     def build(cls) -> 'LoggingProcessInfo':
         return cls(
-            os.getpid(),
+            pid=os.getpid(),
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingMultiprocessingInfo(ta.NamedTuple):
     process_name: str
 
     @classmethod
@@ -89,15 +89,16 @@ class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ig
             return None
 
         return cls(
-            mp.current_process().name,
+            process_name=mp.current_process().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingAsyncioTaskInfo(ta.NamedTuple):
     name: str
 
     @classmethod
@@ -115,5 +116,5 @@ class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore
             return None
 
         return cls(
-            task.get_name(),  # Always non-None
+            name=task.get_name(),  # Always non-None
         )

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/levels.py

@@ -22,36 +22,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
 
-    _effective_name: ta.Optional[str]
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
+
+    #
+
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
+
+        self._name_and_offset = t
+        return t
+
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
 
-        self._effective_name = n
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -69,3 +99,6 @@ NamedLogLevel.WARNING = NamedLogLevel(logging.WARNING)
 NamedLogLevel.INFO = NamedLogLevel(logging.INFO)
 NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
+
+
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/modules.py

@@ -3,7 +3,7 @@ import logging
 import typing as ta
 
 from .base import Logger
-from .std.adapters import StdLogger
+from .std.loggers import StdLogger
 
 
 ##

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/protocols.py

@@ -7,6 +7,7 @@ from .levels import LogLevel
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 

omlish-0.0.0.dev428/omlish/logs/std/adapters.py → omlish-0.0.0.dev430/omlish/logs/std/loggers.py

@@ -23,6 +23,9 @@ class StdLogger(Logger):
     def std(self) -> logging.Logger:
         return self._std
 
+    def is_enabled_for(self, level: LogLevel) -> bool:
+        return self._std.isEnabledFor(level)
+
     def get_effective_level(self) -> LogLevel:
         return self._std.getEffectiveLevel()
 

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/times.py

@@ -4,14 +4,16 @@ import logging
 import time
 import typing as ta
 
-from .infos import LoggingContextInfo
+from .infos import logging_context_info
 from .warnings import LoggingSetupWarning
 
 
 ##
 
 
-class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingTimeFields(ta.NamedTuple):
     """Maps directly to stdlib `logging.LogRecord` fields, and must be kept in sync with it."""
 
     created: float
@@ -59,9 +61,9 @@ class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
         relative_created = (time_ns - start_time_ns) / 1e6
 
         return cls(
-            created,
-            msecs,
-            relative_created,
+            created=created,
+            msecs=msecs,
+            relative_created=relative_created,
         )
 
 

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/logs/typed/types.py

@@ -86,6 +86,7 @@ class TypedLoggerValue(Abstract, ta.Generic[T]):
     def of(cls: ta.Type[TypedLoggerValueT], v: ta.Any) -> ta.Union[TypedLoggerValueT, AbsentTypedLoggerValue]:
         return cls(v) if v is not ABSENT_TYPED_LOGGER_VALUE else ABSENT_TYPED_LOGGER_VALUE
 
+    @ta.final
     @property
     def v(self) -> T:
         return self._v

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish/sockets/server/server.py

@@ -22,7 +22,7 @@ from .handlers import SocketServerHandler
 
 
 class SocketServer:
-    _DEFAULT_LOGGER = logging.getLogger('.'.join([__name__, 'SocketServer']))
+    _DEFAULT_LOGGER: LoggerLike = logging.getLogger('.'.join([__name__, 'SocketServer']))  # FIXME
 
     def __init__(
             self,

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev428
+Version: 0.0.0.dev430
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev428 → omlish-0.0.0.dev430}/omlish.egg-info/SOURCES.txt

@@ -520,11 +520,11 @@ omlish/logs/times.py
 omlish/logs/utils.py
 omlish/logs/warnings.py
 omlish/logs/std/__init__.py
-omlish/logs/std/adapters.py
 omlish/logs/std/configs.py
 omlish/logs/std/filters.py
 omlish/logs/std/handlers.py
 omlish/logs/std/json.py
+omlish/logs/std/loggers.py
 omlish/logs/std/noisy.py
 omlish/logs/std/proxy.py
 omlish/logs/std/records.py