ominfra 0.0.0.dev428__py3-none-any.whl → 0.0.0.dev429__py3-none-any.whl

ominfra/scripts/journald2aws.py

@@ -2691,19 +2691,16 @@ def format_num_bytes(num_bytes: int) -> str:
 ##
 
 
-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
 
@@ -2728,8 +2725,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
@@ -2746,8 +2744,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
@@ -2760,8 +2759,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
@@ -2778,8 +2778,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
@@ -4912,7 +4913,9 @@ def check_lite_runtime_version() -> None:
 ##
 
 
-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
@@ -5036,7 +5039,9 @@ class JsonLoggingFormatter(logging.Formatter):
 ##
 
 
-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
@@ -5729,8 +5734,9 @@ def subprocess_maybe_shell_wrap_exec(*cmd: str) -> ta.Tuple[str, ...]:
 
 
 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:

ominfra/scripts/manage.py

@@ -3993,19 +3993,16 @@ def typing_annotations_attr() -> str:
 ##
 
 
-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
 
@@ -4030,8 +4027,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
@@ -4048,8 +4046,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
@@ -4062,8 +4061,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
@@ -4080,8 +4080,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
@@ -7590,7 +7591,9 @@ class PredicateTimeout(Timeout):
 ##
 
 
-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
@@ -7745,7 +7748,9 @@ class JsonLoggingFormatter(logging.Formatter):
 ##
 
 
-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
@@ -10965,8 +10970,9 @@ class DeploySpec(DeploySpecKeyed[DeployKey]):
 
 
 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:

ominfra/scripts/supervisor.py

@@ -3076,19 +3076,16 @@ def typing_annotations_attr() -> str:
 ##
 
 
-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
 
@@ -3113,8 +3110,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
@@ -3131,8 +3129,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
@@ -3145,8 +3144,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
@@ -3163,8 +3163,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
@@ -6177,7 +6178,9 @@ def check_lite_runtime_version() -> None:
 ##
 
 
-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
@@ -6332,7 +6335,9 @@ class JsonLoggingFormatter(logging.Formatter):
 ##
 
 
-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
@@ -9573,8 +9578,9 @@ class CoroHttpServer:
 
 
 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:

{ominfra-0.0.0.dev428.dist-info → ominfra-0.0.0.dev429.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev428
+Version: 0.0.0.dev429
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev428
-Requires-Dist: omlish==0.0.0.dev428
+Requires-Dist: omdev==0.0.0.dev429
+Requires-Dist: omlish==0.0.0.dev429
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev428.dist-info → ominfra-0.0.0.dev429.dist-info}/RECORD

@@ -112,9 +112,9 @@ ominfra/manage/targets/connection.py,sha256=mOHCsDVG-DZBhl3Mb7TTr1vhPb0gxDOOMW1x
 ominfra/manage/targets/inject.py,sha256=3M4wBkxtvymq_yhiotHlTN8iydELMjVCndyp9Bq-4eo,1572
 ominfra/manage/targets/targets.py,sha256=LjSQrDsHEjEQMDHcxtNKmLjy0YGLXJRGPFdUjazzFIM,1918
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=iUjxqPegHGyvIgUNWMPAeN2-P_sLfe_Nmf6naYicg7c,225783
-ominfra/scripts/manage.py,sha256=PopDg9ZR_2hAFOqr-HQF6Y_rasAUvPL_A8I1aXWYLZ8,449470
-ominfra/scripts/supervisor.py,sha256=51HD1rLxo5PhSXceIatbpVoatzs7Hf3cAJYuJ84dRFA,359209
+ominfra/scripts/journald2aws.py,sha256=PcwfGVueNPjOLOsig6J9phO2BMC7KGhag4mij0YVFFQ,225572
+ominfra/scripts/manage.py,sha256=LNPJYbNiIW_sYtXN7_Top02C4ry3-ftE3kOQKb-x9zY,449259
+ominfra/scripts/supervisor.py,sha256=Qbn0go8hCer5wO2r5EY-T8pszD33q8NGUIGwbTcOFi8,358998
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=XASv9C_CWI-u-yX5jVzhJrkJhlwQRkYQWQQG1uJwAd8,1375
 ominfra/tailscale/cli.py,sha256=zRV7-tKB7kBah1oTVZlol-vwx1FBlnfzYAPGkeU5jX4,3543
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=ePmo7cUAiBZARkM_3K4GKYZXxV73An_aioS1m-AAJis,6181
-ominfra-0.0.0.dev428.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev428.dist-info/METADATA,sha256=DgoChKK9hL_QYLqC-3iF7P2A56nIQLlawcecm_Kd_00,2377
-ominfra-0.0.0.dev428.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ominfra-0.0.0.dev428.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev428.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev428.dist-info/RECORD,,
+ominfra-0.0.0.dev429.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev429.dist-info/METADATA,sha256=1aOXl62enLVpevDZyuNFqKG_Y1aLk7pc7SzBYpqiBQE,2377
+ominfra-0.0.0.dev429.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ominfra-0.0.0.dev429.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev429.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev429.dist-info/RECORD,,