ommlds 0.0.0.dev463__py3-none-any.whl → 0.0.0.dev464__py3-none-any.whl

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

@@ -0,0 +1,145 @@
+import os
+import typing as ta
+
+from omlish import check
+from omlish import inject as inj
+from omlish import lang
+
+from ..... import minichain as mc
+from .injection import bind_tool_context_provider_to_key
+from .injection import tool_catalog_entries
+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
+
+
+##
+
+
+_TOOL_BINDERS: dict[str, ta.Callable[[], inj.Elements]] = {}
+
+
+def _tool_binder(name: str) -> ta.Callable[[ta.Callable[[], inj.Elements]], ta.Callable[[], inj.Elements]]:
+    def inner(fn):
+        check.not_in(name, _TOOL_BINDERS)
+        _TOOL_BINDERS[name] = fn
+        return fn
+    return inner
+
+
+#
+
+
+@_tool_binder('weather')
+def _bind_weather_tool() -> inj.Elements:
+    from .weather import WEATHER_TOOL
+
+    return inj.as_elements(
+        tool_catalog_entries().bind_item_consts(WEATHER_TOOL),
+    )
+
+
+@_tool_binder('todo')
+def _bind_todo_tools() -> inj.Elements:
+    from .....minichain.lib.todo.context import TodoContext
+    from .....minichain.lib.todo.tools.read import todo_read_tool
+    from .....minichain.lib.todo.tools.write import todo_write_tool
+
+    return inj.as_elements(
+        tool_catalog_entries().bind_item_consts(
+            todo_read_tool(),
+            todo_write_tool(),
+        ),
+
+        inj.bind(TodoContext()),
+        bind_tool_context_provider_to_key(TodoContext),
+    )
+
+
+@_tool_binder('fs')
+def _bind_fs_tools() -> inj.Elements:
+    from .....minichain.lib.fs.context import FsContext
+    from .....minichain.lib.fs.tools.ls import ls_tool
+    from .....minichain.lib.fs.tools.read import read_tool
+
+    return inj.as_elements(
+        tool_catalog_entries().bind_item_consts(
+            ls_tool(),
+            read_tool(),
+        ),
+
+        inj.bind(FsContext(
+            root_dir=os.getcwd(),
+        )),
+        bind_tool_context_provider_to_key(FsContext),
+    )
+
+
+# if tools_config.enable_unsafe_tools_do_not_use_lol:
+#     from ...minichain.lib.bash import bash_tool
+#     els.append(bind_tool(bash_tool()))
+#
+#     from ...minichain.lib.fs.tools.edit import edit_tool
+#     els.append(bind_tool(edit_tool()))
+
+
+##
+
+
+def bind_tools(
+        *,
+        silent: bool = False,
+        dangerous_no_confirmation: bool = False,
+        enabled_tools: ta.Iterable[str] | None = None,
+) -> inj.Elements:
+    els: list[inj.Elemental] = []
+
+    #
+
+    els.append(inj.bind(mc.ToolCatalog, singleton=True))
+
+    #
+
+    els.append(tool_catalog_entries().bind_items_provider(singleton=True))
+
+    for etn in check.not_isinstance(enabled_tools or [], str):
+        els.append(_TOOL_BINDERS[etn]())
+
+    #
+
+    exec_stack = inj.wrapper_binder_helper(_execution.ToolUseExecutor)
+
+    els.append(exec_stack.push_bind(to_ctor=_execution.ToolUseExecutorImpl, singleton=True))
+
+    if not silent:
+        els.append(exec_stack.push_bind(to_ctor=_rendering.ResultRenderingToolUseExecutor, singleton=True))
+
+        if 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 dangerous_no_confirmation:
+        els.append(inj.bind(_confirmation.ToolExecutionConfirmation, to_ctor=_confirmation.InteractiveToolExecutionConfirmation, singleton=True))  # noqa
+
+    #
+
+    els.extend([
+        tool_context_providers().bind_items_provider(singleton=True),
+
+        inj.bind(_execution.ToolContextProvider, to_fn=lang.typed_lambda(tcps=_execution.ToolContextProviders)(
+            lambda tcps: _execution.ToolContextProvider(lambda: [tc for tcp in tcps for tc in tcp()]),
+        ), singleton=True),
+    ])
+
+    #
+
+    return inj.as_elements(*els)

ommlds/cli/sessions/chat/tools/injection.py

@@ -0,0 +1,29 @@
+import typing as ta
+
+from omlish import inject as inj
+from omlish import lang
+
+from ..... import minichain as mc
+
+
+with lang.auto_proxy_import(globals()):
+    from . import execution as _execution
+
+##
+
+
+@lang.cached_function
+def tool_catalog_entries() -> 'inj.ItemsBinderHelper[mc.ToolCatalogEntry]':
+    return inj.items_binder_helper[mc.ToolCatalogEntry](mc.ToolCatalogEntries)
+
+
+@lang.cached_function
+def tool_context_providers() -> 'inj.ItemsBinderHelper[_execution.ToolContextProvider]':
+    return inj.items_binder_helper[_execution.ToolContextProvider](_execution.ToolContextProviders)
+
+
+def bind_tool_context_provider_to_key(key: ta.Any) -> inj.Elements:
+    return tool_context_providers().bind_item(to_fn=inj.KwargsTarget.of(
+        lambda v: _execution.ToolContextProvider(lambda: [v]),
+        v=key,
+    ), singleton=True)

ommlds/cli/sessions/chat/tools/rendering.py

@@ -0,0 +1,58 @@
+import typing as ta
+
+from ..... import minichain as mc
+from ..rendering.types import ContentRendering
+from .execution import ToolUseExecutor
+
+
+##
+
+
+class ArgsRenderingToolUseExecutor(ToolUseExecutor):
+    def __init__(
+            self,
+            *,
+            wrapped: ToolUseExecutor,
+            renderer: ContentRendering,
+    ) -> None:
+        super().__init__()
+
+        self._wrapped = wrapped
+        self._renderer = renderer
+
+    async def execute_tool_use(
+            self,
+            use: 'mc.ToolUse',
+            *ctx_items: ta.Any,
+    ) -> 'mc.ToolUseResultMessage':
+        await self._renderer.render_content(mc.JsonContent(dict(
+            id=use.id,
+            name=use.name,
+            args=use.args,
+        )))
+
+        return await self._wrapped.execute_tool_use(use, *ctx_items)
+
+
+class ResultRenderingToolUseExecutor(ToolUseExecutor):
+    def __init__(
+            self,
+            *,
+            wrapped: ToolUseExecutor,
+            renderer: ContentRendering,
+    ) -> None:
+        super().__init__()
+
+        self._wrapped = wrapped
+        self._renderer = renderer
+
+    async def execute_tool_use(
+            self,
+            use: 'mc.ToolUse',
+            *ctx_items: ta.Any,
+    ) -> 'mc.ToolUseResultMessage':
+        out = await self._wrapped.execute_tool_use(use, *ctx_items)
+
+        await self._renderer.render_content(out.tur.c)
+
+        return out

ommlds/cli/{tools → sessions/chat/tools}/weather.py

@@ -1,4 +1,4 @@
-from ... import minichain as mc
+from ..... import minichain as mc
 
 
 ##

ommlds/cli/sessions/inject.py

@@ -1,8 +1,7 @@
 from omlish import inject as inj
 
 from .base import Session
-from .chat.base import ChatSession
-from .chat2.session import Chat2Session
+from .chat.session import ChatSession
 
 
 ##
@@ -16,11 +15,7 @@ def bind_sessions(session_cfg: Session.Config) -> inj.Elements:
     ]
 
     if isinstance(session_cfg, ChatSession.Config):
-        from .chat.inject import bind_chat_session
-        els.append(bind_chat_session(session_cfg))
-
-    elif isinstance(session_cfg, Chat2Session.Config):
-        from .chat2.inject import bind_chat
+        from .chat.inject import bind_chat
         els.append(bind_chat(session_cfg))  # noqa
 
     return inj.as_elements(*els)

{ommlds-0.0.0.dev463.dist-info → ommlds-0.0.0.dev464.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev463
+Version: 0.0.0.dev464
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev463
-Requires-Dist: omlish==0.0.0.dev463
+Requires-Dist: omdev==0.0.0.dev464
+Requires-Dist: omlish==0.0.0.dev464
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev463.dist-info → ommlds-0.0.0.dev464.dist-info}/RECORD

@@ -77,65 +77,67 @@ ommlds/backends/torch/devices.py,sha256=KWkeyArPdUwVqckQTJPkN-4GQdv39cpOgCMv_Xfk
 ommlds/backends/torch/purge.py,sha256=sp6XUxNLoVCepxIPKw3tevHn-cQqgorILvIQzixauiI,1834
 ommlds/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/__main__.py,sha256=1ffCb0fcUOJMzxROJmJRXQ8PSOVYv7KrcuBtT95cf0c,140
-ommlds/cli/inject.py,sha256=4YqgTvVKoe1bFQ_Qfgy-_pOcv6ZOq537T6_uF7Lkiew,1338
-ommlds/cli/main.py,sha256=kyR2QoFbuXwpThQ6VQ7Ty-ILyvyUY-mCbG5B2m-atPQ,6310
+ommlds/cli/inject.py,sha256=QEuipqBPsET3rA0aO2c8hKCU77kgWwMfWktW8cGDkyw,1160
+ommlds/cli/main.py,sha256=dCSmhu0Xk6thP6pu_nmo1kp-WiR4aC1RBOfG0Y8BKjI,5534
 ommlds/cli/state.py,sha256=tRPmgCANRrw7A5Qr700OaH58F6S96O37I8Ivrbo7_gI,3001
 ommlds/cli/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/backends/inject.py,sha256=OVstNsoeVnprM9PBL_zP0N46KkoDg3_Wz90BWcQ7km4,1734
 ommlds/cli/backends/standard.py,sha256=HnammWyAXJHeqXJrAMBdarcT4Nyt2CxudZdD2fW_Y9M,631
 ommlds/cli/sessions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/base.py,sha256=oTqsqZ9jhBWFblANpVWLLIzmRfP8HO9QYtPnZ-GZxS0,452
-ommlds/cli/sessions/inject.py,sha256=dPpcYioOvoK286C5hRR348pnS6UmQJ429AF7aY7HGfk,744
+ommlds/cli/sessions/inject.py,sha256=oDiEuBkchaBKHVTJcd11v4P_pSurhrvwhbaAVCcUhOM,548
 ommlds/cli/sessions/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/base.py,sha256=GlDBXZ-KymSokNl1a7uwX1abswmRE67Q0zOIHjhZb_0,796
-ommlds/cli/sessions/chat/code.py,sha256=6hnjibVMTxSUciIIsDPsLHLGMlJNNUZtVQJxFkpi8sM,4269
-ommlds/cli/sessions/chat/inject.py,sha256=uF-QJvONu5sntXxaEu5KTYy2MUaSY8c5oJz0HpK3c7E,2621
-ommlds/cli/sessions/chat/interactive.py,sha256=gurYiDCQSY_5llcE75zvEbpVp77AbKSfgY243Z68bLw,2039
-ommlds/cli/sessions/chat/printing.py,sha256=3f6icLamt7Wd7oiTshGVnIgC5YAsx_CBvZ4QH_7_mFs,2921
-ommlds/cli/sessions/chat/prompt.py,sha256=tB8Wsy1FYXU6Gq-xOUTVpk8PVAu03mh7lcXf7xO7uJ4,5288
-ommlds/cli/sessions/chat/state.py,sha256=pdYwkovRxcLVyIHS3yGrMlqP-81j-XrKAFd4AnGzx5o,2700
-ommlds/cli/sessions/chat/tools.py,sha256=dj6ADr6RIJnoIKH5wxRLGkgKAfZ_TtnqNLQ6uO-1Gfg,2325
-ommlds/cli/sessions/chat2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/_inject.py,sha256=Rf54u0TVvZNW4jOFx7nQqATo71TcOLx1_8jjyNIBGV4,2465
-ommlds/cli/sessions/chat2/configs.py,sha256=C7MvPpZKQ8Tr43CrCxMr2Ey0yO-rvruWLfMntRAQuDU,534
-ommlds/cli/sessions/chat2/driver.py,sha256=el3D4vAOswtwEd5TELRMUDoJxg07vca1bnTJ4gvz5Lk,1381
-ommlds/cli/sessions/chat2/inject.py,sha256=RvEVvoTaWoth5X48bnMLL5umm5L2_Z-j-YBrsMyHXyc,4256
-ommlds/cli/sessions/chat2/phases.py,sha256=bFAPQQuVh3pd8gV-scMsrGwwAHokTdl9YHfBni5v-wA,1171
-ommlds/cli/sessions/chat2/session.py,sha256=ENE_YrN1A7ZLaDorJfBuRVI7pntMl4KTnUH11c9Vajo,523
-ommlds/cli/sessions/chat2/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/backends/catalog.py,sha256=awERG2SgoMqxcjMt1LBQ2iTxn7qhsiJXxSBSHDOafZU,1746
-ommlds/cli/sessions/chat2/backends/types.py,sha256=RgVvXV8OjVxApszYVv-XTfD3gw7ZlbNCs10_Wl5Dico,690
-ommlds/cli/sessions/chat2/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/chat/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/chat/ai/rendering.py,sha256=gw3MMoFFyEvac2Ett8gI2-cgUITTWMrTnW7BR_VaT3s,2051
-ommlds/cli/sessions/chat2/chat/ai/services.py,sha256=mgFm0D9Z3WJQ6L7EJyRaYRxgxRgl7TzbPUQtxYTCuVA,2124
-ommlds/cli/sessions/chat2/chat/ai/types.py,sha256=OBU0WhxT-ot3ALdystR2-Bu5eoy62TWy8f3mWTsMEJM,742
-ommlds/cli/sessions/chat2/chat/state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/chat/state/inmemory.py,sha256=ltwNMI4CWevJmR4z42Bmd_BBrnyalEPkATAuYHq2Z0g,859
-ommlds/cli/sessions/chat2/chat/state/storage.py,sha256=XgYYSuv-RduiEjdhTRmV8OG_1WHyEMuoIITaH6bE0mg,1426
-ommlds/cli/sessions/chat2/chat/state/types.py,sha256=m3G5T7fqZXqaz_gz1IDSi83b9FPMV3B3dNeVg0q4tJ8,792
-ommlds/cli/sessions/chat2/chat/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/chat/user/interactive.py,sha256=ClTaO132682LbCpXN1MQxhoJOlmTIzzR_Vc2yHyJymc,686
-ommlds/cli/sessions/chat2/chat/user/oneshot.py,sha256=eIUA3slRzcqwf5qR5TG_rwV4Wd-K_ItKF0LdhA8exz4,586
-ommlds/cli/sessions/chat2/chat/user/types.py,sha256=zjBUDz1U0VnmTFq3enl-CL1ZWoc8Aa0_0b41nbZ0PkQ,260
-ommlds/cli/sessions/chat2/content/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/content/messages.py,sha256=MP3LsKWy97yFq1WCireCk1W6_TyeT5SlTom8SimOlCQ,821
-ommlds/cli/sessions/chat2/content/strings.py,sha256=IRwgAR8_CWVU8TxX9ZBJOznnIg-N4GUQ0lbyHy8jj4g,1051
-ommlds/cli/sessions/chat2/rendering/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/rendering/markdown.py,sha256=dL5lIZJkwqTuvBdNU4q-z0qIuo8sqvnUlIK6xL55PH4,1799
-ommlds/cli/sessions/chat2/rendering/raw.py,sha256=iimt5lRY7mxkmDD3cOri9oxQ0zCuA5PC_LeDOR_Znbk,2428
-ommlds/cli/sessions/chat2/rendering/types.py,sha256=7D8QV8r4Xy5LQ5lCaLEF7JvomWCwnoHH78EKy7UzEbM,447
-ommlds/cli/sessions/chat2/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat2/tools/confirmation.py,sha256=ZiSBp0RKLPAVyHsFdUJrdZmvYnyZAVFt_zaqvF4JDeU,1064
-ommlds/cli/sessions/chat2/tools/execution.py,sha256=FAyaxw9BPNWveouF8s7GJiYxqECs0i72ZFXYW12z00c,1268
+ommlds/cli/sessions/chat/configs.py,sha256=7NtpOaSyjABKLuJ1jAbp1lCT1tPjvPVJ_vakbzvuk8g,692
+ommlds/cli/sessions/chat/driver.py,sha256=ddnCYTKqWiPxV8U4UbFwb7E3yi81ItjZ9j3AJd3a3Mk,1395
+ommlds/cli/sessions/chat/inject.py,sha256=tlZ2kmS6PxLbGzgKhbtUyzUw2uyeZ9TpWt0QFdgmAOM,1656
+ommlds/cli/sessions/chat/session.py,sha256=eqwelLE74JFC-fBpk_hdwMD2nP4pLv3ZPwUn99200B8,521
+ommlds/cli/sessions/chat/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/backends/catalog.py,sha256=GroogxBQf_zlrhEEwTSq18v13HWsuXOP276VcuphPic,1756
+ommlds/cli/sessions/chat/backends/inject.py,sha256=VbZ-Fb679kTItRpAhIYCqSM8vXUFeRDQWssUfrFgGi8,882
+ommlds/cli/sessions/chat/backends/injection.py,sha256=GCn5OvNIEowgB70kQVuU84z3i8lLA4vOVkTZlQG8s0o,327
+ommlds/cli/sessions/chat/backends/types.py,sha256=5eImYHXLKqbC5MDrN443eMGamP9snCmV1n7LtAsqgPk,696
+ommlds/cli/sessions/chat/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/chat/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/chat/ai/inject.py,sha256=Uq1zDpFj3cZqWns2gfMu1Oun4ssbfzVB1JfpUdwh8wc,2572
+ommlds/cli/sessions/chat/chat/ai/injection.py,sha256=2O_ELMusxQsYaB2oqvzjYpZQzjshocJup7Z5unzoUIY,404
+ommlds/cli/sessions/chat/chat/ai/rendering.py,sha256=cicA6NwkM9UJb1dgsakhkhIMWGzBsArPFvYoINBmuec,2285
+ommlds/cli/sessions/chat/chat/ai/services.py,sha256=RNO3emXEFPr0M04wThRQo332x0n5R3n8aQFctcePCHQ,2629
+ommlds/cli/sessions/chat/chat/ai/tools.py,sha256=en94LLM8y73N11xhQPlkSLfbzAmYVwKU-4nz2i0CK0E,1094
+ommlds/cli/sessions/chat/chat/ai/types.py,sha256=QH6Cn6DrdxBi0Tnura7Fq-WtGUm0FdsazZSgki6nf0A,750
+ommlds/cli/sessions/chat/chat/state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/chat/state/inject.py,sha256=usHhiE1fKtttJvxgVN-LuwIsfyau_0n17-99bDuPNnw,1131
+ommlds/cli/sessions/chat/chat/state/inmemory.py,sha256=2lSCWnNEH_vj9RJUVzM8huAHAXBJ6Go02og2nzew1hk,861
+ommlds/cli/sessions/chat/chat/state/storage.py,sha256=IabpjwrD89kX7s_hcKjpumu0He0jMmK-uOig1RmAxIA,1428
+ommlds/cli/sessions/chat/chat/state/types.py,sha256=iMovPXnRvZJ8ieM5gPnTBi1X7j-9GUtziiPBZJJf034,794
+ommlds/cli/sessions/chat/chat/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/chat/user/inject.py,sha256=x0DV0kMxEiHVTjQwsQlW4wKHfACu0Nlnhbsc4Uum_wI,2164
+ommlds/cli/sessions/chat/chat/user/interactive.py,sha256=AZ8v5uGscnNk4KJdGisOA2LND8m7473fY5Whks7M_tI,688
+ommlds/cli/sessions/chat/chat/user/oneshot.py,sha256=jPrZBBuf-olBfPF7CPTYK7-Dr7EvSriU7L0nORHfbv4,588
+ommlds/cli/sessions/chat/chat/user/types.py,sha256=MNlhMxlLtxVod9rUZlSPvRaippPAXEdX_GHh73QLeSg,262
+ommlds/cli/sessions/chat/content/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/content/messages.py,sha256=DhGIBdPXXiQdKcQkPKFJPmhdL2CBHvyoVWhSKBRVMY0,939
+ommlds/cli/sessions/chat/content/strings.py,sha256=PyaHeUnAAuhOyJr7F7G4xupUOQLs7_iOd74wFNHTkfg,1055
+ommlds/cli/sessions/chat/phases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/phases/inject.py,sha256=m9GcCVcp1GnNKN1qwDSgTkfp3e107wXgPeEHDLbfG8s,448
+ommlds/cli/sessions/chat/phases/injection.py,sha256=ZUFRRLp3HNhKaPBW6aiw5XFEGNkqTj8WVSlXM0kg0y0,326
+ommlds/cli/sessions/chat/phases/manager.py,sha256=_wfc0FfL5h_5L-6hnYb3U3kiRmkGDkJu7wGj5Cgz7_Y,727
+ommlds/cli/sessions/chat/phases/types.py,sha256=w1pAEydJYaHzSzdlqygCwKxvVZnfo_R_xJqq8wBzZsQ,512
+ommlds/cli/sessions/chat/rendering/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/rendering/inject.py,sha256=Yo_BDxDNbTge8UtEp31uTKhsFdaeVf-4CFs3rdu8l0I,885
+ommlds/cli/sessions/chat/rendering/markdown.py,sha256=C4z9Rs0ivVTrBmu7lFnybNOq1j9hEZb58Gc_R8rmcUI,1803
+ommlds/cli/sessions/chat/rendering/raw.py,sha256=L7RIY77dycZRTspWJC4Vj4fP9I-vdqo_0qe_8bj-0QQ,2432
+ommlds/cli/sessions/chat/rendering/types.py,sha256=6wzYeitDGVufrf0W-R2cuwcBscPf9yPl0HtiCd7am2Q,449
+ommlds/cli/sessions/chat/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/tools/confirmation.py,sha256=I_nYBIIoeprCShUaVpN4v01YOAdY6iJEM5-ybc0p8VA,1072
+ommlds/cli/sessions/chat/tools/execution.py,sha256=4sRuZWZjNBo852hhLZjqTqEZpgu9KPXHEawiICIMUdc,1576
+ommlds/cli/sessions/chat/tools/inject.py,sha256=iKBvMrgmFCkgjD0MWtIQFuoiijfRwmhfFW1l6q5Fnd0,3845
+ommlds/cli/sessions/chat/tools/injection.py,sha256=xsVbJAKsDIP-2LbzDXZ3LBJgeY0FJ66UuCK0OYB1uw0,837
+ommlds/cli/sessions/chat/tools/rendering.py,sha256=a9gIhxuGF9tfXGlkGXpdweSz4dacIsxoqJNKpRSvUN4,1402
+ommlds/cli/sessions/chat/tools/weather.py,sha256=vZXOHdRGGlkDEXasW5foc58MyEMOc79bhIfIgrumRlo,302
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/completion/completion.py,sha256=2ZrzmHBCF3mG13ABcoiHva6OUzPpdF7qzByteaLNsxk,1077
 ommlds/cli/sessions/embedding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/embedding/embedding.py,sha256=9U5Maj-XI5nsrk7m-O3P2rZggey0z2p7onZn2QfQe38,1051
-ommlds/cli/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/tools/config.py,sha256=aEssMUVNR0yy9v9yXJm3MOohb97Gx26jrOg2QHZuFbo,272
-ommlds/cli/tools/inject.py,sha256=L30UvDCyXjt4gB1snatp7xx-VF4nlBiewS10Hnaq76c,1938
-ommlds/cli/tools/weather.py,sha256=FUPxPF5KBbbyK3voBtcRUOkuMO2zK5GFZoFTJMaM6LQ,300
 ommlds/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/datasets/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/datasets/lib/movies.py,sha256=LmdfoXsZU9XMM_r-sxCLv_s06BFzwWO4xUj6sc9XVcI,1961
@@ -358,9 +360,9 @@ ommlds/wiki/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ommlds/wiki/utils/io.py,sha256=UKgDJGtmpnWvIqVd2mJc2QNPOqlToEY1GEveNp6_pMo,7088
 ommlds/wiki/utils/progress.py,sha256=EhvKcMFYtsarCQhIahlO6f0SboyAKP3UwUyrnVnP-Vk,3222
 ommlds/wiki/utils/xml.py,sha256=vVV8Ctn13aaRM9eYfs9Wd6rHn5WOCEUzQ44fIhOvJdg,3754
-ommlds-0.0.0.dev463.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev463.dist-info/METADATA,sha256=mIhlH46UdhPuSfHGwghj8EAqxLWoSPCUtCgtHlCSleQ,3224
-ommlds-0.0.0.dev463.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev463.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev463.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev463.dist-info/RECORD,,
+ommlds-0.0.0.dev464.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev464.dist-info/METADATA,sha256=tgOdigb0BtGCCBTpaDgfW0Rog8sK9jpRUYW1jsIxMxo,3224
+ommlds-0.0.0.dev464.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev464.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev464.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev464.dist-info/RECORD,,

ommlds/cli/sessions/chat/base.py

@@ -1,42 +0,0 @@
-import dataclasses as dc
-import typing as ta
-
-from omlish import lang
-
-from .... import minichain as mc
-from ..base import Session
-
-
-##
-
-
-DEFAULT_CHAT_MODEL_BACKEND = 'openai'
-
-
-##
-
-
-ChatOption: ta.TypeAlias = mc.ChatChoicesOptions
-ChatOptions = ta.NewType('ChatOptions', ta.Sequence[ChatOption])
-
-
-##
-
-
-ChatSessionConfigT = ta.TypeVar('ChatSessionConfigT', bound='ChatSession.Config')
-
-
-class ChatSession(Session[ChatSessionConfigT], lang.Abstract, ta.Generic[ChatSessionConfigT]):
-    @dc.dataclass(frozen=True)
-    class Config(Session.Config, lang.Abstract):
-        _: dc.KW_ONLY
-
-        markdown: bool = False
-
-        dangerous_no_tool_confirmation: bool = False
-
-    def __init__(
-            self,
-            config: ChatSessionConfigT,
-    ) -> None:
-        super().__init__(config)

ommlds/cli/sessions/chat/code.py

@@ -1,125 +0,0 @@
-import dataclasses as dc
-import itertools
-import os.path
-
-from omlish import check
-from omlish import lang
-
-from .... import minichain as mc
-from ....minichain.lib.code.prompts import CODE_AGENT_SYSTEM_PROMPT
-from ...tools.config import ToolsConfig
-from .base import DEFAULT_CHAT_MODEL_BACKEND
-from .base import ChatOptions
-from .base import ChatSession
-from .printing import ChatSessionPrinter
-from .state import ChatStateManager
-from .tools import ToolUseExecutor
-
-
-##
-
-
-class CodeChatSession(ChatSession['CodeChatSession.Config']):
-    @dc.dataclass(frozen=True)
-    class Config(ChatSession.Config):
-        _: dc.KW_ONLY
-
-        new: bool = False
-
-        backend: str | None = None
-        model_name: str | None = None
-
-        initial_message: mc.Content | None = None
-
-    def __init__(
-            self,
-            config: Config,
-            *,
-            state_manager: ChatStateManager,
-            chat_options: ChatOptions | None = None,
-            printer: ChatSessionPrinter,
-            backend_catalog: mc.BackendCatalog,
-            tool_exec_request_executor: ToolUseExecutor,
-            tools_config: ToolsConfig | None = None,
-    ) -> None:
-        super().__init__(config)
-
-        self._state_manager = state_manager
-        self._chat_options = chat_options
-        self._printer = printer
-        self._backend_catalog = backend_catalog
-        self._tool_exec_request_executor = tool_exec_request_executor
-        self._tools_config = tools_config
-
-    async def run(self) -> None:
-        if self._config.new:
-            self._state_manager.clear_state()
-            state = self._state_manager.extend_chat([
-                mc.SystemMessage(CODE_AGENT_SYSTEM_PROMPT),
-            ])
-
-        else:
-            state = self._state_manager.get_state()
-
-        backend = self._config.backend
-        if backend is None:
-            backend = DEFAULT_CHAT_MODEL_BACKEND
-
-        # FIXME: lol
-        from ....minichain.lib.fs.context import FsContext
-        fs_tool_context = FsContext(
-            root_dir=os.getcwd(),
-            writes_permitted=self._tools_config is not None and self._tools_config.enable_unsafe_tools_do_not_use_lol,
-        )
-
-        from ....minichain.lib.todo.context import TodoContext
-        todo_tool_context = TodoContext()
-
-        mdl: mc.ChatChoicesService
-        async with lang.async_maybe_managing(self._backend_catalog.get_backend(
-                mc.ChatChoicesService,
-                backend,
-                *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),
-        )) as mdl:
-            for i in itertools.count():
-                if not i and self._config.initial_message is not None:
-                    req_msg = mc.UserMessage(self._config.initial_message)
-                else:
-                    try:
-                        prompt = input('> ')  # FIXME: async lol
-                    except EOFError:
-                        break
-                    req_msg = mc.UserMessage(prompt)
-
-                state = self._state_manager.extend_chat([req_msg])
-
-                while True:
-                    response = await mdl.invoke(mc.ChatChoicesRequest(
-                        state.chat,
-                        (self._chat_options or []),
-                    ))
-
-                    tool_resp_lst = []
-                    for resp_msg in check.single(response.v).ms:
-                        state = self._state_manager.extend_chat([resp_msg])
-
-                        if isinstance(resp_msg, mc.AiMessage):
-                            self._printer.print(resp_msg)
-
-                        elif isinstance(resp_msg, mc.ToolUseMessage):
-                            trm = await self._tool_exec_request_executor.execute_tool_use(
-                                resp_msg.tu,
-                                fs_tool_context,
-                                todo_tool_context,
-                            )
-
-                            self._printer.print(trm.tur.c)
-                            tool_resp_lst.append(trm)
-
-                        else:
-                            raise TypeError(resp_msg)
-
-                    if not tool_resp_lst:
-                        break
-
-                    state = self._state_manager.extend_chat(tool_resp_lst)

ommlds/cli/sessions/chat/interactive.py

@@ -1,70 +0,0 @@
-import dataclasses as dc
-
-from omlish import check
-from omlish import lang
-
-from .... import minichain as mc
-from .base import DEFAULT_CHAT_MODEL_BACKEND
-from .base import ChatSession
-from .printing import ChatSessionPrinter
-from .state import ChatStateManager
-
-
-##
-
-
-class InteractiveChatSession(ChatSession['InteractiveChatSession.Config']):
-    @dc.dataclass(frozen=True)
-    class Config(ChatSession.Config):
-        _: dc.KW_ONLY
-
-        new: bool = False
-
-        backend: str | None = None
-        model_name: str | None = None
-
-    def __init__(
-            self,
-            config: Config,
-            *,
-            state_manager: ChatStateManager,
-            printer: ChatSessionPrinter,
-            backend_catalog: mc.BackendCatalog,
-    ) -> None:
-        super().__init__(config)
-
-        self._state_manager = state_manager
-        self._printer = printer
-        self._backend_catalog = backend_catalog
-
-    async def run(self) -> None:
-        if self._config.new:
-            state = self._state_manager.clear_state()
-        else:
-            state = self._state_manager.get_state()
-
-        backend = self._config.backend
-        if backend is None:
-            backend = DEFAULT_CHAT_MODEL_BACKEND
-
-        mdl: mc.ChatChoicesService
-        async with lang.async_maybe_managing(self._backend_catalog.get_backend(
-                mc.ChatChoicesService,
-                backend,
-                *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),
-        )) as mdl:
-            while True:
-                try:
-                    prompt = input('> ')  # FIXME: async lol
-                except EOFError:
-                    break
-
-                req_msg = mc.UserMessage(prompt)
-
-                response = await mdl.invoke(mc.ChatChoicesRequest([*state.chat, req_msg]))
-
-                resp_msg = check.isinstance(check.single(response.v[0].ms), mc.AiMessage)
-
-                self._printer.print(resp_msg)
-
-                state = self._state_manager.extend_chat([req_msg, resp_msg])