ommlds 0.0.0.dev502__py3-none-any.whl → 0.0.0.dev504__py3-none-any.whl

ommlds/cli/backends/meta.py

@@ -6,6 +6,7 @@ from .types import BackendProvider
 
 
 ServiceT = ta.TypeVar('ServiceT', bound=mc.Service)
+StreamServiceT = ta.TypeVar('StreamServiceT', bound=mc.Service)
 
 
 ##
@@ -33,3 +34,49 @@ class FirstInWinsBackendProvider(BackendProvider[ServiceT]):
                 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/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/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/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,