omdev 0.0.0.dev429__tar.gz → 0.0.0.dev430__tar.gz

{omdev-0.0.0.dev429/omdev.egg-info → omdev-0.0.0.dev430}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev429
+Version: 0.0.0.dev430
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev429
+Requires-Dist: omlish==0.0.0.dev430
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev429 → omdev-0.0.0.dev430}/omdev/scripts/ci.py

@@ -1833,8 +1833,8 @@ class LoggingSourceFileInfo(ta.NamedTuple):
             return None
 
         return cls(
-            file_name,
-            module,
+            file_name=file_name,
+            module=module,
         )
 
 
@@ -1851,9 +1851,9 @@ class LoggingThreadInfo(ta.NamedTuple):
     @classmethod
     def build(cls) -> 'LoggingThreadInfo':
         return cls(
-            threading.get_ident(),
-            threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
-            threading.current_thread().name,
+            ident=threading.get_ident(),
+            native_id=threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
+            name=threading.current_thread().name,
         )
 
 
@@ -1868,7 +1868,7 @@ class LoggingProcessInfo(ta.NamedTuple):
     @classmethod
     def build(cls) -> 'LoggingProcessInfo':
         return cls(
-            os.getpid(),
+            pid=os.getpid(),
         )
 
 
@@ -1887,7 +1887,7 @@ class LoggingMultiprocessingInfo(ta.NamedTuple):
             return None
 
         return cls(
-            mp.current_process().name,
+            process_name=mp.current_process().name,
         )
 
 
@@ -1914,7 +1914,7 @@ class LoggingAsyncioTaskInfo(ta.NamedTuple):
             return None
 
         return cls(
-            task.get_name(),  # Always non-None
+            name=task.get_name(),  # Always non-None
         )
 
 
@@ -1937,36 +1937,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
+
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
 
-    _effective_name: ta.Optional[str]
+    #
+
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
+
+        self._name_and_offset = t
+        return t
 
-        self._effective_name = n
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
+
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -1986,6 +2016,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../omlish/logs/std/filters.py
 
@@ -5008,10 +5041,10 @@ class LoggingCaller(ta.NamedTuple):
                 sinfo = sinfo[:-1]
 
         return cls(
-            f.f_code.co_filename,
-            f.f_lineno or 0,
-            f.f_code.co_name,
-            sinfo,
+            file_path=f.f_code.co_filename,
+            line_no=f.f_lineno or 0,
+            name=f.f_code.co_name,
+            stack_info=sinfo,
         )
 
 
@@ -5022,6 +5055,7 @@ class LoggingCaller(ta.NamedTuple):
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 
@@ -5160,9 +5194,9 @@ class LoggingTimeFields(ta.NamedTuple):
         relative_created = (time_ns - start_time_ns) / 1e6
 
         return cls(
-            created,
-            msecs,
-            relative_created,
+            created=created,
+            msecs=msecs,
+            relative_created=relative_created,
         )
 
 
@@ -9436,7 +9470,6 @@ class CoroHttpServer:
 
 
 class AnyLogger(Abstract, ta.Generic[T]):
-    @ta.final
     def is_enabled_for(self, level: LogLevel) -> bool:
         return level >= self.get_effective_level()
 
@@ -9635,7 +9668,7 @@ class AsyncLogger(AnyLogger[ta.Awaitable[None]], Abstract):
 class AnyNopLogger(AnyLogger[T], Abstract):
     @ta.final
     def get_effective_level(self) -> LogLevel:
-        return 999
+        return -999
 
 
 @ta.final
@@ -11138,7 +11171,7 @@ class CoroHttpServerSocketHandler(SocketHandler_):
 
 
 ########################################
-# ../../../omlish/logs/std/adapters.py
+# ../../../omlish/logs/std/loggers.py
 
 
 ##
@@ -11154,6 +11187,9 @@ class StdLogger(Logger):
     def std(self) -> logging.Logger:
         return self._std
 
+    def is_enabled_for(self, level: LogLevel) -> bool:
+        return self._std.isEnabledFor(level)
+
     def get_effective_level(self) -> LogLevel:
         return self._std.getEffectiveLevel()
 

{omdev-0.0.0.dev429 → omdev-0.0.0.dev430}/omdev/scripts/interp.py

@@ -1407,36 +1407,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
+
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
+
+    #
 
-    _effective_name: ta.Optional[str]
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
+
+        self._name_and_offset = t
+        return t
+
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
 
-        self._effective_name = n
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -1456,6 +1486,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../omlish/logs/std/filters.py
 
@@ -2826,6 +2859,7 @@ class PredicateTimeout(Timeout):
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 

{omdev-0.0.0.dev429 → omdev-0.0.0.dev430}/omdev/scripts/pyproject.py

@@ -2992,8 +2992,8 @@ class LoggingSourceFileInfo(ta.NamedTuple):
             return None
 
         return cls(
-            file_name,
-            module,
+            file_name=file_name,
+            module=module,
         )
 
 
@@ -3010,9 +3010,9 @@ class LoggingThreadInfo(ta.NamedTuple):
     @classmethod
     def build(cls) -> 'LoggingThreadInfo':
         return cls(
-            threading.get_ident(),
-            threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
-            threading.current_thread().name,
+            ident=threading.get_ident(),
+            native_id=threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
+            name=threading.current_thread().name,
         )
 
 
@@ -3027,7 +3027,7 @@ class LoggingProcessInfo(ta.NamedTuple):
     @classmethod
     def build(cls) -> 'LoggingProcessInfo':
         return cls(
-            os.getpid(),
+            pid=os.getpid(),
         )
 
 
@@ -3046,7 +3046,7 @@ class LoggingMultiprocessingInfo(ta.NamedTuple):
             return None
 
         return cls(
-            mp.current_process().name,
+            process_name=mp.current_process().name,
         )
 
 
@@ -3073,7 +3073,7 @@ class LoggingAsyncioTaskInfo(ta.NamedTuple):
             return None
 
         return cls(
-            task.get_name(),  # Always non-None
+            name=task.get_name(),  # Always non-None
         )
 
 
@@ -3096,36 +3096,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
+
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
 
-    _effective_name: ta.Optional[str]
+    #
+
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
+
+        self._name_and_offset = t
+        return t
 
-        self._effective_name = n
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
+
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -3145,6 +3175,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../omlish/logs/std/filters.py
 
@@ -5588,10 +5621,10 @@ class LoggingCaller(ta.NamedTuple):
                 sinfo = sinfo[:-1]
 
         return cls(
-            f.f_code.co_filename,
-            f.f_lineno or 0,
-            f.f_code.co_name,
-            sinfo,
+            file_path=f.f_code.co_filename,
+            line_no=f.f_lineno or 0,
+            name=f.f_code.co_name,
+            stack_info=sinfo,
         )
 
 
@@ -5602,6 +5635,7 @@ class LoggingCaller(ta.NamedTuple):
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 
@@ -5740,9 +5774,9 @@ class LoggingTimeFields(ta.NamedTuple):
         relative_created = (time_ns - start_time_ns) / 1e6
 
         return cls(
-            created,
-            msecs,
-            relative_created,
+            created=created,
+            msecs=msecs,
+            relative_created=relative_created,
         )
 
 
@@ -7581,7 +7615,6 @@ InterpProviders = ta.NewType('InterpProviders', ta.Sequence[InterpProvider])
 
 
 class AnyLogger(Abstract, ta.Generic[T]):
-    @ta.final
     def is_enabled_for(self, level: LogLevel) -> bool:
         return level >= self.get_effective_level()
 
@@ -7780,7 +7813,7 @@ class AsyncLogger(AnyLogger[ta.Awaitable[None]], Abstract):
 class AnyNopLogger(AnyLogger[T], Abstract):
     @ta.final
     def get_effective_level(self) -> LogLevel:
-        return 999
+        return -999
 
 
 @ta.final
@@ -8390,7 +8423,7 @@ class InterpResolver:
 
 
 ########################################
-# ../../../omlish/logs/std/adapters.py
+# ../../../omlish/logs/std/loggers.py
 
 
 ##
@@ -8406,6 +8439,9 @@ class StdLogger(Logger):
     def std(self) -> logging.Logger:
         return self._std
 
+    def is_enabled_for(self, level: LogLevel) -> bool:
+        return self._std.isEnabledFor(level)
+
     def get_effective_level(self) -> LogLevel:
         return self._std.getEffectiveLevel()
 

{omdev-0.0.0.dev429 → omdev-0.0.0.dev430/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev429
+Version: 0.0.0.dev430
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev429
+Requires-Dist: omlish==0.0.0.dev430
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev429 → omdev-0.0.0.dev430}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev429
+omlish==0.0.0.dev430
 
 [all]
 black~=25.1

{omdev-0.0.0.dev429 → omdev-0.0.0.dev430}/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.dev429'
+version = '0.0.0.dev430'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev429',
+    'omlish == 0.0.0.dev430',
 ]
 
 [project.optional-dependencies]