omlish 0.0.0.dev439__py3-none-any.whl → 0.0.0.dev440__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev439'
-__revision__ = '3f7c136d6cdb4f4c2e749cf404632d93585559e3'
+__version__ = '0.0.0.dev440'
+__revision__ = '7792777b41adb12f06ac8c2ecc82f5b7d2f8c99b'
 
 
 #

omlish/lifecycles/contextmanagers.py

@@ -36,7 +36,7 @@ class LifecycleContextManager(ta.Generic[LifecycleT]):
         self._lifecycle = lifecycle
         self._controller = lifecycle if isinstance(lifecycle, LifecycleController) else LifecycleController(lifecycle)
 
-    __repr__ = lang.attr_ops('lifecycle', 'state').repr
+    __repr__ = lang.attr_ops(lambda o: (o.lifecycle, o.state)).repr
 
     @property
     def lifecycle(self) -> LifecycleT:

omlish/lifecycles/controller.py

@@ -47,7 +47,7 @@ class AnyLifecycleController(AnyLifecycle[R], lang.Abstract, ta.Generic[AnyLifec
         self._state = LifecycleStates.NEW
         self._listeners: list[AnyLifecycleListener[AnyLifecycleT, R]] = []
 
-    __repr__ = lang.attr_ops('lifecycle', 'state').repr
+    __repr__ = lang.attr_ops(lambda o: (o.lifecycle, o.state)).repr
 
     @property
     def lifecycle(self) -> AnyLifecycleT:

omlish/lite/attrops.py

@@ -51,6 +51,7 @@ class AttrOps(ta.Generic[T]):
                 o: ta.Union[
                     str,
                     ta.Tuple[str, str],
+                    ta.Mapping[str, ta.Any],
                     'AttrOps.Attr',
                 ],
         ) -> 'AttrOps.Attr':
@@ -58,12 +59,16 @@ class AttrOps(ta.Generic[T]):
                 return o
             elif isinstance(o, str):
                 return cls(o)
-            else:
+            elif isinstance(o, tuple):
                 name, disp = o
                 return cls(
                     name,
                     display=disp,
                 )
+            elif isinstance(o, ta.Mapping):
+                return cls(**o)
+            else:
+                raise TypeError(o)
 
         @property
         def name(self) -> str:
@@ -87,6 +92,7 @@ class AttrOps(ta.Generic[T]):
             *attrs: ta.Sequence[ta.Union[
                 str,
                 ta.Tuple[str, str],
+                ta.Mapping[str, ta.Any],
                 Attr,
             ]],
             with_module: bool = False,
@@ -171,8 +177,8 @@ class AttrOps(ta.Generic[T]):
 
         attrs: ta.List[AttrOps.Attr] = []
         for o in raw:
-            if isinstance(o, AttrOps.Attr):
-                attrs.append(o)
+            if isinstance(o, (AttrOps.Attr, ta.Mapping)):
+                attrs.append(AttrOps.Attr.of(o))
                 continue
 
             if isinstance(o, tuple):

omlish/lite/inject.py

@@ -1,5 +1,5 @@
 # ruff: noqa: UP006 UP007 UP043 UP045
-# @omlish-amalg ../../omdev/scripts/inject.py
+# @omlish-amalg ../../omdev/scripts/lib/inject.py
 import abc
 import contextlib
 import contextvars

omlish/lite/marshal.py

@@ -1,5 +1,5 @@
 # ruff: noqa: UP006 UP007 UP045
-# @omlish-amalg ../../omdev/scripts/marshal.py
+# @omlish-amalg ../../omdev/scripts/lib/marshal.py
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version

omlish/logs/_amalg.py

@@ -0,0 +1,8 @@
+# @omlish-lite
+# @omlish-amalg ../../omdev/scripts/lib/logs.py
+from .base import AnyLogger  # noqa
+from .standard import configure_standard_logging  # noqa
+from .std.loggers import StdLogger  # noqa
+
+
+##

{omlish-0.0.0.dev439.dist-info → omlish-0.0.0.dev440.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev439
+Version: 0.0.0.dev440
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev439.dist-info → omlish-0.0.0.dev440.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.omlish-manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=dvgJrWD5N6Mjo6BacUkFRrr7AXjC5cDHEIJlldjLl-I,3575
+omlish/__about__.py,sha256=ztLqhA0Gv6PdeLN7Br7ZcSzbhP8AxdZD1iLcFEWqcI4,3575
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ZNIMl1kwg3qdei4DiUrJPQe5M81S1e76N-GuNSwLBAE,8683
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -464,8 +464,8 @@ omlish/lang/imports/traversal.py,sha256=pbFQIa880NGjSfcLsno2vE_G41_CLwDHb-7gWg2J
 omlish/lifecycles/__init__.py,sha256=zOuvV4pErPwxcKUSgshmME2Duw9GrjwckpNmW3FPKng,810
 omlish/lifecycles/abstract.py,sha256=1nMCFVislFq-boMD6TK9APIkRm_5OzcpSsDs2XnByVQ,2248
 omlish/lifecycles/base.py,sha256=sCmzj2F-JcFD2qDsjNOPhKSbDIJaT9CEKK19RqkP-sg,2462
-omlish/lifecycles/contextmanagers.py,sha256=42PCrvMF8TyhoWMwPxP1oliZpspGHwom3AJPguVwnI8,2078
-omlish/lifecycles/controller.py,sha256=cvRnXj3EyT5aB_1pqwckScQhspRiPQmT2Whh2Z5S-z0,4756
+omlish/lifecycles/contextmanagers.py,sha256=8-i1WJA79b_Jsv-tqvEkD4hh13UaHKXDOrhYZBIGz7E,2090
+omlish/lifecycles/controller.py,sha256=oFYc8m9TNwBSb6vqHxt9mFcpED7FdqehDfrIoli7fc4,4768
 omlish/lifecycles/manager.py,sha256=92s1IH_gDP25PM5tFuPMP2hD_6s5fPi_VzZiDS5549g,5449
 omlish/lifecycles/states.py,sha256=6gTdY3hn7-1sJ60lA3GeMx5RVKvXtFBBXE4KEjoO1Hs,1297
 omlish/lifecycles/transitions.py,sha256=3IFdWGtAeoy3XRlIyW7yCKV4e4Iof9ytkqklGMRFYQs,1944
@@ -473,16 +473,16 @@ omlish/lite/__init__.py,sha256=cyZEpGob7XjU8DohyNxVe5CQRk4CQ5vrHL42OdhQb8w,148
 omlish/lite/abstract.py,sha256=Z3kLviPNGLkmA8m8BZILzWxez_sP18OyzgMP3-c2-RI,4068
 omlish/lite/args.py,sha256=ILJXAiN3KjIoJwY42aKpYPngUdxHIy9ssVIExFVz3fE,978
 omlish/lite/asyncs.py,sha256=sTXTUTTVI8m1a1P6NxObQKk-NFKlmpcnNbucr4Fg-NU,937
-omlish/lite/attrops.py,sha256=ytH2uv_oocyhhlU3T7kHh3UEkdgUnDiGqeyXe3uxPY4,8772
+omlish/lite/attrops.py,sha256=qmXNDpbjel3qbH2kl-gRhdu6QYepw8lnC_Z_UEBI6Y8,9039
 omlish/lite/cached.py,sha256=ocQcppTwGdSnKPYMz75VoH526UUT8YtDJeRczBX0-wI,1306
 omlish/lite/check.py,sha256=ytCkwZoKfOlJqylL-AGm8C2WfsWJd2q3kFbnZCzX3_M,13844
 omlish/lite/configs.py,sha256=4-1uVxo-aNV7vMKa7PVNhM610eejG1WepB42-Dw2xQI,914
 omlish/lite/contextmanagers.py,sha256=usDzBoNqJi98AccVlwgZoMvoBXOe9wyx2MreZtWhJy4,5863
 omlish/lite/dataclasses.py,sha256=aRSCZz1jN_UI-CWJhN0SJeKxa-79vXNUZ6YOMgG31SE,3610
 omlish/lite/imports.py,sha256=GyEDKL-WuHtdOKIL-cc8aFd0-bHwZFDEjAB52ItabX0,1341
-omlish/lite/inject.py,sha256=tF0aI6uSNdhwQXXnnev6wKBG3ENbuajT_kBQpaGmNNQ,29155
+omlish/lite/inject.py,sha256=BQgjBj2mzJgMimLam-loSpQzcb31-8NYPVRQgHVv3cQ,29159
 omlish/lite/json.py,sha256=m0Ce9eqUZG23-H7-oOp8n1sf4fzno5vtK4AK_4Vc-Mg,706
-omlish/lite/marshal.py,sha256=JE5siS7WG_kdEpxTsHVcjIHjJN89cU2y4WtJhS5vgFs,23016
+omlish/lite/marshal.py,sha256=oVqVwqTArFUj9lYhmKg_MVgnqlCAUvOnYgtU3bBu_bk,23020
 omlish/lite/maybes.py,sha256=NusCpK0FVqkIutw6_Wldn69G5VyKYhat7SegBIQmGpk,4412
 omlish/lite/maysync.py,sha256=NiltEfX_mc7jWgWZ9XAqkDzMlLVprTAZvXRObXJT_IE,14926
 omlish/lite/objects.py,sha256=HzN_4J6w6WDLKDrW8jSNUKgfAR5vUsB42rtSCu04oqQ,1921
@@ -498,6 +498,7 @@ omlish/lite/types.py,sha256=QM9whf55r7TmmQBRApIWSlyVKsl1p_jcut_YheyZMFY,146
 omlish/lite/typing.py,sha256=m2CyJTz2OVOCPRvp-0UuEx7oleZgXqs3rYXijE0bTsA,1280
 omlish/lite/wrappers.py,sha256=d00Ls2kFHuogKd5wEBaU65VNCN10YXIZtiwu1mbMpmA,530
 omlish/logs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/logs/_amalg.py,sha256=XTfwEPyxNLHgDq3rEDa5WnotoyFIxvvcAKeqOFZxBY8,204
 omlish/logs/all.py,sha256=GqST35bRnHgpGmQXvtHih7kLaw5DcFgB32uxPGAsgSI,1717
 omlish/logs/base.py,sha256=Z1hfwYS2LgMJxFIyHiOvYa2meu2MH3kQDkhaWRNzt0M,5698
 omlish/logs/contexts.py,sha256=qMX-BrOKmYIBOXIlSntKJT9mcsRryTqfcTFp9K1GJmE,4836
@@ -826,9 +827,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev439.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev439.dist-info/METADATA,sha256=Sb_tGPltUyRpCzhFFI9-HrwblPX4hTyeVJ2SPrKxwD8,19003
-omlish-0.0.0.dev439.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev439.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev439.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev439.dist-info/RECORD,,
+omlish-0.0.0.dev440.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev440.dist-info/METADATA,sha256=WRE_PtouG98WjbjgEJLQjuvkhq2VcrgDl50Q5B3UmXA,19003
+omlish-0.0.0.dev440.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev440.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev440.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev440.dist-info/RECORD,,