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

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

@@ -1,48 +1,57 @@
 /* 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;
+}
 
-    text-align: center;
+.welcome-message-content {
 }
 
 
 /* User */
 
 .user-message {
-    width: 100%;
-    height: auto;
-
-    margin-top: 1;
 }
 
 .user-message-outer {
-    width: 100%;
+    width: 1fr;
     height: auto;
 }
 
@@ -57,7 +66,7 @@
 }
 
 .user-message-inner {
-    width: 100%;
+    width: 1fr;
     height: auto;
 }
 
@@ -65,14 +74,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 +94,7 @@
 }
 
 .ai-message-inner {
-    width: 100%;
+    width: 1fr;
     height: auto;
 
     padding: 0;
@@ -102,3 +107,52 @@
         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;
+}
+
+.tool-confirmation-message-inner-open {
+    background: $warning-lighten-3 15%;
+}
+
+.tool-confirmation-message-inner-closed {
+}
+
+.tool-confirmation-message-outer-content {
+}
+
+.tool-confirmation-message-inner-content {
+    background: $background;
+
+    margin: 1;
+    padding: 1;
+}
+
+.tool-confirmation-message-controls {
+    margin: 1;
+}

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

@@ -0,0 +1,38 @@
+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),
+        )
+
+        if not await (await self._app()).confirm_tool_use(
+                'Execute requested tool?',
+                json.dumps_pretty(tr_dct),
+        ):
+            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,51 @@ 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,
+            outer_content: str,
+            inner_content: str,
+            fut: asyncio.Future[bool],
+    ) -> None:
+        super().__init__()
+
+        self.add_class('tool-confirmation-message')
+
+        self._outer_content = outer_content
+        self._inner_content = inner_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._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')
+
+    @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)

ommlds/cli/sessions/chat/session.py

@@ -1,9 +1,6 @@
 import typing as ta
 
-from omlish import dataclasses as dc
-
 from ..base import Session
-from .configs import ChatConfig
 from .interfaces.base import ChatInterface
 
 
@@ -11,23 +8,13 @@ from .interfaces.base import ChatInterface
 
 
 @ta.final
-class ChatSession(Session['ChatSession.Config']):
-    """
-    An adapter to the lower level, dumber, non-chat-specific cli 'session' layer. Nothing else takes the kitchen-sink
-    'ChatConfig' object, it's only here for type dispatch in lower layers.
-    """
-
-    @dc.dataclass(frozen=True)
-    class Config(Session.Config, ChatConfig):
-        pass
-
+class ChatSession(Session):
     def __init__(
             self,
-            config: Config,
             *,
             interface: ChatInterface,
     ) -> None:
-        super().__init__(config)
+        super().__init__()
 
         self._interface = interface
 

ommlds/cli/sessions/completion/configs.py

@@ -1,6 +1,7 @@
 from omlish import dataclasses as dc
 
 from .... import minichain as mc
+from ..configs import SessionConfig
 
 
 ##
@@ -12,10 +13,8 @@ DEFAULT_BACKEND = 'openai'
 ##
 
 
-@dc.dataclass(frozen=True)
-class CompletionConfig:
+@dc.dataclass(frozen=True, kw_only=True)
+class CompletionConfig(SessionConfig):
     content: 'mc.Content'
 
-    _: dc.KW_ONLY
-
     backend: str | None = None

ommlds/cli/sessions/completion/inject.py

@@ -1,4 +1,3 @@
-from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
@@ -23,7 +22,7 @@ def bind_completion(cfg: CompletionConfig) -> inj.Elements:
     #
 
     els.extend([
-        inj.bind(_session.CompletionSession.Config(**dc.asdict(cfg))),
+        inj.bind(cfg),
         inj.bind(Session, to_ctor=_session.CompletionSession, singleton=True),
     ])
 

ommlds/cli/sessions/completion/session.py

@@ -1,5 +1,4 @@
 from omlish import check
-from omlish import dataclasses as dc
 
 from .... import minichain as mc
 from ...backends.types import CompletionServiceBackendProvider
@@ -10,19 +9,16 @@ from .configs import CompletionConfig
 ##
 
 
-class CompletionSession(Session['CompletionSession.Config']):
-    @dc.dataclass(frozen=True)
-    class Config(Session.Config, CompletionConfig):
-        pass
-
+class CompletionSession(Session):
     def __init__(
             self,
-            config: Config,
+            config: CompletionConfig,
             *,
             service_provider: CompletionServiceBackendProvider,
     ) -> None:
-        super().__init__(config)
+        super().__init__()
 
+        self._config = config
         self._service_provider = service_provider
 
     async def run(self) -> None:

ommlds/cli/sessions/configs.py

@@ -0,0 +1,10 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class SessionConfig(lang.Abstract):
+    pass

ommlds/cli/sessions/embedding/configs.py

@@ -1,6 +1,7 @@
 from omlish import dataclasses as dc
 
 from .... import minichain as mc
+from ..configs import SessionConfig
 
 
 ##
@@ -12,10 +13,8 @@ DEFAULT_BACKEND = 'openai'
 ##
 
 
-@dc.dataclass(frozen=True)
-class EmbeddingConfig:
+@dc.dataclass(frozen=True, kw_only=True)
+class EmbeddingConfig(SessionConfig):
     content: 'mc.Content'
 
-    _: dc.KW_ONLY
-
     backend: str | None = None

ommlds/cli/sessions/embedding/inject.py

@@ -1,4 +1,3 @@
-from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
@@ -23,7 +22,7 @@ def bind_embedding(cfg: EmbeddingConfig) -> inj.Elements:
     #
 
     els.extend([
-        inj.bind(_session.EmbeddingSession.Config(**dc.asdict(cfg))),
+        inj.bind(cfg),
         inj.bind(Session, to_ctor=_session.EmbeddingSession, singleton=True),
     ])
 

ommlds/cli/sessions/embedding/session.py

@@ -1,4 +1,3 @@
-from omlish import dataclasses as dc
 from omlish.formats import json
 
 from .... import minichain as mc
@@ -10,19 +9,16 @@ from .configs import EmbeddingConfig
 ##
 
 
-class EmbeddingSession(Session['EmbeddingSession.Config']):
-    @dc.dataclass(frozen=True)
-    class Config(Session.Config, EmbeddingConfig):
-        pass
-
+class EmbeddingSession(Session):
     def __init__(
             self,
-            config: Config,
+            config: EmbeddingConfig,
             *,
             service_provider: EmbeddingServiceBackendProvider,
     ) -> None:
-        super().__init__(config)
+        super().__init__()
 
+        self._config = config
         self._service_provider = service_provider
 
     async def run(self) -> None:

ommlds/cli/sessions/inject.py

@@ -1,34 +1,34 @@
-import typing as ta
-
 from omlish import inject as inj
 from omlish import lang
 
+from .chat.configs import ChatConfig
+from .completion.configs import CompletionConfig
+from .configs import SessionConfig
+from .embedding.configs import EmbeddingConfig
+
 
 with lang.auto_proxy_import(globals()):
-    from .chat import configs as _chat_cfgs
-    from .chat import inject as _chat_inj
-    from .completion import configs as _completion_cfgs
-    from .completion import inject as _completion_inj
-    from .embedding import configs as _embedding_cfgs
-    from .embedding import inject as _embedding_inj
+    from .chat import inject as _chat
+    from .completion import inject as _completion
+    from .embedding import inject as _embedding
 
 
 ##
 
 
-def bind_sessions(cfg: ta.Any) -> inj.Elements:
+def bind_sessions(cfg: SessionConfig) -> inj.Elements:
     els: list[inj.Elemental] = []
 
     #
 
-    if isinstance(cfg, _chat_cfgs.ChatConfig):
-        els.append(_chat_inj.bind_chat(cfg))
+    if isinstance(cfg, ChatConfig):
+        els.append(_chat.bind_chat(cfg))
 
-    elif isinstance(cfg, _completion_cfgs.CompletionConfig):
-        els.append(_completion_inj.bind_completion(cfg))
+    elif isinstance(cfg, CompletionConfig):
+        els.append(_completion.bind_completion(cfg))
 
-    elif isinstance(cfg, _embedding_cfgs.EmbeddingConfig):
-        els.append(_embedding_inj.bind_embedding(cfg))
+    elif isinstance(cfg, EmbeddingConfig):
+        els.append(_embedding.bind_embedding(cfg))
 
     else:
         raise TypeError(cfg)

ommlds/cli/state/storage.py

@@ -1,4 +1,5 @@
 import abc
+import datetime
 import os.path
 import typing as ta
 
@@ -52,8 +53,12 @@ STATE_VERSION = 0
 @dc.dataclass(frozen=True)
 class MarshaledState:
     version: int
+
     payload: ta.Any
 
+    created_at: datetime.datetime | None = dc.field(default_factory=lang.utcnow)
+    updated_at: datetime.datetime | None = dc.field(default_factory=lang.utcnow)
+
 
 class MarshalStateStorage(StateStorage, lang.Abstract):
     def __init__(
@@ -75,6 +80,7 @@ class MarshalStateStorage(StateStorage, lang.Abstract):
         ms = MarshaledState(
             version=self._version,
             payload=msh.marshal(obj, ty),
+            updated_at=lang.utcnow(),
         )
         return msh.marshal(ms)
 
@@ -102,7 +108,7 @@ class JsonFileStateStorage(MarshalStateStorage):
         return json.loads(data)
 
     def _save_file_data(self, data: ta.Any) -> None:
-        data = json.dumps_pretty(data)
+        data = json.dumps_compact(data)
         with open(self._file, 'w') as f:
             f.write(data)
 

ommlds/minichain/backends/impls/cerebras/protocol.py

@@ -16,7 +16,7 @@ from ....chat.messages import ToolUseResultMessage
 from ....chat.messages import UserMessage
 from ....chat.stream.types import AiDelta
 from ....chat.stream.types import ContentAiDelta
-from ....chat.stream.types import ToolUseAiDelta
+from ....chat.stream.types import PartialToolUseAiDelta
 from ....chat.tools.types import Tool
 from ....content.prepare import prepare_content_str
 from ....tools.jsonschema import build_tool_spec_params_json_schema
@@ -128,10 +128,10 @@ def build_mc_ai_choice_deltas(delta: pt.ChatCompletionChunk.Choice.Delta) -> AiC
 
         for tc in delta.tool_calls or []:
             tc_fn = check.not_none(tc.function)
-            lst.append(ToolUseAiDelta(
+            lst.append(PartialToolUseAiDelta(
                 id=tc.id,
-                name=check.not_none(tc_fn.name),
-                args=json.loads(tc_fn.arguments or '{}'),
+                name=tc_fn.name,
+                raw_args=tc_fn.arguments,
             ))
 
         return AiChoiceDeltas(lst)

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

@@ -1,3 +1,29 @@
+"""
+dolphin3:latest           d5ab9ae8e1f2    4.9 GB    11 months ago (no tools)
+
+functiongemma:270m        7c19b650567a    300 MB    5 minutes ago
+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
+
+devstral-small-2:24b      24277f07f62d    15 GB     15 hours 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.dev493.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev491
+Version: 0.0.0.dev493
 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.dev493
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev491; extra == "all"
+Requires-Dist: omdev==0.0.0.dev493; 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"
@@ -33,12 +33,12 @@ Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
 Requires-Dist: pillow~=12.0; extra == "all"
-Requires-Dist: ddgs~=9.9; extra == "all"
+Requires-Dist: ddgs~=9.10; extra == "all"
 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.dev493; 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"
@@ -62,7 +62,7 @@ Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
 Requires-Dist: pillow~=12.0; extra == "pillow"
 Provides-Extra: search
-Requires-Dist: ddgs~=9.9; extra == "search"
+Requires-Dist: ddgs~=9.10; extra == "search"
 Provides-Extra: wiki
 Requires-Dist: mwparserfromhell~=0.7; extra == "wiki"
 Requires-Dist: wikitextparser~=0.56; extra == "wiki"