omlish 0.0.0.dev142__tar.gz → 0.0.0.dev144__tar.gz

{omlish-0.0.0.dev142/omlish.egg-info → omlish-0.0.0.dev144}/PKG-INFO

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

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev142'
-__revision__ = 'fe684cfe6dc46f867fb6990935e8b145b67bbefa'
+__version__ = '0.0.0.dev144'
+__revision__ = '4d901652b9972fb965683ca3ac965147536a9dd4'
 
 
 #

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish/collections/coerce.py

@@ -334,4 +334,5 @@ def map_of_or_none(
     value_fn = _unpack_fn(value_fn)
     return inner
 
+
 # endregion

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish/docker/__init__.py

@@ -14,7 +14,6 @@ from .compose import (  # noqa
 )
 
 from .helpers import (  # noqa
-    DOCKER_FOR_MAC_HOSTNAME,
     DOCKER_HOST_PLATFORM_KEY,
     get_docker_host_platform,
     timebomb_payload,
@@ -32,5 +31,7 @@ from .hub import (  # noqa
 
 
 from ..lite.docker import (  # noqa
+    DOCKER_FOR_MAC_HOSTNAME,
+
     is_likely_in_docker,
 )

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish/docker/helpers.py

@@ -21,12 +21,6 @@ def timebomb_payload(delay_s: float, name: str = _DEFAULT_TIMEBOMB_NAME) -> str:
 ##
 
 
-DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'
-
-
-##
-
-
 # Set by pyproject, docker-dev script
 DOCKER_HOST_PLATFORM_KEY = 'DOCKER_HOST_PLATFORM'
 

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish/lite/docker.py

@@ -2,6 +2,9 @@ import re
 import sys
 
 
+DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'
+
+
 _LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/(docker|desktop-containerd)/')
 
 

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish/lite/marshal.py

@@ -32,21 +32,26 @@ T = ta.TypeVar('T')
 ##
 
 
+@dc.dataclass(frozen=True)
+class ObjMarshalOptions:
+    raw_bytes: bool = False
+
+
 class ObjMarshaler(abc.ABC):
     @abc.abstractmethod
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         raise NotImplementedError
 
 
 class NopObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
 
@@ -54,29 +59,29 @@ class NopObjMarshaler(ObjMarshaler):
 class ProxyObjMarshaler(ObjMarshaler):
     m: ta.Optional[ObjMarshaler] = None
 
-    def marshal(self, o: ta.Any) -> ta.Any:
-        return check_not_none(self.m).marshal(o)
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return check_not_none(self.m).marshal(o, opts)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
-        return check_not_none(self.m).unmarshal(o)
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return check_not_none(self.m).unmarshal(o, opts)
 
 
 @dc.dataclass(frozen=True)
 class CastObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty(o)
 
 
 class DynamicObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return marshal_obj(o)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
 
@@ -84,21 +89,36 @@ class DynamicObjMarshaler(ObjMarshaler):
 class Base64ObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return base64.b64encode(o).decode('ascii')
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty(base64.b64decode(o))
 
 
+@dc.dataclass(frozen=True)
+class BytesSwitchedObjMarshaler(ObjMarshaler):
+    m: ObjMarshaler
+
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        if opts.raw_bytes:
+            return o
+        return self.m.marshal(o, opts)
+
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        if opts.raw_bytes:
+            return o
+        return self.m.unmarshal(o, opts)
+
+
 @dc.dataclass(frozen=True)
 class EnumObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o.name
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty.__members__[o]  # type: ignore
 
 
@@ -106,15 +126,15 @@ class EnumObjMarshaler(ObjMarshaler):
 class OptionalObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         if o is None:
             return None
-        return self.item.marshal(o)
+        return self.item.marshal(o, opts)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         if o is None:
             return None
-        return self.item.unmarshal(o)
+        return self.item.unmarshal(o, opts)
 
 
 @dc.dataclass(frozen=True)
@@ -123,11 +143,11 @@ class MappingObjMarshaler(ObjMarshaler):
     km: ObjMarshaler
     vm: ObjMarshaler
 
-    def marshal(self, o: ta.Any) -> ta.Any:
-        return {self.km.marshal(k): self.vm.marshal(v) for k, v in o.items()}
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return {self.km.marshal(k, opts): self.vm.marshal(v, opts) for k, v in o.items()}
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty((self.km.unmarshal(k), self.vm.unmarshal(v)) for k, v in o.items())
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return self.ty((self.km.unmarshal(k, opts), self.vm.unmarshal(v, opts)) for k, v in o.items())
 
 
 @dc.dataclass(frozen=True)
@@ -135,11 +155,11 @@ class IterableObjMarshaler(ObjMarshaler):
     ty: type
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any) -> ta.Any:
-        return [self.item.marshal(e) for e in o]
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return [self.item.marshal(e, opts) for e in o]
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(self.item.unmarshal(e) for e in o)
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return self.ty(self.item.unmarshal(e, opts) for e in o)
 
 
 @dc.dataclass(frozen=True)
@@ -148,11 +168,11 @@ class DataclassObjMarshaler(ObjMarshaler):
     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 marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return {k: m.marshal(getattr(o, k), opts) 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() if not self.nonstrict or k in self.fs})
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return self.ty(**{k: self.fs[k].unmarshal(v, opts) for k, v in o.items() if not self.nonstrict or k in self.fs})
 
 
 @dc.dataclass(frozen=True)
@@ -172,50 +192,50 @@ class PolymorphicObjMarshaler(ObjMarshaler):
             {i.tag: i for i in impls},
         )
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         impl = self.impls_by_ty[type(o)]
-        return {impl.tag: impl.m.marshal(o)}
+        return {impl.tag: impl.m.marshal(o, opts)}
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         [(t, v)] = o.items()
         impl = self.impls_by_tag[t]
-        return impl.m.unmarshal(v)
+        return impl.m.unmarshal(v, opts)
 
 
 @dc.dataclass(frozen=True)
 class DatetimeObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o.isoformat()
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty.fromisoformat(o)  # type: ignore
 
 
 class DecimalObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return str(check_isinstance(o, decimal.Decimal))
 
-    def unmarshal(self, v: ta.Any) -> ta.Any:
+    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return decimal.Decimal(check_isinstance(v, str))
 
 
 class FractionObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         fr = check_isinstance(o, fractions.Fraction)
         return [fr.numerator, fr.denominator]
 
-    def unmarshal(self, v: ta.Any) -> ta.Any:
+    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         num, denom = check_isinstance(v, list)
         return fractions.Fraction(num, denom)
 
 
 class UuidObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return str(o)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return uuid.UUID(o)
 
 
@@ -225,7 +245,7 @@ class UuidObjMarshaler(ObjMarshaler):
 _DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
     **{t: NopObjMarshaler() for t in (type(None),)},
     **{t: CastObjMarshaler(t) for t in (int, float, str, bool)},
-    **{t: Base64ObjMarshaler(t) for t in (bytes, bytearray)},
+    **{t: BytesSwitchedObjMarshaler(Base64ObjMarshaler(t)) for t in (bytes, bytearray)},
     **{t: IterableObjMarshaler(t, DynamicObjMarshaler()) for t in (list, tuple, set, frozenset)},
     **{t: MappingObjMarshaler(t, DynamicObjMarshaler(), DynamicObjMarshaler()) for t in (dict,)},
 
@@ -258,12 +278,16 @@ class ObjMarshalerManager:
     def __init__(
             self,
             *,
+            default_options: ObjMarshalOptions = ObjMarshalOptions(),
+
             default_obj_marshalers: ta.Dict[ta.Any, ObjMarshaler] = _DEFAULT_OBJ_MARSHALERS,  # noqa
             generic_mapping_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_MAPPING_TYPES,  # noqa
             generic_iterable_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES,  # noqa
     ) -> None:
         super().__init__()
 
+        self._default_options = default_options
+
         self._obj_marshalers = dict(default_obj_marshalers)
         self._generic_mapping_types = generic_mapping_types
         self._generic_iterable_types = generic_iterable_types
@@ -372,11 +396,35 @@ class ObjMarshalerManager:
 
     #
 
-    def marshal_obj(self, o: ta.Any, ty: ta.Any = None) -> ta.Any:
-        return self.get_obj_marshaler(ty if ty is not None else type(o)).marshal(o)
-
-    def unmarshal_obj(self, o: ta.Any, ty: ta.Union[ta.Type[T], ta.Any]) -> T:
-        return self.get_obj_marshaler(ty).unmarshal(o)
+    def marshal_obj(
+            self,
+            o: ta.Any,
+            ty: ta.Any = None,
+            opts: ta.Optional[ObjMarshalOptions] = None,
+    ) -> ta.Any:
+        m = self.get_obj_marshaler(ty if ty is not None else type(o))
+        return m.marshal(o, opts or self._default_options)
+
+    def unmarshal_obj(
+            self,
+            o: ta.Any,
+            ty: ta.Union[ta.Type[T], ta.Any],
+            opts: ta.Optional[ObjMarshalOptions] = None,
+    ) -> T:
+        m = self.get_obj_marshaler(ty)
+        return m.unmarshal(o, opts or self._default_options)
+
+    def roundtrip_obj(
+            self,
+            o: ta.Any,
+            ty: ta.Any = None,
+            opts: ta.Optional[ObjMarshalOptions] = None,
+    ) -> ta.Any:
+        if ty is None:
+            ty = type(o)
+        m: ta.Any = self.marshal_obj(o, ty, opts)
+        u: ta.Any = self.unmarshal_obj(m, ty, opts)
+        return u
 
 
 ##

omlish-0.0.0.dev144/omlish/lite/pycharm.py

@@ -0,0 +1,48 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+import typing as ta
+
+
+DEFAULT_PYCHARM_VERSION = '242.23726.102'
+
+
+@dc.dataclass(frozen=True)
+class PycharmRemoteDebug:
+    port: int
+    host: ta.Optional[str] = 'localhost'
+    install_version: ta.Optional[str] = DEFAULT_PYCHARM_VERSION
+
+
+def pycharm_debug_connect(prd: PycharmRemoteDebug) -> None:
+    if prd.install_version is not None:
+        import subprocess
+        import sys
+        subprocess.check_call([
+            sys.executable,
+            '-mpip',
+            'install',
+            f'pydevd-pycharm~={prd.install_version}',
+        ])
+
+    pydevd_pycharm = __import__('pydevd_pycharm')  # noqa
+    pydevd_pycharm.settrace(
+        prd.host,
+        port=prd.port,
+        stdoutToServer=True,
+        stderrToServer=True,
+    )
+
+
+def pycharm_debug_preamble(prd: PycharmRemoteDebug) -> str:
+    import inspect
+    import textwrap
+
+    return textwrap.dedent(f"""
+        {inspect.getsource(pycharm_debug_connect)}
+
+        pycharm_debug_connect(PycharmRemoteDebug(
+            {prd.port!r},
+            host={prd.host!r},
+            install_version={prd.install_version!r},
+        ))
+    """)

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish/logs/abc.py

@@ -1,7 +1,6 @@
 # ruff: noqa: A002
 # ruff: noqa: N802
 # ruff: noqa: N815
-
 import types
 import typing as ta
 

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/omlish.egg-info/SOURCES.txt

@@ -333,6 +333,7 @@ omlish/lite/logs.py
 omlish/lite/marshal.py
 omlish/lite/maybes.py
 omlish/lite/pidfile.py
+omlish/lite/pycharm.py
 omlish/lite/reflect.py
 omlish/lite/runtime.py
 omlish/lite/secrets.py

{omlish-0.0.0.dev142 → omlish-0.0.0.dev144}/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.dev142'
+version = '0.0.0.dev144'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',