ommlds 0.0.0.dev491__py3-none-any.whl → 0.0.0.dev492__py3-none-any.whl

ommlds/.omlish-manifests.json

@@ -459,7 +459,7 @@
     "module": ".minichain.backends.impls.ollama.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/ollama/chat.py",
-    "line": 35,
+    "line": 61,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -475,7 +475,7 @@
     "module": ".minichain.backends.impls.ollama.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/ollama/chat.py",
-    "line": 68,
+    "line": 94,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.ollama.chat",
@@ -490,7 +490,7 @@
     "module": ".minichain.backends.impls.ollama.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/ollama/chat.py",
-    "line": 111,
+    "line": 137,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.ollama.chat",
@@ -550,7 +550,7 @@
     "module": ".minichain.backends.impls.openai.names",
     "attr": "_CHAT_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/openai/names.py",
-    "line": 65,
+    "line": 67,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -575,6 +575,7 @@
             "gpt-5-mini": null,
             "gpt-5-nano": null,
             "gpt-5.1": null,
+            "gpt-5.2": null,
             "gpt3.5-turbo": "gpt-3.5-turbo",
             "gpt3.5-turbo-instruct": "gpt-3.5-turbo-instruct",
             "gpt4": "gpt-4",
@@ -589,7 +590,8 @@
             "gpt5-mini": "gpt-5-mini",
             "gpt5-nano": "gpt-5-nano",
             "gpt5.1": "gpt-5.1",
-            "gpt": "gpt-5.1",
+            "gpt5.2": "gpt-5.2",
+            "gpt": "gpt-5.2",
             "gpt-mini": "gpt-5-mini",
             "o3": null,
             "o3-mini": null,
@@ -604,7 +606,7 @@
     "module": ".minichain.backends.impls.openai.names",
     "attr": "_COMPLETION_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/openai/names.py",
-    "line": 79,
+    "line": 81,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -619,7 +621,7 @@
     "module": ".minichain.backends.impls.openai.names",
     "attr": "_EMBEDDING_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/openai/names.py",
-    "line": 91,
+    "line": 93,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [

ommlds/cli/main.py

@@ -36,7 +36,8 @@ def _process_main_extra_args(args: ap.Namespace) -> None:
         logs.configure_standard_logging('DEBUG')
     else:
         logs.configure_standard_logging('INFO')
-        logs.silence_noisy_loggers()
+
+    logs.silence_noisy_loggers()
 
 
 ##

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

@@ -3,6 +3,8 @@ TODO:
  - lifecycles
  - StreamService
 """
+from omlish import lang
+
 from ..... import minichain as mc
 from .ai.types import AiChatGenerator
 from .events.manager import ChatEventsManager
@@ -15,6 +17,10 @@ from .state.types import ChatStateManager
 ##
 
 
+class ChatDriverGetter(lang.Func0['ChatDriver']):
+    pass
+
+
 class ChatDriver:
     def __init__(
             self,

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

@@ -53,7 +53,7 @@ def bind_driver(cfg: DriverConfig) -> inj.Elements:
     els.extend([
         inj.bind(_driver.ChatDriver, singleton=True),
 
-        inj.bind_late(_driver.ChatDriver),
+        inj.bind_late(_driver.ChatDriver, _driver.ChatDriverGetter),
     ])
 
     #

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

@@ -29,12 +29,12 @@ def bind_user(cfg: UserConfig = UserConfig()) -> inj.Elements:
         )))
 
     if cfg.initial_user_content is not None:
-        async def add_initial_user_content(ca: '_driver.ChatDriver') -> None:
-            await ca.send_user_messages([mc.UserMessage(cfg.initial_user_content)])
+        async def add_initial_user_content(cd: '_driver.ChatDriver') -> None:
+            await cd.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[_driver.ChatDriver],
+            lambda cdg: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_user_content(cdg())),
+            cdg=_driver.ChatDriverGetter,
         )))
 
     return inj.as_elements(*els)

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

@@ -36,6 +36,12 @@ class InteractiveBareChatInterface(ChatInterface):
             except EOFError:
                 break
 
+            print()
+            print('<')
+            print()
+
             await self._driver.send_user_messages([mc.UserMessage(s)])
 
+            print()
+
         await self._driver.stop()

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

@@ -16,7 +16,7 @@ def bind_interface(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
     els: list[inj.Elemental] = []
 
     if cfg.use_textual:
-        els.append(_textual.bind_textual())
+        els.append(_textual.bind_textual(cfg))
 
     else:
         els.append(_bare.bind_bare(cfg))

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

@@ -3,6 +3,8 @@ import typing as ta
 
 from omdev.tui import textual as tx
 from omlish import check
+from omlish import lang
+from omlish.logs import all as logs
 
 from ...... import minichain as mc
 from ...drivers.driver import ChatDriver
@@ -14,10 +16,14 @@ from .widgets.input import InputTextArea
 from .widgets.messages import AiMessage
 from .widgets.messages import StaticAiMessage
 from .widgets.messages import StreamAiMessage
+from .widgets.messages import ToolConfirmationMessage
 from .widgets.messages import UserMessage
 from .widgets.messages import WelcomeMessage
 
 
+log, alog = logs.get_module_loggers(globals())
+
+
 ##
 
 
@@ -27,19 +33,27 @@ ChatDriverEventQueue = ta.NewType('ChatDriverEventQueue', asyncio.Queue)
 ##
 
 
+class ChatAppGetter(lang.CachedFunc0['ChatApp']):
+    pass
+
+
 class ChatApp(tx.App):
     ENABLE_COMMAND_PALETTE: ta.ClassVar[bool] = False
 
     def __init__(
             self,
             *,
-            driver: ChatDriver,
-            event_queue: ChatDriverEventQueue,
+            chat_driver: ChatDriver,
+            chat_driver_event_queue: ChatDriverEventQueue,
     ) -> None:
         super().__init__()
 
-        self._chat_driver = driver
-        self._event_queue = event_queue
+        tx.setup_app_devtools(self, port=41932)
+
+        self._chat_driver = chat_driver
+        self._chat_driver_event_queue = chat_driver_event_queue
+
+        self._chat_driver_action_queue: asyncio.Queue[ta.Any] = asyncio.Queue()
 
     def get_driver_class(self) -> type[tx.Driver]:
         return tx.get_pending_writes_driver_class(super().get_driver_class())
@@ -49,8 +63,7 @@ class ChatApp(tx.App):
     #
 
     def compose(self) -> tx.ComposeResult:
-        with tx.VerticalScroll(id='messages-scroll'):
-            yield tx.Static(id='messages-container')
+        yield tx.VerticalScroll(id='messages-container')
 
         yield InputOuter(id='input-outer')
 
@@ -59,22 +72,19 @@ class ChatApp(tx.App):
     def _get_input_text_area(self) -> InputTextArea:
         return self.query_one('#input', InputTextArea)
 
-    def _get_messages_scroll(self) -> tx.VerticalScroll:
-        return self.query_one('#messages-scroll', tx.VerticalScroll)
-
-    def _get_messages_container(self) -> tx.Static:
-        return self.query_one('#messages-container', tx.Static)
+    def _get_messages_container(self) -> tx.VerticalScroll:
+        return self.query_one('#messages-container', tx.VerticalScroll)
 
     #
 
     def _is_messages_at_bottom(self, threshold: int = 3) -> bool:
-        return (ms := self._get_messages_scroll()).scroll_y >= (ms.max_scroll_y - threshold)
+        return (ms := self._get_messages_container()).scroll_y >= (ms.max_scroll_y - threshold)
 
     def _scroll_messages_to_bottom(self) -> None:
-        self._get_messages_scroll().scroll_end(animate=False)
+        self._get_messages_container().scroll_end(animate=False)
 
     def _anchor_messages(self) -> None:
-        if (ms := self._get_messages_scroll()).max_scroll_y:
+        if (ms := self._get_messages_container()).max_scroll_y:
             ms.anchor()
 
     #
@@ -102,7 +112,7 @@ class ChatApp(tx.App):
 
             await sam.append_content(content)
 
-            self.call_after_refresh(lambda: self._get_messages_container().scroll_end(animate=False))
+            self.call_after_refresh(self._scroll_messages_to_bottom)
 
             if was_at_bottom:
                 self.call_after_refresh(self._anchor_messages)
@@ -116,7 +126,7 @@ class ChatApp(tx.App):
         msg_ctr = self._get_messages_container()
 
         for msg in [*(self._pending_mount_messages or []), *messages]:
-            if isinstance(msg, AiMessage):
+            if isinstance(msg, (AiMessage, ToolConfirmationMessage)):
                 await self._finalize_stream_ai_message()
 
             await msg_ctr.mount(msg)
@@ -127,21 +137,24 @@ class ChatApp(tx.App):
 
         self._pending_mount_messages = None
 
-        self.call_after_refresh(lambda: msg_ctr.scroll_end(animate=False))
+        self.call_after_refresh(self._scroll_messages_to_bottom)
 
         if was_at_bottom:
             self.call_after_refresh(self._anchor_messages)
 
     #
 
-    _event_queue_task: asyncio.Task[None] | None = None
+    _chat_driver_event_task: asyncio.Task[None] | None = None
 
-    async def _event_queue_task_main(self) -> None:
+    @logs.async_exception_logging(alog)
+    async def _chat_driver_event_task_main(self) -> None:
         while True:
-            ev = await self._event_queue.get()
+            ev = await self._chat_driver_event_queue.get()
             if ev is None:
                 break
 
+            await alog.debug(lambda: f'Got chat driver event: {ev!r}')
+
             if isinstance(ev, AiMessagesChatEvent):
                 wx: list[tx.Widget] = []
 
@@ -159,35 +172,46 @@ class ChatApp(tx.App):
                     self.call_later(self._mount_messages)
 
             elif isinstance(ev, AiDeltaChatEvent):
-                cd = check.isinstance(ev.delta, mc.ContentAiDelta)
-                cc = check.isinstance(cd.c, str)
-                self.call_later(self. _append_stream_ai_message_content, cc)
+                if isinstance(ev.delta, mc.ContentAiDelta):
+                    cc = check.isinstance(ev.delta.c, str)
+                    self.call_later(self._append_stream_ai_message_content, cc)
+
+                elif isinstance(ev.delta, mc.ToolUseAiDelta):
+                    pass
 
     #
 
-    # def _schedule_after_refresh(self) -> None:
-    #     self.call_after_refresh(self._after_refresh)
+    _chat_driver_action_task: asyncio.Task[None] | None = None
 
-    # def _after_refresh(self) -> None:
-    #     self.after_repaint()
-    #
-    #     self._schedule_after_refresh()
+    @logs.async_exception_logging(alog)
+    async def _chat_driver_action_task_main(self) -> None:
+        while True:
+            ac = await self._chat_driver_action_queue.get()
+            if ac is None:
+                break
 
-    # def after_repaint(self) -> None:
-    #     # from omdev.tui.textual.debug.dominfo import inspect_dom_node  # noqa
-    #
-    #     pass
+            await alog.debug(lambda: f'Got chat driver action: {ac!r}')
+
+            if isinstance(ac, mc.UserMessage):
+                try:
+                    await self._chat_driver.send_user_messages([ac])
+                except Exception as e:  # noqa
+                    raise
+
+            else:
+                raise TypeError(ac)  # noqa
 
     #
 
     async def on_mount(self) -> None:
-        # self._schedule_after_refresh()
-
-        check.state(self._event_queue_task is None)
-        self._event_queue_task = asyncio.create_task(self._event_queue_task_main())
+        check.state(self._chat_driver_event_task is None)
+        self._chat_driver_event_task = asyncio.create_task(self._chat_driver_event_task_main())
 
         await self._chat_driver.start()
 
+        check.state(self._chat_driver_action_task is None)
+        self._chat_driver_action_task = asyncio.create_task(self._chat_driver_action_task_main())
+
         self._get_input_text_area().focus()
 
         await self._mount_messages(
@@ -197,12 +221,17 @@ class ChatApp(tx.App):
         )
 
     async def on_unmount(self) -> None:
+        if (cdt := self._chat_driver_event_task) is not None:
+            await self._chat_driver_event_queue.put(None)
+            await cdt
+
         await self._chat_driver.stop()
 
-        if (eqt := self._event_queue_task) is not None:
-            await self._event_queue.put(None)
-            await eqt
+        if (cet := self._chat_driver_event_task) is not None:
+            await self._chat_driver_event_queue.put(None)
+            await cet
 
+    @tx.on(InputTextArea.Submitted)
     async def on_input_text_area_submitted(self, event: InputTextArea.Submitted) -> None:
         self._get_input_text_area().clear()
 
@@ -214,4 +243,20 @@ class ChatApp(tx.App):
             ),
         )
 
-        await self._chat_driver.send_user_messages([mc.UserMessage(event.text)])
+        await self._chat_driver_action_queue.put(mc.UserMessage(event.text))
+
+    #
+
+    async def confirm_tool_use(self, message: str) -> bool:
+        fut: asyncio.Future[bool] = asyncio.get_running_loop().create_future()
+
+        tcm = ToolConfirmationMessage(message, fut)
+
+        async def inner() -> None:
+            await self._mount_messages(tcm)
+
+        self.call_later(inner)
+
+        ret = await fut
+
+        return ret

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

@@ -10,13 +10,13 @@ from omlish import lang
 from ...drivers.events.injection import event_callbacks
 from ..base import ChatInterface
 from ..configs import InterfaceConfig
-from .app import ChatApp
-from .app import ChatDriverEventQueue
-from .interface import TextualChatInterface
 
 
 with lang.auto_proxy_import(globals()):
     from ...drivers.tools import confirmation as _tools_confirmation
+    from . import app as _app
+    from . import interface as _interface
+    from . import tools as _tools
 
 
 ##
@@ -24,23 +24,25 @@ with lang.auto_proxy_import(globals()):
 
 def bind_textual(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
     els: list[inj.Elemental] = [
-        inj.bind(ChatInterface, to_ctor=TextualChatInterface, singleton=True),
+        inj.bind(ChatInterface, to_ctor=_interface.TextualChatInterface, singleton=True),
     ]
 
     #
 
     els.extend([
-        inj.bind(ChatApp, singleton=True),
+        inj.bind(_app.ChatApp, singleton=True),
+
+        inj.bind_late(_app.ChatApp, _app.ChatAppGetter),
     ])
 
     #
 
     els.extend([
-        inj.bind(ChatDriverEventQueue, to_const=asyncio.Queue()),
+        inj.bind(_app.ChatDriverEventQueue, to_const=asyncio.Queue()),
 
         event_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
             lambda eq: lambda ev: eq.put(ev),
-            eq=ChatDriverEventQueue,
+            eq=_app.ChatDriverEventQueue,
         )),
     ])
 
@@ -55,12 +57,11 @@ def bind_textual(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
             ))
 
         else:
-            # els.append(inj.bind(
-            #     _tools_confirmation.ToolExecutionConfirmation,
-            #     to_ctor=_tools.InteractiveToolExecutionConfirmation,
-            #     singleton=True,
-            # ))
-            raise NotImplementedError
+            els.append(inj.bind(
+                _tools_confirmation.ToolExecutionConfirmation,
+                to_ctor=_tools.ChatAppToolExecutionConfirmation,
+                singleton=True,
+            ))
 
     #
 

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

@@ -1,7 +1,90 @@
+import inspect
+import logging
+import typing as ta
+
+from omdev.tui import textual as tx
+
 from ..base import ChatInterface
 from .app import ChatApp
 
 
+if ta.TYPE_CHECKING:
+    from textual_dev.client import DevtoolsClient
+
+
+##
+
+
+def _translate_log_level(level: int) -> tuple['tx.LogGroup', 'tx.LogVerbosity']:
+    if level >= logging.ERROR:
+        return (tx.LogGroup.ERROR, tx.LogVerbosity.HIGH)
+    elif level >= logging.WARNING:
+        return (tx.LogGroup.ERROR, tx.LogVerbosity.HIGH)
+    elif level >= logging.INFO:
+        return (tx.LogGroup.INFO, tx.LogVerbosity.NORMAL)
+    elif level >= logging.DEBUG:
+        return (tx.LogGroup.DEBUG, tx.LogVerbosity.NORMAL)
+    else:
+        return (tx.LogGroup.UNDEFINED, tx.LogVerbosity.NORMAL)
+
+
+class _HackLoggingHandler(logging.Handler):
+    """
+    TODO:
+     - reify caller from LogContextInfos
+     - queue worker, this blocks the asyncio thread lol
+     - move to omdev.tui.textual obviously
+    """
+
+    def __init__(self, devtools: ta.Optional['DevtoolsClient']) -> None:
+        super().__init__()
+
+        self._devtools = devtools
+
+    def emit(self, record: logging.LogRecord) -> None:
+        if (devtools := self._devtools) is not None and devtools.is_connected:
+            from textual_dev.client import DevtoolsLog
+
+            msg = self.format(record)
+
+            caller = inspect.Traceback(
+                filename=record.filename,
+                lineno=record.lineno,
+                function=record.funcName,
+                code_context=None,
+                index=None,
+            )
+
+            group, verbosity = _translate_log_level(record.levelno)
+
+            devtools.log(
+                DevtoolsLog(
+                    msg,
+                    caller=caller,
+                ),
+                group=group,
+                verbosity=verbosity,
+            )
+
+
+def _hack_loggers(devtools: ta.Optional['DevtoolsClient']) -> None:
+    from omlish.logs.std.standard import _locking_logging_module_lock  # noqa
+    from omlish.logs.std.standard import StandardConfiguredLoggingHandler
+
+    with _locking_logging_module_lock():
+        std_handler = next((h for h in logging.root.handlers if isinstance(h, StandardConfiguredLoggingHandler)), None)
+
+        hack_handler = _HackLoggingHandler(devtools)
+
+        if std_handler is not None:
+            hack_handler.setFormatter(std_handler.formatter)
+
+            for std_filter in std_handler.filters:
+                hack_handler.addFilter(std_filter)
+
+        logging.root.handlers = [hack_handler]
+
+
 ##
 
 
@@ -16,4 +99,6 @@ class TextualChatInterface(ChatInterface):
         self._app = app
 
     async def run(self) -> None:
+        _hack_loggers(self._app.devtools)
+
         await self._app.run_async()

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

@@ -1,13 +1,15 @@
 #input-outer {
     width: 100%;
     height: auto;
+
+    background: $background-darken-3;
 }
 
 #input-vertical {
     width: 100%;
     height: auto;
 
-    margin: 0 2 1 2;
+    margin: 0 1 1 1;
 
     padding: 0;
 }

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

@@ -1,33 +1,47 @@
 /* Container */
 
-#messages-scroll {
+#messages-container {
     width: 100%;
     height: 1fr;
 
-    padding: 0 2 0 2;
+    scrollbar-gutter: stable;
+
+    background: $background-darken-3;
+
+    text-align: left;
+
+    scrollbar-size: 1 1;
 }
 
-#messages-container {
-    width: 100%;
+
+/* Base */
+
+.message {
+    width: 1fr;
     height: auto;
 
-    margin-top: 1;
-    margin-bottom: 0;
+    margin: 1 0 0 0;
+
+    padding-right: 1;
 
     layout: stream;
-    text-align: left;
 }
 
 
 /* Welcome */
 
 .welcome-message {
-    margin: 1;
+    padding: 1 2 1 1;
 
     border: round;
+}
 
-    padding: 1;
+.welcome-message-outer {
+    width: 1fr;
+    height: auto;
+}
 
+.welcome-message-content {
     text-align: center;
 }
 
@@ -35,14 +49,10 @@
 /* User */
 
 .user-message {
-    width: 100%;
-    height: auto;
-
-    margin-top: 1;
 }
 
 .user-message-outer {
-    width: 100%;
+    width: 1fr;
     height: auto;
 }
 
@@ -57,7 +67,7 @@
 }
 
 .user-message-inner {
-    width: 100%;
+    width: 1fr;
     height: auto;
 }
 
@@ -65,14 +75,10 @@
 /* Ai */
 
 .ai-message {
-    width: 100%;
-    height: auto;
-
-    margin-top: 1;
 }
 
 .ai-message-outer {
-    width: 100%;
+    width: 1fr;
     height: auto;
 
     align: left top;
@@ -89,7 +95,7 @@
 }
 
 .ai-message-inner {
-    width: 100%;
+    width: 1fr;
     height: auto;
 
     padding: 0;
@@ -102,3 +108,48 @@
         padding: 0;
     }
 }
+
+
+/* Tool Confirmation */
+
+.tool-confirmation-message {
+}
+
+.tool-confirmation-message-outer {
+    width: 1fr;
+    height: auto;
+
+    align: left top;
+}
+
+.tool-confirmation-message-glyph {
+    width: auto;
+    height: auto;
+
+    background: transparent;
+    color: $primary;
+
+    text-style: bold;
+}
+
+.tool-confirmation-message-inner {
+    width: 1fr;
+    height: auto;
+
+    padding: 1;
+}
+
+.tool-confirmation-message-inner-open {
+    background: $warning-lighten-3 15%;
+}
+
+.tool-confirmation-message-inner-closed {
+}
+
+.tool-confirmation-message-content {
+    background: $background;
+}
+
+.tool-confirmation-message-controls {
+    margin-top: 1;
+}

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

@@ -0,0 +1,37 @@
+from omlish.formats import json
+
+from ...... import minichain as mc
+from ...drivers.tools.confirmation import ToolExecutionConfirmation
+from ...drivers.tools.confirmation import ToolExecutionRequestDeniedError
+from .app import ChatAppGetter
+
+
+##
+
+
+class ChatAppToolExecutionConfirmation(ToolExecutionConfirmation):
+    def __init__(
+            self,
+            *,
+            app: ChatAppGetter,
+    ) -> None:
+        super().__init__()
+
+        self._app = app
+
+    async def confirm_tool_execution_or_raise(
+            self,
+            use: 'mc.ToolUse',
+            entry: 'mc.ToolCatalogEntry',
+    ) -> None:
+        tr_dct = dict(
+            id=use.id,
+            name=entry.spec.name,
+            args=use.args,
+            # spec=msh.marshal(tce.spec),
+        )
+
+        msg = f'Execute requested tool?\n\n{json.dumps_pretty(tr_dct)}'  # noqa
+
+        if not await self._app().confirm_tool_use(msg):
+            raise ToolExecutionRequestDeniedError

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

@@ -1,4 +1,5 @@
 import abc
+import asyncio
 import typing as ta
 
 from omdev.tui import textual as tx
@@ -9,7 +10,10 @@ from omlish import lang
 
 
 class Message(tx.Static, lang.Abstract):
-    pass
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.add_class('message')
 
 
 ##
@@ -17,10 +21,16 @@ class Message(tx.Static, lang.Abstract):
 
 class WelcomeMessage(Message):
     def __init__(self, content: str) -> None:
-        super().__init__(content)
+        super().__init__()
 
         self.add_class('welcome-message')
 
+        self._content = content
+
+    def compose(self) -> tx.ComposeResult:
+        with tx.Vertical(classes='welcome-message-outer'):
+            yield tx.Static(self._content, classes='welcome-message-content')
+
 
 ##
 
@@ -112,3 +122,43 @@ class StreamAiMessage(AiMessage):
 
         await stream.stop()
         self._stream_ = None
+
+
+##
+
+
+class ToolConfirmationControls(tx.Static):
+    class Allowed(tx.Message):
+        pass
+
+    def compose(self) -> tx.ComposeResult:
+        yield tx.Button('Allow', action='allow')
+
+    def action_allow(self) -> None:
+        self.post_message(self.Allowed())
+
+
+class ToolConfirmationMessage(Message):
+    def __init__(self, content: str, fut: asyncio.Future[bool]) -> None:
+        super().__init__()
+
+        self.add_class('tool-confirmation-message')
+
+        self._content = content
+        self._fut = fut
+
+    def compose(self) -> tx.ComposeResult:
+        with tx.Horizontal(classes='tool-confirmation-message-outer'):
+            yield tx.Static('? ', classes='tool-confirmation-message-glyph')
+            with tx.Vertical(classes='tool-confirmation-message-inner tool-confirmation-message-inner-open'):
+                yield tx.Static(self._content, classes='tool-confirmation-message-content')
+                yield ToolConfirmationControls(classes='tool-confirmation-message-controls')
+
+    @tx.on(ToolConfirmationControls.Allowed)
+    async def on_allowed(self, event: ToolConfirmationControls.Allowed) -> None:
+        inner = self.query_one(tx.Vertical)
+        await inner.query_one(ToolConfirmationControls).remove()
+        inner.remove_class('tool-confirmation-message-inner-open')
+        inner.add_class('tool-confirmation-message-inner-closed')
+
+        self._fut.set_result(True)

ommlds/minichain/backends/impls/ollama/chat.py

@@ -1,3 +1,29 @@
+"""
+devstral-small-2:24b      24277f07f62d    15 GB     15 hours ago
+
+dolphin3:latest           d5ab9ae8e1f2    4.9 GB    11 months ago (no tools)
+
+gemma3:27b                a418f5838eaf    17 GB     7 weeks ago (no tools)
+gemma3:4b                 a2af6cc3eb7f    3.3 GB    7 weeks ago (no tools)
+
+llama3.2:1b               baf6a787fdff    1.3 GB    13 months ago (too stupid for tools)
+llama3.2:latest           a80c4f17acd5    2.0 GB    13 months ago
+
+ministral-3:14b           4760c35aeb9d    9.1 GB    11 hours ago
+mistral:latest            6577803aa9a0    4.4 GB    3 seconds ago
+
+nemotron-3-nano:30b       b725f1117407    24 GB     15 hours ago
+
+olmo-3.1:32b-instruct     a16b6a5be6cf    19 GB     11 hours ago (no tools)
+olmo-3.1:32b-think        223d4ec84d91    19 GB     11 hours ago (no tools)
+
+phi4-mini:latest          78fad5d182a7    2.5 GB    8 months ago (no tools)
+
+qwen3-coder:30b           06c1097efce0    18 GB     11 hours ago
+qwen3-next:80b            b2ebb986e4e9    50 GB     11 hours ago
+qwen3:30b                 ad815644918f    18 GB     11 hours ago
+qwen3:32b                 030ee887880f    20 GB     11 hours ago
+"""
 import typing as ta
 
 from omlish import check

ommlds/minichain/backends/impls/openai/names.py

@@ -32,6 +32,8 @@ _GPT_MODEL_NAMES = [
     'gpt-5-nano',
 
     'gpt-5.1',
+
+    'gpt-5.2',
 ]
 
 
@@ -48,7 +50,7 @@ CHAT_MODEL_NAMES = ModelNameCollection(
             for n in _GPT_MODEL_NAMES
         },
 
-        'gpt': 'gpt-5.1',
+        'gpt': 'gpt-5.2',
         'gpt-mini': 'gpt-5-mini',
 
         #

{ommlds-0.0.0.dev491.dist-info → ommlds-0.0.0.dev492.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev491
+Version: 0.0.0.dev492
 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.dev491
+Requires-Dist: omlish==0.0.0.dev492
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev491; extra == "all"
+Requires-Dist: omdev==0.0.0.dev492; 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.29; 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.dev491; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev492; 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.dev491.dist-info → ommlds-0.0.0.dev492.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=Xz1zqDGjmcuUgaWaK454DizBTKTg5Qj8eRN_vRP-nLw,27810
+ommlds/.omlish-manifests.json,sha256=HQMkRy6laT2rf3PmlTpd0BCs5tTWLi-9d09xRptM2Uw,27872
 ommlds/README.md,sha256=xhbl2n19GznXrIzAGdlX8PAYJYsOo_Zu63I7G1UFRZE,398
 ommlds/__about__.py,sha256=cRA9AUVZmvQaibdmACDEpd5T2VWWVWtJT_zpgt9I0Wg,1900
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -104,7 +104,7 @@ ommlds/cli/__main__.py,sha256=1ffCb0fcUOJMzxROJmJRXQ8PSOVYv7KrcuBtT95cf0c,140
 ommlds/cli/_dataclasses.py,sha256=z-bFKj4I8bBufNzSPexvqdfqEmDpr7CdgqtGC-si1qg,150661
 ommlds/cli/asyncs.py,sha256=NAMzzaZq7ORjlbbBB_Y9vcM9qoBpGf4VJNtl_3p_8G4,629
 ommlds/cli/inject.py,sha256=CdG-Zgq3T0pDWLhHRZSqlkR4W2mS7LlCOHD2uP1llf0,610
-ommlds/cli/main.py,sha256=PQoe6vCcQ5tuYYo5cgXtb7p38K1h7BzLdg415Y9fhyc,10813
+ommlds/cli/main.py,sha256=Jii-_pW551fl4muJi2m3dpF1s01oCoQb1UepIZL8Zxk,10810
 ommlds/cli/secrets.py,sha256=8GHlewS3yeFDfFNekaYwRm4nG9l3nd-Mc8tKl9Ma_Uo,469
 ommlds/cli/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/backends/catalog.py,sha256=hLcBXBCiB7eKT_2yv8kyLD5f94LV7vCcOe144URuJxs,3225
@@ -133,8 +133,8 @@ ommlds/cli/sessions/chat/inject.py,sha256=BTrORil0zpK6jhYpBmMqpZQODueGfu89mfUjXR
 ommlds/cli/sessions/chat/session.py,sha256=gjwCDh8-fDuFD5OvZpJa3C8GShOhbRNZwQv5wreGHR4,801
 ommlds/cli/sessions/chat/drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/drivers/configs.py,sha256=eKJTI1y29L6PUnE5SXDkXdPfpBFeyHxMGTrOOIdYFFk,524
-ommlds/cli/sessions/chat/drivers/driver.py,sha256=MJSLto_wk0J_EkAL404etP4DnccY8u55QAg4J_7ip7A,1521
-ommlds/cli/sessions/chat/drivers/inject.py,sha256=KeQeaCPj7jfPcihAF9BSBIXWYGDth_FECEv2lAgVIVI,1332
+ommlds/cli/sessions/chat/drivers/driver.py,sha256=uewbCaMEjOcSgfKRM93hs1Zrn7NGkgi87mftCmDLLT4,1607
+ommlds/cli/sessions/chat/drivers/inject.py,sha256=5qX1Kbear_iGPwKJkWhI0UuzRLpITEicqXGZGCoBTWM,1358
 ommlds/cli/sessions/chat/drivers/types.py,sha256=KNDkgdX6FdihIYty5S7HHzsGPE-zdAbqFmxwyZF8CZE,124
 ommlds/cli/sessions/chat/drivers/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/drivers/ai/configs.py,sha256=MjuJicX53mrSHCDTpBTHLUyrovXFkKGqrVguuYbrwNg,185
@@ -180,28 +180,29 @@ ommlds/cli/sessions/chat/drivers/tools/weather/inject.py,sha256=HSB6gCp23T2HME07
 ommlds/cli/sessions/chat/drivers/tools/weather/tools.py,sha256=tGkr97D-60Lgsnjs1nSqV5BEZrTNlcaU_TFCY4ZRQyE,304
 ommlds/cli/sessions/chat/drivers/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/drivers/user/configs.py,sha256=tBSP2j1Bynn0Qt_S0GNUuNniMWivVSCFad3H4UCS3qY,280
-ommlds/cli/sessions/chat/drivers/user/inject.py,sha256=LYvB2vSpcBZZ1eM9z8Hxow4uBo_d-MkESVhnZNkLJII,1394
+ommlds/cli/sessions/chat/drivers/user/inject.py,sha256=8Kf0CbeIK2_fMaXTrSXlYCJRk_Ipi39XJK4-gj6Ty6Q,1393
 ommlds/cli/sessions/chat/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/interfaces/base.py,sha256=3z7yI-ow7037_n6VanQYZjOgKL_iRZ8FB6JP553SY7M,198
 ommlds/cli/sessions/chat/interfaces/configs.py,sha256=toI23cp2YVT_m-l-ICwg11xeD0_wkI-NLpBRkjRJyJI,473
-ommlds/cli/sessions/chat/interfaces/inject.py,sha256=Ip-srA7ONGF-YgbLikwfTd3O1UoxeDTMI6CnPpc6A80,493
+ommlds/cli/sessions/chat/interfaces/inject.py,sha256=qyD0MrWlfwFF5d_ofhG83sp4UH3tDlwUkfQ7X9e2lzs,496
 ommlds/cli/sessions/chat/interfaces/bare/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/interfaces/bare/inject.py,sha256=y_iYbVlVn1YCWLUYT0iZ7p3z8Wzfn-RWQZMOkNLKoBQ,1866
-ommlds/cli/sessions/chat/interfaces/bare/interactive.py,sha256=oIBHkRrfLVGhPiVH_7wg79WMwJeNr8cTht20PMNxlho,1096
+ommlds/cli/sessions/chat/interfaces/bare/interactive.py,sha256=kKZyrAnm8gy4bupVFPGWBsgU57MklZS49DcdungEwgs,1181
 ommlds/cli/sessions/chat/interfaces/bare/oneshot.py,sha256=1TNhTtg6KwzbG8GGxrT64tg9TDFakZ32qxrsT-djTwk,388
 ommlds/cli/sessions/chat/interfaces/bare/tools.py,sha256=_UsuoXLIvfpFP_We5DBBlhm6rwB3_cFA3lmFvpG9b-A,824
 ommlds/cli/sessions/chat/interfaces/bare/user.py,sha256=gZgfuQAnU_MH_Awb-Ut6sJE_Di4jvquKOkBT415NmR0,877
 ommlds/cli/sessions/chat/interfaces/textual/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/interfaces/textual/app.py,sha256=UKaPnLUNqb8_u1L4PigJyDBfDqgk00lNU4gUogsg_0M,6465
-ommlds/cli/sessions/chat/interfaces/textual/inject.py,sha256=dI7ZeQNVegL5MCwKJ_uNf-ZpBuUim9G84etHSkTHWOI,1672
-ommlds/cli/sessions/chat/interfaces/textual/interface.py,sha256=tvS8ORiunBxTIkTW2YmqRRyL7p46FrVpZEeix-ez9FA,322
+ommlds/cli/sessions/chat/interfaces/textual/app.py,sha256=jRgm05Kxokw2Iy_cQz2NqR4TawiGo5rpVQUK-teRGHc,7885
+ommlds/cli/sessions/chat/interfaces/textual/inject.py,sha256=bklFLLxzOHv02LZEC4Wf2dD_K8hlt_quyMp3YiH3JzU,1703
+ommlds/cli/sessions/chat/interfaces/textual/interface.py,sha256=cNgkZq5Q8SxPhqirdZN-1tlh_fLvfop-hUamIPPMOnE,2837
+ommlds/cli/sessions/chat/interfaces/textual/tools.py,sha256=svxDS2kUybojbLVQ42x8JzEx_yvUyQa6mEOqWf-XIFs,966
 ommlds/cli/sessions/chat/interfaces/textual/styles/__init__.py,sha256=7_U5oUjwegOymeWgt6nLpFfWfjGTrlWL8m4Au8MsaFE,542
-ommlds/cli/sessions/chat/interfaces/textual/styles/input.tcss,sha256=6aYFNxZ-GmTLirWnJcxVNPeq8YqgjS4GJDuxwXbOBhI,601
+ommlds/cli/sessions/chat/interfaces/textual/styles/input.tcss,sha256=9LLwsuYjY8y1XTEnBy_ADKzpRaPPvpe-mNHhiAjEIdo,640
 ommlds/cli/sessions/chat/interfaces/textual/styles/markdown.tcss,sha256=KCKlgt_EEjHVZSTwP_w2YMrR6mURLYVryOwOziAFlTw,105
-ommlds/cli/sessions/chat/interfaces/textual/styles/messages.tcss,sha256=PpBc7IfCJyhHdsFftDY1YHb4-ccVpTlpcYxg-6NGWW0,1171
+ommlds/cli/sessions/chat/interfaces/textual/styles/messages.tcss,sha256=v20cVDQQzCZWhWz1qW29EBKazJ0uoWtUuTGBQ-8uFew,1864
 ommlds/cli/sessions/chat/interfaces/textual/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/interfaces/textual/widgets/input.py,sha256=7PrKv6ZqPoDOTOE2V-Pz2hru1n1Dwz_4Fxc1eBwqdr0,944
-ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py,sha256=8h-pCaUOpEdimZUnyWmiQiHPAwARfqCi9SosskhR7Bk,2656
+ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py,sha256=HqBrx4-5J6wD8Zj09CTECMw4Pw_zwUjPLjQ7UZN41s8,4421
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/completion/configs.py,sha256=ZibOyJxIMbclzKDK_mj8jVzFJxjkyVWmo1Tb9ZnQQ1M,240
 ommlds/cli/sessions/completion/inject.py,sha256=vk3ewhXWGemKcOllr1iG_nMz5523qEu40MI62Dlx9AQ,933
@@ -275,14 +276,14 @@ ommlds/minichain/backends/impls/llamacpp/stream.py,sha256=XMKNMGzn5dFIZCqfEQdUvy
 ommlds/minichain/backends/impls/mlx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/mlx/chat.py,sha256=tmZZAmVg-XcbxZYGNHrKC0hiJbxW88pgEHqIEC5D2Xc,7536
 ommlds/minichain/backends/impls/ollama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/ollama/chat.py,sha256=xggP89xsZZ73QQnlxw7vn5G7swN10JAhVCpW1OWFf6g,5604
+ommlds/minichain/backends/impls/ollama/chat.py,sha256=Ugdi--BM77tCwXezSBUgnE8BbClMCSaZ4wUkxaFNcC4,6751
 ommlds/minichain/backends/impls/ollama/protocol.py,sha256=1G5B1dtLdfOQVI32fSgzMaqN0iPv_WZkn1p6KKVgUNM,4749
 ommlds/minichain/backends/impls/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/openai/chat.py,sha256=G1IK94PwB16rYCkRos9JEuiAu1GgCK4CnZFOIShhpig,2856
 ommlds/minichain/backends/impls/openai/completion.py,sha256=4Mi4Zvrq5fCqUd0asL3WiCbCdmxOdo0NFkoZMfdsYXY,1939
 ommlds/minichain/backends/impls/openai/embedding.py,sha256=BNtvKYLTsnQwQR9Tv3Fr8zCYN1kr1UNdJ15lcsjz6X0,1765
 ommlds/minichain/backends/impls/openai/format.py,sha256=dAvaqi3LhPu7N9S8BDBkuGSWdD_cxkBEIXPLChcGWdk,7414
-ommlds/minichain/backends/impls/openai/names.py,sha256=5Q6tJbdEtAAsM6mzYLo6cCcMdbgzfbFXLwxVXafqYvo,1534
+ommlds/minichain/backends/impls/openai/names.py,sha256=M1spn4Yio6LEnKWEzPqXSrzJg3wsf2M1iZIYFAvxb80,1550
 ommlds/minichain/backends/impls/openai/stream.py,sha256=bsZeGUepqOl9AcN44kWk03V6q-v1ewBCfZqb_MJEfxg,5454
 ommlds/minichain/backends/impls/sentencepiece/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/sentencepiece/tokens.py,sha256=S32bkN5bbAeLrRLW0VW2N4dEOKvBwt2mMS3CGbcmzQI,1679
@@ -467,9 +468,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.dev491.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev491.dist-info/METADATA,sha256=5AhDRw276qD3ClTCg_Wh8x4iyQ-LhrVpZ8K3BRGAOhI,3493
-ommlds-0.0.0.dev491.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev491.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev491.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev491.dist-info/RECORD,,
+ommlds-0.0.0.dev492.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev492.dist-info/METADATA,sha256=Wr6m1PkP3_nshtFnuS5mMHM5eRGMT2o_7CXbwB3heyc,3493
+ommlds-0.0.0.dev492.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev492.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev492.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev492.dist-info/RECORD,,