ommlds 0.0.0.dev513__py3-none-any.whl → 0.0.0.dev515__py3-none-any.whl

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

@@ -59,6 +59,12 @@ class ChatAppScreen(tx.Screen):
             'Copy selected text',
             show=False,
         ),
+
+        tx.Binding(
+            'f10',
+            'app.confirm_all_pending_tool_uses',
+            'Confirms all pending tool uses',
+        ),
     ]
 
     @classmethod
@@ -110,6 +116,8 @@ class ChatApp(
 
         self._input_focused_key_events: weakref.WeakSet[tx.Key] = weakref.WeakSet()
 
+        self._pending_tool_confirmations: set[ToolConfirmationMessage] = set()
+
     def get_driver_class(self) -> type[tx.Driver]:
         return tx.get_pending_writes_driver_class(super().get_driver_class())
 
@@ -327,7 +335,7 @@ class ChatApp(
 
     async def on_unmount(self) -> None:
         if (cat := self._chat_action_queue_task) is not None:
-            await self._chat_event_queue.put(None)
+            await self._chat_action_queue.put(None)
             await cat
 
         await self._chat_driver.stop()
@@ -351,7 +359,7 @@ class ChatApp(
             ),
         )
 
-        self._input_history_manager.add(event.text)
+        await self._input_history_manager.add(event.text)
 
         await self._chat_action_queue.put(ChatApp.UserInput(event.text))
 
@@ -363,12 +371,14 @@ class ChatApp(
 
     @tx.on(InputTextArea.HistoryPrevious)
     async def on_input_text_area_history_previous(self, event: InputTextArea.HistoryPrevious) -> None:
+        await self._input_history_manager.load_if_necessary()
         if (entry := self._input_history_manager.get_previous(event.text)) is not None:
             self._get_input_text_area().text = entry
             self._move_input_cursor_to_end()
 
     @tx.on(InputTextArea.HistoryNext)
     async def on_input_text_area_history_next(self, event: InputTextArea.HistoryNext) -> None:
+        await self._input_history_manager.load_if_necessary()
         if (entry := self._input_history_manager.get_next(event.text)) is not None:
             ita = self._get_input_text_area()
             ita.text = entry
@@ -409,6 +419,10 @@ class ChatApp(
             fut,
         )
 
+        fut.add_done_callback(lambda _: self._pending_tool_confirmations.discard(tcm))
+
+        self._pending_tool_confirmations.add(tcm)
+
         async def inner() -> None:
             await self._mount_messages(tcm)
 
@@ -427,3 +441,13 @@ class ChatApp(
     async def action_cancel(self) -> None:
         if (cat := self._cur_chat_action) is not None:
             cat.cancel()
+
+    async def action_confirm_all_pending_tool_uses(self) -> None:
+        for tcm in list(self._pending_tool_confirmations):
+            if not tcm.has_rendered:
+                continue
+
+            if not tcm.has_confirmed:
+                await tcm.confirm()
+
+            self._pending_tool_confirmations.discard(tcm)

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

@@ -1,9 +1,9 @@
 import abc
-import json
 import os
 import typing as ta
 
 from omlish import lang
+from omlish.formats import json
 
 
 ##
@@ -11,11 +11,11 @@ from omlish import lang
 
 class InputHistoryStorage(lang.Abstract):
     @abc.abstractmethod
-    def load(self) -> list[str]:
+    def load(self) -> ta.Awaitable[list[str]]:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def save(self, entries: ta.Sequence[str]) -> None:
+    def save(self, entries: ta.Sequence[str]) -> ta.Awaitable[None]:
         raise NotImplementedError
 
 
@@ -25,10 +25,10 @@ class InMemoryInputHistoryStorage(InputHistoryStorage):
 
         self._entries: list[str] = []
 
-    def load(self) -> list[str]:
+    async def load(self) -> list[str]:
         return list(self._entries)
 
-    def save(self, entries: ta.Sequence[str]) -> None:
+    async def save(self, entries: ta.Sequence[str]) -> None:
         self._entries = list(entries)
 
 
@@ -38,26 +38,31 @@ class FileInputHistoryStorage(InputHistoryStorage):
 
         self._path = path
 
-    def load(self) -> list[str]:
+    async def load(self) -> list[str]:
         if not os.path.exists(self._path):
             return []
 
         try:
-            with open(self._path) as f:
-                data = json.load(f)
-                if isinstance(data, list) and all(isinstance(e, str) for e in data):
-                    return data
-                return []
-        except (json.JSONDecodeError, OSError):
+            with open(self._path) as f:  # noqa
+                content = f.read()
+        except OSError:
             return []
 
-    def save(self, entries: ta.Sequence[str]) -> None:
+        data = json.loads(content)
+
+        if isinstance(data, list) and all(isinstance(e, str) for e in data):
+            return data
+        return []
+
+    async def save(self, entries: ta.Sequence[str]) -> None:
+        content = json.dumps_pretty(list(entries))
+        dir_path = os.path.dirname(self._path)
+
         try:
-            dir_path = os.path.dirname(self._path)
             if dir_path:
                 os.makedirs(dir_path, exist_ok=True)
-            with open(self._path, 'w') as f:
-                json.dump(list(entries), f, indent=2)
+            with open(self._path, 'w') as f:  # noqa
+                f.write(content)
         except OSError:
             pass
 
@@ -88,16 +93,34 @@ class InputHistoryManager:
         self._storage = storage
         self._max_entries = max_entries
 
-        self._entries: list[str] = self._storage.load()
-        self._position: int = len(self._entries)
-        self._current_draft: str = ''
+    #
+
+    _entries: list[str]
+    _position: int = 0
+
+    async def load_if_necessary(self) -> None:
+        try:
+            self._entries  # noqa
+        except AttributeError:
+            pass
+        else:
+            return
+
+        self._entries = await self._storage.load()
+        self._position = len(self._entries)
 
-    def add(self, text: str) -> None:
+    #
+
+    _current_draft: str = ''
+
+    async def add(self, text: str) -> None:
         """Add a new history entry and reset position."""
 
         if not text.strip():
             return
 
+        await self.load_if_necessary()
+
         # Don't add duplicate consecutive entries
         if self._entries and self._entries[-1] == text:
             self.reset_position()
@@ -109,7 +132,7 @@ class InputHistoryManager:
         if len(self._entries) > self._max_entries:
             self._entries = self._entries[-self._max_entries:]
 
-        self._storage.save(self._entries)
+        await self._storage.save(self._entries)
         self.reset_position()
 
     def get_previous(self, text: str | None = None) -> str | None:
@@ -123,20 +146,24 @@ class InputHistoryManager:
             The previous history entry, or None if at the beginning
         """
 
-        if not self._entries:
+        try:
+            entries = self._entries
+        except AttributeError:
+            return None
+        if entries:
             return None
 
         # Save current draft if we're at the end
-        if self._position == len(self._entries) and text is not None:
+        if self._position == len(entries) and text is not None:
             self._current_draft = text
 
         # Move to previous entry
         if self._position > 0:
             self._position -= 1
-            return self._entries[self._position]
+            return entries[self._position]
 
         # Already at oldest entry
-        return self._entries[0] if self._entries else None
+        return entries[0] if entries else None
 
     def get_next(self, text: str | None = None) -> str | None:
         """
@@ -149,20 +176,24 @@ class InputHistoryManager:
             The next history entry, the saved draft if moving past the end, or None
         """
 
-        if not self._entries:
+        try:
+            entries = self._entries
+        except AttributeError:
+            return None
+        if entries:
             return None
 
         # Move to next entry
-        if self._position < len(self._entries):
+        if self._position < len(entries):
             self._position += 1
 
             # If we moved past the end, return the draft
-            if self._position == len(self._entries):
+            if self._position == len(entries):
                 draft = self._current_draft
                 self._current_draft = ''
                 return draft
 
-            return self._entries[self._position]
+            return entries[self._position]
 
         # Already at newest position
         return None
@@ -170,5 +201,11 @@ class InputHistoryManager:
     def reset_position(self) -> None:
         """Reset history position to the end (no history item selected)."""
 
-        self._position = len(self._entries)
+        try:
+            entries = self._entries
+        except AttributeError:
+            self._position = 0
+        else:
+            self._position = len(entries)
+
         self._current_draft = ''

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

@@ -3,6 +3,7 @@ import asyncio
 import typing as ta
 
 from omdev.tui import textual as tx
+from omlish import check
 from omlish import lang
 
 
@@ -145,14 +146,14 @@ class StreamAiMessage(AiMessage):
 
 
 class ToolConfirmationControls(tx.Static):
-    class Allowed(tx.Message):
+    class ClickedAllow(tx.Message):
         pass
 
     def compose(self) -> tx.ComposeResult:
         yield tx.Button('Allow', action='allow')
 
     def action_allow(self) -> None:
-        self.post_message(self.Allowed())
+        self.post_message(self.ClickedAllow())
 
 
 class ToolConfirmationMessage(Message):
@@ -170,24 +171,58 @@ class ToolConfirmationMessage(Message):
         self._inner_content = inner_content
         self._fut = fut
 
-    def compose(self) -> tx.ComposeResult:
-        with tx.Horizontal(classes='tool-confirmation-message-outer message-outer'):
-            yield tx.Static('? ', classes='tool-confirmation-message-glyph message-glyph')
-            with tx.Vertical(classes='tool-confirmation-message-inner tool-confirmation-message-inner-open message-inner'):  # noqa
-                yield tx.Static(self._outer_content, classes='tool-confirmation-message-outer-content')
-                yield tx.Static(self._inner_content, classes='tool-confirmation-message-inner-content')
-                yield ToolConfirmationControls(classes='tool-confirmation-message-controls')
+        self._has_rendered = False
+        self._has_confirmed = False
+
+    @property
+    def has_rendered(self) -> bool:
+        return self._has_rendered
+
+    @property
+    def has_confirmed(self) -> bool:
+        return self._has_confirmed
+
+    async def confirm(self) -> None:
+        check.equal(self._fut.done(), self._has_confirmed)
+
+        if self._has_confirmed:
+            return
+        self._has_confirmed = True
 
-    @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')
+
         inner.query_one('.tool-confirmation-message-outer-content', tx.Static).update('Tool use confirmed.')
 
         self._fut.set_result(True)
 
+    def compose(self) -> tx.ComposeResult:
+        with tx.Horizontal(classes='tool-confirmation-message-outer message-outer'):
+            yield tx.Static('? ', classes='tool-confirmation-message-glyph message-glyph')
+            with tx.Vertical(classes=' '.join([
+                'tool-confirmation-message-inner',
+                'tool-confirmation-message-inner-open',
+                'message-inner',
+            ])):
+                yield tx.Static(self._outer_content, classes='tool-confirmation-message-outer-content')
+                yield tx.Static(self._inner_content, classes='tool-confirmation-message-inner-content')
+
+                yield ToolConfirmationControls(classes='tool-confirmation-message-controls')
+
+    def on_mount(self) -> None:
+        def inner():
+            self._has_rendered = True
+
+        self.call_after_refresh(inner)
+
+    @tx.on(ToolConfirmationControls.ClickedAllow)
+    async def on_clicked_allow(self, event: ToolConfirmationControls.ClickedAllow) -> None:
+        await self.confirm()
+
 
 #
 

ommlds/minichain/backends/impls/transformers/transformers.py

@@ -10,7 +10,7 @@ import typing as ta
 from omlish import check
 from omlish import lang
 from omlish import typedvalues as tv
-from omlish.asyncs.asyncio.sync import AsyncioBufferRelay
+from omlish.asyncs.asyncio.sync import AsyncioSyncBufferRelay
 
 from ....chat.choices.services import ChatChoicesRequest
 from ....chat.choices.services import ChatChoicesResponse
@@ -242,7 +242,7 @@ class TransformersChatChoicesStreamService(BaseTransformersChatChoicesService):
             for m in request.v
         ]
 
-        relay: AsyncioBufferRelay = AsyncioBufferRelay()
+        relay: AsyncioSyncBufferRelay = AsyncioSyncBufferRelay()
 
         def streamer_callback(text: str, *, stream_end: bool) -> None:
             if text or stream_end:

{ommlds-0.0.0.dev513.dist-info → ommlds-0.0.0.dev515.dist-info}/METADATA

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

@@ -214,11 +214,11 @@ ommlds/cli/sessions/chat/interfaces/bare/interactive.py,sha256=ZnYoePvXtUbhkDQ0j
 ommlds/cli/sessions/chat/interfaces/bare/oneshot.py,sha256=b758OIa0gf9I_0UdxYJ6re-g8-8xndgr3R0OotUOsmc,387
 ommlds/cli/sessions/chat/interfaces/bare/tools.py,sha256=_UsuoXLIvfpFP_We5DBBlhm6rwB3_cFA3lmFvpG9b-A,824
 ommlds/cli/sessions/chat/interfaces/textual/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/interfaces/textual/app.py,sha256=glO32FiPn4T1nLXBOe2QpTwkFv0yGKchGZQHGFQVaOw,12614
+ommlds/cli/sessions/chat/interfaces/textual/app.py,sha256=QVLD4ZT4-SJ4UQhKSfm6MAjOtqeLtYhW3tMMXxg7h88,13432
 ommlds/cli/sessions/chat/interfaces/textual/configs.py,sha256=-pvG2_Uai70ohDfK4Tt8yaHnvdCs10_gaoQkr-CsOqA,213
 ommlds/cli/sessions/chat/interfaces/textual/facades.py,sha256=zXVG7DKVl-Xtdc893O_yktHCMvM0do6hLesMd8hbqeo,411
 ommlds/cli/sessions/chat/interfaces/textual/inject.py,sha256=eBhFVZ2VmQdoTPSZvi2OSkZ-fX8Mw2TKo28bHZeACJY,3056
-ommlds/cli/sessions/chat/interfaces/textual/inputhistory.py,sha256=Jdmwd6RTBLK8rGyz4w560cwuK6LXi_OTubVfw_-ORTM,4687
+ommlds/cli/sessions/chat/interfaces/textual/inputhistory.py,sha256=hUGrIpSmI0wlg0jwqdT42hLkrzeQF4wnN6wdom9HDJU,5332
 ommlds/cli/sessions/chat/interfaces/textual/interface.py,sha256=lHeuiMtA7DW9knuapZEOZSl9-9SmOfUxiPnd4-plLHE,445
 ommlds/cli/sessions/chat/interfaces/textual/tools.py,sha256=KVlUmIyzqUuOHMzB9ZXGUaGsb-Tp5LAmMpB1agAHYjo,985
 ommlds/cli/sessions/chat/interfaces/textual/styles/__init__.py,sha256=7_U5oUjwegOymeWgt6nLpFfWfjGTrlWL8m4Au8MsaFE,542
@@ -227,7 +227,7 @@ ommlds/cli/sessions/chat/interfaces/textual/styles/markdown.tcss,sha256=KCKlgt_E
 ommlds/cli/sessions/chat/interfaces/textual/styles/messages.tcss,sha256=tl0ZPnYY3jsumj_Y_AFaA1Vbz7AvgWC7xMuS-JOAPEk,1820
 ommlds/cli/sessions/chat/interfaces/textual/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/interfaces/textual/widgets/input.py,sha256=MMONcOi3Aq8ZzmvJn6tHNPbfV3EOol25fABxtW1h--E,1827
-ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py,sha256=_xu24596FT0MZMWOdE0-2SkPF_na_J6lG35CstKCI94,5614
+ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py,sha256=RiERDoNe7HwSbQx0ATh0cToGhwOXnNLdnkVZnWV203g,6332
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/completion/configs.py,sha256=jOtadH46Esx6CztbQazAgIx9Tt5uuu4pGPov3G3O5Ac,286
 ommlds/cli/sessions/completion/inject.py,sha256=oWRS2D4d-mdCwi7jT_Is462k1UBlCruz4nrUeT9xedY,848
@@ -320,7 +320,7 @@ ommlds/minichain/backends/impls/tokenizers/tokens.py,sha256=wLz9UTWhHrrJm56ZSLZD
 ommlds/minichain/backends/impls/transformers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/transformers/sentence.py,sha256=0T01aY0rVauw--AdchroNkcwaK3ku0ZdP8ikcsYeHyA,1462
 ommlds/minichain/backends/impls/transformers/tokens.py,sha256=ozlTX0c3sixgcgz87OwEBoVxTF69MTz46LbHzuS8r2Y,2166
-ommlds/minichain/backends/impls/transformers/transformers.py,sha256=hXWNe2knROuTJoI737t5FIqUdhmldpHW89tBkfpyofM,9052
+ommlds/minichain/backends/impls/transformers/transformers.py,sha256=6eQa95I4PEcUap3bhpRujEDRsVG3MX768bZk4944fPg,9064
 ommlds/minichain/backends/strings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/strings/manifests.py,sha256=kmlanVUAZqIh0P95Mm8H20e8ib3gEgYHHUlkCXDQGFk,413
 ommlds/minichain/backends/strings/parsing.py,sha256=FbijHuHiIkOwC3jecUD-IXs7y12PS0ByCQeCfjJKuE8,1781
@@ -526,9 +526,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.dev513.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev513.dist-info/METADATA,sha256=hjYsfB2_iBou440IpGgVuJC6zvpRLoJ8UQ79M5VCBhE,3602
-ommlds-0.0.0.dev513.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-ommlds-0.0.0.dev513.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev513.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev513.dist-info/RECORD,,
+ommlds-0.0.0.dev515.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev515.dist-info/METADATA,sha256=Ymblue2sqaQ1fupD_pdxYWr0xwhiL2JytUMrqYk_XFQ,3602
+ommlds-0.0.0.dev515.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ommlds-0.0.0.dev515.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev515.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev515.dist-info/RECORD,,