omdev 0.0.0.dev432__tar.gz → 0.0.0.dev434__tar.gz

{omdev-0.0.0.dev432/omdev.egg-info → omdev-0.0.0.dev434}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev432
+Version: 0.0.0.dev434
 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.dev432
+Requires-Dist: omlish==0.0.0.dev434
 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.dev432 → omdev-0.0.0.dev434}/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.dev432 → omdev-0.0.0.dev434}/omdev/__about__.py

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

{omdev-0.0.0.dev432 → omdev-0.0.0.dev434}/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.dev432 → omdev-0.0.0.dev434}/omdev/scripts/ci.py

@@ -7713,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:
@@ -9869,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
 
@@ -10265,13 +10250,20 @@ 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._logging_context = _logging_context
+        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)
+
 
 ##
 
@@ -10284,10 +10276,29 @@ class LogRecordLoggingContext(LoggingContext):
 
         self._rec = rec
 
-        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
-            type(info): info
+        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]:

{omdev-0.0.0.dev432 → omdev-0.0.0.dev434}/omdev/scripts/pyproject.py

@@ -7176,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:
@@ -8014,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
 
@@ -8410,13 +8395,20 @@ 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._logging_context = _logging_context
+        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)
+
 
 ##
 
@@ -8429,10 +8421,29 @@ class LogRecordLoggingContext(LoggingContext):
 
         self._rec = rec
 
-        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
-            type(info): info
+        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]:

{omdev-0.0.0.dev432 → omdev-0.0.0.dev434/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev432
+Version: 0.0.0.dev434
 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.dev432
+Requires-Dist: omlish==0.0.0.dev434
 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.dev432 → omdev-0.0.0.dev434}/omdev.egg-info/requires.txt

@@ -1,8 +1,8 @@
-omlish==0.0.0.dev432
+omlish==0.0.0.dev434
 
 [all]
 black~=25.1
-pycparser~=2.22
+pycparser~=2.23
 pcpp~=1.30
 docutils~=0.22
 markdown-it-py~=4.0
@@ -17,7 +17,7 @@ segno~=1.6
 black~=25.1
 
 [c]
-pycparser~=2.22
+pycparser~=2.23
 pcpp~=1.30
 
 [doc]

{omdev-0.0.0.dev432 → omdev-0.0.0.dev434}/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.dev432'
+version = '0.0.0.dev434'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,13 +24,13 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev432',
+    'omlish == 0.0.0.dev434',
 ]
 
 [project.optional-dependencies]
 all = [
     'black ~= 25.1',
-    'pycparser ~= 2.22',
+    'pycparser ~= 2.23',
     'pcpp ~= 1.30',
     'docutils ~= 0.22',
     'markdown-it-py ~= 4.0',
@@ -45,7 +45,7 @@ black = [
     'black ~= 25.1',
 ]
 c = [
-    'pycparser ~= 2.22',
+    'pycparser ~= 2.23',
     'pcpp ~= 1.30',
 ]
 doc = [