omlish 0.0.0.dev226__py3-none-any.whl → 0.0.0.dev228__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev226'
-__revision__ = '1f3419dac98e9db37df48a9a952f780d17bf31ed'
+__version__ = '0.0.0.dev228'
+__revision__ = '00e3d1141f5caccfbfa74099183b2d12485e1b0d'
 
 
 #
@@ -79,7 +79,7 @@ class Project(ProjectBase):
         ],
 
         'secrets': [
-            'cryptography ~= 43.0',
+            'cryptography ~= 44.0',
         ],
 
         'sqlalchemy': [

omlish/diag/lslocks.py

@@ -19,7 +19,7 @@ from ..subprocesses.run import SubprocessRunOutput
 
 
 @dc.dataclass(frozen=True)
-class LsLocksItem:
+class LslocksItem:
     """https://manpages.ubuntu.com/manpages/lunar/man8/lslocks.8.html"""
 
     command: str
@@ -38,7 +38,7 @@ class LsLocksItem:
 
 
 @dc.dataclass(frozen=True)
-class LsLocksCommand(SubprocessRunnable):
+class LslocksCommand(SubprocessRunnable[ta.List[LslocksItem]]):
     pid: ta.Optional[int] = None
     no_inaccessible: bool = False
 
@@ -56,9 +56,9 @@ class LsLocksCommand(SubprocessRunnable):
             stderr='devnull',
         )
 
-    def handle_run_output(self, output: SubprocessRunOutput) -> ta.List[LsLocksItem]:
+    def handle_run_output(self, output: SubprocessRunOutput) -> ta.List[LslocksItem]:
         buf = check.not_none(output.stdout).decode().strip()
         if not buf:
             return []
         obj = json.loads(buf)
-        return unmarshal_obj(obj['locks'], ta.List[LsLocksItem])
+        return unmarshal_obj(obj['locks'], ta.List[LslocksItem])

omlish/diag/lsof.py

@@ -2,9 +2,6 @@
 # @omlish-lite
 """
 https://man7.org/linux/man-pages/man8/lsof.8.html
-
-Included in the process set are fields that identify the command, the process group IDentification (PGID) number, the
-task (thread) ID (TID), and the user ID (UID) number or login name.
 """
 import dataclasses as dc
 import enum
@@ -151,7 +148,6 @@ class LsofItem:
 
     @classmethod
     def from_prefixes(cls, dct: ta.Mapping[str, ta.Any]) -> 'LsofItem':
-        print(dct)
         kw: ta.Dict[str, ta.Any] = {
             fld.name: val
             for pfx, val in dct.items()
@@ -242,6 +238,9 @@ class LsofCommand(SubprocessRunnable[ta.List[LsofItem]]):
         return LsofItem.from_prefix_lines(lines)
 
 
+##
+
+
 if __name__ == '__main__':
     def _main() -> None:
         argparse = __import__('argparse')

omlish/diag/ps.py

@@ -12,6 +12,9 @@ from ..subprocesses.run import SubprocessRunOutput
 from ..subprocesses.sync import subprocesses
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class PsItem:
     pid: int
@@ -43,6 +46,9 @@ class PsCommand(SubprocessRunnable):
         )
 
 
+##
+
+
 def get_ps_item(pid: int, timeout: ta.Optional[Timeout] = None) -> PsItem:
     return PsCommand(pid).run(subprocesses, timeout=timeout)
 
@@ -59,6 +65,9 @@ def get_ps_lineage(pid: int, timeout: ta.Optional[Timeout] = None) -> ta.List[Ps
     return ret
 
 
+##
+
+
 if __name__ == '__main__':
     def _main() -> None:
         print(get_ps_lineage(os.getpid()))

omlish/lite/timeouts.py

@@ -50,7 +50,7 @@ class Timeout(abc.ABC):
 
     @classmethod
     def _now(cls) -> float:
-        return time.time()
+        return time.monotonic()
 
     #
 

omlish/marshal/__init__.py

@@ -42,14 +42,11 @@ from .forbidden import (  # noqa
 from .global_ import (  # noqa
     GLOBAL_REGISTRY,
 
+    global_marshaler_factory,
     marshal,
-    unmarshal,
-)
 
-from .helpers import (  # noqa
-    update_field_metadata,
-    update_fields_metadata,
-    update_object_metadata,
+    global_unmarshaler_factory,
+    unmarshal,
 )
 
 from .naming import (  # noqa
@@ -62,31 +59,59 @@ from .nop import (  # noqa
     NopMarshalerUnmarshaler,
 )
 
-from .objects import (  # noqa
+from .objects.helpers import (  # noqa
+    update_field_metadata,
+    update_fields_metadata,
+    update_object_metadata,
+)
+
+from .objects.marshal import (  # noqa
+    ObjectMarshaler,
+    SimpleObjectMarshalerFactory,
+)
+
+from .objects.metadata import (  # noqa
     FieldInfo,
     FieldInfos,
     FieldMetadata,
     FieldOptions,
-    ObjectMarshaler,
     ObjectMetadata,
     ObjectSpecials,
+)
+
+from .objects.unmarshal import (  # noqa
     ObjectUnmarshaler,
-    SimpleObjectMarshalerFactory,
     SimpleObjectUnmarshalerFactory,
 )
 
-from .polymorphism import (  # noqa
+from .polymorphism.marshal import (  # noqa
+    PolymorphismMarshalerFactory,
+    make_polymorphism_marshaler,
+)
+
+from .polymorphism.metadata import (  # noqa
     Impl,
     Impls,
     Polymorphism,
-    PolymorphismMarshalerFactory,
+    polymorphism_from_subclasses,
+)
+
+from .polymorphism.unions import (  # noqa
+    PRIMITIVE_UNION_TYPES,
+    PolymorphismUnionMarshalerFactory,
+    PolymorphismUnionUnmarshalerFactory,
+    PrimitiveUnionMarshaler,
+    PrimitiveUnionMarshalerFactory,
+    PrimitiveUnionUnmarshaler,
+    PrimitiveUnionUnmarshalerFactory,
+)
+
+from .polymorphism.unmarshal import (  # noqa
     PolymorphismUnmarshalerFactory,
-    make_polymorphism_marshaler,
     make_polymorphism_unmarshaler,
-    polymorphism_from_subclasses,
 )
 
-from .primitives import (  # noqa
+from .singular.primitives import (  # noqa
     PRIMITIVE_TYPES,
 )
 
@@ -102,16 +127,6 @@ from .standard import (  # noqa
     new_standard_unmarshaler_factory,
 )
 
-from .unions import (  # noqa
-    PRIMITIVE_UNION_TYPES,
-    PolymorphismUnionMarshalerFactory,
-    PolymorphismUnionUnmarshalerFactory,
-    PrimitiveUnionMarshaler,
-    PrimitiveUnionMarshalerFactory,
-    PrimitiveUnionUnmarshaler,
-    PrimitiveUnionUnmarshalerFactory,
-)
-
 from .values import (  # noqa
     Value,
 )

omlish/marshal/{iterables.py → composite/iterables.py}

@@ -7,16 +7,16 @@ import dataclasses as dc
 import functools
 import typing as ta
 
-from .. import check
-from .. import reflect as rfl
-from ..funcs import match as mfs
-from .base import MarshalContext
-from .base import Marshaler
-from .base import MarshalerFactoryMatchClass
-from .base import UnmarshalContext
-from .base import Unmarshaler
-from .base import UnmarshalerFactoryMatchClass
-from .values import Value
+from ... import check
+from ... import reflect as rfl
+from ...funcs import match as mfs
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactoryMatchClass
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..base import UnmarshalerFactoryMatchClass
+from ..values import Value
 
 
 DEFAULT_ITERABLE_CONCRETE_TYPES: dict[type[collections.abc.Iterable], type[collections.abc.Iterable]] = {

omlish/marshal/{literals.py → composite/literals.py}

@@ -1,15 +1,15 @@
 import dataclasses as dc
 import typing as ta
 
-from .. import check
-from .. import reflect as rfl
-from .base import MarshalContext
-from .base import Marshaler
-from .base import MarshalerFactory
-from .base import UnmarshalContext
-from .base import Unmarshaler
-from .base import UnmarshalerFactory
-from .values import Value
+from ... import check
+from ... import reflect as rfl
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactory
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..base import UnmarshalerFactory
+from ..values import Value
 
 
 @dc.dataclass(frozen=True)

omlish/marshal/{mappings.py → composite/mappings.py}

@@ -2,16 +2,16 @@ import collections.abc
 import dataclasses as dc
 import typing as ta
 
-from .. import check
-from .. import reflect as rfl
-from ..funcs import match as mfs
-from .base import MarshalContext
-from .base import Marshaler
-from .base import MarshalerFactoryMatchClass
-from .base import UnmarshalContext
-from .base import Unmarshaler
-from .base import UnmarshalerFactoryMatchClass
-from .values import Value
+from ... import check
+from ... import reflect as rfl
+from ...funcs import match as mfs
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactoryMatchClass
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..base import UnmarshalerFactoryMatchClass
+from ..values import Value
 
 
 DEFAULT_MAPPING_CONCRETE_TYPES: dict[type[collections.abc.Mapping], type[collections.abc.Mapping]] = {

omlish/marshal/{maybes.py → composite/maybes.py}

@@ -5,17 +5,17 @@ TODO:
 import dataclasses as dc
 import typing as ta
 
-from .. import check
-from .. import lang
-from .. import reflect as rfl
-from ..funcs import match as mfs
-from .base import MarshalContext
-from .base import Marshaler
-from .base import MarshalerFactoryMatchClass
-from .base import UnmarshalContext
-from .base import Unmarshaler
-from .base import UnmarshalerFactoryMatchClass
-from .values import Value
+from ... import check
+from ... import lang
+from ... import reflect as rfl
+from ...funcs import match as mfs
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactoryMatchClass
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..base import UnmarshalerFactoryMatchClass
+from ..values import Value
 
 
 @dc.dataclass(frozen=True)

omlish/marshal/{newtypes.py → composite/newtypes.py}

@@ -1,11 +1,11 @@
-from .. import check
-from .. import reflect as rfl
-from .base import MarshalContext
-from .base import Marshaler
-from .base import MarshalerFactory
-from .base import UnmarshalContext
-from .base import Unmarshaler
-from .base import UnmarshalerFactory
+from ... import check
+from ... import reflect as rfl
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactory
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..base import UnmarshalerFactory
 
 
 class NewtypeMarshalerFactory(MarshalerFactory):

omlish/marshal/{optionals.py → composite/optionals.py}

@@ -1,15 +1,15 @@
 import dataclasses as dc
 import typing as ta
 
-from .. import check
-from .. import reflect as rfl
-from .base import MarshalContext
-from .base import Marshaler
-from .base import MarshalerFactory
-from .base import UnmarshalContext
-from .base import Unmarshaler
-from .base import UnmarshalerFactory
-from .values import Value
+from ... import check
+from ... import reflect as rfl
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactory
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..base import UnmarshalerFactory
+from ..values import Value
 
 
 @dc.dataclass(frozen=True)

omlish/marshal/objects/__init__.py

@@ -0,0 +1,7 @@
+"""
+TODO:
+ - cfg naming
+ - adapters for dataclasses / namedtuples / user objects (as configured)
+ - mro-merge ObjectMetadata
+ - key ordering override - like slice, -1 means last
+"""

omlish/marshal/{dataclasses.py → objects/dataclasses.py}

@@ -4,30 +4,30 @@ TODO:
 """
 import typing as ta
 
-from .. import check
-from .. import collections as col
-from .. import dataclasses as dc
-from .. import lang
-from .. import reflect as rfl
-from ..lite import marshal as lm
-from .base import MarshalContext
-from .base import Marshaler
-from .base import MarshalerFactory
-from .base import Option
-from .base import UnmarshalContext
-from .base import Unmarshaler
-from .base import UnmarshalerFactory
-from .naming import Naming
-from .naming import translate_name
-from .objects import DEFAULT_FIELD_OPTIONS
-from .objects import FIELD_OPTIONS_KWARGS
-from .objects import FieldInfo
-from .objects import FieldInfos
-from .objects import FieldMetadata
-from .objects import FieldOptions
-from .objects import ObjectMarshaler
-from .objects import ObjectMetadata
-from .objects import ObjectUnmarshaler
+from ... import check
+from ... import collections as col
+from ... import dataclasses as dc
+from ... import lang
+from ... import reflect as rfl
+from ...lite import marshal as lm
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactory
+from ..base import Option
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..base import UnmarshalerFactory
+from ..naming import Naming
+from ..naming import translate_name
+from .marshal import ObjectMarshaler
+from .metadata import DEFAULT_FIELD_OPTIONS
+from .metadata import FIELD_OPTIONS_KWARGS
+from .metadata import FieldInfo
+from .metadata import FieldInfos
+from .metadata import FieldMetadata
+from .metadata import FieldOptions
+from .metadata import ObjectMetadata
+from .unmarshal import ObjectUnmarshaler
 
 
 ##

omlish/marshal/{helpers.py → objects/helpers.py}

@@ -1,13 +1,16 @@
 import typing as ta
 
-from .. import dataclasses as dc
-from .objects import FieldMetadata
-from .objects import ObjectMetadata
+from ... import dataclasses as dc
+from .metadata import FieldMetadata
+from .metadata import ObjectMetadata
 
 
 T = ta.TypeVar('T')
 
 
+##
+
+
 def update_field_metadata(**kwargs: ta.Any) -> dc.field_modifier:
     @dc.field_modifier
     def inner(f: dc.Field) -> dc.Field:

omlish/marshal/objects/marshal.py

@@ -0,0 +1,108 @@
+import collections.abc
+import typing as ta
+
+from ... import check
+from ... import dataclasses as dc
+from ... import reflect as rfl
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import MarshalerFactory
+from ..values import Value
+from .metadata import FieldInfo
+from .metadata import FieldInfos
+from .metadata import ObjectSpecials
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ObjectMarshaler(Marshaler):
+    fields: ta.Sequence[tuple[FieldInfo, Marshaler]]
+
+    _: dc.KW_ONLY
+
+    specials: ObjectSpecials = ObjectSpecials()
+
+    attr_getter: ta.Callable[[ta.Any, str], ta.Any] | None = None
+
+    @classmethod
+    def make(
+            cls,
+            ctx: MarshalContext,
+            fis: FieldInfos,
+            **kwargs: ta.Any,
+    ) -> Marshaler:
+        fields = [
+            (fi, ctx.make(fi.type))
+            for fi in fis
+        ]
+
+        return cls(
+            fields,
+            **kwargs,
+        )
+
+    #
+
+    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
+        if (attr_getter := self.attr_getter) is None:
+            attr_getter = getattr
+
+        ret: dict[str, ta.Any] = {}
+        for fi, m in self.fields:
+            v = attr_getter(o, fi.name)
+
+            if fi.options.omit_if is not None and fi.options.omit_if(v):
+                continue
+
+            if fi.name in self.specials.set:
+                continue
+
+            mn = fi.marshal_name
+            if mn is None:
+                continue
+
+            mv = m.marshal(ctx, v)
+
+            if fi.options.embed:
+                for ek, ev in check.isinstance(mv, collections.abc.Mapping).items():
+                    ret[mn + check.non_empty_str(ek)] = ev
+
+            else:
+                ret[mn] = mv
+
+        if self.specials.unknown is not None:
+            if (ukf := attr_getter(o, self.specials.unknown)):
+                if (dks := set(ret) & set(ukf)):
+                    raise KeyError(f'Unknown field keys duplicate fields: {dks!r}')
+
+            ret.update(ukf)  # FIXME: marshal?
+
+        return ret
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class SimpleObjectMarshalerFactory(MarshalerFactory):
+    dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
+
+    _: dc.KW_ONLY
+
+    specials: ObjectSpecials = ObjectSpecials()
+
+    def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
+        return isinstance(rty, type) and rty in self.dct
+
+    def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
+        ty = check.isinstance(rty, type)
+
+        fis = FieldInfos(self.dct[ty])
+
+        return ObjectMarshaler.make(
+            ctx,
+            fis,
+            specials=self.specials,
+        )