ommlds 0.0.0.dev509__tar.gz → 0.0.0.dev511__tar.gz

{ommlds-0.0.0.dev509/ommlds.egg-info → ommlds-0.0.0.dev511}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev509
+Version: 0.0.0.dev511
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,16 +14,16 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev509
+Requires-Dist: omlish==0.0.0.dev511
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev509; extra == "all"
+Requires-Dist: omdev==0.0.0.dev511; extra == "all"
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "all"
 Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "all"
 Requires-Dist: tiktoken~=0.12; extra == "all"
 Requires-Dist: tinygrad~=0.12; extra == "all"
 Requires-Dist: tokenizers~=0.22; extra == "all"
-Requires-Dist: torch~=2.9; extra == "all"
+Requires-Dist: torch~=2.10; extra == "all"
 Requires-Dist: transformers~=4.57; extra == "all"
 Requires-Dist: sentence-transformers~=5.2; extra == "all"
 Requires-Dist: huggingface-hub~=0.36; extra == "all"
@@ -38,7 +38,7 @@ Requires-Dist: mwparserfromhell~=0.7; extra == "all"
 Requires-Dist: wikitextparser~=0.56; extra == "all"
 Requires-Dist: lxml>=5.3; python_version < "3.13" and extra == "all"
 Provides-Extra: omdev
-Requires-Dist: omdev==0.0.0.dev509; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev511; extra == "omdev"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "backends"
@@ -46,7 +46,7 @@ Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "backends"
 Requires-Dist: tiktoken~=0.12; extra == "backends"
 Requires-Dist: tinygrad~=0.12; extra == "backends"
 Requires-Dist: tokenizers~=0.22; extra == "backends"
-Requires-Dist: torch~=2.9; extra == "backends"
+Requires-Dist: torch~=2.10; extra == "backends"
 Requires-Dist: transformers~=4.57; extra == "backends"
 Requires-Dist: sentence-transformers~=5.2; extra == "backends"
 Provides-Extra: huggingface

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/__about__.py

@@ -33,7 +33,7 @@ class Project(ProjectBase):
 
             'tokenizers ~= 0.22',
 
-            'torch ~= 2.9',
+            'torch ~= 2.10',
 
             'transformers ~= 4.57',
             'sentence-transformers ~= 5.2',

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/cli/_dataclasses.py

@@ -2962,6 +2962,157 @@ def _process_dataclass__9f7e26a87dd163b610f38caa1ce9b3c6356e632a():
     return _process_dataclass
 
 
+@_register(
+    plan_repr=(
+        "Plans(tup=(CopyPlan(fields=('message', 'error')), EqPlan(fields=('message', 'error')), FrozenPlan(fields=('mes"
+        "sage', 'error'), allow_dynamic_dunder_attrs=False), HashPlan(action='add', fields=('message', 'error'), cache="
+        "False), InitPlan(fields=(InitPlan.Field(name='message', annotation=OpRef(name='init.fields.0.annotation'), def"
+        "ault=OpRef(name='init.fields.0.default'), default_factory=None, init=True, override=False, field_type=FieldTyp"
+        "e.INSTANCE, coerce=None, validate=None, check_type=None), InitPlan.Field(name='error', annotation=OpRef(name='"
+        "init.fields.1.annotation'), default=OpRef(name='init.fields.1.default'), default_factory=None, init=True, over"
+        "ride=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check_type=None)), self_param='self', s"
+        "td_params=('message', 'error'), kw_only_params=(), frozen=True, slots=False, post_init_params=None, init_fns=("
+        "), validate_fns=()), ReprPlan(fields=(ReprPlan.Field(name='message', kw_only=False, fn=None), ReprPlan.Field(n"
+        "ame='error', kw_only=False, fn=None)), id=False, terse=False, default_fn=None)))"
+    ),
+    plan_repr_sha1='4e9140c5445b4f62b7f2b08a89442350123d2517',
+    op_ref_idents=(
+        '__dataclass__init__fields__0__annotation',
+        '__dataclass__init__fields__0__default',
+        '__dataclass__init__fields__1__annotation',
+        '__dataclass__init__fields__1__default',
+    ),
+    cls_names=(
+        ('ommlds.cli.sessions.chat.drivers.impl', 'ErrorChatEvent'),
+    ),
+)
+def _process_dataclass__4e9140c5445b4f62b7f2b08a89442350123d2517():
+    def _process_dataclass(
+        *,
+        __dataclass__cls,
+        __dataclass__init__fields__0__annotation,
+        __dataclass__init__fields__0__default,
+        __dataclass__init__fields__1__annotation,
+        __dataclass__init__fields__1__default,
+        __dataclass__FieldFnValidationError,  # noqa
+        __dataclass__FieldTypeValidationError,  # noqa
+        __dataclass__FnValidationError,  # noqa
+        __dataclass__FrozenInstanceError=dataclasses.FrozenInstanceError,  # noqa
+        __dataclass__FunctionType=types.FunctionType,  # noqa
+        __dataclass__HAS_DEFAULT_FACTORY=dataclasses._HAS_DEFAULT_FACTORY,  # noqa
+        __dataclass__MISSING=dataclasses.MISSING,  # noqa
+        __dataclass__None=None,  # noqa
+        __dataclass__TypeError=TypeError,  # noqa
+        __dataclass___recursive_repr=reprlib.recursive_repr,  # noqa
+        __dataclass__isinstance=isinstance,  # noqa
+        __dataclass__object_setattr=object.__setattr__,  # noqa
+        __dataclass__property=property,  # noqa
+    ):
+        def __copy__(self):
+            if self.__class__ is not __dataclass__cls:
+                raise TypeError(self)
+            return __dataclass__cls(  # noqa
+                message=self.message,
+                error=self.error,
+            )
+
+        __copy__.__qualname__ = f"{__dataclass__cls.__qualname__}.__copy__"
+        if '__copy__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __copy__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__copy__', __copy__)
+
+        def __eq__(self, other):
+            if self is other:
+                return True
+            if self.__class__ is not other.__class__:
+                return NotImplemented
+            return (
+                self.message == other.message and
+                self.error == other.error
+            )
+
+        __eq__.__qualname__ = f"{__dataclass__cls.__qualname__}.__eq__"
+        if '__eq__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __eq__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__eq__', __eq__)
+
+        __dataclass___setattr_frozen_fields = {
+            'message',
+            'error',
+        }
+
+        def __setattr__(self, name, value):
+            if (
+                type(self) is __dataclass__cls
+                or name in __dataclass___setattr_frozen_fields
+            ):
+                raise __dataclass__FrozenInstanceError(f"cannot assign to field {name!r}")
+            super(__dataclass__cls, self).__setattr__(name, value)
+
+        __setattr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__setattr__"
+        if '__setattr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __setattr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__setattr__', __setattr__)
+
+        __dataclass___delattr_frozen_fields = {
+            'message',
+            'error',
+        }
+
+        def __delattr__(self, name):
+            if (
+                type(self) is __dataclass__cls
+                or name in __dataclass___delattr_frozen_fields
+            ):
+                raise __dataclass__FrozenInstanceError(f"cannot delete field {name!r}")
+            super(__dataclass__cls, self).__delattr__(name)
+
+        __delattr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__delattr__"
+        if '__delattr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __delattr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__delattr__', __delattr__)
+
+        def __hash__(self):
+            return hash((
+                self.message,
+                self.error,
+            ))
+
+        __hash__.__qualname__ = f"{__dataclass__cls.__qualname__}.__hash__"
+        setattr(__dataclass__cls, '__hash__', __hash__)
+
+        def __init__(
+            self,
+            message: __dataclass__init__fields__0__annotation = __dataclass__init__fields__0__default,
+            error: __dataclass__init__fields__1__annotation = __dataclass__init__fields__1__default,
+        ) -> __dataclass__None:
+            __dataclass__object_setattr(self, 'message', message)
+            __dataclass__object_setattr(self, 'error', error)
+
+        __init__.__qualname__ = f"{__dataclass__cls.__qualname__}.__init__"
+        if '__init__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __init__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__init__', __init__)
+
+        @__dataclass___recursive_repr()
+        def __repr__(self):
+            parts = []
+            parts.append(f"message={self.message!r}")
+            parts.append(f"error={self.error!r}")
+            return (
+                f"{self.__class__.__qualname__}("
+                f"{', '.join(parts)}"
+                f")"
+            )
+
+        __repr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__repr__"
+        if '__repr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __repr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__repr__', __repr__)
+
+    return _process_dataclass
+
+
 @_register(
     plan_repr=(
         "Plans(tup=(CopyPlan(fields=('version', 'payload', 'created_at', 'updated_at')), EqPlan(fields=('version', 'pay"

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/cli/sessions/chat/drivers/events/types.py

@@ -36,3 +36,9 @@ class AiMessagesChatEvent(ChatEvent, lang.Final):
 @dc.dataclass(frozen=True)
 class AiDeltaChatEvent(ChatEvent, lang.Final):
     delta: 'mc.AiDelta'
+
+
+@dc.dataclass(frozen=True)
+class ErrorChatEvent(ChatEvent, lang.Final):
+    message: str | None = None
+    error: BaseException | None = None

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/cli/sessions/chat/interfaces/textual/app.py

@@ -50,9 +50,24 @@ class ChatAppGetter(lang.AsyncCachedFunc0['ChatApp']):
     pass
 
 
-class ChatApp(tx.App):
+class ChatApp(
+    tx.ClipboardAppMixin,
+    tx.DevtoolsAppMixin,
+    tx.App,
+):
     ENABLE_COMMAND_PALETTE: ta.ClassVar[bool] = False
 
+    BINDINGS: ta.ClassVar[ta.Sequence[tx.BindingType]] = [
+        *tx.App.BINDINGS,
+
+        tx.Binding(
+            'alt+c,ctrl+c,super+c',
+            'screen.copy_text',
+            'Copy selected text',
+            show=False,
+        ),
+    ]
+
     def __init__(
             self,
             *,
@@ -223,7 +238,8 @@ class ChatApp(tx.App):
                 try:
                     await self._chat_facade.handle_user_input(ac.text)
                 except Exception as e:  # noqa
-                    raise
+                    # raise
+                    await self.display_ui_message(repr(e))
 
             else:
                 raise TypeError(ac)  # noqa

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/minichain/__init__.py

@@ -252,6 +252,14 @@ with _lang.auto_proxy_init(
         transform_content_strings,
     )
 
+    from .content.transform.types import (  # noqa
+        ContentTransform,
+    )
+
+    from .content.transform.visitors import (  # noqa
+        VisitorContentTransform,
+    )
+
     ##
 
     from .content.code import (  # noqa
@@ -334,6 +342,11 @@ with _lang.auto_proxy_init(
         RecursiveContent,
     )
 
+    from .content.resources import (  # noqa
+        ResourceContent,
+        resource_content,
+    )
+
     from .content.section import (  # noqa
         SectionContent,
     )
@@ -369,8 +382,6 @@ with _lang.auto_proxy_init(
 
         StaticContentVisitorTypeError,
         StaticContentVisitor,
-
-        ContentTransform,
     )
 
     ##

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/minichain/_dataclasses.py

@@ -7053,6 +7053,171 @@ def _process_dataclass__ef0fad925bba9f189d06f3ca8625366af9abb8a5():
     return _process_dataclass
 
 
+@_register(
+    plan_repr=(
+        "Plans(tup=(CopyPlan(fields=('_metadata', 'package', 'file')), EqPlan(fields=('_metadata', 'package', 'file')),"
+        " FrozenPlan(fields=('_metadata', 'package', 'file'), allow_dynamic_dunder_attrs=False), HashPlan(action='add',"
+        " fields=('_metadata', 'package', 'file'), cache=False), InitPlan(fields=(InitPlan.Field(name='_metadata', anno"
+        "tation=OpRef(name='init.fields.0.annotation'), default=OpRef(name='init.fields.0.default'), default_factory=No"
+        "ne, init=True, override=False, field_type=FieldType.INSTANCE, coerce=OpRef(name='init.fields.0.coerce'), valid"
+        "ate=None, check_type=None), InitPlan.Field(name='package', annotation=OpRef(name='init.fields.1.annotation'), "
+        "default=None, default_factory=None, init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, val"
+        "idate=None, check_type=None), InitPlan.Field(name='file', annotation=OpRef(name='init.fields.2.annotation'), d"
+        "efault=None, default_factory=None, init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, vali"
+        "date=None, check_type=None)), self_param='self', std_params=('package', 'file'), kw_only_params=('_metadata',)"
+        ", frozen=True, slots=False, post_init_params=None, init_fns=(), validate_fns=()), ReprPlan(fields=(ReprPlan.Fi"
+        "eld(name='package', kw_only=False, fn=None), ReprPlan.Field(name='file', kw_only=False, fn=None)), id=False, t"
+        "erse=False, default_fn=None)))"
+    ),
+    plan_repr_sha1='96d8a115fd863c61344f44124f5175d63ed37469',
+    op_ref_idents=(
+        '__dataclass__init__fields__0__annotation',
+        '__dataclass__init__fields__0__coerce',
+        '__dataclass__init__fields__0__default',
+        '__dataclass__init__fields__1__annotation',
+        '__dataclass__init__fields__2__annotation',
+    ),
+    cls_names=(
+        ('ommlds.minichain.backends.impls.mistral', 'ResourceContent'),
+    ),
+)
+def _process_dataclass__96d8a115fd863c61344f44124f5175d63ed37469():
+    def _process_dataclass(
+        *,
+        __dataclass__cls,
+        __dataclass__init__fields__0__annotation,
+        __dataclass__init__fields__0__coerce,
+        __dataclass__init__fields__0__default,
+        __dataclass__init__fields__1__annotation,
+        __dataclass__init__fields__2__annotation,
+        __dataclass__FieldFnValidationError,  # noqa
+        __dataclass__FieldTypeValidationError,  # noqa
+        __dataclass__FnValidationError,  # noqa
+        __dataclass__FrozenInstanceError=dataclasses.FrozenInstanceError,  # noqa
+        __dataclass__FunctionType=types.FunctionType,  # noqa
+        __dataclass__HAS_DEFAULT_FACTORY=dataclasses._HAS_DEFAULT_FACTORY,  # noqa
+        __dataclass__MISSING=dataclasses.MISSING,  # noqa
+        __dataclass__None=None,  # noqa
+        __dataclass__TypeError=TypeError,  # noqa
+        __dataclass___recursive_repr=reprlib.recursive_repr,  # noqa
+        __dataclass__isinstance=isinstance,  # noqa
+        __dataclass__object_setattr=object.__setattr__,  # noqa
+        __dataclass__property=property,  # noqa
+    ):
+        def __copy__(self):
+            if self.__class__ is not __dataclass__cls:
+                raise TypeError(self)
+            return __dataclass__cls(  # noqa
+                _metadata=self._metadata,
+                package=self.package,
+                file=self.file,
+            )
+
+        __copy__.__qualname__ = f"{__dataclass__cls.__qualname__}.__copy__"
+        if '__copy__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __copy__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__copy__', __copy__)
+
+        def __eq__(self, other):
+            if self is other:
+                return True
+            if self.__class__ is not other.__class__:
+                return NotImplemented
+            return (
+                self._metadata == other._metadata and
+                self.package == other.package and
+                self.file == other.file
+            )
+
+        __eq__.__qualname__ = f"{__dataclass__cls.__qualname__}.__eq__"
+        if '__eq__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __eq__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__eq__', __eq__)
+
+        __dataclass___setattr_frozen_fields = {
+            '_metadata',
+            'package',
+            'file',
+        }
+
+        def __setattr__(self, name, value):
+            if (
+                type(self) is __dataclass__cls
+                or name in __dataclass___setattr_frozen_fields
+            ):
+                raise __dataclass__FrozenInstanceError(f"cannot assign to field {name!r}")
+            super(__dataclass__cls, self).__setattr__(name, value)
+
+        __setattr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__setattr__"
+        if '__setattr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __setattr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__setattr__', __setattr__)
+
+        __dataclass___delattr_frozen_fields = {
+            '_metadata',
+            'package',
+            'file',
+        }
+
+        def __delattr__(self, name):
+            if (
+                type(self) is __dataclass__cls
+                or name in __dataclass___delattr_frozen_fields
+            ):
+                raise __dataclass__FrozenInstanceError(f"cannot delete field {name!r}")
+            super(__dataclass__cls, self).__delattr__(name)
+
+        __delattr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__delattr__"
+        if '__delattr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __delattr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__delattr__', __delattr__)
+
+        def __hash__(self):
+            return hash((
+                self._metadata,
+                self.package,
+                self.file,
+            ))
+
+        __hash__.__qualname__ = f"{__dataclass__cls.__qualname__}.__hash__"
+        setattr(__dataclass__cls, '__hash__', __hash__)
+
+        def __init__(
+            self,
+            package: __dataclass__init__fields__1__annotation,
+            file: __dataclass__init__fields__2__annotation,
+            *,
+            _metadata: __dataclass__init__fields__0__annotation = __dataclass__init__fields__0__default,
+        ) -> __dataclass__None:
+            _metadata = __dataclass__init__fields__0__coerce(_metadata)
+            __dataclass__object_setattr(self, '_metadata', _metadata)
+            __dataclass__object_setattr(self, 'package', package)
+            __dataclass__object_setattr(self, 'file', file)
+
+        __init__.__qualname__ = f"{__dataclass__cls.__qualname__}.__init__"
+        if '__init__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __init__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__init__', __init__)
+
+        @__dataclass___recursive_repr()
+        def __repr__(self):
+            parts = []
+            parts.append(f"package={self.package!r}")
+            parts.append(f"file={self.file!r}")
+            return (
+                f"{self.__class__.__qualname__}("
+                f"{', '.join(parts)}"
+                f")"
+            )
+
+        __repr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__repr__"
+        if '__repr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __repr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__repr__', __repr__)
+
+    return _process_dataclass
+
+
 @_register(
     plan_repr=(
         "Plans(tup=(CopyPlan(fields=('_metadata', 'body', 'header')), EqPlan(fields=('_metadata', 'body', 'header')), F"

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/minichain/content/__init__.py

@@ -25,6 +25,7 @@ from . import (  # noqa
     quote as _quote,
     raw as _raw,
     recursive as _recursive,
+    resources as _resources,
     section as _section,
     sequence as _sequence,
     standard as _standard,

ommlds-0.0.0.dev511/ommlds/minichain/content/resources.py

@@ -0,0 +1,22 @@
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .recursive import RecursiveContent
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ResourceContent(RecursiveContent, lang.Final):
+    package: str
+    file: str
+
+
+def resource_content(*parts: str) -> ResourceContent:
+    *package_parts, file = parts
+    for p in check.not_empty(package_parts):
+        check.non_empty_str(p)
+        check.arg(not (p.startswith('.') or p.endswith('.')))
+    return ResourceContent('.'.join(package_parts), file)

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/minichain/content/transform/json.py

@@ -8,13 +8,13 @@ from ..json import JsonContent
 from ..metadata import ContentOriginal
 from ..standard import StandardContent
 from ..text import TextContent
-from ..visitors import ContentTransform
+from .visitors import VisitorContentTransform
 
 
 ##
 
 
-class JsonContentRenderer(ContentTransform[None]):
+class JsonContentRenderer(VisitorContentTransform[None]):
     def __init__(
             self,
             *,

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/minichain/content/transform/markdown.py

@@ -5,4 +5,4 @@
 #
 #
 # class MarkdownContentTransform(ContentTransform):
-#     def apply(self, ):
+#     def transform(self, ):

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/minichain/content/transform/materialize.py

@@ -4,8 +4,11 @@ from omlish import lang
 from omlish.text import templating as tpl
 
 from ..content import Content
-from .recursive import PlaceholderContents
+from .namespaces import NamespaceContentMaterializer
+from .placeholders import PlaceholderContentMaterializer
+from .placeholders import PlaceholderContents
 from .recursive import RecursiveContentMaterializer
+from .resources import ResourceContentMaterializer
 from .templates import TemplateContentMaterializer
 
 
@@ -14,7 +17,7 @@ from .templates import TemplateContentMaterializer
 
 class ContentMaterializer(lang.Abstract):
     @abc.abstractmethod
-    def apply(self, c: Content) -> Content:
+    def materialize(self, c: Content) -> Content:
         raise NotImplementedError
 
 
@@ -30,12 +33,17 @@ class DefaultContentMaterializer(ContentMaterializer):
     ) -> None:
         super().__init__()
 
-        self._placeholder_contents = placeholder_contents
-        self._templater_context = templater_context
+        self._recursive_materializer = RecursiveContentMaterializer(
+            NamespaceContentMaterializer(),
+            PlaceholderContentMaterializer(placeholder_contents),
+            ResourceContentMaterializer(),
+        )
 
-    def apply(self, c: Content) -> Content:
-        c = RecursiveContentMaterializer(self._placeholder_contents).visit(c, None)
-        c = TemplateContentMaterializer(self._templater_context).visit(c, None)
+        self._template_materializer = TemplateContentMaterializer(templater_context)
+
+    def materialize(self, c: Content) -> Content:
+        c = self._recursive_materializer.transform(c, None)
+        c = self._template_materializer.transform(c, None)
         return c
 
 
@@ -48,4 +56,4 @@ def materialize_content(
     return DefaultContentMaterializer(
         placeholder_contents=placeholder_contents,
         templater_context=templater_context,
-    ).apply(c)
+    ).materialize(c)

{ommlds-0.0.0.dev509 → ommlds-0.0.0.dev511}/ommlds/minichain/content/transform/metadata.py

@@ -1,16 +1,16 @@
 from ..content import Content
 from ..metadata import ContentOriginal
 from ..standard import StandardContent
-from ..visitors import ContentTransform
+from .visitors import VisitorContentTransform
 
 
 ##
 
 
-class OriginalMetadataStrippingContentTransform(ContentTransform[None]):
+class OriginalMetadataStrippingContentTransform(VisitorContentTransform[None]):
     def visit_standard_content(self, c: StandardContent, ctx: None) -> StandardContent:
         return c.with_metadata(discard=[ContentOriginal])
 
 
 def strip_content_original_metadata(c: Content) -> Content:
-    return OriginalMetadataStrippingContentTransform().visit(c, None)
+    return OriginalMetadataStrippingContentTransform().transform(c, None)

ommlds-0.0.0.dev511/ommlds/minichain/content/transform/namespaces.py

@@ -0,0 +1,20 @@
+from omlish import check
+
+from ..content import Content
+from ..namespaces import ContentNamespace
+from ..namespaces import NamespaceContent
+from .visitors import VisitorContentTransform
+
+
+##
+
+
+class NamespaceContentMaterializer(VisitorContentTransform[None]):
+    def visit_namespace_content(self, c: NamespaceContent, ctx: None) -> Content:
+        check.issubclass(c.ns, ContentNamespace)
+        out: list[Content] = []
+        for n, e in c.ns:
+            if n.startswith('_'):
+                continue
+            out.append(self.transform(e, ctx))
+        return out