ommlds 0.0.0.dev472__tar.gz → 0.0.0.dev474__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev472
+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.dev472
-Requires-Dist: omlish==0.0.0.dev472
+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,12 +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"
@@ -48,7 +49,9 @@ 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
 Requires-Dist: numpy>=1.26; extra == "numpy"
 Provides-Extra: ocr
@@ -57,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.dev472 → ommlds-0.0.0.dev474}/ommlds/.omlish-manifests.json

@@ -468,7 +468,7 @@
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.tinygrad.chat",
         "attr": "TinygradLlama3ChatChoicesService",
-        "name": "tinygrad_llama3",
+        "name": "tinygrad-llama3",
         "aliases": null,
         "type": "ChatChoicesService"
       }
@@ -483,7 +483,7 @@
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.tinygrad.chat",
         "attr": "TinygradLlama3ChatChoicesStreamService",
-        "name": "tinygrad_llama3",
+        "name": "tinygrad-llama3",
         "aliases": null,
         "type": "ChatChoicesStreamService"
       }
@@ -500,7 +500,7 @@
           "ChatChoicesService",
           "ChatChoicesStreamService"
         ],
-        "backend_name": "tinygrad_llama3",
+        "backend_name": "tinygrad-llama3",
         "model_names": null
       }
     }

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

@@ -38,7 +38,11 @@ class Project(ProjectBase):
 
         'huggingface': [
             'huggingface-hub ~= 0.36',
-            'datasets ~= 4.3',
+            'datasets ~= 4.4',
+        ],
+
+        'nanochat': [
+            'regex >= 2025.0',
         ],
 
         'numpy': [
@@ -56,7 +60,7 @@ class Project(ProjectBase):
         ],
 
         'search': [
-            'ddgs ~= 9.6',
+            'ddgs ~= 9.7',
         ],
 
         'wiki': [
@@ -76,6 +80,8 @@ class Project(ProjectBase):
 
 
 class Setuptools(SetuptoolsBase):
+    rs = True
+
     find_packages = {
         'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/cli/main.py

@@ -191,7 +191,7 @@ def _main(args: ta.Any = None) -> None:
             _a_main,
             args,
         ),
-        backend='asyncio',
+        # backend='trio',
     )  # noqa
 
 

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/cli/sessions/chat/backends/inject.py

@@ -2,6 +2,7 @@ import typing as ta
 
 from omlish import inject as inj
 from omlish import lang
+from omlish import typedvalues as tv
 
 from ..... import minichain as mc
 from .injection import backend_configs
@@ -41,7 +42,7 @@ def bind_backends(
         async def inner(be: 'mc.BackendCatalog.Backend', cfgs: _types.BackendConfigs | None) -> ta.Any:
             kwt = inj.build_kwargs_target(be.factory, non_strict=True)
             kw = await injector.provide_kwargs(kwt)
-            return be.factory(*cfgs or [], **kw)
+            return be.factory(*tv.collect(*(be.configs or []), *(cfgs or []), override=True), **kw)
 
         return _catalog.CatalogBackendProvider.Instantiator(inner)
 

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/backends/impls/anthropic/stream.py

@@ -52,7 +52,7 @@ class AnthropicChatChoicesStreamService:
             self._model_name = cc.pop(AnthropicChatChoicesService.DEFAULT_MODEL_NAME)
             self._api_key = check.not_none(ApiKey.pop_secret(cc, env='ANTHROPIC_API_KEY'))
 
-    READ_CHUNK_SIZE = 64 * 1024
+    READ_CHUNK_SIZE: ta.ClassVar[int] = -1
 
     async def invoke(
             self,

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/backends/impls/google/stream.py

@@ -125,7 +125,7 @@ class GoogleChatChoicesStreamService:
         AiMessage: 'model',
     }
 
-    READ_CHUNK_SIZE = 64 * 1024
+    READ_CHUNK_SIZE: ta.ClassVar[int] = -1
 
     async def invoke(
             self,

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/backends/impls/ollama/chat.py

@@ -146,7 +146,7 @@ class OllamaChatChoicesService(BaseOllamaChatChoicesService):
 # )
 @static_check_is_chat_choices_stream_service
 class OllamaChatChoicesStreamService(BaseOllamaChatChoicesService):
-    READ_CHUNK_SIZE = 64 * 1024
+    READ_CHUNK_SIZE: ta.ClassVar[int] = -1
 
     async def invoke(
             self,

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/backends/impls/openai/stream.py

@@ -54,7 +54,7 @@ class OpenaiChatChoicesStreamService:
             self._model_name = cc.pop(OpenaiChatChoicesService.DEFAULT_MODEL_NAME)
             self._api_key = ApiKey.pop_secret(cc, env='OPENAI_API_KEY')
 
-    READ_CHUNK_SIZE = 64 * 1024
+    READ_CHUNK_SIZE: ta.ClassVar[int] = -1
 
     async def invoke(self, request: ChatChoicesStreamRequest) -> ChatChoicesStreamResponse:
         # check.isinstance(request, ChatRequest)

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/backends/impls/tinygrad/chat.py

@@ -113,7 +113,7 @@ class BaseTinygradLlama3ChatService(lang.ExitStacked, lang.Abstract):
 
 
 # @omlish-manifest $.minichain.registries.manifests.RegistryManifest(
-#     name='tinygrad_llama3',
+#     name='tinygrad-llama3',
 #     type='ChatChoicesService',
 # )
 @static_check_is_chat_choices_service
@@ -133,7 +133,7 @@ class TinygradLlama3ChatChoicesService(BaseTinygradLlama3ChatService):
 
 
 # @omlish-manifest $.minichain.registries.manifests.RegistryManifest(
-#     name='tinygrad_llama3',
+#     name='tinygrad-llama3',
 #     type='ChatChoicesStreamService',
 # )
 @static_check_is_chat_choices_stream_service
@@ -168,5 +168,5 @@ class TinygradLlama3ChatChoicesStreamService(BaseTinygradLlama3ChatService):
 #         'ChatChoicesService',
 #         'ChatChoicesStreamService',
 #     ],
-#     'tinygrad_llama3',
+#     'tinygrad-llama3',
 # )

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/backends/strings/parsing.py

@@ -56,7 +56,7 @@ _REPO_MODEL_PAT = re.compile(
 def parse_backend_string(s: str) -> ParsedBackendString:
     backend: str | None
     if ':' in s:
-        backend, s = s.split(':')
+        backend, _, s = s.partition(':')
     else:
         backend = None
 

{ommlds-0.0.0.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/backends/strings/resolving.py

@@ -108,7 +108,10 @@ class ManifestBackendStringResolver(BackendStringResolver):
 
         mn: str | None = mdl.name
 
-        if mn == m.backend_name:
+        if args.parsed.backend == m.backend_name and mn is not None:
+            pass
+
+        elif mn == m.backend_name:
             if m.model_names is not None:
                 mn = m.model_names.resolved_default
             else:

{ommlds-0.0.0.dev472 → 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.dev472 → ommlds-0.0.0.dev474}/ommlds/minichain/stream/services.py

@@ -125,17 +125,18 @@ class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
             return
         if self._cr.cr_running or self._cr.cr_suspended:
             cex = StreamServiceCancelledError()
-            for i in itertools.count():
+            i = None
+            for n in itertools.count():
                 try:
-                    if not i:
+                    if not n:
                         x = self._g.throw(cex)
                     else:
-                        x = self._g.send(None)
+                        x = self._g.send(i)
                 except StreamServiceCancelledError as cex2:
                     if cex2 is cex:
                         break
                     raise
-                yield x
+                i = yield x
         if self._cr.cr_running:
             raise RuntimeError(f'Coroutine {self._cr!r} not terminated')
         if self._g is not self._a:
@@ -155,9 +156,10 @@ class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
     @types.coroutine
     def _anext(self):
         check.state(self._state == 'running')
+        i = None
         while True:
             try:
-                x = self._g.send(None)
+                x = self._g.send(i)
             except StopIteration as e:
                 if e.value is not None:
                     self._outputs = tv.TypedValues(*check.isinstance(e.value, ta.Sequence))
@@ -170,7 +172,7 @@ class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
                 x.done = True
                 return x.value
 
-            yield x
+            i = yield x
 
     async def __anext__(self) -> V:
         return await self._anext()
@@ -195,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.dev474/ommlds/nanochat/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Andrej Karpathy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

ommlds-0.0.0.dev474/ommlds/nanochat/rustbpe/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Andrej Karpathy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.