ommlds 0.0.0.dev464__py3-none-any.whl → 0.0.0.dev466__py3-none-any.whl

ommlds/.omlish-manifests.json

@@ -18,7 +18,7 @@
     "module": ".minichain.backends.impls.anthropic.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/anthropic/chat.py",
-    "line": 39,
+    "line": 38,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.chat",
@@ -63,7 +63,7 @@
     "module": ".minichain.backends.impls.anthropic.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/anthropic/stream.py",
-    "line": 33,
+    "line": 36,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.stream",
@@ -137,7 +137,7 @@
     "module": ".minichain.backends.impls.google.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/google/stream.py",
-    "line": 36,
+    "line": 41,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.google.stream",

ommlds/backends/google/protocol/types.py

@@ -148,11 +148,14 @@ class Part(lang.Final):
     video_metadata: VideoMetadata | None = None
 
 
+ContentRole: ta.TypeAlias = ta.Literal['user', 'model']
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 @_set_class_marshal_options
 class Content(lang.Final):
     parts: ta.Sequence[Part] | None = None
-    role: ta.Literal['user', 'model'] | None = None
+    role: ContentRole | None = None
 
 
 ##

ommlds/cli/inject.py

@@ -1,28 +1,13 @@
-import os.path
+import typing as ta
 
-from omdev.home.paths import get_home_paths
 from omlish import inject as inj
 from omlish import lang
 
 
 with lang.auto_proxy_import(globals()):
-    from . import state
-    from .backends import inject as backends_inj
-    from .sessions import base as sessions_base
-    from .sessions import inject as sessions_inj
-
-
-##
-
-
-def _provide_state_storage() -> 'state.StateStorage':
-    state_dir = os.path.join(get_home_paths().state_dir, 'minichain', 'cli')
-    if not os.path.exists(state_dir):
-        os.makedirs(state_dir, exist_ok=True)
-        os.chmod(state_dir, 0o770)  # noqa
-
-    state_file = os.path.join(state_dir, 'state.json')
-    return state.JsonFileStateStorage(state_file)
+    from .backends import inject as _backends
+    from .sessions import inject as _sessions
+    from .state import inject as _state
 
 
 ##
@@ -30,20 +15,22 @@ def _provide_state_storage() -> 'state.StateStorage':
 
 def bind_main(
         *,
-        session_cfg: 'sessions_base.Session.Config',
+        session_cfg: ta.Any,
         enable_backend_strings: bool = False,
 ) -> inj.Elements:
-    els: list[inj.Elemental] = [
-        backends_inj.bind_backends(
+    els: list[inj.Elemental] = []
+
+    #
+
+    els.extend([
+        _backends.bind_backends(
             enable_backend_strings=enable_backend_strings,
         ),
 
-        sessions_inj.bind_sessions(session_cfg),
-    ]
-
-    #
+        _sessions.bind_sessions(session_cfg),
 
-    els.append(inj.bind(_provide_state_storage, singleton=True))
+        _state.bind_state(),
+    ])
 
     #
 

ommlds/cli/main.py

@@ -24,9 +24,9 @@ from omlish.subprocesses.sync import subprocesses
 from .. import minichain as mc
 from .inject import bind_main
 from .sessions.base import Session
-from .sessions.chat.session import ChatSession
-from .sessions.completion.completion import CompletionSession
-from .sessions.embedding.embedding import EmbeddingSession
+from .sessions.chat.configs import ChatConfig
+from .sessions.completion.configs import CompletionConfig
+from .sessions.embedding.configs import EmbeddingConfig
 
 
 if ta.TYPE_CHECKING:
@@ -125,30 +125,33 @@ async def _a_main(args: ta.Any = None) -> None:
 
     #
 
-    session_cfg: Session.Config
+    session_cfg: ta.Any
 
     if args.embed:
-        session_cfg = EmbeddingSession.Config(
+        session_cfg = EmbeddingConfig(
             check.not_none(content),  # noqa
             backend=args.backend,
         )
 
     elif args.completion:
-        session_cfg = CompletionSession.Config(
+        session_cfg = CompletionConfig(
             check.not_none(content),  # noqa
             backend=args.backend,
         )
 
     else:
-        from ..minichain.lib.code.prompts import CODE_AGENT_SYSTEM_PROMPT
+        system_content: mc.Content | None = None
+        if (args.new or args.ephemeral) and args.code:
+            from ..minichain.lib.code.prompts import CODE_AGENT_SYSTEM_PROMPT
+            system_content = CODE_AGENT_SYSTEM_PROMPT
 
-        session_cfg = ChatSession.Config(
+        session_cfg = ChatConfig(
             backend=args.backend,
             model_name=args.model_name,
             state='ephemeral' if args.ephemeral else 'new' if args.new else 'continue',
-            initial_system_content=CODE_AGENT_SYSTEM_PROMPT if args.new and args.code else None,
+            initial_system_content=system_content,
             initial_user_content=content,  # noqa
-            interactive=args.interactive,
+            interactive=bool(args.interactive),
             markdown=bool(args.markdown),
             stream=bool(args.stream),
             enable_tools=(
@@ -171,7 +174,7 @@ async def _a_main(args: ta.Any = None) -> None:
 
     with inj.create_managed_injector(bind_main(
             session_cfg=session_cfg,
-            enable_backend_strings=isinstance(session_cfg, ChatSession.Config),
+            enable_backend_strings=isinstance(session_cfg, ChatConfig),
     )) as injector:
         await injector[Session].run()
 

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

@@ -36,34 +36,31 @@ def bind_ai(
 
     #
 
+    ai_stack = inj.wrapper_binder_helper(_types.AiChatGenerator)
+
     if stream:
-        ai_stack = inj.wrapper_binder_helper(_types.StreamAiChatGenerator)
+        stream_ai_stack = inj.wrapper_binder_helper(_types.StreamAiChatGenerator)
 
-        els.append(ai_stack.push_bind(to_ctor=_services.ChatChoicesStreamServiceStreamAiChatGenerator, singleton=True))
+        els.append(stream_ai_stack.push_bind(to_ctor=_services.ChatChoicesStreamServiceStreamAiChatGenerator, singleton=True))  # noqa
 
         if not silent:
-            els.append(ai_stack.push_bind(to_ctor=_rendering.RenderingStreamAiChatGenerator, singleton=True))
-
-        if enable_tools:
-            raise NotImplementedError
+            els.append(stream_ai_stack.push_bind(to_ctor=_rendering.RenderingStreamAiChatGenerator, singleton=True))
 
         els.extend([
-            inj.bind(_types.StreamAiChatGenerator, to_key=ai_stack.top),
-            inj.bind(_types.AiChatGenerator, to_key=_types.StreamAiChatGenerator),
+            inj.bind(_types.StreamAiChatGenerator, to_key=stream_ai_stack.top),
+            ai_stack.push_bind(to_key=_types.StreamAiChatGenerator),
         ])
 
     else:
-        ai_stack = inj.wrapper_binder_helper(_types.AiChatGenerator)
-
         els.append(ai_stack.push_bind(to_ctor=_services.ChatChoicesServiceAiChatGenerator, singleton=True))
 
         if not silent:
             els.append(ai_stack.push_bind(to_ctor=_rendering.RenderingAiChatGenerator, singleton=True))
 
-        if enable_tools:
-            els.append(ai_stack.push_bind(to_ctor=_tools.ToolExecutingAiChatGenerator, singleton=True))
+    if enable_tools:
+        els.append(ai_stack.push_bind(to_ctor=_tools.ToolExecutingAiChatGenerator, singleton=True))
 
-        els.append(inj.bind(_types.AiChatGenerator, to_key=ai_stack.top))
+    els.append(inj.bind(_types.AiChatGenerator, to_key=ai_stack.top))
 
     #
 

ommlds/cli/sessions/chat/chat/ai/services.py

@@ -63,19 +63,17 @@ class ChatChoicesStreamServiceStreamAiChatGenerator(StreamAiChatGenerator):
     ) -> mc.AiChat:
         opts = self._options() if self._options is not None else []
 
-        lst: list[str] = []
-
         async with self._service_provider.provide_backend() as service:
+            joiner = mc.AiChoiceDeltaJoiner()
+
             async with (await service.invoke(mc.ChatChoicesStreamRequest(chat, opts))).v as st_resp:
                 async for o in st_resp:
+                    joiner.add(o.choices)
+
                     choice = check.single(o.choices)
 
                     for delta in choice.deltas:
                         if delta_callback is not None:
                             await delta_callback(delta)
 
-                    c = check.isinstance(delta, mc.ContentAiChoiceDelta).c  # noqa
-                    if c is not None:
-                        lst.append(check.isinstance(c, str))
-
-        return [mc.AiMessage(''.join(lst))]
+        return check.single(joiner.build())

ommlds/cli/sessions/chat/chat/state/storage.py

@@ -4,7 +4,7 @@ from omlish import check
 from omlish import lang
 
 from ...... import minichain as mc
-from .....state import StateStorage
+from .....state.storage import StateStorage
 from .types import ChatState
 from .types import ChatStateManager
 

ommlds/cli/sessions/chat/inject.py

@@ -1,12 +1,15 @@
+from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
+from ..base import Session
 from .configs import DEFAULT_CHAT_MODEL_BACKEND
 from .configs import ChatConfig
 
 
 with lang.auto_proxy_import(globals()):
     from . import driver as _driver
+    from . import session as _session
     from .backends import inject as _backends
     from .chat.ai import inject as _chat_ai
     from .chat.state import inject as _chat_state
@@ -69,4 +72,11 @@ def bind_chat(cfg: ChatConfig) -> inj.Elements:
 
     #
 
+    els.extend([
+        inj.bind(_session.ChatSession.Config(**dc.asdict(cfg))),
+        inj.bind(Session, to_ctor=_session.ChatSession, singleton=True),
+    ])
+
+    #
+
     return inj.as_elements(*els)

ommlds/cli/sessions/completion/configs.py

@@ -0,0 +1,21 @@
+import dataclasses as dc
+
+from .... import minichain as mc
+
+
+##
+
+
+DEFAULT_COMPLETION_MODEL_BACKEND = 'openai'
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class CompletionConfig:
+    content: 'mc.Content'
+
+    _: dc.KW_ONLY
+
+    backend: str | None = None

ommlds/cli/sessions/completion/inject.py

@@ -0,0 +1,28 @@
+from omlish import dataclasses as dc
+from omlish import inject as inj
+from omlish import lang
+
+from ..base import Session
+from .configs import CompletionConfig
+
+
+with lang.auto_proxy_import(globals()):
+    from . import session as _session
+
+
+##
+
+
+def bind_completion(cfg: CompletionConfig) -> inj.Elements:
+    els: list[inj.Elemental] = []
+
+    #
+
+    els.extend([
+        inj.bind(_session.CompletionSession.Config(**dc.asdict(cfg))),
+        inj.bind(Session, to_ctor=_session.CompletionSession, singleton=True),
+    ])
+
+    #
+
+    return inj.as_elements(*els)

ommlds/cli/sessions/completion/{completion.py → session.py}

@@ -5,22 +5,17 @@ from omlish import lang
 
 from .... import minichain as mc
 from ..base import Session
+from .configs import DEFAULT_COMPLETION_MODEL_BACKEND
+from .configs import CompletionConfig
 
 
 ##
 
 
-DEFAULT_COMPLETION_MODEL_BACKEND = 'openai'
-
-
 class CompletionSession(Session['CompletionSession.Config']):
     @dc.dataclass(frozen=True)
-    class Config(Session.Config):
-        content: mc.Content
-
-        _: dc.KW_ONLY
-
-        backend: str | None = None
+    class Config(Session.Config, CompletionConfig):
+        pass
 
     def __init__(
             self,

ommlds/cli/sessions/embedding/configs.py

@@ -0,0 +1,21 @@
+import dataclasses as dc
+
+from .... import minichain as mc
+
+
+##
+
+
+DEFAULT_EMBEDDING_MODEL_BACKEND = 'openai'
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class EmbeddingConfig:
+    content: 'mc.Content'
+
+    _: dc.KW_ONLY
+
+    backend: str | None = None

ommlds/cli/sessions/embedding/inject.py

@@ -0,0 +1,28 @@
+from omlish import dataclasses as dc
+from omlish import inject as inj
+from omlish import lang
+
+from ..base import Session
+from .configs import EmbeddingConfig
+
+
+with lang.auto_proxy_import(globals()):
+    from . import session as _session
+
+
+##
+
+
+def bind_embedding(cfg: EmbeddingConfig) -> inj.Elements:
+    els: list[inj.Elemental] = []
+
+    #
+
+    els.extend([
+        inj.bind(_session.EmbeddingSession.Config(**dc.asdict(cfg))),
+        inj.bind(Session, to_ctor=_session.EmbeddingSession, singleton=True),
+    ])
+
+    #
+
+    return inj.as_elements(*els)

ommlds/cli/sessions/embedding/{embedding.py → session.py}

@@ -5,22 +5,17 @@ from omlish.formats import json
 
 from .... import minichain as mc
 from ..base import Session
+from .configs import DEFAULT_EMBEDDING_MODEL_BACKEND
+from .configs import EmbeddingConfig
 
 
 ##
 
 
-DEFAULT_EMBEDDING_MODEL_BACKEND = 'openai'
-
-
 class EmbeddingSession(Session['EmbeddingSession.Config']):
     @dc.dataclass(frozen=True)
-    class Config(Session.Config):
-        content: mc.Content
-
-        _: dc.KW_ONLY
-
-        backend: str | None = None
+    class Config(Session.Config, EmbeddingConfig):
+        pass
 
     def __init__(
             self,

ommlds/cli/sessions/inject.py

@@ -1,21 +1,38 @@
+import typing as ta
+
 from omlish import inject as inj
+from omlish import lang
+
 
-from .base import Session
-from .chat.session import ChatSession
+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
 
 
 ##
 
 
-def bind_sessions(session_cfg: Session.Config) -> inj.Elements:
-    els: list[inj.Elemental] = [
-        inj.bind(session_cfg),
-        inj.bind(session_cfg.configurable_cls, singleton=True),
-        inj.bind(Session, to_key=session_cfg.configurable_cls),
-    ]
+def bind_sessions(cfg: ta.Any) -> inj.Elements:
+    els: list[inj.Elemental] = []
+
+    #
+
+    if isinstance(cfg, _chat_cfgs.ChatConfig):
+        els.append(_chat_inj.bind_chat(cfg))
+
+    elif isinstance(cfg, _completion_cfgs.CompletionConfig):
+        els.append(_completion_inj.bind_completion(cfg))
+
+    elif isinstance(cfg, _embedding_cfgs.EmbeddingConfig):
+        els.append(_embedding_inj.bind_embedding(cfg))
+
+    else:
+        raise TypeError(cfg)
 
-    if isinstance(session_cfg, ChatSession.Config):
-        from .chat.inject import bind_chat
-        els.append(bind_chat(session_cfg))  # noqa
+    #
 
     return inj.as_elements(*els)

ommlds/cli/state/inject.py

@@ -0,0 +1,28 @@
+import os.path
+
+from omdev.home.paths import get_home_paths
+from omlish import inject as inj
+from omlish import lang
+
+
+with lang.auto_proxy_import(globals()):
+    from . import storage as _storage
+
+
+##
+
+
+def _provide_state_storage() -> '_storage.StateStorage':
+    state_dir = os.path.join(get_home_paths().state_dir, 'minichain', 'cli')
+    if not os.path.exists(state_dir):
+        os.makedirs(state_dir, exist_ok=True)
+        os.chmod(state_dir, 0o770)  # noqa
+
+    state_file = os.path.join(state_dir, 'state.json')
+    return _storage.JsonFileStateStorage(state_file)
+
+
+def bind_state() -> inj.Elements:
+    return inj.as_elements(
+        inj.bind(_provide_state_storage, singleton=True),
+    )

ommlds/minichain/__init__.py

@@ -92,6 +92,10 @@ with _lang.auto_proxy_init(
         ChatChoicesStreamServiceChatChoicesService,
     )
 
+    from .chat.stream.joining import (  # noqa
+        AiChoiceDeltaJoiner,
+    )
+
     from .chat.stream.services import (  # noqa
         ChatChoicesStreamRequest,
         ChatChoicesStreamResponse,
@@ -109,7 +113,9 @@ with _lang.auto_proxy_init(
 
         AiChoiceDelta,
         ContentAiChoiceDelta,
+        AnyToolUseAiChoiceDelta,
         ToolUseAiChoiceDelta,
+        PartialToolUseAiChoiceDelta,
 
         AiChoiceDeltas,
         AiChoicesDeltas,

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

@@ -22,15 +22,14 @@ from ....chat.messages import AnyAiMessage
 from ....chat.messages import Message
 from ....chat.messages import SystemMessage
 from ....chat.messages import ToolUseMessage
-from ....chat.messages import ToolUseResultMessage
 from ....chat.messages import UserMessage
 from ....chat.tools.types import Tool
-from ....content.prepare import prepare_content_str
 from ....models.configs import ModelName
 from ....standard import ApiKey
-from ....tools.jsonschema import build_tool_spec_params_json_schema
 from ....tools.types import ToolUse
 from .names import MODEL_NAMES
+from .protocol import build_protocol_chat_messages
+from .protocol import build_protocol_tool
 
 
 ##
@@ -44,13 +43,6 @@ from .names import MODEL_NAMES
 class AnthropicChatChoicesService:
     DEFAULT_MODEL_NAME: ta.ClassVar[ModelName] = ModelName(check.not_none(MODEL_NAMES.default))
 
-    ROLES_MAP: ta.ClassVar[ta.Mapping[type[Message], str]] = {
-        SystemMessage: 'system',
-        UserMessage: 'user',
-        AiMessage: 'assistant',
-        ToolUseMessage: 'assistant',
-    }
-
     def __init__(
             self,
             *configs: ApiKey | ModelName,
@@ -78,62 +70,13 @@ class AnthropicChatChoicesService:
             *,
             max_tokens: int = 4096,  # FIXME: ChatOption
     ) -> ChatChoicesResponse:
-        messages: list[pt.Message] = []
-        system: list[pt.Content] | None = None
-        for i, m in enumerate(request.v):
-            if isinstance(m, SystemMessage):
-                if i != 0 or system is not None:
-                    raise Exception('Only supports one system message and must be first')
-                system = [pt.Text(check.not_none(self._get_msg_content(m)))]
-
-            elif isinstance(m, ToolUseResultMessage):
-                messages.append(pt.Message(
-                    role='user',
-                    content=[pt.ToolResult(
-                        tool_use_id=check.not_none(m.tur.id),
-                        content=json.dumps_compact(msh.marshal(m.tur.c)) if not isinstance(m.tur.c, str) else m.tur.c,
-                    )],
-                ))
-
-            elif isinstance(m, AiMessage):
-                # messages.append(pt.Message(
-                #     role=self.ROLES_MAP[type(m)],  # noqa
-                #     content=[pt.Text(check.isinstance(self._get_msg_content(m), str))],
-                # ))
-                messages.append(pt.Message(
-                    role='assistant',
-                    content=[
-                        *([pt.Text(check.isinstance(m.c, str))] if m.c is not None else []),
-                    ],
-                ))
-
-            elif isinstance(m, ToolUseMessage):
-                messages.append(pt.Message(
-                    role='assistant',
-                    content=[
-                        pt.ToolUse(
-                            id=check.not_none(m.tu.id),
-                            name=check.not_none(m.tu.name),
-                            input=m.tu.args,
-                        ),
-                    ],
-                ))
-
-            else:
-                messages.append(pt.Message(
-                    role=self.ROLES_MAP[type(m)],  # type: ignore[arg-type]
-                    content=[pt.Text(check.isinstance(self._get_msg_content(m), str))],
-                ))
+        messages, system = build_protocol_chat_messages(request.v)
 
         tools: list[pt.ToolSpec] = []
         with tv.TypedValues(*request.options).consume() as oc:
             t: Tool
             for t in oc.pop(Tool, []):
-                tools.append(pt.ToolSpec(
-                    name=check.not_none(t.spec.name),
-                    description=prepare_content_str(t.spec.desc),
-                    input_schema=build_tool_spec_params_json_schema(t.spec),
-                ))
+                tools.append(build_protocol_tool(t))
 
         a_req = pt.MessagesRequest(
             model=MODEL_NAMES.resolve(self._model_name.v),