ommlds 0.0.0.dev465__py3-none-any.whl → 0.0.0.dev466__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": 35,
+    "line": 36,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.stream",
@@ -137,7 +137,7 @@
     "module": ".minichain.backends.impls.google.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/google/stream.py",
-    "line": 36,
+    "line": 41,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.google.stream",

ommlds/backends/google/protocol/types.py

@@ -148,11 +148,14 @@ class Part(lang.Final):
     video_metadata: VideoMetadata | None = None
 
 
+ContentRole: ta.TypeAlias = ta.Literal['user', 'model']
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 @_set_class_marshal_options
 class Content(lang.Final):
     parts: ta.Sequence[Part] | None = None
-    role: ta.Literal['user', 'model'] | None = None
+    role: ContentRole | None = None
 
 
 ##

ommlds/cli/sessions/chat/chat/ai/services.py

@@ -63,19 +63,17 @@ class ChatChoicesStreamServiceStreamAiChatGenerator(StreamAiChatGenerator):
     ) -> mc.AiChat:
         opts = self._options() if self._options is not None else []
 
-        lst: list[str] = []
-
         async with self._service_provider.provide_backend() as service:
+            joiner = mc.AiChoiceDeltaJoiner()
+
             async with (await service.invoke(mc.ChatChoicesStreamRequest(chat, opts))).v as st_resp:
                 async for o in st_resp:
+                    joiner.add(o.choices)
+
                     choice = check.single(o.choices)
 
                     for delta in choice.deltas:
                         if delta_callback is not None:
                             await delta_callback(delta)
 
-                    c = check.isinstance(delta, mc.ContentAiChoiceDelta).c  # noqa
-                    if c is not None:
-                        lst.append(check.isinstance(c, str))
-
-        return [mc.AiMessage(''.join(lst))]
+        return check.single(joiner.build())

ommlds/minichain/__init__.py

@@ -92,6 +92,10 @@ with _lang.auto_proxy_init(
         ChatChoicesStreamServiceChatChoicesService,
     )
 
+    from .chat.stream.joining import (  # noqa
+        AiChoiceDeltaJoiner,
+    )
+
     from .chat.stream.services import (  # noqa
         ChatChoicesStreamRequest,
         ChatChoicesStreamResponse,
@@ -109,7 +113,9 @@ with _lang.auto_proxy_init(
 
         AiChoiceDelta,
         ContentAiChoiceDelta,
+        AnyToolUseAiChoiceDelta,
         ToolUseAiChoiceDelta,
+        PartialToolUseAiChoiceDelta,
 
         AiChoiceDeltas,
         AiChoicesDeltas,

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

@@ -17,6 +17,7 @@ from ....chat.stream.services import static_check_is_chat_choices_stream_service
 from ....chat.stream.types import AiChoiceDeltas
 from ....chat.stream.types import AiChoicesDeltas
 from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.stream.types import PartialToolUseAiChoiceDelta
 from ....chat.tools.types import Tool
 from ....configs import Config
 from ....resources import UseResources
@@ -123,19 +124,35 @@ class AnthropicChatChoicesStreamService:
                                         check.not_none(msg_start)
                                         check.none(cbk_start)
                                         cbk_start = ae
+
                                         if isinstance(ae.content_block, AnthropicSseDecoderEvents.ContentBlockStart.Text):  # noqa
                                             await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiChoiceDelta(
                                                 ae.content_block.text,
                                             )])]))
+
+                                        elif isinstance(ae.content_block, AnthropicSseDecoderEvents.ContentBlockStart.ToolUse):  # noqa
+                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([PartialToolUseAiChoiceDelta(  # noqa
+                                                id=ae.content_block.id,
+                                                name=ae.content_block.name,
+                                                raw_args=ae.content_block.input,
+                                            )])]))
+
                                         else:
                                             raise TypeError(ae.content_block)
 
                                     case AnthropicSseDecoderEvents.ContentBlockDelta():
                                         check.not_none(cbk_start)
+
                                         if isinstance(ae.delta, AnthropicSseDecoderEvents.ContentBlockDelta.TextDelta):
                                             await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiChoiceDelta(
                                                 ae.delta.text,
                                             )])]))
+
+                                        elif isinstance(ae.delta, AnthropicSseDecoderEvents.ContentBlockDelta.InputJsonDelta):  # noqa
+                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([PartialToolUseAiChoiceDelta(  # noqa
+                                                raw_args=ae.delta.partial_json,
+                                            )])]))
+
                                         else:
                                             raise TypeError(ae.delta)
 

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

@@ -15,6 +15,8 @@ from ....chat.choices.types import ChatChoicesOutputs
 from ....chat.messages import AiMessage
 from ....chat.messages import Message
 from ....chat.messages import SystemMessage
+from ....chat.messages import ToolUseMessage
+from ....chat.messages import ToolUseResultMessage
 from ....chat.messages import UserMessage
 from ....chat.stream.services import ChatChoicesStreamRequest
 from ....chat.stream.services import ChatChoicesStreamResponse
@@ -22,12 +24,15 @@ from ....chat.stream.services import static_check_is_chat_choices_stream_service
 from ....chat.stream.types import AiChoiceDeltas
 from ....chat.stream.types import AiChoicesDeltas
 from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.stream.types import ToolUseAiChoiceDelta
+from ....chat.tools.types import Tool
 from ....models.configs import ModelName
 from ....resources import UseResources
 from ....standard import ApiKey
 from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
 from .names import MODEL_NAMES
+from .tools import build_tool_spec_schema
 
 
 ##
@@ -48,22 +53,70 @@ class GoogleChatChoicesStreamService:
             self._model_name = cc.pop(self.DEFAULT_MODEL_NAME)
             self._api_key = ApiKey.pop_secret(cc, env='GEMINI_API_KEY')
 
-    def _get_msg_content(self, m: Message) -> str | None:
-        if isinstance(m, AiMessage):
-            return check.isinstance(m.c, str)
+    def _make_str_content(
+            self,
+            s: str | None,
+            *,
+            role: pt.ContentRole | None = None,
+    ) -> pt.Content | None:
+        if s is None:
+            return None
+
+        return pt.Content(
+            parts=[pt.Part(
+                text=check.not_none(s),
+            )],
+            role=role,
+        )
 
-        elif isinstance(m, (SystemMessage, UserMessage)):
-            return check.isinstance(m.c, str)
+    def _make_msg_content(self, m: Message) -> pt.Content:
+        if isinstance(m, (AiMessage, SystemMessage, UserMessage)):
+            return check.not_none(self._make_str_content(
+                check.isinstance(m.c, str),
+                role=self.ROLES_MAP[type(m)],
+            ))
+
+        elif isinstance(m, ToolUseResultMessage):
+            tr_resp_val: pt.Value
+            if m.tur.c is None:
+                tr_resp_val = pt.NullValue()  # type: ignore[unreachable]
+            elif isinstance(m.tur.c, str):
+                tr_resp_val = pt.StringValue(m.tur.c)
+            else:
+                raise TypeError(m.tur.c)
+            return pt.Content(
+                parts=[pt.Part(
+                    function_response=pt.FunctionResponse(
+                        id=m.tur.id,
+                        name=m.tur.name,
+                        response={
+                            'value': tr_resp_val,
+                        },
+                    ),
+                )],
+            )
+
+        elif isinstance(m, ToolUseMessage):
+            return pt.Content(
+                parts=[pt.Part(
+                    function_call=pt.FunctionCall(
+                        id=m.tu.id,
+                        name=m.tu.name,
+                        args=m.tu.args,
+                    ),
+                )],
+                role='model',
+            )
 
         else:
             raise TypeError(m)
 
     BASE_URL: ta.ClassVar[str] = 'https://generativelanguage.googleapis.com/v1beta/models'
 
-    ROLES_MAP: ta.ClassVar[ta.Mapping[type[Message], str]] = {
-        SystemMessage: 'system',
+    ROLES_MAP: ta.ClassVar[ta.Mapping[type[Message], pt.ContentRole | None]] = {  # noqa
+        SystemMessage: None,
         UserMessage: 'user',
-        AiMessage: 'assistant',
+        AiMessage: 'model',
     }
 
     READ_CHUNK_SIZE = 64 * 1024
@@ -74,16 +127,28 @@ class GoogleChatChoicesStreamService:
     ) -> ChatChoicesStreamResponse:
         key = check.not_none(self._api_key).reveal()
 
+        msgs = list(request.v)
+
+        system_inst: pt.Content | None = None
+        if msgs and isinstance(m0 := msgs[0], SystemMessage):
+            system_inst = self._make_msg_content(m0)
+            msgs.pop(0)
+
+        g_tools: list[pt.Tool] = []
+        with tv.TypedValues(*request.options).consume() as oc:
+            t: Tool
+            for t in oc.pop(Tool, []):
+                g_tools.append(pt.Tool(
+                    function_declarations=[build_tool_spec_schema(t.spec)],
+                ))
+
         g_req = pt.GenerateContentRequest(
             contents=[
-                pt.Content(
-                    parts=[pt.Part(
-                        text=check.not_none(self._get_msg_content(m)),
-                    )],
-                    role=self.ROLES_MAP[type(m)],  # type: ignore[arg-type]
-                )
-                for m in request.v
+                self._make_msg_content(m)
+                for m in msgs
             ],
+            tools=g_tools or None,
+            system_instruction=system_inst,
         )
 
         req_dct = msh.marshal(g_req)
@@ -110,18 +175,38 @@ class GoogleChatChoicesStreamService:
                         if isinstance(bl, DelimitingBuffer.Incomplete):
                             # FIXME: handle
                             return []
+
                         l = bl.decode('utf-8')
                         if not l:
                             continue
+
                         if l.startswith('data: '):
                             gcr = msh.unmarshal(json.loads(l[6:]), pt.GenerateContentResponse)  # noqa
                             cnd = check.single(check.not_none(gcr.candidates))
+
                             for p in check.not_none(cnd.content).parts or []:
-                                await sink.emit(AiChoicesDeltas([
-                                    AiChoiceDeltas([
-                                        ContentAiChoiceDelta(check.not_none(p.text)),
-                                    ]),
-                                ]))
+                                if (txt := p.text) is not None:
+                                    check.none(p.function_call)
+                                    await sink.emit(AiChoicesDeltas([
+                                        AiChoiceDeltas([
+                                            ContentAiChoiceDelta(check.not_none(txt)),
+                                        ]),
+                                    ]))
+
+                                elif (fc := p.function_call) is not None:
+                                    check.none(p.text)
+                                    await sink.emit(AiChoicesDeltas([
+                                        AiChoiceDeltas([
+                                            ToolUseAiChoiceDelta(
+                                                id=fc.id,
+                                                name=fc.name,
+                                                args=fc.args,
+                                            ),
+                                        ]),
+                                    ]))
+
+                                else:
+                                    raise ValueError(p)
 
                     if not b:
                         return []

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

@@ -18,7 +18,9 @@ from ....chat.messages import SystemMessage
 from ....chat.messages import ToolUseMessage
 from ....chat.messages import ToolUseResultMessage
 from ....chat.messages import UserMessage
+from ....chat.stream.types import AiChoiceDelta
 from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.stream.types import PartialToolUseAiChoiceDelta
 from ....chat.tools.types import Tool
 from ....content.json import JsonContent
 from ....content.prepare import prepare_content_str
@@ -212,17 +214,20 @@ class OpenaiChatRequestHandler:
             ),
         )
 
-    def build_ai_choice_delta(self, delta: ta.Mapping[str, ta.Any]) -> ContentAiChoiceDelta:
-        return ContentAiChoiceDelta(
-            check.not_none(delta.get('content')),
-            # FIXME:
-            # tool_exec_requests=[
-            #     ToolUse(
-            #         id=tc['id'],
-            #         spec=self._process_options().tools_by_name[tc['function']['name']],
-            #         args=json.loads(tc['function']['arguments'] or '{}'),
-            #         raw_args=tc['function']['arguments'],
-            #     )
-            #     for tc in message_or_delta.get('tool_calls', [])
-            # ] or None,
-        )
+    def build_ai_choice_delta(self, delta: ta.Mapping[str, ta.Any]) -> AiChoiceDelta:
+        if (c := delta.get('content')) is not None:
+            check.state(not delta.get('tool_calls'))
+            return ContentAiChoiceDelta(c)
+
+        elif (tcs := delta.get('tool_calls')) is not None:  # noqa
+            check.state(delta.get('content') is None)
+            tc = check.single(tcs)
+            tc_fn = tc['function']
+            return PartialToolUseAiChoiceDelta(
+                id=tc.get('id'),
+                name=tc_fn.get('name'),
+                raw_args=tc_fn.get('arguments'),
+            )
+
+        else:
+            raise ValueError(delta)

ommlds/minichain/chat/stream/adapters.py

@@ -1,22 +1,14 @@
-from omlish import check
 from omlish import dataclasses as dc
-from omlish import lang
 
 from ...services import Response
-from ...tools.types import ToolUse
 from ..choices.services import ChatChoicesRequest
 from ..choices.services import static_check_is_chat_choices_service
 from ..choices.types import AiChoice
 from ..choices.types import AiChoices
-from ..messages import AiMessage
-from ..messages import AnyAiMessage
-from ..messages import ToolUseMessage
+from .joining import AiChoiceDeltaJoiner
 from .services import ChatChoicesOutputs
 from .services import ChatChoicesStreamOutputs
 from .services import ChatChoicesStreamService
-from .types import AiChoiceDelta
-from .types import ContentAiChoiceDelta
-from .types import ToolUseAiChoiceDelta
 
 
 ##
@@ -31,50 +23,13 @@ class ChatChoicesStreamServiceChatChoicesService:
         AiChoices,
         ChatChoicesOutputs | ChatChoicesStreamOutputs,
     ]:
-        choice_lsts: list[list[list[str] | ToolUse]] = []
-
-        def add(l: list[list[str] | ToolUse], d: AiChoiceDelta) -> None:
-            if isinstance(d, ContentAiChoiceDelta):
-                s = check.isinstance(d.c, str)
-                if l and isinstance(l[-1], list):
-                    l[-1].append(s)
-                else:
-                    l.append([s])
-
-            elif isinstance(d, ToolUseAiChoiceDelta):
-                l.append(d.tu)
-
-            else:
-                raise TypeError(d)
+        joiner = AiChoiceDeltaJoiner()
 
         async with (resp := await self.service.invoke(request)).v as it:  # noqa
-            i = -1  # noqa
-            l: list[list[str] | ToolUse]
-            async for i, cs in lang.async_enumerate(it):
-                if i == 0:
-                    for c in cs.choices:
-                        choice_lsts.append(l := [])
-                        for d in c.deltas:
-                            add(l, d)
-
-                else:
-                    for l, c in zip(choice_lsts, cs.choices, strict=True):
-                        for d in c.deltas:
-                            add(l, d)
+            async for cs in it:
+                joiner.add(cs.choices)
 
         # check.state(resp_v.is_done)
 
-        ret: list[AiChoice] = []
-        for cl in choice_lsts:
-            cc: list[AnyAiMessage] = []
-            for e in cl:
-                if isinstance(e, list):
-                    cc.append(AiMessage(''.join(e)))
-                elif isinstance(e, ToolUse):
-                    cc.append(ToolUseMessage(e))
-                else:
-                    raise TypeError(e)
-            ret.append(AiChoice(cc))
-
         # FIXME: outputs lol
-        return Response(ret)
+        return Response([AiChoice(ms) for ms in joiner.build()])

ommlds/minichain/chat/stream/joining.py

@@ -0,0 +1,96 @@
+import typing as ta
+
+from omlish import check
+from omlish.formats import json
+
+from ...tools.types import ToolUse
+from ..messages import AiChat
+from ..messages import AiMessage
+from ..messages import AnyAiMessage
+from ..messages import ToolUseMessage
+from .types import AiChoiceDelta
+from .types import AiChoiceDeltas
+from .types import ContentAiChoiceDelta
+from .types import PartialToolUseAiChoiceDelta
+from .types import ToolUseAiChoiceDelta
+
+
+##
+
+
+class AiChoiceDeltaJoiner:
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._seq = 0
+        self._channels: list[AiChoiceDeltaJoiner._Channel] = []
+
+    class _Channel(ta.NamedTuple):
+        deltas: list[AiChoiceDelta]
+        messages: list[AnyAiMessage]
+
+    def _build_joined(self, deltas: ta.Sequence[AiChoiceDelta]) -> AnyAiMessage:
+        dty = check.single(set(map(type, check.not_empty(deltas))))
+
+        if dty is ContentAiChoiceDelta:
+            cds = ta.cast(ta.Sequence[ContentAiChoiceDelta], deltas)
+            return AiMessage(''.join(check.isinstance(cd.c, str) for cd in cds))
+
+        elif dty is ToolUseAiChoiceDelta:
+            raise TypeError(dty)
+
+        elif dty is PartialToolUseAiChoiceDelta:
+            tds = ta.cast(ta.Sequence[PartialToolUseAiChoiceDelta], deltas)
+            for td in ta.cast(ta.Sequence[PartialToolUseAiChoiceDelta], deltas)[1:]:
+                check.none(td.id)
+                check.none(td.name)
+
+            ra = ''.join(filter(None, (td.raw_args for td in tds)))
+
+            return ToolUseMessage(ToolUse(
+                id=tds[0].id,
+                name=check.non_empty_str(tds[0].name),
+                args=json.loads(ra),
+                raw_args=ra,
+            ))
+
+        else:
+            raise TypeError(dty)
+
+    def _join_one(self, chan: _Channel) -> None:
+        if not chan.deltas:
+            return
+
+        chan.messages.append(self._build_joined(chan.deltas))
+        chan.deltas.clear()
+
+    def _add_to(self, chan: _Channel, d: AiChoiceDelta) -> None:
+        if chan.deltas and type(chan.deltas[0]) is not type(d):
+            self._join_one(chan)
+
+        if isinstance(d, ToolUseAiChoiceDelta):
+            chan.messages.append(ToolUseMessage(ToolUse(
+                id=d.id,
+                name=check.not_none(d.name),
+                args=d.args or {},
+            )))
+
+        else:
+            chan.deltas.append(d)
+
+    def add(self, choices: ta.Sequence[AiChoiceDeltas]) -> None:
+        if not self._seq:
+            check.empty(self._channels)
+            self._channels.extend(self._Channel([], []) for _ in range(len(choices)))
+
+        for chan, c in zip(self._channels, choices, strict=True):
+            for d in c.deltas:
+                self._add_to(chan, d)
+
+        self._seq += 1
+
+    def build(self) -> list[AiChat]:
+        for chan in self._channels:
+            self._join_one(chan)
+
+        return [list(chan.messages) for chan in self._channels]

ommlds/minichain/chat/stream/types.py

@@ -6,7 +6,6 @@ from omlish import marshal as msh
 
 from ...content.types import Content
 from ...stream.services import StreamOptions
-from ...tools.types import ToolUse
 from ...types import Option
 from ...types import Output
 from ..choices.types import ChatChoicesOptions
@@ -48,9 +47,23 @@ class ContentAiChoiceDelta(AiChoiceDelta, lang.Final):
     c: Content
 
 
-@dc.dataclass(frozen=True)
-class ToolUseAiChoiceDelta(AiChoiceDelta, lang.Final):
-    tu: ToolUse
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class AnyToolUseAiChoiceDelta(AiChoiceDelta, lang.Abstract):
+    id: str | None = None
+    name: str | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ToolUseAiChoiceDelta(AnyToolUseAiChoiceDelta, lang.Final):
+    args: ta.Mapping[str, ta.Any] | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class PartialToolUseAiChoiceDelta(AnyToolUseAiChoiceDelta, lang.Final):
+    raw_args: ta.Any | None = None
 
 
 #

{ommlds-0.0.0.dev465.dist-info → ommlds-0.0.0.dev466.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev465
+Version: 0.0.0.dev466
 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.dev465
-Requires-Dist: omlish==0.0.0.dev465
+Requires-Dist: omdev==0.0.0.dev466
+Requires-Dist: omlish==0.0.0.dev466
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev465.dist-info → ommlds-0.0.0.dev466.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=5HdEXx21B_B9DSFeEoQ1teSsanB_NOU5F2o5yjrAtKI,17930
+ommlds/.omlish-manifests.json,sha256=ZrDlaAwG8hoshkjW-up0pk0dMvDI3g5dW1M92uaf5KI,17930
 ommlds/__about__.py,sha256=uAJgr2I_m_oZPlV5P8XLFeYpBlEM-DdzeyF6O5OK_qs,1759
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/huggingface.py,sha256=JfEyfKOxU3-SY_ojtXBJFNeD-NIuKjvMe3GL3e93wNA,1175
@@ -16,7 +16,7 @@ ommlds/backends/anthropic/protocol/sse/events.py,sha256=pLscyLFpxcrtOijNPRgivrxY
 ommlds/backends/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/google/protocol/__init__.py,sha256=OWmhuCS_sZ08ZaBtSSDRIudHKzkzgmqxY-3jgQxTidw,105
 ommlds/backends/google/protocol/_marshal.py,sha256=LWikcdMDrKQ0lMtclNXwK9qamijUBzK62nrEVo2OFtc,305
-ommlds/backends/google/protocol/types.py,sha256=-szndCfo4h4TnfWY23B-_ksgDO0W_Qnu958h4NEWJFw,17494
+ommlds/backends/google/protocol/types.py,sha256=JDft5-5sPuy8sFWTvid4JuC9a9EnuQizt9dyAV2L56s,17536
 ommlds/backends/llamacpp/__init__.py,sha256=zXFpLXE4a2vEl0jcPDyKlPHHfZ3Z8Dz0twhEIyZ8-vg,59
 ommlds/backends/llamacpp/buildwheel.py,sha256=q9ghCLVbm8Jm6syrZlBP-x1qNDd0wSl15B2OXBtDBQ8,3813
 ommlds/backends/llamacpp/logging.py,sha256=nCEC6ASEuTpJqx47DMLhnbr5KelDlbxhM0nKQt4bc3w,773
@@ -100,7 +100,7 @@ ommlds/cli/sessions/chat/chat/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 ommlds/cli/sessions/chat/chat/ai/inject.py,sha256=FCq-E8auVJ-gnK18NoKiINGBHgDllroZRG7z5ZY63L8,2514
 ommlds/cli/sessions/chat/chat/ai/injection.py,sha256=2O_ELMusxQsYaB2oqvzjYpZQzjshocJup7Z5unzoUIY,404
 ommlds/cli/sessions/chat/chat/ai/rendering.py,sha256=cicA6NwkM9UJb1dgsakhkhIMWGzBsArPFvYoINBmuec,2285
-ommlds/cli/sessions/chat/chat/ai/services.py,sha256=RNO3emXEFPr0M04wThRQo332x0n5R3n8aQFctcePCHQ,2629
+ommlds/cli/sessions/chat/chat/ai/services.py,sha256=-XcMEatIDA0h_h-crL45c3qvC5VbDdhvKcWsxzioQA8,2507
 ommlds/cli/sessions/chat/chat/ai/tools.py,sha256=en94LLM8y73N11xhQPlkSLfbzAmYVwKU-4nz2i0CK0E,1094
 ommlds/cli/sessions/chat/chat/ai/types.py,sha256=QH6Cn6DrdxBi0Tnura7Fq-WtGUm0FdsazZSgki6nf0A,750
 ommlds/cli/sessions/chat/chat/state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -147,7 +147,7 @@ ommlds/cli/state/storage.py,sha256=tRPmgCANRrw7A5Qr700OaH58F6S96O37I8Ivrbo7_gI,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=5pHq8Tlhgqx5p9ilC0EjN8dpOZ2Xc1ADHgwa1V-FFkk,10829
+ommlds/minichain/__init__.py,sha256=EqNJpuMwqkkdlNmipjaoC30yAqH7c8oziszlkCcXBrQ,10982
 ommlds/minichain/_marshal.py,sha256=n9PGWrHhvAmGIc7KDOYt3IF9Z6G0ncXskyICTp3Ji6k,1923
 ommlds/minichain/_typedvalues.py,sha256=Vl1Edt5khC0e5RPFBPmPCxn0IzrfVd0NHzAjAN2E6Kc,2183
 ommlds/minichain/completion.py,sha256=lQ0LfCIYZsvDqteHhhDIv16D2_gn_xMfEL0ouywE5Yo,1033
@@ -172,14 +172,14 @@ ommlds/minichain/backends/impls/anthropic/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 ommlds/minichain/backends/impls/anthropic/chat.py,sha256=LVaRP_Pbz4UghSHD8GZ22hMWE4Rsd_6bSysgl2BR_AM,4166
 ommlds/minichain/backends/impls/anthropic/names.py,sha256=GPPeYt0CcDcDCR8I6BMd7bMjC_Zk_bjnLLpF9ClwXcg,1099
 ommlds/minichain/backends/impls/anthropic/protocol.py,sha256=whPVYuKShKiMCzasHl77sCIiymhzXj8mFZXEyhZvld8,3292
-ommlds/minichain/backends/impls/anthropic/stream.py,sha256=agET8PPbKg-7gYL3FGyU45J-QqV65VkEo15ipScEzUA,7667
+ommlds/minichain/backends/impls/anthropic/stream.py,sha256=AvoLk25R7E_aSS1tAN-P-UKjhKPxYtQoeGakXvFdblI,8677
 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
 ommlds/minichain/backends/impls/google/chat.py,sha256=q6LasmAh3Xn78kNlgpgwoKhdTj3o76j0X3_xitdyAE0,6316
 ommlds/minichain/backends/impls/google/names.py,sha256=HxHJ31HeKZg6aW1C_Anqp-gamCXpq9pOdKj8_yVgE8Y,871
 ommlds/minichain/backends/impls/google/search.py,sha256=5-2nAZ1QmbqHSQcwWnqqcgCM-Duy2ryctJEIv2tcpZg,3260
-ommlds/minichain/backends/impls/google/stream.py,sha256=no8MM4rrduvxrDWKIPAaYUiH5la3OxuVgAvDP3mkmnE,4921
+ommlds/minichain/backends/impls/google/stream.py,sha256=Mhg5cOe7PKbnlQURyk2IRermtpzxU5Y0j3w4fkt2ZRg,7900
 ommlds/minichain/backends/impls/google/tools.py,sha256=Tty0gsyx7-PbeoNqMuql_ewQ6q-ZsDaDdsD5ShinGVY,5089
 ommlds/minichain/backends/impls/huggingface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/huggingface/configs.py,sha256=6jsBtPNXOP57PcpxNTVLGWLc-18Iwn_lDbGouwCJTIQ,258
@@ -195,7 +195,7 @@ ommlds/minichain/backends/impls/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 ommlds/minichain/backends/impls/openai/chat.py,sha256=3hiKX2WqRo1cwF4AhcnzcCb2fsmwNLW7YPGYpask41A,2660
 ommlds/minichain/backends/impls/openai/completion.py,sha256=0XTC08mZzbW23Y2DNW2xfRR0eDX4nTyejF8CR1BdHZs,1756
 ommlds/minichain/backends/impls/openai/embedding.py,sha256=kkDJ3_0EqwQ_E0eXsSH1TuWXQmRqaijK8zG90fnlf3s,1582
-ommlds/minichain/backends/impls/openai/format.py,sha256=xzd7iuyEcu8aROZQJ14A6C0Vxylg75yQbWwk-Oz8Q74,7150
+ommlds/minichain/backends/impls/openai/format.py,sha256=M1AYWDhz1QApazFeae4xTO9ng_59sx4uYs0FKt0GIKM,7275
 ommlds/minichain/backends/impls/openai/format2.py,sha256=OQ3N8VR4uL3PvHxjOQSdgg1bQ4_WiDz_sOV4WhVEXpQ,6611
 ommlds/minichain/backends/impls/openai/names.py,sha256=b74t8FwSbGEveVtVz4SqM5tiRDyTKNlUKlseV6AX3Yo,1211
 ommlds/minichain/backends/impls/openai/stream.py,sha256=X45qIXgwAk7IVe4LL6gzL3uJivdaB-hUGutltHeswTc,5280
@@ -228,9 +228,10 @@ ommlds/minichain/chat/choices/services.py,sha256=p_FsCZEsGJun8epzAHoeNdjwJ86Zwih
 ommlds/minichain/chat/choices/types.py,sha256=OPnMUp0KUKGGPJKsQZiXUtd8Z9b_JnhOy7SXKL6QDWU,725
 ommlds/minichain/chat/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/chat/stream/_marshal.py,sha256=r6NYBUviV7jIssaFprzv2rVEj8cFEuBlt71BSMZ-448,397
-ommlds/minichain/chat/stream/adapters.py,sha256=Mxftmg6izUoeZnVZM4v5o0_eCtY0QuYAd-X7BkqYHWY,2627
+ommlds/minichain/chat/stream/adapters.py,sha256=3hKo3-MLtVIB-Nhdlxt17LP9vZESr-2fBZQ3Yr6l_Ps,1077
+ommlds/minichain/chat/stream/joining.py,sha256=oPxLT4qEYWCaxclnZvt54ztQP5md4V6u6Uwn4qd2e9M,2936
 ommlds/minichain/chat/stream/services.py,sha256=TxNEOm85QEFYtKb59q_uP6eSNh75v1fF-IpsJjhY4to,1252
-ommlds/minichain/chat/stream/types.py,sha256=OoPNYpPZxFNZcEbr36U1zpA_hsVU16ujsFnnHcq5W-0,1252
+ommlds/minichain/chat/stream/types.py,sha256=t1udlFSMlSlEyQHRnBEQYI_f-FuE6twRBFGzR66blWQ,1585
 ommlds/minichain/chat/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/chat/tools/execution.py,sha256=tCPsz1kCt5RcoRX7dwfaJRvObniJJv_D2hCwz1Slo_A,573
 ommlds/minichain/chat/tools/ids.py,sha256=DFBKrpeDTCnMcU-P38VbPWX0YBDaz_HzMgx3yXWjFWQ,759
@@ -367,9 +368,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.dev465.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev465.dist-info/METADATA,sha256=JAD5TLj7Vqeese-787MMUhAcQFykg29h_upNHQ5XUFA,3224
-ommlds-0.0.0.dev465.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev465.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev465.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev465.dist-info/RECORD,,
+ommlds-0.0.0.dev466.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev466.dist-info/METADATA,sha256=cTdtmfR8ON19GS5ay_ImJD5oZ5uXwylxukZIaX7NNUM,3224
+ommlds-0.0.0.dev466.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev466.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev466.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev466.dist-info/RECORD,,