omlish 0.0.0.dev141__py3-none-any.whl → 0.0.0.dev143__py3-none-any.whl

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,)},
 
@@ -251,117 +271,169 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
 }
 
 
-def _make_obj_marshaler(
-        ty: ta.Any,
-        rec: ta.Callable[[ta.Any], ObjMarshaler],
-        *,
-        nonstrict_dataclasses: bool = False,
-) -> ObjMarshaler:
-    if isinstance(ty, type):
-        if abc.ABC in ty.__bases__:
-            return PolymorphicObjMarshaler.of([  # type: ignore
-                PolymorphicObjMarshaler.Impl(
-                    ity,
-                    ity.__qualname__,
-                    rec(ity),
-                )
-                for ity in deep_subclasses(ty)
-                if abc.ABC not in ity.__bases__
-            ])
-
-        if issubclass(ty, enum.Enum):
-            return EnumObjMarshaler(ty)
-
-        if dc.is_dataclass(ty):
-            return DataclassObjMarshaler(
-                ty,
-                {f.name: rec(f.type) for f in dc.fields(ty)},
-                nonstrict=nonstrict_dataclasses,
-            )
-
-    if is_generic_alias(ty):
-        try:
-            mt = _OBJ_MARSHALER_GENERIC_MAPPING_TYPES[ta.get_origin(ty)]
-        except KeyError:
-            pass
-        else:
-            k, v = ta.get_args(ty)
-            return MappingObjMarshaler(mt, rec(k), rec(v))
-
-        try:
-            st = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES[ta.get_origin(ty)]
-        except KeyError:
-            pass
-        else:
-            [e] = ta.get_args(ty)
-            return IterableObjMarshaler(st, rec(e))
-
-        if is_union_alias(ty):
-            return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
-
-    raise TypeError(ty)
-
-
 ##
 
 
-_OBJ_MARSHALERS_LOCK = threading.RLock()
-
-_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
-
-_OBJ_MARSHALER_PROXIES: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
-
-
-def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
-    with _OBJ_MARSHALERS_LOCK:
-        if ty in _OBJ_MARSHALERS:
-            raise KeyError(ty)
-        _OBJ_MARSHALERS[ty] = m
-
+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
+
+        self._lock = threading.RLock()
+        self._marshalers: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
+        self._proxies: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
+
+    #
+
+    def make_obj_marshaler(
+            self,
+            ty: ta.Any,
+            rec: ta.Callable[[ta.Any], ObjMarshaler],
+            *,
+            nonstrict_dataclasses: bool = False,
+    ) -> ObjMarshaler:
+        if isinstance(ty, type):
+            if abc.ABC in ty.__bases__:
+                return PolymorphicObjMarshaler.of([  # type: ignore
+                    PolymorphicObjMarshaler.Impl(
+                        ity,
+                        ity.__qualname__,
+                        rec(ity),
+                    )
+                    for ity in deep_subclasses(ty)
+                    if abc.ABC not in ity.__bases__
+                ])
+
+            if issubclass(ty, enum.Enum):
+                return EnumObjMarshaler(ty)
+
+            if dc.is_dataclass(ty):
+                return DataclassObjMarshaler(
+                    ty,
+                    {f.name: rec(f.type) for f in dc.fields(ty)},
+                    nonstrict=nonstrict_dataclasses,
+                )
 
-def get_obj_marshaler(
-        ty: ta.Any,
-        *,
-        no_cache: bool = False,
-        **kwargs: ta.Any,
-) -> ObjMarshaler:
-    with _OBJ_MARSHALERS_LOCK:
-        if not no_cache:
+        if is_generic_alias(ty):
             try:
-                return _OBJ_MARSHALERS[ty]
+                mt = self._generic_mapping_types[ta.get_origin(ty)]
             except KeyError:
                 pass
+            else:
+                k, v = ta.get_args(ty)
+                return MappingObjMarshaler(mt, rec(k), rec(v))
 
-        try:
-            return _OBJ_MARSHALER_PROXIES[ty]
-        except KeyError:
-            pass
+            try:
+                st = self._generic_iterable_types[ta.get_origin(ty)]
+            except KeyError:
+                pass
+            else:
+                [e] = ta.get_args(ty)
+                return IterableObjMarshaler(st, rec(e))
+
+            if is_union_alias(ty):
+                return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
+
+        raise TypeError(ty)
+
+    #
+
+    def register_opj_marshaler(self, ty: ta.Any, m: ObjMarshaler) -> None:
+        with self._lock:
+            if ty in self._obj_marshalers:
+                raise KeyError(ty)
+            self._obj_marshalers[ty] = m
+
+    def get_obj_marshaler(
+            self,
+            ty: ta.Any,
+            *,
+            no_cache: bool = False,
+            **kwargs: ta.Any,
+    ) -> ObjMarshaler:
+        with self._lock:
+            if not no_cache:
+                try:
+                    return self._obj_marshalers[ty]
+                except KeyError:
+                    pass
 
-        rec = functools.partial(
-            get_obj_marshaler,
-            no_cache=no_cache,
-            **kwargs,
-        )
+            try:
+                return self._proxies[ty]
+            except KeyError:
+                pass
 
-        p = ProxyObjMarshaler()
-        _OBJ_MARSHALER_PROXIES[ty] = p
-        try:
-            m = _make_obj_marshaler(ty, rec, **kwargs)
-        finally:
-            del _OBJ_MARSHALER_PROXIES[ty]
-        p.m = m
+            rec = functools.partial(
+                self.get_obj_marshaler,
+                no_cache=no_cache,
+                **kwargs,
+            )
 
-        if not no_cache:
-            _OBJ_MARSHALERS[ty] = m
-        return m
+            p = ProxyObjMarshaler()
+            self._proxies[ty] = p
+            try:
+                m = self.make_obj_marshaler(ty, rec, **kwargs)
+            finally:
+                del self._proxies[ty]
+            p.m = m
+
+            if not no_cache:
+                self._obj_marshalers[ty] = m
+            return m
+
+    #
+
+    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
 
 
 ##
 
 
-def marshal_obj(o: ta.Any, ty: ta.Any = None) -> ta.Any:
-    return get_obj_marshaler(ty if ty is not None else type(o)).marshal(o)
+OBJ_MARSHALER_MANAGER = ObjMarshalerManager()
 
+register_opj_marshaler = OBJ_MARSHALER_MANAGER.register_opj_marshaler
+get_obj_marshaler = OBJ_MARSHALER_MANAGER.get_obj_marshaler
 
-def unmarshal_obj(o: ta.Any, ty: ta.Union[ta.Type[T], ta.Any]) -> T:
-    return get_obj_marshaler(ty).unmarshal(o)
+marshal_obj = OBJ_MARSHALER_MANAGER.marshal_obj
+unmarshal_obj = OBJ_MARSHALER_MANAGER.unmarshal_obj

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

@@ -10,6 +10,19 @@ from .logs import log
 from .runtime import is_debugger_attached
 
 
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+
+
+##
+
+
+SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
+    'pipe': subprocess.PIPE,
+    'stdout': subprocess.STDOUT,
+    'devnull': subprocess.DEVNULL,
+}
+
+
 ##
 
 

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.dev141.dist-info → omlish-0.0.0.dev143.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev141
+Version: 0.0.0.dev143
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -21,6 +21,7 @@ Requires-Dist: trio-asyncio~=0.15; extra == "all"
 Requires-Dist: lz4~=4.3; extra == "all"
 Requires-Dist: python-snappy~=0.7; extra == "all"
 Requires-Dist: zstandard~=0.23; extra == "all"
+Requires-Dist: brotli~=1.1; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.1; extra == "all"
 Requires-Dist: psutil~=6.0; extra == "all"
@@ -60,6 +61,7 @@ Provides-Extra: compress
 Requires-Dist: lz4~=4.3; extra == "compress"
 Requires-Dist: python-snappy~=0.7; extra == "compress"
 Requires-Dist: zstandard~=0.23; extra == "compress"
+Requires-Dist: brotli~=1.1; extra == "compress"
 Provides-Extra: diag
 Requires-Dist: asttokens~=3.0; extra == "diag"
 Requires-Dist: executing~=2.1; extra == "diag"