ommlds 0.0.0.dev442__py3-none-any.whl → 0.0.0.dev443__py3-none-any.whl

ommlds/.omlish-manifests.json

@@ -63,7 +63,7 @@
     "module": ".minichain.backends.impls.anthropic.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/anthropic/stream.py",
-    "line": 34,
+    "line": 35,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.stream",
@@ -184,7 +184,7 @@
     "module": ".minichain.backends.impls.llamacpp.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/llamacpp/stream.py",
-    "line": 31,
+    "line": 32,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.llamacpp.stream",
@@ -341,7 +341,7 @@
     "module": ".minichain.backends.impls.openai.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/openai/stream.py",
-    "line": 36,
+    "line": 37,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.openai.stream",
@@ -356,7 +356,7 @@
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/tinygrad/chat.py",
-    "line": 113,
+    "line": 115,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.tinygrad.chat",
@@ -371,7 +371,7 @@
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/tinygrad/chat.py",
-    "line": 133,
+    "line": 135,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.tinygrad.chat",
@@ -386,7 +386,7 @@
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/tinygrad/chat.py",
-    "line": 159,
+    "line": 161,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [

ommlds/__about__.py

@@ -19,7 +19,7 @@ class Project(ProjectBase):
             'llama-cpp-python ~= 0.3',
 
             'mlx ~= 0.29',
-            'mlx-lm ~= 0.27; sys_platform == "darwin"',
+            'mlx-lm ~= 0.28; sys_platform == "darwin"',
 
             # 'sentencepiece ~= 0.2',  # FIXME: https://github.com/google/sentencepiece/issues/1121
 

ommlds/cli/sessions/chat/interactive.py

@@ -54,7 +54,7 @@ class InteractiveChatSession(ChatSession['InteractiveChatSession.Config']):
             backend = DEFAULT_CHAT_MODEL_BACKEND
 
         mdl: mc.ChatChoicesService
-        with lang.maybe_managing(self._backend_catalog.get_backend(
+        async with lang.async_maybe_managing(self._backend_catalog.get_backend(
                 mc.ChatChoicesService,
                 backend,
                 *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),

ommlds/cli/sessions/chat/prompt.py

@@ -70,17 +70,17 @@ class PromptChatSession(ChatSession['PromptChatSession.Config']):
         ]
 
         mdl: mc.ChatChoicesStreamService
-        with lang.maybe_managing(self._backend_catalog.get_backend(
+        async with lang.async_maybe_managing(self._backend_catalog.get_backend(
             mc.ChatChoicesStreamService,
             self._config.backend or DEFAULT_CHAT_MODEL_BACKEND,
             *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),
         )) as mdl:
-            with (await mdl.invoke(mc.ChatChoicesStreamRequest(
+            async with (await mdl.invoke(mc.ChatChoicesStreamRequest(
                     [*state.chat, *new_chat],
                     (self._chat_options or []),
             ))).v as st_resp:
                 lst: list[str] = []
-                for o in st_resp:
+                async for o in st_resp:
                     if o:
                         m = check.single(o).m
                         if m.c is not None:
@@ -107,7 +107,7 @@ class PromptChatSession(ChatSession['PromptChatSession.Config']):
         ]
 
         mdl: mc.ChatChoicesService
-        with lang.maybe_managing(self._backend_catalog.get_backend(
+        async with lang.async_maybe_managing(self._backend_catalog.get_backend(
             mc.ChatChoicesService,
                 self._config.backend or DEFAULT_CHAT_MODEL_BACKEND,
                 *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),

ommlds/cli/sessions/completion/completion.py

@@ -36,7 +36,7 @@ class CompletionSession(Session['CompletionSession.Config']):
         prompt = check.isinstance(self._config.content, str)
 
         mdl: mc.CompletionService
-        with lang.maybe_managing(self._backend_catalog.get_backend(
+        async with lang.async_maybe_managing(self._backend_catalog.get_backend(
                 mc.CompletionService,
                 self._config.backend or DEFAULT_COMPLETION_MODEL_BACKEND,
         )) as mdl:

ommlds/cli/sessions/embedding/embedding.py

@@ -34,7 +34,7 @@ class EmbeddingSession(Session['EmbeddingSession.Config']):
 
     async def run(self) -> None:
         mdl: mc.EmbeddingService
-        with lang.maybe_managing(self._backend_catalog.get_backend(
+        async with lang.async_maybe_managing(self._backend_catalog.get_backend(
             mc.EmbeddingService,
             self._config.backend or DEFAULT_EMBEDDING_MODEL_BACKEND,
         )) as mdl:

ommlds/minichain/__init__.py

@@ -98,8 +98,6 @@ with _lang.auto_proxy_init(
         ChatChoicesStreamService,
         AbstractChatChoicesStreamService,
         static_check_is_chat_choices_stream_service,
-
-        ChatChoicesStreamGenerator,
     )
 
     from .chat.stream.types import (  # noqa
@@ -322,7 +320,12 @@ with _lang.auto_proxy_init(
         StreamOption,
         StreamOptions,
 
-        ResponseGenerator,
+        StreamResponseSink,
+        StreamResponseIterator,
+
+        StreamServiceCancelledError,
+        StreamServiceNotAwaitedError,
+
         StreamResponse,
         new_stream_response,
     )

ommlds/minichain/backends/impls/anthropic/stream.py

@@ -23,6 +23,7 @@ from ....chat.stream.types import AiMessageDelta
 from ....configs import Config
 from ....resources import UseResources
 from ....standard import ApiKey
+from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
 from .chat import AnthropicChatChoicesService
 from .names import MODEL_NAMES
@@ -83,11 +84,11 @@ class AnthropicChatChoicesStreamService:
             data=json.dumps(raw_request).encode('utf-8'),
         )
 
-        with UseResources.or_new(request.options) as rs:
+        async with UseResources.or_new(request.options) as rs:
             http_client = rs.enter_context(http.client())
             http_response = rs.enter_context(http_client.stream_request(http_request))
 
-            def yield_choices() -> ta.Generator[AiChoiceDeltas, None, ta.Sequence[ChatChoicesOutputs] | None]:
+            async def inner(sink: StreamResponseSink[AiChoiceDeltas]) -> ta.Sequence[ChatChoicesOutputs] | None:
                 db = DelimitingBuffer([b'\r', b'\n', b'\r\n'])
                 sd = sse.SseDecoder()
                 ass = AnthropicSseMessageAssembler()
@@ -112,9 +113,9 @@ class AnthropicChatChoicesStreamService:
                                 for am in ass(ae):
                                     if isinstance(am, pt.Message):
                                         mt = check.isinstance(check.single(check.not_none(am.content)), pt.Text)
-                                        yield [
+                                        await sink.emit([
                                             AiChoiceDelta(AiMessageDelta(mt.text)),
-                                        ]
+                                        ])
 
                     if not b:
                         return []
@@ -122,4 +123,4 @@ class AnthropicChatChoicesStreamService:
             # raw_response = json.loads(check.not_none(http_response.data).decode('utf-8'))
             # return rh.build_response(raw_response)
 
-            return new_stream_response(rs, yield_choices())
+            return await new_stream_response(rs, inner)

ommlds/minichain/backends/impls/llamacpp/stream.py

@@ -19,6 +19,7 @@ from ....chat.stream.types import AiMessageDelta
 from ....configs import Config
 from ....models.configs import ModelPath
 from ....resources import UseResources
+from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
 from .chat import LlamacppChatChoicesService
 from .format import ROLES_MAP
@@ -52,7 +53,7 @@ class LlamacppChatChoicesStreamService(lang.ExitStacked):
     async def invoke(self, request: ChatChoicesStreamRequest) -> ChatChoicesStreamResponse:
         lcu.install_logging_hook()
 
-        with UseResources.or_new(request.options) as rs:
+        async with UseResources.or_new(request.options) as rs:
             rs.enter_context(self._lock)
 
             model: ta.Any = self._load_model()  # FIXME: the types are awful lol
@@ -74,7 +75,7 @@ class LlamacppChatChoicesStreamService(lang.ExitStacked):
 
             rs.enter_context(lang.defer(close_output))
 
-            def yield_choices() -> ta.Generator[AiChoiceDeltas, None, ta.Sequence[ChatChoicesOutputs] | None]:
+            async def inner(sink: StreamResponseSink[AiChoiceDeltas]) -> ta.Sequence[ChatChoicesOutputs] | None:
                 for chunk in output:
                     check.state(chunk['object'] == 'chat.completion.chunk')
                     l: list[AiChoiceDelta] = []
@@ -86,7 +87,7 @@ class LlamacppChatChoicesStreamService(lang.ExitStacked):
                         if not (content := delta.get('content', '')):
                             continue
                         l.append(AiChoiceDelta(AiMessageDelta(content)))
-                    yield l
+                    await sink.emit(l)
                 return None
 
-            return new_stream_response(rs, yield_choices())
+            return await new_stream_response(rs, inner)

ommlds/minichain/backends/impls/openai/stream.py

@@ -24,6 +24,7 @@ from ....resources import ResourcesOption
 from ....resources import UseResources
 from ....standard import ApiKey
 from ....stream.services import StreamOption
+from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
 from .chat import OpenaiChatChoicesService
 from .format import OpenaiChatRequestHandler
@@ -78,11 +79,11 @@ class OpenaiChatChoicesStreamService:
             data=json.dumps(raw_request).encode('utf-8'),
         )
 
-        with UseResources.or_new(request.options) as rs:
+        async with UseResources.or_new(request.options) as rs:
             http_client = rs.enter_context(http.client())
             http_response = rs.enter_context(http_client.stream_request(http_request))
 
-            def yield_choices() -> ta.Generator[AiChoiceDeltas, None, ta.Sequence[ChatChoicesOutputs] | None]:
+            async def inner(sink: StreamResponseSink[AiChoiceDeltas]) -> ta.Sequence[ChatChoicesOutputs]:
                 db = DelimitingBuffer([b'\r', b'\n', b'\r\n'])
                 sd = sse.SseDecoder()
                 while True:
@@ -111,10 +112,10 @@ class OpenaiChatChoicesStreamService:
                                 if not sj['choices']:
                                     continue
 
-                                yield [
+                                await sink.emit([
                                     AiChoiceDelta(rh.build_ai_message_delta(choice['delta']))
                                     for choice in sj['choices']
-                                ]
+                                ])
 
                     if not b:
                         return []
@@ -122,4 +123,4 @@ class OpenaiChatChoicesStreamService:
             # raw_response = json.loads(check.not_none(http_response.data).decode('utf-8'))
             # return rh.build_response(raw_response)
 
-            return new_stream_response(rs, yield_choices())
+            return await new_stream_response(rs, inner)

ommlds/minichain/backends/impls/tinygrad/chat.py

@@ -10,19 +10,21 @@ from ....chat.choices.services import ChatChoicesRequest
 from ....chat.choices.services import ChatChoicesResponse
 from ....chat.choices.services import static_check_is_chat_choices_service
 from ....chat.choices.types import AiChoice
+from ....chat.choices.types import ChatChoicesOutputs
 from ....chat.messages import AiMessage
 from ....chat.messages import Chat
 from ....chat.messages import SystemMessage
 from ....chat.messages import UserMessage
-from ....chat.stream.services import ChatChoicesStreamGenerator
 from ....chat.stream.services import ChatChoicesStreamRequest
 from ....chat.stream.services import ChatChoicesStreamResponse
 from ....chat.stream.services import static_check_is_chat_choices_stream_service
 from ....chat.stream.types import AiChoiceDelta
+from ....chat.stream.types import AiChoiceDeltas
 from ....chat.stream.types import AiMessageDelta
 from ....chat.types import ChatOption
 from ....llms.types import LlmOption
 from ....resources import UseResources
+from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
 
 
@@ -137,7 +139,7 @@ class TinygradLlama3ChatChoicesService(BaseTinygradLlama3ChatService):
 @static_check_is_chat_choices_stream_service
 class TinygradLlama3ChatChoicesStreamService(BaseTinygradLlama3ChatService):
     async def invoke(self, request: ChatChoicesStreamRequest) -> ChatChoicesStreamResponse:
-        with UseResources.or_new(request.options) as rs:
+        async with UseResources.or_new(request.options) as rs:
             llm = self._load_model()
             toks = _prepare_toks(
                 llm,
@@ -145,12 +147,12 @@ class TinygradLlama3ChatChoicesStreamService(BaseTinygradLlama3ChatService):
                 request.options.get_any((ChatOption, LlmOption)),  # FIXME  # noqa
             )
 
-            def yield_choices() -> ChatChoicesStreamGenerator:
+            async def inner(sink: StreamResponseSink[AiChoiceDeltas]) -> ta.Sequence[ChatChoicesOutputs]:
                 for s in tgl3.run_llm(llm, toks):
-                    yield [AiChoiceDelta(AiMessageDelta(s))]
+                    await sink.emit([AiChoiceDelta(AiMessageDelta(s))])
                 return []
 
-            return new_stream_response(rs, yield_choices())
+            return await new_stream_response(rs, inner)
 
 
 ##

ommlds/minichain/chat/stream/adapters.py

@@ -2,6 +2,7 @@ import typing as ta
 
 from omlish import check
 from omlish import dataclasses as dc
+from omlish import lang
 
 from ...services import Response
 from ..choices.services import ChatChoicesRequest
@@ -33,10 +34,9 @@ class ChatChoicesStreamServiceChatChoicesService:
     ]:
         lst: list[ChatChoicesStreamServiceChatChoicesService._Choice] = []
 
-        resp = await self.service.invoke(request)
-        with resp.v as resp_v:
+        async with (resp := await self.service.invoke(request)).v as it:  # noqa
             i = -1  # noqa
-            for i, cs in enumerate(resp_v):
+            async for i, cs in lang.async_enumerate(it):
                 if i == 0:
                     for c in cs:
                         m = c.m
@@ -56,7 +56,7 @@ class ChatChoicesStreamServiceChatChoicesService:
                         # if m.tool_exec_requests:
                         #     ch.trs.extend(m.tool_exec_requests)
 
-        check.state(resp_v.is_done)
+        # check.state(resp_v.is_done)
 
         ret: list[AiChoice] = []
         for ch in lst:

ommlds/minichain/chat/stream/services.py

@@ -43,9 +43,3 @@ class AbstractChatChoicesStreamService(lang.Abstract):
     @abc.abstractmethod
     def invoke(self, request: ChatChoicesStreamRequest) -> ta.Awaitable[ChatChoicesStreamResponse]:
         raise NotImplementedError
-
-
-##
-
-
-ChatChoicesStreamGenerator: ta.TypeAlias = ta.Generator[AiChoiceDeltas, None, ta.Sequence[ChatChoicesOutputs] | None]

ommlds/minichain/resources.py

@@ -3,7 +3,6 @@ TODO:
  - unify with omlish.sql.api.resources -> omlish.resources
 """
 import contextlib
-import threading
 import typing as ta
 
 from omlish import check
@@ -43,26 +42,25 @@ class Resources(lang.Final, lang.NotPicklable):
 
         self._no_autoclose = no_autoclose
 
-        self._lock = threading.RLock()
-
         self._closed = False
 
         self._refs: ta.MutableSet[ResourcesRef] = col.IdentitySet()
 
-        self._es = contextlib.ExitStack()
-        self._es.__enter__()
+        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:
-        with self._lock:
-            return len(self._refs)
+        return len(self._refs)
 
     @property
     def closed(self) -> bool:
@@ -77,15 +75,16 @@ class Resources(lang.Final, lang.NotPicklable):
         pass
 
     @classmethod
-    def new(cls, **kwargs: ta.Any) -> ta.ContextManager['Resources']:
-        @contextlib.contextmanager
-        def inner():
+    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:
-                res.remove_ref(init_ref)
+                await res.remove_ref(init_ref)
 
         return inner()
 
@@ -93,30 +92,30 @@ class Resources(lang.Final, lang.NotPicklable):
 
     def add_ref(self, ref: ResourcesRef) -> None:
         check.isinstance(ref, ResourcesRef)
-        with self._lock:
-            check.state(not self._closed)
-            self._refs.add(ref)
+        check.state(not self._closed)
+        self._refs.add(ref)
 
     def has_ref(self, ref: ResourcesRef) -> bool:
-        with self._lock:
-            return ref in self._refs
+        return ref in self._refs
 
-    def remove_ref(self, ref: ResourcesRef) -> None:
+    async def remove_ref(self, ref: ResourcesRef) -> None:
         check.isinstance(ref, ResourcesRef)
-        with self._lock:
-            try:
-                self._refs.remove(ref)
-            except KeyError:
-                raise ResourcesRefNotRegisteredError(ref) from None
-            if not self._no_autoclose and not self._refs:
-                self.close()
+        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:
-        with self._lock:
-            check.state(not self._closed)
-            return self._es.enter_context(cm)
+        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)
 
     #
 
@@ -125,12 +124,11 @@ class Resources(lang.Final, lang.NotPicklable):
 
     #
 
-    def close(self) -> None:
-        with self._lock:
-            try:
-                self._es.__exit__(None, None, None)
-            finally:
-                self._closed = True
+    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:
@@ -159,11 +157,11 @@ class ResourceManaged(ResourcesRef, lang.Final, lang.NotPicklable, ta.Generic[T]
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}<{self._v!r}>'
 
-    def __enter__(self) -> T:
+    async def __aenter__(self) -> T:
         return self._v
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.__resources.remove_ref(self)
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        await self.__resources.remove_ref(self)
 
 
 ##
@@ -175,11 +173,11 @@ class ResourcesOption(Option, lang.Abstract):
 
 class UseResources(tv.UniqueScalarTypedValue[Resources], ResourcesOption, lang.Final):
     @classmethod
-    @contextlib.contextmanager
-    def or_new(cls, options: ta.Sequence[Option]) -> ta.Iterator[Resources]:
+    @contextlib.asynccontextmanager
+    async def or_new(cls, options: ta.Sequence[Option]) -> ta.AsyncGenerator[Resources]:
         if (ur := tv.as_collection(options).get(UseResources)) is not None:
-            with ResourceManaged(ur.v, ur.v) as rs:
+            async with ResourceManaged(ur.v, ur.v) as rs:
                 yield rs
         else:
-            with Resources.new() as rs:
+            async with Resources.new() as rs:
                 yield rs

ommlds/minichain/stream/services.py

@@ -1,4 +1,4 @@
-import contextlib
+import abc
 import typing as ta
 
 from omlish import check
@@ -14,6 +14,8 @@ from ..types import Output
 
 
 V = ta.TypeVar('V')
+V2 = ta.TypeVar('V2')
+
 OutputT = ta.TypeVar('OutputT', bound=Output)
 StreamOutputT = ta.TypeVar('StreamOutputT', bound=Output)
 
@@ -31,44 +33,143 @@ StreamOptions: ta.TypeAlias = StreamOption | ResourcesOption
 ##
 
 
-class ResponseGenerator(lang.Final, ta.Generic[V, OutputT]):
-    def __init__(self, g: ta.Generator[V, None, ta.Sequence[OutputT] | None]) -> None:
-        super().__init__()
+class StreamResponseSink(lang.Abstract, ta.Generic[V]):
+    @abc.abstractmethod
+    def emit(self, value: V) -> ta.Awaitable[None]:
+        raise NotImplementedError
 
-        self._g = g
-        self._is_done = False
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}<{self._g!r}>'
+class StreamResponseIterator(lang.Abstract, ta.Generic[V, OutputT]):
+    @abc.abstractmethod
+    def __aenter__(self) -> ta.Awaitable[ta.Self]:
+        raise NotImplementedError
 
-    _outputs: tv.TypedValues[OutputT]
+    @abc.abstractmethod
+    def __aexit__(self, exc_type, exc_val, exc_tb) -> ta.Awaitable[None]:
+        raise NotImplementedError
 
     @property
-    def is_done(self) -> bool:
-        return self._is_done
+    @abc.abstractmethod
+    def outputs(self) -> tv.TypedValues[OutputT]:
+        raise NotImplementedError
+
+    @ta.final
+    def __aiter__(self) -> ta.AsyncIterator[V]:
+        return self
+
+    @abc.abstractmethod
+    def __anext__(self) -> ta.Awaitable[V]:
+        raise NotImplementedError
+
+
+##
+
+
+class StreamServiceCancelledError(BaseException):
+    pass
+
+
+class StreamServiceNotAwaitedError(Exception):
+    pass
+
+
+class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
+    def __init__(
+            self,
+            fn: ta.Callable[[StreamResponseSink[V]], ta.Awaitable[ta.Sequence[OutputT] | None]],
+    ) -> None:
+        super().__init__()
+
+        self._fn = fn
+
+    @ta.final
+    class _Emit(ta.Generic[V2]):
+        def __init__(self, ssr: '_StreamServiceResponse', value: V2) -> None:
+            self.ssr, self.value = ssr, value
+
+        done: bool = False
+
+        def __await__(self) -> ta.Generator['_StreamServiceResponse._Emit[V2]']:
+            if not self.done:
+                yield self
+            if not self.done:
+                raise StreamServiceNotAwaitedError
+
+    @ta.final
+    class _Sink(StreamResponseSink[V2]):
+        def __init__(self, ssr: '_StreamServiceResponse') -> None:
+            super().__init__()
+
+            self._ssr = ssr
+
+        def emit(self, item: V2) -> ta.Awaitable[None]:
+            return _StreamServiceResponse._Emit(self._ssr, item)
+
+    _state: ta.Literal['new', 'running', 'closed'] = 'new'
+    _sink: _Sink[V]
+    _a: ta.Any
+    _cr: ta.Any
+
+    async def __aenter__(self) -> ta.Self:
+        check.state(self._state == 'new')
+        self._state = 'running'
+        self._sink = _StreamServiceResponse._Sink(self)
+        self._cr = self._fn(self._sink)
+        self._a = self._cr.__await__()
+        self._g = iter(self._a)
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb) -> None:
+        old_state = self._state
+        self._state = 'closed'
+        if old_state != 'running':
+            return
+        if self._cr.cr_running:
+            cex = StreamServiceCancelledError()
+            try:
+                self._g.throw(cex)
+            except StreamServiceCancelledError as cex2:
+                if cex2 is not cex:
+                    raise
+        if self._cr.cr_running:
+            raise RuntimeError(f'Coroutine {self._cr!r} not terminated')
+        if self._g is not self._a:
+            self._g.close()
+        self._a.close()
+        self._cr.close()
+
+    _outputs: tv.TypedValues[OutputT]
 
     @property
     def outputs(self) -> tv.TypedValues[OutputT]:
         return self._outputs
 
-    def __iter__(self) -> ta.Iterator[V]:
-        return self
+    async def __anext__(self) -> V:
+        check.state(self._state == 'running')
+        while True:
+            try:
+                x = self._g.send(None)
+            except StopIteration as e:
+                if e.value is not None:
+                    self._outputs = tv.TypedValues(*check.isinstance(e.value, ta.Sequence))
+                else:
+                    self._outputs = tv.TypedValues()
+                raise StopAsyncIteration from None
 
-    def __next__(self) -> V:
-        try:
-            return next(self._g)
-        except StopIteration as e:
-            self._is_done = True
-            if e.value is not None:
-                self._outputs = tv.TypedValues(*check.isinstance(e.value, ta.Sequence))
-            else:
-                self._outputs = tv.TypedValues()
-            raise
+            if isinstance(x, _StreamServiceResponse._Emit) and x.ssr is self:
+                check.state(not x.done)
+                x.done = True
+                return x.value
+
+            await x
+
+
+##
 
 
 StreamResponse: ta.TypeAlias = Response[
     ResourceManaged[
-        ResponseGenerator[
+        StreamResponseIterator[
             V,
             OutputT,
         ],
@@ -77,18 +178,16 @@ StreamResponse: ta.TypeAlias = Response[
 ]
 
 
-def new_stream_response(
+async def new_stream_response(
         rs: Resources,
-        g: ta.Generator[V, None, ta.Sequence[OutputT] | None],
+        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(
-            ResponseGenerator(
-                rs.enter_context(
-                    contextlib.closing(
-                        g,
-                    ),
+            await rs.enter_async_context(
+                _StreamServiceResponse(
+                    fn,
                 ),
             ),
         ),

ommlds/minichain/stream/wrap.py

@@ -5,8 +5,8 @@ from ..resources import Resources
 from ..services import Request
 from ..services import Service
 from ..types import Output
-from .services import ResponseGenerator
 from .services import StreamResponse
+from .services import StreamResponseSink
 from .services import new_stream_response
 
 
@@ -29,36 +29,34 @@ class WrappedStreamService(ta.Generic[StreamRequestT, V, OutputT, StreamOutputT]
 
     #
 
-    def _process_request(self, request: StreamRequestT) -> StreamRequestT:
+    async def _process_request(self, request: StreamRequestT) -> StreamRequestT:
         return request
 
-    def _process_stream_outputs(self, outputs: ta.Sequence[StreamOutputT]) -> ta.Sequence[StreamOutputT]:
+    async def _process_stream_outputs(self, outputs: ta.Sequence[StreamOutputT]) -> ta.Sequence[StreamOutputT]:
         return outputs
 
-    def _process_vs(self, vs: ta.Iterator[V]) -> ta.Iterator[V]:
-        return vs
+    async def _process_value(self, v: V) -> ta.Iterable[V]:
+        return [v]
 
-    def _process_outputs(self, outputs: ta.Sequence[OutputT]) -> ta.Sequence[OutputT]:
+    async def _process_outputs(self, outputs: ta.Sequence[OutputT]) -> ta.Sequence[OutputT]:
         return outputs
 
     #
 
     async def invoke(self, request: StreamRequestT) -> StreamResponse[V, OutputT, StreamOutputT]:
-        with Resources.new() as rs:
-            in_response = await self._inner.invoke(self._process_request(request))
-            in_vs: ResponseGenerator[V, OutputT] = rs.enter_context(in_response.v)
-            out_vs = self._process_vs(in_vs)
-
-            def yield_vs() -> ta.Generator[V, None, ta.Sequence[OutputT] | None]:
-                while True:
-                    try:
-                        out_v = next(out_vs)
-                    except StopIteration as se:
-                        return self._process_outputs(se.value)
-                    yield out_v
-
-            return new_stream_response(
+        async with Resources.new() as rs:
+            in_resp = await self._inner.invoke(await self._process_request(request))
+            in_vs = await rs.enter_async_context(in_resp.v)
+
+            async def inner(sink: StreamResponseSink[V]) -> ta.Sequence[OutputT] | None:
+                async for in_v in in_vs:
+                    for out_v in (await self._process_value(in_v)):
+                        await sink.emit(out_v)
+
+                return await self._process_outputs(in_vs.outputs)
+
+            return await new_stream_response(
                 rs,
-                yield_vs(),
-                self._process_stream_outputs(in_response.outputs),
+                inner,
+                await self._process_stream_outputs(in_resp.outputs),
             )

{ommlds-0.0.0.dev442.dist-info → ommlds-0.0.0.dev443.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev442
+Version: 0.0.0.dev443
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,12 +14,12 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev442
-Requires-Dist: omlish==0.0.0.dev442
+Requires-Dist: omdev==0.0.0.dev443
+Requires-Dist: omlish==0.0.0.dev443
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"
-Requires-Dist: mlx-lm~=0.27; sys_platform == "darwin" and extra == "all"
+Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "all"
 Requires-Dist: tiktoken~=0.11; extra == "all"
 Requires-Dist: tinygrad~=0.11; extra == "all"
 Requires-Dist: tokenizers~=0.22; extra == "all"
@@ -39,7 +39,7 @@ Requires-Dist: lxml>=5.3; python_version < "3.13" and extra == "all"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.29; extra == "backends"
-Requires-Dist: mlx-lm~=0.27; sys_platform == "darwin" and extra == "backends"
+Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "backends"
 Requires-Dist: tiktoken~=0.11; extra == "backends"
 Requires-Dist: tinygrad~=0.11; extra == "backends"
 Requires-Dist: tokenizers~=0.22; extra == "backends"

{ommlds-0.0.0.dev442.dist-info → ommlds-0.0.0.dev443.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ommlds/.omlish-manifests.json,sha256=mCv-0aH_AHhPPs4Uq8-3JmKJE1LXgspCmHvsAVQpNdY,17481
-ommlds/__about__.py,sha256=MNqSmD9ozY6rDorcO5skXSfyFHzOBT7A3r956u62tPs,1759
+ommlds/.omlish-manifests.json,sha256=UfOa-wySWiPmKtp2MqM1dvOCDiyaxDOFK29yBFRzKPE,17481
+ommlds/__about__.py,sha256=Z9VIVQnuNBbIYEtIm9XZU4T2QGRqMNjtmQX2OOTaUc0,1759
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/huggingface.py,sha256=JfEyfKOxU3-SY_ojtXBJFNeD-NIuKjvMe3GL3e93wNA,1175
 ommlds/_hacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -87,15 +87,15 @@ ommlds/cli/sessions/inject.py,sha256=sCwNFDhiyir1taxufFVEcHtaK_o14IcsQOvGUHWM9Jo
 ommlds/cli/sessions/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/base.py,sha256=GlDBXZ-KymSokNl1a7uwX1abswmRE67Q0zOIHjhZb_0,796
 ommlds/cli/sessions/chat/inject.py,sha256=zg26F-yDm9sH4COzS-3yZua2taeb3ogHCOZ34UEKI54,2661
-ommlds/cli/sessions/chat/interactive.py,sha256=AeZWJ0lI8pt9NqXOGm4KTAdWB1NYkec87LntVpZ6pVk,1972
+ommlds/cli/sessions/chat/interactive.py,sha256=0Pt3H7uZl9nGXAvMqGxU8Ih65N-DrWSkLahRFmnkFw8,1984
 ommlds/cli/sessions/chat/printing.py,sha256=urlxuSBOisRVn1f_uDb343pyBps9ht2BznMWB_H0ti8,2321
-ommlds/cli/sessions/chat/prompt.py,sha256=d3KIMvyVviNr6zFHbhOQOaeXIanpGUXZ8_4BoOAEMAI,4511
+ommlds/cli/sessions/chat/prompt.py,sha256=nEj2vwzwBJ4WTEwXwKkygrOktqqsoyGaJ46z-LYl1pQ,4547
 ommlds/cli/sessions/chat/state.py,sha256=en29yekINGqVqqMoqZxxIRMuU_j3Z7Qxvtr8q5igcgg,2621
 ommlds/cli/sessions/chat/tools.py,sha256=wEcpawpEj2Zgti9gWGjk_B9yfCM3SL-tFVb56cQnDso,2259
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/completion/completion.py,sha256=Dhc1mShRPifRjLtFRFjgkdbA_aojRHnhU1NGPG3aSU0,1065
+ommlds/cli/sessions/completion/completion.py,sha256=2ZrzmHBCF3mG13ABcoiHva6OUzPpdF7qzByteaLNsxk,1077
 ommlds/cli/sessions/embedding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/embedding/embedding.py,sha256=zh1nqSP9YYCFGPlbWUibiIaG_a-jxCW6R-Y584dyWuA,1039
+ommlds/cli/sessions/embedding/embedding.py,sha256=9U5Maj-XI5nsrk7m-O3P2rZggey0z2p7onZn2QfQe38,1051
 ommlds/cli/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/tools/config.py,sha256=fjdZAxs9r7aNN-YjYLQNU15KWOUtL5azX_3typf-ltQ,225
 ommlds/cli/tools/inject.py,sha256=dnS9OdYAGRE2QpWGAge3bu3UCmc7h5EUXVhnwL2zJsk,1447
@@ -103,7 +103,7 @@ ommlds/cli/tools/weather.py,sha256=FUPxPF5KBbbyK3voBtcRUOkuMO2zK5GFZoFTJMaM6LQ,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=0C25ffuHRqsZ23pRjyORIsG89QxGHsMc0bojhGYz84o,10327
+ommlds/minichain/__init__.py,sha256=6R-TOiDSx4PuK8_57XUWVmpG1bfzDx8pZxHSQWpMUtc,10400
 ommlds/minichain/_marshal.py,sha256=Lcib21J6jWyd-fkdQhUzij-TH2tnwylBChLRGrinWbk,892
 ommlds/minichain/_typedvalues.py,sha256=vPwVYGWtIJT_dclarnZlA-2sjP2o3L2HSDK5VDurYfM,2229
 ommlds/minichain/completion.py,sha256=lQ0LfCIYZsvDqteHhhDIv16D2_gn_xMfEL0ouywE5Yo,1033
@@ -111,7 +111,7 @@ ommlds/minichain/configs.py,sha256=WwrHxfkDAfo_RtuCqUgySthj-2W26lZbpuQoghUyGNw,1
 ommlds/minichain/envs.py,sha256=vE2CSeT6KYxOpPY72VbFLzGUnBERYdhfiEUlvSRHkXE,225
 ommlds/minichain/json.py,sha256=hfI9TMhgmhECIi-CFGnezsvOGeYWIHbZGfDDBeiUmB4,177
 ommlds/minichain/metadata.py,sha256=2jik8gEm_VMnknPuPwqRssTg0MClRFUrXz_IsyEgUt4,878
-ommlds/minichain/resources.py,sha256=4p2EhzxVK4kp8mgZ7PKXFYQQV-H28eTzV4HL0QMIm0Y,4358
+ommlds/minichain/resources.py,sha256=HfcydnyFmXVRspYw-32-lvM_OfrZQdPEebAt3ivLev0,4436
 ommlds/minichain/search.py,sha256=azRzWcYhcm9IgSHquqLwtbwowtYCRAtPLSm7Gvt9iNo,1262
 ommlds/minichain/standard.py,sha256=uKXvdUNLxdUu7suCBsVOjJtnYVC2hjD_tmz3Ra7H6Jg,2510
 ommlds/minichain/types.py,sha256=K6RRjpUi17UEG0cqPrrvbVANU0iRVh3WLiH-y6oEWFI,414
@@ -126,7 +126,7 @@ ommlds/minichain/backends/impls/sqlite.py,sha256=NOFm_fgr-OZ8mo7etj0zwvxsDnidRwK
 ommlds/minichain/backends/impls/anthropic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/anthropic/chat.py,sha256=eyh7hWADTcQiMAHjYgjwoZZcpVxHLUhqSJhuraw27K8,3712
 ommlds/minichain/backends/impls/anthropic/names.py,sha256=CNZzE0EQwdIPGV0JNr5YbpuM1lf0l5AN1Su6XpwJ-LM,1098
-ommlds/minichain/backends/impls/anthropic/stream.py,sha256=8-wvfC1Gg_wlnV4-bb8VukE9ptT6nN52gx-mkn8bwog,5344
+ommlds/minichain/backends/impls/anthropic/stream.py,sha256=I95OVhJ6y1AiZDwxRzK9W8pyNvzFIFmfyqhT4KmAQV0,5410
 ommlds/minichain/backends/impls/duckduckgo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/duckduckgo/search.py,sha256=igzeU9P9b1MMiu4KAJVS9H6KLIoPm68wXi4Kx3_DHyQ,940
 ommlds/minichain/backends/impls/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -140,7 +140,7 @@ ommlds/minichain/backends/impls/llamacpp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 ommlds/minichain/backends/impls/llamacpp/chat.py,sha256=X7B_H4PdsNX7rZ2LvldOv2oUDUnYLcvPAdqVVkWcb4A,5403
 ommlds/minichain/backends/impls/llamacpp/completion.py,sha256=oJ2I6wUoIPXYLm9Vc7dwOPgqbevatTjNBZ-jXeM24tQ,2372
 ommlds/minichain/backends/impls/llamacpp/format.py,sha256=lKO88-IbqWD7vTWoerLiPBdKKCLq86cbBJO96A7wMbE,702
-ommlds/minichain/backends/impls/llamacpp/stream.py,sha256=nmKCb_DdrgSbNb_1l7Sf8J1wA4s8pOr7ygoHmhcBZAI,3276
+ommlds/minichain/backends/impls/llamacpp/stream.py,sha256=1AOtwPelxKpPRTJZjv1xkK5LYfySGe7uo0uazxM7BbM,3342
 ommlds/minichain/backends/impls/mlx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/mlx/chat.py,sha256=DzR86VcrYx7gMxAAQ40Wf7IuBI4F0mxNvuEykotufPI,4556
 ommlds/minichain/backends/impls/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -149,11 +149,11 @@ ommlds/minichain/backends/impls/openai/completion.py,sha256=0XTC08mZzbW23Y2DNW2x
 ommlds/minichain/backends/impls/openai/embedding.py,sha256=kkDJ3_0EqwQ_E0eXsSH1TuWXQmRqaijK8zG90fnlf3s,1582
 ommlds/minichain/backends/impls/openai/format.py,sha256=ooUwI3UA7zeWOGFAAlFAM49lUDmtEJ3P3fPlwJ0_fNA,6423
 ommlds/minichain/backends/impls/openai/names.py,sha256=b74t8FwSbGEveVtVz4SqM5tiRDyTKNlUKlseV6AX3Yo,1211
-ommlds/minichain/backends/impls/openai/stream.py,sha256=88yEVdOuzxGNT1mnUg769IjHQVGZoPmzh7JAPX30qDg,4984
+ommlds/minichain/backends/impls/openai/stream.py,sha256=uEn4gLiS6Ep9CzvA3GMsgD_pu610P5wAs3p4xhr7p7E,5043
 ommlds/minichain/backends/impls/sentencepiece/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/sentencepiece/tokens.py,sha256=tUEBKyBgkTowssS_AdcAuPkyFzfyDfE935x4JG8PXM0,1602
 ommlds/minichain/backends/impls/tinygrad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/tinygrad/chat.py,sha256=vx6ZSv5_un1tFmJIubR9a-Thr2Yxu05W2vdP_xcye3Q,4630
+ommlds/minichain/backends/impls/tinygrad/chat.py,sha256=teCEuTiqQRd0RXhY_j8XRiryKHYJUwPvYntmBGYt1Ao,4776
 ommlds/minichain/backends/impls/tokenizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/tokenizers/tokens.py,sha256=_8Q49k5YroG5wQI0cuK6kOJ3XYwjhpaAS04ejhzBsWw,1500
 ommlds/minichain/backends/impls/transformers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -178,8 +178,8 @@ ommlds/minichain/chat/choices/adapters.py,sha256=gI6Vh4m-lz8dFagz7-mBAERDdd0G7uJ
 ommlds/minichain/chat/choices/services.py,sha256=p_FsCZEsGJun8epzAHoeNdjwJ86ZwihIhvFMsfdafeA,1041
 ommlds/minichain/chat/choices/types.py,sha256=GzkzaLnRKrugmjOfF0SvwHChc5pE88-HrADshswQLEE,730
 ommlds/minichain/chat/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/chat/stream/adapters.py,sha256=RPHV9NDkCsiw2qI4QT19Q0p2WlbEPwOguNqzIMjDlnc,2217
-ommlds/minichain/chat/stream/services.py,sha256=O4hERji7TmpEWNrXd9gb7cXspIO2T6ftz-VVWI--H8Q,1375
+ommlds/minichain/chat/stream/adapters.py,sha256=Xd82qvr73RHDSQiqyIpMA43LpMSc6JQp844Ii8oLxw0,2256
+ommlds/minichain/chat/stream/services.py,sha256=XAj4CZvpxPrfjbkV6iN0651bj19fkec00wgTkAqDxJk,1250
 ommlds/minichain/chat/stream/types.py,sha256=XqeTQBTCW-aXaI_L3v64dWe96HF6DCPAVvf6-j3b90I,1302
 ommlds/minichain/chat/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/chat/tools/execution.py,sha256=a44cvJsmrXRqyg-3p5oaeI54HGjhOCDEtL9CMg-p1ic,540
@@ -241,8 +241,8 @@ ommlds/minichain/services/requests.py,sha256=VAfKbYu4T0CZTWVQmZ2LUmYU7DNm6IerYMN
 ommlds/minichain/services/responses.py,sha256=4W6Z4Fx4_GFqKgle27OeLr0zzjVTA0pkZrlsZiFQNdo,1534
 ommlds/minichain/services/services.py,sha256=WjkQNYIp87SflLSReOHMkG2qIVAOem6vsrs_2NxWN_M,325
 ommlds/minichain/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/stream/services.py,sha256=4I3DaiJGAbvzBDs1uGAMkabO8opc5CbkqxvxOxd3EFs,2186
-ommlds/minichain/stream/wrap.py,sha256=bA4YMgxGSB-B9woUCR5tpkhOMjF1NUOZzuU1F71Du0U,2062
+ommlds/minichain/stream/services.py,sha256=oOdJ-GpkeXpb-kqEY7FZi_J0NzbVJk5VpPUk7ZIRFt4,5020
+ommlds/minichain/stream/wrap.py,sha256=B9jyUBmeD6KTan6XD4kNe_khjr0w0juck9FyBtR-HI8,2009
 ommlds/minichain/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/text/applypatch.py,sha256=YIN5JChJ0FXyK1I6OiAHQmE7BT-exHfaAMM9ay7ylyc,17705
 ommlds/minichain/text/toolparsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -299,9 +299,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=vVV8Ctn13aaRM9eYfs9Wd6rHn5WOCEUzQ44fIhOvJdg,3754
-ommlds-0.0.0.dev442.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev442.dist-info/METADATA,sha256=z4nqdm1N90RMFDn4PYH8WUpT12PiK8cAQSbmaE-3WRw,3224
-ommlds-0.0.0.dev442.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev442.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev442.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev442.dist-info/RECORD,,
+ommlds-0.0.0.dev443.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev443.dist-info/METADATA,sha256=7kkg5qkXPTJymBKRtYsIJAoxGsciQx_I7MDodtdXano,3224
+ommlds-0.0.0.dev443.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev443.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev443.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev443.dist-info/RECORD,,