omdev 0.0.0.dev431__tar.gz → 0.0.0.dev433__tar.gz

{omdev-0.0.0.dev431/omdev.egg-info → omdev-0.0.0.dev433}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev431
+Version: 0.0.0.dev433
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev431
+Requires-Dist: omlish==0.0.0.dev433
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
-Requires-Dist: pycparser~=2.22; extra == "all"
+Requires-Dist: pycparser~=2.23; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.0; extra == "all"
@@ -30,7 +30,7 @@ Requires-Dist: segno~=1.6; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.1; extra == "black"
 Provides-Extra: c
-Requires-Dist: pycparser~=2.22; extra == "c"
+Requires-Dist: pycparser~=2.23; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"

{omdev-0.0.0.dev431 → omdev-0.0.0.dev433}/omdev/.omlish-manifests.json

@@ -236,7 +236,7 @@
     "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/execstat.py",
-    "line": 89,
+    "line": 92,
     "value": {
       "!.cli.types.CliModule": {
         "name": "py/execstat",

{omdev-0.0.0.dev431 → omdev-0.0.0.dev433}/omdev/__about__.py

@@ -17,7 +17,7 @@ class Project(ProjectBase):
         ],
 
         'c': [
-            'pycparser ~= 2.22',
+            'pycparser ~= 2.23',
             'pcpp ~= 1.30',
         ],
 

{omdev-0.0.0.dev431 → omdev-0.0.0.dev433}/omdev/py/scripts/execstat.py

@@ -17,13 +17,14 @@ import typing as ta
 
 
 def _run(
+        report: 'ta.Callable[[dict], None]',
         src: str,
         *,
         setup: 'ta.Optional[str]' = None,
         time: bool = False,
         rss: bool = False,
         modules: bool = False,
-) -> dict:
+) -> None:
     if rss:
         import resource  # noqa
 
@@ -61,26 +62,28 @@ def _run(
 
     #
 
-    exec(code, globals(), ns)
+    try:
+        exec(code, globals(), ns)
 
-    #
+    finally:
+        #
 
-    if time:
-        end_time = get_time()
+        if time:
+            end_time = get_time()
 
-    if rss:
-        end_rss = get_rss()
+        if rss:
+            end_rss = get_rss()
 
-    if modules:
-        end_modules = get_modules()
+        if modules:
+            end_modules = get_modules()
 
-    #
+        #
 
-    return {
-        **({'time': (end_time - start_time)} if time else {}),  # noqa
-        **({'rss': (end_rss - start_rss)} if rss else {}),  # noqa
-        **({'modules': [m for m in end_modules if m not in start_modules]} if modules else {}),  # noqa
-    }
+        report({
+            **({'time': (end_time - start_time)} if time else {}),  # noqa
+            **({'rss': (end_rss - start_rss)} if rss else {}),  # noqa
+            **({'modules': [m for m in end_modules if m not in start_modules]} if modules else {}),  # noqa
+        })
 
 
 #
@@ -145,13 +148,10 @@ def _main() -> None:
 
         payload = '\n'.join([
             inspect.getsource(_run),
-            f'dct = _run(**{run_kw!r})',
-            f'import json',
-            f'with open({out_file!r}, "w") as f:',  # noqa
-            f'    f.write(json.dumps(dct))',
+            f'with open({out_file!r}, "w") as f: _run(lambda dct: f.write(__import__("json").dumps(dct)), **{run_kw!r})',  # noqa
         ])
 
-        subprocess.check_call([exe, '-c', payload])
+        subprocess.call([exe, '-c', payload])
 
         with open(out_file) as f:
             result = json.load(f)

{omdev-0.0.0.dev431 → omdev-0.0.0.dev433}/omdev/scripts/ci.py

@@ -7653,6 +7653,16 @@ class LoggingContext(Abstract):
             raise TypeError(f'LoggingContextInfo absent: {ty}')
         return info
 
+
+@ta.final
+class SimpleLoggingContext(LoggingContext):
+    def __init__(self, *infos: LoggingContextInfo) -> None:
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {type(i): i for i in infos}
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
+
 ##
 
 
@@ -7703,16 +7713,17 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
             stack_offset: int = 0,
             stack_info: bool = False,
     ) -> None:
-        # TODO: Name, Msg, Extra
-
         if time_ns is None:
             time_ns = time.time_ns()
 
+        # Done early to not trample on sys.exc_info()
+        exc = LoggingContextInfos.Exc.build(exc_info)
+
         self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {}
         self._set_info(
             LoggingContextInfos.Level.build(level),
+            exc,
             LoggingContextInfos.Time.build(time_ns),
-            LoggingContextInfos.Exc.build(exc_info),
         )
 
         if caller is not CaptureLoggingContextImpl.NOT_SET:
@@ -7854,10 +7865,14 @@ def _locking_logging_module_lock() -> ta.Iterator[None]:
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
-        json: bool = False,
         target: ta.Optional[logging.Logger] = None,
+
         force: bool = False,
+
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
+
+        formatter: ta.Optional[logging.Formatter] = None,  # noqa
+        json: bool = False,
 ) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -7878,11 +7893,11 @@ def configure_standard_logging(
 
         #
 
-        formatter: logging.Formatter
-        if json:
-            formatter = JsonLoggingFormatter()
-        else:
-            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        if formatter is None:
+            if json:
+                formatter = JsonLoggingFormatter()
+            else:
+                formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))  # noqa
         handler.setFormatter(formatter)
 
         #
@@ -9855,22 +9870,6 @@ class LoggingContextInfoRecordAdapters:
                 args=rec.args,
             )
 
-    # FIXME: handled specially - all unknown attrs on LogRecord
-    # class Extra(Adapter[LoggingContextInfos.Extra]):
-    #     _record_attrs: ta.ClassVar[ta.Mapping[str, ta.Union[ta.Any, ta.Tuple[ta.Any, ta.Any]]]] = dict()
-    #
-    #     def info_to_record(self, info: ta.Optional[LoggingContextInfos.Extra]) -> ta.Mapping[str, ta.Any]:
-    #         # FIXME:
-    #         # if extra is not None:
-    #         #     for key in extra:
-    #         #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
-    #         #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
-    #         #         rv.__dict__[key] = extra[key]
-    #         return dict()
-    #
-    #     def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Extra]:
-    #         return None
-
     class Time(RequiredAdapter[LoggingContextInfos.Time]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.Time]] = LoggingContextInfos.Time
 
@@ -9976,8 +9975,23 @@ class LoggingContextInfoRecordAdapters:
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Caller]:
             # FIXME: piecemeal?
-            # FIXME: strip _STACK_INFO_PREFIX
-            raise NotImplementedError
+            if (
+                    rec.pathname != self._UNKNOWN_PATH_NAME and
+                    rec.lineno != 0 and
+                    rec.funcName != self._UNKNOWN_FUNC_NAME
+            ):
+                if (sinfo := rec.stack_info) is not None and sinfo.startswith(self._STACK_INFO_PREFIX):
+                    sinfo = sinfo[len(self._STACK_INFO_PREFIX):]
+                return LoggingContextInfos.Caller(
+                    file_path=rec.pathname,
+
+                    line_no=rec.lineno,
+                    func_name=rec.funcName,
+
+                    stack_info=sinfo,
+                )
+
+            return None
 
     class SourceFile(Adapter[LoggingContextInfos.SourceFile]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.SourceFile]] = LoggingContextInfos.SourceFile
@@ -10013,9 +10027,9 @@ class LoggingContextInfoRecordAdapters:
             )
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.SourceFile]:
-            if not (
-                    rec.module is None or
-                    rec.module == self._UNKNOWN_MODULE
+            if (
+                    rec.module is not None and
+                    rec.module != self._UNKNOWN_MODULE
             ):
                 return LoggingContextInfos.SourceFile(
                     file_name=rec.filename,
@@ -10168,16 +10182,11 @@ _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS: ta.Mapping[ta.Type[LoggingContextInfo], L
 ##
 
 
-KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
-    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
-)
-
-
 # Formatter:
 #  - https://github.com/python/cpython/blob/39b2f82717a69dde7212bc39b673b0f55c99e6a3/Lib/logging/__init__.py#L514 (3.8)
 #  - https://github.com/python/cpython/blob/f070f54c5f4a42c7c61d1d5d3b8f3b7203b4a0fb/Lib/logging/__init__.py#L554 (~3.14)  # noqa
 #
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     # The logged message, computed as msg % args. Set to `record.getMessage()`.
     message=str,
 
@@ -10191,7 +10200,15 @@ KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     exc_text=ta.Optional[str],
 )
 
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
+
+##
+
+
+_KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
+    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
+)
+
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
 
 
 class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
@@ -10201,13 +10218,13 @@ class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
 def _check_std_logging_record_attrs() -> None:
     if (
             len([a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs]) !=
-            len(KNOWN_STD_LOGGING_RECORD_ATTR_SET)
+            len(_KNOWN_STD_LOGGING_RECORD_ATTR_SET)
     ):
         raise RuntimeError('Duplicate LoggingContextInfoRecordAdapter record attrs')
 
     rec_dct = dict(logging.makeLogRecord({}).__dict__)
 
-    if (unk_rec_fields := frozenset(rec_dct) - KNOWN_STD_LOGGING_RECORD_ATTR_SET):
+    if (unk_rec_fields := frozenset(rec_dct) - _KNOWN_STD_LOGGING_RECORD_ATTR_SET):
         import warnings  # noqa
 
         warnings.warn(
@@ -10233,11 +10250,60 @@ class LoggingContextLogRecord(logging.LogRecord):
     #  - exc_info: LoggingExcInfoTuple | None
     #  - func: str | None = None -> funcName
     #  - sinfo: str | None = None -> stack_info
+    #
 
     def __init__(self, *, _logging_context: LoggingContext) -> None:  # noqa
+        self.__dict__.update(_logging_context=_logging_context)
+
         for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_:
             self.__dict__.update(ad.context_to_record(_logging_context))
 
+    _logging_context: LoggingContext
+
+    # FIXME: track extra
+    # def __setattr__(self, key, value):
+    #     super().__setattr__(key, value)
+
+
+##
+
+
+@ta.final
+class LogRecordLoggingContext(LoggingContext):
+    def __init__(self, rec: logging.LogRecord) -> None:
+        if isinstance(rec, LoggingContextLogRecord):
+            raise TypeError(rec)
+
+        self._rec = rec
+
+        infos: ta.List[LoggingContextInfo] = [
+            info
+            for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_
+            if (info := ad.record_to_info(rec)) is not None
+        ]
+
+        # FIXME:
+        # if extra is not None:
+        #     for key in extra:
+        #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
+        #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
+        #         rv.__dict__[key] = extra[key]
+
+        if (extra := {
+            a: v
+            for a, v in rec.__dict__.items()
+            if a not in _KNOWN_STD_LOGGING_RECORD_ATTR_SET
+        }):
+            infos.append(LoggingContextInfos.Extra(extra))
+
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
+            type(info): info
+            for info in infos
+        }
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
 
 ########################################
 # ../../../omlish/secrets/tempssl.py

{omdev-0.0.0.dev431 → omdev-0.0.0.dev433}/omdev/scripts/interp.py

@@ -4220,10 +4220,14 @@ def _locking_logging_module_lock() -> ta.Iterator[None]:
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
-        json: bool = False,
         target: ta.Optional[logging.Logger] = None,
+
         force: bool = False,
+
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
+
+        formatter: ta.Optional[logging.Formatter] = None,  # noqa
+        json: bool = False,
 ) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -4244,11 +4248,11 @@ def configure_standard_logging(
 
         #
 
-        formatter: logging.Formatter
-        if json:
-            formatter = JsonLoggingFormatter()
-        else:
-            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        if formatter is None:
+            if json:
+                formatter = JsonLoggingFormatter()
+            else:
+                formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))  # noqa
         handler.setFormatter(formatter)
 
         #

{omdev-0.0.0.dev431 → omdev-0.0.0.dev433}/omdev/scripts/pyproject.py

@@ -7116,6 +7116,16 @@ class LoggingContext(Abstract):
             raise TypeError(f'LoggingContextInfo absent: {ty}')
         return info
 
+
+@ta.final
+class SimpleLoggingContext(LoggingContext):
+    def __init__(self, *infos: LoggingContextInfo) -> None:
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {type(i): i for i in infos}
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
+
 ##
 
 
@@ -7166,16 +7176,17 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
             stack_offset: int = 0,
             stack_info: bool = False,
     ) -> None:
-        # TODO: Name, Msg, Extra
-
         if time_ns is None:
             time_ns = time.time_ns()
 
+        # Done early to not trample on sys.exc_info()
+        exc = LoggingContextInfos.Exc.build(exc_info)
+
         self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {}
         self._set_info(
             LoggingContextInfos.Level.build(level),
+            exc,
             LoggingContextInfos.Time.build(time_ns),
-            LoggingContextInfos.Exc.build(exc_info),
         )
 
         if caller is not CaptureLoggingContextImpl.NOT_SET:
@@ -7317,10 +7328,14 @@ def _locking_logging_module_lock() -> ta.Iterator[None]:
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
-        json: bool = False,
         target: ta.Optional[logging.Logger] = None,
+
         force: bool = False,
+
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
+
+        formatter: ta.Optional[logging.Formatter] = None,  # noqa
+        json: bool = False,
 ) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -7341,11 +7356,11 @@ def configure_standard_logging(
 
         #
 
-        formatter: logging.Formatter
-        if json:
-            formatter = JsonLoggingFormatter()
-        else:
-            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        if formatter is None:
+            if json:
+                formatter = JsonLoggingFormatter()
+            else:
+                formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))  # noqa
         handler.setFormatter(formatter)
 
         #
@@ -8000,22 +8015,6 @@ class LoggingContextInfoRecordAdapters:
                 args=rec.args,
             )
 
-    # FIXME: handled specially - all unknown attrs on LogRecord
-    # class Extra(Adapter[LoggingContextInfos.Extra]):
-    #     _record_attrs: ta.ClassVar[ta.Mapping[str, ta.Union[ta.Any, ta.Tuple[ta.Any, ta.Any]]]] = dict()
-    #
-    #     def info_to_record(self, info: ta.Optional[LoggingContextInfos.Extra]) -> ta.Mapping[str, ta.Any]:
-    #         # FIXME:
-    #         # if extra is not None:
-    #         #     for key in extra:
-    #         #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
-    #         #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
-    #         #         rv.__dict__[key] = extra[key]
-    #         return dict()
-    #
-    #     def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Extra]:
-    #         return None
-
     class Time(RequiredAdapter[LoggingContextInfos.Time]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.Time]] = LoggingContextInfos.Time
 
@@ -8121,8 +8120,23 @@ class LoggingContextInfoRecordAdapters:
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Caller]:
             # FIXME: piecemeal?
-            # FIXME: strip _STACK_INFO_PREFIX
-            raise NotImplementedError
+            if (
+                    rec.pathname != self._UNKNOWN_PATH_NAME and
+                    rec.lineno != 0 and
+                    rec.funcName != self._UNKNOWN_FUNC_NAME
+            ):
+                if (sinfo := rec.stack_info) is not None and sinfo.startswith(self._STACK_INFO_PREFIX):
+                    sinfo = sinfo[len(self._STACK_INFO_PREFIX):]
+                return LoggingContextInfos.Caller(
+                    file_path=rec.pathname,
+
+                    line_no=rec.lineno,
+                    func_name=rec.funcName,
+
+                    stack_info=sinfo,
+                )
+
+            return None
 
     class SourceFile(Adapter[LoggingContextInfos.SourceFile]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.SourceFile]] = LoggingContextInfos.SourceFile
@@ -8158,9 +8172,9 @@ class LoggingContextInfoRecordAdapters:
             )
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.SourceFile]:
-            if not (
-                    rec.module is None or
-                    rec.module == self._UNKNOWN_MODULE
+            if (
+                    rec.module is not None and
+                    rec.module != self._UNKNOWN_MODULE
             ):
                 return LoggingContextInfos.SourceFile(
                     file_name=rec.filename,
@@ -8313,16 +8327,11 @@ _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS: ta.Mapping[ta.Type[LoggingContextInfo], L
 ##
 
 
-KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
-    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
-)
-
-
 # Formatter:
 #  - https://github.com/python/cpython/blob/39b2f82717a69dde7212bc39b673b0f55c99e6a3/Lib/logging/__init__.py#L514 (3.8)
 #  - https://github.com/python/cpython/blob/f070f54c5f4a42c7c61d1d5d3b8f3b7203b4a0fb/Lib/logging/__init__.py#L554 (~3.14)  # noqa
 #
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     # The logged message, computed as msg % args. Set to `record.getMessage()`.
     message=str,
 
@@ -8336,7 +8345,15 @@ KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     exc_text=ta.Optional[str],
 )
 
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
+
+##
+
+
+_KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
+    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
+)
+
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
 
 
 class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
@@ -8346,13 +8363,13 @@ class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
 def _check_std_logging_record_attrs() -> None:
     if (
             len([a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs]) !=
-            len(KNOWN_STD_LOGGING_RECORD_ATTR_SET)
+            len(_KNOWN_STD_LOGGING_RECORD_ATTR_SET)
     ):
         raise RuntimeError('Duplicate LoggingContextInfoRecordAdapter record attrs')
 
     rec_dct = dict(logging.makeLogRecord({}).__dict__)
 
-    if (unk_rec_fields := frozenset(rec_dct) - KNOWN_STD_LOGGING_RECORD_ATTR_SET):
+    if (unk_rec_fields := frozenset(rec_dct) - _KNOWN_STD_LOGGING_RECORD_ATTR_SET):
         import warnings  # noqa
 
         warnings.warn(
@@ -8378,11 +8395,60 @@ class LoggingContextLogRecord(logging.LogRecord):
     #  - exc_info: LoggingExcInfoTuple | None
     #  - func: str | None = None -> funcName
     #  - sinfo: str | None = None -> stack_info
+    #
 
     def __init__(self, *, _logging_context: LoggingContext) -> None:  # noqa
+        self.__dict__.update(_logging_context=_logging_context)
+
         for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_:
             self.__dict__.update(ad.context_to_record(_logging_context))
 
+    _logging_context: LoggingContext
+
+    # FIXME: track extra
+    # def __setattr__(self, key, value):
+    #     super().__setattr__(key, value)
+
+
+##
+
+
+@ta.final
+class LogRecordLoggingContext(LoggingContext):
+    def __init__(self, rec: logging.LogRecord) -> None:
+        if isinstance(rec, LoggingContextLogRecord):
+            raise TypeError(rec)
+
+        self._rec = rec
+
+        infos: ta.List[LoggingContextInfo] = [
+            info
+            for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_
+            if (info := ad.record_to_info(rec)) is not None
+        ]
+
+        # FIXME:
+        # if extra is not None:
+        #     for key in extra:
+        #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
+        #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
+        #         rv.__dict__[key] = extra[key]
+
+        if (extra := {
+            a: v
+            for a, v in rec.__dict__.items()
+            if a not in _KNOWN_STD_LOGGING_RECORD_ATTR_SET
+        }):
+            infos.append(LoggingContextInfos.Extra(extra))
+
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
+            type(info): info
+            for info in infos
+        }
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
 
 ########################################
 # ../../../omlish/subprocesses/base.py

{omdev-0.0.0.dev431 → omdev-0.0.0.dev433/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev431
+Version: 0.0.0.dev433
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev431
+Requires-Dist: omlish==0.0.0.dev433
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
-Requires-Dist: pycparser~=2.22; extra == "all"
+Requires-Dist: pycparser~=2.23; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.0; extra == "all"
@@ -30,7 +30,7 @@ Requires-Dist: segno~=1.6; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.1; extra == "black"
 Provides-Extra: c
-Requires-Dist: pycparser~=2.22; extra == "c"
+Requires-Dist: pycparser~=2.23; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"