omlish 0.0.0.dev350__py3-none-any.whl → 0.0.0.dev352__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev350'
-__revision__ = 'd469538d3fe7c09eb1810deb5e2e2e0d300243a6'
+__version__ = '0.0.0.dev352'
+__revision__ = '538038adb75dc291a13579ef39744033ae4c6fc2'
 
 
 #

omlish/http/headers.py

@@ -2,6 +2,7 @@
 TODO:
  - handle secrets (but they're strs..)
 """
+import http.client
 import typing as ta
 
 from .. import cached
@@ -11,9 +12,15 @@ from .. import collections as col
 
 StrOrBytes: ta.TypeAlias = str | bytes
 
+
+##
+
+
 CanHttpHeaders: ta.TypeAlias = ta.Union[
     'HttpHeaders',
 
+    http.client.HTTPMessage,
+
     ta.Mapping[str, str],
     ta.Mapping[str, ta.Sequence[str]],
     ta.Mapping[str, str | ta.Sequence[str]],
@@ -42,7 +49,10 @@ class HttpHeaders:
 
         # TODO: optimized storage, 'use-whats-given'
         lst: list[tuple[bytes, bytes]] = []
-        if isinstance(src, ta.Mapping):
+        if isinstance(src, http.client.HTTPMessage):
+            lst = [(self._as_bytes(k), self._as_bytes(v)) for k, v in src.items()]
+
+        elif isinstance(src, ta.Mapping):
             for k, v in src.items():
                 if isinstance(v, (str, bytes)):
                     lst.append((self._as_bytes(k), self._as_bytes(v)))
@@ -181,6 +191,23 @@ class HttpHeaders:
     def items(self) -> ta.Iterable[tuple[bytes, bytes]]:
         return self._lst
 
+    #
+
+    def update(
+            self,
+            *items: tuple[bytes, bytes],  # FIXME: all arg types
+            override: bool = False,
+    ) -> 'HttpHeaders':
+        if override:
+            nks = {k.lower() for k, v in items}
+            src = [(k, v) for k, v in self.items() if k.lower() not in nks]
+        else:
+            src = list(self.items())
+        return HttpHeaders([
+            *src,
+            *items,
+        ])
+
 
 def headers(src: CanHttpHeaders) -> HttpHeaders:
     return HttpHeaders(src)

omlish/io/compress/gzip.py

@@ -313,7 +313,7 @@ class IncrementalGzipDecompressor:
                     crc = _zero_crc()
                     stream_size = 0  # Decompressed size of unconcatenated stream
                     last_mtime = yield from self._read_gzip_header(rdr)
-                    if not last_mtime:
+                    if last_mtime is None:
                         check.none((yield b''))
                         return
                     new_member = False

omlish/io/coro/__init__.py

@@ -53,4 +53,6 @@ from .stepped import (  # noqa
     read_into_str_stepped_coro,
 
     buffer_bytes_stepped_reader_coro,
+
+    iterable_bytes_stepped_coro,
 )

omlish/io/coro/stepped.py

@@ -190,3 +190,35 @@ def buffer_bytes_stepped_reader_coro(g: BytesSteppedReaderCoro) -> BytesSteppedC
                     return
             else:
                 break
+
+
+##
+
+
+@lang.autostart
+def iterable_bytes_stepped_coro(g: BytesSteppedCoro) -> ta.Generator[ta.Iterator[bytes], bytes, None]:
+    i: bytes | None = check.isinstance((yield None), bytes)  # type: ignore[misc]
+    eof = False
+
+    def f() -> ta.Iterator[bytes]:
+        nonlocal i
+        while True:
+            o = g.send(i)
+            i = None
+
+            if isinstance(o, bytes):
+                yield o
+                if not o:
+                    nonlocal eof
+                    eof = True
+                    return
+            elif o is None:
+                return
+            else:
+                raise TypeError(o)
+
+    while True:
+        if eof:
+            return
+
+        i = (yield f())  # noqa

omlish/iterators/__init__.py

@@ -10,7 +10,6 @@ from .recipes import (  # noqa
 )
 
 from .tools import (  # noqa
-    chunk,
     expand_indexed_pairs,
     merge_on,
     take,

omlish/iterators/tools.py

@@ -47,20 +47,6 @@ def take(n: int, iterable: ta.Iterable[T]) -> list[T]:
     return list(itertools.islice(iterable, n))
 
 
-def chunk(n: int, iterable: ta.Iterable[T], strict: bool = False) -> ta.Iterator[list[T]]:
-    # TODO: remove with 3.13 - 3.12 doesn't support strict
-    iterator = iter(functools.partial(take, n, iter(iterable)), [])
-    if strict:
-        def ret():
-            for chunk in iterator:
-                if len(chunk) != n:
-                    raise ValueError('iterable is not divisible by n.')
-                yield chunk
-        return iter(ret())
-    else:
-        return iterator
-
-
 def merge_on(
         function: ta.Callable[[T], U],
         *its: ta.Iterable[T],

omlish/lang/__init__.py

@@ -227,6 +227,7 @@ from .imports import (  # noqa
 from .iterables import (  # noqa
     IteratorWithReturn,
     asrange,
+    chunk,
     common_prefix_len,
     exhaust,
     flatmap,

omlish/lang/iterables.py

@@ -33,6 +33,20 @@ def peek(vs: ta.Iterable[T]) -> tuple[T, ta.Iterator[T]]:
     return v, itertools.chain(iter((v,)), it)
 
 
+def chunk(n: int, iterable: ta.Iterable[T], strict: bool = False) -> ta.Iterator[list[T]]:
+    # TODO: replace with itertools.batched in 3.13 - 3.12 doesn't support strict
+    iterator = iter(functools.partial(take, n, iter(iterable)), [])
+    if strict:
+        def ret():
+            for c in iterator:
+                if len(c) != n:
+                    raise ValueError('iterable is not divisible by n.')
+                yield c
+        return iter(ret())
+    else:
+        return iterator
+
+
 def interleave(vs: ta.Iterable[T], d: T) -> ta.Iterable[T]:
     for i, v in enumerate(vs):
         if i:

omlish/marshal/__init__.py

@@ -123,6 +123,10 @@ from .polymorphism.metadata import (  # noqa
     polymorphism_from_subclasses,
 )
 
+from .polymorphism.standard import (  # noqa
+    standard_polymorphism_factories,
+)
+
 from .polymorphism.unions import (  # noqa
     PRIMITIVE_UNION_TYPES,
     PolymorphismUnionMarshalerFactory,

omlish/marshal/polymorphism/standard.py

@@ -0,0 +1,22 @@
+import typing as ta
+
+from ..base import MarshalerFactory
+from ..base import UnmarshalerFactory
+from .marshal import PolymorphismMarshalerFactory
+from .metadata import Polymorphism
+from .metadata import TypeTagging
+from .metadata import WrapperTypeTagging
+from .unmarshal import PolymorphismUnmarshalerFactory
+
+
+##
+
+
+def standard_polymorphism_factories(
+        poly: Polymorphism,
+        tt: TypeTagging = WrapperTypeTagging(),
+) -> ta.Sequence[MarshalerFactory | UnmarshalerFactory]:
+    return [
+        PolymorphismMarshalerFactory(poly, tt),
+        PolymorphismUnmarshalerFactory(poly, tt),
+    ]

omlish/term/confirm.py

@@ -0,0 +1,40 @@
+import sys
+import typing as ta
+
+
+##
+
+
+def confirm_action(
+        message: str | None = None,
+        *,
+        stdin: ta.Any | None = None,
+        stdout: ta.Any | None = None,
+) -> bool:
+    if stdin is None:
+        stdin = sys.stdin
+    if not stdin.isatty():
+        raise OSError(f'stdin {stdin!r} is not a tty')
+
+    if stdout is None:
+        stdout = sys.stdout
+    if not stdout.isatty():
+        raise OSError(f'stdout {stdout!r} is not a tty')
+
+    while True:
+        if message and not message[-1].isspace():
+            if '\n' in message:
+                prefix = message + '\n\n'
+            else:
+                prefix = message + ' '
+        else:
+            prefix = ''
+
+        c = input(f'{prefix}(y/n): ').lower().strip()
+
+        if c == 'y':
+            return True
+        elif c == 'n':
+            return False
+        else:
+            print("Please enter 'y' for yes or 'n' for no.")

{omlish-0.0.0.dev350.dist-info → omlish-0.0.0.dev352.dist-info}/METADATA

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

{omlish-0.0.0.dev350.dist-info → omlish-0.0.0.dev352.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=AUKRnK6uBoxkzAoPrPIc6EXVm1J9Q64N8PRE-AyokNs,3478
+omlish/__about__.py,sha256=1QrsZ7a4tfaOZ2X4I1KvbNEhVOyaYwWqS4vdXo7oCaM,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -320,7 +320,7 @@ omlish/http/cookies.py,sha256=uuOYlHR6e2SC3GM41V0aozK10nef9tYg83Scqpn5-HM,6351
 omlish/http/dates.py,sha256=Otgp8wRxPgNGyzx8LFowu1vC4EKJYARCiAwLFncpfHM,2875
 omlish/http/encodings.py,sha256=w2WoKajpaZnQH8j-IBvk5ZFL2O2pAU_iBvZnkocaTlw,164
 omlish/http/handlers.py,sha256=XHv35iLAKAsnftGyJa27Ds9asfCmUtqMRVmrzOKJqck,3902
-omlish/http/headers.py,sha256=ZMmjrEiYjzo0YTGyK0YsvjdwUazktGqzVVYorY4fd44,5081
+omlish/http/headers.py,sha256=Ft7jsjDegcpzkXk2rk3uw8bEFIB7vifIfLMMwATDo1A,5716
 omlish/http/json.py,sha256=9XwAsl4966Mxrv-1ytyCqhcE6lbBJw-0_tFZzGszgHE,7440
 omlish/http/jwt.py,sha256=6Rigk1WrJ059DY4jDIKnxjnChWb7aFdermj2AI2DSvk,4346
 omlish/http/multipart.py,sha256=R9ycpHsXRcmh0uoc43aYb7BdWL-8kSQHe7J-M81aQZM,2240
@@ -383,28 +383,28 @@ omlish/io/compress/base.py,sha256=zwPnicyrEY-zersxdhxGHXxn02ycl8ew2uZXEecJea4,61
 omlish/io/compress/brotli.py,sha256=sNDX5HmEVqg9_xID5NTFPAWuvlNPw5ixfOnnIWwZf_o,1189
 omlish/io/compress/bz2.py,sha256=HtwBuBYHJ3MyWO9xJ0XhWpyIYTA3OszLrpu_J4kRRPA,1534
 omlish/io/compress/codecs.py,sha256=VBc_MAz0W8lVKTKavot3aVKOuPmEUquzarMtpyuteiU,1804
-omlish/io/compress/gzip.py,sha256=tSjZmLWc7BZugYhmv07Pjr_TaVD1X-0JnZIlAk67iyQ,12213
+omlish/io/compress/gzip.py,sha256=f5G-uqzL3HYF58dIolb8TghHeSGVSVodwW5vys1ouvk,12217
 omlish/io/compress/lz4.py,sha256=qaze1yVXexjJyN18Adh8fbTm_5pEeyytx66KoMUNpCU,2759
 omlish/io/compress/lzma.py,sha256=qDyshBgBUSPcZpAyXiRXnqI7zx7x60UpPxn8K3nN8aM,2469
 omlish/io/compress/snappy.py,sha256=JFoH_9l0Tr9AGaQ0jHRiP4TsFnG071l27mprCBcqt4c,704
 omlish/io/compress/zlib.py,sha256=dE38zBY4qNihUYtPjSpNRXweiw6mB6xsYqsBJklTDXM,2364
 omlish/io/compress/zstd.py,sha256=wik_HWLq_8fGAJgGyMGq9fhFQovot1aCH4lwMpihQmg,949
-omlish/io/coro/__init__.py,sha256=cfeng1ESiMlCU_ubI1aWcBD9IK0Im7emOTsggmlEjtI,1046
+omlish/io/coro/__init__.py,sha256=Mr8-GoDzOlA2sKmaDxuov2vPmjX_IeB_49I8dTSvjvA,1080
 omlish/io/coro/consts.py,sha256=4r6IMLBMic6MJHVn9UiORIkkPAuxsqtzFT3KV0fatC0,33
 omlish/io/coro/direct.py,sha256=Y--rP3wvBAYMeYctokb5IGd8UyQGmEFChyKISmRg5k0,294
 omlish/io/coro/readers.py,sha256=9VcXuBQ7BSoFen8UVuYFwnl2jJVjyilWV7QeqLNQtKU,4131
-omlish/io/coro/stepped.py,sha256=eAppRniUZ00rk3goWLU4zsd52MhZB2_YrOmFqs3RfR4,4929
+omlish/io/coro/stepped.py,sha256=xk7ODs_kSz_6IAmgW9682pMKGCuSVpzcGNvOsjoFzwI,5643
 omlish/io/fdio/__init__.py,sha256=XJMieft-Z-JEkpeARn0M1Jj7HYCjRHwfs2QfE8gdzQs,137
 omlish/io/fdio/handlers.py,sha256=Bw2jhrNili7XRlsf63mlSkrFPHmWM2jelb3BmWqy3Ok,1361
 omlish/io/fdio/kqueue.py,sha256=xRxDPKcOw5_bMDS0buF5xi12WHok4reNnnaYTX4kkCk,3843
 omlish/io/fdio/manager.py,sha256=I4KDZGo8fkBe0LAhpN0rmP9KJHyXRynypcCYsTzEjS4,1261
 omlish/io/fdio/pollers.py,sha256=nhSbzL8N9LBVsbGZngJySeCPqMjkax4NNiFgB7CLbfk,5513
-omlish/iterators/__init__.py,sha256=yMavf5FofiS1EU4UFuWPXiFZ03W0H-y7MuMxW8FUaEE,358
+omlish/iterators/__init__.py,sha256=yMPzA1GMTxP96FR1ruaWpNCr4_tRczhKq-cUpi5J_58,347
 omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8,3159
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
-omlish/iterators/tools.py,sha256=tdtWhwkPQq3sg7Brakrcbf8e1cOBg6e0TtwnSMnvEpg,2582
+omlish/iterators/tools.py,sha256=M16LXrJhMdsz5ea2qH0vws30ZvhQuQSCVFSLpRf_gTg,2096
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=nFH_r4AnosVDh6gyQ-2-y5OBgWiRik_Mx5hcN0TItdg,6434
+omlish/lang/__init__.py,sha256=vk7k-NT3QWB_YcBPAO6_ml2z3feVLuq69pweWX8ECOk,6445
 omlish/lang/attrs.py,sha256=zFiVuGVOq88x45464T_LxDa-ZEq_RD9zJLq2zeVEBDc,5105
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -417,7 +417,7 @@ omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
 omlish/lang/functions.py,sha256=qNqzWF6vI6PGTzKhgkhnNXP8e1gSerb8GsHG3_wVBP8,6386
 omlish/lang/generators.py,sha256=a4D5HU_mySs2T2z3xCmE_s3t4QJkj0YRrK4-hhpGd0A,5197
 omlish/lang/imports.py,sha256=y9W9Y-d_cQ35QCLuSIPoa6vnEqSErFCz8b-34IH128U,10552
-omlish/lang/iterables.py,sha256=krehpKGdOI5ZxqChS7pse5Kzj1B9M4qk4ruFnUdNtiE,2842
+omlish/lang/iterables.py,sha256=y1SX2Co3VsOeX2wlfFF7K3rwLvF7Dtre7VY6EpfwAwA,3338
 omlish/lang/objects.py,sha256=ZsibJwNp1EXorbaObm9TlCNtuuM65snCmVb7H4_llqI,6116
 omlish/lang/outcomes.py,sha256=mpFy_VoM-b74L1aCFsjsZVUHx_icZ1AHMOKeVesjOp4,8628
 omlish/lang/overrides.py,sha256=IBzK6ljfLX6TLgIyKTSjhqTLcuKRkQNVtEOnBLS4nuA,2095
@@ -490,7 +490,7 @@ omlish/manifests/base.py,sha256=5CmayiuzdXXv9hB5tDnWqfAosAoEQ26YG0B-emkiTXU,941
 omlish/manifests/load.py,sha256=XYSWJve4dYSaXNO4vSTv5REB6dqJEy9u-S0hoWOx8ko,6661
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=4iDPXWpJnLQkxnHtKqPNz3qdPgKzLpB3E5MTf9jYW8s,312
-omlish/marshal/__init__.py,sha256=7jIXe9wQv-if1iRUuU6a4MdHScTLFFL8X2JwHaNTAxI,3395
+omlish/marshal/__init__.py,sha256=SKPETuXI-XbjimU7nlJWo-ioANNzqn6IFBXkbqoPgIw,3480
 omlish/marshal/base.py,sha256=Q0ZRsz5z0NTI6PeWPc9mdMstJryDDbeIAdpKH9-SDps,11427
 omlish/marshal/errors.py,sha256=g5XJyTHd__8lfwQ4KwgK-E5WR6MoNTMrqKP2U_QRQQQ,307
 omlish/marshal/factories.py,sha256=Q926jSVjaQLEmStnHLhm_c_vqEysN1LnDCwAsFLIzXw,2970
@@ -519,6 +519,7 @@ omlish/marshal/objects/unmarshal.py,sha256=IXIl_iokvVCSWYhkRORrWP_sE1DVklnrUErGW
 omlish/marshal/polymorphism/__init__.py,sha256=e2UTrSL0qp7w_1vkdxDWd7sXlWhep2KPV49-BB64ma8,130
 omlish/marshal/polymorphism/marshal.py,sha256=wVaUxiHMJwyEWfQIE3cuEcJFSMVNJhpdJoa1yRgBPUE,2260
 omlish/marshal/polymorphism/metadata.py,sha256=Tvrjvi1kVhBbuljcQI60BXOIPEh-0_MGHXZDP-YKg1M,3335
+omlish/marshal/polymorphism/standard.py,sha256=Gj_fhmkWlY99oYjceP1N9SVOnaPCHRwtO812kJYIuhA,603
 omlish/marshal/polymorphism/unions.py,sha256=NDXh2aVCLUFfi10qvIZR39prtHwjndQiVl13XcIKV3k,4386
 omlish/marshal/polymorphism/unmarshal.py,sha256=5jJnDarY85PuGTeL_9bwoeHjNIZnfVN3zr5rVhmNoQc,2451
 omlish/marshal/singular/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -735,6 +736,7 @@ omlish/subprocesses/wrap.py,sha256=AhGV8rsnaVUMQCFYKkrjj35fs3O-VJLZC1hZ14dz3C8,7
 omlish/term/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/term/codes.py,sha256=fDRhUYzCzllcvCfMMgEroJaQoxqFsfTivpYdVmnwcCE,6390
 omlish/term/coloring.py,sha256=MCFYV_JTvEObTCJE12wfalW8OFFQB_KIFBKDtfES6Nk,2559
+omlish/term/confirm.py,sha256=5aqZnfy60K9CBSfXDsD-zA84HJm5fBWb_Y1T1x8gRnw,918
 omlish/term/progressbar.py,sha256=FtQqeIJCwSDWzraeG5uI9jKifQG1lOOyTpukJEpH22A,3672
 omlish/term/vt100/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/term/vt100/c.py,sha256=cAhDKXI81PZRtFmTotfad3HZGREP1QnOlWYoAw6v-Fw,3532
@@ -864,9 +866,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.dev350.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev350.dist-info/METADATA,sha256=B5RNI-pfzvV67WQMtelu7lKV6mR5c654rRJ-jwWvyUU,4416
-omlish-0.0.0.dev350.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev350.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev350.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev350.dist-info/RECORD,,
+omlish-0.0.0.dev352.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev352.dist-info/METADATA,sha256=jtHXPRnomM-Ci8TwuWsGIHCGIR2pFERjLhvwLc9hcZE,4416
+omlish-0.0.0.dev352.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev352.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev352.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev352.dist-info/RECORD,,