ommlds 0.0.0.dev450__py3-none-any.whl → 0.0.0.dev452__py3-none-any.whl

ommlds/backends/openai/protocol/chatcompletion/tokenlogprob.py

@@ -3,17 +3,21 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
+
 
 ##
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionTokenLogprob(lang.Final):
     token: str
     bytes: ta.Sequence[int] | None = None
     logprob: float
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class TopLogprob(lang.Final):
         token: str
         bytes: ta.Sequence[int] | None = None

ommlds/backends/openai/protocol/completionusage.py

@@ -1,17 +1,21 @@
 from omlish import dataclasses as dc
 from omlish import lang
 
+from ._common import _set_class_marshal_options
+
 
 ##
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class CompletionUsage(lang.Final):
     completion_tokens: int
     prompt_tokens: int
     total_tokens: int
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class CompletionTokensDetails(lang.Final):
         accepted_prediction_tokens: int | None = None
         audio_tokens: int | None = None
@@ -21,6 +25,7 @@ class CompletionUsage(lang.Final):
     completion_tokens_details: CompletionTokensDetails | None = None
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class PromptTokensDetails(lang.Final):
         audio_tokens: int | None = None
         cached_tokens: int | None = None

ommlds/cli/main.py

@@ -68,7 +68,7 @@ async def _a_main(args: ta.Any = None) -> None:
 
     parser.add_argument('--enable-fs-tools', action='store_true')
     parser.add_argument('--enable-todo-tools', action='store_true')
-    parser.add_argument('--enable-unsafe-bash-tool', action='store_true')
+    parser.add_argument('--enable-unsafe-tools-do-not-use-lol', action='store_true')
     parser.add_argument('--enable-test-weather-tool', action='store_true')
     parser.add_argument('--dangerous-no-tool-confirmation', action='store_true')
 
@@ -174,7 +174,7 @@ async def _a_main(args: ta.Any = None) -> None:
     tools_config = ToolsConfig(
         enable_fs_tools=args.enable_fs_tools or args.code,
         enable_todo_tools=args.enable_todo_tools or args.code,
-        enable_unsafe_bash_tool=args.enable_unsafe_bash_tool,
+        enable_unsafe_tools_do_not_use_lol=args.enable_unsafe_tools_do_not_use_lol,
         enable_test_weather_tool=args.enable_test_weather_tool,
     )
 

ommlds/cli/sessions/chat/code.py

@@ -7,12 +7,13 @@ from omlish import lang
 
 from .... import minichain as mc
 from ....minichain.lib.code.prompts import CODE_AGENT_SYSTEM_PROMPT
+from ...tools.config import ToolsConfig
 from .base import DEFAULT_CHAT_MODEL_BACKEND
 from .base import ChatOptions
 from .base import ChatSession
 from .printing import ChatSessionPrinter
 from .state import ChatStateManager
-from .tools import ToolExecRequestExecutor
+from .tools import ToolUseExecutor
 
 
 with lang.auto_proxy_import(globals()):
@@ -42,7 +43,8 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
             chat_options: ChatOptions | None = None,
             printer: ChatSessionPrinter,
             backend_catalog: mc.BackendCatalog,
-            tool_exec_request_executor: ToolExecRequestExecutor,
+            tool_exec_request_executor: ToolUseExecutor,
+            tools_config: ToolsConfig | None = None,
     ) -> None:
         super().__init__(config)
 
@@ -51,6 +53,7 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
         self._printer = printer
         self._backend_catalog = backend_catalog
         self._tool_exec_request_executor = tool_exec_request_executor
+        self._tools_config = tools_config
 
     async def run(self) -> None:
         if self._config.new:
@@ -68,7 +71,11 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
 
         # FIXME: lol
         from ....minichain.lib.fs.context import FsContext
-        fs_tool_context = FsContext(root_dir=os.getcwd())
+        fs_tool_context = FsContext(
+            root_dir=os.getcwd(),
+            writes_permitted=self._tools_config is not None and self._tools_config.enable_unsafe_tools_do_not_use_lol,
+        )
+
         from ....minichain.lib.todo.context import TodoContext
         todo_tool_context = TodoContext()
 
@@ -82,7 +89,10 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
                 if not i and self._config.initial_message is not None:
                     req_msg = mc.UserMessage(self._config.initial_message)
                 else:
-                    prompt = await ptk.prompt('> ')
+                    try:
+                        prompt = await ptk.prompt('> ')
+                    except EOFError:
+                        break
                     req_msg = mc.UserMessage(prompt)
 
                 state = self._state_manager.extend_chat([req_msg])
@@ -92,23 +102,28 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
                         state.chat,
                         (self._chat_options or []),
                     ))
-                    resp_msg = check.single(response.v).m
 
-                    self._printer.print(resp_msg)
-                    state = self._state_manager.extend_chat([resp_msg])
+                    tool_resp_lst = []
+                    for resp_msg in check.single(response.v).ms:
+                        state = self._state_manager.extend_chat([resp_msg])
 
-                    if not (trs := resp_msg.tool_exec_requests):
-                        break
+                        if isinstance(resp_msg, mc.AiMessage):
+                            self._printer.print(resp_msg)
 
-                    tool_resp_lst = []
-                    for tr in trs:
-                        trm = await self._tool_exec_request_executor.execute_tool_request(
-                            tr,
-                            fs_tool_context,
-                            todo_tool_context,
-                        )
-
-                        self._printer.print(trm.c)
-                        tool_resp_lst.append(trm)
+                        elif isinstance(resp_msg, mc.ToolUseMessage):
+                            trm = await self._tool_exec_request_executor.execute_tool_use(
+                                resp_msg.tu,
+                                fs_tool_context,
+                                todo_tool_context,
+                            )
+
+                            self._printer.print(trm.tur.c)
+                            tool_resp_lst.append(trm)
+
+                        else:
+                            raise TypeError(resp_msg)
+
+                    if not tool_resp_lst:
+                        break
 
                     state = self._state_manager.extend_chat(tool_resp_lst)

ommlds/cli/sessions/chat/inject.py

@@ -14,9 +14,9 @@ from .state import ChatStateManager
 from .state import StateStorageChatStateManager
 from .tools import AskingToolExecutionConfirmation
 from .tools import NopToolExecutionConfirmation
-from .tools import ToolExecRequestExecutor
-from .tools import ToolExecRequestExecutorImpl
 from .tools import ToolExecutionConfirmation
+from .tools import ToolUseExecutor
+from .tools import ToolUseExecutorImpl
 
 
 ##
@@ -89,8 +89,8 @@ def bind_chat_session(cfg: ChatSession.Config) -> inj.Elements:
     #
 
     els.extend([
-        inj.bind(ToolExecRequestExecutorImpl, singleton=True),
-        inj.bind(ToolExecRequestExecutor, to_key=ToolExecRequestExecutorImpl),
+        inj.bind(ToolUseExecutorImpl, singleton=True),
+        inj.bind(ToolUseExecutor, to_key=ToolUseExecutorImpl),
     ])
 
     #

ommlds/cli/sessions/chat/interactive.py

@@ -1,5 +1,6 @@
 import dataclasses as dc
 
+from omlish import check
 from omlish import lang
 
 from .... import minichain as mc
@@ -63,7 +64,7 @@ class InteractiveChatSession(ChatSession['InteractiveChatSession.Config']):
 
                 response = await mdl.invoke(mc.ChatChoicesRequest([*state.chat, req_msg]))
 
-                resp_msg = response.v[0].m
+                resp_msg = check.isinstance(check.single(response.v[0].ms), mc.AiMessage)
 
                 self._printer.print(resp_msg)
 

ommlds/cli/sessions/chat/printing.py

@@ -3,6 +3,7 @@ import typing as ta
 
 from omlish import check
 from omlish import lang
+from omlish.formats import json
 
 from .... import minichain as mc
 
@@ -43,11 +44,14 @@ class StringChatSessionPrinter(ChatSessionPrinter, lang.Abstract):
             elif isinstance(obj, mc.AiMessage):
                 if obj.c is not None:
                     self._print_str(check.isinstance(obj.c, str))
-            elif isinstance(obj, mc.ToolExecResultMessage):
-                self._print_str(check.isinstance(obj.c, str))
+            elif isinstance(obj, mc.ToolUseResultMessage):
+                self._print_str(check.isinstance(obj.tur.c, str))
             else:
                 raise TypeError(obj)
 
+        elif isinstance(obj, mc.JsonContent):
+            self._print_str(json.dumps_pretty(obj.v))
+
         elif isinstance(obj, str):
             self._print_str(obj)
 

ommlds/cli/sessions/chat/prompt.py

@@ -10,7 +10,7 @@ from .base import ChatOptions
 from .base import ChatSession
 from .printing import ChatSessionPrinter
 from .state import ChatStateManager
-from .tools import ToolExecRequestExecutor
+from .tools import ToolUseExecutor
 
 
 ##
@@ -42,7 +42,7 @@ class PromptChatSession(ChatSession['PromptChatSession.Config']):
             chat_options: ChatOptions | None = None,
             printer: ChatSessionPrinter,
             backend_catalog: mc.BackendCatalog,
-            tool_exec_request_executor: ToolExecRequestExecutor,
+            tool_exec_request_executor: ToolUseExecutor,
     ) -> None:
         super().__init__(config)
 
@@ -83,11 +83,10 @@ class PromptChatSession(ChatSession['PromptChatSession.Config']):
                 lst: list[str] = []
                 async for o in st_resp:
                     if o:
-                        m = check.single(o).m
-                        if m.c is not None:
-                            print(check.isinstance(m.c, str), end='', flush=True)
-                            lst.append(check.isinstance(m.c, str))
-                        check.none(m.tool_exec_requests)
+                        c = check.isinstance(check.single(check.single(o.choices).deltas), mc.ContentAiChoiceDelta).c
+                        if c is not None:
+                            print(check.isinstance(c, str), end='', flush=True)
+                            lst.append(check.isinstance(c, str))
                 print()
 
             resp_m = mc.AiMessage(''.join(lst))
@@ -118,33 +117,35 @@ class PromptChatSession(ChatSession['PromptChatSession.Config']):
                 (self._chat_options or []),
             ))
 
-            resp_m = response.v[0].m
-            new_chat.append(resp_m)
+            for resp_m in response.v[0].ms:
+                new_chat.append(resp_m)
 
-            if (trs := resp_m.tool_exec_requests):
-                check.state(resp_m.c is None)
+                if isinstance(resp_m, mc.AiMessage):
+                    self._printer.print(resp_m)
 
-                tr: mc.ToolExecRequest = check.single(check.not_none(trs))
+                elif isinstance(resp_m, mc.ToolUseMessage):
+                    tr: mc.ToolUse = resp_m.tu
 
-                # FIXME: lol
-                from ....minichain.lib.fs.context import FsContext
+                    # FIXME: lol
+                    from ....minichain.lib.fs.context import FsContext
 
-                trm = await self._tool_exec_request_executor.execute_tool_request(
-                    tr,
-                    FsContext(root_dir=os.getcwd()),
-                )
+                    trm = await self._tool_exec_request_executor.execute_tool_use(
+                        tr,
+                        FsContext(root_dir=os.getcwd()),
+                    )
 
-                print(trm.c)
-                new_chat.append(trm)
+                    print(trm.tur.c)
+                    new_chat.append(trm)
 
-                response = await mdl.invoke(mc.ChatChoicesRequest(
-                    [*state.chat, *new_chat],
-                    (self._chat_options or []),
-                ))
+                    response = await mdl.invoke(mc.ChatChoicesRequest(
+                        [*state.chat, *new_chat],
+                        (self._chat_options or []),
+                    ))
 
-                resp_m = response.v[0].m
-                new_chat.append(resp_m)
+                    resp_m = check.isinstance(check.single(response.v[0].ms), mc.AiMessage)
+                    new_chat.append(resp_m)
 
-            self._printer.print(resp_m)
+                else:
+                    raise TypeError(resp_m)
 
         self._state_manager.extend_chat(new_chat)

ommlds/cli/sessions/chat/tools.py

@@ -3,7 +3,6 @@ import typing as ta
 
 from omlish import check
 from omlish import lang
-from omlish import marshal as msh
 from omlish.formats import json
 
 from .... import minichain as mc
@@ -24,7 +23,7 @@ class ToolExecutionConfirmation(lang.Abstract):
     @abc.abstractmethod
     def confirm_tool_execution_or_raise(
             self,
-            tr: mc.ToolExecRequest,
+            tr: mc.ToolUse,
             tce: mc.ToolCatalogEntry,
     ) -> ta.Awaitable[None]:
         raise NotImplementedError
@@ -33,7 +32,7 @@ class ToolExecutionConfirmation(lang.Abstract):
 class NopToolExecutionConfirmation(ToolExecutionConfirmation):
     async def confirm_tool_execution_or_raise(
             self,
-            tr: mc.ToolExecRequest,
+            tr: mc.ToolUse,
             tce: mc.ToolCatalogEntry,
     ) -> None:
         pass
@@ -42,14 +41,14 @@ class NopToolExecutionConfirmation(ToolExecutionConfirmation):
 class AskingToolExecutionConfirmation(ToolExecutionConfirmation):
     async def confirm_tool_execution_or_raise(
             self,
-            tr: mc.ToolExecRequest,
+            tr: mc.ToolUse,
             tce: mc.ToolCatalogEntry,
     ) -> None:
         tr_dct = dict(
             id=tr.id,
             name=tce.spec.name,
             args=tr.args,
-            spec=msh.marshal(tce.spec),
+            # spec=msh.marshal(tce.spec),
         )
         cr = await ptk.strict_confirm(f'Execute requested tool?\n\n{json.dumps_pretty(tr_dct)}\n\n')
 
@@ -60,17 +59,17 @@ class AskingToolExecutionConfirmation(ToolExecutionConfirmation):
 ##
 
 
-class ToolExecRequestExecutor(lang.Abstract):
+class ToolUseExecutor(lang.Abstract):
     @abc.abstractmethod
-    def execute_tool_request(
+    def execute_tool_use(
             self,
-            tr: mc.ToolExecRequest,
+            tr: mc.ToolUse,
             *ctx_items: ta.Any,
-    ) -> ta.Awaitable[mc.ToolExecResultMessage]:
+    ) -> ta.Awaitable[mc.ToolUseResultMessage]:
         raise NotImplementedError
 
 
-class ToolExecRequestExecutorImpl(ToolExecRequestExecutor):
+class ToolUseExecutorImpl(ToolUseExecutor):
     def __init__(
             self,
             *,
@@ -82,16 +81,16 @@ class ToolExecRequestExecutorImpl(ToolExecRequestExecutor):
         self._catalog = catalog
         self._confirmation = confirmation
 
-    async def execute_tool_request(
+    async def execute_tool_use(
             self,
-            tr: mc.ToolExecRequest,
+            tr: mc.ToolUse,
             *ctx_items: ta.Any,
-    ) -> mc.ToolExecResultMessage:
+    ) -> mc.ToolUseResultMessage:
         tce = self._catalog.by_name[check.non_empty_str(tr.name)]
 
         await self._confirmation.confirm_tool_execution_or_raise(tr, tce)
 
-        return await mc.execute_tool_request(
+        return await mc.execute_tool_use(
             mc.ToolContext(
                 tr,
                 *ctx_items,

ommlds/cli/tools/config.py

@@ -9,6 +9,6 @@ class ToolsConfig:
     enable_fs_tools: bool = False
     enable_todo_tools: bool = False
 
-    enable_unsafe_bash_tool: bool = False
+    enable_unsafe_tools_do_not_use_lol: bool = False
 
     enable_test_weather_tool: bool = False

ommlds/cli/tools/inject.py

@@ -60,10 +60,13 @@ def bind_tools(tools_config: ToolsConfig) -> inj.Elements:
         from ...minichain.lib.todo.tools.write import todo_write_tool
         els.append(bind_tool(todo_write_tool()))
 
-    if tools_config.enable_unsafe_bash_tool:
+    if tools_config.enable_unsafe_tools_do_not_use_lol:
         from ...minichain.lib.bash import bash_tool
         els.append(bind_tool(bash_tool()))
 
+        from ...minichain.lib.fs.tools.edit import edit_tool
+        els.append(bind_tool(edit_tool()))
+
     if tools_config.enable_test_weather_tool:
         els.append(bind_tool(WEATHER_TOOL))
 

ommlds/minichain/__init__.py

@@ -107,14 +107,16 @@ with _lang.auto_proxy_init(
         ChatChoicesStreamOutput,
         ChatChoicesStreamOutputs,
 
-        ToolExecRequestDelta,
-        AiMessageDelta,
         AiChoiceDelta,
+        ContentAiChoiceDelta,
+        ToolUseAiChoiceDelta,
+
         AiChoiceDeltas,
+        AiChoicesDeltas,
     )
 
     from .chat.tools.execution import (  # noqa
-        execute_tool_request,
+        execute_tool_use,
     )
 
     from .chat.transforms.base import (  # noqa
@@ -122,7 +124,6 @@ with _lang.auto_proxy_init(
         CompositeMessageTransform,
         FnMessageTransform,
         TypeFilteredMessageTransform,
-        fn_message_transform,
 
         ChatTransform,
         CompositeChatTransform,
@@ -153,12 +154,22 @@ with _lang.auto_proxy_init(
     )
 
     from .chat.messages import (  # noqa
-        AiMessage,
-        Chat,
         Message,
+        Chat,
+
+        AnyUserMessage,
+        UserChat,
+        check_user_chat,
+
+        AnyAiMessage,
+        AiChat,
+        check_ai_chat,
+
         SystemMessage,
-        ToolExecResultMessage,
         UserMessage,
+        AiMessage,
+        ToolUseMessage,
+        ToolUseResultMessage,
     )
 
     from .chat.services import (  # noqa
@@ -197,8 +208,14 @@ with _lang.auto_proxy_init(
         ImageContent,
     )
 
+    from .content.json import (  # noqa
+        JsonContent,
+    )
+
     from .content.materialize import (  # noqa
         CanContent,
+
+        materialize_content,
     )
 
     from .content.metadata import (  # noqa
@@ -401,7 +418,8 @@ with _lang.auto_proxy_init(
 
         ToolSpec,
 
-        ToolExecRequest,
+        ToolUse,
+        ToolUseResult,
     )
 
     ##
@@ -493,6 +511,12 @@ with _lang.auto_proxy_init(
         EnvKey,
     )
 
+    from .json import (  # noqa
+        JsonSchema,
+
+        JsonValue,
+    )
+
     from .metadata import (  # noqa
         Metadata,
 

ommlds/minichain/_marshal.py

@@ -1,10 +1,13 @@
 from omlish import dataclasses as dc
+from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 from omlish.funcs import match as mfs
 from omlish.typedvalues.marshal import build_typed_values_marshaler
 from omlish.typedvalues.marshal import build_typed_values_unmarshaler
 
+from .json import JsonValue
+
 
 ##
 
@@ -25,3 +28,39 @@ class _TypedValuesFieldUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
     @mfs.simple(lambda _, ctx, rty: True)
     def _build(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
         return build_typed_values_unmarshaler(ctx, self.tvs_rty)
+
+
+##
+
+
+class MarshalJsonValue(lang.NotInstantiable, lang.Final):
+    pass
+
+
+class _JsonValueMarshalerFactory(msh.MarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: rty is MarshalJsonValue)
+    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
+        return msh.NopMarshalerUnmarshaler()
+
+
+class _JsonValueUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: rty is MarshalJsonValue)
+    def _build(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
+        return msh.NopMarshalerUnmarshaler()
+
+
+##
+
+
+@lang.static_init
+def _install_standard_marshaling() -> None:
+    msh.register_global_config(
+        JsonValue,
+        msh.ReflectOverride(MarshalJsonValue),
+        identity=True,
+    )
+
+    msh.install_standard_factories(
+        _JsonValueMarshalerFactory(),
+        _JsonValueUnmarshalerFactory(),
+    )