omdev 0.0.0.dev29__py3-none-any.whl → 0.0.0.dev31__py3-none-any.whl

omdev/scripts/pyproject.py

@@ -11,9 +11,8 @@ TODO:
  - build / package / publish / version roll
   - {pkg_name: [src_dirs]}, default excludes, generate MANIFST.in, ...
  - env vars - PYTHONPATH
- - optional uv backend
 
-lookit:
+See:
  - https://pdm-project.org/en/latest/
  - https://rye.astral.sh/philosophy/
  - https://github.com/indygreg/python-build-standalone/blob/main/pythonbuild/cpython.py
@@ -30,6 +29,7 @@ import base64
 import collections
 import collections.abc
 import concurrent.futures as cf
+import contextlib
 import csv
 import dataclasses as dc
 import datetime
@@ -2800,6 +2800,24 @@ class StandardLogHandler(ProxyLogHandler):
 ##
 
 
+@contextlib.contextmanager
+def _locking_logging_module_lock() -> ta.Iterator[None]:
+    if hasattr(logging, '_acquireLock'):
+        logging._acquireLock()  # noqa
+        try:
+            yield
+        finally:
+            logging._releaseLock()  # type: ignore  # noqa
+
+    elif hasattr(logging, '_lock'):
+        # https://github.com/python/cpython/commit/74723e11109a320e628898817ab449b3dad9ee96
+        with logging._lock:  # noqa
+            yield
+
+    else:
+        raise Exception("Can't find lock in logging module")
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
@@ -2807,8 +2825,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    logging._acquireLock()  # type: ignore  # noqa
-    try:
+    with _locking_logging_module_lock():
         if target is None:
             target = logging.root
 
@@ -2848,9 +2865,6 @@ def configure_standard_logging(
 
         return StandardLogHandler(handler)
 
-    finally:
-        logging._releaseLock()  # type: ignore  # noqa
-
 
 ########################################
 # ../../../omlish/lite/marshal.py
@@ -4221,7 +4235,14 @@ TODO:
  - custom tags
  - optionally install / upgrade pyenv itself
  - new vers dont need these custom mac opts, only run on old vers
-"""
+
+TODO opts:
+ - --enable-loadable-sqlite-extensions LDFLAGS="-L/opt/homebrew/opt/sqlite/lib" CPPFLAGS="-I/opt/homebrew/opt/sqlite/include"
+ - --enable-shared
+ - --enable-optimizations
+ - --enable-profiling ?
+ - --enable-ipv6 ?
+"""  # noqa
 
 
 ##
@@ -4929,6 +4950,11 @@ class Venv:
         if (sr := self._cfg.requires):
             rr = RequirementsRewriter(self._name)
             reqs = [rr.rewrite(req) for req in sr]
+
+            # TODO: automatically try slower uv download when it fails? lol
+            #   Caused by: Failed to download distribution due to network timeout. Try increasing UV_HTTP_TIMEOUT (current value: 30s).  # noqa
+            #   UV_CONCURRENT_DOWNLOADS=4 UV_HTTP_TIMEOUT=3600
+
             subprocess_check_call(
                 ve,
                 '-m',

omdev/secrets.py

@@ -0,0 +1,12 @@
+import os.path
+import typing as ta
+
+import yaml
+
+
+SECRETS_PATH = os.getenv('SECRETS_PATH', os.path.expanduser('~/Dropbox/.dotfiles/secrets.yml'))
+
+
+def load_secrets() -> dict[str, ta.Any]:
+    with open(SECRETS_PATH) as f:
+        return yaml.safe_load(f)

omdev/tools/piptools.py

@@ -21,6 +21,30 @@ class Cli(ap.Cli):
         latest = check.not_none(doc.find('./channel/item/title')).text
         print(latest)
 
+    @ap.command(
+        ap.arg('file'),
+        ap.arg('-w', '--write', action='store_true'),
+        ap.arg('-q', '--quiet', action='store_true'),
+    )
+    def filter_dev_deps(self) -> None:
+        with open(self.args.file) as f:
+            src = f.read()
+
+        out = []
+        for l in src.splitlines(keepends=True):
+            if l.startswith('-e'):
+                continue
+            out.append(l)
+
+        new_src = ''.join(out)
+
+        if not self.args.quiet:
+            print(new_src)
+
+        if self.args.write:
+            with open(self.args.file, 'w') as f:
+                f.write(new_src)
+
 
 if __name__ == '__main__':
     Cli()()

{omdev-0.0.0.dev29.dist-info → omdev-0.0.0.dev31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev29
+Version: 0.0.0.dev31
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev29
+Requires-Dist: omlish ==0.0.0.dev31
 Provides-Extra: all
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
 Requires-Dist: cffi ~=1.17 ; extra == 'all'

{omdev-0.0.0.dev29.dist-info → omdev-0.0.0.dev31.dist-info}/RECORD

@@ -7,27 +7,30 @@ omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=P8v4I1tm6g-PEWJiNwAKxErvWwL-Nop83vAuwq1kR5A,2246
 omdev/findmagic.py,sha256=DhBYHHP_dzwM5pIh21xnQPnkZ2YmAXCjithsr7X0ScU,2357
 omdev/git.py,sha256=OzP4xHVboaa7GhS-mg4F3lYWf3HLa5aMm6V6PtIw_3U,2137
-omdev/manifests.py,sha256=8Wf_pOn9cUaeb6thFqanpuhbqfvrDs5kH-H1BBOb4n4,6622
+omdev/manifests.py,sha256=bn8FzgYvC7L70mRXvu8TSc41eGp-BSVzuRvGuYj3FC8,9225
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
+omdev/secrets.py,sha256=ja0VsCB01MHxYwn5OHjFeXV9cRah9AQl-0uJzZELpic,256
 omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=OE1udULO1g4McUbeg1CoHbSm4hbQ2kcE3ffEGxlnPh4,69
 omdev/amalg/amalg.py,sha256=g7wwcPE2G9qmzh8M9eZAscOYWKo3ldI8bNxEXFnmzLE,14064
 omdev/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/cache/comp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/cache/comp/cache.py,sha256=0VDub_za4GlR5gIynqK4CnhhZFs-cdtlf_lwMhgtFa4,3387
-omdev/cache/comp/contexts.py,sha256=1pkZXeNG3Ehrwb6vZHWOgR0zDSXSTKsPrdSDW5tIRKs,3091
-omdev/cache/comp/fns.py,sha256=72yQ1e7NH8GxZ-ppcik1JLMEJGzrBvHgI5PSp4HcXVM,2943
-omdev/cache/comp/resolvers.py,sha256=Do7_PKy-09hyptgKel1vKQnHcpc3wjCP-1St3unTspc,614
-omdev/cache/comp/types.py,sha256=vFrcB8WftWDHQnrHG0lRXMBStWCm2M_Q4Xft-Rz7xnc,1907
-omdev/cache/data/__init__.py,sha256=7286T46a7gUEvC0gvSYZtfyS_h2oZJx0I2zE6UUTJkc,294
-omdev/cache/data/actions.py,sha256=OrCjo0INKeG8iEvXnQ9LI8PD8WF4d1vxrBwQzuA2ASw,829
-omdev/cache/data/cache.py,sha256=VQQpC5c2TcpLtFG87nkMdJ6_jgmRsocRuZe2FdzTddo,4768
+omdev/cache/compute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/cache/compute/cache.py,sha256=pEbcTSQavhX7M0olzR8AOCtHx7tMnMnEDEfTPQVY5uE,3602
+omdev/cache/compute/contexts.py,sha256=OKOHOIj8JSEHmCKMY9G_zpKkLAkGuXcFXvzY5SXqCMA,3231
+omdev/cache/compute/currents.py,sha256=D1Ls5Sd7FX2aPO5wpyEwTSmkz50sxkwCs37Amb0urH8,1425
+omdev/cache/compute/fns.py,sha256=_1xU7qw1O57OsTp17RFjFTBO1M2t54RL-CGdl-0cTBk,4175
+omdev/cache/compute/resolvers.py,sha256=9dq0mt__emp8CdNDWPVUr_dCkTOn7ar6nw0F2QH6XpQ,566
+omdev/cache/compute/storage.py,sha256=woCUqHg8ZrwLEejRG3zu1L5ZXxGNNXveh3E8FnlEkjc,941
+omdev/cache/compute/types.py,sha256=NpCTTJHDmpERjrbO6dh9TEzHuP6-vOuoX3ym9sA0ukc,2639
+omdev/cache/data/__init__.py,sha256=SQXtugLceRif463rcoklpQ33pxYLgEIm0xiI6NvOI6M,301
+omdev/cache/data/actions.py,sha256=TX6DPbOzQY6S2MSTPnsG53BQ61NNPWuLeCXa-MF-W2g,1109
+omdev/cache/data/cache.py,sha256=WSsbFyFRT_IQFYQCrmUpaTvs9DRglLmCnhguOzdJ6p4,5753
 omdev/cache/data/consts.py,sha256=d6W_aeMqgah6PmPYi9RA8Be54oQ4BcNCy8kDQ7FlB_Q,26
 omdev/cache/data/defaults.py,sha256=HrapVUIf9Ozu3qSfRPyQj-vx-dz6Yyedjb-k3yV4CW8,277
-omdev/cache/data/manifests.py,sha256=6SqUiAlzkuDwIApEjzh5P6VimRVGk3iMwXjEPH2zvrc,1006
-omdev/cache/data/specs.py,sha256=ggvbp4nSEnXJImt_stVh4OsOYNzPIVGXAWplr17yEyg,2290
+omdev/cache/data/manifests.py,sha256=CupK71fL3_PnDzUqjrWLNt64KfGKF-K4ycMkT5p0gPA,979
+omdev/cache/data/specs.py,sha256=EB_JLIFe47ETCtAk8BD6oY6qhM7U_nOkILJfnLaVafI,2351
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=aOWF_5C2pqnIrkT1ykEaL7N2pIpamW6pdXriRbd3lvs,1725
 omdev/cexts/build.py,sha256=F3z1-CjDlEM-Gzi5IunKUBO52qdH_pMsFylobTdGJnI,2654
@@ -56,7 +59,7 @@ omdev/interp/__main__.py,sha256=gFhR9DikwDZk0LqgdR3qq_aXQHThUOPllDmHDOfnFAU,67
 omdev/interp/cli.py,sha256=8T3qLXTC2mni5FXDHkHN3mZG9_BnjkDMXYy6EYbAYR8,1679
 omdev/interp/inspect.py,sha256=SI4jQmWfXCnlceFTxlVRfTlEYYCjO_X12wuG5e74yto,2849
 omdev/interp/providers.py,sha256=PFEjozW0c33eqg8sno-GHMKbhVUzQF9jrAx-M0uQimk,1787
-omdev/interp/pyenv.py,sha256=whNOnNnt01rRL6pe3Ew-o84_V84bBTG6mR-wro0Vh3Q,12454
+omdev/interp/pyenv.py,sha256=s7nY2c6g3dOzvEefB_lgDjs6XSJ_u1ClCXQlWnCk6oM,12688
 omdev/interp/resolvers.py,sha256=tpzlmqGp1C4QKdA6TfcPmtmaygu7mb6WK2RPSbyNQ6s,3022
 omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,7731
 omdev/interp/system.py,sha256=UFHfMR0CHCEnNx5fhrze8esAwigpRrJUA33ftq6nA0I,3514
@@ -73,15 +76,15 @@ omdev/precheck/scripts.py,sha256=qq6MXkxgrYngPg5pWnXH4uRSuRkP3mFqbeml1UmvGBc,126
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gFhR9DikwDZk0LqgdR3qq_aXQHThUOPllDmHDOfnFAU,67
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
-omdev/pyproject/cli.py,sha256=qBVsQDcNSCC3i78X9jFlPZ3ahDSY-0OD0UN1mbqLgYE,10649
+omdev/pyproject/cli.py,sha256=gRUsTcVQDx9u6hZNOGAHG-4pccF6tS3I1fHBzgS1Tb0,10908
 omdev/pyproject/configs.py,sha256=K9H5cGwVLgHi8wKwtYvlXHZ9ThtmnI4jo8JAb-t1-70,2859
 omdev/pyproject/pkg.py,sha256=GlZvDcLbo7HmiV2SgQnJdgAswr9IoJpy5gOeTRXG2RM,12576
 omdev/pyproject/reqs.py,sha256=coq21cdWQIPs06-iuRnwc6F2Sf-IxpqoT6DEMhol2kA,2298
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
 omdev/scripts/execrss.py,sha256=HzDNmwXOO8fMwIRXw9q8CUnVfLFCQASyU2tfY_y2Vf8,324
-omdev/scripts/interp.py,sha256=_WbXArFouTOZ4-95Kc7kCC1GbFmp-Ftyhz_1jLxTvQw,68796
-omdev/scripts/pyproject.py,sha256=REWHjV1sCP0t6QEv9Yv7N4okJKIElTCs8xQ-pvDqFDU,152647
+omdev/scripts/interp.py,sha256=f_BDB7gQTnGMQk-kzUHcBbtl1RGpFIqQskOCODHir50,69488
+omdev/scripts/pyproject.py,sha256=zL2MPdN1tyEBXzZc6rmB86cTdAZUCtmB9ICtaMGIxj4,153598
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 omdev/toml/writer.py,sha256=dwz_Qw8z5Z_nmWpXqch63W6S_j6n256erb7AGFTVzB4,2872
@@ -90,14 +93,14 @@ omdev/tools/dockertools.py,sha256=0RoUThTqv4ySJZX0aufYeQWD2bp-BMplQ8Y4WvDpguA,52
 omdev/tools/gittools.py,sha256=zPy2D5WDs-CbwT86_T_hbaq5yCuss5e-ouUccXC6xlg,578
 omdev/tools/importscan.py,sha256=XRLiasVSaTIp-jnO0-Nfhi0t6gnv_hVy5j2nVfEvuMI,3831
 omdev/tools/importtrace.py,sha256=oDry9CwIv5h96wSaTVKJ0qQ5vMGxYE5oBtfF-GYNLJs,13430
-omdev/tools/piptools.py,sha256=etJBfjtUZ5HeQ7C4sxWmeshT-xXPdhScqEHWbca98n0,657
+omdev/tools/piptools.py,sha256=P2Nq8OzRuLxay1uQgqaWf3Iz6PFVhFKmVaBwxNbbzwU,1274
 omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
 omdev/tools/sqlrepl.py,sha256=v9uVQ4nvquSXcQVYIFq34ikumSILvKqzD6lUKLcncCE,5646
 omdev/versioning/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/versioning/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
 omdev/versioning/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
-omdev-0.0.0.dev29.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev29.dist-info/METADATA,sha256=_kVRNNJ4CIoIyEtgTCcAJzicnJevUfpkRjtXGcONxCQ,1252
-omdev-0.0.0.dev29.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev29.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev29.dist-info/RECORD,,
+omdev-0.0.0.dev31.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev31.dist-info/METADATA,sha256=PPt5cs_yozGg6dBtCj2mS1oviINmxzj1NVOmhIxa0Vg,1252
+omdev-0.0.0.dev31.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev31.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev31.dist-info/RECORD,,

omdev/cache/comp/cache.py

@@ -1,137 +0,0 @@
-"""
-TODO:
- - decorator
- - thread local cache instance - but shared
- - arbitrary user-specified cache keys
- - filesystem OPTIONAL
- - locking
- - Keyer scheme
- - per-module-ish CACHE_VERSION convention
- - are pickles stable?
- - ComputeCache class
- - Cacheable - fn is one
- - ttl
- - nice to have: np mmap
- - compress?
- - decos, descriptors, etc
- - overlap w/ jobs/dags/batches/whatever
- - joblib
- - keep src anyway, but just for warn
-  - strip comments?
- - ** INPUTS **
-  - if underlying impl changes, bust
-  - kinda reacty/reffy/signally
- - decorator unwrapping and shit
- - proactive deep invalidate
- - tracked and versioned 'ops' but not result cached
-  - 'Versioned'
-
-manifest stuff
- - serialization_version
- - lib_version
- - lib_revision
-
-fn manifest stuff
- - source
- - qualname
- - location
-
-See:
- - https://github.com/amakelov/mandala
- - https://jax.readthedocs.io/en/latest/autodidax.html
- - tinyjit
- - https://docs.python.org/3/library/pickle.html#pickle.Pickler.dispatch_table
-
-names:
- - CacheKey = unambiguous, fully qualified, unhashed map key - usually Cacheable + args
- - Cacheable = usually a fn
- - CacheableName = qualname of a cacheable
-  - dir structure: __package__/__qualname__/... ?
-"""
-import copy
-import typing as ta
-
-from omlish import collections as col
-from omlish import dataclasses as dc
-
-from .types import CacheableName
-from .types import CacheableResolver
-from .types import CacheableVersionMap
-from .types import CacheKey
-from .types import CacheResult
-
-
-class Cache:
-    def __init__(
-            self,
-            resolver: CacheableResolver,
-    ) -> None:
-        super().__init__()
-
-        self._resolver = resolver
-
-        self._dct: dict[CacheKey, Cache.Entry] = {}
-
-        self._stats = Cache.Stats()
-
-    @dc.dataclass()
-    class Stats:
-        num_hits: int = 0
-        num_misses: int = 0
-        num_invalidates: int = 0
-        num_puts: int = 0
-
-    @property
-    def stats(self) -> Stats:
-        return copy.deepcopy(self._stats)
-
-    @dc.dataclass(frozen=True)
-    class Entry:
-        key: CacheKey
-        versions: CacheableVersionMap
-        value: ta.Any
-
-        @dc.validate
-        def _check_types(self) -> bool:
-            return (
-                isinstance(self.key, CacheKey) and
-                isinstance(self.versions, col.frozendict)
-            )
-
-    def _build_version_map(self, names: ta.Iterable[CacheableName]) -> CacheableVersionMap:
-        dct = {}
-        for n in names:
-            c = self._resolver.resolve(n)
-            dct[n] = c.version
-        return col.frozendict(dct)
-
-    def get(self, key: CacheKey) -> CacheResult | None:
-        try:
-            entry = self._dct[key]
-        except KeyError:
-            self._stats.num_misses += 1
-            return None
-
-        new_versions = self._build_version_map(entry.versions)
-        if entry.versions != new_versions:
-            del self._dct[key]
-            self._stats.num_invalidates += 1
-            return None
-
-        self._stats.num_hits += 1
-        return CacheResult(
-            True,
-            entry.versions,
-            entry.value,
-        )
-
-    def put(self, key: CacheKey, versions: CacheableVersionMap, val: ta.Any) -> None:
-        if key in self._dct:
-            raise KeyError(key)
-
-        self._dct[key] = Cache.Entry(
-            key,
-            versions,
-            val,
-        )
-        self._stats.num_puts += 1

omdev/cache/comp/contexts.py

@@ -1,136 +0,0 @@
-import contextlib
-import typing as ta
-
-from omlish import check
-from omlish import lang
-
-from .cache import Cache
-from .types import Cacheable
-from .types import CacheableVersionMap
-from .types import CacheKey
-from .types import CacheResult
-from .types import merge_version_maps
-
-
-CacheT = ta.TypeVar('CacheT', bound='Cache')
-
-
-##
-
-
-_CURRENT_CACHE: Cache | None = None
-
-
-@contextlib.contextmanager
-def cache_context(cache: CacheT) -> ta.Iterator[CacheT]:
-    global _CURRENT_CACHE
-    prev = _CURRENT_CACHE
-    try:
-        _CURRENT_CACHE = cache
-        yield cache
-    finally:
-        check.is_(_CURRENT_CACHE, cache)
-        _CURRENT_CACHE = prev
-
-
-def get_current_cache() -> Cache | None:
-    return _CURRENT_CACHE
-
-
-##
-
-
-class CacheableContext(lang.Final):
-    def __init__(
-            self,
-            cacheable: Cacheable,
-            key: CacheKey,
-            *,
-            parent: ta.Optional['CacheableContext'] = None,
-    ) -> None:
-        super().__init__()
-        self._cacheable = cacheable
-        self._key = key
-        self._parent = parent
-
-        self._result: CacheResult | None = None
-        self._children: list[CacheableContext] = []
-
-        if parent is not None:
-            check.state(not parent.has_result)
-            parent._children.append(self)  # noqa
-
-    #
-
-    @property
-    def cacheable(self) -> Cacheable:
-        return self._cacheable
-
-    @property
-    def key(self) -> CacheKey:
-        return self._key
-
-    @property
-    def parent(self) -> ta.Optional['CacheableContext']:
-        return self._parent
-
-    @property
-    def children(self) -> ta.Sequence['CacheableContext']:
-        return self._children
-
-    #
-
-    @property
-    def has_result(self) -> bool:
-        return self._result is not None
-
-    def result(self) -> CacheResult:
-        return check.not_none(self._result)
-
-    def set_hit(self, result: CacheResult) -> None:
-        check.state(result.hit)
-        self._result = check.replacing_none(self._result, result)
-        self.result_versions()
-
-    def set_miss(self, val: ta.Any) -> None:
-        self._result = check.replacing_none(self._result, CacheResult(
-            False,
-            CacheableVersionMap(),
-            val,
-        ))
-        self.result_versions()
-
-    @lang.cached_function
-    def result_versions(self) -> CacheableVersionMap:
-        r = check.not_none(self._result)
-        return merge_version_maps(
-            self._cacheable.as_version_map,
-            r.versions,
-            *[c.result_versions() for c in self._children],
-        )
-
-
-#
-
-
-_CURRENT_CACHEABLE_CONTEXT: CacheableContext | None = None
-
-
-@contextlib.contextmanager
-def cacheable_context(
-        cacheable: Cacheable,
-        key: CacheKey,
-) -> ta.Iterator[CacheableContext]:
-    global _CURRENT_CACHEABLE_CONTEXT
-    prev = _CURRENT_CACHEABLE_CONTEXT
-    ctx = CacheableContext(
-        cacheable,
-        key,
-        parent=prev,
-    )
-    try:
-        _CURRENT_CACHEABLE_CONTEXT = ctx
-        yield ctx
-    finally:
-        check.is_(_CURRENT_CACHEABLE_CONTEXT, ctx)
-        _CURRENT_CACHEABLE_CONTEXT = prev

omdev/cache/comp/fns.py

@@ -1,115 +0,0 @@
-import functools
-import importlib
-import typing as ta
-
-from omlish import cached
-from omlish import check
-from omlish import collections as col
-from omlish import dataclasses as dc
-from omlish import lang
-
-from .contexts import cacheable_context
-from .contexts import get_current_cache
-from .types import Cacheable
-from .types import CacheableName
-from .types import CacheableResolver
-from .types import CacheKey
-
-
-T = ta.TypeVar('T')
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class FnCacheableName(CacheableName, lang.Final):
-    module: str
-    qualname: str
-
-
-@dc.dataclass(frozen=True)
-class FnCacheable(Cacheable, lang.Final):
-    fn: ta.Callable
-    version: int = dc.xfield(override=True)
-
-    @cached.property
-    def name(self) -> FnCacheableName:
-        return FnCacheableName(self.fn.__module__, self.fn.__qualname__)  # noqa
-
-
-class FnCacheableResolver(CacheableResolver):
-    def resolve(self, name: CacheableName) -> Cacheable:
-        fname = check.isinstance(name, FnCacheableName)
-
-        mod = importlib.import_module(fname.module)
-        obj = mod
-        for a in fname.qualname.split('.'):
-            obj = getattr(obj, a)
-
-        check.callable(obj)
-        fc = check.isinstance(obj.__cacheable__, FnCacheable)
-
-        return fc
-
-
-@dc.dataclass(frozen=True)
-class FnCacheKey(CacheKey[FnCacheableName], lang.Final):
-    args: tuple
-    kwargs: col.frozendict[str, ta.Any]
-
-    @dc.validate
-    def _check_fn_types(self) -> bool:
-        return (
-            isinstance(self.name, FnCacheableName) and
-            isinstance(self.args, tuple) and
-            isinstance(self.kwargs, col.frozendict)
-        )
-
-
-##
-
-
-def cached_fn(version: int) -> ta.Callable[[T], T]:
-    def outer(fn):
-        @functools.wraps(fn)
-        def inner(*args, **kwargs):
-            # NOTE: just for testing :x allows updating
-            # TODO: proper wrapper obj probably (enforce name resolution)
-            cacheable = inner.__cacheable__  # type: ignore
-
-            if (cache := get_current_cache()) is not None:
-                key = FnCacheKey(
-                    cacheable.name,
-                    args,
-                    col.frozendict(kwargs),
-                )
-
-                with cacheable_context(
-                        cacheable,
-                        key,
-                ) as ctx:
-                    if (hit := cache.get(key)) is not None:
-                        ctx.set_hit(hit)
-                        return hit.value
-
-                    val = fn(*args, **kwargs)
-                    ctx.set_miss(val)
-                    cache.put(
-                        key,
-                        ctx.result_versions(),
-                        val,
-                    )
-                    return val
-
-            else:
-                return fn(*args, **kwargs)
-
-        inner.__cacheable__ = FnCacheable(  # type: ignore
-            fn,
-            version,
-        )
-
-        return inner
-
-    return outer  # noqa

omdev/cache/comp/resolvers.py

@@ -1,23 +0,0 @@
-from .types import Cacheable
-from .types import CacheableName
-from .types import CacheableResolver
-
-
-class CachingCacheableResolver(CacheableResolver):
-    def __init__(self, child: CacheableResolver) -> None:
-        super().__init__()
-
-        self._child = child
-        self._dct: dict[CacheableName, Cacheable] = {}
-
-    def clear(self) -> None:
-        self._dct.clear()
-
-    def resolve(self, name: CacheableName) -> Cacheable:
-        try:
-            return self._dct[name]
-        except KeyError:
-            pass
-        ret = self._child.resolve(name)
-        self._dct[name] = ret
-        return ret