omlish 0.0.0.dev427__tar.gz → 0.0.0.dev428__tar.gz

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

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

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

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev427'
-__revision__ = '13723ced41ac43696831e7a640c46f91663c9a46'
+__version__ = '0.0.0.dev428'
+__revision__ = '302f3506177c6fb44a3b8786e8125ee75d322b0e'
 
 
 #

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

@@ -111,6 +111,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.dev428/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.dev428}/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.dev428}/omlish/secrets/secrets.py

@@ -11,7 +11,6 @@ TODO:
 """
 import abc
 import collections
-import logging
 import os
 import sys
 import time
@@ -21,12 +20,13 @@ import typing as ta
 from .. import dataclasses as dc
 from .. import lang
 from .. import marshal as msh
+from ..logs import all as logs
 
 
 msh.register_global_module_import('.marshal', __package__)
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -269,7 +269,7 @@ class LoggingSecrets(Secrets):
             self,
             child: Secrets,
             *,
-            log: logging.Logger | None = None,  # noqa
+            log: logs.LoggerLike | None = None,  # noqa
     ) -> None:
         super().__init__()
 

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

@@ -3,11 +3,11 @@
 import abc
 import concurrent.futures as cf
 import dataclasses as dc
-import logging
 import socket
 import typing as ta
 
 from ...lite.abstract import Abstract
+from ...logs.protocols import LoggerLike
 from ..addresses import SocketAndAddress
 from ..handlers import SocketHandler
 from ..io import SocketIoPair
@@ -142,7 +142,7 @@ class ExecutorSocketServerHandler(SocketServerHandler_):
 @dc.dataclass(frozen=True)
 class ExceptionLoggingSocketServerHandler(SocketServerHandler_):
     handler: SocketServerHandler
-    log: logging.Logger
+    log: LoggerLike
 
     ignored: ta.Optional[ta.Container[ta.Type[Exception]]] = None
 

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

@@ -11,6 +11,7 @@ import typing as ta
 from ...lite.abstract import Abstract
 from ...lite.contextmanagers import ExitStacked
 from ...lite.contextmanagers import defer
+from ...logs.protocols import LoggerLike
 from ..addresses import SocketAndAddress
 from ..bind import SocketBinder
 from ..io import close_socket_immediately
@@ -29,7 +30,7 @@ class SocketServer:
             handler: SocketServerHandler,
             *,
             on_error: ta.Optional[ta.Callable[[BaseException, ta.Optional[SocketAndAddress]], None]] = None,
-            error_logger: ta.Optional[logging.Logger] = _DEFAULT_LOGGER,
+            error_logger: ta.Optional[LoggerLike] = _DEFAULT_LOGGER,
             poll_interval: float = .5,
             shutdown_timeout: ta.Optional[float] = None,
     ) -> None:

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

@@ -1,9 +1,9 @@
 # ruff: noqa: UP006 UP007 UP045
 # @omlish-lite
 import dataclasses as dc
-import logging
 import typing as ta
 
+from ...logs.protocols import LoggerLike
 from ..addresses import SocketAndAddress
 from ..io import close_socket_immediately
 from .handlers import SocketServerHandler
@@ -17,7 +17,7 @@ from .handlers import SocketServerHandler_
 class SslErrorHandlingSocketServerHandler(SocketServerHandler_):
     handler: SocketServerHandler
 
-    log: ta.Optional[logging.Logger] = None
+    log: ta.Optional[LoggerLike] = None
 
     #
 

{omlish-0.0.0.dev427 → omlish-0.0.0.dev428}/omlish/subprocesses/base.py

@@ -9,6 +9,7 @@ import typing as ta
 
 from ..lite.abstract import Abstract
 from ..lite.timeouts import Timeout
+from ..logs.protocols import LoggerLike
 from .wrap import subprocess_maybe_shell_wrap_exec
 
 
@@ -55,12 +56,12 @@ class VerboseCalledProcessError(subprocess.CalledProcessError):
 
 
 class BaseSubprocesses(Abstract):
-    DEFAULT_LOGGER: ta.ClassVar[ta.Optional[logging.Logger]] = None
+    DEFAULT_LOGGER: ta.ClassVar[ta.Optional[LoggerLike]] = None
 
     def __init__(
             self,
             *,
-            log: ta.Optional[logging.Logger] = None,
+            log: ta.Optional[LoggerLike] = None,
             try_exceptions: ta.Optional[ta.Tuple[ta.Type[Exception], ...]] = None,
     ) -> None:
         super().__init__()
@@ -68,7 +69,7 @@ class BaseSubprocesses(Abstract):
         self._log = log if log is not None else self.DEFAULT_LOGGER
         self._try_exceptions = try_exceptions if try_exceptions is not None else self.DEFAULT_TRY_EXCEPTIONS
 
-    def set_logger(self, log: ta.Optional[logging.Logger]) -> None:
+    def set_logger(self, log: ta.Optional[LoggerLike]) -> None:
         self._log = log
 
     #

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

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

{omlish-0.0.0.dev427 → omlish-0.0.0.dev428}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev427'
+version = '0.0.0.dev428'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',

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

@@ -1,10 +0,0 @@
-# @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__'))