ommlds 0.0.0.dev496__py3-none-any.whl → 0.0.0.dev498__py3-none-any.whl

ommlds/minichain/_typedvalues.py

@@ -23,14 +23,21 @@ def _tv_field_coercer(
 ) -> ta.Callable[[ta.Sequence], tv.TypedValues]:
     if isinstance(tvc, tuple):
         check.arg(all(issubclass(e, tv.TypedValue) for e in tvc))
+
     else:
         check.issubclass(tvc, tv.TypedValue)
 
     def inner(seq):
-        return tv.TypedValues(*[
-            check.isinstance(e, tvc)
-            for e in check.isinstance(seq, ta.Sequence)
-        ])
+        if isinstance(seq, tv.TypedValues):
+            for e in seq:
+                check.isinstance(e, tvc)
+            return seq
+
+        else:
+            return tv.TypedValues(*[
+                check.isinstance(e, tvc)
+                for e in check.isinstance(seq, ta.Sequence)
+            ])
 
     return inner
 

ommlds/minichain/chat/content.py

@@ -0,0 +1,42 @@
+import typing as ta
+
+from ..content.content import Content
+from ..content.transform.strings import transform_content_strings
+from .messages import AiMessage
+from .messages import Message
+from .messages import SystemMessage
+from .messages import ToolUseMessage
+from .messages import ToolUseResultMessage
+from .messages import UserMessage
+
+
+MessageT = ta.TypeVar('MessageT', bound=Message)
+
+
+##
+
+
+def transform_message_content(fn: ta.Callable[[Content], Content], m: MessageT) -> MessageT:
+    if isinstance(m, UserMessage):
+        return m.replace(c=fn(m.c))
+
+    elif isinstance(m, AiMessage):
+        return m.replace(c=fn(m.c))
+
+    elif isinstance(m, SystemMessage):
+        return m.replace(c=fn(m.c))
+
+    elif isinstance(m, ToolUseMessage):
+        # TODO: m.tu.args?
+        return m
+
+    elif isinstance(m, ToolUseResultMessage):
+        # TODO: m.tur.c?
+        return m
+
+    else:
+        raise TypeError(m)
+
+
+def transform_message_content_strings(fn: ta.Callable[[str], str], m: MessageT) -> MessageT:
+    return transform_message_content(lambda c: transform_content_strings(fn, c), m)

ommlds/minichain/chat/messages.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - channel? reasoning / thinking?
+"""
 import operator
 import typing as ta
 
@@ -5,13 +9,12 @@ from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
 from omlish import marshal as msh
-from omlish import typedvalues as tv
 
-from .._typedvalues import _tv_field_metadata
-from ..content.types import Content
-from ..metadata import MetadataContainer
+from ..content.content import Content
+from ..metadata import MetadataContainerDataclass
 from ..tools.types import ToolUse
 from ..tools.types import ToolUseResult
+from .metadata import MessageMetadata
 from .metadata import MessageMetadatas
 
 
@@ -23,7 +26,7 @@ msh.register_global_module_import('._marshal', __package__)
 
 @dc.dataclass(frozen=True)
 class Message(  # noqa
-    MetadataContainer[MessageMetadatas],
+    MetadataContainerDataclass[MessageMetadatas],
     lang.Abstract,
     lang.Sealed,
 ):
@@ -31,18 +34,14 @@ class Message(  # noqa
         default=(),
         kw_only=True,
         repr=False,
-        metadata=_tv_field_metadata(
-            MessageMetadatas,
-            marshal_name='metadata',
-        ),
     )
 
-    @property
-    def metadata(self) -> tv.TypedValues[MessageMetadatas]:
-        return check.isinstance(self._metadata, tv.TypedValues)
+    MetadataContainerDataclass._configure_metadata_field(_metadata, MessageMetadatas)  # noqa
 
-    def with_metadata(self, *mds: MessageMetadatas, override: bool = False) -> ta.Self:
-        return dc.replace(self, _metadata=tv.TypedValues(*self._metadata, *mds, override=override))
+    def replace(self, **kwargs: ta.Any) -> ta.Self:
+        if (n := dc.replace_is_not(self, **kwargs)) is self:
+            return self
+        return n.update_metadata(MessageOriginal(self), discard=[MessageOriginal], override=True)
 
 
 Chat: ta.TypeAlias = ta.Sequence[Message]
@@ -51,6 +50,14 @@ Chat: ta.TypeAlias = ta.Sequence[Message]
 ##
 
 
+@dc.dataclass(frozen=True)
+class MessageOriginal(MessageMetadata, lang.Final):
+    c: Message
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class AnyUserMessage(Message, lang.Abstract):
     pass

ommlds/minichain/chat/stream/types.py

@@ -4,7 +4,7 @@ from omlish import dataclasses as dc
 from omlish import lang
 from omlish import marshal as msh
 
-from ...content.types import Content
+from ...content.content import Content
 from ...stream.services import StreamOptions
 from ...types import Option
 from ...types import Output

ommlds/minichain/chat/templating.py

@@ -10,9 +10,9 @@ from omlish import dataclasses as dc
 from omlish import lang
 from omlish.text import templating as tpl
 
-from ..content.transform.strings import transform_content_strings
 from ..envs import Env
 from ..envs import EnvKey
+from .content import transform_message_content_strings
 from .messages import Chat
 from .messages import Message
 
@@ -81,7 +81,7 @@ class ChatTemplater:
                 t = self.d[s]
                 return t.render(tpl.Templater.Context(env))
 
-            return [transform_content_strings(render_content_str, self.m)]
+            return [transform_message_content_strings(render_content_str, self.m)]
 
     @dc.dataclass(frozen=True)
     class _PlaceholderStep(_Step):
@@ -110,7 +110,7 @@ class ChatTemplater:
                 content_strs.add(s)
                 return s
 
-            transform_content_strings(visit_content_str, p.v)
+            transform_message_content_strings(visit_content_str, p.v)
 
             d: dict[str, tpl.Templater] = {
                 s: self._template_factory(s)

ommlds/minichain/chat/transforms/metadata.py

@@ -26,7 +26,7 @@ class UuidAddingMessageTransform(MessageTransform):
 
     def transform_message(self, m: Message) -> Chat:
         if Uuid not in m.metadata:
-            m = m.with_metadata(Uuid(self.uuid_factory()))
+            m = m.update_metadata(Uuid(self.uuid_factory()))
         return [m]
 
 
@@ -36,7 +36,7 @@ class CreatedAtAddingMessageTransform(MessageTransform):
 
     def transform_message(self, m: Message) -> Chat:
         if CreatedAt not in m.metadata:
-            m = m.with_metadata(CreatedAt(self.clock()))
+            m = m.update_metadata(CreatedAt(self.clock()))
         return [m]
 
 
@@ -54,6 +54,6 @@ class OriginAddingMessageTransform(MessageTransform):
 
     def transform_message(self, m: Message) -> Chat:
         return [
-            o.with_metadata(TransformedMessageOrigin(m)) if TransformedMessageOrigin not in o.metadata else m
+            o.update_metadata(TransformedMessageOrigin(m)) if TransformedMessageOrigin not in o.metadata else m
             for o in self.child.transform_message(m)
         ]

ommlds/minichain/content/__init__.py

@@ -8,17 +8,26 @@ _msh.register_global_module_import('._marshal', __package__)
 ##
 
 
-# This is everything _marshal.py references - it must all be imported before the conditional import.
+# These are all of the Content subtypes - it must all be imported before the conditional import.
 
 from . import (  # noqa
     code as _code,
+    composite as _composite,
+    content as _content,
     dynamic as _dynamic,
+    emphasis as _emphasis,
     images as _images,
     json as _json,
+    link as _link,
+    markdown as _markdown,
+    namespaces as _namespaces,
+    placeholders as _placeholders,
     quote as _quote,
     raw as _raw,
+    recursive as _recursive,
     section as _section,
     sequence as _sequence,
+    standard as _standard,
     tag as _tag,
     templates as _templates,
     text as _text,

ommlds/minichain/content/_marshal.py

@@ -7,24 +7,28 @@ from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 
-from .code import CodeContent  # noqa
-from .dynamic import DynamicContent  # noqa
-from .images import ImageContent  # noqa
-from .json import JsonContent  # noqa
-from .quote import QuoteContent  # noqa
+from .code import BlockCodeContent
+from .code import InlineCodeContent
+from .content import BaseContent
+from .content import Content
+from .emphasis import BoldContent
+from .emphasis import BoldItalicContent
+from .emphasis import ItalicContent
+from .images import ImageContent
+from .json import JsonContent
+from .link import LinkContent
+from .markdown import MarkdownContent
+from .quote import QuoteContent
 from .raw import NON_STR_SINGLE_RAW_CONTENT_TYPES
 from .raw import NonStrSingleRawContent
-from .raw import RawContent  # noqa
-from .raw import SingleRawContent  # noqa
-from .section import SectionContent  # noqa
-from .sequence import BlockContent  # noqa
-from .sequence import InlineContent  # noqa
-from .sequence import ItemListContent  # noqa
-from .tag import TagContent  # noqa
-from .text import TextContent  # noqa
-from .types import CONTENT_TYPES  # noqa
-from .types import BaseContent
-from .types import Content
+from .raw import RawContent
+from .raw import SingleRawContent
+from .section import SectionContent
+from .sequence import BlockContent
+from .sequence import InlineContent
+from .sequence import ItemListContent
+from .tag import TagContent
+from .text import TextContent
 
 
 ##
@@ -234,12 +238,21 @@ def _install_standard_marshaling() -> None:
         BaseContent,
         [
 
-            msh.Impl(CodeContent, 'code'),
+            msh.Impl(InlineCodeContent, 'inline_code'),
+            msh.Impl(BlockCodeContent, 'block_code'),
+
+            msh.Impl(BoldContent, 'bold'),
+            msh.Impl(ItalicContent, 'italic'),
+            msh.Impl(BoldItalicContent, 'bold_italic'),
 
             msh.Impl(ImageContent, 'image'),
 
             msh.Impl(JsonContent, 'json'),
 
+            msh.Impl(LinkContent, 'link'),
+
+            msh.Impl(MarkdownContent, 'markdown'),
+
             msh.Impl(QuoteContent, 'quote'),
 
             msh.Impl(SectionContent, 'section'),

ommlds/minichain/content/code.py

@@ -2,16 +2,25 @@ from omlish import dataclasses as dc
 from omlish import lang
 
 from .standard import StandardContent
-from .types import LeafContent
 
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class CodeContent(StandardContent, LeafContent, lang.Final):
+class CodeContent(StandardContent, lang.Abstract):
     s: str
 
     _: dc.KW_ONLY
 
     lang: str | None = None
+
+
+@dc.dataclass(frozen=True)
+class InlineCodeContent(CodeContent, lang.Final):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class BlockCodeContent(CodeContent, lang.Final):
+    pass

ommlds/minichain/content/composite.py

@@ -0,0 +1,28 @@
+import abc
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .content import Content
+from .standard import StandardContent
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class CompositeContent(StandardContent, lang.Abstract):
+    @abc.abstractmethod
+    def child_content(self) -> ta.Sequence[Content]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _replace_child_content(self, new_child_content: ta.Sequence[Content]) -> ta.Self:
+        raise NotImplementedError
+
+    def replace_child_content(self, new_child_content: ta.Sequence[Content]) -> ta.Self:
+        if lang.seqs_identical(new_child_content, self.child_content()):
+            return self
+
+        return self._replace_child_content(new_child_content)

ommlds/minichain/content/{types.py → content.py}

@@ -10,10 +10,6 @@ class BaseContent(lang.Abstract, lang.PackageSealed):
     pass
 
 
-class LeafContent(BaseContent, lang.Abstract):
-    pass
-
-
 ##
 
 

ommlds/minichain/content/emphasis.py

@@ -0,0 +1,27 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .standard import StandardContent
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class EmphasisContent(StandardContent, lang.Abstract):
+    s: str
+
+
+@dc.dataclass(frozen=True)
+class BoldContent(EmphasisContent, lang.Final):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class ItalicContent(EmphasisContent, lang.Final):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class BoldItalicContent(EmphasisContent, lang.Final):
+    pass

ommlds/minichain/content/images.py

@@ -9,7 +9,6 @@ from omlish import dataclasses as dc
 from omlish import lang
 
 from .standard import StandardContent
-from .types import LeafContent
 
 
 if ta.TYPE_CHECKING:
@@ -22,5 +21,5 @@ else:
 
 
 @dc.dataclass(frozen=True)
-class ImageContent(StandardContent, LeafContent, lang.Final):
+class ImageContent(StandardContent, lang.Final):
     i: 'pimg.Image' = dc.field()

ommlds/minichain/content/json.py

@@ -3,12 +3,11 @@ from omlish import lang
 
 from ..json import JsonValue
 from .standard import StandardContent
-from .types import LeafContent
 
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class JsonContent(StandardContent, LeafContent, lang.Final):
+class JsonContent(StandardContent, lang.Final):
     v: JsonValue

ommlds/minichain/content/link.py

@@ -0,0 +1,13 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .standard import StandardContent
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class LinkContent(StandardContent, lang.Final):
+    url: str
+    title: str | None = None

ommlds/minichain/content/markdown.py

@@ -0,0 +1,12 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .standard import StandardContent
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class MarkdownContent(StandardContent, lang.Final):
+    s: str

ommlds/minichain/content/metadata.py

@@ -1,9 +1,11 @@
 import typing as ta
 
+from omlish import dataclasses as dc
 from omlish import lang
 
 from ..metadata import CommonMetadata
 from ..metadata import Metadata
+from .content import Content
 
 
 ##
@@ -14,3 +16,11 @@ class ContentMetadata(Metadata, lang.Abstract):
 
 
 ContentMetadatas: ta.TypeAlias = ContentMetadata | CommonMetadata
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ContentOriginal(ContentMetadata, lang.Final):
+    c: Content

ommlds/minichain/content/namespaces.py

@@ -1,8 +1,7 @@
 from omlish import dataclasses as dc
 from omlish import lang
 
-from .dynamic import DynamicContent
-from .types import LeafContent
+from .recursive import RecursiveContent
 
 
 ##
@@ -13,5 +12,5 @@ class ContentNamespace(lang.Namespace, lang.Abstract):
 
 
 @dc.dataclass(frozen=True)
-class NamespaceContent(DynamicContent, LeafContent, lang.Final):
+class NamespaceContent(RecursiveContent, lang.Final):
     ns: type[ContentNamespace]

ommlds/minichain/content/placeholders.py

@@ -3,8 +3,7 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
-from .dynamic import DynamicContent
-from .types import LeafContent
+from .recursive import RecursiveContent
 
 
 ##
@@ -18,5 +17,5 @@ PlaceholderContentKey: ta.TypeAlias = str | type[ContentPlaceholder]
 
 
 @dc.dataclass(frozen=True)
-class PlaceholderContent(DynamicContent, LeafContent, lang.Final):
+class PlaceholderContent(RecursiveContent, lang.Final):
     k: PlaceholderContentKey

ommlds/minichain/content/quote.py

@@ -2,16 +2,25 @@
 TODO:
  - attribution
 """
+import typing as ta
+
+from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
 
-from .standard import StandardContent
-from .types import Content
+from .composite import CompositeContent
+from .content import Content
 
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class QuoteContent(StandardContent, lang.Final):
+class QuoteContent(CompositeContent, lang.Final):
     body: Content
+
+    def child_content(self) -> ta.Sequence[Content]:
+        return [self.body]
+
+    def _replace_child_content(self, new_child_content: ta.Sequence[Content]) -> ta.Self:
+        return self.replace(body=check.single(new_child_content))

ommlds/minichain/content/recursive.py

@@ -0,0 +1,12 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .dynamic import DynamicContent
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class RecursiveContent(DynamicContent, lang.Abstract):
+    pass

ommlds/minichain/content/section.py

@@ -1,14 +1,26 @@
+import typing as ta
+
+from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
 
-from .standard import StandardContent
-from .types import Content
+from .composite import CompositeContent
+from .content import Content
 
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class SectionContent(StandardContent, lang.Final):
-    header: str
+class SectionContent(CompositeContent, lang.Final):
     body: Content
+
+    _: dc.KW_ONLY
+
+    header: str | None
+
+    def child_content(self) -> ta.Sequence[Content]:
+        return [self.body]
+
+    def _replace_child_content(self, new_child_content: ta.Sequence[Content]) -> ta.Self:
+        return self.replace(body=check.single(new_child_content))

ommlds/minichain/content/sequence.py

@@ -1,5 +1,6 @@
 """
 TODO:
+ - ... does inline have *any* separator? generic whitespace when content is stripped?
  - track BlockContent nesting depth?
  - section names? dedicated 'section' content with header and body?
 """
@@ -8,17 +9,23 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
-from .standard import StandardContent
-from .types import Content
+from .composite import CompositeContent
+from .content import Content
 
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class SequenceContent(StandardContent, lang.Abstract):
+class SequenceContent(CompositeContent, lang.Abstract):
     l: ta.Sequence[Content]
 
+    def child_content(self) -> ta.Sequence[Content]:
+        return self.l
+
+    def _replace_child_content(self, new_child_content: ta.Sequence[Content]) -> ta.Self:
+        return self.replace(l=new_child_content)
+
 
 @dc.dataclass(frozen=True)
 class InlineContent(SequenceContent, lang.Final):
@@ -32,4 +39,6 @@ class BlockContent(SequenceContent, lang.Final):
 
 @dc.dataclass(frozen=True)
 class ItemListContent(SequenceContent, lang.Final):
-    pass
+    _: dc.KW_ONLY
+
+    style: ta.Literal['-', '#'] = '-'