ommlds 0.0.0.dev516__py3-none-any.whl → 0.0.0.dev518__py3-none-any.whl

ommlds/minichain/__init__.py

@@ -689,8 +689,8 @@ with _lang.auto_proxy_init(
     from .resources import (  # noqa
         ResourcesRef,
         ResourcesRefNotRegisteredError,
-        Resources,
 
+        Resources,
         ResourceManaged,
 
         ResourcesOption,

ommlds/minichain/resources.py

@@ -1,13 +1,8 @@
-"""
-TODO:
- - unify with omlish.sql.api.resources -> omlish.resources
-"""
 import contextlib
 import typing as ta
 
-from omlish import check
-from omlish import collections as col
 from omlish import lang
+from omlish import resources as _resources
 from omlish import typedvalues as tv
 from omlish.logs import all as logs
 
@@ -23,191 +18,14 @@ log = logs.get_module_logger(globals())
 ##
 
 
-class ResourcesRef(lang.Abstract):
-    pass
-
-
-class ResourcesRefNotRegisteredError(Exception):
-    pass
-
-
-@ta.final
-class Resources(lang.Final, lang.NotPicklable):
-    """
-    Essentially a reference-tracked AsyncContextManager.
-    """
-
-    def __init__(
-            self,
-            *,
-            init_ref: ResourcesRef | None = None,
-            no_autoclose: bool = False,
-    ) -> None:
-        super().__init__()
-
-        self._no_autoclose = no_autoclose
-
-        self._closed = False
-
-        self._refs: ta.MutableSet[ResourcesRef] = col.IdentitySet()
-
-        self._aes = contextlib.AsyncExitStack()
-
-        if init_ref is not None:
-            self.add_ref(init_ref)
-
-    async def init(self) -> None:
-        await self._aes.__aenter__()
-
-    @property
-    def autoclose(self) -> bool:
-        return not self._no_autoclose
-
-    @property
-    def num_refs(self) -> int:
-        return len(self._refs)
-
-    @property
-    def closed(self) -> bool:
-        return self._closed
-
-    def __repr__(self) -> str:
-        return lang.attr_repr(self, 'closed', 'num_refs', with_id=True)
-
-    #
-
-    class _InitRef(ResourcesRef):
-        pass
-
-    @classmethod
-    def new(cls, **kwargs: ta.Any) -> ta.AsyncContextManager['Resources']:
-        @contextlib.asynccontextmanager
-        async def inner():
-            init_ref = Resources._InitRef()
-
-            res = Resources(init_ref=init_ref, **kwargs)
-
-            await res.init()
-
-            try:
-                yield res
-
-            finally:
-                await res.remove_ref(init_ref)
-
-        return inner()
-
-    #
-
-    def add_ref(self, ref: ResourcesRef) -> None:
-        check.isinstance(ref, ResourcesRef)
-        check.state(not self._closed)
-
-        self._refs.add(ref)
-
-    def has_ref(self, ref: ResourcesRef) -> bool:
-        return ref in self._refs
-
-    async def remove_ref(self, ref: ResourcesRef) -> None:
-        check.isinstance(ref, ResourcesRef)
-
-        try:
-            self._refs.remove(ref)
-
-        except KeyError:
-            raise ResourcesRefNotRegisteredError(ref) from None
-
-        if not self._no_autoclose and not self._refs:
-            await self.aclose()
-
-    #
-
-    def enter_context(self, cm: ta.ContextManager[T]) -> T:
-        check.state(not self._closed)
-
-        return self._aes.enter_context(cm)
-
-    async def enter_async_context(self, cm: ta.AsyncContextManager[T]) -> T:
-        check.state(not self._closed)
-
-        return await self._aes.enter_async_context(cm)
-
-    #
-
-    def new_managed(self, v: T) -> 'ResourceManaged[T]':
-        return ResourceManaged(v, self)
-
-    #
-
-    async def aclose(self) -> None:
-        try:
-            await self._aes.__aexit__(None, None, None)
-        finally:
-            self._closed = True
-
-    def __del__(self) -> None:
-        if not self._closed:
-            ref_lst = list(self._refs)
-            log.error(
-                f'{__package__}.{self.__class__.__name__}.__del__: '  # noqa
-                f'%r deleted without being closed! '
-                f'refs: %s',
-                repr(self),
-                ref_lst,
-            )
-
-
-##
-
-
-@ta.final
-class ResourceManaged(ResourcesRef, lang.Final, lang.NotPicklable, ta.Generic[T]):
-    """
-    A class to 'handoff' a ref to a `Resources`, allowing the `Resources` to temporarily survive being passed from
-    instantiation within a callee.
-
-    This class wraps an arbitrary value, likely an object referencing resources managed by the `Resources`, which is
-    accessed by `__aenter__`'ing. However, as the point of this class is handoff of a `Resources`, not necessarily some
-    arbitrary value, the value needn't necessarily be related to the `Resources`, or may even be `None`.
-
-    The ref to the `Resources` is allocated in the ctor, so the contract is that an instance of this must be immediately
-    `__aenter__`'d before doing anything else with the return value of the call. Failure to do so leaks the `Resources`.
-    """
-
-    def __init__(self, v: T, resources: Resources) -> None:
-        super().__init__()
-
-        self.__v = v
-        self.__resources = resources
-
-        resources.add_ref(self)
-
-    __state: ta.Literal['new', 'entered', 'exited'] = 'new'
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}<{self.__v!r}, {self.__state}>'
-
-    async def __aenter__(self) -> T:
-        check.state(self.__state == 'new')
-        self.__state = 'entered'
-
-        return self.__v
+ResourcesRef: ta.TypeAlias = _resources.ResourceManagerRef
+ResourcesRefNotRegisteredError: ta.TypeAlias = _resources.ResourceManagerRefNotRegisteredError
 
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        check.state(self.__state == 'entered')
-        self.__state = 'exited'
+Resources: ta.TypeAlias = _resources.AsyncResourceManager
 
-        await self.__resources.remove_ref(self)
+# Explicitly not marked as `ta.TypeAlias` because it confuses pycharm.
+ResourceManaged = _resources.AsyncResourceManaged
 
-    def __del__(self) -> None:
-        if self.__state != 'exited':
-            log.error(
-                f'{__package__}.{self.__class__.__name__}.__del__: '  # noqa
-                f'%r deleted without being entered and exited! '
-                f'resources: %s',
-                repr(self),
-                repr(self.__resources),
-            )
 
 ##
 

{ommlds-0.0.0.dev516.dist-info → ommlds-0.0.0.dev518.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev516
+Version: 0.0.0.dev518
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,9 +14,9 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev516
+Requires-Dist: omlish==0.0.0.dev518
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev516; extra == "all"
+Requires-Dist: omdev==0.0.0.dev518; extra == "all"
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "all"
 Requires-Dist: mlx-lm~=0.30; sys_platform == "darwin" and extra == "all"
@@ -39,7 +39,7 @@ Requires-Dist: mwparserfromhell~=0.7; extra == "all"
 Requires-Dist: wikitextparser~=0.56; extra == "all"
 Requires-Dist: lxml>=5.3; python_version < "3.13" and extra == "all"
 Provides-Extra: omdev
-Requires-Dist: omdev==0.0.0.dev516; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev518; extra == "omdev"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "backends"

{ommlds-0.0.0.dev516.dist-info → ommlds-0.0.0.dev518.dist-info}/RECORD

@@ -244,7 +244,7 @@ ommlds/cli/state/storage.py,sha256=Wr8DVuEGUxfFJn0tMWNTVdint6NBDdLKstNWSjx8sKw,3
 ommlds/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/datasets/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/datasets/lib/movies.py,sha256=LmdfoXsZU9XMM_r-sxCLv_s06BFzwWO4xUj6sc9XVcI,1961
-ommlds/minichain/__init__.py,sha256=pmYyU-bDodWx3sKU0NmcLXDY5mp8BxM8S60LMghSxgQ,14048
+ommlds/minichain/__init__.py,sha256=eeJ0JZRJjVwp4hkNtoPpDuPDIAwY__BZ_uD7uzahx44,14048
 ommlds/minichain/_dataclasses.py,sha256=D3K9j3I5-s5LAN9b5ZmWT80rbYMMVURLDpFXf6MkSQc,956494
 ommlds/minichain/_marshal.py,sha256=n9PGWrHhvAmGIc7KDOYt3IF9Z6G0ncXskyICTp3Ji6k,1923
 ommlds/minichain/_typedvalues.py,sha256=0EkpyGo1IVnpcsssz8Xdm_vIoqIbb0dKdhZ5AJzAJCk,2292
@@ -253,7 +253,7 @@ ommlds/minichain/configs.py,sha256=WwrHxfkDAfo_RtuCqUgySthj-2W26lZbpuQoghUyGNw,1
 ommlds/minichain/envs.py,sha256=vE2CSeT6KYxOpPY72VbFLzGUnBERYdhfiEUlvSRHkXE,225
 ommlds/minichain/json.py,sha256=0_5rV5Zi2qPOvXi2CLAc5DF7FN3jK3ABbjoKdjtTuVo,360
 ommlds/minichain/metadata.py,sha256=NRrcfN2l4XArHXje3vA9AmkDceXsN-ymT8fbmbW0Ka8,2228
-ommlds/minichain/resources.py,sha256=ERGSVNcfuvjY8lLpcIvoB1X4KVn831F4lmUn7wnYw-M,5880
+ommlds/minichain/resources.py,sha256=4tK9ImmW4j7RWg3Ti2wm7u_wZOlQftzpt4bqFn-3Rh4,1150
 ommlds/minichain/search.py,sha256=YOMJKkTLLSfGKaxltk9bf5OdPq7MpCtLOC3NZ_4iq-E,1269
 ommlds/minichain/standard.py,sha256=l7C6EXE4FgfJOphl0vHMwCq4FvMNViloz7pPfMsRnGU,2637
 ommlds/minichain/types.py,sha256=K6RRjpUi17UEG0cqPrrvbVANU0iRVh3WLiH-y6oEWFI,414
@@ -528,9 +528,9 @@ ommlds/wiki/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ommlds/wiki/utils/io.py,sha256=UKgDJGtmpnWvIqVd2mJc2QNPOqlToEY1GEveNp6_pMo,7088
 ommlds/wiki/utils/progress.py,sha256=EhvKcMFYtsarCQhIahlO6f0SboyAKP3UwUyrnVnP-Vk,3222
 ommlds/wiki/utils/xml.py,sha256=sNJNkZ9rT8B-kJMO6bRz8J1USy4fyPx0m2PwTX7vxYY,3846
-ommlds-0.0.0.dev516.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev516.dist-info/METADATA,sha256=cmuDX5xzzGE64NG0octLCakvyjJcJox4PU98KqxnX_I,3598
-ommlds-0.0.0.dev516.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-ommlds-0.0.0.dev516.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev516.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev516.dist-info/RECORD,,
+ommlds-0.0.0.dev518.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev518.dist-info/METADATA,sha256=dh8M2MdgXfCevQdMxafkcXjCGVkI-9gDVIdqA9B9teA,3598
+ommlds-0.0.0.dev518.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ommlds-0.0.0.dev518.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev518.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev518.dist-info/RECORD,,