ommlds 0.0.0.dev450__py3-none-any.whl → 0.0.0.dev451__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": 30,
+    "line": 37,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.chat",
@@ -96,7 +96,7 @@
     "module": ".minichain.backends.impls.google.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/google/chat.py",
-    "line": 33,
+    "line": 34,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.google.chat",
@@ -606,7 +606,7 @@
     "module": ".tools.ocr",
     "attr": "_CLI_MODULE",
     "file": "ommlds/tools/ocr.py",
-    "line": 83,
+    "line": 89,
     "value": {
       "!omdev.cli.types.CliModule": {
         "name": "ocr",

ommlds/backends/anthropic/protocol/_marshal.py

@@ -8,7 +8,7 @@ from .types import Content
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     for root_cls in [
         Content,
         Content.CacheControl,

ommlds/backends/anthropic/protocol/sse/_marshal.py

@@ -8,7 +8,7 @@ from .events import AnthropicSseDecoderEvents
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     for root_cls in [
         AnthropicSseDecoderEvents.Event,
         AnthropicSseDecoderEvents.ContentBlockStart.ContentBlock,

ommlds/backends/anthropic/protocol/sse/assemble.py

@@ -76,7 +76,7 @@ class AnthropicSseMessageAssembler(
             elif isinstance(ae, AnthropicSseDecoderEvents.MessageStop):
                 yield [Message(
                     id=ms.message.id,
-                    role=ms.message.role,
+                    role=ms.message.role,  # type: ignore[arg-type]
                     model=ms.message.model,
                     content=content,
                     stop_reason=dct['stop_reason'],

ommlds/backends/anthropic/protocol/types.py

@@ -1,3 +1,6 @@
+"""
+https://docs.claude.com/en/api/messages
+"""
 import typing as ta
 
 from omlish import dataclasses as dc
@@ -8,6 +11,22 @@ from omlish import marshal as msh
 ##
 
 
+def _set_class_marshal_options(cls):
+    msh.update_object_metadata(
+        cls,
+        field_defaults=msh.FieldMetadata(
+            options=msh.FieldOptions(
+                omit_if=lang.is_none,
+            ),
+        ),
+    )
+
+    return cls
+
+
+##
+
+
 class Content(lang.Abstract, lang.Sealed):
     class CacheControl(lang.Abstract, lang.Sealed):
         """https://docs.anthropic.com/en/docs/build-with-claude/prompt-caching"""
@@ -18,7 +37,7 @@ class Content(lang.Abstract, lang.Sealed):
 
 
 @dc.dataclass(frozen=True)
-@msh.update_fields_metadata(['cache_control'], omit_if=lang.is_none)
+@_set_class_marshal_options
 class Text(Content):
     text: str
 
@@ -28,7 +47,7 @@ class Text(Content):
 
 
 @dc.dataclass(frozen=True)
-@msh.update_fields_metadata(['cache_control'], omit_if=lang.is_none)
+@_set_class_marshal_options
 class ToolUse(Content):
     id: str
     name: str
@@ -40,6 +59,7 @@ class ToolUse(Content):
 
 
 @dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class ToolResult(Content):
     tool_use_id: str
     content: str
@@ -49,7 +69,7 @@ class ToolResult(Content):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-@msh.update_object_metadata(field_defaults=msh.FieldMetadata(options=msh.FieldOptions(omit_if=lang.is_none)))
+@_set_class_marshal_options
 class CacheCreation:
     ephemeral_5m_input_tokens: int | None = None
     ephemeral_1h_input_tokens: int | None = None
@@ -59,7 +79,7 @@ class CacheCreation:
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-@msh.update_object_metadata(field_defaults=msh.FieldMetadata(options=msh.FieldOptions(omit_if=lang.is_none)))
+@_set_class_marshal_options
 class Usage:
     input_tokens: int | None = None
     output_tokens: int | None = None
@@ -75,15 +95,15 @@ class Usage:
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-@msh.update_object_metadata(field_defaults=msh.FieldMetadata(options=msh.FieldOptions(omit_if=lang.is_none)))
+@_set_class_marshal_options
 class Message:
     id: str | None = None
 
-    role: str | None = None
+    role: ta.Literal['user', 'assistant']
 
     model: str | None = None
 
-    content: ta.Sequence[Content] | None = None
+    content: str | ta.Sequence[Content] | None = None
 
     stop_reason: str | None = None
     stop_sequence: str | None = None
@@ -95,6 +115,7 @@ class Message:
 
 
 @dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class ToolSpec:
     name: str
     description: str
@@ -105,7 +126,7 @@ class ToolSpec:
 
 
 @dc.dataclass(frozen=True)
-@msh.update_object_metadata(field_defaults=msh.FieldMetadata(options=msh.FieldOptions(omit_if=lang.is_none)))
+@_set_class_marshal_options
 class MessagesRequest:
     model: str
 
@@ -113,7 +134,7 @@ class MessagesRequest:
 
     _: dc.KW_ONLY
 
-    system: ta.Sequence[Content] | None = None
+    system: str | ta.Sequence[Content] | None = None
 
     tools: ta.Sequence[ToolSpec] | None = None
 

ommlds/backends/google/protocol/_marshal.py

@@ -8,7 +8,7 @@ from .types import Value
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         *msh.standard_polymorphism_factories(
             msh.polymorphism_from_subclasses(Value),

ommlds/backends/openai/protocol/_marshal.py

@@ -10,7 +10,7 @@ from .chatcompletion.responseformat import ChatCompletionResponseFormat
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     for root_cls, tag_field in [
         (ChatCompletionContentPart, 'type'),
         (ChatCompletionMessage, 'role'),

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,6 +7,7 @@ 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
@@ -43,6 +44,7 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
             printer: ChatSessionPrinter,
             backend_catalog: mc.BackendCatalog,
             tool_exec_request_executor: ToolExecRequestExecutor,
+            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])

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
 
@@ -48,6 +49,9 @@ class StringChatSessionPrinter(ChatSessionPrinter, lang.Abstract):
             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/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
@@ -49,7 +48,7 @@ class AskingToolExecutionConfirmation(ToolExecutionConfirmation):
             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')
 

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

@@ -197,8 +197,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
@@ -493,6 +499,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(),
+    )

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

@@ -1,4 +1,5 @@
 """
+https://docs.claude.com/en/api/messages
 https://github.com/anthropics/anthropic-sdk-python/tree/cd80d46f7a223a5493565d155da31b898a4c6ee5/src/anthropic/types
 https://github.com/anthropics/anthropic-sdk-python/blob/cd80d46f7a223a5493565d155da31b898a4c6ee5/src/anthropic/resources/completions.py#L53
 https://github.com/anthropics/anthropic-sdk-python/blob/cd80d46f7a223a5493565d155da31b898a4c6ee5/src/anthropic/resources/messages.py#L70
@@ -6,11 +7,12 @@ https://github.com/anthropics/anthropic-sdk-python/blob/cd80d46f7a223a5493565d15
 import typing as ta
 
 from omlish import check
-from omlish import lang
+from omlish import marshal as msh
 from omlish import typedvalues as tv
 from omlish.formats import json
 from omlish.http import all as http
 
+from .....backends.anthropic.protocol import types as pt
 from ....chat.choices.services import ChatChoicesRequest
 from ....chat.choices.services import ChatChoicesResponse
 from ....chat.choices.services import static_check_is_chat_choices_service
@@ -18,9 +20,14 @@ from ....chat.choices.types import AiChoice
 from ....chat.messages import AiMessage
 from ....chat.messages import Message
 from ....chat.messages import SystemMessage
+from ....chat.messages import ToolExecResultMessage
 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 ToolExecRequest
 from .names import MODEL_NAMES
 
 
@@ -68,26 +75,69 @@ class AnthropicChatChoicesService:
             *,
             max_tokens: int = 4096,  # FIXME: ChatOption
     ) -> ChatChoicesResponse:
-        messages = []
-        system: str | None = None
+        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 = self._get_msg_content(m)
+                system = [pt.Text(check.not_none(self._get_msg_content(m)))]
+
+            elif isinstance(m, ToolExecResultMessage):
+                messages.append(pt.Message(
+                    role='user',
+                    content=[pt.ToolResult(
+                        tool_use_id=check.not_none(m.id),
+                        content=json.dumps_compact(msh.marshal(m.c)) if not isinstance(m.c, str) else m.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))],
+                # ))
+                a_tus: list[pt.ToolUse] = []
+                for tr in m.tool_exec_requests or []:
+                    a_tus.append(pt.ToolUse(
+                        id=check.not_none(tr.id),
+                        name=check.not_none(tr.name),
+                        input=tr.args,
+                    ))
+                messages.append(pt.Message(
+                    role='assistant',
+                    content=[
+                        *([pt.Text(check.isinstance(m.c, str))] if m.c is not None else []),
+                        *a_tus,
+                    ],
+                ))
+
             else:
-                messages.append(dict(
-                    role=self.ROLES_MAP[type(m)],  # noqa
-                    content=check.isinstance(self._get_msg_content(m), str),
+                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))],
+                ))
+
+        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),
                 ))
 
-        raw_request = dict(
+        a_req = pt.MessagesRequest(
             model=MODEL_NAMES.resolve(self._model_name.v),
-            **lang.opt_kw(system=system),
+            system=system,
             messages=messages,
+            tools=tools or None,
             max_tokens=max_tokens,
         )
 
+        raw_request = msh.marshal(a_req)
+
         raw_response = http.request(
             'https://api.anthropic.com/v1/messages',
             headers={
@@ -100,6 +150,24 @@ class AnthropicChatChoicesService:
 
         response = json.loads(check.not_none(raw_response.data).decode('utf-8'))
 
+        resp_c: ta.Any = None
+        ters: list[ToolExecRequest] = []
+        for c in response['content']:
+            if c['type'] == 'text':
+                check.none(resp_c)
+                resp_c = check.not_none(c['text'])
+            elif c['type'] == 'tool_use':
+                ters.append(ToolExecRequest(
+                    id=c['id'],
+                    name=c['name'],
+                    args=c['input'],
+                ))
+            else:
+                raise TypeError(c['type'])
+
         return ChatChoicesResponse([
-            AiChoice(AiMessage(response['content'][0]['text'])),  # noqa
+            AiChoice(AiMessage(
+                resp_c,
+                tool_exec_requests=ters if ters else None,
+            )),
         ])

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

@@ -20,6 +20,7 @@ from ....chat.messages import SystemMessage
 from ....chat.messages import ToolExecResultMessage
 from ....chat.messages import UserMessage
 from ....chat.tools.types import Tool
+from ....content.types import Content
 from ....models.configs import ModelName
 from ....standard import ApiKey
 from ....tools.types import ToolExecRequest
@@ -59,7 +60,7 @@ class GoogleChatChoicesService:
 
     ROLES_MAP: ta.ClassVar[ta.Mapping[type[Message], str]] = {
         UserMessage: 'user',
-        AiMessage: 'assistant',
+        AiMessage: 'model',
     }
 
     async def invoke(
@@ -79,6 +80,7 @@ class GoogleChatChoicesService:
                         text=check.not_none(self._get_msg_content(m)),
                     )],
                 )
+
             elif isinstance(m, ToolExecResultMessage):
                 tr_resp_val: pt.Value
                 if m.c is None:
@@ -98,6 +100,26 @@ class GoogleChatChoicesService:
                         ),
                     )],
                 ))
+
+            elif isinstance(m, AiMessage):
+                ai_parts: list[pt.Part] = []
+                if m.c is not None:
+                    ai_parts.append(pt.Part(
+                        text=check.not_none(self._get_msg_content(m)),
+                    ))
+                for teq in m.tool_exec_requests or []:
+                    ai_parts.append(pt.Part(
+                        function_call=pt.FunctionCall(
+                            id=teq.id,
+                            name=teq.name,
+                            args=teq.args,
+                        ),
+                    ))
+                g_contents.append(pt.Content(
+                    parts=ai_parts,
+                    role='model',
+                ))
+
             else:
                 g_contents.append(pt.Content(
                     parts=[pt.Part(
@@ -137,17 +159,23 @@ class GoogleChatChoicesService:
 
         ai_choices: list[AiChoice] = []
         for c in g_resp.candidates or []:
-            g_resp_part = check.single(check.not_none(check.not_none(c.content).parts))
-            ter: ToolExecRequest | None = None
-            if (g_fc := g_resp_part.function_call) is not None:
-                ter = ToolExecRequest(
-                    id=g_fc.id,
-                    name=g_fc.name,
-                    args=g_fc.args or {},
-                )
+            ai_c: Content | None = None
+            ters: list[ToolExecRequest] = []
+            for g_resp_part in check.not_none(check.not_none(c.content).parts):
+                if (g_txt := g_resp_part.text) is not None:
+                    check.none(ai_c)
+                    ai_c = g_txt
+                elif (g_fc := g_resp_part.function_call) is not None:
+                    ters.append(ToolExecRequest(
+                        id=g_fc.id,
+                        name=g_fc.name,
+                        args=g_fc.args or {},
+                    ))
+                else:
+                    raise TypeError(g_resp_part)
             ai_choices.append(AiChoice(AiMessage(
-                c=g_resp_part.text,
-                tool_exec_requests=[ter] if ter is not None else None,
+                c=ai_c,
+                tool_exec_requests=ters if ters else None,
             )))
 
         return ChatChoicesResponse(ai_choices)

ommlds/minichain/chat/_marshal.py

@@ -12,7 +12,7 @@ from .messages import Message
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msgs_poly = msh.polymorphism_from_subclasses(
         Message,
         naming=msh.Naming.SNAKE,