ommlds 0.0.0.dev477__py3-none-any.whl → 0.0.0.dev479__py3-none-any.whl

ommlds/.omlish-manifests.json

@@ -533,8 +533,8 @@
             "gpt5-chat-latest": "gpt-5-chat-latest",
             "gpt5-mini": "gpt-5-mini",
             "gpt5-nano": "gpt-5-nano",
-            "gpt": "gpt-4o",
-            "gpt-mini": "gpt-4o-mini",
+            "gpt": "gpt-5",
+            "gpt-mini": "gpt-5-mini",
             "o3": null,
             "o3-mini": null,
             "o4-mini": null,
@@ -729,6 +729,18 @@
       }
     }
   },
+  {
+    "module": ".minichain.chat.choices.stream.services",
+    "attr": null,
+    "file": "ommlds/minichain/chat/choices/stream/services.py",
+    "line": 28,
+    "value": {
+      "!.minichain.registries.manifests.RegistryTypeManifest": {
+        "module": "ommlds.minichain.chat.choices.stream.services",
+        "attr": "ChatChoicesStreamService"
+      }
+    }
+  },
   {
     "module": ".minichain.chat.services",
     "attr": null,
@@ -749,7 +761,7 @@
     "value": {
       "!.minichain.registries.manifests.RegistryTypeManifest": {
         "module": "ommlds.minichain.chat.stream.services",
-        "attr": "ChatChoicesStreamService"
+        "attr": "ChatStreamService"
       }
     }
   },

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

@@ -57,11 +57,11 @@ class RenderingStreamAiChatGenerator(StreamAiChatGenerator):
     async def get_next_ai_messages_streamed(
             self,
             chat: 'mc.Chat',
-            delta_callback: ta.Callable[['mc.AiChoiceDelta'], ta.Awaitable[None]] | None = None,
+            delta_callback: ta.Callable[['mc.AiDelta'], ta.Awaitable[None]] | None = None,
     ) -> mc.Chat:
         async with self._renderer.create_context() as renderer:
-            async def inner(delta: mc.AiChoiceDelta) -> None:
-                if isinstance(delta, mc.ContentAiChoiceDelta):
+            async def inner(delta: mc.AiDelta) -> None:
+                if isinstance(delta, mc.ContentAiDelta):
                     await renderer.render_content(delta.c)
 
                 if delta_callback is not None:

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

@@ -59,12 +59,12 @@ class ChatChoicesStreamServiceStreamAiChatGenerator(StreamAiChatGenerator):
     async def get_next_ai_messages_streamed(
             self,
             chat: 'mc.Chat',
-            delta_callback: ta.Callable[['mc.AiChoiceDelta'], ta.Awaitable[None]] | None = None,
+            delta_callback: ta.Callable[['mc.AiDelta'], ta.Awaitable[None]] | None = None,
     ) -> mc.AiChat:
         opts = self._options() if self._options is not None else []
 
         async with self._service_provider.provide_backend() as service:
-            joiner = mc.AiChoiceDeltaJoiner()
+            joiner = mc.AiChoicesDeltaJoiner()
 
             async with (await service.invoke(mc.ChatChoicesStreamRequest(chat, opts))).v as st_resp:
                 async for o in st_resp:

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

@@ -23,6 +23,6 @@ class StreamAiChatGenerator(AiChatGenerator, lang.Abstract):
     def get_next_ai_messages_streamed(
             self,
             chat: 'mc.Chat',
-            delta_callback: ta.Callable[['mc.AiChoiceDelta'], ta.Awaitable[None]] | None = None,
+            delta_callback: ta.Callable[['mc.AiDelta'], ta.Awaitable[None]] | None = None,
     ) -> ta.Awaitable['mc.Chat']:
         raise NotImplementedError

ommlds/minichain/__init__.py

@@ -65,6 +65,33 @@ with _lang.auto_proxy_init(
 
     ##
 
+    from .chat.choices.stream.adapters import (  # noqa
+        ChatChoicesStreamServiceChatChoicesService,
+    )
+
+    from .chat.choices.stream.joining import (  # noqa
+        AiChoicesDeltaJoiner,
+    )
+
+    from .chat.choices.stream.services import (  # noqa
+        ChatChoicesStreamRequest,
+        ChatChoicesStreamResponse,
+        ChatChoicesStreamService,
+        AbstractChatChoicesStreamService,
+        static_check_is_chat_choices_stream_service,
+    )
+
+    from .chat.choices.stream.types import (  # noqa
+        ChatChoicesStreamOption,
+        ChatChoicesStreamOptions,
+
+        ChatChoicesStreamOutput,
+        ChatChoicesStreamOutputs,
+
+        AiChoiceDeltas,
+        AiChoicesDeltas,
+    )
+
     from .chat.choices.adapters import (  # noqa
         ChatChoicesServiceChatService,
     )
@@ -88,37 +115,27 @@ with _lang.auto_proxy_init(
         AiChoices,
     )
 
-    from .chat.stream.adapters import (  # noqa
-        ChatChoicesStreamServiceChatChoicesService,
-    )
-
     from .chat.stream.joining import (  # noqa
-        AiChoiceDeltaJoiner,
+        AiDeltaJoiner,
     )
 
     from .chat.stream.services import (  # noqa
-        ChatChoicesStreamRequest,
-        ChatChoicesStreamResponse,
-        ChatChoicesStreamService,
-        AbstractChatChoicesStreamService,
-        static_check_is_chat_choices_stream_service,
+        ChatStreamRequest,
+        ChatStreamResponse,
+        ChatStreamService,
+        AbstractChatStreamService,
+        static_check_is_chat_stream_service,
     )
 
     from .chat.stream.types import (  # noqa
-        ChatChoicesStreamOption,
-        ChatChoicesStreamOptions,
+        AiDelta,
+        AiDeltas,
 
-        ChatChoicesStreamOutput,
-        ChatChoicesStreamOutputs,
-
-        AiChoiceDelta,
-        ContentAiChoiceDelta,
-        AnyToolUseAiChoiceDelta,
-        ToolUseAiChoiceDelta,
-        PartialToolUseAiChoiceDelta,
+        ContentAiDelta,
 
-        AiChoiceDeltas,
-        AiChoicesDeltas,
+        AnyToolUseAiDelta,
+        ToolUseAiDelta,
+        PartialToolUseAiDelta,
     )
 
     from .chat.tools.execution import (  # noqa

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

@@ -11,13 +11,13 @@ from omlish.io.buffers import DelimitingBuffer
 from .....backends.anthropic.protocol import types as pt
 from .....backends.anthropic.protocol.sse.events import AnthropicSseDecoderEvents
 from ....chat.choices.services import ChatChoicesOutputs
-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 AiChoiceDeltas
-from ....chat.stream.types import AiChoicesDeltas
-from ....chat.stream.types import ContentAiChoiceDelta
-from ....chat.stream.types import PartialToolUseAiChoiceDelta
+from ....chat.choices.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
+from ....chat.stream.types import ContentAiDelta
+from ....chat.stream.types import PartialToolUseAiDelta
 from ....chat.tools.types import Tool
 from ....configs import Config
 from ....resources import UseResources
@@ -131,12 +131,12 @@ class AnthropicChatChoicesStreamService:
                                         cbk_start = ae
 
                                         if isinstance(ae.content_block, AnthropicSseDecoderEvents.ContentBlockStart.Text):  # noqa
-                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiChoiceDelta(
+                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiDelta(
                                                 ae.content_block.text,
                                             )])]))
 
                                         elif isinstance(ae.content_block, AnthropicSseDecoderEvents.ContentBlockStart.ToolUse):  # noqa
-                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([PartialToolUseAiChoiceDelta(  # noqa
+                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([PartialToolUseAiDelta(  # noqa
                                                 id=ae.content_block.id,
                                                 name=ae.content_block.name,
                                                 raw_args=ae.content_block.input,
@@ -149,12 +149,12 @@ class AnthropicChatChoicesStreamService:
                                         check.not_none(cbk_start)
 
                                         if isinstance(ae.delta, AnthropicSseDecoderEvents.ContentBlockDelta.TextDelta):
-                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiChoiceDelta(
+                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiDelta(
                                                 ae.delta.text,
                                             )])]))
 
                                         elif isinstance(ae.delta, AnthropicSseDecoderEvents.ContentBlockDelta.InputJsonDelta):  # noqa
-                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([PartialToolUseAiChoiceDelta(  # noqa
+                                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([PartialToolUseAiDelta(  # noqa
                                                 raw_args=ae.delta.partial_json,
                                             )])]))
 

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

@@ -6,15 +6,15 @@ from omlish.text.lorem import LOREM
 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.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
 from ....chat.choices.types import AiChoice
 from ....chat.choices.types import ChatChoicesOutputs
 from ....chat.messages import AiMessage
-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 AiChoiceDeltas
-from ....chat.stream.types import AiChoicesDeltas
-from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.stream.types import ContentAiDelta
 from ....resources import UseResources
 from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
@@ -48,7 +48,7 @@ class DummyChatChoicesStreamService:
                 for s in LOREM:
                     await sink.emit(AiChoicesDeltas([
                         AiChoiceDeltas([
-                            ContentAiChoiceDelta(s),
+                            ContentAiDelta(s),
                         ]),
                     ]))
 

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

@@ -11,6 +11,11 @@ from omlish.http import all as http
 from omlish.io.buffers import DelimitingBuffer
 
 from .....backends.google.protocol import types as pt
+from ....chat.choices.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
 from ....chat.choices.types import ChatChoicesOutputs
 from ....chat.messages import AiMessage
 from ....chat.messages import Message
@@ -18,13 +23,8 @@ 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
-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.stream.types import ContentAiDelta
+from ....chat.stream.types import ToolUseAiDelta
 from ....chat.tools.types import Tool
 from ....models.configs import ModelName
 from ....resources import UseResources
@@ -194,7 +194,7 @@ class GoogleChatChoicesStreamService:
                                     check.none(p.function_call)
                                     await sink.emit(AiChoicesDeltas([
                                         AiChoiceDeltas([
-                                            ContentAiChoiceDelta(check.not_none(txt)),
+                                            ContentAiDelta(check.not_none(txt)),
                                         ]),
                                     ]))
 
@@ -202,7 +202,7 @@ class GoogleChatChoicesStreamService:
                                     check.none(p.text)
                                     await sink.emit(AiChoicesDeltas([
                                         AiChoiceDeltas([
-                                            ToolUseAiChoiceDelta(
+                                            ToolUseAiDelta(
                                                 id=fc.id,
                                                 name=fc.name,
                                                 args=fc.args,

ommlds/minichain/backends/impls/groq/protocol.py

@@ -5,6 +5,7 @@ from omlish.formats import json
 
 from .....backends.groq import protocol as pt
 from ....chat.choices.services import ChatChoicesResponse
+from ....chat.choices.stream.types import AiChoiceDeltas
 from ....chat.choices.types import AiChoice
 from ....chat.messages import AiMessage
 from ....chat.messages import AnyAiMessage
@@ -13,10 +14,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 AiChoiceDeltas
-from ....chat.stream.types import ContentAiChoiceDelta
-from ....chat.stream.types import ToolUseAiChoiceDelta
+from ....chat.stream.types import AiDelta
+from ....chat.stream.types import ContentAiDelta
+from ....chat.stream.types import ToolUseAiDelta
 from ....chat.tools.types import Tool
 from ....content.prepare import prepare_content_str
 from ....tools.jsonschema import build_tool_spec_params_json_schema
@@ -121,14 +121,14 @@ def build_mc_choices_response(gq_resp: pt.ChatCompletionResponse) -> ChatChoices
 
 def build_mc_ai_choice_deltas(delta: pt.ChatCompletionChunk.Choice.Delta) -> AiChoiceDeltas:
     if delta.role in (None, 'assistant'):
-        lst: list[AiChoiceDelta] = []
+        lst: list[AiDelta] = []
 
         if delta.content is not None:
-            lst.append(ContentAiChoiceDelta(delta.content))
+            lst.append(ContentAiDelta(delta.content))
 
         for tc in delta.tool_calls or []:
             tc_fn = check.not_none(tc.function)
-            lst.append(ToolUseAiChoiceDelta(
+            lst.append(ToolUseAiDelta(
                 id=tc.id,
                 name=check.not_none(tc_fn.name),
                 args=json.loads(tc_fn.arguments or '{}'),

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

@@ -10,10 +10,10 @@ from omlish.io.buffers import DelimitingBuffer
 
 from .....backends.groq import protocol as pt
 from ....chat.choices.services import ChatChoicesOutputs
-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 AiChoicesDeltas
+from ....chat.choices.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoicesDeltas
 from ....chat.tools.types import Tool
 from ....configs import Config
 from ....resources import UseResources

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

@@ -10,12 +10,12 @@ from omlish import typedvalues as tv
 
 from .....backends import llamacpp as lcu
 from ....chat.choices.services import ChatChoicesOutputs
-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 AiChoiceDeltas
-from ....chat.stream.types import AiChoicesDeltas
-from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.choices.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
+from ....chat.stream.types import ContentAiDelta
 from ....configs import Config
 from ....models.configs import ModelPath
 from ....resources import UseResources
@@ -102,7 +102,7 @@ class LlamacppChatChoicesStreamService(lang.ExitStacked):
                     # FIXME: stop reason
 
                     if (content := delta.get('content', '')):
-                        await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiChoiceDelta(content)])]))
+                        await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiDelta(content)])]))
 
                 return None
 

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

@@ -10,18 +10,18 @@ from ....chat.choices.services import ChatChoicesOutputs
 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.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
 from ....chat.choices.types import AiChoice
 from ....chat.choices.types import ChatChoicesOptions
 from ....chat.messages import AiMessage
 from ....chat.messages import Message
 from ....chat.messages import SystemMessage
 from ....chat.messages import UserMessage
-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 AiChoiceDeltas
-from ....chat.stream.types import AiChoicesDeltas
-from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.stream.types import ContentAiDelta
 from ....configs import Config
 from ....llms.types import MaxTokens
 from ....models.configs import ModelPath
@@ -207,7 +207,7 @@ class MlxChatChoicesStreamService(BaseMlxChatChoicesService):
                 for go in gen:
                     if go.text:
                         await sink.emit(AiChoicesDeltas([AiChoiceDeltas([
-                            ContentAiChoiceDelta(go.text),
+                            ContentAiDelta(go.text),
                         ])]))
 
                 return []

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

@@ -13,18 +13,18 @@ from ....chat.choices.services import ChatChoicesOutputs
 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.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
 from ....chat.choices.types import AiChoice
 from ....chat.messages import AiMessage
 from ....chat.messages import AnyAiMessage
 from ....chat.messages import Message
 from ....chat.messages import SystemMessage
 from ....chat.messages import UserMessage
-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 AiChoiceDeltas
-from ....chat.stream.types import AiChoicesDeltas
-from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.stream.types import ContentAiDelta
 from ....models.configs import ModelName
 from ....resources import UseResources
 from ....standard import ApiUrl
@@ -189,7 +189,7 @@ class OllamaChatChoicesStreamService(BaseOllamaChatChoicesService):
                         check.state(not lp.message.tool_calls)
 
                         if (c := lp.message.content):
-                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiChoiceDelta(
+                            await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiDelta(
                                 c,
                             )])]))
 

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

@@ -17,9 +17,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.stream.types import AiDelta
+from ....chat.stream.types import ContentAiDelta
+from ....chat.stream.types import PartialToolUseAiDelta
 from ....chat.tools.types import Tool
 from ....content.json import JsonContent
 from ....content.prepare import prepare_content_str
@@ -128,16 +128,16 @@ def build_mc_choices_response(oai_resp: pt.ChatCompletionResponse) -> ChatChoice
     )
 
 
-def build_mc_ai_choice_delta(delta: pt.ChatCompletionChunkChoiceDelta) -> AiChoiceDelta:
+def build_mc_ai_delta(delta: pt.ChatCompletionChunkChoiceDelta) -> AiDelta:
     if delta.content is not None:
         check.state(not delta.tool_calls)
-        return ContentAiChoiceDelta(delta.content)
+        return ContentAiDelta(delta.content)
 
     elif delta.tool_calls is not None:
         check.state(delta.content is None)
         tc = check.single(delta.tool_calls)
         tc_fn = check.not_none(tc.function)
-        return PartialToolUseAiChoiceDelta(
+        return PartialToolUseAiDelta(
             id=tc.id,
             name=tc_fn.name,
             raw_args=tc_fn.arguments,
@@ -166,8 +166,8 @@ class OpenaiChatRequestHandler:
         self._mandatory_kwargs = mandatory_kwargs
 
     DEFAULT_OPTIONS: ta.ClassVar[tv.TypedValues[Option]] = tv.TypedValues[Option](
-        Temperature(0.),
-        MaxTokens(1024),
+        # Temperature(0.),
+        # MaxTokens(1024),
     )
 
     _OPTION_KWARG_NAMES_MAP: ta.ClassVar[ta.Mapping[str, type[ChatChoicesOptions]]] = dict(
@@ -182,8 +182,8 @@ class OpenaiChatRequestHandler:
     @cached.function
     def _process_options(self) -> _ProcessedOptions:
         kwargs: dict = dict(
-            temperature=0,
-            max_tokens=1024,
+            # temperature=0,
+            # max_tokens=1024,
         )
 
         tools_by_name: dict[str, ToolSpec] = {}

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

@@ -46,8 +46,8 @@ CHAT_MODEL_NAMES = ModelNameCollection(
             for n in _GPT_MODEL_NAMES
         },
 
-        'gpt': 'gpt-4o',
-        'gpt-mini': 'gpt-4o-mini',
+        'gpt': 'gpt-5',
+        'gpt-mini': 'gpt-5-mini',
 
         #
 

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

@@ -13,12 +13,12 @@ from omlish.io.buffers import DelimitingBuffer
 
 from .....backends.openai import protocol as pt
 from ....chat.choices.services import ChatChoicesOutputs
-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 AiChoiceDeltas
-from ....chat.stream.types import AiChoicesDeltas
-from ....chat.stream.types import ChatChoicesStreamOption
+from ....chat.choices.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
+from ....chat.choices.stream.types import ChatChoicesStreamOption
 from ....configs import Config
 from ....resources import ResourcesOption
 from ....resources import UseResources
@@ -28,7 +28,7 @@ from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
 from .chat import OpenaiChatChoicesService
 from .format import OpenaiChatRequestHandler
-from .format import build_mc_ai_choice_delta
+from .format import build_mc_ai_delta
 from .names import CHAT_MODEL_NAMES
 
 
@@ -122,7 +122,7 @@ class OpenaiChatChoicesStreamService:
                                     break
 
                                 await sink.emit(AiChoicesDeltas([
-                                    AiChoiceDeltas([build_mc_ai_choice_delta(choice.delta)])
+                                    AiChoiceDeltas([build_mc_ai_delta(choice.delta)])
                                     for choice in ccc.choices
                                 ]))
 

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

@@ -9,18 +9,18 @@ from ....chat.choices.services import ChatChoicesOptions
 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.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas
+from ....chat.choices.stream.types import AiChoicesDeltas
 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 ChatChoicesStreamRequest
-from ....chat.stream.services import ChatChoicesStreamResponse
-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 ContentAiDelta
 from ....chat.types import ChatOption
 from ....llms.types import LlmOption
 from ....resources import UseResources
@@ -151,7 +151,7 @@ class TinygradLlama3ChatChoicesStreamService(BaseTinygradLlama3ChatService):
                 for s in tgl3.run_llm(llm, toks):
                     await sink.emit(AiChoicesDeltas([
                         AiChoiceDeltas([
-                            ContentAiChoiceDelta(s),
+                            ContentAiDelta(s),
                         ]),
                     ]))
 

ommlds/minichain/backends/impls/transformers/transformers.py

@@ -19,6 +19,11 @@ from .....backends.transformers.streamers import CancellableTextStreamer
 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.stream.services import ChatChoicesStreamRequest
+from ....chat.choices.stream.services import ChatChoicesStreamResponse
+from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.choices.stream.types import AiChoiceDeltas  # noqa
+from ....chat.choices.stream.types import AiChoicesDeltas  # noqa
 from ....chat.choices.types import AiChoice
 from ....chat.choices.types import ChatChoicesOutputs
 from ....chat.messages import AiMessage
@@ -27,12 +32,7 @@ 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
-from ....chat.stream.services import static_check_is_chat_choices_stream_service
-from ....chat.stream.types import AiChoiceDeltas  # noqa
-from ....chat.stream.types import AiChoicesDeltas  # noqa
-from ....chat.stream.types import ContentAiChoiceDelta  # noqa
+from ....chat.stream.types import ContentAiDelta  # noqa
 from ....completion import CompletionRequest
 from ....completion import CompletionResponse
 from ....completion import static_check_is_completion_service
@@ -288,7 +288,7 @@ class TransformersChatChoicesStreamService(BaseTransformersChatChoicesService):
                         end = False
 
                     if out:
-                        await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiChoiceDelta(out)])]))
+                        await sink.emit(AiChoicesDeltas([AiChoiceDeltas([ContentAiDelta(out)])]))
 
                     if end:
                         break

ommlds/minichain/chat/{stream → choices/stream}/adapters.py

@@ -1,11 +1,11 @@
 from omlish import dataclasses as dc
 
-from ...services import Response
-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 .joining import AiChoiceDeltaJoiner
+from ....services import Response
+from ..services import ChatChoicesRequest
+from ..services import static_check_is_chat_choices_service
+from ..types import AiChoice
+from ..types import AiChoices
+from .joining import AiChoicesDeltaJoiner
 from .services import ChatChoicesOutputs
 from .services import ChatChoicesStreamOutputs
 from .services import ChatChoicesStreamService
@@ -23,7 +23,7 @@ class ChatChoicesStreamServiceChatChoicesService:
         AiChoices,
         ChatChoicesOutputs | ChatChoicesStreamOutputs,
     ]:
-        joiner = AiChoiceDeltaJoiner()
+        joiner = AiChoicesDeltaJoiner()
 
         async with (resp := await self.service.invoke(request)).v as it:  # noqa
             async for cs in it:

ommlds/minichain/chat/choices/stream/joining.py

@@ -0,0 +1,31 @@
+import typing as ta
+
+from omlish import check
+
+from ...messages import AiChat
+from ...stream.joining import AiDeltaJoiner
+from .types import AiChoiceDeltas
+
+
+##
+
+
+class AiChoicesDeltaJoiner:
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._seq = 0
+        self._channels: list[AiDeltaJoiner] = []
+
+    def add(self, choices: ta.Sequence[AiChoiceDeltas]) -> None:
+        if not self._seq:
+            check.empty(self._channels)
+            self._channels.extend(AiDeltaJoiner() for _ in range(len(choices)))
+
+        for chan, c in zip(self._channels, choices, strict=True):
+            chan.add(c.deltas)
+
+        self._seq += 1
+
+    def build(self) -> list[AiChat]:
+        return [list(chan.build()) for chan in self._channels]

ommlds/minichain/chat/choices/stream/services.py

@@ -0,0 +1,45 @@
+import abc
+import typing as ta
+
+from omlish import lang
+
+from ....registries.globals import register_type
+from ....services import Request
+from ....services import Service
+from ....stream.services import StreamResponse
+from ...messages import Chat
+from ..types import ChatChoicesOutputs
+from .types import AiChoicesDeltas
+from .types import ChatChoicesStreamOptions
+from .types import ChatChoicesStreamOutputs
+
+
+##
+
+
+ChatChoicesStreamRequest: ta.TypeAlias = Request[Chat, ChatChoicesStreamOptions]
+
+ChatChoicesStreamResponse: ta.TypeAlias = StreamResponse[
+    AiChoicesDeltas,
+    ChatChoicesOutputs,
+    ChatChoicesStreamOutputs,
+]
+
+# @omlish-manifest $.minichain.registries.manifests.RegistryTypeManifest
+ChatChoicesStreamService: ta.TypeAlias = Service[ChatChoicesStreamRequest, ChatChoicesStreamResponse]
+
+register_type(ChatChoicesStreamService, module=__name__)
+
+
+def static_check_is_chat_choices_stream_service[T: ChatChoicesStreamService](t: type[T]) -> type[T]:
+    return t
+
+
+##
+
+
+@static_check_is_chat_choices_stream_service
+class AbstractChatChoicesStreamService(lang.Abstract):
+    @abc.abstractmethod
+    def invoke(self, request: ChatChoicesStreamRequest) -> ta.Awaitable[ChatChoicesStreamResponse]:
+        raise NotImplementedError

ommlds/minichain/chat/choices/stream/types.py

@@ -0,0 +1,43 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ....stream.services import StreamOptions
+from ....types import Option
+from ....types import Output
+from ...stream.types import AiDeltas
+from ..types import ChatChoicesOptions
+
+
+##
+
+
+class ChatChoicesStreamOption(Option, lang.Abstract, lang.PackageSealed):
+    pass
+
+
+ChatChoicesStreamOptions: ta.TypeAlias = ChatChoicesStreamOption | StreamOptions | ChatChoicesOptions
+
+
+##
+
+
+class ChatChoicesStreamOutput(Output, lang.Abstract, lang.PackageSealed):
+    pass
+
+
+ChatChoicesStreamOutputs: ta.TypeAlias = ChatChoicesStreamOutput
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class AiChoiceDeltas(lang.Final):
+    deltas: AiDeltas
+
+
+@dc.dataclass(frozen=True)
+class AiChoicesDeltas(lang.Final):
+    choices: ta.Sequence[AiChoiceDeltas]

ommlds/minichain/chat/stream/_marshal.py

@@ -1,7 +1,7 @@
 from omlish import lang
 from omlish import marshal as msh
 
-from .types import AiChoiceDelta
+from .types import AiDelta
 
 
 ##
@@ -9,8 +9,8 @@ from .types import AiChoiceDelta
 
 @lang.static_init
 def _install_standard_marshaling() -> None:
-    acd_poly = msh.polymorphism_from_subclasses(AiChoiceDelta, naming=msh.Naming.SNAKE)
+    ad_poly = msh.polymorphism_from_subclasses(AiDelta, naming=msh.Naming.SNAKE)
     msh.install_standard_factories(
-        msh.PolymorphismMarshalerFactory(acd_poly),
-        msh.PolymorphismUnmarshalerFactory(acd_poly),
+        msh.PolymorphismMarshalerFactory(ad_poly),
+        msh.PolymorphismUnmarshalerFactory(ad_poly),
     )

ommlds/minichain/chat/stream/joining.py

@@ -8,40 +8,36 @@ 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
+from .types import AiDelta
+from .types import AiDeltas
+from .types import ContentAiDelta
+from .types import PartialToolUseAiDelta
+from .types import ToolUseAiDelta
 
 
 ##
 
 
-class AiChoiceDeltaJoiner:
+class AiDeltaJoiner:
     def __init__(self) -> None:
         super().__init__()
 
-        self._seq = 0
-        self._channels: list[AiChoiceDeltaJoiner._Channel] = []
+        self._deltas: list[AiDelta] = []
+        self._messages: list[AnyAiMessage] = []
 
-    class _Channel(ta.NamedTuple):
-        deltas: list[AiChoiceDelta]
-        messages: list[AnyAiMessage]
-
-    def _build_joined(self, deltas: ta.Sequence[AiChoiceDelta]) -> AnyAiMessage:
+    def _build_joined(self, deltas: ta.Sequence[AiDelta]) -> AnyAiMessage:
         dty = check.single(set(map(type, check.not_empty(deltas))))
 
-        if dty is ContentAiChoiceDelta:
-            cds = ta.cast(ta.Sequence[ContentAiChoiceDelta], deltas)
+        if dty is ContentAiDelta:
+            cds = ta.cast(ta.Sequence[ContentAiDelta], deltas)
             return AiMessage(''.join(check.isinstance(cd.c, str) for cd in cds))
 
-        elif dty is ToolUseAiChoiceDelta:
+        elif dty is ToolUseAiDelta:
             raise TypeError(dty)
 
-        elif dty is PartialToolUseAiChoiceDelta:
-            tds = ta.cast(ta.Sequence[PartialToolUseAiChoiceDelta], deltas)
-            for td in ta.cast(ta.Sequence[PartialToolUseAiChoiceDelta], deltas)[1:]:
+        elif dty is PartialToolUseAiDelta:
+            tds = ta.cast(ta.Sequence[PartialToolUseAiDelta], deltas)
+            for td in ta.cast(ta.Sequence[PartialToolUseAiDelta], deltas)[1:]:
                 check.none(td.id)
                 check.none(td.name)
 
@@ -57,19 +53,19 @@ class AiChoiceDeltaJoiner:
         else:
             raise TypeError(dty)
 
-    def _join_one(self, chan: _Channel) -> None:
-        if not chan.deltas:
+    def _maybe_join(self) -> None:
+        if not self._deltas:
             return
 
-        chan.messages.append(self._build_joined(chan.deltas))
-        chan.deltas.clear()
+        self._messages.append(self._build_joined(self._deltas))
+        self._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)
+    def _add_one(self, d: AiDelta) -> None:
+        if self._deltas and type(self._deltas[0]) is not type(d):
+            self._maybe_join()
 
-        if isinstance(d, ToolUseAiChoiceDelta):
-            chan.messages.append(ToolUseMessage(ToolUse(
+        if isinstance(d, ToolUseAiDelta):
+            self._messages.append(ToolUseMessage(ToolUse(
                 id=d.id,
                 name=check.not_none(d.name),
                 args=d.args or {},
@@ -77,21 +73,13 @@ class AiChoiceDeltaJoiner:
             )))
 
         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._deltas.append(d)
 
-        self._seq += 1
+    def add(self, deltas: AiDeltas) -> None:
+        for d in deltas:
+            self._add_one(d)
 
-    def build(self) -> list[AiChat]:
-        for chan in self._channels:
-            self._join_one(chan)
+    def build(self) -> AiChat:
+        self._maybe_join()
 
-        return [list(chan.messages) for chan in self._channels]
+        return list(self._messages)

ommlds/minichain/chat/stream/services.py

@@ -7,39 +7,39 @@ from ...registries.globals import register_type
 from ...services import Request
 from ...services import Service
 from ...stream.services import StreamResponse
-from ..choices.types import ChatChoicesOutputs
 from ..messages import Chat
-from .types import AiChoicesDeltas
-from .types import ChatChoicesStreamOptions
-from .types import ChatChoicesStreamOutputs
+from ..types import ChatOutputs
+from .types import AiDeltas
+from .types import ChatStreamOptions
+from .types import ChatStreamOutputs
 
 
 ##
 
 
-ChatChoicesStreamRequest: ta.TypeAlias = Request[Chat, ChatChoicesStreamOptions]
+ChatStreamRequest: ta.TypeAlias = Request[Chat, ChatStreamOptions]
 
-ChatChoicesStreamResponse: ta.TypeAlias = StreamResponse[
-    AiChoicesDeltas,
-    ChatChoicesOutputs,
-    ChatChoicesStreamOutputs,
+ChatStreamResponse: ta.TypeAlias = StreamResponse[
+    AiDeltas,
+    ChatOutputs,
+    ChatStreamOutputs,
 ]
 
 # @omlish-manifest $.minichain.registries.manifests.RegistryTypeManifest
-ChatChoicesStreamService: ta.TypeAlias = Service[ChatChoicesStreamRequest, ChatChoicesStreamResponse]
+ChatStreamService: ta.TypeAlias = Service[ChatStreamRequest, ChatStreamResponse]
 
-register_type(ChatChoicesStreamService, module=__name__)
+register_type(ChatStreamService, module=__name__)
 
 
-def static_check_is_chat_choices_stream_service[T: ChatChoicesStreamService](t: type[T]) -> type[T]:
+def static_check_is_chat_stream_service[T: ChatStreamService](t: type[T]) -> type[T]:
     return t
 
 
 ##
 
 
-@static_check_is_chat_choices_stream_service
-class AbstractChatChoicesStreamService(lang.Abstract):
+@static_check_is_chat_stream_service
+class AbstractChatStreamService(lang.Abstract):
     @abc.abstractmethod
-    def invoke(self, request: ChatChoicesStreamRequest) -> ta.Awaitable[ChatChoicesStreamResponse]:
+    def invoke(self, request: ChatStreamRequest) -> ta.Awaitable[ChatStreamResponse]:
         raise NotImplementedError

ommlds/minichain/chat/stream/types.py

@@ -8,7 +8,7 @@ from ...content.types import Content
 from ...stream.services import StreamOptions
 from ...types import Option
 from ...types import Output
-from ..choices.types import ChatChoicesOptions
+from ..types import ChatOptions
 
 
 msh.register_global_module_import('._marshal', __package__)
@@ -17,36 +17,39 @@ msh.register_global_module_import('._marshal', __package__)
 ##
 
 
-class ChatChoicesStreamOption(Option, lang.Abstract, lang.PackageSealed):
+class ChatStreamOption(Option, lang.Abstract, lang.PackageSealed):
     pass
 
 
-ChatChoicesStreamOptions: ta.TypeAlias = ChatChoicesStreamOption | StreamOptions | ChatChoicesOptions
+ChatStreamOptions: ta.TypeAlias = ChatStreamOption | StreamOptions | ChatOptions
 
 
 ##
 
 
-class ChatChoicesStreamOutput(Output, lang.Abstract, lang.PackageSealed):
+class ChatStreamOutput(Output, lang.Abstract, lang.PackageSealed):
     pass
 
 
-ChatChoicesStreamOutputs: ta.TypeAlias = ChatChoicesStreamOutput
+ChatStreamOutputs: ta.TypeAlias = ChatStreamOutput
 
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class AiChoiceDelta(lang.Sealed, lang.Abstract):
+class AiDelta(lang.Sealed, lang.Abstract):
     pass
 
 
+AiDeltas: ta.TypeAlias = ta.Sequence[AiDelta]
+
+
 #
 
 
 @dc.dataclass(frozen=True)
-class ContentAiChoiceDelta(AiChoiceDelta, lang.Final):
+class ContentAiDelta(AiDelta, lang.Final):
     c: Content
 
 
@@ -54,29 +57,16 @@ class ContentAiChoiceDelta(AiChoiceDelta, lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-class AnyToolUseAiChoiceDelta(AiChoiceDelta, lang.Abstract):
+class AnyToolUseAiDelta(AiDelta, lang.Abstract):
     id: str | None = None
     name: str | None = None
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-class ToolUseAiChoiceDelta(AnyToolUseAiChoiceDelta, lang.Final):
+class ToolUseAiDelta(AnyToolUseAiDelta, lang.Final):
     args: ta.Mapping[str, ta.Any] | None = None
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-class PartialToolUseAiChoiceDelta(AnyToolUseAiChoiceDelta, lang.Final):
+class PartialToolUseAiDelta(AnyToolUseAiDelta, lang.Final):
     raw_args: ta.Any | None = None
-
-
-#
-
-
-@dc.dataclass(frozen=True)
-class AiChoiceDeltas(lang.Final):
-    deltas: ta.Sequence[AiChoiceDelta]
-
-
-@dc.dataclass(frozen=True)
-class AiChoicesDeltas(lang.Final):
-    choices: ta.Sequence[AiChoiceDeltas]

{ommlds-0.0.0.dev477.dist-info → ommlds-0.0.0.dev479.dist-info}/METADATA

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

{ommlds-0.0.0.dev477.dist-info → ommlds-0.0.0.dev479.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=8dexRefvFsIfCdj0aNLHnjBb_Qn14SRsImSkiO-R-G8,25355
+ommlds/.omlish-manifests.json,sha256=uNauTZ9FpiirIw1ElVuf66UOCUR-K7BN8lfCPUNnINg,25714
 ommlds/__about__.py,sha256=5ekfRjb6SiK6o6SAusykyPQ_oxy46_IEga7nD0EL0cI,1839
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/_hacks/__init__.py,sha256=ajfw7dMKH8UuloeQ5MSxWwgAmdWf2v8gm-K3uLP9wtY,196
@@ -123,10 +123,10 @@ ommlds/cli/sessions/chat/chat/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 ommlds/cli/sessions/chat/chat/ai/configs.py,sha256=zIth9PKJ9u68Mblctraj2HQcEuiztKGF5sPeJZ-OABw,182
 ommlds/cli/sessions/chat/chat/ai/inject.py,sha256=hyYIL7v_aFFtOZGRKwwPqu_A0Uox1sW_m4twrz2aahI,2482
 ommlds/cli/sessions/chat/chat/ai/injection.py,sha256=2O_ELMusxQsYaB2oqvzjYpZQzjshocJup7Z5unzoUIY,404
-ommlds/cli/sessions/chat/chat/ai/rendering.py,sha256=SC_0l059ZNvNgpO3uivmJLRbG2YuDynvAkz92dcanIw,2293
-ommlds/cli/sessions/chat/chat/ai/services.py,sha256=W70n0AyjaHqq3MDiYTs4Tyczr0QPCyavxUQL2b4Dpog,2511
+ommlds/cli/sessions/chat/chat/ai/rendering.py,sha256=cMSO-ibCaz_zbeumVo-IncAbTM84UeuAsRr9jaw3IxM,2275
+ommlds/cli/sessions/chat/chat/ai/services.py,sha256=OVYwO1tsfHyHgPHfNFkd1Dn0x9cB3j-bfA30oYWf1xA,2506
 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/ai/types.py,sha256=v92Z6WiU67O2Z9wyWGHdIxGwYLeOhvFVGd_h9coT1tM,744
 ommlds/cli/sessions/chat/chat/state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/chat/state/configs.py,sha256=VMrqC-2dE8lXZmT1dBgUUReS0FDQWzD0U6thSyjOOZM,192
 ommlds/cli/sessions/chat/chat/state/inject.py,sha256=PXGn3Q6wuDHEID0D7p8xh_w2H1TGQpusR-zu4MmGUsc,1107
@@ -175,7 +175,7 @@ ommlds/cli/state/storage.py,sha256=h7wcWkJaQ17nIS2GtBOk4fiu6ZyPLtmKXwVgpVN-hAg,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=uruXAyfKzg_Ed3ZPkiNVopZugZV62-eqPOT1EtxljiA,11042
+ommlds/minichain/__init__.py,sha256=5dwCPjaHhEDFOW8HIiC67eCWcOBHcsWUeKKfY5kyxAk,11410
 ommlds/minichain/_marshal.py,sha256=n9PGWrHhvAmGIc7KDOYt3IF9Z6G0ncXskyICTp3Ji6k,1923
 ommlds/minichain/_typedvalues.py,sha256=Vl1Edt5khC0e5RPFBPmPCxn0IzrfVd0NHzAjAN2E6Kc,2183
 ommlds/minichain/completion.py,sha256=lQ0LfCIYZsvDqteHhhDIv16D2_gn_xMfEL0ouywE5Yo,1033
@@ -200,22 +200,22 @@ ommlds/minichain/backends/impls/anthropic/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 ommlds/minichain/backends/impls/anthropic/chat.py,sha256=-qGr_DZgGe-dr1AKb6WLtCq_I2E9635X1rQZSJqOb04,4318
 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=NNBFb0sMId9yWua3fkAMZ-qYhQN9nLrXiO4DViR77YI,8790
+ommlds/minichain/backends/impls/anthropic/stream.py,sha256=jxKzytoYJLK9JftihGhWTcFIoXFgouQR7Yu5Q1j_ku8,8794
 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/dummy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/dummy/chat.py,sha256=_FYMplztZqXqjiFW3dkpytDRX1G4kw_zcBvJevkH4zE,2255
+ommlds/minichain/backends/impls/dummy/chat.py,sha256=FUTvNPWmb4Hm-axglvPiqbvLwE7sajHOM5H7j9Qj2-c,2283
 ommlds/minichain/backends/impls/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/google/chat.py,sha256=lGb5blGLlcBlt9xeDZJvbh5SlV7fgfezd5_As_SPBXo,6499
 ommlds/minichain/backends/impls/google/names.py,sha256=HxHJ31HeKZg6aW1C_Anqp-gamCXpq9pOdKj8_yVgE8Y,871
 ommlds/minichain/backends/impls/google/search.py,sha256=y5_6seSRU8CFnLA_Ja8XEMbIBWSgwBzE1iBf-qyz0tA,3427
-ommlds/minichain/backends/impls/google/stream.py,sha256=ITownhKSOJB4IG23wWZJepUImSM6vJsDMOM9W1STpwU,8013
+ommlds/minichain/backends/impls/google/stream.py,sha256=AT8qbP0EqJUnf-D45aTbEQ0h5lvgtIK6XKki0t8RkZE,8029
 ommlds/minichain/backends/impls/google/tools.py,sha256=Tty0gsyx7-PbeoNqMuql_ewQ6q-ZsDaDdsD5ShinGVY,5089
 ommlds/minichain/backends/impls/groq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/groq/chat.py,sha256=XXJznM6h2fBBtrY8MggMUNJf8thyFTM3p1XzFImwkAk,2743
 ommlds/minichain/backends/impls/groq/names.py,sha256=RnvBSytxPF1a9Bj_OPVELuD1nAKJnJrG3ZwJfYo6Szs,1075
-ommlds/minichain/backends/impls/groq/protocol.py,sha256=3sLC8wX0jnUOSMf3WqXH8zKT8RCSFKrbx5VyqaPViUQ,5242
-ommlds/minichain/backends/impls/groq/stream.py,sha256=in62MWfQLfXRVPpoFdJyLNGZ_bRfXymmVTdQpEuAfCU,5092
+ommlds/minichain/backends/impls/groq/protocol.py,sha256=FPydA4ftMhXFLEfYjmHsmNdBoM4gcEthvqmeX5yB3pc,5214
+ommlds/minichain/backends/impls/groq/stream.py,sha256=5PZHrs_QNyKofJClKq5R5aOsq-H26UeWH7uncbJGrmI,5124
 ommlds/minichain/backends/impls/huggingface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/huggingface/configs.py,sha256=6jsBtPNXOP57PcpxNTVLGWLc-18Iwn_lDbGouwCJTIQ,258
 ommlds/minichain/backends/impls/huggingface/repos.py,sha256=8BDxJmra9elSQL2vzp2nr2p4Hpq56A3zTk7hTTnfJU4,861
@@ -223,28 +223,28 @@ ommlds/minichain/backends/impls/llamacpp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 ommlds/minichain/backends/impls/llamacpp/chat.py,sha256=J6Jslx9atAtWvLdrVtvRboQUBzRX7Z5aHlo0dK5X78A,5649
 ommlds/minichain/backends/impls/llamacpp/completion.py,sha256=oJ2I6wUoIPXYLm9Vc7dwOPgqbevatTjNBZ-jXeM24tQ,2372
 ommlds/minichain/backends/impls/llamacpp/format.py,sha256=fcLMwk7r7FbNrYCH39G3fDRInKvlPIqcoxyLj95CooA,778
-ommlds/minichain/backends/impls/llamacpp/stream.py,sha256=uzrXr2HhshgFe3Z0g8KTPc6Dr2kPsyxZabIy2d6IOBg,3547
+ommlds/minichain/backends/impls/llamacpp/stream.py,sha256=GP3RJsjLXCW2zxvn17BqRg5jbuiNMGdHz06enfsLp2k,3575
 ommlds/minichain/backends/impls/mlx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/mlx/chat.py,sha256=sMlhgiFZrxAC-kKkLSJ6c-2uJn0IHZXH4EiPET_-CKI,7458
+ommlds/minichain/backends/impls/mlx/chat.py,sha256=jV3bVvXx1oGaBYTbODUIpPX4k0Vmjj4SX7x3qQMluyM,7486
 ommlds/minichain/backends/impls/ollama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/ollama/chat.py,sha256=agnJcOwJGebSiV5TG0UmVFYGCc7hEpt7FM73rtyF8gk,6609
+ommlds/minichain/backends/impls/ollama/chat.py,sha256=zBKc0CXVEuO0ntLi38gRK2S5F_FqXdHS4WJKDIaos-g,6637
 ommlds/minichain/backends/impls/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/openai/chat.py,sha256=G1IK94PwB16rYCkRos9JEuiAu1GgCK4CnZFOIShhpig,2856
 ommlds/minichain/backends/impls/openai/completion.py,sha256=4Mi4Zvrq5fCqUd0asL3WiCbCdmxOdo0NFkoZMfdsYXY,1939
 ommlds/minichain/backends/impls/openai/embedding.py,sha256=BNtvKYLTsnQwQR9Tv3Fr8zCYN1kr1UNdJ15lcsjz6X0,1765
-ommlds/minichain/backends/impls/openai/format.py,sha256=teGX8mNU3sXNWP4YWGD8d59M4X9_r75ImSzfTJgtNCM,7351
-ommlds/minichain/backends/impls/openai/names.py,sha256=4dzfoTKYrY0JuSIhmCMloZ2nujR69jyLbcJE9eMAYDE,1518
-ommlds/minichain/backends/impls/openai/stream.py,sha256=UWEjMJ8tzgyXRU2nXi9r6M8Q3if0ueQHFhZdJDO0UEo,5420
+ommlds/minichain/backends/impls/openai/format.py,sha256=8ZiS503H3QwOvc4_21IiS71awtaQpUv38pfNaMYIFeE,7316
+ommlds/minichain/backends/impls/openai/names.py,sha256=PB5as6YO1ijLKXGvpyxzP9Z0_jKsOIpJnAsK5hogOKI,1516
+ommlds/minichain/backends/impls/openai/stream.py,sha256=bsZeGUepqOl9AcN44kWk03V6q-v1ewBCfZqb_MJEfxg,5454
 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=Y3Lp08Sb0YUPAxEciexOUm0uyoJnhbH5pWT9buclx6Y,4916
+ommlds/minichain/backends/impls/tinygrad/chat.py,sha256=OBPkyY4FyUWT-KwumAPSubqXsgWeaa31mp-j-RT7crU,4944
 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
 ommlds/minichain/backends/impls/transformers/sentence.py,sha256=1bFJ-ND3MOkj7mNsPuISrQCpqTs7npmmNmYcc2go-Fk,1393
 ommlds/minichain/backends/impls/transformers/tokens.py,sha256=uS3-IWOJRUMBfPDVRrp3SCaXdE1yzEdKHQcyv0JZQIw,2089
-ommlds/minichain/backends/impls/transformers/transformers.py,sha256=laM8G2SAE6jUjnHkeZsbWxS2KJF4efi-35aBlRBzIsE,9053
+ommlds/minichain/backends/impls/transformers/transformers.py,sha256=irBOBBQlZyv2M63YIW01VJvXXzZwn30ddRbONIKDd44,9081
 ommlds/minichain/backends/strings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/strings/manifests.py,sha256=kmlanVUAZqIh0P95Mm8H20e8ib3gEgYHHUlkCXDQGFk,413
 ommlds/minichain/backends/strings/parsing.py,sha256=Etmk04BnKvCMtGg4AgbvxsPGvfRcLldLxpdpxcozdNk,1779
@@ -262,12 +262,16 @@ ommlds/minichain/chat/choices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 ommlds/minichain/chat/choices/adapters.py,sha256=Keroaj0B5YEYPF3k0fOQK6JUZnM1XVFThGB5Uv689Sc,629
 ommlds/minichain/chat/choices/services.py,sha256=p_FsCZEsGJun8epzAHoeNdjwJ86ZwihIhvFMsfdafeA,1041
 ommlds/minichain/chat/choices/types.py,sha256=OPnMUp0KUKGGPJKsQZiXUtd8Z9b_JnhOy7SXKL6QDWU,725
+ommlds/minichain/chat/choices/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/minichain/chat/choices/stream/adapters.py,sha256=f3QCjJ1fDzDzLB-tKmxG-tr15lFMCbiLjjF3g2ew5XA,1048
+ommlds/minichain/chat/choices/stream/joining.py,sha256=9L40pXj6wL3KVrOdCd4Jhj3DyltvM-Z7xkLUnrzDioE,757
+ommlds/minichain/chat/choices/stream/services.py,sha256=9Jc6Hf9Iphepzksll29Skv7IlnawJIutQTitPJPoAD0,1249
+ommlds/minichain/chat/choices/stream/types.py,sha256=V1QTk1XDcPyfpOpYuDH-cj6swhr4-urpUH9eFGZNfjY,808
 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=3hKo3-MLtVIB-Nhdlxt17LP9vZESr-2fBZQ3Yr6l_Ps,1077
-ommlds/minichain/chat/stream/joining.py,sha256=N0vAg1UJbwnXl5dRkmb-EP5_MfhRgF0liZ45OEDY0XA,2989
-ommlds/minichain/chat/stream/services.py,sha256=TxNEOm85QEFYtKb59q_uP6eSNh75v1fF-IpsJjhY4to,1252
-ommlds/minichain/chat/stream/types.py,sha256=kpHsWLNHk7hmaNPDSCqLH-ECSAiz83lRfr00LhSWb5U,1589
+ommlds/minichain/chat/stream/_marshal.py,sha256=eUdDrjPKYKwgaNrntZsuquB121pcDcW9lyNRy8bqVsw,382
+ommlds/minichain/chat/stream/joining.py,sha256=U-z1MJTIuw0LIJCUQ80RcGROpPgbqG6FHVjuTe7j57s,2416
+ommlds/minichain/chat/stream/services.py,sha256=Ikaf8fofoPW6UM3MajAGgdc0U6VU8jhn0F6r-FX5XFc,1102
+ommlds/minichain/chat/stream/types.py,sha256=l_fQZr2uD-RugYqCH4KbCh6XksDJHu_mfDWtFT6IRFI,1308
 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
@@ -408,9 +412,9 @@ ommlds/wiki/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ommlds/wiki/utils/io.py,sha256=UKgDJGtmpnWvIqVd2mJc2QNPOqlToEY1GEveNp6_pMo,7088
 ommlds/wiki/utils/progress.py,sha256=EhvKcMFYtsarCQhIahlO6f0SboyAKP3UwUyrnVnP-Vk,3222
 ommlds/wiki/utils/xml.py,sha256=sNJNkZ9rT8B-kJMO6bRz8J1USy4fyPx0m2PwTX7vxYY,3846
-ommlds-0.0.0.dev477.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev477.dist-info/METADATA,sha256=ncQdlJg91UEeoFaW8OiTM2ipyNxyVbm4oHwycfYcSHM,3344
-ommlds-0.0.0.dev477.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev477.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev477.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev477.dist-info/RECORD,,
+ommlds-0.0.0.dev479.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev479.dist-info/METADATA,sha256=IZv1huK95dvim3UTt-vNJzMqKpnw-jGWT38Lj32xv9o,3344
+ommlds-0.0.0.dev479.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev479.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev479.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev479.dist-info/RECORD,,