omlish 0.0.0.dev100__py3-none-any.whl → 0.0.0.dev102__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev100'
-__revision__ = '82ba736e6716a22664513d7e70b388c6645703db'
+__version__ = '0.0.0.dev102'
+__revision__ = '591e5229fd5080d01399bef3d509a4686af32891'
 
 
 #

omlish/collections/__init__.py

@@ -1,3 +1,9 @@
+# ruff: noqa: I001
+import typing as _ta
+
+from .. import lang as _lang
+
+
 from .coerce import (  # noqa
     abs_set,
     abs_set_of,
@@ -74,10 +80,16 @@ from .persistent import (  # noqa
     PersistentMap,
 )
 
-from .skiplist import (  # noqa
-    SkipList,
-    SkipListDict,
-)
+if _ta.TYPE_CHECKING:
+    from .skiplist import (  # noqa
+        SkipList,
+        SkipListDict,
+    )
+else:
+    _lang.proxy_init(globals(), '.skiplist', [
+        'SkipList',
+        'SkipListDict',
+    ])
 
 from .sorted import (  # noqa
     SortedCollection,
@@ -86,9 +98,16 @@ from .sorted import (  # noqa
     SortedMutableMapping,
 )
 
-from .treapmap import (  # noqa
-    new_treap_map,
-)
+if _ta.TYPE_CHECKING:
+    from .treapmap import (  # noqa
+        TreapMap,
+        new_treap_map,
+    )
+else:
+    _lang.proxy_init(globals(), '.treapmap', [
+        'TreapMap',
+        'new_treap_map',
+    ])
 
 from .unmodifiable import (  # noqa
     Unmodifiable,

omlish/collections/cache/__init__.py

@@ -1,11 +1,19 @@
-from .descriptor import Ignore  # noqa
-from .descriptor import Scope  # noqa
-from .descriptor import cache  # noqa
-from .descriptor import ignore  # noqa
-from .impl import LFU  # noqa
-from .impl import LRI  # noqa
-from .impl import LRU  # noqa
-from .impl import new_cache  # noqa
-from .types import Cache  # noqa
-from .types import Eviction  # noqa
-from .types import OverweightError  # noqa
+from .descriptor import (  # noqa
+    Ignore,
+    Scope,
+    cache,
+    ignore,
+)
+
+from .impl import (  # noqa
+    LFU,
+    LRI,
+    LRU,
+    new_cache,
+)
+
+from .types import (  # noqa
+    Cache,
+    Eviction,
+    OverweightError,
+)

omlish/lang/__init__.py

@@ -127,6 +127,7 @@ from .imports import (  # noqa
     import_module_attr,
     lazy_import,
     proxy_import,
+    proxy_init,
     resolve_import_name,
     try_import,
     yield_import_all,

omlish/lang/imports.py

@@ -237,3 +237,87 @@ def _trigger_conditional_imports(package: str) -> None:
     _REGISTERED_CONDITIONAL_IMPORTS[package] = None
     for tn in tns:
         __import__(tn)
+
+
+##
+
+
+class NamePackage(ta.NamedTuple):
+    name: str
+    package: str
+
+
+class _ProxyInit:
+    def __init__(
+            self,
+            name_package: NamePackage,
+            *,
+            globals: ta.MutableMapping[str, ta.Any] | None = None,  # noqa
+            update_globals: bool = False,
+    ) -> None:
+        super().__init__()
+
+        self._name_package = name_package
+        self._globals = globals
+        self._update_globals = update_globals
+
+        self._pkgs_by_attr: dict[str, str] = {}
+        self._mods_by_pkgs: dict[str, ta.Any] = {}
+
+    @property
+    def name_package(self) -> NamePackage:
+        return self._name_package
+
+    def add(self, package: str, attrs: ta.Iterable[str]) -> None:
+        if isinstance(attrs, str):
+            raise TypeError(attrs)
+        for attr in attrs:
+            self._pkgs_by_attr[attr] = package
+
+    def get(self, attr: str) -> ta.Any:
+        try:
+            pkg = self._pkgs_by_attr[attr]
+        except KeyError:
+            raise AttributeError(attr)  # noqa
+
+        try:
+            mod = self._mods_by_pkgs[pkg]
+        except KeyError:
+            mod = importlib.import_module(pkg, package=self.name_package.package)
+
+        val = getattr(mod, attr)
+
+        if self._update_globals and self._globals is not None:
+            self._globals[attr] = val
+
+        return val
+
+
+def proxy_init(
+        globals: ta.MutableMapping[str, ta.Any],  # noqa
+        package: str,
+        attrs: ta.Iterable[str],
+) -> None:
+    if isinstance(attrs, str):
+        raise TypeError(attrs)
+
+    init_name_package = NamePackage(
+        globals['__name__'],
+        globals['__package__'],
+    )
+
+    pi: _ProxyInit
+    try:
+        pi = globals['__proxy_init__']
+    except KeyError:
+        pi = _ProxyInit(
+            init_name_package,
+            globals=globals,
+        )
+        globals['__proxy_init__'] = pi
+        globals['__getattr__'] = pi.get
+    else:
+        if pi.name_package != init_name_package:
+            raise Exception(f'Wrong init name: {pi.name_package=} != {init_name_package=}')
+
+    pi.add(package, attrs)

omlish/term.py

@@ -320,9 +320,13 @@ def progress_bar(
         *,
         no_tty_check: bool = False,
         total: int | None = None,
+        out: ta.TextIO | None = None,
         **kwargs: ta.Any,
 ) -> ta.Generator[T, None, None]:
-    if not no_tty_check and not sys.stdout.isatty():
+    if out is None:
+        out = sys.stdout
+
+    if not no_tty_check and not out.isatty():
         yield from seq
         return
 
@@ -332,6 +336,7 @@ def progress_bar(
 
     pb = ProgressBar(
         total=total,
+        out=out,
         **kwargs,
     )
 
@@ -340,7 +345,7 @@ def progress_bar(
         yield item
 
     pb.print(complete=True)
-    sys.stdout.write('\n')
+    out.write('\n')
 
 
 ##

{omlish-0.0.0.dev100.dist-info → omlish-0.0.0.dev102.dist-info}/METADATA

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

{omlish-0.0.0.dev100.dist-info → omlish-0.0.0.dev102.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=yVqFrqrMN4BTjvYSB13be3wGA95pIC84Yq_0m2yFPyA,3352
+omlish/__about__.py,sha256=pBJkbHIJJzAOlkMivUCm04lP4HEtJB4MsycgG36bN4s,3352
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -18,7 +18,7 @@ omlish/multiprocessing.py,sha256=QZT4C7I-uThCAjaEY3xgUYb-5GagUlnE4etN01LDyU4,518
 omlish/os.py,sha256=5nJ-a9JKSMoaZVZ1eOa5BAbfL7o7CF7ue_PyJwufnwY,1460
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/sync.py,sha256=AqwIfIuCMVHLwlJUa7dmaSjfA4sM5AYPCD5-nsz3XVQ,1516
-omlish/term.py,sha256=pgzEZ8FigEvaaRK38N4HhPSI-M9GOYIXy3XLu_CSROc,9197
+omlish/term.py,sha256=BXJSE9gfM461bh4z_gysx0oavZSafqcQs5ayZK-kTUo,9284
 omlish/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/antlr/_runtime/BufferedTokenStream.py,sha256=1Rnhm62MZCWSuQeRs7lRUbdtdyo7Gyg8r4gAETjv-cE,10793
 omlish/antlr/_runtime/CommonTokenFactory.py,sha256=QrSSTH0gYhOpPeOHqrs6-2g1PGcgYvjhR6J6pynKLOc,2147
@@ -94,7 +94,7 @@ omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1
 omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
 omlish/bootstrap/sys.py,sha256=iLHUNIuIPv-k-Mc6aHj5sSET78olCVt7t0HquFDO4iQ,8762
-omlish/collections/__init__.py,sha256=JFphLT_jEe-h_YBKyjrI0RT4KgNvjPXRErebBHwIHfY,1763
+omlish/collections/__init__.py,sha256=qIznS1cnXBxQsZk871DDWOnQfxk_u1PZ_VuIWxqPuxw,2134
 omlish/collections/_abc.py,sha256=sP7BpTVhx6s6C59mTFeosBi4rHOWC6tbFBYbxdZmvh0,2365
 omlish/collections/_io_abc.py,sha256=Cxs8KB1B_69rxpUYxI-MTsilAmNooJJn3w07DKqYKkE,1255
 omlish/collections/coerce.py,sha256=o11AMrUiyoadd8WkdqeKPIpXf2xd0LyylzNCyJivCLU,7036
@@ -112,7 +112,7 @@ omlish/collections/treap.py,sha256=A09ZPacGyJlyRB-Wi4TNj3tE0w-RpFNliPgpDaa6Vwg,7
 omlish/collections/treapmap.py,sha256=TxOM-ZRF5PK2xe5wRIhESNt7DGh9b_MeZfE7HLkCOs4,5804
 omlish/collections/unmodifiable.py,sha256=QmUEi9IBXqiM_KGgH2rqg15VmkHJo1MZ6kwq2twEMho,4750
 omlish/collections/utils.py,sha256=9o9STwzAn5YjZRZ9ns1kuo7NgLXLaoVPFu6AJd-3JT8,4336
-omlish/collections/cache/__init__.py,sha256=Cv8RX-Ehit3um0QLDq7uRDqJUCcdqTKoAB9T0pM_5hg,392
+omlish/collections/cache/__init__.py,sha256=D1gO71VcwxFTZP9gAc9isHfg_TEdalwhsJcgGLvS9hg,233
 omlish/collections/cache/descriptor.py,sha256=t-1Gh4DTABDuNmeDJlpoW4LV3gi_uSlBd9ZfBINfYCM,5023
 omlish/collections/cache/impl.py,sha256=nQox5kChhns9h2a5gnX-ayQGBQJ5-B1aZkLQ2Aej19g,15137
 omlish/collections/cache/types.py,sha256=yNjwd6CGyTJQdxN2CQxFqqBAlcs1Z7vvNV-aU1K7p8E,685
@@ -257,7 +257,7 @@ omlish/inject/impl/privates.py,sha256=alpCYyk5VJ9lJknbRH2nLVNFYVvFhkj-VC1Vco3zCF
 omlish/inject/impl/providers.py,sha256=QnwhsujJFIHC0JTgd2Wlo1kP53i3CWTrj1nKU2DNxwg,2375
 omlish/inject/impl/proxy.py,sha256=1ko0VaKqzu9UG8bIldp9xtUrAVUOFTKWKTjOCqIGr4s,1636
 omlish/inject/impl/scopes.py,sha256=ASfULXgP_ETlsAqFJfrZmyEaZt64Zr8tNn5ScA-EoXk,5900
-omlish/lang/__init__.py,sha256=pKAxhQe2qbN9pDXPOz9_MRxTKJPPWHZyAkWoAaZ9P4M,3688
+omlish/lang/__init__.py,sha256=1BTfyRGPq8ahztMT3xP34EcN2zV3bInCqc1XrUygZh8,3704
 omlish/lang/cached.py,sha256=92TvRZQ6sWlm7dNn4hgl7aWKbX0J1XUEo3DRjBpgVQk,7834
 omlish/lang/clsdct.py,sha256=AjtIWLlx2E6D5rC97zQ3Lwq2SOMkbg08pdO_AxpzEHI,1744
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
@@ -266,7 +266,7 @@ omlish/lang/datetimes.py,sha256=ehI_DhQRM-bDxAavnp470XcekbbXc4Gdw9y1KpHDJT0,223
 omlish/lang/descriptors.py,sha256=RRBbkMgTzg82fFFE4D0muqobpM-ZZaOta6yB1lpX3s8,6617
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=kkPfcdocg-OmyN7skIqrFxNvqAv89Zc_kXKYAN8vw8g,3895
-omlish/lang/imports.py,sha256=Oy7iInOTqgZv6nyRbnvGrPv4cKKIAzPbhfDXCajDUcc,6626
+omlish/lang/imports.py,sha256=zxhoDw4d9F0GcKZGFAe1kU8AiTvGoWLVsqU2uggi_Rk,8729
 omlish/lang/iterables.py,sha256=xRwktm6i2RHSb_ELfAXdjITIfE69qDyMEzgeZqvQXiU,2386
 omlish/lang/maybes.py,sha256=NYHZDjqDtwPMheDrj2VtUVujxRPf8Qpgk4ZlZCTvBZc,3492
 omlish/lang/objects.py,sha256=LOC3JvX1g5hPxJ7Sv2TK9kNkAo9c8J-Jw2NmClR_rkA,4576
@@ -458,9 +458,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev100.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev100.dist-info/METADATA,sha256=TdLGZ5Orn-POreEB-DwNEVxZtZLSzc-J_wm9QxN6WVM,4000
-omlish-0.0.0.dev100.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-omlish-0.0.0.dev100.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev100.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev100.dist-info/RECORD,,
+omlish-0.0.0.dev102.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev102.dist-info/METADATA,sha256=rMtcXpbFBE9hmWF4JaCACQPrjmk1VOMvJcugXSjtbOw,4000
+omlish-0.0.0.dev102.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+omlish-0.0.0.dev102.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev102.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev102.dist-info/RECORD,,