omlish 0.0.0.dev7__py3-none-any.whl → 0.0.0.dev9__py3-none-any.whl

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/lite/logs.py

@@ -1,9 +1,12 @@
 """
 TODO:
+ - translate json keys
  - debug
 """
-# ruff: noqa: UP007
+# ruff: noqa: UP006 UP007 N802
+import datetime
 import logging
+import threading
 import typing as ta
 
 from .json import json_dumps_compact
@@ -12,6 +15,19 @@ 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] = {
@@ -47,6 +63,59 @@ class JsonLogFormatter(logging.Formatter):
         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)
+##
+
+
+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/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/logs/__init__.py

@@ -1,9 +1,13 @@
-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
+from .configs import (  # noqa
+    configure_standard_logging,
+)
+
+from .formatters import (  # noqa
+    ColorLogFormatter,
+    JsonLogFormatter,
+    StandardLogFormatter,
+)
+
+from .utils import (  # noqa
+    error_logging,
+)

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/logs/formatters.py

@@ -1,25 +1,10 @@
-# ruff: noqa: ANN201
-# ruff: noqa: N802
-
-import datetime
+# ruff: noqa: ANN201 N802
 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)
+from ..lite.logs import JsonLogFormatter  # noqa
+from ..lite.logs import StandardLogFormatter
 
 
 class ColorLogFormatter(StandardLogFormatter):
@@ -39,38 +24,3 @@ class ColorLogFormatter(StandardLogFormatter):
         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)

{omlish-0.0.0.dev7.dist-info → omlish-0.0.0.dev9.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omlish/__about__.py,sha256=TwqdcftpXPLJwEH5TJ-OVm9QOL9L13Atq8Ew7Kie3rk,2266
+omlish/__about__.py,sha256=JCY-M7iylNgcjr0_K9gugS_gLwRxaJNSTA-wGF9lork,2279
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=QRQmX9G0-L_nATkFtGHvpd4qrpYzKATdjuFLbBqzJPM,6224
 omlish/bootstrap.py,sha256=3pGNiHlUcQl81q76_Wesd4pblmy82EOKkcdgectF15Q,18820
@@ -182,18 +182,17 @@ omlish/lite/cached.py,sha256=dUm647FbIsoxWT23XUFM51F7i-C2Buxr5b5zzgbCtQI,546
 omlish/lite/check.py,sha256=DR3Zj-7o4Y7pNheln68nN_BdX9zaotGQ2y8v97GDiWQ,535
 omlish/lite/contextmanagers.py,sha256=HnQJiyrOmSvTL22XRJrFl5CLpCyHD9fsntEUAr9G-60,427
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
-omlish/lite/logs.py,sha256=UJURLPKZvPnnF-6B7ySM36KO3auzz9DsSYKug0dF454,1197
-omlish/lite/marshal.py,sha256=MUn5DeuLheMZBiwnWwYXqRWPeSuXYpC7mm32oZ0mQN4,8526
+omlish/lite/logs.py,sha256=VrZMlHgUK6o1zHaKNgHLecIozv49cZ8vwY43wJ_6-pE,2646
+omlish/lite/marshal.py,sha256=5uwri-KzPiktnbYORkGXcJ4kulZvp_nS4MxPsU1Y-G0,8608
 omlish/lite/reflect.py,sha256=9QYJwdINraq1JNMEgvoqeSlVvRRgOXpxAkpgX8EgRXc,1307
 omlish/lite/runtime.py,sha256=VUhmNQvwf8QzkWSKj4Q0ReieJA_PzHaJNRBivfTseow,452
 omlish/lite/secrets.py,sha256=ToaS10AcH7UOFi7XHKp2mikLErp1Rrne5mtFJ388hF8,462
 omlish/lite/strings.py,sha256=9dO_A6EkhcTZ2xmOUGSOMT-mx9BnoOzYu1-ocSrDJaA,670
 omlish/lite/subprocesses.py,sha256=KuGV3ImehMjCUK0JoV3pUtG_7o5wei1lRDn9HxzByAg,3063
-omlish/logs/__init__.py,sha256=V8jEdb5rj9Dli0b9qtR0ZYstRoIlxWqbU38UmEOXbfY,419
+omlish/logs/__init__.py,sha256=UPMdG3mbUm4PUJw6muXs4dk-uNE0aMDj_XebKCa-Wpk,224
 omlish/logs/_abc.py,sha256=UgrCUQVUi_PvT3p1CEkb3P74CFrFcZq2AFby3GEUv9M,5974
-omlish/logs/configs.py,sha256=yHumOuo5rWsOf2hnF2eyHHz-NKSLd-VBw8IRq-r94EM,1981
-omlish/logs/filters.py,sha256=dk-_sRQhp_rCGF48qpPj5viHOBEOu78quXe9pHHs78c,187
-omlish/logs/formatters.py,sha256=lI2KB8w_PDVX4YkWkImtki0MRKN2dlT6F2KTNEhYRJA,1970
+omlish/logs/configs.py,sha256=Dnd5nm6OUD_n4YDtP4VuDo8flIofU-xf7xlw-t9FVv8,1285
+omlish/logs/formatters.py,sha256=AFs9C6-qrFkgXZ0nL39wih_LGck1Tc79alvGyibBdQo,720
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
 omlish/marshal/__init__.py,sha256=52Jl7SgSA0Ei7TBrNmcbXCcICiU6oBS9NhjGg8zvgKI,1383
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
@@ -261,8 +260,8 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=KGgo0wHOIMVMZtDso-rhSWKAcAkYAH2IGpg9tULabu8,6505
-omlish-0.0.0.dev7.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev7.dist-info/METADATA,sha256=JWyAEL1oLxlMaL4EHFxm8F1fcMe7EU2QLi-jlYSgGlQ,2121
-omlish-0.0.0.dev7.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-omlish-0.0.0.dev7.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev7.dist-info/RECORD,,
+omlish-0.0.0.dev9.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev9.dist-info/METADATA,sha256=tN28LGRcGl7hlNnWZpgTkPsCT2YtQqMpW8btdAREiss,2121
+omlish-0.0.0.dev9.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+omlish-0.0.0.dev9.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev9.dist-info/RECORD,,

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