ommlds 0.0.0.dev336__tar.gz → 0.0.0.dev338__tar.gz

{ommlds-0.0.0.dev336/ommlds.egg-info → ommlds-0.0.0.dev338}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev336
+Version: 0.0.0.dev338
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev336
-Requires-Dist: omlish==0.0.0.dev336
+Requires-Dist: omdev==0.0.0.dev338
+Requires-Dist: omlish==0.0.0.dev338
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.26; extra == "all"

{ommlds-0.0.0.dev336 → ommlds-0.0.0.dev338}/ommlds/minichain/__init__.py

@@ -2,6 +2,10 @@
 
 ##
 
+from .chat.choices.adapters import (  # noqa
+    ChatChoicesServiceChatService,
+)
+
 from .chat.choices.services import (  # noqa
     ChatChoicesRequestOption,
     ChatChoicesRequestOptions,
@@ -21,6 +25,10 @@ from .chat.choices.types import (  # noqa
     AiChoices,
 )
 
+from .chat.stream.adapters import (  # noqa
+    ChatChoicesStreamServiceChatChoicesService,
+)
+
 from .chat.stream.services import (  # noqa
     ChatChoicesStreamRequestOption,
     ChatChoicesStreamRequestOptions,
@@ -35,6 +43,18 @@ from .chat.stream.services import (  # noqa
     AbstractChatChoicesStreamService,
 )
 
+from .chat.transforms.base import (  # noqa
+    MessageTransform,
+
+    ChatTransform,
+
+    MessageTransformChatTransform,
+)
+
+from .chat.transforms.uuids import (  # noqa
+    UuidAddingMessageTransform,
+)
+
 from .chat.formats import (  # noqa
     JSON_RESPONSE_FORMAT,
     JsonResponseFormat,

{ommlds-0.0.0.dev336 → ommlds-0.0.0.dev338}/ommlds/minichain/backends/openai/stream.py

@@ -88,6 +88,10 @@ class OpenaiChatChoicesStreamService(ChatChoicesStreamService):
 
                                 check.state(sj['object'] == 'chat.completion.chunk')
 
+                                # FIXME: stop reason
+                                if not sj['choices']:
+                                    continue
+
                                 yield [
                                     AiChoice(rh.build_ai_message(choice['delta']))
                                     for choice in sj['choices']

ommlds-0.0.0.dev338/ommlds/minichain/chat/choices/adapters.py

@@ -0,0 +1,25 @@
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ...services import Response
+from ..messages import AiMessage
+from ..services import ChatRequest
+from ..services import ChatService
+from .services import ChatChoicesResponseOutputs
+from .services import ChatChoicesService
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ChatChoicesServiceChatService:
+    service: ChatChoicesService
+
+    def invoke(self, request: ChatRequest) -> Response[AiMessage, ChatChoicesResponseOutputs]:
+        resp = self.service.invoke(request)
+        return Response(check.single(resp.v).m, resp.outputs)
+
+
+lang.static_check_issubclass[ChatService](ChatChoicesServiceChatService)

{ommlds-0.0.0.dev336 → ommlds-0.0.0.dev338}/ommlds/minichain/chat/choices/types.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - ChatResponseOutputs really go on each AiChoice...
+"""
 import typing as ta
 
 from omlish import dataclasses as dc

ommlds-0.0.0.dev338/ommlds/minichain/chat/stream/adapters.py

@@ -0,0 +1,69 @@
+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
+from ..choices.services import ChatChoicesService
+from ..choices.types import AiChoice
+from ..choices.types import AiChoices
+from ..messages import AiMessage
+from ..messages import ToolExecRequest
+from .services import ChatChoicesResponseOutputs
+from .services import ChatChoicesStreamResponseOutputs
+from .services import ChatChoicesStreamService
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ChatChoicesStreamServiceChatChoicesService:
+    service: ChatChoicesStreamService
+
+    class _Choice(ta.NamedTuple):
+        parts: list[str]
+        trs: list[ToolExecRequest]
+
+    def invoke(self, request: ChatChoicesRequest) -> Response[
+        AiChoices,
+        ChatChoicesResponseOutputs | ChatChoicesStreamResponseOutputs,
+    ]:
+        lst: list[ChatChoicesStreamServiceChatChoicesService._Choice] = []
+
+        resp = self.service.invoke(request)
+        with resp.v as resp_v:
+            i = -1  # noqa
+            for i, cs in enumerate(resp_v):
+                if i == 0:
+                    for c in cs:
+                        m = c.m
+                        lst.append(self._Choice(
+                            [m.s] if m.s is not None else [],
+                            list(m.tool_exec_requests or []),
+                        ))
+
+                else:
+                    for ch, c in zip(lst, cs, strict=True):
+                        m = c.m
+                        if m.s is not None:
+                            ch.parts.append(m.s)
+                        if m.tool_exec_requests:
+                            ch.trs.extend(m.tool_exec_requests)
+
+        check.state(resp_v.is_done)
+
+        ret: list[AiChoice] = []
+        for ch in lst:
+            ret.append(AiChoice(AiMessage(
+                ''.join(ch.parts) if ch.parts else None,
+                ch.trs or None,
+            )))
+
+        # FIXME: outputs lol
+        return Response(ret)
+
+
+lang.static_check_issubclass[ChatChoicesService](ChatChoicesStreamServiceChatChoicesService)

ommlds-0.0.0.dev338/ommlds/minichain/chat/transforms/base.py

@@ -0,0 +1,36 @@
+import abc
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ..messages import Chat
+from ..messages import Message
+
+
+##
+
+
+class MessageTransform(lang.Abstract):
+    @abc.abstractmethod
+    def transform_message(self, message: Message) -> Message:
+        raise NotImplementedError
+
+
+##
+
+
+class ChatTransform(lang.Abstract):
+    @abc.abstractmethod
+    def transform_chat(self, chat: Chat) -> Chat:
+        raise NotImplementedError
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class MessageTransformChatTransform(ChatTransform):
+    inner: MessageTransform
+
+    def transform_chat(self, chat: Chat) -> Chat:
+        return [self.inner.transform_message(m) for m in chat]

ommlds-0.0.0.dev338/ommlds/minichain/chat/transforms/uuids.py

@@ -0,0 +1,21 @@
+import typing as ta
+import uuid
+
+from omlish import dataclasses as dc
+
+from ...metadata import Uuid
+from ..messages import Message
+from .base import MessageTransform
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class UuidAddingMessageTransform(MessageTransform):
+    uuid_factory: ta.Callable[[], uuid.UUID] = dc.field(default_factory=lambda: uuid.uuid4)
+
+    def transform_message(self, m: Message) -> Message:
+        if Uuid not in m.metadata:
+            m = m.with_metadata(Uuid(self.uuid_factory()))
+        return m

{ommlds-0.0.0.dev336 → ommlds-0.0.0.dev338/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev336
+Version: 0.0.0.dev338
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev336
-Requires-Dist: omlish==0.0.0.dev336
+Requires-Dist: omdev==0.0.0.dev338
+Requires-Dist: omlish==0.0.0.dev338
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.26; extra == "all"

{ommlds-0.0.0.dev336 → ommlds-0.0.0.dev338}/ommlds.egg-info/SOURCES.txt

@@ -144,10 +144,15 @@ ommlds/minichain/chat/services.py
 ommlds/minichain/chat/templating.py
 ommlds/minichain/chat/tools.py
 ommlds/minichain/chat/choices/__init__.py
+ommlds/minichain/chat/choices/adapters.py
 ommlds/minichain/chat/choices/services.py
 ommlds/minichain/chat/choices/types.py
 ommlds/minichain/chat/stream/__init__.py
+ommlds/minichain/chat/stream/adapters.py
 ommlds/minichain/chat/stream/services.py
+ommlds/minichain/chat/transforms/__init__.py
+ommlds/minichain/chat/transforms/base.py
+ommlds/minichain/chat/transforms/uuids.py
 ommlds/minichain/content/__init__.py
 ommlds/minichain/content/_marshal.py
 ommlds/minichain/content/content.py

{ommlds-0.0.0.dev336 → ommlds-0.0.0.dev338}/ommlds.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev336
-omlish==0.0.0.dev336
+omdev==0.0.0.dev338
+omlish==0.0.0.dev338
 
 [all]
 llama-cpp-python~=0.3

{ommlds-0.0.0.dev336 → ommlds-0.0.0.dev338}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev336'
+version = '0.0.0.dev338'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev336',
-    'omlish == 0.0.0.dev336',
+    'omdev == 0.0.0.dev338',
+    'omlish == 0.0.0.dev338',
 ]
 
 [project.optional-dependencies]