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

ommlds/cli/state.py

@@ -14,6 +14,38 @@ T = ta.TypeVar('T')
 ##
 
 
+class StateStorage(lang.Abstract):
+    @abc.abstractmethod
+    def load_state(self, key: str, ty: type[T] | None) -> ta.Awaitable[T | None]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def save_state(self, key: str, obj: ta.Any | None, ty: type[T] | None) -> ta.Awaitable[None]:
+        raise NotImplementedError
+
+
+##
+
+
+class InMemoryStateStorage(StateStorage):
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._dct: dict[str, ta.Any] = {}
+
+    async def load_state(self, key: str, ty: type[T] | None) -> T | None:
+        return self._dct.get(key)
+
+    async def save_state(self, key: str, obj: ta.Any | None, ty: type[T] | None) -> None:
+        if obj is None:
+            self._dct.pop(key, None)
+        else:
+            self._dct[key] = obj
+
+
+##
+
+
 STATE_VERSION = 0
 
 
@@ -23,10 +55,7 @@ class MarshaledState:
     payload: ta.Any
 
 
-#
-
-
-class StateStorage(lang.Abstract):
+class MarshalStateStorage(StateStorage, lang.Abstract):
     def __init__(
             self,
             *,
@@ -36,36 +65,24 @@ class StateStorage(lang.Abstract):
 
         self._version = version
 
-    #
-
-    def unmarshal_state(self, obj: ta.Any, ty: type[T] | None = None) -> T | None:
+    def _unmarshal_state(self, obj: ta.Any, ty: type[T] | None = None) -> T | None:
         ms = msh.unmarshal(obj, MarshaledState)
         if ms.version < self._version:
             return None
         return msh.unmarshal(ms.payload, ty)
 
-    def marshal_state(self, obj: ta.Any, ty: type | None = None) -> ta.Any:
+    def _marshal_state(self, obj: ta.Any, ty: type | None = None) -> ta.Any:
         ms = MarshaledState(
             version=self._version,
             payload=msh.marshal(obj, ty),
         )
         return msh.marshal(ms)
 
-    #
-
-    @abc.abstractmethod
-    def load_state(self, key: str, ty: type[T] | None) -> T | None:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def save_state(self, key: str, obj: ta.Any | None, ty: type[T] | None) -> None:
-        raise NotImplementedError
-
 
 #
 
 
-class JsonFileStateStorage(StateStorage):
+class JsonFileStateStorage(MarshalStateStorage):
     def __init__(
             self,
             file: str,
@@ -91,19 +108,19 @@ class JsonFileStateStorage(StateStorage):
 
     #
 
-    def load_state(self, key: str, ty: type[T] | None) -> T | None:
+    async def load_state(self, key: str, ty: type[T] | None) -> T | None:
         if not (data := self._load_file_data()):
             return None
         if (dct := data.get(key)) is None:
             return None
-        return self.unmarshal_state(dct, ty)
+        return self._unmarshal_state(dct, ty)
 
-    def save_state(self, key: str, obj: ta.Any | None, ty: type[T] | None) -> None:
+    async def save_state(self, key: str, obj: ta.Any | None, ty: type[T] | None) -> None:
         if (data := self._load_file_data()) is None:
             data = {}
         if obj is None:
             data.pop(key, None)
         else:
-            dct = self.marshal_state(obj, ty)
+            dct = self._marshal_state(obj, ty)
             data[key] = dct
         self._save_file_data(data)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev462
+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.dev462
-Requires-Dist: omlish==0.0.0.dev462
+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.dev462.dist-info → ommlds-0.0.0.dev464.dist-info}/RECORD

@@ -26,7 +26,7 @@ ommlds/backends/mlx/caching.py,sha256=jPhVclrm8RckXiJLY-iokCSGjMfVMr_VH8fTFYA3FB
 ommlds/backends/mlx/cli.py,sha256=In4gGBqvFApLE-vNMi6bqba7Xa-SZfCmSSGuRCDCjlU,10685
 ommlds/backends/mlx/generation.py,sha256=e53MT80QJI6KhUr9UNnJkx9h3bUFtn1dy9K-R57c6hk,9785
 ommlds/backends/mlx/limits.py,sha256=GZfad6q14fvFHoPfovdnH3jnM1qGvdprfQk_pMWqI5g,2780
-ommlds/backends/mlx/loading.py,sha256=v8k--OD1qG6ivrD2sQv_DhIwBAxJe47vKfhkD_KmuOQ,2031
+ommlds/backends/mlx/loading.py,sha256=5M18MPeXiIsPV5Laww6gu3KicLKJ11G0OJMjyixDa9c,3585
 ommlds/backends/mlx/tokenization/LICENSE,sha256=0T9KDFIRDAqANM8DZgpgrzPq3WwnBKsw5EkrkeR3xqM,1066
 ommlds/backends/mlx/tokenization/__init__.py,sha256=0GfhhjUc4OhY_dpQncq984kcdyOCholjVNjAIAcjAHM,232
 ommlds/backends/mlx/tokenization/loading.py,sha256=OSD7-ZnLuY2Owv5MpQB8CCEPMhOPwParqMPpS5omZBI,3154
@@ -77,32 +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=dy_uES0N4_ULmizx72RN06SGtXfDv3VFdqd3dpYgfqg,5805
-ommlds/cli/state.py,sha256=CRmScYuNvwe8nbZ41NQOpUiV9HuSjINzu6vIjwEDVnI,2447
+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=sCwNFDhiyir1taxufFVEcHtaK_o14IcsQOvGUHWM9Jo,545
+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=CjYkcpZ4fEBE0kPl1g101EDzq0MKy6S6E84dfDhwzcQ,2649
-ommlds/cli/sessions/chat/tools.py,sha256=dj6ADr6RIJnoIKH5wxRLGkgKAfZ_TtnqNLQ6uO-1Gfg,2325
+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
@@ -325,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.dev462.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev462.dist-info/METADATA,sha256=_rx-ONK6kUEVzq29OxeCLvj9Wh6a4XehcO9D-aBEo6U,3224
-ommlds-0.0.0.dev462.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev462.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev462.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev462.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])

ommlds/cli/sessions/chat/printing.py

@@ -1,126 +0,0 @@
-import abc
-import typing as ta
-
-from omdev.tui import rich
-from omlish import check
-from omlish import lang
-from omlish.formats import json
-
-from .... import minichain as mc
-
-
-##
-
-
-class ChatSessionPrinter(lang.Abstract):
-    @abc.abstractmethod
-    def print(self, obj: mc.Message | mc.Content) -> None:
-        raise NotImplementedError
-
-
-#
-
-
-class StringChatSessionPrinter(ChatSessionPrinter, lang.Abstract):
-    @abc.abstractmethod
-    def _print_str(self, s: str) -> None:
-        raise NotImplementedError
-
-    def print(self, obj: mc.Message | mc.Content) -> None:
-        if obj is None:
-            pass
-
-        elif isinstance(obj, mc.Message):
-            if isinstance(obj, mc.SystemMessage):
-                if obj.c is not None:
-                    self._print_str(check.isinstance(obj.c, str))
-            elif isinstance(obj, mc.UserMessage):
-                if obj.c is not None:
-                    self._print_str(check.isinstance(obj.c, str))
-            elif isinstance(obj, mc.AiMessage):
-                if obj.c is not None:
-                    self._print_str(check.isinstance(obj.c, str))
-            elif isinstance(obj, mc.ToolUseResultMessage):
-                self._print_str(check.isinstance(obj.tur.c, str))
-            else:
-                raise TypeError(obj)
-
-        elif isinstance(obj, mc.JsonContent):
-            self._print_str(json.dumps_pretty(obj.v))
-
-        elif isinstance(obj, str):
-            self._print_str(obj)
-
-        else:
-            raise TypeError(obj)
-
-
-#
-
-
-class SimpleStringChatSessionPrinter(StringChatSessionPrinter):
-    def __init__(
-            self,
-            *,
-            str_printer: ta.Callable[[str], None] | None = None,
-    ) -> None:
-        super().__init__()
-
-        if str_printer is None:
-            str_printer = print
-        self._str_printer = str_printer
-
-    def _print_str(self, s: str) -> None:
-        s = s.strip()
-        if not s:
-            return
-
-        self._str_printer(s)
-
-
-#
-
-
-class MarkdownStringChatSessionPrinter(StringChatSessionPrinter):
-    def _print_str(self, s: str) -> None:
-        s = s.strip()
-        if not s:
-            return
-
-        rich.Console().print(rich.Markdown(s))
-
-
-##
-
-
-class StreamPrinter(lang.ExitStacked, lang.Abstract):
-    @abc.abstractmethod
-    def feed(self, s: str) -> None:
-        raise NotImplementedError
-
-
-#
-
-
-class SimpleStreamPrinter(StreamPrinter):
-    def feed(self, s: str) -> None:
-        print(s, end='', flush=True)
-
-    def _exit_contexts(self) -> None:
-        super()._exit_contexts()
-        print(flush=True)
-
-
-#
-
-
-class MarkdownStreamPrinter(StreamPrinter):
-    def __init__(self) -> None:
-        super().__init__()
-
-    def _enter_contexts(self) -> None:
-        super()._enter_contexts()
-        self._ir: rich.MarkdownLiveStream = self._enter_context(rich.IncrementalMarkdownLiveStream())
-
-    def feed(self, s: str) -> None:
-        self._ir.feed(s)