ommlds 0.0.0.dev449__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": 29,
+    "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/__init__.py

@@ -0,0 +1,3 @@
+from omlish import marshal as _msh  # noqa
+
+_msh.register_global_module_import('._marshal', __package__)

ommlds/backends/google/protocol/_marshal.py

@@ -0,0 +1,16 @@
+from omlish import lang
+from omlish import marshal as msh
+
+from .types import Value
+
+
+##
+
+
+@lang.static_init
+def _install_standard_marshaling() -> None:
+    msh.install_standard_factories(
+        *msh.standard_polymorphism_factories(
+            msh.polymorphism_from_subclasses(Value),
+        ),
+    )