ommlds 0.0.0.dev501__tar.gz → 0.0.0.dev503__tar.gz

{ommlds-0.0.0.dev501/ommlds.egg-info → ommlds-0.0.0.dev503}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev501
+Version: 0.0.0.dev503
 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.dev501
+Requires-Dist: omlish==0.0.0.dev503
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev501; extra == "all"
+Requires-Dist: omdev==0.0.0.dev503; 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.dev501; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev503; 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.dev501 → ommlds-0.0.0.dev503}/ommlds/.omlish-manifests.json

@@ -44,9 +44,9 @@
         "model_names": {
           "default": "claude",
           "aliases": {
-            "claude-opus-4-1-20250805": null,
-            "claude-opus-4-1": "claude-opus-4-1-20250805",
-            "claude-opus": "claude-opus-4-1",
+            "claude-opus-4-5-20251101": null,
+            "claude-opus-4-5": "claude-opus-4-5-20251101",
+            "claude-opus": "claude-opus-4-5",
             "claude-sonnet-4-5-20250929": null,
             "claude-sonnet-4-5": "claude-sonnet-4-5-20250929",
             "claude-sonnet": "claude-sonnet-4-5",
@@ -93,7 +93,7 @@
     "module": ".minichain.backends.impls.cerebras.names",
     "attr": "_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/cerebras/names.py",
-    "line": 22,
+    "line": 37,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -106,8 +106,15 @@
           "aliases": {
             "llama3.1-8b": null,
             "llama-3.3-70b": null,
+            "llama3": "llama-3.3-70b",
             "gpt-oss-120b": null,
-            "qwen-3-32b": null
+            "gpt-oss": "gpt-oss-120b",
+            "qwen-3-32b": null,
+            "qwen3": "qwen-3-32b",
+            "qwen-3-235b-a22b-instruct-2507": null,
+            "qwen-3-235b": "qwen-3-235b-a22b-instruct-2507",
+            "zai-glm-4.7": null,
+            "glm": "zai-glm-4.7"
           }
         }
       }
@@ -210,7 +217,7 @@
     "module": ".minichain.backends.impls.google.names",
     "attr": "_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/google/names.py",
-    "line": 32,
+    "line": 38,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -221,6 +228,10 @@
         "model_names": {
           "default": "gemini",
           "aliases": {
+            "gemini-3-pro-preview": null,
+            "gemini-3-pro": "gemini-3-pro-preview",
+            "gemini-3-flash-preview": null,
+            "gemini-3-flash": "gemini-3-flash-preview",
             "gemini-2.5-pro": null,
             "gemini-2.5-flash": null,
             "gemini-2.5-flash-lite": null,
@@ -636,7 +647,7 @@
     "module": ".minichain.backends.impls.openai.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/openai/stream.py",
-    "line": 38,
+    "line": 45,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.openai.stream",

{ommlds-0.0.0.dev501 → ommlds-0.0.0.dev503}/ommlds/cli/_dataclasses.py

@@ -3124,23 +3124,22 @@ def _process_dataclass__0f6d91dd6a878d827836d961e4683d55b1c9095a():
 @_register(
     plan_repr=(
         "Plans(tup=(CopyPlan(fields=('command', 'argv', 'help', 'arg_error')), EqPlan(fields=('command', 'argv', 'help'"
-        ", 'arg_error')), FrozenPlan(fields=('command', 'argv', 'help', 'arg_error'), allow_dynamic_dunder_attrs=False)"
-        ", HashPlan(action='add', fields=('command', 'argv', 'help', 'arg_error'), cache=False), InitPlan(fields=(InitP"
-        "lan.Field(name='command', annotation=OpRef(name='init.fields.0.annotation'), default=None, default_factory=Non"
-        "e, init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check_type=None), Ini"
-        "tPlan.Field(name='argv', annotation=OpRef(name='init.fields.1.annotation'), default=None, default_factory=None"
-        ", init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check_type=None), Init"
-        "Plan.Field(name='help', annotation=OpRef(name='init.fields.2.annotation'), default=None, default_factory=None,"
-        " init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check_type=None), InitP"
-        "lan.Field(name='arg_error', annotation=OpRef(name='init.fields.3.annotation'), default=OpRef(name='init.fields"
-        ".3.default'), default_factory=None, init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, val"
-        "idate=None, check_type=None)), self_param='self', std_params=('command', 'argv', 'help', 'arg_error'), kw_only"
-        "_params=(), frozen=True, slots=False, post_init_params=None, init_fns=(), validate_fns=()), ReprPlan(fields=(R"
-        "eprPlan.Field(name='command', kw_only=False, fn=None), ReprPlan.Field(name='argv', kw_only=False, fn=None), Re"
-        "prPlan.Field(name='help', kw_only=False, fn=None), ReprPlan.Field(name='arg_error', kw_only=False, fn=None)), "
-        "id=False, terse=False, default_fn=None)))"
-    ),
-    plan_repr_sha1='02a8469353c0212e2a85695c052b1bb12a809b51',
+        ", 'arg_error')), HashPlan(action='set_none', fields=None, cache=None), InitPlan(fields=(InitPlan.Field(name='c"
+        "ommand', annotation=OpRef(name='init.fields.0.annotation'), default=None, default_factory=None, init=True, ove"
+        "rride=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check_type=None), InitPlan.Field(name="
+        "'argv', annotation=OpRef(name='init.fields.1.annotation'), default=None, default_factory=None, init=True, over"
+        "ride=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check_type=None), InitPlan.Field(name='"
+        "help', annotation=OpRef(name='init.fields.2.annotation'), default=None, default_factory=None, init=True, overr"
+        "ide=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check_type=None), InitPlan.Field(name='a"
+        "rg_error', annotation=OpRef(name='init.fields.3.annotation'), default=OpRef(name='init.fields.3.default'), def"
+        "ault_factory=None, init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, validate=None, check"
+        "_type=None)), self_param='self', std_params=('command', 'argv', 'help', 'arg_error'), kw_only_params=(), froze"
+        "n=False, slots=False, post_init_params=None, init_fns=(), validate_fns=()), ReprPlan(fields=(ReprPlan.Field(na"
+        "me='command', kw_only=False, fn=None), ReprPlan.Field(name='argv', kw_only=False, fn=None), ReprPlan.Field(nam"
+        "e='help', kw_only=False, fn=None), ReprPlan.Field(name='arg_error', kw_only=False, fn=None)), id=False, terse="
+        "False, default_fn=None)))"
+    ),
+    plan_repr_sha1='0843ef2470048b534567b0a1d3bd52e06d96c21b',
     op_ref_idents=(
         '__dataclass__init__fields__0__annotation',
         '__dataclass__init__fields__1__annotation',
@@ -3152,7 +3151,7 @@ def _process_dataclass__0f6d91dd6a878d827836d961e4683d55b1c9095a():
         ('ommlds.cli.sessions.chat.facades.facade', 'ArgsCommandError'),
     ),
 )
-def _process_dataclass__02a8469353c0212e2a85695c052b1bb12a809b51():
+def _process_dataclass__0843ef2470048b534567b0a1d3bd52e06d96c21b():
     def _process_dataclass(
         *,
         __dataclass__cls,
@@ -3207,56 +3206,7 @@ def _process_dataclass__02a8469353c0212e2a85695c052b1bb12a809b51():
             raise __dataclass__TypeError(f"Cannot overwrite attribute __eq__ in class {__dataclass__cls.__name__}")
         setattr(__dataclass__cls, '__eq__', __eq__)
 
-        __dataclass___setattr_frozen_fields = {
-            'command',
-            'argv',
-            'help',
-            'arg_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 = {
-            'command',
-            'argv',
-            'help',
-            'arg_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.command,
-                self.argv,
-                self.help,
-                self.arg_error,
-            ))
-
-        __hash__.__qualname__ = f"{__dataclass__cls.__qualname__}.__hash__"
-        setattr(__dataclass__cls, '__hash__', __hash__)
+        setattr(__dataclass__cls, '__hash__', None)
 
         def __init__(
             self,
@@ -3265,10 +3215,10 @@ def _process_dataclass__02a8469353c0212e2a85695c052b1bb12a809b51():
             help: __dataclass__init__fields__2__annotation,
             arg_error: __dataclass__init__fields__3__annotation = __dataclass__init__fields__3__default,
         ) -> __dataclass__None:
-            __dataclass__object_setattr(self, 'command', command)
-            __dataclass__object_setattr(self, 'argv', argv)
-            __dataclass__object_setattr(self, 'help', help)
-            __dataclass__object_setattr(self, 'arg_error', arg_error)
+            self.command = command
+            self.argv = argv
+            self.help = help
+            self.arg_error = arg_error
 
         __init__.__qualname__ = f"{__dataclass__cls.__qualname__}.__init__"
         if '__init__' in __dataclass__cls.__dict__:

{ommlds-0.0.0.dev501 → ommlds-0.0.0.dev503}/ommlds/cli/backends/inject.py

@@ -91,6 +91,26 @@ def bind_backends(cfg: BackendConfig = BackendConfig()) -> inj.Elements:
         else:
             lst.append(bp_stack.push_bind(to_ctor=bp_impl, singleton=True))
 
+        if bp_iface is _types.ChatChoicesServiceBackendProvider:
+            rt_key: inj.Key = inj.Key(_meta.RetryBackendProvider, tag=bp_iface)
+            lst.extend([
+                inj.private(
+                    inj.bind(_types.BackendProvider, to_key=bp_stack.top),
+                    inj.bind(rt_key, to_ctor=_meta.RetryBackendProvider, singleton=True, expose=True),
+                ),
+                bp_stack.push_bind(to_key=rt_key),
+            ])
+
+        elif bp_iface is _types.ChatChoicesStreamServiceBackendProvider:
+            rts_key: inj.Key = inj.Key(_meta.RetryStreamBackendProvider, tag=bp_iface)
+            lst.extend([
+                inj.private(
+                    inj.bind(_types.BackendProvider, to_key=bp_stack.top),
+                    inj.bind(rts_key, to_ctor=_meta.RetryStreamBackendProvider, singleton=True, expose=True),
+                ),
+                bp_stack.push_bind(to_key=rts_key),
+            ])
+
         lst.append(inj.bind(bp_iface, to_key=bp_stack.top))
 
     #

ommlds-0.0.0.dev503/ommlds/cli/backends/meta.py

@@ -0,0 +1,82 @@
+import contextlib
+import typing as ta
+
+from ... import minichain as mc
+from .types import BackendProvider
+
+
+ServiceT = ta.TypeVar('ServiceT', bound=mc.Service)
+StreamServiceT = ta.TypeVar('StreamServiceT', bound=mc.Service)
+
+
+##
+
+
+class FirstInWinsBackendProvider(BackendProvider[ServiceT]):
+    def __init__(
+            self,
+            backend_providers: ta.AbstractSet[BackendProvider],
+    ) -> None:
+        super().__init__()
+
+        self._backend_providers = [ta.cast(BackendProvider[ServiceT], bp) for bp in backend_providers]
+
+    def provide_backend(self) -> ta.AsyncContextManager[ServiceT]:
+        @contextlib.asynccontextmanager
+        async def inner():
+            from ...minichain.wrappers.firstinwins import AsyncioFirstInWinsService
+
+            async with contextlib.AsyncExitStack() as aes:
+                svcs = [
+                    await aes.enter_async_context(bp.provide_backend())
+                    for bp in self._backend_providers
+                ]
+                yield AsyncioFirstInWinsService(*svcs)
+
+        return inner()
+
+
+##
+
+
+class RetryBackendProvider(BackendProvider):
+    def __init__(
+            self,
+            backend_provider: BackendProvider,
+    ) -> None:
+        super().__init__()
+
+        self._backend_provider = backend_provider
+
+    def provide_backend(self) -> ta.AsyncContextManager:
+        @contextlib.asynccontextmanager
+        async def inner():
+            async with contextlib.AsyncExitStack() as aes:
+                yield mc.RetryService(
+                    await aes.enter_async_context(self._backend_provider.provide_backend()),
+                )
+
+        return inner()
+
+
+##
+
+
+class RetryStreamBackendProvider(BackendProvider):
+    def __init__(
+            self,
+            backend_provider: BackendProvider,
+    ) -> None:
+        super().__init__()
+
+        self._backend_provider = backend_provider
+
+    def provide_backend(self) -> ta.AsyncContextManager:
+        @contextlib.asynccontextmanager
+        async def inner():
+            async with contextlib.AsyncExitStack() as aes:
+                yield mc.RetryStreamService(
+                    await aes.enter_async_context(self._backend_provider.provide_backend()),
+                )
+
+        return inner()

{ommlds-0.0.0.dev501 → ommlds-0.0.0.dev503}/ommlds/cli/sessions/chat/drivers/ai/tools.py

@@ -24,17 +24,13 @@ class ToolExecutingAiChatGenerator(AiChatGenerator):
         while True:
             new = await self._wrapped.get_next_ai_messages([*chat, *out])
 
-            out.extend(new)
-
             cont = False
 
             for msg in new:
+                out.append(msg)
+
                 if isinstance(msg, mc.ToolUseMessage):
-                    trm = await self._executor.execute_tool_use(
-                        msg.tu,
-                        # fs_tool_context,
-                        # todo_tool_context,  # noqa
-                    )
+                    trm = await self._executor.execute_tool_use(msg.tu)
 
                     out.append(trm)
 

{ommlds-0.0.0.dev501 → ommlds-0.0.0.dev503}/ommlds/cli/sessions/chat/facades/commands/base.py

@@ -13,7 +13,7 @@ class CommandError(Exception):
     pass
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass()
 class ArgsCommandError(CommandError):
     command: 'Command'
     argv: ta.Sequence[str]

{ommlds-0.0.0.dev501 → ommlds-0.0.0.dev503}/ommlds/minichain/__init__.py

@@ -457,10 +457,6 @@ with _lang.auto_proxy_init(
         new_stream_response,
     )
 
-    from .stream.wrap import (  # noqa
-        WrappedStreamService,
-    )
-
     ##
 
     from .tools.execution.catalog import (  # noqa
@@ -603,6 +599,44 @@ with _lang.auto_proxy_init(
 
     ##
 
+    from .wrappers.retry import (  # noqa
+        AnyRetryService,
+
+        RetryServiceMaxRetriesExceededError,
+        RetryServiceOutput,
+
+        RetryService,
+
+        RetryStreamService,
+    )
+
+    from .wrappers.services import (  # noqa
+        WrappedRequestV,
+        WrappedOptionT,
+        WrappedResponseV,
+        WrappedOutputT,
+        WrappedRequest,
+        WrappedResponse,
+        WrappedService,
+
+        WrapperService,
+        MultiWrapperService,
+
+        wrap_service,
+    )
+
+    from .wrappers.stream import (  # noqa
+        WrappedStreamOutputT,
+        WrappedStreamOptions,
+        WrappedStreamRequest,
+        WrappedStreamResponse,
+        WrappedStreamService,
+
+        WrapperStreamService,
+    )
+
+    ##
+
     from .completion import (  # noqa
         CompletionOption,
         CompletionOptions,