omlish 0.0.0.dev264__tar.gz → 0.0.0.dev265__tar.gz

{omlish-0.0.0.dev264/omlish.egg-info → omlish-0.0.0.dev265}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev264
+Version: 0.0.0.dev265
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev264'
-__revision__ = '4a101c8e5b339dfa81732f13f8df74dec23b204f'
+__version__ = '0.0.0.dev265'
+__revision__ = 'f83c70eb0c46f33c859473df28f39340c4f9899b'
 
 
 #

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/bindings.py

@@ -8,6 +8,9 @@ from .types import Scope
 from .types import Unscoped
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class Binding(Element, lang.Final):

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/eagers.py

@@ -9,6 +9,9 @@ from .elements import Element
 from .keys import Key
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class Eager(Element, lang.Final):

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/elements.py

@@ -6,6 +6,9 @@ from .. import lang
 from .impl.origins import HasOriginsImpl
 
 
+##
+
+
 class Element(HasOriginsImpl, lang.Abstract, lang.PackageSealed):
     """Note: inheritors must be dataclasses."""
 
@@ -29,7 +32,7 @@ class Elements(lang.Final):
                 yield from c
 
 
-Elemental = ta.Union[  # noqa
+Elemental: ta.TypeAlias = ta.Union[  # noqa
     Element,
     Elements,
     ElementGenerator,

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/impl/elements.py

@@ -60,6 +60,9 @@ else:
 ElementT = ta.TypeVar('ElementT', bound=Element)
 
 
+##
+
+
 class ElementCollection(lang.Final):
     def __init__(self, es: Elements) -> None:
         super().__init__()

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/impl/injector.py

@@ -45,6 +45,9 @@ from .scopes import make_scope_impl
 log = logging.getLogger(__name__)
 
 
+##
+
+
 DEFAULT_SCOPES: list[Scope] = [
     Unscoped(),
     Singleton(),

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/impl/multis.py

@@ -14,6 +14,9 @@ from .providers import LinkProviderImpl
 from .providers import ProviderImpl
 
 
+##
+
+
 @dc.dataclass(frozen=True, eq=False)
 class SetProviderImpl(ProviderImpl, lang.Final):
     ps: ta.Sequence[ProviderImpl]

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/impl/proxy.py

@@ -4,6 +4,9 @@ from ... import check
 from ... import lang
 
 
+##
+
+
 @lang.cached_function
 def _cyclic_dependency_proxy() -> tuple[type, ta.Callable[[ta.Any, ta.Any], None]]:
     import wrapt  # noqa

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/impl/scopes.py

@@ -38,6 +38,9 @@ else:
     injector_ = lang.proxy_import('.injector', __package__)
 
 
+##
+
+
 class ScopeImpl(lang.Abstract):
     @property
     @abc.abstractmethod

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/injector.py

@@ -17,6 +17,9 @@ else:
 T = ta.TypeVar('T')
 
 
+##
+
+
 class Injector(lang.Abstract):
     @abc.abstractmethod
     def try_provide(self, key: ta.Any) -> lang.Maybe[ta.Any]:

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/inspect.py

@@ -13,6 +13,9 @@ else:
 T = ta.TypeVar('T')
 
 
+##
+
+
 class Kwarg(ta.NamedTuple):
     name: str
     key: Key

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/keys.py

@@ -10,6 +10,9 @@ from .types import Tag
 T = ta.TypeVar('T')
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class Key(lang.Final, ta.Generic[T]):

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/listeners.py

@@ -8,6 +8,9 @@ from .injector import Injector
 from .keys import Key
 
 
+##
+
+
 ProvisionListener: ta.TypeAlias = ta.Callable[[
     Injector,
     Key,

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/multis.py

@@ -69,6 +69,7 @@ class MapProvider(Provider):
 class SetBinder(ElementGenerator, ta.Generic[T]):
     def __init__(self, *, tag: ta.Any = None) -> None:
         super().__init__()
+
         self._tag: ta.Any = tag
         self._sbs: list[SetBinding] = []
 
@@ -96,6 +97,7 @@ class SetBinder(ElementGenerator, ta.Generic[T]):
 class MapBinder(ElementGenerator, ta.Generic[K, V]):
     def __init__(self, *, tag: ta.Any = None) -> None:
         super().__init__()
+
         self._tag: ta.Any = tag
         self._mbs: list[MapBinding] = []
 

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/origins.py

@@ -8,6 +8,9 @@ from .. import lang
 T = ta.TypeVar('T')
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class Origin:

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/overrides.py

@@ -8,6 +8,9 @@ from .elements import Elements
 from .elements import as_elements
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class Overrides(Element, lang.Final):

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/privates.py

@@ -9,6 +9,9 @@ from .keys import Key
 from .keys import as_key
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @dc.extra_params(cache_hash=True)
 class Expose(Element, lang.Final):

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/providers.py

@@ -6,6 +6,9 @@ from .. import lang
 from .keys import Key
 
 
+##
+
+
 class _Missing(lang.NotInstantiable):
     pass
 

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/types.py

@@ -3,6 +3,9 @@ import collections
 from .. import lang
 
 
+##
+
+
 Tag = collections.namedtuple('Tag', 'tag')  # noqa
 
 

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/inject/utils.py

@@ -8,6 +8,9 @@ from .impl.origins import HasOriginsImpl
 T = ta.TypeVar('T')
 
 
+##
+
+
 @dc.dataclass(frozen=True, eq=False)
 class ConstFn(HasOriginsImpl, lang.Final, ta.Generic[T]):
     """An origin tracking provider function for a constant value. Equivalent to `lambda: v` but transparent."""

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/lang/__init__.py

@@ -199,6 +199,7 @@ from .maybes import (  # noqa
 
 from .objects import (  # noqa
     SimpleProxy,
+    anon_object,
     arg_repr,
     attr_repr,
     build_mro_dict,

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/lang/objects.py

@@ -199,3 +199,21 @@ class SimpleProxy(ta.Generic[T]):
 
     def __delattr__(self, item):
         delattr(object.__getattribute__(self, '__wrapped__'), item)
+
+
+##
+
+
+class _AnonObject:
+    def __init__(self, **attrs: ta.Any) -> None:
+        super().__init__()
+
+        for k, v in attrs.items():
+            setattr(self, k, v)
+
+    def __init_subclass__(cls, **kwargs):
+        raise TypeError
+
+
+def anon_object(**attrs: ta.Any) -> ta.Any:
+    return _AnonObject(**attrs)

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/term/codes.py

@@ -29,6 +29,7 @@ def strip_ansi_codes(s: str) -> str:
 class ControlSequence:
     def __init__(self, fn: ta.Callable[..., str], desc: str) -> None:
         super().__init__()
+
         self._fn = fn
         self._desc = desc
 
@@ -40,19 +41,6 @@ class ControlSequence:
         return self._fn(*args, **kwargs)
 
 
-CUU = ControlSequence(lambda n: CSI + str(n) + 'A', 'Cursor Up')
-CUD = ControlSequence(lambda n: CSI + str(n) + 'B', 'Cursor Down')
-CUF = ControlSequence(lambda n: CSI + str(n) + 'C', 'Cursor Forward')
-CUB = ControlSequence(lambda n: CSI + str(n) + 'D', 'Cursor Back')
-
-CNL = ControlSequence(lambda n: CSI + str(n) + 'E', 'Cursor Next Line')
-CPL = ControlSequence(lambda n: CSI + str(n) + 'F', 'Cursor Previous Line')
-CHA = ControlSequence(lambda n: CSI + str(n) + 'G', 'Cursor Horizontal Line Absolute')
-
-CUP = ControlSequence(lambda n, m: CSI + str(n) + ';' + str(m) + 'H', 'Cursor Position')
-HVP = ControlSequence(lambda n, m: CSI + str(n) + ';' + str(m) + 'f', 'Horizontal Vertical Position')
-
-
 def _str_val(val: ta.Any) -> str:
     if isinstance(val, enum.Enum):
         return str(val.value)
@@ -60,6 +48,26 @@ def _str_val(val: ta.Any) -> str:
         return str(val)
 
 
+def _opt_str_val(v):
+    if v is None:
+        return ''
+    else:
+        return _str_val(v)
+
+
+CUU = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'A', 'Cursor Up')
+CUD = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'B', 'Cursor Down')
+CUF = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'C', 'Cursor Forward')
+CUB = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'D', 'Cursor Back')
+
+CNL = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'E', 'Cursor Next Line')
+CPL = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'F', 'Cursor Previous Line')
+CHA = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'G', 'Cursor Horizontal Line Absolute')
+
+CUP = ControlSequence(lambda n, m: CSI + str(n) + ';' + str(m) + 'H', 'Cursor Position')
+HVP = ControlSequence(lambda n, m: CSI + str(n) + ';' + str(m) + 'f', 'Horizontal Vertical Position')
+
+
 class EDs(enum.Enum):
     FROM_CURSOR_TO_END = 0
     FROM_CURSOR_TO_BEGINNING = 1
@@ -67,7 +75,7 @@ class EDs(enum.Enum):
     ALL_AND_SCROLLBACK = 3
 
 
-ED = ControlSequence(lambda n: CSI + _str_val(n) + 'J', 'Erase in Display')
+ED = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'J', 'Erase in Display')
 
 
 class ELs(enum.Enum):
@@ -76,10 +84,10 @@ class ELs(enum.Enum):
     ALL = 2
 
 
-EL = ControlSequence(lambda n: CSI + _str_val(n) + 'K', 'Erase in Line')
+EL = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'K', 'Erase in Line')
 
-SU = ControlSequence(lambda n: CSI + str(n) + 'S', 'Scroll Up')
-SD = ControlSequence(lambda n: CSI + str(n) + 'T', 'Scroll Down')
+SU = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'S', 'Scroll Up')
+SD = ControlSequence(lambda n=None: CSI + _opt_str_val(n) + 'T', 'Scroll Down')
 
 DSR = ControlSequence(lambda: CSI + '6n', 'Device Status Report')
 

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/omlish/term/progressbar.py

@@ -1,3 +1,5 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
 import sys
 import time
 import typing as ta
@@ -20,12 +22,12 @@ class ProgressBar:
 
     def __init__(
             self,
-            total: int | None = None,
+            total: ta.Optional[int] = None,
             *,
             length: int = 40,
             interval: float = .2,
-            start_time: float | None = None,
-            out: ta.TextIO | None = None,
+            start_time: ta.Optional[float] = None,
+            out: ta.Optional[ta.TextIO] = None,
     ) -> None:
         super().__init__()
 
@@ -73,17 +75,25 @@ class ProgressBar:
         info = ' | '.join(info_parts)
         return f'{bar} {info}'
 
+    # Note: omitted, kept lite for now
+    # _LINE_UPDATE_PREFIX: ta.ClassVar[str] = ''.join([
+    #     codes.EL(codes.ELs.ALL),
+    #     codes.CHA(),
+    # ])
+
+    _LINE_UPDATE_PREFIX: ta.ClassVar[str] = '\033[2K\033['
+
     def print(
             self,
             *,
-            now: float | None = None,
+            now: ta.Optional[float] = None,
             **kwargs: ta.Any,
     ) -> None:
         if now is None:
             now = time.time()
 
         line = self.render(**kwargs)
-        self._out.write(f'\033[2K\033[G{line}')
+        self._out.write(f'{self._LINE_UPDATE_PREFIX}{line}')
         self._out.flush()
 
         self._last_print = now
@@ -92,7 +102,7 @@ class ProgressBar:
             self,
             n: int = 1,
             *,
-            now: float | None = None,
+            now: ta.Optional[float] = None,
             silent: bool = False,
     ) -> None:
         if now is None:
@@ -110,8 +120,8 @@ def progress_bar(
         seq: ta.Iterable[T],
         *,
         no_tty_check: bool = False,
-        total: int | None = None,
-        out: ta.TextIO | None = None,
+        total: ta.Optional[int] = None,
+        out: ta.Optional[ta.TextIO] = None,
         **kwargs: ta.Any,
 ) -> ta.Generator[T, None, None]:
     if out is None:
@@ -137,3 +147,14 @@ def progress_bar(
 
     pb.print(complete=True)
     out.write('\n')
+
+
+##
+
+
+if __name__ == '__main__':
+    def _main() -> None:
+        for _ in progress_bar(range(100), no_tty_check=True):
+            time.sleep(0.01)
+
+    _main()

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev264
+Version: 0.0.0.dev265
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev264 → omlish-0.0.0.dev265}/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.dev264'
+version = '0.0.0.dev265'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',