omlish 0.0.0.dev427__tar.gz → 0.0.0.dev429__tar.gz

{omlish-0.0.0.dev427/omlish.egg-info → omlish-0.0.0.dev429}/PKG-INFO

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

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev427'
-__revision__ = '13723ced41ac43696831e7a640c46f91663c9a46'
+__version__ = '0.0.0.dev429'
+__revision__ = 'aec560601e4f8ecdc171e4341c2b17e996a0ef91'
 
 
 #

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/omlish/asyncs/asyncio/subprocesses.py

@@ -4,12 +4,12 @@ import asyncio.base_subprocess
 import asyncio.subprocess
 import contextlib
 import functools
-import logging
 import subprocess
 import typing as ta
 
 from ...lite.check import check
 from ...lite.timeouts import TimeoutLike
+from ...logs.protocols import LoggerLike
 from ...subprocesses.asyncs import AbstractAsyncSubprocesses
 from ...subprocesses.run import SubprocessRun
 from ...subprocesses.run import SubprocessRunOutput
@@ -28,7 +28,7 @@ class AsyncioProcessCommunicator:
             proc: asyncio.subprocess.Process,
             loop: ta.Optional[ta.Any] = None,
             *,
-            log: ta.Optional[logging.Logger] = None,
+            log: ta.Optional[LoggerLike] = None,
     ) -> None:
         super().__init__()
 

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/omlish/asyncs/bluelet/runner.py

@@ -39,6 +39,7 @@ import types
 import typing as ta
 import weakref
 
+from ...logs.protocols import LoggerLike
 from .core import BlueletCoro
 from .core import BlueletExcInfo
 from .core import CoreBlueletEvent
@@ -84,7 +85,7 @@ class BlueletCoroException(Exception):  # noqa
 def _bluelet_event_select(
         events: ta.Iterable[BlueletEvent],
         *,
-        log: ta.Optional[logging.Logger] = None,
+        log: ta.Optional[LoggerLike] = None,
 ) -> ta.Set[WaitableBlueletEvent]:
     """
     Perform a select() over all the Events provided, returning the ones ready to be fired. Only WaitableEvents
@@ -182,7 +183,7 @@ class _BlueletRunner:
             self,
             root_coro: BlueletCoro,
             *,
-            log: ta.Optional[logging.Logger] = None,
+            log: ta.Optional[LoggerLike] = None,
     ) -> None:
         super().__init__()
 

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/omlish/formats/dotenv.py

@@ -27,7 +27,6 @@ import abc
 import codecs
 import contextlib
 import io
-import logging
 import os
 import pathlib
 import re
@@ -36,6 +35,7 @@ import tempfile
 import typing as ta
 
 from ..lite.abstract import Abstract
+from ..logs.protocols import LoggerLike
 
 
 ##
@@ -312,7 +312,7 @@ def parse_dotenv_stream(stream: ta.IO[str]) -> ta.Iterator[DotenvBinding]:
 
 def _dotenv_with_warn_for_invalid_lines(
         mappings: ta.Iterator[DotenvBinding],
-        log: ta.Optional[logging.Logger] = None,
+        log: ta.Optional[LoggerLike] = None,
 ) -> ta.Iterator[DotenvBinding]:
     for mapping in mappings:
         if mapping.error:
@@ -337,7 +337,7 @@ class Dotenv:
         interpolate: bool = True,
         override: bool = True,
         env: ta.Optional[ta.Mapping[str, str]] = None,
-        log: ta.Optional[logging.Logger] = None,
+        log: ta.Optional[LoggerLike] = None,
     ) -> None:
         super().__init__()
 
@@ -415,7 +415,7 @@ def dotenv_get_key(
     key_to_get: str,
     *,
     encoding: ta.Optional[str] = 'utf-8',
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Optional[str]:
     """
     Get the value of a given key from the given .env.
@@ -461,7 +461,7 @@ def dotenv_set_key(
     quote_mode: str = 'always',
     export: bool = False,
     encoding: ta.Optional[str] = 'utf-8',
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Tuple[ta.Optional[bool], str, str]:
     """
     Adds or Updates a key/value to the given .env
@@ -511,7 +511,7 @@ def dotenv_unset_key(
     *,
     quote_mode: str = 'always',
     encoding: ta.Optional[str] = 'utf-8',
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Tuple[ta.Optional[bool], str]:
     """
     Removes a given key from the given `.env` file.
@@ -575,7 +575,7 @@ def dotenv_values(
     interpolate: bool = True,
     encoding: ta.Optional[str] = 'utf-8',
     env: ta.Optional[ta.Mapping[str, str]] = None,
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Dict[str, ta.Optional[str]]:
     """
     Parse a .env file and return its content as a dict.

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/omlish/http/handlers.py

@@ -7,6 +7,7 @@ import logging
 import typing as ta
 
 from ..lite.abstract import Abstract
+from ..logs.protocols import LoggerLike
 from ..sockets.addresses import SocketAddress
 from .parsing import HttpHeaders
 
@@ -70,7 +71,7 @@ class HttpHandler_(Abstract):  # noqa
 @dc.dataclass(frozen=True)
 class LoggingHttpHandler(HttpHandler_):
     handler: HttpHandler
-    log: logging.Logger
+    log: LoggerLike
     level: int = logging.DEBUG
 
     def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
@@ -83,7 +84,7 @@ class LoggingHttpHandler(HttpHandler_):
 @dc.dataclass(frozen=True)
 class ExceptionLoggingHttpHandler(HttpHandler_):
     handler: HttpHandler
-    log: logging.Logger
+    log: LoggerLike
     message: ta.Union[str, ta.Callable[[HttpHandlerRequest, BaseException], str]] = 'Error in http handler'
 
     def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/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.dev427 → omlish-0.0.0.dev429}/omlish/logs/base.py

@@ -21,8 +21,9 @@ LoggingMsgFn = ta.Callable[[], ta.Union[str, tuple]]  # ta.TypeAlias
 
 
 class AnyLogger(Abstract, ta.Generic[T]):
+    @ta.final
     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:

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/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

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/omlish/logs/contexts.py

@@ -89,6 +89,12 @@ class LoggingContext(Abstract):
 
 
 class CaptureLoggingContext(LoggingContext, Abstract):
+    class AlreadyCapturedError(Exception):
+        pass
+
+    class NotCapturedError(Exception):
+        pass
+
     @abc.abstractmethod
     def capture(self) -> None:
         """Must be cooperatively called only from the expected locations."""
@@ -142,9 +148,6 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
                 self._exc_info_tuple: ta.Optional[LoggingExcInfoTuple] = (type(exc_info), exc_info, exc_info.__traceback__)  # noqa
             else:
                 self._exc_info_tuple = exc_info
-        else:
-            self._exc_info = None
-            self._exc_info_tuple = None
 
         #
 
@@ -154,14 +157,7 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
             self._stack_offset = stack_offset
             self._stack_info = stack_info
 
-        #
-
-        self._thread = LoggingThreadInfo.build()
-        self._process = LoggingProcessInfo.build()
-        self._multiprocessing = LoggingMultiprocessingInfo.build()
-        self._asyncio_task = LoggingAsyncioTaskInfo.build()
-
-    #
+    ##
 
     @property
     def level(self) -> NamedLogLevel:
@@ -185,6 +181,11 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
         times = self._times = LoggingTimeFields.build(self.time_ns)
         return times
 
+    #
+
+    _exc_info: ta.Optional[LoggingExcInfo] = None
+    _exc_info_tuple: ta.Optional[LoggingExcInfoTuple] = None
+
     @property
     def exc_info(self) -> ta.Optional[LoggingExcInfo]:
         return self._exc_info
@@ -193,58 +194,83 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
     def exc_info_tuple(self) -> ta.Optional[LoggingExcInfoTuple]:
         return self._exc_info_tuple
 
-    #
+    ##
+
+    _stack_offset: int
+    _stack_info: bool
 
-    def inc_stack_offset(self, ofs: int = 1) -> 'LoggingContext':
+    def inc_stack_offset(self, ofs: int = 1) -> 'CaptureLoggingContext':
         if hasattr(self, '_stack_offset'):
             self._stack_offset += ofs
         return self
 
+    _has_captured: bool = False
+
     _caller: ta.Optional[LoggingCaller]
+    _source_file: ta.Optional[LoggingSourceFileInfo]
+
+    _thread: ta.Optional[LoggingThreadInfo]
+    _process: ta.Optional[LoggingProcessInfo]
+    _multiprocessing: ta.Optional[LoggingMultiprocessingInfo]
+    _asyncio_task: ta.Optional[LoggingAsyncioTaskInfo]
 
     def capture(self) -> None:
-        """Must be cooperatively called only from the exact configured _stack_offset."""
+        if self._has_captured:
+            raise CaptureLoggingContextImpl.AlreadyCapturedError
+        self._has_captured = True
+
+        if not hasattr(self, '_caller'):
+            self._caller = LoggingCaller.find(
+                self._stack_offset + 1,
+                stack_info=self._stack_info,
+            )
+
+        if (caller := self._caller) is not None:
+            self._source_file = LoggingSourceFileInfo.build(caller.file_path)
+        else:
+            self._source_file = None
 
-        try:
-            self._caller  # noqa
-        except AttributeError:
-            pass
+        self._thread = LoggingThreadInfo.build()
+        self._process = LoggingProcessInfo.build()
+        self._multiprocessing = LoggingMultiprocessingInfo.build()
+        self._asyncio_task = LoggingAsyncioTaskInfo.build()
 
-        self._caller = LoggingCaller.find(
-            self._stack_offset + 1,
-            stack_info=self._stack_info,
-        )
+    #
 
     def caller(self) -> ta.Optional[LoggingCaller]:
         try:
             return self._caller
         except AttributeError:
-            return None
-
-    _source_file: ta.Optional[LoggingSourceFileInfo]
+            raise CaptureLoggingContext.NotCapturedError from None
 
     def source_file(self) -> ta.Optional[LoggingSourceFileInfo]:
         try:
             return self._source_file
         except AttributeError:
-            pass
-
-        if (caller := self.caller()) is None:
-            return None
-
-        src_file = self._source_file = LoggingSourceFileInfo.build(caller.file_path)
-        return src_file
+            raise CaptureLoggingContext.NotCapturedError from None
 
     #
 
     def thread(self) -> ta.Optional[LoggingThreadInfo]:
-        return self._thread
+        try:
+            return self._thread
+        except AttributeError:
+            raise CaptureLoggingContext.NotCapturedError from None
 
     def process(self) -> ta.Optional[LoggingProcessInfo]:
-        return self._process
+        try:
+            return self._process
+        except AttributeError:
+            raise CaptureLoggingContext.NotCapturedError from None
 
     def multiprocessing(self) -> ta.Optional[LoggingMultiprocessingInfo]:
-        return self._multiprocessing
+        try:
+            return self._multiprocessing
+        except AttributeError:
+            raise CaptureLoggingContext.NotCapturedError from None
 
     def asyncio_task(self) -> ta.Optional[LoggingAsyncioTaskInfo]:
-        return self._asyncio_task
+        try:
+            return self._asyncio_task
+        except AttributeError:
+            raise CaptureLoggingContext.NotCapturedError from None

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/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
 
@@ -46,8 +43,9 @@ class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[
 ##
 
 
+@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
@@ -64,8 +62,9 @@ class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingProcessInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingProcessInfo(ta.NamedTuple):
     pid: int
 
     @classmethod
@@ -78,8 +77,9 @@ class LoggingProcessInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[mis
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingMultiprocessingInfo(ta.NamedTuple):
     process_name: str
 
     @classmethod
@@ -96,8 +96,9 @@ class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ig
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingAsyncioTaskInfo(ta.NamedTuple):
     name: str
 
     @classmethod
@@ -111,6 +112,9 @@ class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore
         except Exception:  # noqa
             return None
 
+        if task is None:
+            return None
+
         return cls(
             task.get_name(),  # Always non-None
         )

omlish-0.0.0.dev429/omlish/logs/modules.py

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

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/omlish/logs/std/handlers.py

@@ -8,10 +8,12 @@ import typing as ta
 
 
 class ListLoggingHandler(logging.Handler):
-    def __init__(self) -> None:
+    def __init__(self, record_list: ta.Optional[ta.List[logging.LogRecord]] = None) -> None:
         super().__init__()
 
-        self.records: ta.List[logging.LogRecord] = []
+        if record_list is None:
+            record_list = []
+        self.records: ta.List[logging.LogRecord] = record_list
 
     def emit(self, record: logging.LogRecord) -> None:
         self.records.append(record)

{omlish-0.0.0.dev427 → omlish-0.0.0.dev429}/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