ommlds 0.0.0.dev473__tar.gz → 0.0.0.dev474__tar.gz

{ommlds-0.0.0.dev473/ommlds.egg-info → ommlds-0.0.0.dev474}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev473
+Version: 0.0.0.dev474
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev473
-Requires-Dist: omlish==0.0.0.dev473
+Requires-Dist: omdev==0.0.0.dev474
+Requires-Dist: omlish==0.0.0.dev474
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"
@@ -27,13 +27,13 @@ Requires-Dist: torch~=2.9; extra == "all"
 Requires-Dist: transformers~=4.57; extra == "all"
 Requires-Dist: sentence-transformers~=5.1; extra == "all"
 Requires-Dist: huggingface-hub~=0.36; extra == "all"
-Requires-Dist: datasets~=4.3; extra == "all"
+Requires-Dist: datasets~=4.4; extra == "all"
 Requires-Dist: regex>=2025.0; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
 Requires-Dist: pillow~=12.0; extra == "all"
-Requires-Dist: ddgs~=9.6; extra == "all"
+Requires-Dist: ddgs~=9.7; extra == "all"
 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"
@@ -49,7 +49,7 @@ Requires-Dist: transformers~=4.57; extra == "backends"
 Requires-Dist: sentence-transformers~=5.1; extra == "backends"
 Provides-Extra: huggingface
 Requires-Dist: huggingface-hub~=0.36; extra == "huggingface"
-Requires-Dist: datasets~=4.3; extra == "huggingface"
+Requires-Dist: datasets~=4.4; extra == "huggingface"
 Provides-Extra: nanochat
 Requires-Dist: regex>=2025.0; extra == "nanochat"
 Provides-Extra: numpy
@@ -60,7 +60,7 @@ Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
 Requires-Dist: pillow~=12.0; extra == "pillow"
 Provides-Extra: search
-Requires-Dist: ddgs~=9.6; extra == "search"
+Requires-Dist: ddgs~=9.7; extra == "search"
 Provides-Extra: wiki
 Requires-Dist: mwparserfromhell~=0.7; extra == "wiki"
 Requires-Dist: wikitextparser~=0.56; extra == "wiki"

{ommlds-0.0.0.dev473 → ommlds-0.0.0.dev474}/ommlds/__about__.py

@@ -38,7 +38,7 @@ class Project(ProjectBase):
 
         'huggingface': [
             'huggingface-hub ~= 0.36',
-            'datasets ~= 4.3',
+            'datasets ~= 4.4',
         ],
 
         'nanochat': [
@@ -60,7 +60,7 @@ class Project(ProjectBase):
         ],
 
         'search': [
-            'ddgs ~= 9.6',
+            'ddgs ~= 9.7',
         ],
 
         'wiki': [

{ommlds-0.0.0.dev473 → ommlds-0.0.0.dev474}/ommlds/minichain/resources.py

@@ -31,6 +31,7 @@ class ResourcesRefNotRegisteredError(Exception):
     pass
 
 
+@ta.final
 class Resources(lang.Final, lang.NotPicklable):
     def __init__(
             self,
@@ -145,24 +146,48 @@ class Resources(lang.Final, lang.NotPicklable):
 ##
 
 
+@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 to being `__aenter__`'d in the caller.
+
+    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.__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}>'
+        return f'{self.__class__.__name__}<{self.__v!r}, {self.__state}>'
 
     async def __aenter__(self) -> T:
-        return self._v
+        check.state(self.__state == 'new')
+        self.__state = 'entered'
+        return self.__v
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
+        check.state(self.__state == 'entered')
+        self.__state = 'exited'
         await self.__resources.remove_ref(self)
 
+    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.dev473 → ommlds-0.0.0.dev474}/ommlds/minichain/stream/services.py

@@ -197,13 +197,14 @@ async def new_stream_response(
         fn: ta.Callable[[StreamResponseSink[V]], ta.Awaitable[ta.Sequence[OutputT] | None]],
         outputs: ta.Sequence[StreamOutputT] | None = None,
 ) -> StreamResponse[V, OutputT, StreamOutputT]:
-    return StreamResponse(
-        rs.new_managed(
-            await rs.enter_async_context(
-                _StreamServiceResponse(
-                    fn,
-                ),
-            ),
-        ),
-        outputs or [],
-    )
+    ssr = _StreamServiceResponse(fn)
+
+    v = rs.new_managed(await rs.enter_async_context(ssr))
+    try:
+        return StreamResponse(v, outputs or [])
+    except BaseException:  # noqa
+        # The StreamResponse ctor can raise - for example in `_tv_field_coercer` - in which case we need to clean up the
+        # resources ref we have already allocated before reraising.
+        async with v:
+            pass
+        raise

{ommlds-0.0.0.dev473 → ommlds-0.0.0.dev474/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev473
+Version: 0.0.0.dev474
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev473
-Requires-Dist: omlish==0.0.0.dev473
+Requires-Dist: omdev==0.0.0.dev474
+Requires-Dist: omlish==0.0.0.dev474
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"
@@ -27,13 +27,13 @@ Requires-Dist: torch~=2.9; extra == "all"
 Requires-Dist: transformers~=4.57; extra == "all"
 Requires-Dist: sentence-transformers~=5.1; extra == "all"
 Requires-Dist: huggingface-hub~=0.36; extra == "all"
-Requires-Dist: datasets~=4.3; extra == "all"
+Requires-Dist: datasets~=4.4; extra == "all"
 Requires-Dist: regex>=2025.0; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
 Requires-Dist: pillow~=12.0; extra == "all"
-Requires-Dist: ddgs~=9.6; extra == "all"
+Requires-Dist: ddgs~=9.7; extra == "all"
 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"
@@ -49,7 +49,7 @@ Requires-Dist: transformers~=4.57; extra == "backends"
 Requires-Dist: sentence-transformers~=5.1; extra == "backends"
 Provides-Extra: huggingface
 Requires-Dist: huggingface-hub~=0.36; extra == "huggingface"
-Requires-Dist: datasets~=4.3; extra == "huggingface"
+Requires-Dist: datasets~=4.4; extra == "huggingface"
 Provides-Extra: nanochat
 Requires-Dist: regex>=2025.0; extra == "nanochat"
 Provides-Extra: numpy
@@ -60,7 +60,7 @@ Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
 Requires-Dist: pillow~=12.0; extra == "pillow"
 Provides-Extra: search
-Requires-Dist: ddgs~=9.6; extra == "search"
+Requires-Dist: ddgs~=9.7; extra == "search"
 Provides-Extra: wiki
 Requires-Dist: mwparserfromhell~=0.7; extra == "wiki"
 Requires-Dist: wikitextparser~=0.56; extra == "wiki"

{ommlds-0.0.0.dev473 → ommlds-0.0.0.dev474}/ommlds.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev473
-omlish==0.0.0.dev473
+omdev==0.0.0.dev474
+omlish==0.0.0.dev474
 
 [all]
 llama-cpp-python~=0.3
@@ -11,13 +11,13 @@ torch~=2.9
 transformers~=4.57
 sentence-transformers~=5.1
 huggingface-hub~=0.36
-datasets~=4.3
+datasets~=4.4
 regex>=2025.0
 numpy>=1.26
 pytesseract~=0.3
 rapidocr-onnxruntime~=1.4
 pillow~=12.0
-ddgs~=9.6
+ddgs~=9.7
 mwparserfromhell~=0.7
 wikitextparser~=0.56
 
@@ -42,7 +42,7 @@ mlx-lm~=0.28
 
 [huggingface]
 huggingface-hub~=0.36
-datasets~=4.3
+datasets~=4.4
 
 [nanochat]
 regex>=2025.0
@@ -58,7 +58,7 @@ rapidocr-onnxruntime~=1.4
 pillow~=12.0
 
 [search]
-ddgs~=9.6
+ddgs~=9.7
 
 [wiki]
 mwparserfromhell~=0.7

{ommlds-0.0.0.dev473 → ommlds-0.0.0.dev474}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev473'
+version = '0.0.0.dev474'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev473',
-    'omlish == 0.0.0.dev473',
+    'omdev == 0.0.0.dev474',
+    'omlish == 0.0.0.dev474',
 ]
 
 [project.optional-dependencies]
@@ -40,13 +40,13 @@ all = [
     'transformers ~= 4.57',
     'sentence-transformers ~= 5.1',
     'huggingface-hub ~= 0.36',
-    'datasets ~= 4.3',
+    'datasets ~= 4.4',
     'regex >= 2025.0',
     'numpy >= 1.26',
     'pytesseract ~= 0.3',
     'rapidocr-onnxruntime ~= 1.4',
     'pillow ~= 12.0',
-    'ddgs ~= 9.6',
+    'ddgs ~= 9.7',
     'mwparserfromhell ~= 0.7',
     'wikitextparser ~= 0.56',
     'lxml >= 5.3; python_version < "3.13"',
@@ -64,7 +64,7 @@ backends = [
 ]
 huggingface = [
     'huggingface-hub ~= 0.36',
-    'datasets ~= 4.3',
+    'datasets ~= 4.4',
 ]
 nanochat = [
     'regex >= 2025.0',
@@ -80,7 +80,7 @@ pillow = [
     'pillow ~= 12.0',
 ]
 search = [
-    'ddgs ~= 9.6',
+    'ddgs ~= 9.7',
 ]
 wiki = [
     'mwparserfromhell ~= 0.7',