ommlds 0.0.0.dev495__tar.gz → 0.0.0.dev496__tar.gz

{ommlds-0.0.0.dev495/ommlds.egg-info → ommlds-0.0.0.dev496}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev495
+Version: 0.0.0.dev496
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,9 +14,9 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev495
+Requires-Dist: omlish==0.0.0.dev496
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev495; extra == "all"
+Requires-Dist: omdev==0.0.0.dev496; 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"
@@ -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.dev495; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev496; 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"

{ommlds-0.0.0.dev495 → ommlds-0.0.0.dev496}/ommlds/cli/backends/inject.py

@@ -70,9 +70,8 @@ def bind_backends(cfg: BackendConfig = BackendConfig()) -> inj.Elements:
                     lst.extend([
                         inj.private(
                             inj.bind(_types.BackendName, to_const=ben),
-                            inj.bind(ben_bp_key, to_ctor=bp_impl, singleton=True),
+                            inj.bind(ben_bp_key, to_ctor=bp_impl, singleton=True, expose=True),
                             inj.bind(bp_iface, to_key=ben_bp_key),
-                            inj.expose(ben_bp_key),
                         ),
                         bp_stack.push_bind(to_key=ben_bp_key),
                     ])
@@ -81,8 +80,7 @@ def bind_backends(cfg: BackendConfig = BackendConfig()) -> inj.Elements:
                 lst.extend([
                     inj.private(
                         inj.set_binder[_types.BackendProvider]().bind(bp_stack.top),
-                        inj.bind(fiw_key, to_ctor=_meta.FirstInWinsBackendProvider, singleton=True),
-                        inj.expose(fiw_key),
+                        inj.bind(fiw_key, to_ctor=_meta.FirstInWinsBackendProvider, singleton=True, expose=True),
                     ),
                     bp_stack.push_bind(to_key=fiw_key),
                 ])

{ommlds-0.0.0.dev495 → ommlds-0.0.0.dev496}/ommlds/cli/content/messages.py

@@ -19,7 +19,7 @@ class MessageContentExtractor(lang.Abstract):
 class MessageContentExtractorImpl(MessageContentExtractor):
     def extract_message_content(self, message: 'mc.Message') -> ta.Optional['mc.Content']:
         if isinstance(message, (mc.SystemMessage, mc.UserMessage, mc.AiMessage)):
-            if message.c is not None:
+            if message.c:
                 return check.isinstance(message.c, str)
             else:
                 return None

{ommlds-0.0.0.dev495 → ommlds-0.0.0.dev496}/ommlds/cli/sessions/chat/drivers/user/inject.py

@@ -1,3 +1,4 @@
+from omlish import check
 from omlish import inject as inj
 from omlish import lang
 
@@ -21,7 +22,7 @@ def bind_user(cfg: UserConfig = UserConfig()) -> inj.Elements:
 
     if cfg.initial_system_content is not None:
         async def add_initial_system_content(cm: '_state.ChatStateManager') -> None:
-            await cm.extend_chat([mc.SystemMessage(cfg.initial_system_content)])
+            await cm.extend_chat([mc.SystemMessage(check.not_none(cfg.initial_system_content))])
 
         els.append(phase_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
             lambda cm: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_system_content(cm)),
@@ -30,7 +31,7 @@ def bind_user(cfg: UserConfig = UserConfig()) -> inj.Elements:
 
     if cfg.initial_user_content is not None:
         async def add_initial_user_content(cdg: '_driver.ChatDriverGetter') -> None:
-            await (await cdg()).send_user_messages([mc.UserMessage(cfg.initial_user_content)])
+            await (await cdg()).send_user_messages([mc.UserMessage(check.not_none(cfg.initial_user_content))])
 
         els.append(phase_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
             lambda cdg: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_user_content(cdg)),

{ommlds-0.0.0.dev495 → ommlds-0.0.0.dev496}/ommlds/minichain/__init__.py

@@ -227,8 +227,40 @@ with _lang.auto_proxy_init(
 
     ##
 
-    from .content.cancontent import (  # noqa
-        CanContent,
+    from .content.transform.base import (  # noqa
+        ContentTransform,
+    )
+
+    from .content.transform.materialize import (  # noqa
+        materialize_content,
+    )
+
+    from .content.transform.prepare import (  # noqa
+        ContentPreparer,
+        ContentStrPreparer,
+
+        DefaultContentPreparer,
+        DefaultContentStrPreparer,
+
+        default_content_preparer,
+        default_content_str_preparer,
+        prepare_content,
+        prepare_content_str,
+    )
+
+    from .content.transform.strings import (  # noqa
+        StringFnContentTransform,
+        transform_content_strings,
+    )
+
+    ##
+
+    from .content.code import (  # noqa
+        CodeContent,
+    )
+
+    from .content.dynamic import (  # noqa
+        DynamicContent,
     )
 
     from .content.images import (  # noqa
@@ -239,10 +271,6 @@ with _lang.auto_proxy_init(
         JsonContent,
     )
 
-    from .content.materialize import (  # noqa
-        materialize_content,
-    )
-
     from .content.metadata import (  # noqa
         ContentMetadata,
         ContentMetadatas,
@@ -250,55 +278,63 @@ with _lang.auto_proxy_init(
 
     from .content.namespaces import (  # noqa
         ContentNamespace,
+        NamespaceContent,
     )
 
     from .content.placeholders import (  # noqa
         ContentPlaceholder,
-        ContentPlaceholderMarker,
-        content_placeholder,
+        PlaceholderContentKey,
+        PlaceholderContent,
     )
 
-    from .content.prepare import (  # noqa
-        ContentPreparer,
-        ContentStrPreparer,
+    from .content.quote import (  # noqa
+        QuoteContent,
+    )
 
-        DefaultContentPreparer,
-        DefaultContentStrPreparer,
+    from .content.raw import (  # noqa
+        NonStrSingleRawContent,
+        NON_STR_SINGLE_RAW_CONTENT_TYPES,
 
-        default_content_preparer,
-        default_content_str_preparer,
-        prepare_content,
-        prepare_content_str,
+        SingleRawContent,
+        SINGLE_RAW_CONTENT_TYPES,
+
+        RawContent,
+        RAW_CONTENT_TYPES,
+    )
+
+    from .content.section import (  # noqa
+        SectionContent,
     )
 
     from .content.sequence import (  # noqa
-        BlockContent,
-        InlineContent,
         SequenceContent,
+        InlineContent,
+        BlockContent,
+        ItemListContent,
+    )
+
+    from .content.standard import (  # noqa
+        StandardContent,
     )
 
     from .content.tag import (  # noqa
         TagContent,
     )
 
-    from .content.text import (  # noqa
-        TextContent,
+    from .content.templates import (  # noqa
+        TemplateContent,
     )
 
-    from .content.transforms.base import (  # noqa
-        ContentTransform,
+    from .content.text import (  # noqa
+        TextContent,
     )
 
     from .content.types import (  # noqa
-        Content,
-        ExtendedContent,
-        SingleContent,
-        SingleExtendedContent,
-    )
+        BaseContent,
+        LeafContent,
 
-    from .content.transforms.strings import (  # noqa
-        StringFnContentTransform,
-        transform_content_strings,
+        Content,
+        CONTENT_TYPES,
     )
 
     ##