omlish 0.0.0.dev25__py3-none-any.whl → 0.0.0.dev27__py3-none-any.whl

omlish/inject/multis.py

@@ -32,14 +32,14 @@ def _check_set_multi_key(mk: Key) -> bool:
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class SetBinding(Element, lang.Final):
-    multi_key: Key = dc.xfield(check=_check_set_multi_key)
+    multi_key: Key = dc.xfield(validate=_check_set_multi_key)
     dst: Key = dc.xfield(coerce=check.of_isinstance(Key))
 
 
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class SetProvider(Provider):
-    multi_key: Key = dc.xfield(check=_check_set_multi_key)
+    multi_key: Key = dc.xfield(validate=_check_set_multi_key)
 
 
 ##
@@ -52,7 +52,7 @@ def _check_map_multi_key(mk: Key) -> bool:
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class MapBinding(Element, lang.Final):
-    multi_key: Key = dc.xfield(check=_check_map_multi_key)
+    multi_key: Key = dc.xfield(validate=_check_map_multi_key)
     map_key: ta.Any = dc.xfield()
     dst: Key = dc.xfield(coerce=check.of_isinstance(Key))
 
@@ -60,7 +60,7 @@ class MapBinding(Element, lang.Final):
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class MapProvider(Provider):
-    multi_key: Key = dc.xfield(check=_check_map_multi_key)
+    multi_key: Key = dc.xfield(validate=_check_map_multi_key)
 
 
 ##

omlish/inject/providers.py

@@ -17,7 +17,7 @@ class Provider(lang.Abstract):
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class FnProvider(Provider):
-    fn: ta.Any = dc.xfield(check=callable)
+    fn: ta.Any = dc.xfield(validate=callable)
 
 
 @dc.dataclass(frozen=True)

omlish/lang/__init__.py

@@ -5,6 +5,7 @@ from .cached import (  # noqa
 
 from .classes import (  # noqa
     Abstract,
+    AnySensitive,
     Callable,
     Descriptor,
     Final,
@@ -17,8 +18,10 @@ from .classes import (  # noqa
     NotPicklable,
     PackageSealed,
     Picklable,
+    SENSITIVE_ATTR,
     Sealed,
     SealedError,
+    Sensitive,
     SimpleMetaDict,
     Singleton,
     Virtual,
@@ -68,6 +71,11 @@ from .contextmanagers import (  # noqa
     maybe_managing,
 )
 
+from .datetimes import (  # noqa
+    utcnow,
+    utcfromtimestamp,
+)
+
 from .descriptors import (  # noqa
     AccessForbiddenError,
     access_forbidden,

omlish/lang/classes/__init__.py

@@ -7,14 +7,17 @@ from .abstract import (  # noqa
 )
 
 from .restrict import (  # noqa
+    AnySensitive,
     Final,
     FinalError,
     NoBool,
     NotInstantiable,
     NotPicklable,
     PackageSealed,
+    SENSITIVE_ATTR,
     Sealed,
     SealedError,
+    Sensitive,
     no_bool,
 )
 

omlish/lang/classes/restrict.py

@@ -1,3 +1,4 @@
+import abc
 import functools
 import typing as ta
 
@@ -9,7 +10,6 @@ from .abstract import is_abstract
 
 
 class FinalError(TypeError):
-
     def __init__(self, _type: type) -> None:
         super().__init__()
 
@@ -49,7 +49,6 @@ class Final(Abstract):
 
 
 class SealedError(TypeError):
-
     def __init__(self, _type) -> None:
         super().__init__()
 
@@ -118,13 +117,11 @@ class NotPicklable:
 
 
 class NoBool:
-
     def __bool__(self) -> bool:
         raise TypeError
 
 
 class _NoBoolDescriptor:
-
     def __init__(self, fn, instance=None, owner=None) -> None:
         super().__init__()
         self._fn = fn
@@ -146,3 +143,27 @@ class _NoBoolDescriptor:
 
 def no_bool(fn):  # noqa
     return _NoBoolDescriptor(fn)
+
+
+##
+
+
+SENSITIVE_ATTR = '__sensitive__'
+
+
+class Sensitive:
+    __sensitive__ = True
+
+
+class _AnySensitiveMeta(abc.ABCMeta):
+    @classmethod
+    def __instancecheck__(cls, instance: object) -> bool:
+        return hasattr(instance, SENSITIVE_ATTR) or super().__instancecheck__(AnySensitive, instance)
+
+    @classmethod
+    def __subclasscheck__(cls, subclass: type) -> bool:
+        return hasattr(subclass, SENSITIVE_ATTR) or super().__subclasscheck__(AnySensitive, subclass)
+
+
+class AnySensitive(NotInstantiable, Final, metaclass=_AnySensitiveMeta):
+    pass

omlish/lang/classes/simple.py

@@ -42,7 +42,6 @@ _MARKER_NAMESPACE_KEYS: set[str] | None = None
 
 
 class _MarkerMeta(abc.ABCMeta):
-
     def __new__(mcls, name, bases, namespace):
         global _MARKER_NAMESPACE_KEYS
 
@@ -74,7 +73,6 @@ class Marker(NotInstantiable, metaclass=_MarkerMeta):
 
 
 class SimpleMetaDict(dict):
-
     def update(self, m: ta.Mapping[K, V], **kwargs: V) -> None:  # type: ignore
         for k, v in m.items():
             self[k] = v
@@ -109,7 +107,6 @@ def _set_singleton_instance(inst):
 
 
 class Singleton:
-
     def __new__(cls):
         return cls.__dict__[_SINGLETON_INSTANCE_ATTR]
 
@@ -119,7 +116,6 @@ class Singleton:
 
 
 class LazySingleton:
-
     def __new__(cls):
         try:
             return cls.__dict__[_SINGLETON_INSTANCE_ATTR]

omlish/lang/classes/virtual.py

@@ -40,7 +40,12 @@ class _VirtualMeta(abc.ABCMeta):
             if absv is not v:
                 namespace[k] = absv
 
-        reqs = {k: v for k, v in namespace.items() if getattr(v, '__isabstractmethod__', False)}
+        reqs = {
+            k: v
+            for k, v in namespace.items()
+            if getattr(v, '__isabstractmethod__', False)
+        }
+
         user_subclasshook = namespace.pop('__subclasshook__', None)
 
         def get_missing_reqs(cls):
@@ -94,13 +99,11 @@ def virtual_check(virtual: type) -> ta.Callable[[Ty], Ty]:
 
 
 class Descriptor(Virtual):
-
     def __get__(self, instance, owner=None):
         raise NotImplementedError
 
 
 class Picklable(Virtual):
-
     def __getstate__(self):
         raise NotImplementedError
 
@@ -112,7 +115,6 @@ class Picklable(Virtual):
 
 
 class Callable(NotInstantiable, Final, ta.Generic[T]):
-
     def __call__(self, *args: ta.Any, **kwargs: ta.Any) -> T:
         raise TypeError
 

omlish/lang/datetimes.py

@@ -0,0 +1,9 @@
+import datetime
+
+
+def utcnow() -> datetime.datetime:
+    return datetime.datetime.now(tz=datetime.UTC)
+
+
+def utcfromtimestamp(ts: float) -> datetime.datetime:
+    return datetime.datetime.fromtimestamp(ts, tz=datetime.UTC)

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

@@ -208,43 +208,48 @@ def configure_standard_logging(
         *,
         json: bool = False,
         target: ta.Optional[logging.Logger] = None,
-        no_check: bool = False,
+        force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    if target is None:
-        target = logging.root
+    logging._acquireLock()  # type: ignore  # noqa
+    try:
+        if target is None:
+            target = logging.root
 
-    #
+        #
 
-    if not no_check:
-        if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
-            return None
+        if not force:
+            if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+                return None
 
-    #
+        #
 
-    handler = logging.StreamHandler()
+        handler = logging.StreamHandler()
 
-    #
+        #
 
-    formatter: logging.Formatter
-    if json:
-        formatter = JsonLogFormatter()
-    else:
-        formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
-    handler.setFormatter(formatter)
+        formatter: logging.Formatter
+        if json:
+            formatter = JsonLogFormatter()
+        else:
+            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        handler.setFormatter(formatter)
+
+        #
 
-    #
+        handler.addFilter(TidLogFilter())
 
-    handler.addFilter(TidLogFilter())
+        #
 
-    #
+        target.addHandler(handler)
 
-    target.addHandler(handler)
+        #
 
-    #
+        if level is not None:
+            target.setLevel(level)
 
-    if level is not None:
-        target.setLevel(level)
+        #
 
-    #
+        return StandardLogHandler(handler)
 
-    return StandardLogHandler(handler)
+    finally:
+        logging._releaseLock()  # type: ignore  # noqa

omlish/lite/secrets.py

@@ -3,9 +3,11 @@ import typing as ta
 
 
 class Secret:
+    __sensitive__ = True
+
     _VALUE_ATTR = '__secret_value__'
 
-    def __init__(self, *, key: ta.Optional[str], value: str) -> None:
+    def __init__(self, *, key: ta.Optional[str] = None, value: str) -> None:
         super().__init__()
         self._key = key
         setattr(self, self._VALUE_ATTR, lambda: value)

omlish/logs/configs.py

@@ -36,13 +36,13 @@ def configure_standard_logging(
         *,
         json: bool = False,
         target: logging.Logger | None = None,
-        no_check: bool = False,
+        force: bool = False,
 ) -> StandardLogHandler | None:
     handler = configure_lite_standard_logging(
         level,
         json=json,
         target=target,
-        no_check=no_check,
+        force=force,
     )
 
     if handler is None:

omlish/marshal/dataclasses.py

@@ -24,7 +24,7 @@ from .objects import ObjectUnmarshaler
 
 
 def get_dataclass_metadata(ty: type) -> ObjectMetadata:
-    return check.optional_single(
+    return check.opt_single(
         e
         for e in dc.get_merged_metadata(ty).get(dc.UserMetadata, [])
         if isinstance(e, ObjectMetadata)

omlish/secrets/secrets.py

@@ -28,7 +28,7 @@ log = logging.getLogger(__name__)
 ##
 
 
-class Secret(lang.NotPicklable, lang.Final):
+class Secret(lang.NotPicklable, lang.Sensitive, lang.Final):
     _VALUE_ATTR = '__secret_value__'
 
     def __init__(self, *, key: str | None, value: str) -> None:

omlish/stats.py

@@ -2,7 +2,7 @@
 TODO:
  - reservoir
  - dep tdigest?
- - struct-of-arrays backed SamplingHistogram
+ - struct-of-arrays - array.array('f', ...) - backed SamplingHistogram
 """
 import bisect
 import collections

{omlish-0.0.0.dev25.dist-info → omlish-0.0.0.dev27.dist-info}/METADATA

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