omdev 0.0.0.dev432__py3-none-any.whl → 0.0.0.dev433__py3-none-any.whl

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/__about__.py

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

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/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/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.dist-info → omdev-0.0.0.dev433.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev432
+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.dev432
+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.dev432.dist-info → omdev-0.0.0.dev433.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omdev/.omlish-manifests.json,sha256=KfVVQzsOja2Zhq2VWbwmRSR_KN9aYcFWehbVCuM2AjA,11909
-omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
+omdev/.omlish-manifests.json,sha256=h7weS1edP_S_5YO-kYLD8Exg4kW60JQXsHH4mKmgmpM,11909
+omdev/__about__.py,sha256=x-dVL4rAhU7f3I8Y98CN8oHwxcqwEF3-W9KA4dBmdTc,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=gu49t10_syXh_TUJs4POsxeFs8we8Y3XTOOPgIXmGvg,4608
 omdev/imgur.py,sha256=oqei705LhSnLWQTOMHMHwRecRXcpSEP90Sg4SVINPQ0,3133
@@ -255,7 +255,7 @@ omdev/py/docstrings/parser.py,sha256=umJEgQBkSXLwWIKZrBbFCfNrz847vpTNDqTTEwlvHpA
 omdev/py/docstrings/rest.py,sha256=c2xPYg_W01W9eYY_KLKX69E4qu4jpkgUshi5K5EyVv8,5221
 omdev/py/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/scripts/bumpversion.py,sha256=UDMtTd_wfkqsmrtHqTKDilWVzUBigzZAOCVND7t9jyw,1124
-omdev/py/scripts/execstat.py,sha256=-c5ioQRruBrD5M0QDzSMaaq4Oe3X3-1O_d63bXjE5EI,4717
+omdev/py/scripts/execstat.py,sha256=iJD48Mn8lF4V7hNvOrChfBRjmItWJTAQzWwHM0wSTBk,4792
 omdev/py/scripts/importtrace.py,sha256=OOf9GvB6PWP2uVzogSYsM5JGUAoSfMx1IKfYUXB8ABc,14245
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=4dCH0coX0OqNwesteKaTE8GxuSfLhgXYQlzNUXLiSNY,4640
@@ -273,9 +273,9 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=1nKcai_SPxE8HT2z8xhSkZVKZO2-A4GeObjM_2kqD-E,423451
+omdev/scripts/ci.py,sha256=Bk7Y3M0trwgTYnOP8RXuNI6f5YrnBa4fyANRW-S62GU,423440
 omdev/scripts/interp.py,sha256=39U9gjJQX0feYdXE9VpzKsE3msVBM-LiLwKaCgWNTKU,166443
-omdev/scripts/pyproject.py,sha256=xbPIEQvYPqCW7AtHltPrvi2ZN89CawIAZTg5YOGyDIQ,330510
+omdev/scripts/pyproject.py,sha256=DV-nS6mF7_d4c08TWoZKGWc-_xcSpobJ2pad5UDTx2Q,330499
 omdev/scripts/slowcat.py,sha256=PwdT-pg62imEEb6kcOozl9_YUi-4KopvjvzWT1OmGb0,2717
 omdev/scripts/tmpexec.py,sha256=t0nErDRALjTk7H0X8ADjZUIDFjlPNzOOokmjCjBHdzs,1431
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -319,9 +319,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev432.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev432.dist-info/METADATA,sha256=RHFIF2qFH4KPwpOiRWn8a00maajlHXO8rM74IECWlVc,5100
-omdev-0.0.0.dev432.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev432.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev432.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev432.dist-info/RECORD,,
+omdev-0.0.0.dev433.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev433.dist-info/METADATA,sha256=BICjsiPYpqxurhsQbqj2SDGXDUc9-p20F9LlkU_bilQ,5100
+omdev-0.0.0.dev433.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev433.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev433.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev433.dist-info/RECORD,,