ommlds 0.0.0.dev510__tar.gz → 0.0.0.dev512__tar.gz

{ommlds-0.0.0.dev510/ommlds.egg-info → ommlds-0.0.0.dev512}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev510
+Version: 0.0.0.dev512
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,12 +14,13 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev510
+Requires-Dist: omlish==0.0.0.dev512
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev510; extra == "all"
+Requires-Dist: omdev==0.0.0.dev512; 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"
+Requires-Dist: sentencepiece~=0.2; extra == "all"
 Requires-Dist: tiktoken~=0.12; extra == "all"
 Requires-Dist: tinygrad~=0.12; extra == "all"
 Requires-Dist: tokenizers~=0.22; extra == "all"
@@ -38,11 +39,12 @@ 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.dev510; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev512; 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"
 Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "backends"
+Requires-Dist: sentencepiece~=0.2; extra == "backends"
 Requires-Dist: tiktoken~=0.12; extra == "backends"
 Requires-Dist: tinygrad~=0.12; extra == "backends"
 Requires-Dist: tokenizers~=0.22; extra == "backends"

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/.omlish-manifests.json

@@ -102,7 +102,7 @@
     "module": ".minichain.backends.impls.cerebras.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/cerebras/chat.py",
-    "line": 26,
+    "line": 27,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.cerebras.chat",
@@ -148,7 +148,7 @@
     "module": ".minichain.backends.impls.cerebras.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/cerebras/stream.py",
-    "line": 30,
+    "line": 31,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.cerebras.stream",

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/__about__.py

@@ -24,7 +24,7 @@ class Project(ProjectBase):
             'mlx ~= 0.30; sys_platform == "darwin"',
             'mlx-lm ~= 0.29; sys_platform == "darwin"',
 
-            # 'sentencepiece ~= 0.2',  # FIXME: https://github.com/google/sentencepiece/issues/1121
+            'sentencepiece ~= 0.2',
 
             'tiktoken ~= 0.12',
 

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/backends/cerebras/protocol.py

@@ -49,7 +49,7 @@ class ChatCompletionRequest(lang.Final):
     class UserMessage(Message, lang.Final):
         content: str | ta.Sequence[str]
         name: str | None = None
-        role: ta.Literal['system'] = 'system'
+        role: ta.Literal['user'] = 'user'
 
     @dc.dataclass(frozen=True, kw_only=True)
     @_set_class_marshal_options

ommlds-0.0.0.dev512/ommlds/backends/groq/clients.py

@@ -0,0 +1,9 @@
+import typing as ta
+
+
+##
+
+
+REQUIRED_HTTP_HEADERS: ta.Mapping[bytes, bytes] = {
+    b'User-Agent': b'python-httpx/0.28.1',  # required or it 403's lol
+}

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/cli/main.py

@@ -4,6 +4,7 @@ TODO:
 """
 import abc
 import functools
+import sys
 import typing as ta
 
 import anyio
@@ -136,14 +137,28 @@ class ChatProfile(Profile):
             check.arg(not self._args.message)
 
         elif self._args.message:
-            # TODO: '-' -> stdin
+            ps: list[str] = []
+
+            for a in self._args.message:
+                if a == '-':
+                    ps.append(sys.stdin.read())
+
+                elif a.startswith('@'):
+                    with open(a[1:]) as f:
+                        ps.append(f.read())
+
+                else:
+                    ps.append(a)
+
+            c = ' '.join(ps)
+
             cfg = dc.replace(
                 cfg,
                 driver=dc.replace(
                     cfg.driver,
                     user=dc.replace(
                         cfg.driver.user,
-                        initial_user_content=' '.join(self._args.message),
+                        initial_user_content=c,
                     ),
                 ),
             )

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/cli/sessions/chat/interfaces/textual/app.py

@@ -25,6 +25,7 @@ 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 MessageDivider
 from .widgets.messages import MessagesContainer
 from .widgets.messages import StaticAiMessage
 from .widgets.messages import StreamAiMessage
@@ -50,6 +51,21 @@ class ChatAppGetter(lang.AsyncCachedFunc0['ChatApp']):
     pass
 
 
+class ChatAppScreen(tx.Screen):
+    BINDINGS: ta.ClassVar[ta.Sequence[tx.BindingType]] = [
+        tx.Binding(
+            'alt+c,super+c',
+            'screen.copy_text',
+            'Copy selected text',
+            show=False,
+        ),
+    ]
+
+    @classmethod
+    def _merge_bindings(cls) -> tx.BindingsMap:
+        return tx.unbind_map_keys(super()._merge_bindings(), ['ctrl+c'])
+
+
 class ChatApp(
     tx.ClipboardAppMixin,
     tx.DevtoolsAppMixin,
@@ -61,10 +77,11 @@ class ChatApp(
         *tx.App.BINDINGS,
 
         tx.Binding(
-            'alt+c,ctrl+c,super+c',
-            'screen.copy_text',
-            'Copy selected text',
+            'escape',
+            'cancel',
+            'Cancel current operation',
             show=False,
+            priority=True,
         ),
     ]
 
@@ -96,16 +113,21 @@ class ChatApp(
     def get_driver_class(self) -> type[tx.Driver]:
         return tx.get_pending_writes_driver_class(super().get_driver_class())
 
+    def get_default_screen(self) -> tx.Screen:
+        return ChatAppScreen(id='_default')
+
     CSS: ta.ClassVar[str] = read_app_css()
 
-    #
+    ##
+    # Compose
 
     def compose(self) -> tx.ComposeResult:
         yield MessagesContainer(id='messages-container')
 
         yield InputOuter(id='input-outer')
 
-    #
+    ##
+    # Widget getters
 
     def _get_input_text_area(self) -> InputTextArea:
         return self.query_one('#input', InputTextArea)
@@ -113,7 +135,8 @@ class ChatApp(
     def _get_messages_container(self) -> tx.VerticalScroll:
         return self.query_one('#messages-container', MessagesContainer)
 
-    #
+    ##
+    # Messages
 
     def _is_messages_at_bottom(self, threshold: int = 3) -> bool:
         return (ms := self._get_messages_container()).scroll_y >= (ms.max_scroll_y - threshold)
@@ -125,6 +148,10 @@ class ChatApp(
         if (ms := self._get_messages_container()).max_scroll_y:
             ms.anchor()
 
+    def _scroll_messages_to_bottom_and_anchor(self) -> None:
+        self._scroll_messages_to_bottom()
+        self._anchor_messages()
+
     #
 
     _pending_mount_messages: list[tx.Widget] | None = None
@@ -150,14 +177,14 @@ class ChatApp(
 
             await sam.append_content(content)
 
-            self.call_after_refresh(self._scroll_messages_to_bottom)
-
             if was_at_bottom:
-                self.call_after_refresh(self._anchor_messages)
+                self.call_after_refresh(self._scroll_messages_to_bottom_and_anchor)
 
         else:
             await self._mount_messages(StreamAiMessage(content))
 
+    _num_mounted_messages = 0
+
     async def _mount_messages(self, *messages: tx.Widget) -> None:
         was_at_bottom = self._is_messages_at_bottom()
 
@@ -167,8 +194,13 @@ class ChatApp(
             if isinstance(msg, (AiMessage, ToolConfirmationMessage)):
                 await self._finalize_stream_ai_message()
 
+            if self._num_mounted_messages:
+                await msg_ctr.mount(MessageDivider())
+
             await msg_ctr.mount(msg)
 
+            self._num_mounted_messages += 1
+
             if isinstance(msg, StreamAiMessage):
                 self._stream_ai_message = check.replacing_none(self._stream_ai_message, msg)
                 await msg.write_initial_content()
@@ -180,12 +212,13 @@ class ChatApp(
         if was_at_bottom:
             self.call_after_refresh(self._anchor_messages)
 
-    #
+    ##
+    # Chat events
 
-    _chat_event_task: asyncio.Task[None] | None = None
+    _chat_event_queue_task: asyncio.Task[None] | None = None
 
-    @logs.async_exception_logging(alog)
-    async def _chat_event_task_main(self) -> None:
+    @logs.async_exception_logging(alog, BaseException)
+    async def _chat_event_queue_task_main(self) -> None:
         while True:
             ev = await self._chat_event_queue.get()
             if ev is None:
@@ -217,16 +250,47 @@ class ChatApp(
                 elif isinstance(ev.delta, mc.ToolUseAiDelta):
                     pass
 
-    #
+    ##
+    # Chat actions
 
     @dc.dataclass(frozen=True)
     class UserInput:
         text: str
 
-    _chat_action_task: asyncio.Task[None] | None = None
+    async def _execute_user_input(self, ac: UserInput) -> None:
+        try:
+            await self._chat_facade.handle_user_input(ac.text)
+        except Exception as e:  # noqa
+            # raise
+            await self.display_ui_message(repr(e))
+
+    #
+
+    _cur_chat_action: asyncio.Task[None] | None = None
+
+    async def _execute_chat_action(self, fn: ta.Callable[[], ta.Any]) -> None:
+        check.state(self._cur_chat_action is None)
+
+        self._cur_chat_action = asyncio.create_task(fn())
+
+        try:
+            await self._cur_chat_action
+
+        except asyncio.CancelledError:
+            pass
 
-    @logs.async_exception_logging(alog)
-    async def _chat_action_task_main(self) -> None:
+        except BaseException as e:  # noqa
+            raise
+
+        finally:
+            self._cur_chat_action = None
+
+    #
+
+    _chat_action_queue_task: asyncio.Task[None] | None = None
+
+    @logs.async_exception_logging(alog, BaseException)
+    async def _chat_action_queue_task_main(self) -> None:
         while True:
             ac = await self._chat_action_queue.get()
             if ac is None:
@@ -235,25 +299,22 @@ class ChatApp(
             await alog.debug(lambda: f'Got chat action: {ac!r}')
 
             if isinstance(ac, ChatApp.UserInput):
-                try:
-                    await self._chat_facade.handle_user_input(ac.text)
-                except Exception as e:  # noqa
-                    # raise
-                    await self.display_ui_message(repr(e))
+                await self._execute_chat_action(lambda: self._execute_user_input(ac))
 
             else:
                 raise TypeError(ac)  # noqa
 
-    #
+    ##
+    # Mounting
 
     async def on_mount(self) -> None:
-        check.state(self._chat_event_task is None)
-        self._chat_event_task = asyncio.create_task(self._chat_event_task_main())
+        check.state(self._chat_event_queue_task is None)
+        self._chat_event_queue_task = asyncio.create_task(self._chat_event_queue_task_main())
 
         await self._chat_driver.start()
 
-        check.state(self._chat_action_task is None)
-        self._chat_action_task = asyncio.create_task(self._chat_action_task_main())
+        check.state(self._chat_action_queue_task is None)
+        self._chat_action_queue_task = asyncio.create_task(self._chat_action_queue_task_main())
 
         self._get_input_text_area().focus()
 
@@ -265,16 +326,19 @@ class ChatApp(
         )
 
     async def on_unmount(self) -> None:
-        if (cdt := self._chat_event_task) is not None:
+        if (cat := self._chat_action_queue_task) is not None:
             await self._chat_event_queue.put(None)
-            await cdt
+            await cat
 
         await self._chat_driver.stop()
 
-        if (cet := self._chat_event_task) is not None:
+        if (cet := self._chat_event_queue_task) is not None:
             await self._chat_event_queue.put(None)
             await cet
 
+    ##
+    # Input
+
     @tx.on(InputTextArea.Submitted)
     async def on_input_text_area_submitted(self, event: InputTextArea.Submitted) -> None:
         self._get_input_text_area().clear()
@@ -329,7 +393,8 @@ class ChatApp(
 
             self.screen.post_message(tx.Key(event.key, event.character))
 
-    #
+    ##
+    # User interaction
 
     async def confirm_tool_use(
             self,
@@ -358,3 +423,7 @@ class ChatApp(
             content: str,
     ) -> None:
         await self._mount_messages(UiMessage(content))
+
+    async def action_cancel(self) -> None:
+        if (cat := self._cur_chat_action) is not None:
+            cat.cancel()

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/cli/sessions/chat/interfaces/textual/styles/messages.tcss

@@ -14,7 +14,17 @@
 }
 
 
-/* Base */
+/* Divider */
+
+.message-divider {
+    height: 1;
+    margin: 1 0 0 0;
+
+    border-top: solid $primary;
+}
+
+
+/* Base Message */
 
 .message {
     width: 1fr;
@@ -50,7 +60,7 @@
 }
 
 
-/* Welcome */
+/* Welcome Message */
 
 .welcome-message {
     margin: 0;
@@ -67,7 +77,7 @@
 }
 
 
-/* User */
+/* User Message */
 
 .user-message {
 }
@@ -82,7 +92,7 @@
 }
 
 
-/* Ai */
+/* Ai Message */
 
 .ai-message {
 }
@@ -106,7 +116,7 @@
 }
 
 
-/* Tool Confirmation */
+/* Tool Confirmation Message */
 
 .tool-confirmation-message {
 }
@@ -142,7 +152,7 @@
 }
 
 
-/* Ui */
+/* Ui Message */
 
 .ui-message {
 }

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py

@@ -16,6 +16,16 @@ class MessagesContainer(tx.VerticalScroll):
 ##
 
 
+class MessageDivider(tx.Static):
+    def __init__(self) -> None:
+        super().__init__()
+
+        self.add_class('message-divider')
+
+
+##
+
+
 class Message(tx.Static, lang.Abstract):
     def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
         super().__init__(*args, **kwargs)

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/minichain/backends/impls/cerebras/chat.py

@@ -7,6 +7,7 @@ from omlish.formats import json
 from omlish.http import all as http
 
 from .....backends.cerebras import protocol as pt
+from .....backends.cerebras.clients import REQUIRED_HTTP_HEADERS
 from ....chat.choices.services import ChatChoicesRequest
 from ....chat.choices.services import ChatChoicesResponse
 from ....chat.choices.services import static_check_is_chat_choices_service
@@ -70,6 +71,7 @@ class CerebrasChatChoicesService:
             headers={
                 http.consts.HEADER_CONTENT_TYPE: http.consts.CONTENT_TYPE_JSON,
                 http.consts.HEADER_AUTH: http.consts.format_bearer_auth_header(check.not_none(self._api_key).reveal()),
+                **REQUIRED_HTTP_HEADERS,
             },
             data=json.dumps(raw_request).encode('utf-8'),
             client=self._http_client,

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/minichain/backends/impls/cerebras/stream.py

@@ -8,6 +8,7 @@ from omlish.http import all as http
 from omlish.http import sse
 
 from .....backends.cerebras import protocol as pt
+from .....backends.cerebras.clients import REQUIRED_HTTP_HEADERS
 from ....chat.choices.stream.services import ChatChoicesStreamRequest
 from ....chat.choices.stream.services import ChatChoicesStreamResponse
 from ....chat.choices.stream.services import static_check_is_chat_choices_stream_service
@@ -98,6 +99,7 @@ class CerebrasChatChoicesStreamService:
             headers={
                 http.consts.HEADER_CONTENT_TYPE: http.consts.CONTENT_TYPE_JSON,
                 http.consts.HEADER_AUTH: http.consts.format_bearer_auth_header(check.not_none(self._api_key).reveal()),
+                **REQUIRED_HTTP_HEADERS,
             },
             data=json.dumps(raw_request).encode('utf-8'),
         )

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds/specs/mcp/clients.py

@@ -79,7 +79,7 @@ class McpServerConnection:
 
     #
 
-    async def __aenter__(self) -> 'McpServerConnection':
+    async def __aenter__(self) -> ta.Self:
         await self._conn.__aenter__()
         return self
 

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev510
+Version: 0.0.0.dev512
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,12 +14,13 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev510
+Requires-Dist: omlish==0.0.0.dev512
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev510; extra == "all"
+Requires-Dist: omdev==0.0.0.dev512; 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"
+Requires-Dist: sentencepiece~=0.2; extra == "all"
 Requires-Dist: tiktoken~=0.12; extra == "all"
 Requires-Dist: tinygrad~=0.12; extra == "all"
 Requires-Dist: tokenizers~=0.22; extra == "all"
@@ -38,11 +39,12 @@ 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.dev510; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev512; 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"
 Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "backends"
+Requires-Dist: sentencepiece~=0.2; extra == "backends"
 Requires-Dist: tiktoken~=0.12; extra == "backends"
 Requires-Dist: tinygrad~=0.12; extra == "backends"
 Requires-Dist: tokenizers~=0.22; extra == "backends"

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ ommlds/backends/anthropic/protocol/sse/events.py
 ommlds/backends/cerebras/__init__.py
 ommlds/backends/cerebras/_dataclasses.py
 ommlds/backends/cerebras/_marshal.py
+ommlds/backends/cerebras/clients.py
 ommlds/backends/cerebras/protocol.py
 ommlds/backends/google/__init__.py
 ommlds/backends/google/protocol/__init__.py

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/ommlds.egg-info/requires.txt

@@ -1,8 +1,9 @@
-omlish==0.0.0.dev510
+omlish==0.0.0.dev512
 
 [all]
-omdev==0.0.0.dev510
+omdev==0.0.0.dev512
 llama-cpp-python~=0.3
+sentencepiece~=0.2
 tiktoken~=0.12
 tinygrad~=0.12
 tokenizers~=0.22
@@ -29,6 +30,7 @@ mlx-lm~=0.29
 
 [backends]
 llama-cpp-python~=0.3
+sentencepiece~=0.2
 tiktoken~=0.12
 tinygrad~=0.12
 tokenizers~=0.22
@@ -55,7 +57,7 @@ pytesseract~=0.3
 rapidocr-onnxruntime~=1.4
 
 [omdev]
-omdev==0.0.0.dev510
+omdev==0.0.0.dev512
 
 [pillow]
 pillow~=12.1

{ommlds-0.0.0.dev510 → ommlds-0.0.0.dev512}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev510'
+version = '0.0.0.dev512'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,15 +24,16 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omlish == 0.0.0.dev510',
+    'omlish == 0.0.0.dev512',
 ]
 
 [project.optional-dependencies]
 all = [
-    'omdev == 0.0.0.dev510',
+    'omdev == 0.0.0.dev512',
     'llama-cpp-python ~= 0.3',
     'mlx ~= 0.30; sys_platform == "darwin"',
     'mlx-lm ~= 0.29; sys_platform == "darwin"',
+    'sentencepiece ~= 0.2',
     'tiktoken ~= 0.12',
     'tinygrad ~= 0.12',
     'tokenizers ~= 0.22',
@@ -52,12 +53,13 @@ all = [
     'lxml >= 5.3; python_version < "3.13"',
 ]
 omdev = [
-    'omdev == 0.0.0.dev510',
+    'omdev == 0.0.0.dev512',
 ]
 backends = [
     'llama-cpp-python ~= 0.3',
     'mlx ~= 0.30; sys_platform == "darwin"',
     'mlx-lm ~= 0.29; sys_platform == "darwin"',
+    'sentencepiece ~= 0.2',
     'tiktoken ~= 0.12',
     'tinygrad ~= 0.12',
     'tokenizers ~= 0.22',