omlish 0.0.0.dev26__tar.gz → 0.0.0.dev28__tar.gz

{omlish-0.0.0.dev26/omlish.egg-info → omlish-0.0.0.dev28}/PKG-INFO

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

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev26'
-__revision__ = 'd3cb2e43eac2aa63dc4606aa371faa78ec0daf1a'
+__version__ = '0.0.0.dev28'
+__revision__ = '8adf3c1230237633abb8801258638f0ae2fa4099'
 
 
 #
@@ -126,11 +126,10 @@ class SetuptoolsBase:
         '*': [
             '*.c',
             '*.cc',
+            '*.cu',
             '*.h',
 
-            '*.json',
-
-            '*.sql',
+            '.manifests.json',
 
             'LICENSE',
         ],

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/dataclasses/impl/api.py

@@ -36,6 +36,7 @@ def field(  # noqa
         check_type: bool | None = None,
         override: bool = False,
         repr_fn: ta.Callable[[ta.Any], str | None] | None = None,
+        frozen: bool | None = None,
 ):  # -> dc.Field
     if default is not MISSING and default_factory is not MISSING:
         raise ValueError('cannot specify both default and default_factory')
@@ -47,6 +48,7 @@ def field(  # noqa
         check_type=check_type,
         override=override,
         repr_fn=repr_fn,
+        frozen=frozen,
     )
 
     md: ta.Mapping = {FieldExtras: fx}

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/dataclasses/impl/params.py

@@ -42,12 +42,13 @@ from .metadata import METADATA_ATTR
 
 @dc.dataclass(frozen=True, kw_only=True)
 class FieldExtras(lang.Final):
-    derive: ta.Callable[..., ta.Any] | None = None
+    derive: ta.Callable[..., ta.Any] | None = None  # TODO
     coerce: bool | ta.Callable[[ta.Any], ta.Any] | None = None
     validate: ta.Callable[[ta.Any], bool] | None = None
     check_type: bool | None = None
     override: bool = False
     repr_fn: ta.Callable[[ta.Any], str | None] | None = None
+    frozen: bool | None = None  # TODO
 
 
 DEFAULT_FIELD_EXTRAS = FieldExtras()

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/docker.py

@@ -170,9 +170,9 @@ _LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/docker/')
 
 
 def is_likely_in_docker() -> bool:
-    if sys.platform != 'linux':
+    if getattr(sys, 'platform') != 'linux':
         return False
-    with open('/proc/mounts') as f:  # type: ignore
+    with open('/proc/mounts') as f:
         ls = f.readlines()
     return any(_LIKELY_IN_DOCKER_PATTERN.match(l) for l in ls)
 

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/lang/descriptors.py

@@ -57,11 +57,6 @@ def unwrap_method_descriptors(fn: ta.Callable) -> ta.Callable:
 ##
 
 
-def unwrap_func(fn: ta.Callable) -> ta.Callable:
-    fn, _ = unwrap_func_with_partials(fn)
-    return fn
-
-
 def unwrap_func_with_partials(fn: ta.Callable) -> tuple[ta.Callable, list[functools.partial]]:
     ps = []
     while True:
@@ -88,6 +83,11 @@ def unwrap_func_with_partials(fn: ta.Callable) -> tuple[ta.Callable, list[functo
     return fn, ps
 
 
+def unwrap_func(fn: ta.Callable) -> ta.Callable:
+    uw, _ = unwrap_func_with_partials(fn)
+    return uw
+
+
 ##
 
 

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/lang/resources.py

@@ -11,7 +11,7 @@ class RelativeResource(ta.NamedTuple):
 
 
 def get_relative_resources(
-        prefix: str | None = None,
+        path: str = '',
         *,
         globals: ta.Mapping[str, ta.Any] | None = None,  # noqa
         package: str | None = None,
@@ -23,13 +23,29 @@ def get_relative_resources(
         if not file:
             file = globals.get('__file__')
 
+    #
+
+    if os.sep in path:
+        raise ValueError(path)  # noqa
+    if not path.startswith('.'):
+        path = '.' + path
+    if set(path) - {'.'}:
+        dot_pos = next(i for i in range(len(path)) if path[i] != '.')
+        num_up = dot_pos - 1
+        path_parts = path[dot_pos:].split('.')
+    else:
+        num_up = len(path) - 1
+        path_parts = []
+
+    #
+
     lst: list[RelativeResource] = []
 
     if package:
-        anchor = package
-        if prefix:
-            anchor += '.' + prefix.replace(os.sep, '.')
-
+        pkg_parts = package.split('.')
+        if num_up:
+            pkg_parts = pkg_parts[:-num_up]
+        anchor = '.'.join([*pkg_parts, *path_parts])
         for pf in importlib.resources.files(anchor).iterdir():
             lst.append(RelativeResource(
                 name=pf.name,
@@ -38,16 +54,19 @@ def get_relative_resources(
             ))
 
     elif file:
-        path = os.path.dirname(file)
-        if prefix:
-            path = os.path.join(path, prefix.replace('.', os.sep))
+        base_dir = os.path.dirname(file)
+        dst_dir = os.path.join(
+            base_dir,
+            *(['..'] * num_up),
+            *path_parts,
+        )
 
         def _read_file(fp: str) -> bytes:
             with open(fp, 'rb') as f:
                 return f.read()
 
-        for ff in os.listdir(path):
-            ff = os.path.join(path, ff)
+        for ff in os.listdir(dst_dir):
+            ff = os.path.join(dst_dir, ff)
             lst.append(RelativeResource(
                 name=os.path.basename(ff),
                 is_file=os.path.isfile(ff),

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/lite/check.py

@@ -27,3 +27,9 @@ def check_not(v: ta.Any) -> None:
     if v:
         raise ValueError(v)
     return v
+
+
+def check_non_empty_str(v: ta.Optional[str]) -> str:
+    if not v:
+        raise ValueError
+    return v

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/marshal/__init__.py

@@ -55,8 +55,13 @@ from .helpers import (  # noqa
 )
 
 from .objects import (  # noqa
+    FieldInfo,
     FieldMetadata,
+    ObjectMarshaler,
     ObjectMetadata,
+    ObjectUnmarshaler,
+    SimpleObjectMarshalerFactory,
+    SimpleObjectUnmarshalerFactory,
 )
 
 from .polymorphism import (  # noqa

{omlish-0.0.0.dev26 → omlish-0.0.0.dev28}/omlish/marshal/objects.py

@@ -9,6 +9,7 @@ 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
@@ -87,6 +88,27 @@ class ObjectMarshaler(Marshaler):
         return ret
 
 
+@dc.dataclass(frozen=True)
+class SimpleObjectMarshalerFactory(MarshalerFactory):
+    dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
+    unknown_field: str | None = None
+
+    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)
+        flds = self.dct[ty]
+        fields = [
+            (fi, ctx.make(fi.type))
+            for fi in flds
+        ]
+        return ObjectMarshaler(
+            fields,
+            unknown_field=self.unknown_field,
+        )
+
+
 ##
 
 
@@ -123,3 +145,26 @@ class ObjectUnmarshaler(Unmarshaler):
             kw[fi.name] = u.unmarshal(ctx, mv)
 
         return self.cls(**kw)
+
+
+@dc.dataclass(frozen=True)
+class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
+    dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
+    unknown_field: str | None = None
+
+    def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
+        return isinstance(rty, type) and rty in self.dct
+
+    def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
+        ty = check.isinstance(rty, type)
+        flds = self.dct[ty]
+        fields_by_unmarshal_name = {
+            n: (fi, ctx.make(fi.type))
+            for fi in flds
+            for n in fi.unmarshal_names
+        }
+        return ObjectUnmarshaler(
+            ty,
+            fields_by_unmarshal_name,
+            unknown_field=self.unknown_field,
+        )