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

ommlds/cli/sessions/chat/{tools → agents/tools}/rendering.py

@@ -1,8 +1,8 @@
 import typing as ta
 
-from ..... import minichain as mc
-from ....rendering.types import ContentRendering
-from .execution import ToolUseExecutor
+from ...... import minichain as mc
+from .....rendering.types import ContentRendering
+from ...agents.tools.execution import ToolUseExecutor
 
 
 ##

ommlds/cli/sessions/chat/{tools → agents/tools}/todo/inject.py

@@ -10,9 +10,9 @@ from .configs import TodoToolSetConfig
 
 
 def bind_todo_tools(cfg: TodoToolSetConfig) -> inj.Elements:
-    from ......minichain.lib.todo.context import TodoContext
-    from ......minichain.lib.todo.tools.read import todo_read_tool
-    from ......minichain.lib.todo.tools.write import todo_write_tool
+    from .......minichain.lib.todo.context import TodoContext
+    from .......minichain.lib.todo.tools.read import todo_read_tool
+    from .......minichain.lib.todo.tools.write import todo_write_tool
 
     return inj.as_elements(
         tool_catalog_entries().bind_item_consts(

ommlds/cli/sessions/chat/{tools → agents/tools}/weather/tools.py

@@ -1,4 +1,4 @@
-from ...... import minichain as mc
+from ....... import minichain as mc
 
 
 ##

ommlds/cli/sessions/chat/{chat → agents}/user/configs.py

@@ -12,5 +12,3 @@ from ...... import minichain as mc
 class UserConfig:
     initial_system_content: ta.Optional['mc.Content'] = None
     initial_user_content: ta.Optional['mc.Content'] = None
-
-    interactive: bool = False

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

@@ -0,0 +1,40 @@
+from omlish import inject as inj
+from omlish import lang
+
+from ...... import minichain as mc
+from ..phases.injection import phase_callbacks
+from ..phases.types import ChatPhase
+from ..phases.types import ChatPhaseCallback
+from .configs import UserConfig
+
+
+with lang.auto_proxy_import(globals()):
+    from .. import agent as _agent
+    from ..state import types as _state
+
+
+##
+
+
+def bind_user(cfg: UserConfig = UserConfig()) -> inj.Elements:
+    els: list[inj.Elemental] = []
+
+    if cfg.initial_system_content is not None:
+        async def add_initial_system_content(cm: '_state.ChatStateManager') -> None:
+            await cm.extend_chat([mc.SystemMessage(cfg.initial_system_content)])
+
+        els.append(phase_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
+            lambda cm: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_system_content(cm)),
+            cm=_state.ChatStateManager,
+        )))
+
+    if cfg.initial_user_content is not None:
+        async def add_initial_user_content(ca: '_agent.ChatAgent') -> None:
+            await ca.send_user_messages([mc.UserMessage(cfg.initial_user_content)])
+
+        els.append(phase_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
+            lambda ca: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_user_content(ca())),
+            ca=inj.Late[_agent.ChatAgent],
+        )))
+
+    return inj.as_elements(*els)

ommlds/cli/sessions/chat/configs.py

@@ -1,12 +1,8 @@
 from omlish import dataclasses as dc
 
-from ...backends.configs import BackendConfig
 from ...rendering.configs import RenderingConfig
-from .chat.ai.configs import AiConfig
-from .chat.state.configs import StateConfig
-from .chat.user.configs import UserConfig
-from .interface.configs import InterfaceConfig
-from .tools.configs import ToolsConfig
+from .agents.configs import AgentConfig
+from .interfaces.configs import InterfaceConfig
 
 
 ##
@@ -20,10 +16,6 @@ DEFAULT_BACKEND = 'openai'
 
 @dc.dataclass(frozen=True, kw_only=True)
 class ChatConfig:
-    backend: BackendConfig = BackendConfig()
-    ai: AiConfig = AiConfig()
-    state: StateConfig = StateConfig()
-    user: UserConfig = UserConfig()
-    rendering: RenderingConfig = RenderingConfig()
+    agent: AgentConfig = AgentConfig()
     interface: InterfaceConfig = InterfaceConfig()
-    tools: ToolsConfig = ToolsConfig()
+    rendering: RenderingConfig = RenderingConfig()

ommlds/cli/sessions/chat/inject.py

@@ -2,23 +2,15 @@ from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
-from ...backends.types import DefaultBackendName
 from ..base import Session
-from .configs import DEFAULT_BACKEND
 from .configs import ChatConfig
 
 
 with lang.auto_proxy_import(globals()):
-    from ...backends import inject as _backends
     from ...rendering import inject as _rendering
-    from . import driver as _driver
     from . import session as _session
-    from .chat.ai import inject as _chat_ai
-    from .chat.state import inject as _chat_state
-    from .chat.user import inject as _chat_user
-    from .interface import inject as _interface
-    from .phases import inject as _phases
-    from .tools import inject as _tools
+    from .agents import inject as _agents
+    from .interfaces import inject as _interfaces
 
 
 ##
@@ -30,27 +22,11 @@ def bind_chat(cfg: ChatConfig) -> inj.Elements:
     #
 
     els.extend([
-        _backends.bind_backends(cfg.backend),
+        _agents.bind_agent(cfg.agent),
 
-        _chat_ai.bind_ai(cfg.ai),
-
-        _chat_user.bind_user(cfg.user),
-
-        _chat_state.bind_state(cfg.state),
-
-        _interface.bind_interface(cfg.interface),
-
-        _phases.bind_phases(),
+        _interfaces.bind_interface(cfg.interface),
 
         _rendering.bind_rendering(cfg.rendering),
-
-        _tools.bind_tools(cfg.tools),
-    ])
-
-    #
-
-    els.extend([
-        inj.bind(_driver.ChatDriver, singleton=True),
     ])
 
     #
@@ -62,8 +38,4 @@ def bind_chat(cfg: ChatConfig) -> inj.Elements:
 
     #
 
-    els.append(inj.bind(DefaultBackendName, to_const=DEFAULT_BACKEND))
-
-    #
-
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/{interface → interfaces}/bare/inject.py

@@ -3,26 +3,36 @@ from omlish import lang
 
 from ..base import ChatInterface
 from ..configs import InterfaceConfig
-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 . import interactive as _interactive
+    from . import oneshot as _oneshot
 
 
 ##
 
 
 def bind_bare(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
-    els: list[inj.Elemental] = [
-        inj.bind(ChatInterface, to_ctor=BareChatInterface, singleton=True),
-    ]
+    els: list[inj.Elemental] = []
 
     if cfg.interactive:
+        els.extend([
+            inj.bind(_interactive.InteractiveBareChatInterface, singleton=True),
+            inj.bind(ChatInterface, to_key=_interactive.InteractiveBareChatInterface),
+        ])
+
         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),
         ])
 
+    else:
+        els.extend([
+            inj.bind(_oneshot.OneshotBareChatInterface, singleton=True),
+            inj.bind(ChatInterface, to_key=_oneshot.OneshotBareChatInterface),
+        ])
+
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/interfaces/bare/interactive.py

@@ -0,0 +1,41 @@
+import typing as ta
+
+from ...... import minichain as mc
+from .....inputs.asyncs import AsyncStringInput
+from .....inputs.asyncs import SyncAsyncStringInput
+from .....inputs.sync import InputSyncStringInput
+from ...agents.agent import ChatAgent
+from ..base import ChatInterface
+
+
+##
+
+
+class InteractiveBareChatInterface(ChatInterface):
+    DEFAULT_STRING_INPUT: ta.ClassVar[AsyncStringInput] = SyncAsyncStringInput(InputSyncStringInput())
+
+    def __init__(
+            self,
+            *,
+            agent: ChatAgent,
+            string_input: AsyncStringInput | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._agent = agent
+        if string_input is None:
+            string_input = self.DEFAULT_STRING_INPUT
+        self._string_input = string_input
+
+    async def run(self) -> None:
+        await self._agent.start()
+
+        while True:
+            try:
+                s = await self._string_input()
+            except EOFError:
+                break
+
+            await self._agent.send_user_messages([mc.UserMessage(s)])
+
+        await self._agent.stop()

ommlds/cli/sessions/chat/interfaces/bare/oneshot.py

@@ -0,0 +1,21 @@
+from ...agents.agent import ChatAgent
+from ..base import ChatInterface
+
+
+##
+
+
+class OneshotBareChatInterface(ChatInterface):
+    def __init__(
+            self,
+            *,
+            agent: ChatAgent,
+    ) -> None:
+        super().__init__()
+
+        self._agent = agent
+
+    async def run(self) -> None:
+        await self._agent.start()
+
+        await self._agent.stop()

ommlds/cli/sessions/chat/{chat/user/interactive.py → interfaces/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 ...agents.user.types import UserChatInput
 
 
 ##

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

@@ -0,0 +1,211 @@
+import asyncio
+import dataclasses as dc
+import io
+import typing as ta
+
+from omdev.tui import textual as tx
+from omlish import check
+from omlish import lang
+
+from ...... import minichain as mc
+from ...agents.agent import ChatAgent
+from ...agents.events.types import AiMessagesChatEvent
+
+
+##
+
+
+ChatAgentEventQueue = ta.NewType('ChatAgentEventQueue', asyncio.Queue)
+
+
+##
+
+
+class WelcomeMessage(tx.Static):
+    def __init__(self, content: str) -> None:
+        super().__init__(content)
+
+        self.add_class('welcome-message')
+
+
+class UserMessage(tx.Static):
+    def __init__(self, content: str) -> None:
+        super().__init__(content)
+
+        self.add_class('user-message')
+
+
+class AiMessage(tx.Static):
+    def __init__(self, content: str) -> None:
+        super().__init__(content)
+
+        self.add_class('ai-message')
+
+
+##
+
+
+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)
+
+
+##
+
+
+@lang.cached_function
+def _read_app_css() -> str:
+    tcss_rsrcs = [
+        rsrc
+        for rsrc in lang.get_relative_resources('.styles', globals=globals()).values()
+        if rsrc.name.endswith('.tcss')
+    ]
+
+    out = io.StringIO()
+
+    for i, rsrc in enumerate(tcss_rsrcs):
+        if i:
+            out.write('\n\n')
+
+        out.write(f'/* {rsrc.name} */\n')
+        out.write('\n')
+
+        out.write(rsrc.read_text().strip())
+        out.write('\n')
+
+    return out.getvalue()
+
+
+#
+
+
+class ChatApp(tx.App):
+    def __init__(
+            self,
+            *,
+            agent: ChatAgent,
+            event_queue: ChatAgentEventQueue,
+    ) -> None:
+        super().__init__()
+
+        self._agent = agent
+        self._event_queue = event_queue
+
+    CSS: ta.ClassVar[str] = _read_app_css()
+
+    ENABLE_COMMAND_PALETTE: ta.ClassVar[bool] = False
+
+    #
+
+    def compose(self) -> tx.ComposeResult:
+        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)
+
+    #
+
+    _pending_mount_messages: list[tx.Widget] | None = None
+
+    async def _enqueue_mount_messages(self, *messages: tx.Widget) -> None:
+        if (lst := self._pending_mount_messages) is None:
+            lst = self._pending_mount_messages = []
+
+        lst.extend(messages)
+
+    async def _mount_messages(self, *messages: tx.Widget) -> None:
+        msg_ctr = self._get_messages_container()
+
+        for msg in [*(self._pending_mount_messages or []), *messages]:
+            await msg_ctr.mount(msg)
+
+        self._pending_mount_messages = None
+
+        self.call_after_refresh(lambda: msg_ctr.scroll_end(animate=False))
+
+    #
+
+    _event_queue_task: asyncio.Task[None] | None = None
+
+    async def _event_queue_task_main(self) -> None:
+        while True:
+            ev = await self._event_queue.get()
+            if ev is None:
+                break
+
+            if isinstance(ev, AiMessagesChatEvent):
+                wx: list[tx.Widget] = []
+
+                for ai_msg in ev.chat:
+                    if isinstance(ai_msg, mc.AiMessage):
+                        wx.append(
+                            AiMessage(
+                                check.isinstance(ai_msg.c, str),
+                            ),
+                        )
+
+                if wx:
+                    await self._enqueue_mount_messages(*wx)
+                    self.call_later(self._mount_messages)
+
+    #
+
+    async def on_mount(self) -> None:
+        check.state(self._event_queue_task is None)
+        self._event_queue_task = asyncio.create_task(self._event_queue_task_main())
+
+        await self._agent.start()
+
+        self._get_input_text_area().focus()
+
+        await self._mount_messages(
+            WelcomeMessage(
+                'Hello!',
+            ),
+        )
+
+    async def on_unmount(self) -> None:
+        await self._agent.stop()
+
+        if (eqt := self._event_queue_task) is not None:
+            await self._event_queue.put(None)
+            await eqt
+
+    async def on_input_text_area_submitted(self, event: InputTextArea.Submitted) -> None:
+        self._get_input_text_area().clear()
+
+        await self._mount_messages(
+            UserMessage(
+                event.text,
+            ),
+        )
+
+        await self._agent.send_user_messages([mc.UserMessage(event.text)])

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

@@ -0,0 +1,43 @@
+"""
+FIXME:
+ - too lazy to lazy import guts like every other proper inject module lol >_<
+"""
+import asyncio
+
+from omlish import inject as inj
+
+from ...agents.events.injection import event_callbacks
+from ..base import ChatInterface
+from .app import ChatAgentEventQueue
+from .app import ChatApp
+from .interface import TextualChatInterface
+
+
+##
+
+
+def bind_textual() -> inj.Elements:
+    els: list[inj.Elemental] = [
+        inj.bind(ChatInterface, to_ctor=TextualChatInterface, singleton=True),
+    ]
+
+    #
+
+    els.extend([
+        inj.bind(ChatApp, singleton=True),
+    ])
+
+    #
+
+    els.extend([
+        inj.bind(ChatAgentEventQueue, to_const=asyncio.Queue()),
+
+        event_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
+            lambda eq: lambda ev: eq.put(ev),
+            eq=ChatAgentEventQueue,
+        )),
+    ])
+
+    #
+
+    return inj.as_elements(*els)

ommlds/cli/sessions/chat/{interface → interfaces}/textual/interface.py

@@ -1,4 +1,3 @@
-from ...driver import ChatDriver
 from ..base import ChatInterface
 from .app import ChatApp
 
@@ -10,12 +9,10 @@ class TextualChatInterface(ChatInterface):
     def __init__(
             self,
             *,
-            driver: ChatDriver,
             app: ChatApp,
     ) -> None:
         super().__init__()
 
-        self._driver = driver
         self._app = app
 
     async def run(self) -> None:

ommlds/cli/sessions/chat/interfaces/textual/styles/input.tcss

@@ -0,0 +1,51 @@
+#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;
+}

ommlds/cli/sessions/chat/interfaces/textual/styles/messages.tcss

@@ -0,0 +1,33 @@
+#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;
+}
+
+.welcome-message {
+    margin: 1;
+
+    border: round;
+
+    padding: 1;
+
+    text-align: center;
+}
+
+.user-message {
+}
+
+.ai-message {
+}

ommlds/cli/sessions/chat/session.py

@@ -4,7 +4,7 @@ from omlish import dataclasses as dc
 
 from ..base import Session
 from .configs import ChatConfig
-from .interface.base import ChatInterface
+from .interfaces.base import ChatInterface
 
 
 ##

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev488
+Version: 0.0.0.dev490
 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.dev490
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev488; extra == "all"
+Requires-Dist: omdev==0.0.0.dev490; 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.dev490; 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"