omlish 0.0.0.dev7__tar.gz → 0.0.0.dev9__tar.gz

{omlish-0.0.0.dev7/omlish.egg-info → omlish-0.0.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev7
+Version: 0.0.0.dev9
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev7 → omlish-0.0.0.dev9}/omlish/__about__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.0.dev7'
+__version__ = '0.0.0.dev9'
 
 
 #
@@ -105,6 +105,6 @@ class SetuptoolsBase:
 
 class Setuptools(SetuptoolsBase):
     find_packages = {
-        'include': ['omlish', 'omlish.*'],
+        'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],
     }

omlish-0.0.0.dev9/omlish/lite/logs.py

@@ -0,0 +1,121 @@
+"""
+TODO:
+ - translate json keys
+ - debug
+"""
+# ruff: noqa: UP006 UP007 N802
+import datetime
+import logging
+import threading
+import typing as ta
+
+from .json import json_dumps_compact
+
+
+log = logging.getLogger(__name__)
+
+
+##
+
+
+class TidLogFilter(logging.Filter):
+
+    def filter(self, record):
+        record.tid = threading.get_native_id()
+        return True
+
+
+##
+
+
+class JsonLogFormatter(logging.Formatter):
+
+    KEYS: ta.Mapping[str, bool] = {
+        'name': False,
+        'msg': False,
+        'args': False,
+        'levelname': False,
+        'levelno': False,
+        'pathname': False,
+        'filename': False,
+        'module': False,
+        'exc_info': True,
+        'exc_text': True,
+        'stack_info': True,
+        'lineno': False,
+        'funcName': False,
+        'created': False,
+        'msecs': False,
+        'relativeCreated': False,
+        'thread': False,
+        'threadName': False,
+        'processName': False,
+        'process': False,
+    }
+
+    def format(self, record: logging.LogRecord) -> str:
+        dct = {
+            k: v
+            for k, o in self.KEYS.items()
+            for v in [getattr(record, k)]
+            if not (o and v is None)
+        }
+        return json_dumps_compact(dct)
+
+
+##
+
+
+STANDARD_LOG_FORMAT_PARTS = [
+    ('asctime', '%(asctime)-15s'),
+    ('process', 'pid=%(process)-6s'),
+    ('thread', 'tid=%(thread)-16s'),
+    ('levelname', '%(levelname)-8s'),
+    ('name', '%(name)s'),
+    ('separator', '::'),
+    ('message', '%(message)s'),
+]
+
+
+class StandardLogFormatter(logging.Formatter):
+
+    @staticmethod
+    def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
+        return ' '.join(v for k, v in parts)
+
+    converter = datetime.datetime.fromtimestamp  # type: ignore
+
+    def formatTime(self, record, datefmt=None):
+        ct = self.converter(record.created)  # type: ignore
+        if datefmt:
+            return ct.strftime(datefmt)  # noqa
+        else:
+            t = ct.strftime("%Y-%m-%d %H:%M:%S")  # noqa
+            return '%s.%03d' % (t, record.msecs)
+
+
+##
+
+
+def configure_standard_logging(
+        level: ta.Union[int, str] = logging.INFO,
+        *,
+        json: bool = False,
+) -> logging.Handler:
+    handler = logging.StreamHandler()
+
+    formatter: logging.Formatter
+    if json:
+        formatter = JsonLogFormatter()
+    else:
+        formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+    handler.setFormatter(formatter)
+
+    handler.addFilter(TidLogFilter())
+
+    logging.root.addHandler(handler)
+
+    if level is not None:
+        logging.root.setLevel(level)
+
+    return handler

{omlish-0.0.0.dev7 → omlish-0.0.0.dev9}/omlish/lite/marshal.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
+ - nonstrict toggle
 """
 # ruff: noqa: UP006 UP007
 import abc
@@ -143,12 +144,13 @@ class IterableObjMarshaler(ObjMarshaler):
 class DataclassObjMarshaler(ObjMarshaler):
     ty: type
     fs: ta.Mapping[str, ObjMarshaler]
+    nonstrict: bool = False
 
     def marshal(self, o: ta.Any) -> ta.Any:
         return {k: m.marshal(getattr(o, k)) for k, m in self.fs.items()}
 
     def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items()})
+        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if self.nonstrict or k in self.fs})
 
 
 @dc.dataclass(frozen=True)

omlish-0.0.0.dev9/omlish/logs/__init__.py

@@ -0,0 +1,13 @@
+from .configs import (  # noqa
+    configure_standard_logging,
+)
+
+from .formatters import (  # noqa
+    ColorLogFormatter,
+    JsonLogFormatter,
+    StandardLogFormatter,
+)
+
+from .utils import (  # noqa
+    error_logging,
+)

{omlish-0.0.0.dev7 → omlish-0.0.0.dev9}/omlish/logs/configs.py

@@ -2,9 +2,10 @@ import dataclasses as dc
 import logging
 import typing as ta
 
-from .filters import TidFilter
-from .formatters import JsonLogFormatter
-from .formatters import StandardLogFormatter
+from ..lite.logs import configure_standard_logging as configure_lite_standard_logging
+
+
+##
 
 
 NOISY_LOGGERS: set[str] = {
@@ -16,6 +17,9 @@ NOISY_LOGGERS: set[str] = {
 }
 
 
+##
+
+
 @dc.dataclass()
 class DictConfig:
     version: int = 1
@@ -33,19 +37,8 @@ FormatterConfig = dict[str, ta.Any]
 HandlerConfig = dict[str, ta.Any]
 LoggerConfig = dict[str, ta.Any]
 
-STANDARD_LOG_FORMAT_PARTS = [
-    ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
-    ('thread', 'tid=%(thread)-16s'),
-    ('levelname', '%(levelname)-8s'),
-    ('name', '%(name)s'),
-    ('separator', '::'),
-    ('message', '%(message)s'),
-]
-
 
-def build_log_format(parts: ta.Iterable[tuple[str, str]]) -> str:
-    return ' '.join(v for k, v in parts)
+##
 
 
 def configure_standard_logging(
@@ -53,21 +46,10 @@ def configure_standard_logging(
         *,
         json: bool = False,
 ) -> logging.Handler:
-    handler = logging.StreamHandler()
-
-    formatter: logging.Formatter
-    if json:
-        formatter = JsonLogFormatter()
-    else:
-        formatter = StandardLogFormatter(build_log_format(STANDARD_LOG_FORMAT_PARTS))
-    handler.setFormatter(formatter)
-
-    handler.addFilter(TidFilter())
-
-    logging.root.addHandler(handler)
-
-    if level is not None:
-        logging.root.setLevel(level)
+    handler = configure_lite_standard_logging(
+        level,
+        json=json,
+    )
 
     for noisy_logger in NOISY_LOGGERS:
         logging.getLogger(noisy_logger).setLevel(logging.WARNING)

omlish-0.0.0.dev9/omlish/logs/formatters.py

@@ -0,0 +1,26 @@
+# ruff: noqa: ANN201 N802
+import logging
+import typing as ta
+
+from .. import term
+from ..lite.logs import JsonLogFormatter  # noqa
+from ..lite.logs import StandardLogFormatter
+
+
+class ColorLogFormatter(StandardLogFormatter):
+
+    LEVEL_COLORS: ta.Mapping[int, term.SGRs.FG] = {
+        logging.WARNING: term.SGRs.FG.BRIGHT_YELLOW,
+        logging.ERROR: term.SGRs.FG.BRIGHT_RED,
+        logging.CRITICAL: term.SGRs.FG.BRIGHT_RED,
+    }
+
+    def formatMessage(self, record):
+        buf = super().formatMessage(record)
+        try:
+            c = self.LEVEL_COLORS[record.levelno]
+        except KeyError:
+            pass
+        else:
+            buf = term.SGR(c) + buf + term.SGR(term.SGRs.RESET)
+        return buf

{omlish-0.0.0.dev7 → omlish-0.0.0.dev9/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev7
+Version: 0.0.0.dev9
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev7 → omlish-0.0.0.dev9}/omlish.egg-info/SOURCES.txt

@@ -201,7 +201,6 @@ omlish/lite/subprocesses.py
 omlish/logs/__init__.py
 omlish/logs/_abc.py
 omlish/logs/configs.py
-omlish/logs/filters.py
 omlish/logs/formatters.py
 omlish/logs/utils.py
 omlish/marshal/__init__.py

{omlish-0.0.0.dev7 → omlish-0.0.0.dev9}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev7'
+version = '0.0.0.dev9'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev7/omlish/lite/logs.py

@@ -1,52 +0,0 @@
-"""
-TODO:
- - debug
-"""
-# ruff: noqa: UP007
-import logging
-import typing as ta
-
-from .json import json_dumps_compact
-
-
-log = logging.getLogger(__name__)
-
-
-class JsonLogFormatter(logging.Formatter):
-
-    KEYS: ta.Mapping[str, bool] = {
-        'name': False,
-        'msg': False,
-        'args': False,
-        'levelname': False,
-        'levelno': False,
-        'pathname': False,
-        'filename': False,
-        'module': False,
-        'exc_info': True,
-        'exc_text': True,
-        'stack_info': True,
-        'lineno': False,
-        'funcName': False,
-        'created': False,
-        'msecs': False,
-        'relativeCreated': False,
-        'thread': False,
-        'threadName': False,
-        'processName': False,
-        'process': False,
-    }
-
-    def format(self, record: logging.LogRecord) -> str:
-        dct = {
-            k: v
-            for k, o in self.KEYS.items()
-            for v in [getattr(record, k)]
-            if not (o and v is None)
-        }
-        return json_dumps_compact(dct)
-
-
-def configure_standard_logging(level: ta.Union[int, str] = logging.INFO) -> None:
-    logging.root.addHandler(logging.StreamHandler())
-    logging.root.setLevel(level)

omlish-0.0.0.dev7/omlish/logs/__init__.py

@@ -1,9 +0,0 @@
-from .configs import build_log_format  # noqa
-from .configs import configure_standard_logging  # noqa
-from .configs import DictConfig  # noqa
-from .configs import NOISY_LOGGERS  # noqa
-from .configs import STANDARD_LOG_FORMAT_PARTS  # noqa
-from .filters import TidFilter  # noqa
-from .formatters import ColorLogFormatter  # noqa
-from .formatters import JsonLogFormatter  # noqa
-from .utils import error_logging  # noqa

omlish-0.0.0.dev7/omlish/logs/filters.py

@@ -1,11 +0,0 @@
-# ruff: noqa: ANN201
-
-import logging
-import threading
-
-
-class TidFilter(logging.Filter):
-
-    def filter(self, record):
-        record.tid = threading.get_native_id()
-        return True

omlish-0.0.0.dev7/omlish/logs/formatters.py

@@ -1,76 +0,0 @@
-# ruff: noqa: ANN201
-# ruff: noqa: N802
-
-import datetime
-import logging
-import typing as ta
-
-from .. import term
-from ..formats import json
-
-
-class StandardLogFormatter(logging.Formatter):
-
-    converter = datetime.datetime.fromtimestamp  # type: ignore
-
-    def formatTime(self, record, datefmt=None):
-        ct = self.converter(record.created)  # type: ignore
-        if datefmt:
-            return ct.strftime(datefmt)  # noqa
-        else:
-            t = ct.strftime("%Y-%m-%d %H:%M:%S")  # noqa
-            return '%s.%03d' % (t, record.msecs)
-
-
-class ColorLogFormatter(StandardLogFormatter):
-
-    LEVEL_COLORS: ta.Mapping[int, term.SGRs.FG] = {
-        logging.WARNING: term.SGRs.FG.BRIGHT_YELLOW,
-        logging.ERROR: term.SGRs.FG.BRIGHT_RED,
-        logging.CRITICAL: term.SGRs.FG.BRIGHT_RED,
-    }
-
-    def formatMessage(self, record):
-        buf = super().formatMessage(record)
-        try:
-            c = self.LEVEL_COLORS[record.levelno]
-        except KeyError:
-            pass
-        else:
-            buf = term.SGR(c) + buf + term.SGR(term.SGRs.RESET)
-        return buf
-
-
-class JsonLogFormatter(logging.Formatter):
-
-    KEYS: ta.Mapping[str, bool] = {
-        'name': False,
-        'msg': False,
-        'args': False,
-        'levelname': False,
-        'levelno': False,
-        'pathname': False,
-        'filename': False,
-        'module': False,
-        'exc_info': True,
-        'exc_text': True,
-        'stack_info': True,
-        'lineno': False,
-        'funcName': False,
-        'created': False,
-        'msecs': False,
-        'relativeCreated': False,
-        'thread': False,
-        'threadName': False,
-        'processName': False,
-        'process': False,
-    }
-
-    def format(self, record: logging.LogRecord) -> str:
-        dct = {
-            k: v
-            for k, o in self.KEYS.items()
-            for v in [getattr(record, k)]
-            if not (o and v is None)
-        }
-        return json.dumps_compact(dct)