ommlds 0.0.0.dev490__py3-none-any.whl → 0.0.0.dev492__py3-none-any.whl

ommlds/cli/main.py

@@ -36,7 +36,8 @@ def _process_main_extra_args(args: ap.Namespace) -> None:
         logs.configure_standard_logging('DEBUG')
     else:
         logs.configure_standard_logging('INFO')
-        logs.silence_noisy_loggers()
+
+    logs.silence_noisy_loggers()
 
 
 ##
@@ -69,10 +70,10 @@ class ChatProfile(Profile):
     def configure_backend(self, cfg: ChatConfig) -> ChatConfig:
         return dc.replace(
             cfg,
-            agent=dc.replace(
-                cfg.agent,
+            driver=dc.replace(
+                cfg.driver,
                 backend=dc.replace(
-                    cfg.agent.backend,
+                    cfg.driver.backend,
                     backend=self._args.backend,
                 ),
             ),
@@ -104,10 +105,10 @@ class ChatProfile(Profile):
         else:
             cfg = dc.replace(
                 cfg,
-                agent=dc.replace(
-                    cfg.agent,
+                driver=dc.replace(
+                    cfg.driver,
                     ai=dc.replace(
-                        cfg.agent.ai,
+                        cfg.driver.ai,
                         verbose=True,
                     ),
                 ),
@@ -133,10 +134,10 @@ class ChatProfile(Profile):
             # TODO: '-' -> stdin
             cfg = dc.replace(
                 cfg,
-                agent=dc.replace(
-                    cfg.agent,
+                driver=dc.replace(
+                    cfg.driver,
                     user=dc.replace(
-                        cfg.agent.user,
+                        cfg.driver.user,
                         initial_user_content=' '.join(self._args.message),
                     ),
                 ),
@@ -157,10 +158,10 @@ class ChatProfile(Profile):
     def configure_state(self, cfg: ChatConfig) -> ChatConfig:
         return dc.replace(
             cfg,
-            agent=dc.replace(
-                cfg.agent,
+            driver=dc.replace(
+                cfg.driver,
                 state=dc.replace(
-                    cfg.agent.state,
+                    cfg.driver.state,
                     state='ephemeral' if self._args.ephemeral else 'new' if self._args.new else 'continue',
                 ),
             ),
@@ -176,10 +177,10 @@ class ChatProfile(Profile):
     def configure_output(self, cfg: ChatConfig) -> ChatConfig:
         return dc.replace(
             cfg,
-            agent=dc.replace(
-                cfg.agent,
+            driver=dc.replace(
+                cfg.driver,
                 ai=dc.replace(
-                    cfg.agent.ai,
+                    cfg.driver.ai,
                     stream=bool(self._args.stream),
                 ),
             ),
@@ -199,30 +200,37 @@ class ChatProfile(Profile):
     ]
 
     def configure_tools(self, cfg: ChatConfig) -> ChatConfig:
+        if not (
+                self._args.enable_fs_tools or
+                self._args.enable_todo_tools or
+                # self._args.enable_unsafe_tools_do_not_use_lol or
+                self._args.enable_test_weather_tool or
+                self._args.code
+        ):
+            return cfg
+
         return dc.replace(
             cfg,
-            agent=dc.replace(
-                cfg.agent,
+            driver=dc.replace(
+                cfg.driver,
                 ai=dc.replace(
-                    cfg.agent.ai,
-                    enable_tools=(
-                        self._args.enable_fs_tools or
-                        self._args.enable_todo_tools or
-                        # self._args.enable_unsafe_tools_do_not_use_lol or
-                        self._args.enable_test_weather_tool or
-                        self._args.code
-                    ),
+                    cfg.driver.ai,
+                    enable_tools=True,
                 ),
                 tools=dc.replace(
-                    cfg.agent.tools,
+                    cfg.driver.tools,
                     enabled_tools={  # noqa
-                        *(cfg.agent.tools.enabled_tools or []),
+                        *(cfg.driver.tools.enabled_tools or []),
                         *(['fs'] if self._args.enable_fs_tools else []),
                         *(['todo'] if self._args.enable_todo_tools else []),
                         *(['weather'] if self._args.enable_test_weather_tool else []),
                     },
                 ),
             ),
+            interface=dc.replace(
+                cfg.interface,
+                enable_tools=True,
+            ),
         )
 
     #
@@ -237,10 +245,10 @@ class ChatProfile(Profile):
 
         cfg = dc.replace(
             cfg,
-            agent=dc.replace(
-                cfg.agent,
+            driver=dc.replace(
+                cfg.driver,
                 ai=dc.replace(
-                    cfg.agent.ai,
+                    cfg.driver.ai,
                     enable_tools=True,
                 ),
             ),
@@ -252,10 +260,10 @@ class ChatProfile(Profile):
 
             cfg = dc.replace(
                 cfg,
-                agent=dc.replace(
-                    cfg.agent,
+                driver=dc.replace(
+                    cfg.driver,
                     user=dc.replace(
-                        cfg.agent.user,
+                        cfg.driver.user,
                         initial_system_content=system_content,
                     ),
                 ),

ommlds/cli/rendering/types.py

@@ -1,3 +1,9 @@
+"""
+TODO:
+ - html?
+ - terminal?
+ - rich? textual.Content?
+"""
 import abc
 import typing as ta
 

ommlds/cli/sessions/chat/configs.py

@@ -1,7 +1,7 @@
 from omlish import dataclasses as dc
 
 from ...rendering.configs import RenderingConfig
-from .agents.configs import AgentConfig
+from .drivers.configs import DriverConfig
 from .interfaces.configs import InterfaceConfig
 
 
@@ -16,6 +16,6 @@ DEFAULT_BACKEND = 'openai'
 
 @dc.dataclass(frozen=True, kw_only=True)
 class ChatConfig:
-    agent: AgentConfig = AgentConfig()
+    driver: DriverConfig = DriverConfig()
     interface: InterfaceConfig = InterfaceConfig()
     rendering: RenderingConfig = RenderingConfig()

ommlds/cli/sessions/chat/{agents → drivers}/ai/inject.py

@@ -66,7 +66,9 @@ def bind_ai(cfg: AiConfig = AiConfig()) -> inj.Elements:
     #
 
     if cfg.enable_tools:
-        def _provide_tools_chat_choices_options_provider(tc: mc.ToolCatalog) -> _services.ChatChoicesServiceOptionsProvider:  # noqa
+        def _provide_tools_chat_choices_options_provider(
+                tc: mc.ToolCatalog,
+        ) -> _services.ChatChoicesServiceOptionsProvider:
             return _services.ChatChoicesServiceOptionsProvider(lambda: [
                 mc.Tool(tce.spec)
                 for tce in tc.by_name.values()

ommlds/cli/sessions/chat/{agents → drivers}/configs.py

@@ -17,7 +17,7 @@ DEFAULT_BACKEND = 'openai'
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-class AgentConfig:
+class DriverConfig:
     ai: AiConfig = AiConfig()
     backend: BackendConfig = BackendConfig()
     state: StateConfig = StateConfig()

ommlds/cli/sessions/chat/{agents/agent.py → drivers/driver.py}

@@ -3,6 +3,8 @@ TODO:
  - lifecycles
  - StreamService
 """
+from omlish import lang
+
 from ..... import minichain as mc
 from .ai.types import AiChatGenerator
 from .events.manager import ChatEventsManager
@@ -15,7 +17,11 @@ from .state.types import ChatStateManager
 ##
 
 
-class ChatAgent:
+class ChatDriverGetter(lang.Func0['ChatDriver']):
+    pass
+
+
+class ChatDriver:
     def __init__(
             self,
             *,

ommlds/cli/sessions/chat/{agents → drivers}/inject.py

@@ -1,18 +1,21 @@
 """
 TODO:
- - private + expose(ChatAgent)
+ - private + expose(ChatDriver)
 """
+import uuid
+
 from omlish import inject as inj
 from omlish import lang
 
 from ....backends.types import DefaultBackendName
 from .configs import DEFAULT_BACKEND
-from .configs import AgentConfig
+from .configs import DriverConfig
 
 
 with lang.auto_proxy_import(globals()):
     from ....backends import inject as _backends
-    from . import agent as _agent
+    from . import driver as _driver
+    from . import types as _types
     from .ai import inject as _ai
     from .events import inject as _events
     from .phases import inject as _phases
@@ -24,7 +27,7 @@ with lang.auto_proxy_import(globals()):
 ##
 
 
-def bind_agent(cfg: AgentConfig) -> inj.Elements:
+def bind_driver(cfg: DriverConfig) -> inj.Elements:
     els: list[inj.Elemental] = []
 
     #
@@ -48,9 +51,9 @@ def bind_agent(cfg: AgentConfig) -> inj.Elements:
     #
 
     els.extend([
-        inj.bind(_agent.ChatAgent, singleton=True),
+        inj.bind(_driver.ChatDriver, singleton=True),
 
-        inj.bind_late(_agent.ChatAgent),
+        inj.bind_late(_driver.ChatDriver, _driver.ChatDriverGetter),
     ])
 
     #
@@ -59,4 +62,8 @@ def bind_agent(cfg: AgentConfig) -> inj.Elements:
 
     #
 
+    els.append(inj.bind(_types.ChatDriverId(uuid.uuid4())))
+
+    #
+
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/{agents → drivers}/tools/configs.py

@@ -9,8 +9,6 @@ from omlish import lang
 
 @dc.dataclass(frozen=True, kw_only=True)
 class ToolsConfig:
-    dangerous_no_confirmation: bool = False
-
     enabled_tools: ta.Iterable[str] | None = None
 
     verbose: bool = False

ommlds/cli/sessions/chat/drivers/tools/confirmation.py

@@ -0,0 +1,44 @@
+import abc
+import typing as ta
+
+from omlish import lang
+
+from ...... import minichain as mc
+
+
+##
+
+
+class ToolExecutionRequestDeniedError(Exception):
+    pass
+
+
+class ToolExecutionConfirmation(lang.Abstract):
+    @abc.abstractmethod
+    def confirm_tool_execution_or_raise(
+            self,
+            use: 'mc.ToolUse',
+            entry: 'mc.ToolCatalogEntry',
+    ) -> ta.Awaitable[None]:
+        raise NotImplementedError
+
+
+##
+
+
+class AlwaysDenyToolExecutionConfirmation(ToolExecutionConfirmation):
+    async def confirm_tool_execution_or_raise(
+            self,
+            use: 'mc.ToolUse',
+            entry: 'mc.ToolCatalogEntry',
+    ) -> None:
+        raise ToolExecutionRequestDeniedError
+
+
+class UnsafeAlwaysAllowToolExecutionConfirmation(ToolExecutionConfirmation):
+    async def confirm_tool_execution_or_raise(
+            self,
+            use: 'mc.ToolUse',
+            entry: 'mc.ToolCatalogEntry',
+    ) -> None:
+        pass

ommlds/cli/sessions/chat/{agents → drivers}/tools/execution.py

@@ -37,7 +37,7 @@ class ToolUseExecutorImpl(ToolUseExecutor):
             *,
             catalog: 'mc.ToolCatalog',
             ctx_provider: ToolContextProvider,
-            confirmation: ToolExecutionConfirmation | None = None,
+            confirmation: ToolExecutionConfirmation,
     ) -> None:
         super().__init__()
 
@@ -52,8 +52,7 @@ class ToolUseExecutorImpl(ToolUseExecutor):
     ) -> 'mc.ToolUseResultMessage':
         tce = self._catalog.by_name[check.non_empty_str(use.name)]
 
-        if self._confirmation is not None:
-            await self._confirmation.confirm_tool_execution_or_raise(use, tce)
+        await self._confirmation.confirm_tool_execution_or_raise(use, tce)
 
         return await mc.execute_tool_use(
             mc.ToolContext(

ommlds/cli/sessions/chat/{agents → drivers}/tools/inject.py

@@ -10,7 +10,6 @@ from .injection import tool_context_providers
 
 
 with lang.auto_proxy_import(globals()):
-    from . import confirmation as _confirmation
     from . import execution as _execution
     from . import rendering as _rendering
 
@@ -59,26 +58,15 @@ def bind_tools(cfg: ToolsConfig = ToolsConfig()) -> inj.Elements:
     els.append(exec_stack.push_bind(to_ctor=_execution.ToolUseExecutorImpl, singleton=True))
 
     if cfg.verbose:
+        els.append(exec_stack.push_bind(to_ctor=_rendering.ArgsRenderingToolUseExecutor, singleton=True))
         els.append(exec_stack.push_bind(to_ctor=_rendering.ResultRenderingToolUseExecutor, singleton=True))
 
-        if cfg.dangerous_no_confirmation:
-            els.append(exec_stack.push_bind(to_ctor=_rendering.ArgsRenderingToolUseExecutor, singleton=True))
-
     els.extend([
         inj.bind(_execution.ToolUseExecutor, to_key=exec_stack.top),
     ])
 
     #
 
-    if not cfg.dangerous_no_confirmation:
-        els.append(inj.bind(
-            _confirmation.ToolExecutionConfirmation,
-            to_ctor=_confirmation.InteractiveToolExecutionConfirmation,
-            singleton=True,
-        ))
-
-    #
-
     els.extend([
         tool_context_providers().bind_items_provider(singleton=True),
 

ommlds/cli/sessions/chat/{agents → drivers}/tools/rendering.py

@@ -2,7 +2,7 @@ import typing as ta
 
 from ...... import minichain as mc
 from .....rendering.types import ContentRendering
-from ...agents.tools.execution import ToolUseExecutor
+from ...drivers.tools.execution import ToolUseExecutor
 
 
 ##

ommlds/cli/sessions/chat/drivers/types.py

@@ -0,0 +1,10 @@
+import uuid
+
+from omlish import typedvalues as tv
+
+
+##
+
+
+class ChatDriverId(tv.UniqueScalarTypedValue[uuid.UUID]):
+    pass

ommlds/cli/sessions/chat/{agents → drivers}/user/inject.py

@@ -9,7 +9,7 @@ from .configs import UserConfig
 
 
 with lang.auto_proxy_import(globals()):
-    from .. import agent as _agent
+    from .. import driver as _driver
     from ..state import types as _state
 
 
@@ -29,12 +29,12 @@ def bind_user(cfg: UserConfig = UserConfig()) -> inj.Elements:
         )))
 
     if cfg.initial_user_content is not None:
-        async def add_initial_user_content(ca: '_agent.ChatAgent') -> None:
-            await ca.send_user_messages([mc.UserMessage(cfg.initial_user_content)])
+        async def add_initial_user_content(cd: '_driver.ChatDriver') -> None:
+            await cd.send_user_messages([mc.UserMessage(cfg.initial_user_content)])
 
         els.append(phase_callbacks().bind_item(to_fn=inj.KwargsTarget.of(
-            lambda ca: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_user_content(ca())),
-            ca=inj.Late[_agent.ChatAgent],
+            lambda cdg: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_user_content(cdg())),
+            cdg=_driver.ChatDriverGetter,
         )))
 
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/inject.py

@@ -9,7 +9,7 @@ from .configs import ChatConfig
 with lang.auto_proxy_import(globals()):
     from ...rendering import inject as _rendering
     from . import session as _session
-    from .agents import inject as _agents
+    from .drivers import inject as _drivers
     from .interfaces import inject as _interfaces
 
 
@@ -22,7 +22,7 @@ def bind_chat(cfg: ChatConfig) -> inj.Elements:
     #
 
     els.extend([
-        _agents.bind_agent(cfg.agent),
+        _drivers.bind_driver(cfg.driver),
 
         _interfaces.bind_interface(cfg.interface),
 

ommlds/cli/sessions/chat/interfaces/bare/inject.py

@@ -8,8 +8,10 @@ from ..configs import InterfaceConfig
 with lang.auto_proxy_import(globals()):
     from .....inputs import asyncs as _inputs_asyncs
     from .....inputs import sync as _inputs_sync
+    from ...drivers.tools import confirmation as _tools_confirmation
     from . import interactive as _interactive
     from . import oneshot as _oneshot
+    from . import tools as _tools
 
 
 ##
@@ -18,6 +20,8 @@ with lang.auto_proxy_import(globals()):
 def bind_bare(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
     els: list[inj.Elemental] = []
 
+    #
+
     if cfg.interactive:
         els.extend([
             inj.bind(_interactive.InteractiveBareChatInterface, singleton=True),
@@ -35,4 +39,23 @@ def bind_bare(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
             inj.bind(ChatInterface, to_key=_oneshot.OneshotBareChatInterface),
         ])
 
+    #
+
+    if cfg.enable_tools:
+        if cfg.dangerous_no_tool_confirmation:
+            els.append(inj.bind(
+                _tools_confirmation.ToolExecutionConfirmation,
+                to_ctor=_tools_confirmation.UnsafeAlwaysAllowToolExecutionConfirmation,
+                singleton=True,
+            ))
+
+        else:
+            els.append(inj.bind(
+                _tools_confirmation.ToolExecutionConfirmation,
+                to_ctor=_tools.InteractiveToolExecutionConfirmation,
+                singleton=True,
+            ))
+
+    #
+
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/interfaces/bare/interactive.py

@@ -4,7 +4,7 @@ from ...... import minichain as mc
 from .....inputs.asyncs import AsyncStringInput
 from .....inputs.asyncs import SyncAsyncStringInput
 from .....inputs.sync import InputSyncStringInput
-from ...agents.agent import ChatAgent
+from ...drivers.driver import ChatDriver
 from ..base import ChatInterface
 
 
@@ -17,18 +17,18 @@ class InteractiveBareChatInterface(ChatInterface):
     def __init__(
             self,
             *,
-            agent: ChatAgent,
+            driver: ChatDriver,
             string_input: AsyncStringInput | None = None,
     ) -> None:
         super().__init__()
 
-        self._agent = agent
+        self._driver = driver
         if string_input is None:
             string_input = self.DEFAULT_STRING_INPUT
         self._string_input = string_input
 
     async def run(self) -> None:
-        await self._agent.start()
+        await self._driver.start()
 
         while True:
             try:
@@ -36,6 +36,12 @@ class InteractiveBareChatInterface(ChatInterface):
             except EOFError:
                 break
 
-            await self._agent.send_user_messages([mc.UserMessage(s)])
+            print()
+            print('<')
+            print()
 
-        await self._agent.stop()
+            await self._driver.send_user_messages([mc.UserMessage(s)])
+
+            print()
+
+        await self._driver.stop()

ommlds/cli/sessions/chat/interfaces/bare/oneshot.py

@@ -1,4 +1,4 @@
-from ...agents.agent import ChatAgent
+from ...drivers.driver import ChatDriver
 from ..base import ChatInterface
 
 
@@ -9,13 +9,13 @@ class OneshotBareChatInterface(ChatInterface):
     def __init__(
             self,
             *,
-            agent: ChatAgent,
+            driver: ChatDriver,
     ) -> None:
         super().__init__()
 
-        self._agent = agent
+        self._driver = driver
 
     async def run(self) -> None:
-        await self._agent.start()
+        await self._driver.start()
 
-        await self._agent.stop()
+        await self._driver.stop()

ommlds/cli/sessions/chat/{agents/tools/confirmation.py → interfaces/bare/tools.py}

@@ -1,28 +1,9 @@
-import abc
-import typing as ta
-
-from omlish import lang
 from omlish.formats import json
 from omlish.term.confirm import confirm_action
 
 from ...... import minichain as mc
-
-
-##
-
-
-class ToolExecutionRequestDeniedError(Exception):
-    pass
-
-
-class ToolExecutionConfirmation(lang.Abstract):
-    @abc.abstractmethod
-    def confirm_tool_execution_or_raise(
-            self,
-            use: 'mc.ToolUse',
-            entry: 'mc.ToolCatalogEntry',
-    ) -> ta.Awaitable[None]:
-        raise NotImplementedError
+from ...drivers.tools.confirmation import ToolExecutionConfirmation
+from ...drivers.tools.confirmation import ToolExecutionRequestDeniedError
 
 
 ##

ommlds/cli/sessions/chat/interfaces/bare/user.py

@@ -4,7 +4,7 @@ from ...... import minichain as mc
 from .....inputs.asyncs import AsyncStringInput
 from .....inputs.asyncs import SyncAsyncStringInput
 from .....inputs.sync import InputSyncStringInput
-from ...agents.user.types import UserChatInput
+from ...drivers.user.types import UserChatInput
 
 
 ##

ommlds/cli/sessions/chat/interfaces/configs.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - obviously, subclasses of InterfaceConfig
+  - this is really just another instance of the whole `argparse -> config -> inject` flow
+"""
 import typing as ta
 
 from omlish import dataclasses as dc
@@ -13,3 +18,6 @@ class InterfaceConfig:
     use_textual: bool = False
 
     use_readline: bool | ta.Literal['auto'] = 'auto'
+
+    enable_tools: bool = False
+    dangerous_no_tool_confirmation: bool = False

ommlds/cli/sessions/chat/interfaces/inject.py

@@ -16,7 +16,7 @@ def bind_interface(cfg: InterfaceConfig = InterfaceConfig()) -> inj.Elements:
     els: list[inj.Elemental] = []
 
     if cfg.use_textual:
-        els.append(_textual.bind_textual())
+        els.append(_textual.bind_textual(cfg))
 
     else:
         els.append(_bare.bind_bare(cfg))