ommlds 0.0.0.dev366__tar.gz → 0.0.0.dev368__tar.gz

{ommlds-0.0.0.dev366/ommlds.egg-info → ommlds-0.0.0.dev368}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev366
+Version: 0.0.0.dev368
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev366
-Requires-Dist: omlish==0.0.0.dev366
+Requires-Dist: omdev==0.0.0.dev368
+Requires-Dist: omlish==0.0.0.dev368
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.26; extra == "all"

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/__init__.py

@@ -137,6 +137,12 @@ from .content.namespaces import (  # noqa
     ContentNamespace,
 )
 
+from .content.placeholders import (  # noqa
+    ContentPlaceholder,
+    ContentPlaceholderMarker,
+    content_placeholder,
+)
+
 from .content.prepare import (  # noqa
     ContentPreparer,
     ContentStrPreparer,

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/anthropic/chat.py

@@ -56,10 +56,10 @@ class AnthropicChatChoicesService:
             self._model_name = cc.pop(ModelName(self.model))
 
     def _get_msg_content(self, m: Message) -> str | None:
-        if isinstance(m, (SystemMessage, AiMessage)):
+        if isinstance(m, AiMessage):
             return m.s
 
-        elif isinstance(m, UserMessage):
+        elif isinstance(m, (UserMessage, SystemMessage)):
             return check.isinstance(m.c, str)
 
         else:

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/google/chat.py

@@ -38,16 +38,16 @@ class GoogleChatChoicesService:
             self._api_key = ApiKey.pop_secret(cc, env='GEMINI_API_KEY')
 
     def _get_msg_content(self, m: Message) -> str | None:
-        if isinstance(m, (SystemMessage, AiMessage)):
-            return m.s
+        if isinstance(m, AiMessage):
+            return check.isinstance(m.s, str)
 
-        elif isinstance(m, UserMessage):
+        elif isinstance(m, (SystemMessage, UserMessage)):
             return check.isinstance(m.c, str)
 
         else:
             raise TypeError(m)
 
-    BASE_URL = 'https://generativelanguage.googleapis.com/v1beta/models'
+    BASE_URL: ta.ClassVar[str] = 'https://generativelanguage.googleapis.com/v1beta/models'
 
     ROLES_MAP: ta.ClassVar[ta.Mapping[type[Message], str]] = {
         SystemMessage: 'system',

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/llamacpp/format.py

@@ -21,10 +21,10 @@ ROLES_MAP: ta.Mapping[type[Message], str] = {
 
 
 def get_msg_content(m: Message) -> str | None:
-    if isinstance(m, (SystemMessage, AiMessage)):
+    if isinstance(m, AiMessage):
         return m.s
 
-    elif isinstance(m, UserMessage):
+    elif isinstance(m, (SystemMessage, UserMessage)):
         return check.isinstance(m.c, str)
 
     else:

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/mistral.py

@@ -37,10 +37,10 @@ class MistralChatChoicesService:
         self._api_key = api_key
 
     def _get_msg_content(self, m: Message) -> str | None:
-        if isinstance(m, (SystemMessage, AiMessage)):
+        if isinstance(m, AiMessage):
             return m.s
 
-        elif isinstance(m, UserMessage):
+        elif isinstance(m, (UserMessage, SystemMessage)):
             return check.isinstance(m.c, str)
 
         else:

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/mlx/chat.py

@@ -56,10 +56,10 @@ class MlxChatChoicesService(lang.ExitStacked):
     }
 
     def _get_msg_content(self, m: Message) -> str | None:
-        if isinstance(m, (SystemMessage, AiMessage)):
-            return m.s
+        if isinstance(m, AiMessage):
+            return check.isinstance(m.s, str)
 
-        elif isinstance(m, UserMessage):
+        elif isinstance(m, (SystemMessage, UserMessage)):
             return check.isinstance(m.c, str)
 
         else:

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/openai/format.py

@@ -35,7 +35,7 @@ def build_request_message(m: Message) -> ta.Mapping[str, ta.Any]:
     if isinstance(m, SystemMessage):
         return dict(
             role='system',
-            content=m.s,
+            content=m.c,
         )
 
     elif isinstance(m, AiMessage):

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/tinygrad/chat.py

@@ -65,7 +65,7 @@ def _prepare_toks(
     for msg in chat:
         if isinstance(msg, SystemMessage):
             role = 'system'
-            msg_s = msg.s
+            msg_s = check.isinstance(msg.c, str)
         elif isinstance(msg, UserMessage):
             role = 'user'
             msg_s = check.isinstance(msg.c, str)

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/backends/transformers/transformers.py

@@ -86,7 +86,7 @@ def build_chat_message(m: Message) -> ta.Mapping[str, ta.Any]:
     if isinstance(m, SystemMessage):
         return dict(
             role='system',
-            content=m.s,
+            content=m.c,
         )
 
     elif isinstance(m, AiMessage):

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/chat/messages.py

@@ -47,7 +47,7 @@ class Message(  # noqa
 
 @dc.dataclass(frozen=True)
 class SystemMessage(Message, lang.Final):
-    s: str
+    c: CanContent
 
 
 #
@@ -94,7 +94,7 @@ Chat: ta.TypeAlias = ta.Sequence[Message]
 class _MessageContentTransform(ContentTransform, lang.Final, lang.NotInstantiable):
     @dispatch.install_method(ContentTransform.apply)
     def apply_system_message(self, m: SystemMessage) -> SystemMessage:
-        return dc.replace(m, s=self.apply(m.s))
+        return dc.replace(m, c=self.apply(m.c))
 
     @dispatch.install_method(ContentTransform.apply)
     def apply_user_message(self, m: UserMessage) -> UserMessage:

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/content/_marshal.py

@@ -7,11 +7,10 @@ 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.text import templating as tpl
 
 from .images import ImageContent  # noqa
 from .materialize import CanContent
-from .namespaces import ContentNamespace
+from .materialize import _InnerCanContent
 from .sequence import BlockContent  # noqa
 from .sequence import InlineContent  # noqa
 from .text import TextContent  # noqa
@@ -88,11 +87,8 @@ class MarshalCanContent(lang.NotInstantiable, lang.Final):
 
 
 MarshalCanContentUnion: ta.TypeAlias = ta.Union[  # noqa
-    str,
-    ExtendedContent,
     ta.Iterable[MarshalCanContent],
-    type[ContentNamespace],
-    tpl.Templater,
+    _InnerCanContent,
 ]
 
 

ommlds-0.0.0.dev368/ommlds/minichain/content/materialize.py

@@ -0,0 +1,203 @@
+"""
+TODO:
+ - ExtendedCanContent
+"""
+import dataclasses as dc
+import typing as ta
+
+from omlish import check
+from omlish import dispatch
+from omlish.text import templating as tpl
+
+from .namespaces import ContentNamespace
+from .placeholders import ContentPlaceholder
+from .placeholders import ContentPlaceholderMarker
+from .types import Content
+from .types import ExtendedContent
+
+
+##
+
+
+_InnerCanContent: ta.TypeAlias = ta.Union[  # noqa
+    str,
+    ExtendedContent,
+
+    ContentPlaceholder,
+    type[ContentPlaceholderMarker],
+
+    type[ContentNamespace],
+
+    tpl.Templater,
+]
+
+CanContent: ta.TypeAlias = ta.Union[  # noqa
+    ta.Iterable['CanContent'],
+
+    None,
+
+    _InnerCanContent,
+]
+
+
+##
+
+
+ContentPlaceholderKey: ta.TypeAlias = ContentPlaceholder | type[ContentPlaceholderMarker]
+ContentPlaceholderMap: ta.TypeAlias = ta.Mapping[ContentPlaceholderKey, CanContent]
+ContentPlaceholderFn: ta.TypeAlias = ta.Callable[[ContentPlaceholderKey], CanContent]
+ContentPlaceholders: ta.TypeAlias = ContentPlaceholderMap | ContentPlaceholderFn
+
+
+@dc.dataclass()
+class ContentPlaceholderMissingError(Exception):
+    key: ContentPlaceholderKey
+
+
+def _make_content_placeholder_fn(cps: ContentPlaceholders | None = None) -> ContentPlaceholderFn:
+    if cps is None:
+        def none_fn(cpk: ContentPlaceholderKey) -> CanContent:
+            raise ContentPlaceholderMissingError(cpk)
+
+        return none_fn
+
+    elif isinstance(cps, ta.Mapping):
+        def mapping_fn(cpk: ContentPlaceholderKey) -> CanContent:
+            try:
+                return cps[cpk]
+            except KeyError:
+                raise ContentPlaceholderMissingError(cpk) from None
+
+        return mapping_fn
+
+    elif callable(cps):
+        return cps
+
+    else:
+        raise TypeError(cps)
+
+
+##
+
+
+class ContentDepthExceededError(Exception):
+    pass
+
+
+class ContentMaterializer:
+    DEFAULT_MAX_DEPTH: int = 100
+
+    def __init__(
+            self,
+            *,
+            content_placeholders: ContentPlaceholders | None = None,
+            templater_context: tpl.Templater.Context | None = None,
+            max_depth: int = DEFAULT_MAX_DEPTH,
+    ) -> None:
+        super().__init__()
+
+        self._templater_context = templater_context
+        self._content_placeholders_fn = _make_content_placeholder_fn(content_placeholders)
+        self._max_depth = max_depth
+
+        self._cur_depth = 0
+
+    def materialize(self, o: CanContent) -> Content:
+        if self._cur_depth >= self._max_depth:
+            raise ContentDepthExceededError
+
+        self._cur_depth += 1
+        try:
+            return self._materialize(o)
+        finally:
+            self._cur_depth -= 1
+
+    @dispatch.method
+    def _materialize(self, o: CanContent) -> Content:
+        raise TypeError(o)
+
+    #
+
+    @_materialize.register
+    def _materialize_str(self, o: str) -> Content:
+        return o
+
+    @_materialize.register
+    def _materialize_extended_content(self, o: ExtendedContent) -> Content:
+        return o
+
+    #
+
+    @_materialize.register
+    def _materialize_iterable(self, o: ta.Iterable) -> Content:
+        return [self.materialize(e) for e in o]
+
+    @_materialize.register
+    def _materialize_none(self, o: None) -> Content:
+        return []
+
+    #
+
+    @_materialize.register
+    def _materialize_placeholder(self, o: ContentPlaceholder) -> Content:
+        return self.materialize(self._content_placeholders_fn(o))
+
+    def _materialize_placeholder_marker_type(self, o: type[ContentPlaceholderMarker]) -> Content:
+        check.issubclass(o, ContentPlaceholderMarker)
+        return self.materialize(self._content_placeholders_fn(o))
+
+    #
+
+    def _materialize_namespace_type(self, o: type[ContentNamespace]) -> Content:
+        check.issubclass(o, ContentNamespace)
+
+        def rec(v: ta.Any) -> ta.Generator[Content]:
+            if isinstance(v, (bytes, bytearray, ta.Mapping)):
+                return
+
+            elif isinstance(v, type):
+                if issubclass(v, ContentNamespace):
+                    for n, e in v:
+                        if n.startswith('_'):
+                            continue
+                        yield from rec(e)
+
+            elif isinstance(v, ta.Iterable):
+                for e in v:
+                    yield from rec(e)
+
+            else:
+                yield self.materialize(v)
+
+        return list(rec(o))
+
+    #
+
+    @_materialize.register
+    def _materialize_type(self, o: type) -> Content:
+        if issubclass(o, ContentPlaceholderMarker):
+            return self._materialize_placeholder_marker_type(o)
+
+        elif issubclass(o, ContentNamespace):
+            return self._materialize_namespace_type(o)
+
+        else:
+            raise TypeError(o)
+
+    #
+
+    @_materialize.register
+    def _materialize_templater(self, o: tpl.Templater) -> Content:
+        return o.render(check.not_none(self._templater_context))
+
+
+def materialize_content(
+        o: CanContent,
+        *,
+        content_placeholders: ContentPlaceholders | None = None,
+        templater_context: tpl.Templater.Context | None = None,
+) -> Content:
+    return ContentMaterializer(
+        content_placeholders=content_placeholders,
+        templater_context=templater_context,
+    ).materialize(o)

ommlds-0.0.0.dev368/ommlds/minichain/content/placeholders.py

@@ -0,0 +1,20 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+##
+
+
+@dc.dataclass(frozen=True, eq=False)
+@dc.extra_class_params(repr_id=True)
+class ContentPlaceholder(lang.Final):
+    # kw_only to prevent misuse - the string passed to this class is not the Content itself, just the name of the
+    # placeholder
+    name: str | None = dc.field(default=None, kw_only=True, metadata=dc.extra_field_params(repr_fn=lang.opt_repr))
+
+
+content_placeholder = ContentPlaceholder
+
+
+class ContentPlaceholderMarker(lang.Marker):
+    pass

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds/minichain/lib/fs/ls/rendering.py

@@ -1,6 +1,9 @@
 """
 TODO:
+ - max_depth
  - '...' marker for truncated directories
+  - any directory with unlisted children will be suffixed inline with '...'
+  - absence of '...' indicates an empty directory
 """
 import dataclasses as dc
 import typing as ta
@@ -15,7 +18,16 @@ from .running import LsItem
 ##
 
 
-@dc.dataclass()
+class RenderedLsLines(ta.NamedTuple):
+    lines: list[str]
+    joined_len: int
+    is_truncated: bool
+
+
+#
+
+
+@dc.dataclass(eq=False)
 class _LsLine:
     item: LsItem
     d: int
@@ -30,28 +42,16 @@ class _LsLine:
         return f'{self.__class__.__name__}<{self.item.path!r}, {self.s!r}>'
 
 
-class RenderedLsLines(ta.NamedTuple):
-    lines: list[str]
-    joined_len: int
-    is_truncated: bool
-
-
-class LsLinesRenderer:
-    def __init__(
-            self,
-            *,
-            soft_max_len: int | None = None,
-    ) -> None:
-        super().__init__()
-
-        self._soft_max_len = soft_max_len
+@dc.dataclass()
+class _LsRenderRun:
+    root: DirLsItem
 
-    def render(self, root: DirLsItem) -> RenderedLsLines:
-        check.state(not root.path.endswith('/'))
-        root_pfx = root.path + '/'
+    _: dc.KW_ONLY
 
-        #
+    soft_max_len: int | None = None
 
+    @lang.cached_function
+    def root_line(self) -> _LsLine:
         def rec0(cur: LsItem, *, d: int = 0) -> _LsLine:
             if isinstance(cur, DirLsItem):
                 return _LsLine(
@@ -69,10 +69,10 @@ class LsLinesRenderer:
                     d,
                 )
 
-        root_line = rec0(root)
-
-        #
+        return rec0(self.root)
 
+    @lang.cached_function
+    def all_lines(self) -> ta.Sequence[_LsLine]:
         all_lines: list[_LsLine] = []
 
         def rec1(cur: _LsLine) -> None:
@@ -81,10 +81,39 @@ class LsLinesRenderer:
                 for child in cur.children.values():
                     rec1(child)
 
-        rec1(root_line)
+        rec1(self.root_line())
+        return all_lines
 
-        #
+    def render_item(self, item: LsItem) -> str:
+        root_pfx = self.root.path + '/'
+
+        if item.path == self.root.path:
+            return f'- {self.root.path}'
+
+        else:
+            return (
+                f'{"  " * (lang.strip_prefix(item.path, root_pfx).count("/") + 1)}'
+                f'- {item.name}'
+                f'{"/" if isinstance(item, DirLsItem) else ""}'
+            )
+
+    def collect_lines(self) -> list[str]:
+        ret: list[str] = []
 
+        def rec2(cur: _LsLine) -> None:
+            if cur.s is None:
+                return
+
+            ret.append(cur.s)
+
+            if cur.children is not None:
+                for child in cur.children.values():
+                    rec2(child)
+
+        rec2(self.root_line())
+        return ret
+
+    def run(self) -> RenderedLsLines:
         cur_len = 0
 
         def add_line(s: str, *, force: bool = False) -> str | None:
@@ -93,7 +122,7 @@ class LsLinesRenderer:
             nonlocal cur_len
             sl = len(s) + (1 if cur_len else 0)
 
-            if not force and (self._soft_max_len is not None and (cur_len + sl) > self._soft_max_len):
+            if not force and (self.soft_max_len is not None and (cur_len + sl) > self.soft_max_len):
                 return None
 
             cur_len += sl
@@ -101,26 +130,14 @@ class LsLinesRenderer:
 
         #
 
-        def render_item(item: LsItem) -> str:
-            if item.path == root.path:
-                return f'- {root.path}'
-
-            else:
-                return (
-                    f'{"  " * (lang.strip_prefix(item.path, root_pfx).count("/") + 1)}'
-                    f'- {item.name}'
-                    f'{"/" if isinstance(item, DirLsItem) else ""}'
-                )
-
-        #
-
-        root_line.s = add_line(render_item(root_line.item), force=True)
+        root_line = self.root_line()
+        root_line.s = add_line(self.render_item(root_line.item), force=True)
 
         for root_child in check.not_none(root_line.children).values():
-            root_child.s = add_line(render_item(root_child.item), force=True)
+            root_child.s = add_line(self.render_item(root_child.item), force=True)
 
         sorted_lines = sorted(
-            all_lines,
+            self.all_lines(),
             key=lambda line: (line.children is None, line.d),
         )
 
@@ -130,7 +147,7 @@ class LsLinesRenderer:
             if cur.s is not None:
                 continue
 
-            s = add_line(render_item(cur.item))
+            s = add_line(self.render_item(cur.item))
             if s is None:
                 is_truncated = True
                 break
@@ -139,22 +156,30 @@ class LsLinesRenderer:
 
         #
 
-        ret: list[str] = []
+        return RenderedLsLines(
+            self.collect_lines(),
+            cur_len,
+            is_truncated,
+        )
 
-        def rec2(cur: _LsLine) -> None:
-            if cur.s is None:
-                return
 
-            ret.append(cur.s)
+#
 
-            if cur.children is not None:
-                for child in cur.children.values():
-                    rec2(child)
 
-        rec2(root_line)
+class LsLinesRenderer:
+    def __init__(
+            self,
+            *,
+            soft_max_len: int | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._soft_max_len = soft_max_len
 
-        return RenderedLsLines(
-            ret,
-            cur_len,
-            is_truncated,
-        )
+    def render(self, root: DirLsItem) -> RenderedLsLines:
+        check.state(not root.path.endswith('/'))
+
+        return _LsRenderRun(
+            root,
+            soft_max_len=self._soft_max_len,
+        ).run()

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev366
+Version: 0.0.0.dev368
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev366
-Requires-Dist: omlish==0.0.0.dev366
+Requires-Dist: omdev==0.0.0.dev368
+Requires-Dist: omlish==0.0.0.dev368
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.26; extra == "all"

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds.egg-info/SOURCES.txt

@@ -169,6 +169,7 @@ ommlds/minichain/content/images.py
 ommlds/minichain/content/materialize.py
 ommlds/minichain/content/metadata.py
 ommlds/minichain/content/namespaces.py
+ommlds/minichain/content/placeholders.py
 ommlds/minichain/content/prepare.py
 ommlds/minichain/content/rendering.py
 ommlds/minichain/content/sequence.py

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/ommlds.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev366
-omlish==0.0.0.dev366
+omdev==0.0.0.dev368
+omlish==0.0.0.dev368
 
 [all]
 llama-cpp-python~=0.3

{ommlds-0.0.0.dev366 → ommlds-0.0.0.dev368}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev366'
+version = '0.0.0.dev368'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev366',
-    'omlish == 0.0.0.dev366',
+    'omdev == 0.0.0.dev368',
+    'omlish == 0.0.0.dev368',
 ]
 
 [project.optional-dependencies]