ommlds 0.0.0.dev551__tar.gz → 0.0.0.dev552__tar.gz

{ommlds-0.0.0.dev551/ommlds.egg-info → ommlds-0.0.0.dev552}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev551
+Version: 0.0.0.dev552
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,9 +14,9 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev551
+Requires-Dist: omlish==0.0.0.dev552
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev551; extra == "all"
+Requires-Dist: omdev==0.0.0.dev552; extra == "all"
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.31; sys_platform == "darwin" and extra == "all"
 Requires-Dist: mlx-lm~=0.31; sys_platform == "darwin" and extra == "all"
@@ -40,7 +40,7 @@ Requires-Dist: mwparserfromhell~=0.7; extra == "all"
 Requires-Dist: wikitextparser~=0.56; extra == "all"
 Requires-Dist: lxml>=5.3; python_version < "3.13" and extra == "all"
 Provides-Extra: omdev
-Requires-Dist: omdev==0.0.0.dev551; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev552; extra == "omdev"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.31; sys_platform == "darwin" and extra == "backends"

ommlds-0.0.0.dev552/ommlds/cli/modes/chat/facades/chat.py

@@ -0,0 +1,17 @@
+import abc
+import typing as ta
+
+from omlish import lang
+
+
+##
+
+
+class UserInputSenderGetter(lang.AsyncCachedFunc0['UserInputSender']):
+    pass
+
+
+class UserInputSender(lang.Abstract):
+    @abc.abstractmethod
+    def send_user_input(self, text: str, *, no_echo: bool = False) -> ta.Awaitable[None]:
+        raise NotImplementedError

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/facades/commands/inject.py

@@ -9,6 +9,7 @@ from .injection import commands
 with lang.auto_proxy_import(globals()):
     from . import manager as _manager
     from . import permissions as _permissions
+    from . import send as _send
     from . import simple as _simple
 
 
@@ -31,9 +32,10 @@ def bind_commands(cfg: CommandsConfig = CommandsConfig()) -> inj.Elements:
     #
 
     for cmd_cls in [
+        _permissions.PermissionsCommand,
+        _send.SendCommand,
         _simple.EchoCommand,
         _simple.QuitCommand,
-        _permissions.PermissionsCommand,
     ]:
         els.extend([
             inj.bind(cmd_cls, singleton=True),
@@ -45,7 +47,7 @@ def bind_commands(cfg: CommandsConfig = CommandsConfig()) -> inj.Elements:
     if aex := cfg.autoexec:
         async def run_autoexec_commands(cm: _manager.CommandsManager) -> None:
             for cmd in aex:
-                await cm.run_command_text(cmd)
+                await cm.run_command_text(cmd.removeprefix('/'))
 
         els.append(
             mc.drivers.injection.phase_callbacks().bind_item(to_fn=inj.target(

ommlds-0.0.0.dev552/ommlds/cli/modes/chat/facades/commands/send.py

@@ -0,0 +1,30 @@
+from omlish.argparse import all as argparse
+
+from ..chat import UserInputSenderGetter
+from .base import Command
+
+
+##
+
+
+class SendCommand(Command):
+    def __init__(
+            self,
+            *,
+            user_input_sender: UserInputSenderGetter,
+    ) -> None:
+        super().__init__()
+
+        self._user_input_sender = user_input_sender
+
+    def _configure_parser(self, parser: argparse.ArgumentParser) -> None:
+        super()._configure_parser(parser)
+
+        parser.add_argument('-q', '--quiet', action='store_true')
+        parser.add_argument('message')
+
+    async def _run_args(self, ctx: Command.Context, args: argparse.Namespace) -> None:
+        await (await self._user_input_sender()).send_user_input(
+            args.message,
+            no_echo=args.quiet,
+        )

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/facades/facade.py

@@ -24,12 +24,9 @@ class ChatFacade:
             text: str,
             *,
             input_uuid: uuid.UUID | None = None,
-            output_uuid: uuid.UUID | None = None,
     ) -> None:
         if input_uuid is None:
             input_uuid = uuid.uuid4()
-        if output_uuid is None:
-            output_uuid = uuid.uuid4()
 
         if text.startswith('/'):
             await self._commands.run_command_text(text[1:])
@@ -39,6 +36,5 @@ class ChatFacade:
 
             await self._driver.do_action(mc.drivers.SendUserMessagesAction(
                 [msg],
-                ai_message_uuid=output_uuid,
                 uuid=input_uuid,
             ))

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/facades/inject.py

@@ -5,6 +5,7 @@ from .configs import FacadeConfig
 
 
 with lang.auto_proxy_import(globals()):
+    from . import chat as _chat
     from . import facade as _facade
     from . import ui as _ui
     from .commands import inject as _commands
@@ -24,6 +25,12 @@ def bind_facade(cfg: FacadeConfig = FacadeConfig()) -> inj.Elements:
 
     #
 
+    els.extend([
+        inj.bind_async_late(_chat.UserInputSender, _chat.UserInputSenderGetter),
+    ])
+
+    #
+
     els.append(inj.bind(_facade.ChatFacade, singleton=True))
 
     #

ommlds-0.0.0.dev552/ommlds/cli/modes/chat/interfaces/bare/chat.py

@@ -0,0 +1,28 @@
+from ...facades.chat import UserInputSender
+from ...facades.facade import ChatFacade
+
+
+##
+
+
+class BareUserInputSender(UserInputSender):
+    def __init__(
+            self,
+            *,
+            facade: ChatFacade,
+    ) -> None:
+        super().__init__()
+
+        self._facade = facade
+
+    async def send_user_input(self, text: str, *, no_echo: bool = False) -> None:
+        if not no_echo:
+            print('> ' + text)
+
+        print()
+        print('<')
+        print()
+
+        await self._facade.handle_user_input(text)
+
+        print()

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/interfaces/bare/inject.py

@@ -9,7 +9,9 @@ from .configs import BareInterfaceConfig
 with lang.auto_proxy_import(globals()):
     from .....interfaces.bare.inputs import asyncs as _inputs_asyncs
     from .....interfaces.bare.inputs import sync as _inputs_sync
+    from ...facades import chat as _facades_chat
     from ...facades import ui as _facades_ui
+    from . import chat as _chat
     from . import interactive as _interactive
     from . import oneshot as _oneshot
     from . import tools as _tools
@@ -59,6 +61,13 @@ def bind_bare(cfg: BareInterfaceConfig = BareInterfaceConfig()) -> inj.Elements:
 
     #
 
+    els.extend([
+        inj.bind(_chat.BareUserInputSender, singleton=True),
+        inj.bind(_facades_chat.UserInputSender, to_key=_chat.BareUserInputSender),
+    ])
+
+    #
+
     els.extend([
         inj.bind(_facades_ui.PrintMessageDisplayer, singleton=True),
         inj.bind(_facades_ui.UiMessageDisplayer, to_key=_facades_ui.PrintMessageDisplayer),

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/interfaces/bare/interactive.py

@@ -4,7 +4,7 @@ from ...... import minichain as mc
 from .....interfaces.bare.inputs.asyncs import AsyncStringInput
 from .....interfaces.bare.inputs.asyncs import SyncAsyncStringInput
 from .....interfaces.bare.inputs.sync import InputSyncStringInput
-from ...facades.facade import ChatFacade
+from ...facades.chat import UserInputSender
 from ..base import ChatInterface
 
 
@@ -18,13 +18,13 @@ class InteractiveBareChatInterface(ChatInterface):
             self,
             *,
             driver: 'mc.drivers.Driver',
-            facade: ChatFacade,
+            user_input_sender: UserInputSender,
             string_input: AsyncStringInput | None = None,
     ) -> None:
         super().__init__()
 
         self._driver = driver
-        self._facade = facade
+        self._user_input_sender = user_input_sender
         if string_input is None:
             string_input = self.DEFAULT_STRING_INPUT
         self._string_input = string_input
@@ -38,12 +38,6 @@ class InteractiveBareChatInterface(ChatInterface):
             except EOFError:
                 break
 
-            print()
-            print('<')
-            print()
-
-            await self._facade.handle_user_input(s)
-
-            print()
+            await self._user_input_sender.send_user_input(s)
 
         await self._driver.stop()

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/interfaces/textual/app.py

@@ -6,6 +6,7 @@ import weakref
 from omdev.tui import textual as tx
 from omlish import check
 from omlish import dataclasses as dc
+from omlish.asyncs.relays import SchedulingAsyncBufferRelay
 from omlish.logs import all as logs
 
 from ...... import minichain as mc
@@ -86,6 +87,8 @@ class ChatApp(
         ),
     ]
 
+    AUTO_FOCUS = '.input-container'
+
     def __init__(
             self,
             *,
@@ -117,6 +120,10 @@ class ChatApp(
 
         self._pending_tool_confirmations: set[ToolConfirmationMessage] = set()
 
+        self._append_stream_ai_message_content_buffer: SchedulingAsyncBufferRelay[tuple[uuid.UUID, str]] = SchedulingAsyncBufferRelay(  # noqa
+            self._schedule_drain_append_stream_ai_message_content_buffer,
+        )
+
         #
 
         self._messages_container = MessagesContainer([welcome_message] if welcome_message is not None else [])
@@ -157,11 +164,54 @@ class ChatApp(
         self.refresh(layout=True)
         self.call_after_refresh(inner)
 
+    async def _schedule_drain_append_stream_ai_message_content_buffer(self) -> None:
+        self.call_next(self._drain_append_stream_ai_message_content_buffer)
+
+    async def _drain_append_stream_ai_message_content_buffer(self) -> None:
+        parts = await self._append_stream_ai_message_content_buffer.swap()
+        await self._messages_container.append_stream_ai_message_content(*parts)
+
     ##
     # Chat events
 
     _chat_event_queue_task: asyncio.Task[None] | None = None
 
+    async def _handle_chat_queue_event(self, ev: ta.Any) -> None:
+        if isinstance(ev, mc.drivers.AiMessagesEvent):
+            if not ev.streamed:
+                wx: list[Message] = []
+
+                for ai_msg in ev.chat:
+                    if isinstance(ai_msg, mc.AiMessage):
+                        wx.append(
+                            StaticAiMessage(
+                                check.isinstance(ai_msg.c, str),
+                                markdown=True,
+                                message_uuid=ai_msg.metadata[mc.MessageUuid].v,
+                            ),
+                        )
+
+                if wx:
+                    await self._messages_container.enqueue_mount_messages(*wx)
+                    self.call_later(self._messages_container.mount_messages)
+
+        elif isinstance(ev, mc.drivers.AiStreamBeginEvent):
+            # self.call_later(self._messages_container.mount_messages, StreamAiMessage(message_uuid=ev.message_uuid))  # noqa
+            pass
+
+        elif isinstance(ev, mc.drivers.AiStreamDeltaEvent):
+            if isinstance(ev.delta, mc.ContentAiDelta):
+                await self._append_stream_ai_message_content_buffer.push((
+                    check.not_none(ev.message_uuid),
+                    check.isinstance(ev.delta.c, str),
+                ))
+
+            elif isinstance(ev.delta, mc.ToolUseAiDelta):
+                pass
+
+        elif isinstance(ev, mc.drivers.AiStreamEndEvent):
+            self.call_later(self._messages_container.finalize_stream_ai_message, ev.message_uuid)
+
     @logs.async_exception_logging(alog, BaseException)
     async def _chat_event_queue_task_main(self) -> None:
         while True:
@@ -171,38 +221,7 @@ class ChatApp(
 
             await alog.debug(lambda: f'Got chat event: {ev!r}')
 
-            if isinstance(ev, mc.drivers.AiMessagesEvent):
-                if not ev.streamed:
-                    wx: list[Message] = []
-
-                    for ai_msg in ev.chat:
-                        if isinstance(ai_msg, mc.AiMessage):
-                            wx.append(
-                                StaticAiMessage(
-                                    check.isinstance(ai_msg.c, str),
-                                    markdown=True,
-                                    message_uuid=ai_msg.metadata[mc.MessageUuid].v,
-                                ),
-                            )
-
-                    if wx:
-                        await self._messages_container.enqueue_mount_messages(*wx)
-                        self.call_later(self._messages_container.mount_messages)
-
-            elif isinstance(ev, mc.drivers.AiStreamBeginEvent):
-                # self.call_later(self._messages_container.mount_messages, StreamAiMessage(message_uuid=ev.message_uuid))  # noqa
-                pass
-
-            elif isinstance(ev, mc.drivers.AiStreamDeltaEvent):
-                if isinstance(ev.delta, mc.ContentAiDelta):
-                    cc = check.isinstance(ev.delta.c, str)
-                    self.call_later(self._messages_container.append_stream_ai_message_content, ev.message_uuid, cc)  # noqa
-
-                elif isinstance(ev.delta, mc.ToolUseAiDelta):
-                    pass
-
-            elif isinstance(ev, mc.drivers.AiStreamEndEvent):
-                self.call_later(self._messages_container.finalize_stream_ai_message, ev.message_uuid)
+            await self._handle_chat_queue_event(ev)
 
     ##
     # Chat actions
@@ -273,8 +292,6 @@ class ChatApp(
         check.state(self._chat_event_queue_task is None)
         self._chat_event_queue_task = asyncio.create_task(self._chat_event_queue_task_main())
 
-        await self._chat_driver.start()
-
         check.state(self._chat_action_queue_task is None)
         self._chat_action_queue_task = asyncio.create_task(self._chat_action_queue_task_main())
 
@@ -282,6 +299,8 @@ class ChatApp(
 
         await self._messages_container.mount_messages()
 
+        self.call_after_refresh(self._chat_driver.start)
+
     async def on_unmount(self) -> None:
         if (cat := self._chat_action_queue_task) is not None:
             await self._chat_action_queue.put(None)
@@ -296,28 +315,34 @@ class ChatApp(
     ##
     # Input
 
-    @tx.on(InputTextArea.Submitted)
-    async def on_input_text_area_submitted(self, event: InputTextArea.Submitted) -> None:
-        self._input_container.input_text_area.clear()
-
+    async def send_user_input(self, s: str, *, no_echo: bool = False) -> None:
         input_uuid = uuid.uuid4()
 
-        await self._messages_container.mount_messages(
-            UserMessage(
-                event.text,
-                message_uuid=input_uuid,
-            ),
-        )
+        if not no_echo:
+            await self._messages_container.mount_messages(
+                UserMessage(
+                    s,
+                    message_uuid=input_uuid,
+                ),
+            )
 
-        await self._input_history_manager.add(event.text)
+            await self._input_history_manager.add(s)
 
         await self._chat_action_queue.put(
             ChatApp.UserInput(
-                event.text,
+                s,
                 input_uuid=input_uuid,
             ),
         )
 
+    @tx.on(InputTextArea.Submitted)
+    async def on_input_text_area_submitted(self, event: InputTextArea.Submitted) -> None:
+        self._input_container.input_text_area.clear()
+
+        await self._input_history_manager.add(event.text)
+
+        await self.send_user_input(event.text)
+
     @tx.on(tx.Key)
     async def on_key(self, event: tx.Key) -> None:
         if event in self._input_focused_key_events:

ommlds-0.0.0.dev552/ommlds/cli/modes/chat/interfaces/textual/chat.py

@@ -0,0 +1,23 @@
+from ...facades.chat import UserInputSender
+from ...facades.facade import ChatFacade
+from .types import ChatAppGetter
+
+
+##
+
+
+class TextualUserInputSender(UserInputSender):
+    def __init__(
+            self,
+            *,
+            app: ChatAppGetter,
+            facade: ChatFacade,
+    ) -> None:
+        super().__init__()
+
+        self._app = app
+        self._facade = facade
+
+    async def send_user_input(self, text: str, *, no_echo: bool = False) -> None:
+        app = await self._app()
+        app.call_later(app.send_user_input, text, no_echo=no_echo)

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/interfaces/textual/inject.py

@@ -17,8 +17,10 @@ from .types import ChatAppGetter
 with lang.auto_proxy_import(globals()):
     from omdev.tui import textual as tx
 
+    from ...facades import chat as _facades_chat
     from ...facades import ui as _facades_ui
     from . import app as _app
+    from . import chat as _chat
     from . import facades as _facades
     from . import inputhistory as _inputhistory
     from . import interface as _interface
@@ -91,6 +93,13 @@ def bind_textual(cfg: TextualInterfaceConfig = TextualInterfaceConfig()) -> inj.
 
     #
 
+    els.extend([
+        inj.bind(_chat.TextualUserInputSender, singleton=True),
+        inj.bind(_facades_chat.UserInputSender, to_key=_chat.TextualUserInputSender),
+    ])
+
+    #
+
     els.extend([
         inj.bind(_facades.ChatAppUiMessageDisplayer, singleton=True),
         inj.bind(_facades_ui.UiMessageDisplayer, to_key=_facades.ChatAppUiMessageDisplayer),

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/cli/modes/chat/interfaces/textual/widgets/messages.py

@@ -8,6 +8,10 @@ from omdev.tui import textual as tx
 from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
+from omlish.logs import all as logs
+
+
+log, alog = logs.get_module_loggers(globals())
 
 
 ##
@@ -487,33 +491,39 @@ class MessagesContainer(tx.InitAddClass, tx.ComposeOnce, tx.VerticalScroll):
 
     #
 
-    async def append_stream_ai_message_content(self, message_uuid: uuid.UUID, content: str) -> None:
-        if (msg := self._messages_by_uuid.get(message_uuid)) is None:
-            aim = StreamAiMessage(content, message_uuid=message_uuid)
-
-            self._messages_by_uuid[message_uuid] = aim
+    async def append_stream_ai_message_content(self, *parts: tuple[uuid.UUID, str]) -> None:
+        mount_messages = False
+        refresh = False
+        scroll_to_bottom = False
 
-            await self.enqueue_mount_messages(aim)
+        for message_uuid, content in parts:
+            if (msg := self._messages_by_uuid.get(message_uuid)) is None:
+                aim = StreamAiMessage(content, message_uuid=message_uuid)
 
-            self.call_later(self.mount_messages)
+                self._messages_by_uuid[message_uuid] = aim
 
-            self.refresh()
+                await self.enqueue_mount_messages(aim)
 
-            return
+                mount_messages = True
+                refresh = True
 
-        aim = check.isinstance(msg, StreamAiMessage)
+            else:
+                aim = check.isinstance(msg, StreamAiMessage)
 
-        if not aim.is_mounted:
-            await aim.append_stream_content(content)
+                if not aim.is_mounted:
+                    await aim.append_stream_content(content)
 
-            return
-
-        was_at_bottom = self._is_messages_at_bottom()
+                else:
+                    scroll_to_bottom |= self._is_messages_at_bottom()
 
-        await aim.append_stream_content(content)
+                    await aim.append_stream_content(content)
 
-        if was_at_bottom:
+        if mount_messages:
+            self.call_later(self.mount_messages)
+        if scroll_to_bottom:
             self.call_after_refresh(self._scroll_messages_to_bottom_and_anchor)
+        if refresh:
+            self.refresh()
 
     async def finalize_stream_ai_message(self, message_uuid: uuid.UUID) -> None:
         if (msg := self._messages_by_uuid.get(message_uuid)) is None:

{ommlds-0.0.0.dev551 → ommlds-0.0.0.dev552}/ommlds/minichain/__init__.py

@@ -142,22 +142,18 @@ with _lang.auto_proxy_init(
         execute_tool_use,
     )
 
-    from .chat.transform.messages import (  # noqa
+    from .chat.transform.types import (  # noqa
         MessageTransform,
 
         CompositeMessageTransform,
         FnMessageTransform,
         TypeFilteredMessageTransform,
-    )
 
-    from .chat.transform.chats import (  # noqa
         ChatTransform,
 
         CompositeChatTransform,
         FnChatTransform,
-
         MessageTransformChatTransform,
-        LastMessageTransformChatTransform,
     )
 
     from .chat.transform.content import (  # noqa