ominfra 0.0.0.dev315__tar.gz → 0.0.0.dev317__tar.gz

{ominfra-0.0.0.dev315/ominfra.egg-info → ominfra-0.0.0.dev317}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev315
+Version: 0.0.0.dev317
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev315
-Requires-Dist: omlish==0.0.0.dev315
+Requires-Dist: omdev==0.0.0.dev317
+Requires-Dist: omlish==0.0.0.dev317
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev315 → ominfra-0.0.0.dev317}/ominfra/clouds/aws/models/services/ec2.py

@@ -1498,6 +1498,7 @@ class ResourceType(_enum.Enum):
     INSTANCE_CONNECT_ENDPOINT = 'instance-connect-endpoint'
     VERIFIED_ACCESS_ENDPOINT_TARGET = 'verified-access-endpoint-target'
     IPAM_EXTERNAL_RESOURCE_VERIFICATION_TOKEN = 'ipam-external-resource-verification-token'
+    MAC_MODIFICATION_TASK = 'mac-modification-task'
 
 
 class RootDeviceType(_enum.Enum):

{ominfra-0.0.0.dev315 → ominfra-0.0.0.dev317}/ominfra/scripts/journald2aws.py

@@ -1955,9 +1955,16 @@ def format_num_bytes(num_bytes: int) -> str:
 # ../../../../../omlish/logs/filters.py
 
 
+##
+
+
 class TidLogFilter(logging.Filter):
     def filter(self, record):
-        record.tid = threading.get_native_id()
+        # FIXME: handle better - missing from wasm and cosmos
+        if hasattr(threading, 'get_native_id'):
+            record.tid = threading.get_native_id()
+        else:
+            record.tid = '?'
         return True
 
 
@@ -1965,6 +1972,9 @@ class TidLogFilter(logging.Filter):
 # ../../../../../omlish/logs/proxy.py
 
 
+##
+
+
 class ProxyLogFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
@@ -4022,6 +4032,9 @@ TODO:
 """
 
 
+##
+
+
 class JsonLogFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,

{ominfra-0.0.0.dev315 → ominfra-0.0.0.dev317}/ominfra/scripts/manage.py

@@ -102,6 +102,9 @@ CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
 
+# ../../omlish/lite/maybes.py
+U = ta.TypeVar('U')
+
 # ../../omlish/lite/timeouts.py
 TimeoutLike = ta.Union['Timeout', ta.Type['Timeout.DEFAULT'], ta.Iterable['TimeoutLike'], float, None]  # ta.TypeAlias
 
@@ -133,7 +136,6 @@ ExitStackedT = ta.TypeVar('ExitStackedT', bound='ExitStacked')
 AsyncExitStackedT = ta.TypeVar('AsyncExitStackedT', bound='AsyncExitStacked')
 
 # ../../omlish/lite/inject.py
-U = ta.TypeVar('U')
 InjectorKeyCls = ta.Union[type, ta.NewType]
 InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
 InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
@@ -3011,7 +3013,13 @@ log = logging.getLogger(__name__)
 ##
 
 
+@functools.total_ordering
 class Maybe(ta.Generic[T]):
+    class ValueNotPresentError(BaseException):
+        pass
+
+    #
+
     @property
     @abc.abstractmethod
     def present(self) -> bool:
@@ -3021,9 +3029,102 @@ class Maybe(ta.Generic[T]):
     def must(self) -> T:
         raise NotImplementedError
 
+    #
+
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __hash__(self) -> int:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __eq__(self, other) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __lt__(self, other) -> bool:
+        raise NotImplementedError
+
+    #
+
+    @ta.final
+    def __ne__(self, other):
+        return not (self == other)
+
+    @ta.final
+    def __iter__(self) -> ta.Iterator[T]:
+        if self.present:
+            yield self.must()
+
+    @ta.final
+    def __bool__(self) -> ta.NoReturn:
+        raise TypeError
+
+    #
+
+    @ta.final
+    def if_present(self, consumer: ta.Callable[[T], None]) -> None:
+        if self.present:
+            consumer(self.must())
+
+    @ta.final
+    def filter(self, predicate: ta.Callable[[T], bool]) -> 'Maybe[T]':
+        if self.present and predicate(self.must()):
+            return self
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def map(self, mapper: ta.Callable[[T], U]) -> 'Maybe[U]':
+        if self.present:
+            return Maybe.just(mapper(self.must()))
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def flat_map(self, mapper: ta.Callable[[T], 'Maybe[U]']) -> 'Maybe[U]':
+        if self.present:
+            if not isinstance(v := mapper(self.must()), Maybe):
+                raise TypeError(v)
+            return v
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def or_else(self, other: ta.Union[T, U]) -> ta.Union[T, U]:
+        if self.present:
+            return self.must()
+        else:
+            return other
+
+    @ta.final
+    def or_else_get(self, supplier: ta.Callable[[], ta.Union[T, U]]) -> ta.Union[T, U]:
+        if self.present:
+            return self.must()
+        else:
+            return supplier()
+
+    @ta.final
+    def or_else_raise(self, exception_supplier: ta.Callable[[], Exception]) -> T:
+        if self.present:
+            return self.must()
+        else:
+            raise exception_supplier()
+
+    #
+
+    @classmethod
+    def of_optional(cls, v: ta.Optional[T]) -> 'Maybe[T]':
+        if v is not None:
+            return cls.just(v)
+        else:
+            return cls.empty()
+
     @classmethod
     def just(cls, v: T) -> 'Maybe[T]':
-        return tuple.__new__(_Maybe, (v,))  # noqa
+        return _JustMaybe(v)
 
     _empty: ta.ClassVar['Maybe']
 
@@ -3032,36 +3133,81 @@ class Maybe(ta.Generic[T]):
         return Maybe._empty
 
 
-class _Maybe(Maybe[T], tuple):
-    __slots__ = ()
+##
 
-    def __init_subclass__(cls, **kwargs):
-        raise TypeError
+
+class _Maybe(Maybe[T], abc.ABC):
+    def __lt__(self, other):
+        if not isinstance(other, _Maybe):
+            return NotImplemented
+        sp = self.present
+        op = other.present
+        if self.present and other.present:
+            return self.must() < other.must()
+        else:
+            return op and not sp
+
+
+class _JustMaybe(_Maybe[T]):
+    __slots__ = ('_v', '_hash')
+
+    def __init__(self, v: T) -> None:
+        super().__init__()
+
+        self._v = v
 
     @property
     def present(self) -> bool:
-        return bool(self)
+        return True
 
     def must(self) -> T:
-        if not self:
-            raise ValueError
-        return self[0]
+        return self._v
 
+    #
 
-Maybe._empty = tuple.__new__(_Maybe, ())  # noqa
+    def __repr__(self) -> str:
+        return f'just({self._v!r})'
 
+    _hash: int
 
-##
+    def __hash__(self) -> int:
+        try:
+            return self._hash
+        except AttributeError:
+            pass
+        h = self._hash = hash((_JustMaybe, self._v))
+        return h
 
+    def __eq__(self, other):
+        return (
+            self.__class__ is other.__class__ and
+            self._v == other._v  # noqa
+        )
+
+
+class _EmptyMaybe(_Maybe[T]):
+    __slots__ = ()
+
+    @property
+    def present(self) -> bool:
+        return False
 
-@functools.singledispatch
-def as_maybe(obj: ta.Any) -> Maybe:
-    raise TypeError(obj)
+    def must(self) -> T:
+        raise Maybe.ValueNotPresentError
 
+    #
 
-@as_maybe.register
-def _(obj: Maybe) -> Maybe:
-    return obj
+    def __repr__(self) -> str:
+        return 'empty()'
+
+    def __hash__(self) -> int:
+        return hash(_EmptyMaybe)
+
+    def __eq__(self, other):
+        return self.__class__ is other.__class__
+
+
+Maybe._empty = _EmptyMaybe()  # noqa
 
 
 ########################################
@@ -3563,9 +3709,16 @@ class Func3(ta.Generic[A0, A1, A2, T]):
 # ../../../omlish/logs/filters.py
 
 
+##
+
+
 class TidLogFilter(logging.Filter):
     def filter(self, record):
-        record.tid = threading.get_native_id()
+        # FIXME: handle better - missing from wasm and cosmos
+        if hasattr(threading, 'get_native_id'):
+            record.tid = threading.get_native_id()
+        else:
+            record.tid = '?'
         return True
 
 
@@ -3573,6 +3726,9 @@ class TidLogFilter(logging.Filter):
 # ../../../omlish/logs/proxy.py
 
 
+##
+
+
 class ProxyLogFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
@@ -7612,6 +7768,9 @@ TODO:
 """
 
 
+##
+
+
 class JsonLogFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,

{ominfra-0.0.0.dev315 → ominfra-0.0.0.dev317}/ominfra/scripts/supervisor.py

@@ -57,6 +57,7 @@ import fractions
 import functools
 import grp
 import html
+import http
 import http.client
 import http.server
 import inspect
@@ -127,6 +128,9 @@ CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
 
+# ../../omlish/lite/maybes.py
+U = ta.TypeVar('U')
+
 # ../../omlish/lite/typing.py
 A0 = ta.TypeVar('A0')
 A1 = ta.TypeVar('A1')
@@ -146,7 +150,6 @@ ConfigDataT = ta.TypeVar('ConfigDataT', bound='ConfigData')
 HttpHeaders = http.client.HTTPMessage  # ta.TypeAlias
 
 # ../../omlish/lite/inject.py
-U = ta.TypeVar('U')
 InjectorKeyCls = ta.Union[type, ta.NewType]
 InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
 InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
@@ -2541,7 +2544,13 @@ log = logging.getLogger(__name__)
 ##
 
 
+@functools.total_ordering
 class Maybe(ta.Generic[T]):
+    class ValueNotPresentError(BaseException):
+        pass
+
+    #
+
     @property
     @abc.abstractmethod
     def present(self) -> bool:
@@ -2551,9 +2560,102 @@ class Maybe(ta.Generic[T]):
     def must(self) -> T:
         raise NotImplementedError
 
+    #
+
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __hash__(self) -> int:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __eq__(self, other) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __lt__(self, other) -> bool:
+        raise NotImplementedError
+
+    #
+
+    @ta.final
+    def __ne__(self, other):
+        return not (self == other)
+
+    @ta.final
+    def __iter__(self) -> ta.Iterator[T]:
+        if self.present:
+            yield self.must()
+
+    @ta.final
+    def __bool__(self) -> ta.NoReturn:
+        raise TypeError
+
+    #
+
+    @ta.final
+    def if_present(self, consumer: ta.Callable[[T], None]) -> None:
+        if self.present:
+            consumer(self.must())
+
+    @ta.final
+    def filter(self, predicate: ta.Callable[[T], bool]) -> 'Maybe[T]':
+        if self.present and predicate(self.must()):
+            return self
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def map(self, mapper: ta.Callable[[T], U]) -> 'Maybe[U]':
+        if self.present:
+            return Maybe.just(mapper(self.must()))
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def flat_map(self, mapper: ta.Callable[[T], 'Maybe[U]']) -> 'Maybe[U]':
+        if self.present:
+            if not isinstance(v := mapper(self.must()), Maybe):
+                raise TypeError(v)
+            return v
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def or_else(self, other: ta.Union[T, U]) -> ta.Union[T, U]:
+        if self.present:
+            return self.must()
+        else:
+            return other
+
+    @ta.final
+    def or_else_get(self, supplier: ta.Callable[[], ta.Union[T, U]]) -> ta.Union[T, U]:
+        if self.present:
+            return self.must()
+        else:
+            return supplier()
+
+    @ta.final
+    def or_else_raise(self, exception_supplier: ta.Callable[[], Exception]) -> T:
+        if self.present:
+            return self.must()
+        else:
+            raise exception_supplier()
+
+    #
+
+    @classmethod
+    def of_optional(cls, v: ta.Optional[T]) -> 'Maybe[T]':
+        if v is not None:
+            return cls.just(v)
+        else:
+            return cls.empty()
+
     @classmethod
     def just(cls, v: T) -> 'Maybe[T]':
-        return tuple.__new__(_Maybe, (v,))  # noqa
+        return _JustMaybe(v)
 
     _empty: ta.ClassVar['Maybe']
 
@@ -2562,36 +2664,81 @@ class Maybe(ta.Generic[T]):
         return Maybe._empty
 
 
-class _Maybe(Maybe[T], tuple):
-    __slots__ = ()
+##
 
-    def __init_subclass__(cls, **kwargs):
-        raise TypeError
+
+class _Maybe(Maybe[T], abc.ABC):
+    def __lt__(self, other):
+        if not isinstance(other, _Maybe):
+            return NotImplemented
+        sp = self.present
+        op = other.present
+        if self.present and other.present:
+            return self.must() < other.must()
+        else:
+            return op and not sp
+
+
+class _JustMaybe(_Maybe[T]):
+    __slots__ = ('_v', '_hash')
+
+    def __init__(self, v: T) -> None:
+        super().__init__()
+
+        self._v = v
 
     @property
     def present(self) -> bool:
-        return bool(self)
+        return True
 
     def must(self) -> T:
-        if not self:
-            raise ValueError
-        return self[0]
+        return self._v
 
+    #
 
-Maybe._empty = tuple.__new__(_Maybe, ())  # noqa
+    def __repr__(self) -> str:
+        return f'just({self._v!r})'
 
+    _hash: int
 
-##
+    def __hash__(self) -> int:
+        try:
+            return self._hash
+        except AttributeError:
+            pass
+        h = self._hash = hash((_JustMaybe, self._v))
+        return h
 
+    def __eq__(self, other):
+        return (
+            self.__class__ is other.__class__ and
+            self._v == other._v  # noqa
+        )
+
+
+class _EmptyMaybe(_Maybe[T]):
+    __slots__ = ()
+
+    @property
+    def present(self) -> bool:
+        return False
 
-@functools.singledispatch
-def as_maybe(obj: ta.Any) -> Maybe:
-    raise TypeError(obj)
+    def must(self) -> T:
+        raise Maybe.ValueNotPresentError
 
+    #
 
-@as_maybe.register
-def _(obj: Maybe) -> Maybe:
-    return obj
+    def __repr__(self) -> str:
+        return 'empty()'
+
+    def __hash__(self) -> int:
+        return hash(_EmptyMaybe)
+
+    def __eq__(self, other):
+        return self.__class__ is other.__class__
+
+
+Maybe._empty = _EmptyMaybe()  # noqa
 
 
 ########################################
@@ -2832,9 +2979,16 @@ class Func3(ta.Generic[A0, A1, A2, T]):
 # ../../../omlish/logs/filters.py
 
 
+##
+
+
 class TidLogFilter(logging.Filter):
     def filter(self, record):
-        record.tid = threading.get_native_id()
+        # FIXME: handle better - missing from wasm and cosmos
+        if hasattr(threading, 'get_native_id'):
+            record.tid = threading.get_native_id()
+        else:
+            record.tid = '?'
         return True
 
 
@@ -2842,6 +2996,9 @@ class TidLogFilter(logging.Filter):
 # ../../../omlish/logs/proxy.py
 
 
+##
+
+
 class ProxyLogFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
@@ -6357,6 +6514,9 @@ TODO:
 """
 
 
+##
+
+
 class JsonLogFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,

{ominfra-0.0.0.dev315 → ominfra-0.0.0.dev317/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev315
+Version: 0.0.0.dev317
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev315
-Requires-Dist: omlish==0.0.0.dev315
+Requires-Dist: omdev==0.0.0.dev317
+Requires-Dist: omlish==0.0.0.dev317
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev315 → ominfra-0.0.0.dev317}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev315
-omlish==0.0.0.dev315
+omdev==0.0.0.dev317
+omlish==0.0.0.dev317
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev315 → ominfra-0.0.0.dev317}/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.dev315'
+version = '0.0.0.dev317'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev315',
-    'omlish == 0.0.0.dev315',
+    'omdev == 0.0.0.dev317',
+    'omlish == 0.0.0.dev317',
 ]
 
 [project.optional-dependencies]