ommlds 0.0.0.dev488__py3-none-any.whl → 0.0.0.dev489__py3-none-any.whl

ommlds/cli/sessions/chat/chat/user/inject.py

@@ -10,7 +10,6 @@ from .configs import UserConfig
 
 with lang.auto_proxy_import(globals()):
     from ..state import types as _state
-    from . import interactive as _interactive
     from . import oneshot as _oneshot
     from . import types as _types
 
@@ -41,8 +40,6 @@ def bind_user(cfg: UserConfig = UserConfig()) -> inj.Elements:
 
             raise NotImplementedError
 
-        els.append(inj.bind(_types.UserChatInput, to_ctor=_interactive.InteractiveUserChatInput, singleton=True))
-
     else:
         if cfg.initial_user_content is None:
             raise ValueError('Initial user content is required for non-interactive chat')

ommlds/cli/sessions/chat/interface/bare/inject.py

@@ -9,6 +9,8 @@ from .interface import BareChatInterface
 with lang.auto_proxy_import(globals()):
     from .....inputs import asyncs as _inputs_asyncs
     from .....inputs import sync as _inputs_sync
+    from ...chat.user import types as _user_types
+    from . import user as _user
 
 
 ##
@@ -20,6 +22,8 @@ def bind_bare(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
     ]
 
     if cfg.interactive:
+        els.append(inj.bind(_user_types.UserChatInput, to_ctor=_user.InteractiveUserChatInput, singleton=True))
+
         els.extend([
             inj.bind(_inputs_sync.SyncStringInput, to_const=_inputs_sync.InputSyncStringInput(use_readline=cfg.use_readline)),  # noqa
             inj.bind(_inputs_asyncs.AsyncStringInput, to_ctor=_inputs_asyncs.ThreadAsyncStringInput, singleton=True),

ommlds/cli/sessions/chat/{chat/user/interactive.py → interface/bare/user.py}

@@ -4,7 +4,7 @@ from ...... import minichain as mc
 from .....inputs.asyncs import AsyncStringInput
 from .....inputs.asyncs import SyncAsyncStringInput
 from .....inputs.sync import InputSyncStringInput
-from .types import UserChatInput
+from ...chat.user.types import UserChatInput
 
 
 ##

ommlds/cli/sessions/chat/interface/textual/app.py

@@ -1,4 +1,47 @@
+import asyncio
+import dataclasses as dc
+import typing as ta
+
 from omdev.tui import textual as tx
+from omlish import check
+
+from ...... import minichain as mc
+from ...driver import ChatDriver
+from .user import QueueUserChatInput
+
+
+##
+
+
+class UserMessage(tx.Static):
+    pass
+
+
+class AiMessage(tx.Static):
+    pass
+
+
+##
+
+
+class InputTextArea(tx.TextArea):
+    @dc.dataclass()
+    class Submitted(tx.Message):
+        text: str
+
+    def __init__(self, **kwargs: ta.Any) -> None:
+        super().__init__(**kwargs)
+
+    async def _on_key(self, event: tx.Key) -> None:
+        if event.key == 'enter':
+            event.prevent_default()
+            event.stop()
+
+            if text := self.text.strip():
+                self.post_message(self.Submitted(text))
+
+        else:
+            await super()._on_key(event)
 
 
 ##
@@ -7,8 +50,142 @@ from omdev.tui import textual as tx
 class ChatApp(tx.App):
     def __init__(
             self,
+            *,
+            chat_driver: ChatDriver,
+            queue_user_chat_input: QueueUserChatInput,
     ) -> None:
         super().__init__()
 
+        self._chat_driver = chat_driver
+        self._queue_user_chat_input = queue_user_chat_input
+
+    CSS: ta.ClassVar[str] = """
+        #messages-scroll {
+            width: 100%;
+            height: 1fr;
+
+            padding: 0 2 0 2;
+        }
+
+        #messages-container {
+            height: auto;
+            width: 100%;
+
+            margin-top: 1;
+            margin-bottom: 0;
+
+            layout: stream;
+            text-align: left;
+        }
+
+        #input-outer {
+            width: 100%;
+            height: auto;
+        }
+
+        #input-vertical {
+            width: 100%;
+            height: auto;
+
+            margin: 0 2 1 2;
+
+            padding: 0;
+        }
+
+        #input-vertical2 {
+            width: 100%;
+            height: auto;
+
+            border: round $foreground-muted;
+
+            padding: 0 1;
+        }
+
+        #input-horizontal {
+            width: 100%;
+            height: auto;
+        }
+
+        #input-glyph {
+            width: auto;
+
+            padding: 0 1 0 0;
+
+            background: transparent;
+            color: $primary;
+
+            text-style: bold;
+        }
+
+        #input {
+            width: 1fr;
+            height: auto;
+            max-height: 16;
+
+            border: none;
+
+            padding: 0;
+
+            background: transparent;
+            color: $text;
+        }
+    """
+
+    ENABLE_COMMAND_PALETTE: ta.ClassVar[bool] = False
+
+    #
+
     def compose(self) -> tx.ComposeResult:
-        yield tx.Static('app goes here lol')
+        with tx.VerticalScroll(id='messages-scroll'):
+            yield tx.Static(id='messages-container')
+
+        with tx.Static(id='input-outer'):
+            with tx.Vertical(id='input-vertical'):
+                with tx.Vertical(id='input-vertical2'):
+                    with tx.Horizontal(id='input-horizontal'):
+                        yield tx.Static('>', id='input-glyph')
+                        yield InputTextArea(placeholder='...', id='input')
+
+    #
+
+    def _get_input_text_area(self) -> InputTextArea:
+        return self.query_one('#input', InputTextArea)
+
+    def _get_messages_container(self) -> tx.Static:
+        return self.query_one('#messages-container', tx.Static)
+
+    #
+
+    async def _mount_message(self, *messages: tx.Widget) -> None:
+        msg_ctr = self._get_messages_container()
+
+        for msg in messages:
+            await msg_ctr.mount(msg)
+
+        self.call_after_refresh(lambda: msg_ctr.scroll_end(animate=False))
+
+    #
+
+    _chat_driver_task: asyncio.Task | None = None
+
+    async def on_mount(self) -> None:
+        check.none(self._chat_driver_task)
+        self._chat_driver_task = asyncio.create_task(self._chat_driver.run())
+
+        self._get_input_text_area().focus()
+
+        await self._mount_message(UserMessage('Hello!'))
+
+    async def on_unmount(self) -> None:
+        await self._queue_user_chat_input.push_next_user_messages([])
+        await check.not_none(self._chat_driver_task)
+
+    async def on_input_text_area_submitted(self, event: InputTextArea.Submitted) -> None:
+        self._get_input_text_area().clear()
+
+        await self._mount_message(
+            UserMessage(event.text),
+            # AiMessage(f'You said: {event.text}!'),
+        )
+
+        await self._queue_user_chat_input.push_next_user_messages([mc.UserMessage(event.text)])

ommlds/cli/sessions/chat/interface/textual/inject.py

@@ -1,8 +1,10 @@
 from omlish import inject as inj
 
+from ...chat.user.types import UserChatInput
 from ..base import ChatInterface
 from .app import ChatApp
 from .interface import TextualChatInterface
+from .user import QueueUserChatInput
 
 
 ##
@@ -17,4 +19,9 @@ def bind_textual() -> inj.Elements:
         inj.bind(ChatApp, singleton=True),
     ])
 
+    els.extend([
+        inj.bind(QueueUserChatInput, singleton=True),
+        inj.bind(UserChatInput, to_key=QueueUserChatInput),
+    ])
+
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/interface/textual/user.py

@@ -0,0 +1,20 @@
+import asyncio
+
+from ...... import minichain as mc
+from ...chat.user.types import UserChatInput
+
+
+##
+
+
+class QueueUserChatInput(UserChatInput):
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._queue: asyncio.Queue[mc.UserChat] = asyncio.Queue()
+
+    async def push_next_user_messages(self, chat: 'mc.UserChat') -> None:
+        await self._queue.put(chat)
+
+    async def get_next_user_messages(self) -> 'mc.UserChat':
+        return await self._queue.get()

{ommlds-0.0.0.dev488.dist-info → ommlds-0.0.0.dev489.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev488
+Version: 0.0.0.dev489
 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.dev488
+Requires-Dist: omlish==0.0.0.dev489
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev488; extra == "all"
+Requires-Dist: omdev==0.0.0.dev489; extra == "all"
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "all"
 Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "all"
@@ -38,7 +38,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.dev488; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev489; extra == "omdev"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "backends"

{ommlds-0.0.0.dev488.dist-info → ommlds-0.0.0.dev489.dist-info}/RECORD

@@ -148,8 +148,7 @@ ommlds/cli/sessions/chat/chat/state/storage.py,sha256=gKUNsNj3TtH67-FOuHXrQlDsES
 ommlds/cli/sessions/chat/chat/state/types.py,sha256=NsHCZNeBfLW1BMVB2rn-DUqA9C5w2vp-_3UjjKl4QRo,806
 ommlds/cli/sessions/chat/chat/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/chat/user/configs.py,sha256=qsiua5CkTRPhO4prORK-GXauUhWRZ3psfpoHvuj8EyA,311
-ommlds/cli/sessions/chat/chat/user/inject.py,sha256=cnG04z35Svy-6sle2_Z_2a9rlbBefi6syi-MZyiXJa8,2056
-ommlds/cli/sessions/chat/chat/user/interactive.py,sha256=SHeiuhkCkM0SM0dTph-W-qk9VLBMuwL1nTE-Moex2qA,862
+ommlds/cli/sessions/chat/chat/user/inject.py,sha256=guy8eQLXlUtXKG9jNnJSCwwT6_jPJ0oxPIGNI2KaT6A,1895
 ommlds/cli/sessions/chat/chat/user/oneshot.py,sha256=jPrZBBuf-olBfPF7CPTYK7-Dr7EvSriU7L0nORHfbv4,588
 ommlds/cli/sessions/chat/chat/user/types.py,sha256=MNlhMxlLtxVod9rUZlSPvRaippPAXEdX_GHh73QLeSg,262
 ommlds/cli/sessions/chat/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -157,12 +156,14 @@ ommlds/cli/sessions/chat/interface/base.py,sha256=3z7yI-ow7037_n6VanQYZjOgKL_iRZ
 ommlds/cli/sessions/chat/interface/configs.py,sha256=xu9nUAI9opNR7X4m92JKr5HhXPNNflHUHQ4UbOPmVMg,244
 ommlds/cli/sessions/chat/interface/inject.py,sha256=Ip-srA7ONGF-YgbLikwfTd3O1UoxeDTMI6CnPpc6A80,493
 ommlds/cli/sessions/chat/interface/bare/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/interface/bare/inject.py,sha256=edyEuvNSdxG3EAb0aDku_QEVPftc_I7e_EJMLNa7Stw,853
+ommlds/cli/sessions/chat/interface/bare/inject.py,sha256=rJPZnntuELdjxovU2yDo_RZl5qBhUfadMb2Dg1e50Pw,1048
 ommlds/cli/sessions/chat/interface/bare/interface.py,sha256=X-M0fyyY6FlJbY_ToJOMGJrPwbx68Hi1y9GfkhdPLKA,336
+ommlds/cli/sessions/chat/interface/bare/user.py,sha256=DIRX8-yWl0U9AD1qr5og0XbFhSZxpCUgnwOxIJloK1Y,874
 ommlds/cli/sessions/chat/interface/textual/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/interface/textual/app.py,sha256=MZGjY8d8KfV58zhT_0bCRn3-2-ole3FCa-rTVY9EE_A,233
-ommlds/cli/sessions/chat/interface/textual/inject.py,sha256=Gqlm7yem3exApLnt_ylSke7Uw-POanno-otdQFxdiSw,399
+ommlds/cli/sessions/chat/interface/textual/app.py,sha256=r25t-0Gvh5O_oS-mKKR5xHSI6d-ibHkpH6ZYKxAFDIk,4303
+ommlds/cli/sessions/chat/interface/textual/inject.py,sha256=MwtFeF3SXfidsxCihcgk3Bp888Ba5CwEj2ZYugkJRtM,620
 ommlds/cli/sessions/chat/interface/textual/interface.py,sha256=SISY0RardWhYdXfpVMTTjNlaeUIu9lgFIxKkDn0_SwA,417
+ommlds/cli/sessions/chat/interface/textual/user.py,sha256=ywXycpaHX7beD1EAv6PtCYNC5vQL6CLIfWM9iYzH3ts,482
 ommlds/cli/sessions/chat/phases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/phases/inject.py,sha256=m9GcCVcp1GnNKN1qwDSgTkfp3e107wXgPeEHDLbfG8s,448
 ommlds/cli/sessions/chat/phases/injection.py,sha256=ZUFRRLp3HNhKaPBW6aiw5XFEGNkqTj8WVSlXM0kg0y0,326
@@ -448,9 +449,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.dev488.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev488.dist-info/METADATA,sha256=q5zXFLRuFUGT23QClBchanPGY_rKEPUHSRZxpsRAWLA,3493
-ommlds-0.0.0.dev488.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev488.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev488.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev488.dist-info/RECORD,,
+ommlds-0.0.0.dev489.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev489.dist-info/METADATA,sha256=3ZTS2XgARBEwxODOmnG5PcDx16y_4TNAy5_ibrVeOO0,3493
+ommlds-0.0.0.dev489.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev489.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev489.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev489.dist-info/RECORD,,