ommlds 0.0.0.dev494__py3-none-any.whl → 0.0.0.dev495__py3-none-any.whl

ommlds/cli/_dataclasses.py

@@ -2062,7 +2062,7 @@ def _process_dataclass__55eb2b38eb7d4e32f3a9306577040632e1c376fb():
         '__dataclass__init__fields__0__annotation',
     ),
     cls_names=(
-        ('ommlds.cli.sessions.chat.drivers.driver', 'AiDeltaChatEvent'),
+        ('ommlds.cli.sessions.chat.drivers.impl', 'AiDeltaChatEvent'),
     ),
 )
 def _process_dataclass__aff24d9a92d53ba94dacb7fb303b9eb4ebd0763f():
@@ -2196,8 +2196,8 @@ def _process_dataclass__aff24d9a92d53ba94dacb7fb303b9eb4ebd0763f():
         '__dataclass__init__fields__0__annotation',
     ),
     cls_names=(
-        ('ommlds.cli.sessions.chat.drivers.driver', 'AiMessagesChatEvent'),
-        ('ommlds.cli.sessions.chat.drivers.driver', 'UserMessagesChatEvent'),
+        ('ommlds.cli.sessions.chat.drivers.impl', 'AiMessagesChatEvent'),
+        ('ommlds.cli.sessions.chat.drivers.impl', 'UserMessagesChatEvent'),
     ),
 )
 def _process_dataclass__b211fde543b7c2c533cdcf9f21b47d2f7f76e5c9():
@@ -2330,9 +2330,9 @@ def _process_dataclass__b211fde543b7c2c533cdcf9f21b47d2f7f76e5c9():
         '__dataclass__init__fields__0__annotation',
     ),
     cls_names=(
-        ('ommlds.cli.sessions.chat.drivers.driver', 'ChatId'),
+        ('ommlds.cli.sessions.chat.drivers.impl', 'ChatDriverId'),
+        ('ommlds.cli.sessions.chat.drivers.impl', 'ChatId'),
         ('ommlds.cli.sessions.chat.drivers.state.ids', 'ChatStateStorageKey'),
-        ('ommlds.cli.sessions.chat.drivers.types', 'ChatDriverId'),
     ),
 )
 def _process_dataclass__3576262424b3ef8ff20966fa3744e5dba9a2ae7d():
@@ -2471,7 +2471,7 @@ def _process_dataclass__3576262424b3ef8ff20966fa3744e5dba9a2ae7d():
         '__dataclass__init__fields__1__annotation',
     ),
     cls_names=(
-        ('ommlds.cli.sessions.chat.drivers.driver', 'ChatPhaseCallback'),
+        ('ommlds.cli.sessions.chat.drivers.impl', 'ChatPhaseCallback'),
     ),
 )
 def _process_dataclass__927265170439340895560333250bc087fa726eff():
@@ -2639,7 +2639,7 @@ def _process_dataclass__927265170439340895560333250bc087fa726eff():
         '__dataclass__init__fields__3__default',
     ),
     cls_names=(
-        ('ommlds.cli.sessions.chat.drivers.driver', 'ChatState'),
+        ('ommlds.cli.sessions.chat.drivers.impl', 'ChatState'),
     ),
 )
 def _process_dataclass__9f7e26a87dd163b610f38caa1ce9b3c6356e632a():

ommlds/cli/backends/inject.py

@@ -12,6 +12,7 @@ from .injection import backend_configs
 with lang.auto_proxy_import(globals()):
     from ...minichain.backends.impls.huggingface import repos as hf_repos
     from . import catalog as _catalog
+    from . import meta as _meta
     from . import types as _types
 
 
@@ -43,14 +44,56 @@ def bind_backends(cfg: BackendConfig = BackendConfig()) -> inj.Elements:
     if cfg.backend is not None:
         lst.append(inj.bind(_types.BackendName, to_const=cfg.backend))
     else:
-        lst.append(inj.bind(_types.BackendName, to_fn=inj.KwargsTarget.of(lambda dbn: dbn, dbn=_types.DefaultBackendName)))  # noqa
-
-    lst.extend([
-        inj.bind(_types.ChatChoicesServiceBackendProvider, to_ctor=_catalog.CatalogChatChoicesServiceBackendProvider, singleton=True),  # noqa
-        inj.bind(_types.ChatChoicesStreamServiceBackendProvider, to_ctor=_catalog.CatalogChatChoicesStreamServiceBackendProvider, singleton=True),  # noqa
-        inj.bind(_types.CompletionServiceBackendProvider, to_ctor=_catalog.CatalogCompletionServiceBackendProvider, singleton=True),  # noqa
-        inj.bind(_types.EmbeddingServiceBackendProvider, to_ctor=_catalog.CatalogEmbeddingServiceBackendProvider, singleton=True),  # noqa
-    ])
+        lst.append(inj.bind(_types.BackendName, to_fn=inj.target(dbn=_types.DefaultBackendName)(lambda dbn: dbn)))
+
+    backend_provider_pairs: list = [
+        (_types.ChatChoicesServiceBackendProvider, _catalog.CatalogChatChoicesServiceBackendProvider),
+        (_types.ChatChoicesStreamServiceBackendProvider, _catalog.CatalogChatChoicesStreamServiceBackendProvider),
+        (_types.CompletionServiceBackendProvider, _catalog.CatalogCompletionServiceBackendProvider),
+        (_types.EmbeddingServiceBackendProvider, _catalog.CatalogEmbeddingServiceBackendProvider),
+    ]
+
+    for bp_iface, bp_impl in backend_provider_pairs:
+        bp_stack = inj.wrapper_binder_helper(bp_iface)
+
+        if bp_iface is _types.ChatChoicesServiceBackendProvider:
+            fiw_ben_lst: list[str] = [
+                # 'openai',
+                # 'anthropic',
+                # 'groq',
+                # 'cerebras',
+            ]
+
+            if fiw_ben_lst:
+                for ben in fiw_ben_lst:
+                    ben_bp_key: inj.Key = inj.Key(bp_impl, tag=ben)
+                    lst.extend([
+                        inj.private(
+                            inj.bind(_types.BackendName, to_const=ben),
+                            inj.bind(ben_bp_key, to_ctor=bp_impl, singleton=True),
+                            inj.bind(bp_iface, to_key=ben_bp_key),
+                            inj.expose(ben_bp_key),
+                        ),
+                        bp_stack.push_bind(to_key=ben_bp_key),
+                    ])
+
+                fiw_key: inj.Key = inj.Key(_meta.FirstInWinsBackendProvider, tag=bp_iface)
+                lst.extend([
+                    inj.private(
+                        inj.set_binder[_types.BackendProvider]().bind(bp_stack.top),
+                        inj.bind(fiw_key, to_ctor=_meta.FirstInWinsBackendProvider, singleton=True),
+                        inj.expose(fiw_key),
+                    ),
+                    bp_stack.push_bind(to_key=fiw_key),
+                ])
+
+            else:
+                lst.append(bp_stack.push_bind(to_ctor=bp_impl, singleton=True))
+
+        else:
+            lst.append(bp_stack.push_bind(to_ctor=bp_impl, singleton=True))
+
+        lst.append(inj.bind(bp_iface, to_key=bp_stack.top))
 
     #
 

ommlds/cli/backends/meta.py

@@ -0,0 +1,35 @@
+import contextlib
+import typing as ta
+
+from ... import minichain as mc
+from .types import BackendProvider
+
+
+ServiceT = ta.TypeVar('ServiceT', bound=mc.Service)
+
+
+##
+
+
+class FirstInWinsBackendProvider(BackendProvider[ServiceT]):
+    def __init__(
+            self,
+            backend_providers: ta.AbstractSet[BackendProvider],
+    ) -> None:
+        super().__init__()
+
+        self._backend_providers = [ta.cast(BackendProvider[ServiceT], bp) for bp in backend_providers]
+
+    def provide_backend(self) -> ta.AsyncContextManager[ServiceT]:
+        @contextlib.asynccontextmanager
+        async def inner():
+            from ...minichain.meta.firstinwins import AsyncioFirstInWinsService
+
+            async with contextlib.AsyncExitStack() as aes:
+                svcs = [
+                    await aes.enter_async_context(bp.provide_backend())
+                    for bp in self._backend_providers
+                ]
+                yield AsyncioFirstInWinsService(*svcs)
+
+        return inner()

ommlds/cli/inject.py

@@ -24,7 +24,7 @@ def bind_main(
 
     els.extend([
         lc.bind_async_lifecycle_registrar(),
-        lc.bind_async_managed_lifecycle_manager(),
+        lc.bind_async_managed_lifecycle_manager(eager=True),
     ])
 
     #

ommlds/cli/sessions/chat/drivers/{driver.py → impl.py}

@@ -3,10 +3,6 @@ TODO:
  - lifecycles
  - StreamService
 """
-import typing as ta
-
-from omlish import lang
-
 from ..... import minichain as mc
 from .ai.types import AiChatGenerator
 from .events.manager import ChatEventsManager
@@ -14,16 +10,13 @@ from .events.types import UserMessagesChatEvent
 from .phases.manager import ChatPhaseManager
 from .phases.types import ChatPhase
 from .state.types import ChatStateManager
+from .types import ChatDriver
 
 
 ##
 
 
-class ChatDriverGetter(lang.Func0[ta.Awaitable['ChatDriver']]):
-    pass
-
-
-class ChatDriver:
+class ChatDriverImpl(ChatDriver):
     def __init__(
             self,
             *,

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

@@ -14,7 +14,7 @@ from .configs import DriverConfig
 
 with lang.auto_proxy_import(globals()):
     from ....backends import inject as _backends
-    from . import driver as _driver
+    from . import impl as _impl
     from . import types as _types
     from .ai import inject as _ai
     from .events import inject as _events
@@ -51,8 +51,10 @@ def bind_driver(cfg: DriverConfig = DriverConfig()) -> inj.Elements:
     #
 
     els.extend([
-        inj.bind(_driver.ChatDriver, singleton=True),
-        inj.bind_async_late(_driver.ChatDriver, _driver.ChatDriverGetter),
+        inj.bind(_impl.ChatDriverImpl, singleton=True),
+        inj.bind(_types.ChatDriver, to_key=_impl.ChatDriverImpl),
+
+        inj.bind_async_late(_types.ChatDriver, _types.ChatDriverGetter),
     ])
 
     #

ommlds/cli/sessions/chat/drivers/state/inject.py

@@ -59,11 +59,10 @@ def bind_state(cfg: StateConfig = StateConfig()) -> inj.Elements:
         els.extend([
             inj.bind(_ids.LastChatIdManager, singleton=True),
 
-            phase_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
-                lambda lcim, cid: ChatPhaseCallback(ChatPhase.STARTED, lambda: lcim.set_last_chat_id(cid)),
+            phase_callbacks().bind_item(to_fn=inj.target(
                 lcim=_ids.LastChatIdManager,
                 cid=_types.ChatId,
-            )),
+            )(lambda lcim, cid: ChatPhaseCallback(ChatPhase.STARTED, lambda: lcim.set_last_chat_id(cid)))),
         ])
 
     elif cfg.state == 'ephemeral':

ommlds/cli/sessions/chat/drivers/tools/injection.py

@@ -29,10 +29,10 @@ def tool_context_providers() -> 'inj.ItemsBinderHelper[_execution.ToolContextPro
 
 
 def bind_tool_context_provider_to_key(key: ta.Any) -> inj.Elements:
-    return tool_context_providers().bind_item(to_fn=inj.KwargsTarget.of(
-        lambda v: _execution.ToolContextProvider(lambda: [v]),
-        v=key,
-    ), singleton=True)
+    return tool_context_providers().bind_item(
+        to_fn=inj.target(v=key)(lambda v: _execution.ToolContextProvider(lambda: [v])),
+        singleton=True,
+    )
 
 
 ##

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

@@ -1,10 +1,31 @@
+import abc
+import typing as ta
 import uuid
 
+from omlish import lang
 from omlish import typedvalues as tv
 
+from ..... import minichain as mc
+
 
 ##
 
 
 class ChatDriverId(tv.UniqueScalarTypedValue[uuid.UUID]):
     pass
+
+
+class ChatDriverGetter(lang.Func0[ta.Awaitable['ChatDriver']]):
+    pass
+
+
+class ChatDriver(lang.Abstract):
+    async def start(self) -> None:
+        pass
+
+    async def stop(self) -> None:
+        pass
+
+    @abc.abstractmethod
+    def send_user_messages(self, next_user_chat: 'mc.UserChat') -> ta.Awaitable[None]:
+        raise NotImplementedError

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

@@ -9,7 +9,7 @@ from .configs import UserConfig
 
 
 with lang.auto_proxy_import(globals()):
-    from .. import driver as _driver
+    from .. import types as _driver
     from ..state import types as _state
 
 

ommlds/cli/sessions/chat/facades/commands/inject.py

@@ -32,8 +32,6 @@ def bind_commands(cfg: CommandsConfig = CommandsConfig()) -> inj.Elements:
         inj.bind(_simple.EchoCommand, singleton=True),
         commands().bind_item(to_key=_simple.EchoCommand),
 
-        inj.bind(_simple.QuitSignal, to_const=lang.as_async(lambda: None)),  # type: ignore  # FIXME: lol
-
         inj.bind(_simple.QuitCommand, singleton=True),
         commands().bind_item(to_key=_simple.QuitCommand),
     ])

ommlds/cli/sessions/chat/facades/commands/simple.py

@@ -1,8 +1,6 @@
-import typing as ta
-
-from omlish import lang
 from omlish.argparse import all as argparse
 
+from ..ui import UiQuitSignal
 from .base import Command
 
 
@@ -22,15 +20,11 @@ class EchoCommand(Command):
 ##
 
 
-class QuitSignal(lang.Func0[ta.Awaitable[None]]):
-    pass
-
-
 class QuitCommand(Command):
     def __init__(
             self,
             *,
-            quit_signal: QuitSignal,
+            quit_signal: UiQuitSignal,
     ) -> None:
         super().__init__()
 

ommlds/cli/sessions/chat/facades/facade.py

@@ -1,5 +1,5 @@
 from ..... import minichain as mc
-from ..drivers.driver import ChatDriver
+from ..drivers.types import ChatDriver
 from .commands.manager import CommandsManager
 
 

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

@@ -6,6 +6,7 @@ from .configs import FacadeConfig
 
 with lang.auto_proxy_import(globals()):
     from . import facade as _facade
+    from . import ui as _ui
     from .commands import inject as _commands
 
 
@@ -27,4 +28,8 @@ def bind_facade(cfg: FacadeConfig = FacadeConfig()) -> inj.Elements:
 
     #
 
+    els.append(inj.bind(_ui.UiQuitSignal(_ui.raise_system_exit_ui_quit_signal)))
+
+    #
+
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/facades/ui.py

@@ -21,3 +21,14 @@ class NopUiMessageDisplayer(UiMessageDisplayer):
 class PrintMessageDisplayer(UiMessageDisplayer):
     async def display_ui_message(self, content: str) -> None:
         print(content)
+
+
+##
+
+
+class UiQuitSignal(lang.Func0[ta.Awaitable[None]]):
+    pass
+
+
+async def raise_system_exit_ui_quit_signal() -> None:
+    raise SystemExit

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

@@ -3,7 +3,7 @@ import typing as ta
 from .....inputs.asyncs import AsyncStringInput
 from .....inputs.asyncs import SyncAsyncStringInput
 from .....inputs.sync import InputSyncStringInput
-from ...drivers.driver import ChatDriver
+from ...drivers.types import ChatDriver
 from ...facades.facade import ChatFacade
 from ..base import ChatInterface
 

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

@@ -1,4 +1,4 @@
-from ...drivers.driver import ChatDriver
+from ...drivers.types import ChatDriver
 from ..base import ChatInterface
 
 

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

@@ -1,6 +1,7 @@
 import asyncio
 import os
 import typing as ta
+import weakref
 
 from omdev.tui import textual as tx
 from omlish import check
@@ -10,14 +11,15 @@ from omlish.logs import all as logs
 
 from ...... import minichain as mc
 from .....backends.types import BackendName
-from ...drivers.driver import ChatDriver
 from ...drivers.events.types import AiDeltaChatEvent
 from ...drivers.events.types import AiMessagesChatEvent
+from ...drivers.types import ChatDriver
 from ...facades.facade import ChatFacade
 from .styles import read_app_css
 from .widgets.input import InputOuter
 from .widgets.input import InputTextArea
 from .widgets.messages import AiMessage
+from .widgets.messages import MessagesContainer
 from .widgets.messages import StaticAiMessage
 from .widgets.messages import StreamAiMessage
 from .widgets.messages import ToolConfirmationMessage
@@ -66,6 +68,8 @@ class ChatApp(tx.App):
 
         self._chat_action_queue: asyncio.Queue[ta.Any] = asyncio.Queue()
 
+        self._input_focused_key_events: weakref.WeakSet[tx.Key] = weakref.WeakSet()
+
     def get_driver_class(self) -> type[tx.Driver]:
         return tx.get_pending_writes_driver_class(super().get_driver_class())
 
@@ -74,7 +78,7 @@ class ChatApp(tx.App):
     #
 
     def compose(self) -> tx.ComposeResult:
-        yield tx.VerticalScroll(id='messages-container')
+        yield MessagesContainer(id='messages-container')
 
         yield InputOuter(id='input-outer')
 
@@ -84,7 +88,7 @@ class ChatApp(tx.App):
         return self.query_one('#input', InputTextArea)
 
     def _get_messages_container(self) -> tx.VerticalScroll:
-        return self.query_one('#messages-container', tx.VerticalScroll)
+        return self.query_one('#messages-container', MessagesContainer)
 
     #
 
@@ -261,6 +265,20 @@ class ChatApp(tx.App):
 
         await self._chat_action_queue.put(ChatApp.UserInput(event.text))
 
+    @tx.on(tx.Key)
+    async def on_key(self, event: tx.Key) -> None:
+        if event in self._input_focused_key_events:
+            return
+
+        chat_input = self._get_input_text_area()
+
+        if not chat_input.has_focus:
+            self._input_focused_key_events.add(event)
+
+            chat_input.focus()
+
+            self.screen.post_message(tx.Key(event.key, event.character))
+
     #
 
     async def confirm_tool_use(

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

@@ -44,10 +44,7 @@ def bind_textual(cfg: TextualInterfaceConfig = TextualInterfaceConfig()) -> inj.
     els.extend([
         inj.bind(_app.ChatEventQueue, to_const=asyncio.Queue()),
 
-        event_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
-            lambda eq: lambda ev: eq.put(ev),
-            eq=_app.ChatEventQueue,
-        )),
+        event_callbacks().bind_item(to_fn=inj.target(eq=_app.ChatEventQueue)(lambda eq: lambda ev: eq.put(ev))),
     ])
 
     #
@@ -83,7 +80,7 @@ def bind_textual(cfg: TextualInterfaceConfig = TextualInterfaceConfig()) -> inj.
 
         inj.bind(
             tx.DevtoolsSetup,
-            to_async_fn=inj.KwargsTarget.of(lambda mgr: mgr.get_setup(), mgr=tx.DevtoolsManager),
+            to_async_fn=inj.target(mgr=tx.DevtoolsManager)(lambda mgr: mgr.get_setup()),
             singleton=True,
         ),
     ])

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

@@ -53,6 +53,8 @@
 /* Welcome */
 
 .welcome-message {
+    margin: 0;
+
     padding: 1 2 1 1;
 
     border: round;

ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py

@@ -9,6 +9,13 @@ from omlish import lang
 ##
 
 
+class MessagesContainer(tx.VerticalScroll):
+    pass
+
+
+##
+
+
 class Message(tx.Static, lang.Abstract):
     def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
         super().__init__(*args, **kwargs)
@@ -16,7 +23,7 @@ class Message(tx.Static, lang.Abstract):
         self.add_class('message')
 
 
-##
+#
 
 
 class WelcomeMessage(Message):
@@ -32,7 +39,7 @@ class WelcomeMessage(Message):
             yield tx.Static(self._content, classes='welcome-message-content')
 
 
-##
+#
 
 
 class UserMessage(Message):
@@ -50,7 +57,7 @@ class UserMessage(Message):
                 yield tx.Static(self._content)
 
 
-##
+#
 
 
 class AiMessage(Message, lang.Abstract):
@@ -124,7 +131,7 @@ class StreamAiMessage(AiMessage):
         self._stream_ = None
 
 
-##
+#
 
 
 class ToolConfirmationControls(tx.Static):
@@ -172,7 +179,7 @@ class ToolConfirmationMessage(Message):
         self._fut.set_result(True)
 
 
-##
+#
 
 
 class UiMessage(Message):

ommlds/minichain/__init__.py

@@ -227,6 +227,10 @@ with _lang.auto_proxy_init(
 
     ##
 
+    from .content.cancontent import (  # noqa
+        CanContent,
+    )
+
     from .content.images import (  # noqa
         ImageContent,
     )
@@ -236,8 +240,6 @@ with _lang.auto_proxy_init(
     )
 
     from .content.materialize import (  # noqa
-        CanContent,
-
         materialize_content,
     )
 
@@ -275,6 +277,10 @@ with _lang.auto_proxy_init(
         SequenceContent,
     )
 
+    from .content.tag import (  # noqa
+        TagContent,
+    )
+
     from .content.text import (  # noqa
         TextContent,
     )
@@ -391,6 +397,14 @@ with _lang.auto_proxy_init(
         tool_context,
     )
 
+    from .tools.execution.errorhandling import (  # noqa
+        ErrorHandlingToolExecutor,
+    )
+
+    from .tools.execution.errors import (  # noqa
+        ToolExecutionError,
+    )
+
     from .tools.execution.executors import (  # noqa
         ToolExecutor,
 
@@ -403,10 +417,6 @@ with _lang.auto_proxy_init(
         reflect_tool_catalog_entry,
     )
 
-    from .tools.execution.errors import (  # noqa
-        ToolExecutionError,
-    )
-
     from .tools.fns import (  # noqa
         ToolFn,