ommlds 0.0.0.dev495__py3-none-any.whl → 0.0.0.dev496__py3-none-any.whl

ommlds/minichain/tools/reflect.py

@@ -23,7 +23,7 @@ from omlish import metadata as md
 from omlish import reflect as rfl
 from omlish.lite.cached import cached_nullary
 
-from ..content.cancontent import CanContent
+from ..content.types import Content
 from .types import EnumToolDtype
 from .types import MappingToolDtype
 from .types import NullableToolDtype
@@ -159,7 +159,7 @@ class ToolReflector:
 
     #
 
-    def _prepare_desc(self, s: CanContent) -> CanContent:
+    def _prepare_desc(self, s: Content | None) -> Content | None:
         if s is None:
             return None
         if not self._raw_descs and isinstance(s, str):
@@ -240,7 +240,7 @@ class ToolReflector:
                 ds_p = ds_p_dct.get(pn)
                 sig_p = sig_p_dct.get(pn)
 
-                p_desc: CanContent
+                p_desc: Content | None
                 if (p_desc := ovr_p.get('desc')) is None:
                     if ds_p is not None:
                         p_desc = ds_p.description

ommlds/minichain/tools/types.py

@@ -6,13 +6,10 @@ from omlish import cached
 from omlish import check
 from omlish import collections as col
 from omlish import dataclasses as dc
-from omlish import dispatch
 from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 
-from ..content.cancontent import CanContent
-from ..content.transforms.base import ContentTransform
 from ..content.types import Content
 
 
@@ -150,7 +147,7 @@ class ToolParam:
 
     _: dc.KW_ONLY
 
-    desc: CanContent = None
+    desc: Content | None = None
 
     type: ToolDtype | None = None
 
@@ -168,12 +165,12 @@ class ToolSpec:
 
     _: dc.KW_ONLY
 
-    desc: CanContent = None
+    desc: Content | None = None
 
     params: ta.Sequence[ToolParam] | None = None
     allow_additional_params: bool | None = None
 
-    returns_desc: CanContent = None
+    returns_desc: Content | None = None
     returns_type: ToolDtype | None = None
 
     @cached.property
@@ -207,11 +204,11 @@ class ToolUseResult(lang.Final):
 ##
 
 
-class _ToolUseContentTransform(ContentTransform, lang.Final, lang.NotInstantiable):
-    @dispatch.install_method(ContentTransform.apply)
-    def apply_tool_use(self, tu: ToolUse) -> ToolUse:
-        return tu  # TODO: args are Content
-
-    @dispatch.install_method(ContentTransform.apply)
-    def apply_tool_use_result(self, tur: ToolUseResult) -> ToolUseResult:
-        return dc.replace(tur, c=self.apply(tur.c))  # noqa
+# class _ToolUseContentTransform(ContentTransform, lang.Final, lang.NotInstantiable):
+#     @dispatch.install_method(ContentTransform.apply)
+#     def apply_tool_use(self, tu: ToolUse) -> ToolUse:
+#         return tu  # TODO: args are Content
+#
+#     @dispatch.install_method(ContentTransform.apply)
+#     def apply_tool_use_result(self, tur: ToolUseResult) -> ToolUseResult:
+#         return dc.replace(tur, c=self.apply(tur.c))  # noqa

{ommlds-0.0.0.dev495.dist-info → ommlds-0.0.0.dev496.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev495
+Version: 0.0.0.dev496
 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.dev495
+Requires-Dist: omlish==0.0.0.dev496
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev495; extra == "all"
+Requires-Dist: omdev==0.0.0.dev496; 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.dev495; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev496; 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.dev495.dist-info → ommlds-0.0.0.dev496.dist-info}/RECORD

@@ -109,12 +109,12 @@ ommlds/cli/secrets.py,sha256=8GHlewS3yeFDfFNekaYwRm4nG9l3nd-Mc8tKl9Ma_Uo,469
 ommlds/cli/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/backends/catalog.py,sha256=snQSdUyFiNJhvzVRShBqqp1bZpZlmoKvonypNMZz3HI,3002
 ommlds/cli/backends/configs.py,sha256=RvNWxsJDSsHc0eWA6hI1_3n__HU7rXAUmzS06ykMPh0,137
-ommlds/cli/backends/inject.py,sha256=xqf6wU6J5aWJJlFa3S2zxvcxocVJTqZLfjBRw0jArw4,4068
+ommlds/cli/backends/inject.py,sha256=NBXfTNZiRD476FUn9TgzbaCTkm2RoOYSl97CoMLRYWE,3997
 ommlds/cli/backends/injection.py,sha256=aCscVcq0_gobzNgLEflGInFC9b_dtnuQgLZ0wX_iTWg,325
 ommlds/cli/backends/meta.py,sha256=wq10RYcUElF3Yudhky7bwte3EGk2ARk2odmRzDJQA_M,997
 ommlds/cli/backends/types.py,sha256=sut62bGJ3baDbQs3-AwnOwJrvw0VTysqQw8f3yJww8w,966
 ommlds/cli/content/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/content/messages.py,sha256=njaZyEOglagkcmmB7TtoPoATIx5zgr5f6ijPQwMsfSA,937
+ommlds/cli/content/messages.py,sha256=4qW8ac2umJxnehNI0eS0sqVWlzjv8BDDg4WBOOx-pkM,925
 ommlds/cli/content/strings.py,sha256=pSzQQFYP-RYlpVuVs8HXk_fGlOo-1IT1yAS8umidrzw,1053
 ommlds/cli/inputs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/inputs/asyncs.py,sha256=V7f68qvYD_VFQPUXJPrytL-eqiC3rbUaaijAAjJrFRU,686
@@ -184,7 +184,7 @@ ommlds/cli/sessions/chat/drivers/tools/weather/inject.py,sha256=HSB6gCp23T2HME07
 ommlds/cli/sessions/chat/drivers/tools/weather/tools.py,sha256=tGkr97D-60Lgsnjs1nSqV5BEZrTNlcaU_TFCY4ZRQyE,304
 ommlds/cli/sessions/chat/drivers/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/drivers/user/configs.py,sha256=tBSP2j1Bynn0Qt_S0GNUuNniMWivVSCFad3H4UCS3qY,280
-ommlds/cli/sessions/chat/drivers/user/inject.py,sha256=eV6kcrxC-XR_rHLWsvIanxq5mMWvvwqhbF3O-REDdxM,1408
+ommlds/cli/sessions/chat/drivers/user/inject.py,sha256=07l_ihIdFFnyG3IYq9LJZL9neTNgpFzf7Mf5nilWekI,1465
 ommlds/cli/sessions/chat/facades/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/facades/configs.py,sha256=883rajnBaJITfYSEhcZ405VMvoCO9a0gELjuj01Qg_Q,199
 ommlds/cli/sessions/chat/facades/facade.py,sha256=3O8IdcuPquCA8fKMjmaj3p0P-OpNAgNRMs5tyMfqcM8,614
@@ -208,7 +208,6 @@ ommlds/cli/sessions/chat/interfaces/bare/inject.py,sha256=GzeCBcwppVAUlXG61vSQZU
 ommlds/cli/sessions/chat/interfaces/bare/interactive.py,sha256=ZnYoePvXtUbhkDQ0jM5gldk-bBrFH_V5oc8O1fuiYcI,1229
 ommlds/cli/sessions/chat/interfaces/bare/oneshot.py,sha256=b758OIa0gf9I_0UdxYJ6re-g8-8xndgr3R0OotUOsmc,387
 ommlds/cli/sessions/chat/interfaces/bare/tools.py,sha256=_UsuoXLIvfpFP_We5DBBlhm6rwB3_cFA3lmFvpG9b-A,824
-ommlds/cli/sessions/chat/interfaces/bare/user.py,sha256=gZgfuQAnU_MH_Awb-Ut6sJE_Di4jvquKOkBT415NmR0,877
 ommlds/cli/sessions/chat/interfaces/textual/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/interfaces/textual/app.py,sha256=Ecn4qawdUId-fGhHUXrhEEDDkIUwzOnyKtlBnCrwf2o,9133
 ommlds/cli/sessions/chat/interfaces/textual/configs.py,sha256=HD8DlWXYJ1M94gr5TIT6oqsFCmOf5Gd6KkSBZUtySew,180
@@ -237,8 +236,8 @@ ommlds/cli/state/storage.py,sha256=Wr8DVuEGUxfFJn0tMWNTVdint6NBDdLKstNWSjx8sKw,3
 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
-ommlds/minichain/__init__.py,sha256=E4MOol7eWSbKgEZXfDaDJSz6Fj5Al7wAYh-42roYxMI,11656
-ommlds/minichain/_dataclasses.py,sha256=MqrzAPmI3L8wfrfluDKg0iLuY7VQXH3uPAPdxxKWy6k,861996
+ommlds/minichain/__init__.py,sha256=wJMDzDh0qQfAMWC61VH8IOT6SIK4nNbG6YGubBuVueo,12311
+ommlds/minichain/_dataclasses.py,sha256=vXkMx3Hip0mp5crdmrgAVwYwDoonwGGn4DJdiobl4wU,913466
 ommlds/minichain/_marshal.py,sha256=n9PGWrHhvAmGIc7KDOYt3IF9Z6G0ncXskyICTp3Ji6k,1923
 ommlds/minichain/_typedvalues.py,sha256=Vl1Edt5khC0e5RPFBPmPCxn0IzrfVd0NHzAjAN2E6Kc,2183
 ommlds/minichain/completion.py,sha256=lQ0LfCIYZsvDqteHhhDIv16D2_gn_xMfEL0ouywE5Yo,1033
@@ -263,12 +262,12 @@ ommlds/minichain/backends/impls/tavily.py,sha256=k67QQF4cL8vMtE5LOXxczNFMGlMeRWV
 ommlds/minichain/backends/impls/anthropic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/anthropic/chat.py,sha256=e4Kcbjvca_yaZsNB_-h335gSCbz4ma1lMUvuR4WzEFE,4874
 ommlds/minichain/backends/impls/anthropic/names.py,sha256=GPPeYt0CcDcDCR8I6BMd7bMjC_Zk_bjnLLpF9ClwXcg,1099
-ommlds/minichain/backends/impls/anthropic/protocol.py,sha256=whPVYuKShKiMCzasHl77sCIiymhzXj8mFZXEyhZvld8,3292
+ommlds/minichain/backends/impls/anthropic/protocol.py,sha256=eMqkl7ML5btqJ27_9l6RY2zdTMsQe0k3Kn_keNq0-Mk,3337
 ommlds/minichain/backends/impls/anthropic/stream.py,sha256=jxKzytoYJLK9JftihGhWTcFIoXFgouQR7Yu5Q1j_ku8,8794
 ommlds/minichain/backends/impls/cerebras/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/cerebras/chat.py,sha256=FbwXrOMbHIIzO8gLZsyI3faYJYFYWPcxZTMxcpIaB4Y,2858
 ommlds/minichain/backends/impls/cerebras/names.py,sha256=NcJF7Py3y8EiQUJ5gL3KV2l25rpsi4Hc3_bwHv7lncQ,574
-ommlds/minichain/backends/impls/cerebras/protocol.py,sha256=nceKmwpwU9HCEVStPqrIa55pi86RiPokrsAs5r034lM,5221
+ommlds/minichain/backends/impls/cerebras/protocol.py,sha256=9ldK0_XM7il0JX3jjcLL8svBiRANrgY65V1Dq4ANevw,5268
 ommlds/minichain/backends/impls/cerebras/stream.py,sha256=gMGlP_QNQ9h8qGZSoFwEZ-mpND7_hx86y3smrsLrUX8,5150
 ommlds/minichain/backends/impls/duckduckgo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/duckduckgo/search.py,sha256=HA5UriBVvNw6-6vmeYJsm83LxsFsksLtzFxj-kdzoPE,1010
@@ -279,11 +278,11 @@ ommlds/minichain/backends/impls/google/chat.py,sha256=lGb5blGLlcBlt9xeDZJvbh5SlV
 ommlds/minichain/backends/impls/google/names.py,sha256=HxHJ31HeKZg6aW1C_Anqp-gamCXpq9pOdKj8_yVgE8Y,871
 ommlds/minichain/backends/impls/google/search.py,sha256=y5_6seSRU8CFnLA_Ja8XEMbIBWSgwBzE1iBf-qyz0tA,3427
 ommlds/minichain/backends/impls/google/stream.py,sha256=AT8qbP0EqJUnf-D45aTbEQ0h5lvgtIK6XKki0t8RkZE,8029
-ommlds/minichain/backends/impls/google/tools.py,sha256=Tty0gsyx7-PbeoNqMuql_ewQ6q-ZsDaDdsD5ShinGVY,5089
+ommlds/minichain/backends/impls/google/tools.py,sha256=bP4bqHt1oZTvrcObkjQCNAUJEXrR9fFIRuvjsVFM910,5109
 ommlds/minichain/backends/impls/groq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/groq/chat.py,sha256=XXJznM6h2fBBtrY8MggMUNJf8thyFTM3p1XzFImwkAk,2743
 ommlds/minichain/backends/impls/groq/names.py,sha256=RnvBSytxPF1a9Bj_OPVELuD1nAKJnJrG3ZwJfYo6Szs,1075
-ommlds/minichain/backends/impls/groq/protocol.py,sha256=FPydA4ftMhXFLEfYjmHsmNdBoM4gcEthvqmeX5yB3pc,5214
+ommlds/minichain/backends/impls/groq/protocol.py,sha256=QNvqcfR9FbAIJv1fVerayws5gYU1am3oLFXmYMnQdX4,5261
 ommlds/minichain/backends/impls/groq/stream.py,sha256=5PZHrs_QNyKofJClKq5R5aOsq-H26UeWH7uncbJGrmI,5124
 ommlds/minichain/backends/impls/huggingface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/huggingface/configs.py,sha256=6jsBtPNXOP57PcpxNTVLGWLc-18Iwn_lDbGouwCJTIQ,258
@@ -297,12 +296,12 @@ ommlds/minichain/backends/impls/mlx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 ommlds/minichain/backends/impls/mlx/chat.py,sha256=tmZZAmVg-XcbxZYGNHrKC0hiJbxW88pgEHqIEC5D2Xc,7536
 ommlds/minichain/backends/impls/ollama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/ollama/chat.py,sha256=vCf_Pw9_4D-gNFD7OrIbWnEOqJE_Vxb_mxiZ0NgCP4c,6816
-ommlds/minichain/backends/impls/ollama/protocol.py,sha256=1G5B1dtLdfOQVI32fSgzMaqN0iPv_WZkn1p6KKVgUNM,4749
+ommlds/minichain/backends/impls/ollama/protocol.py,sha256=zB0Q6PChiRlskDhjvpXIb3pSeLcH1wFg5QUqfo20R-s,4796
 ommlds/minichain/backends/impls/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/openai/chat.py,sha256=G1IK94PwB16rYCkRos9JEuiAu1GgCK4CnZFOIShhpig,2856
 ommlds/minichain/backends/impls/openai/completion.py,sha256=4Mi4Zvrq5fCqUd0asL3WiCbCdmxOdo0NFkoZMfdsYXY,1939
 ommlds/minichain/backends/impls/openai/embedding.py,sha256=BNtvKYLTsnQwQR9Tv3Fr8zCYN1kr1UNdJ15lcsjz6X0,1765
-ommlds/minichain/backends/impls/openai/format.py,sha256=dAvaqi3LhPu7N9S8BDBkuGSWdD_cxkBEIXPLChcGWdk,7414
+ommlds/minichain/backends/impls/openai/format.py,sha256=wIAwgvCkzEP2HdTUMeaZqJhEV2UJddS462WpvK0oduU,7457
 ommlds/minichain/backends/impls/openai/names.py,sha256=M1spn4Yio6LEnKWEzPqXSrzJg3wsf2M1iZIYFAvxb80,1550
 ommlds/minichain/backends/impls/openai/stream.py,sha256=bsZeGUepqOl9AcN44kWk03V6q-v1ewBCfZqb_MJEfxg,5454
 ommlds/minichain/backends/impls/sentencepiece/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -323,10 +322,10 @@ ommlds/minichain/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 ommlds/minichain/chat/_marshal.py,sha256=M3p093nxzxITbznc--P-tyCXuWDHrq4JFKTZAx6XWdk,740
 ommlds/minichain/chat/formats.py,sha256=LmlU7iu8PMJuroFTmyWfP4tXvLjj5VNxdAp1Us9MSAA,562
 ommlds/minichain/chat/history.py,sha256=GI10mTCr8yv0mxJRK-YVtYqOuUjBvX5Su5FYYmLpPxU,1566
-ommlds/minichain/chat/messages.py,sha256=fAMbuwFv_rwuJSaYaGBN_B7jXeyZUSKek7gaPa8eYhQ,3577
+ommlds/minichain/chat/messages.py,sha256=zTIMLvZM33_sFmRbl3ohEAy3jTgPGAIa1Fjg-_0Bi2w,3480
 ommlds/minichain/chat/metadata.py,sha256=V8EUqUsiAITtIae8SC_4YyyBBvciG34jRuSylql4AvU,248
 ommlds/minichain/chat/services.py,sha256=HzP35CLOz-vCptUUpuehI5yNJorTtY64gwrb6ZWNfwI,919
-ommlds/minichain/chat/templating.py,sha256=pUgYC6N9-IGr3TXWt-uN5pTQ5XVt5S0--xA2_7u-37E,3148
+ommlds/minichain/chat/templating.py,sha256=3P46me6H_cY-hTqVW4jK7lFAbuUuwpsZX9QOYg5QB6s,3147
 ommlds/minichain/chat/types.py,sha256=tHYR1jRGEStNbcDebMrEuHQBNpYh8id2MS0-1Fzxwgs,430
 ommlds/minichain/chat/choices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/chat/choices/adapters.py,sha256=Keroaj0B5YEYPF3k0fOQK6JUZnM1XVFThGB5Uv689Sc,629
@@ -351,27 +350,32 @@ ommlds/minichain/chat/transforms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 ommlds/minichain/chat/transforms/base.py,sha256=V22SasLdnzvmSO7C19gigi8LKeWVtBHmhaSJbkj6b4Y,2923
 ommlds/minichain/chat/transforms/metadata.py,sha256=Gw1cUIk2cVzHMyFPwboY_HWEuV_Ts3R4AVmOuyH120A,1563
 ommlds/minichain/chat/transforms/services.py,sha256=wJw2eu-TU1sVXUYvg7rc7QNn93cCXhtEI_q-KZ5Dz0I,1016
-ommlds/minichain/content/__init__.py,sha256=nHXG5a6KSoM9xqlvA4jfwVNbCtqV88bg7298PmmNJKA,384
-ommlds/minichain/content/_marshal.py,sha256=_ND3TPg5DscnK8BuZNunAhLrmYLShGB-6KRGqH0oe2E,6122
-ommlds/minichain/content/cancontent.py,sha256=AlHvdCZqIqMe7sElTp3cHsDAZsk9muotdNaodszn6AE,549
-ommlds/minichain/content/images.py,sha256=d69MgAQm9DaslJJIqRJNY3f75t_Ti5aqkGG1Ypi5Iew,426
-ommlds/minichain/content/json.py,sha256=g4QjFLYJQUE38u5nd1QzNgruwl06efyaBjiq5ehftd0,250
-ommlds/minichain/content/materialize.py,sha256=9APT8cjkpd30g7e29Cj-PFThARnUPno2VaEXNQFGcWY,4880
+ommlds/minichain/content/__init__.py,sha256=dQGwU7lJ2i1Khhm7vu-bgCXA-SSzZGbRSnED0YbJSSA,503
+ommlds/minichain/content/_marshal.py,sha256=72XnBsUaYDsmjnYMNEeaU0g7LxMCpa4FU9qG9WbEvHY,9195
+ommlds/minichain/content/code.py,sha256=lw-jc-U-op6lIdbzu9wz3HZpPKm6jx3RQvwLoGFpr1o,285
+ommlds/minichain/content/dynamic.py,sha256=vXOdc7roBoL7C9DXPo9K4KZFeehJAH-Woq_YN3v13wU,197
+ommlds/minichain/content/images.py,sha256=9q53vOsb2miAT_8xT-7G1DgrruELySzNXiLgT0VoabI,448
+ommlds/minichain/content/json.py,sha256=OYwS_bW1RVyaenpetc_k-SXgGHxx9KJOxNzA_Xy9sv0,272
 ommlds/minichain/content/metadata.py,sha256=FcWW8YbtDEz5rmucvfqjMTC4aA6rO2WQJtP0lX_DShs,248
-ommlds/minichain/content/namespaces.py,sha256=KkIrwQZ_9bojw5ytkNX8-5FI4ZdCEAEnMAUElx6p51Y,95
-ommlds/minichain/content/placeholders.py,sha256=NMl2m5yVVv9fnNinyXP_UKoa7ZDUIArZqwbbj5f96yI,526
-ommlds/minichain/content/prepare.py,sha256=ZVXmFg2f0UULwrTjb5VjZygpird9Qox6JsI1QWcQHgw,1903
-ommlds/minichain/content/sequence.py,sha256=DkU0iRlxGchPa77-V7HZfzTXmLTaFqGIFBcjV2p3fmo,580
-ommlds/minichain/content/simple.py,sha256=8Psf7n50Z9uMVhxWesQVveHSFX78EKdPEGG5Wm3LDP8,1199
-ommlds/minichain/content/tag.py,sha256=VoLW3Yl66KpBaueyFRwtodXvWdbzHjtuGMXN6o8CcTI,379
-ommlds/minichain/content/text.py,sha256=kcadL2Ojq7AwNdT_vMk5EhOC3mZpFTFpKbMjdkfUoos,215
-ommlds/minichain/content/types.py,sha256=fJhf55HNJP-tTKf_yd_n_4XFBmJkoNF912NU0-QyQDU,575
-ommlds/minichain/content/transforms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/content/transforms/base.py,sha256=omdEId9FZbeCk8Aak-oMJpMiY4vK4nrQWAbhzmsHZkc,1054
-ommlds/minichain/content/transforms/interleave.py,sha256=sQRXk9M7g9iF4weJf71oD_kgJsCbg9clA0EIZgexhSc,2478
-ommlds/minichain/content/transforms/squeeze.py,sha256=Bf9lKjR3pRQBT0BabH8YRRlR31KO8tpHQX_mzWsxT3U,1672
-ommlds/minichain/content/transforms/stringify.py,sha256=-DhAkRQeRzh-ULQFP25HipyKdrR1lKooGEyw6BwEg-w,1237
-ommlds/minichain/content/transforms/strings.py,sha256=-uEZ8dXnl_5dNfkwedBeUGzCiAWJn-B4DGMeM0hX3dA,466
+ommlds/minichain/content/namespaces.py,sha256=nr9KdKiL1DJyZF059QJGa7NJanAMBgwP5bo7ffnSles,325
+ommlds/minichain/content/placeholders.py,sha256=CsGTYAPPu1COKLss5jzLpn0qeoN56yBpLJs3qr6f0F4,416
+ommlds/minichain/content/quote.py,sha256=Cn03AYZEaK_wGZgPgdi1S9ffwJSCB8x8OZ4y_ZtZZVY,257
+ommlds/minichain/content/raw.py,sha256=evB4Vv7Tk42tQrVf5-f78wdjeXEqwcdWEz0pt7z58WQ,676
+ommlds/minichain/content/section.py,sha256=iYtNUYl5tV7qfyD1a2rxtAPn3VKCQ_zYqsJa95Su7J8,246
+ommlds/minichain/content/sequence.py,sha256=cuTzM48Dgdn2wyfIPcN9-kL7jHM1sn0WHabeAokZ4Jw,649
+ommlds/minichain/content/standard.py,sha256=uKECecSSiOVnNYXuVWPkAMkYa0-uLXRW2vumwDMOn50,995
+ommlds/minichain/content/tag.py,sha256=1uA9kctmjYd-ftgSmVkOAebydKAj0EdgduvZP7erYaQ,358
+ommlds/minichain/content/templates.py,sha256=S09GAjBX_qeRTIgtd7lXs4EFzM-ujsbEbJbsnuj9wO0,290
+ommlds/minichain/content/text.py,sha256=BcptL8PETJc1f7bBLHf51949E_UOhzAn1MzvanjJEgg,237
+ommlds/minichain/content/types.py,sha256=wgZRE164BkJAkRi3tcwEZGvSfw_15MIRy5mxah-v5gQ,361
+ommlds/minichain/content/transform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/minichain/content/transform/base.py,sha256=6w2Uk-DpYyL0_I-jZ-qCz6Trw_R-wJTeE61T_bMxDQ0,1829
+ommlds/minichain/content/transform/interleave.py,sha256=M3FkEyFBR6N51wBltrpoNGDyI6Cpj0sTUUiho73fD8c,2308
+ommlds/minichain/content/transform/materialize.py,sha256=0MTzUmbJnTlvMoBXwBGjeHqGUNACZicUzjrapASKvWU,3078
+ommlds/minichain/content/transform/prepare.py,sha256=Olh2cBckcq438h0NL2kGymrQLLNUO1cBVK3W7o2d07k,1818
+ommlds/minichain/content/transform/squeeze.py,sha256=8TL2G0-pFxVk63IVhbGbFVoeuYkKQMunBQfgNRNFTEE,1415
+ommlds/minichain/content/transform/stringify.py,sha256=PwA4T7qBUBDfSfuV6UXibBSDC5NwbgZt-A2rkXDx0Ts,1063
+ommlds/minichain/content/transform/strings.py,sha256=-uEZ8dXnl_5dNfkwedBeUGzCiAWJn-B4DGMeM0hX3dA,466
 ommlds/minichain/docs/__init__.py,sha256=vNpT6sA5YDalFqsCFn0DjUvarxRtRl3w2V9liEU0CQk,364
 ommlds/minichain/docs/docs.py,sha256=Ex7hiqaiYDB9hQhUjuzot8MFktl3LIGG41YBFaNoC80,1340
 ommlds/minichain/docs/dtypes.py,sha256=BRZmLK9NfQwITBYmDOmRPDlFg1RP5BYWT0Xw04AinF8,499
@@ -398,7 +402,7 @@ ommlds/minichain/lib/todo/context.py,sha256=ne3kUvP2QRd9hCE9KbJIGI-ugA6fOKoqcK4V
 ommlds/minichain/lib/todo/types.py,sha256=oypIB9tIbMeZBk5MAl0uETqxJFsZ7hRrVOandLnS82I,1592
 ommlds/minichain/lib/todo/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/lib/todo/tools/read.py,sha256=7P8ohR-t9y9f_iF-kr0JA36ti0LhJCeBpMsnXeXwHoU,1501
-ommlds/minichain/lib/todo/tools/write.py,sha256=TGO-zuF62j61pB8tFxd9wdtMHrYuVvnwnjinMOOGabk,14734
+ommlds/minichain/lib/todo/tools/write.py,sha256=AVLW9iEHrukFoPILDchb7qvJUP-CbEuUM9-GNFqXVyU,14804
 ommlds/minichain/llms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/llms/_marshal.py,sha256=YR7n2GVhS9I2rDvKe-VqzS-u1WbLcJT9DgFBO6oZ9fo,1518
 ommlds/minichain/llms/tokens.py,sha256=RPrAzf4Qx9xNPGj7_EkzcVOR9qIGkhQg8AM6qhr7gfw,292
@@ -444,14 +448,14 @@ ommlds/minichain/tokens/vocabs.py,sha256=-4WSCbeeoELLiAaRSzbi-z6Cv-hyTRK1T9HMm_i
 ommlds/minichain/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/tools/_marshal.py,sha256=9np2tuzGfRwL5BMCd6QYChzimtTBUfHxT4IoEA6v3Eg,410
 ommlds/minichain/tools/fns.py,sha256=UVgj9f0vnjFzP5uP4zpN4slOA5nEOD8Ob1aJwKrSggA,3930
-ommlds/minichain/tools/jsonschema.py,sha256=20i3Yrw91nzgYRcZfVfrDjtFEpGD1Gc_5iiFhq1KV8w,4233
-ommlds/minichain/tools/reflect.py,sha256=-fZE68XeUvDR7WTEKuMk3zurUFZ_undNH0b6aBtvesQ,8693
-ommlds/minichain/tools/types.py,sha256=_6LVw_iW7vcn6or29_vuBRYGdYM0FRsYgGmQRjwbYuY,4867
+ommlds/minichain/tools/jsonschema.py,sha256=gipEyit6OmVAa02Azhk8xbFHlolWXd0Jp5x_fvAzdHg,4253
+ommlds/minichain/tools/reflect.py,sha256=TdE9qyiRqKisf4VST9Cng-I_lsSNdSxSXJ1g1TOyXHE,8697
+ommlds/minichain/tools/types.py,sha256=_8G7ZeHwF8buSTvl30bz0n3Pc0LX57G4F9YQViZaGGg,4767
 ommlds/minichain/tools/execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/tools/execution/catalog.py,sha256=sBde49FSClTreX8KO5pZ2-EE1NyTZOoagNdowN3n5pE,2002
 ommlds/minichain/tools/execution/context.py,sha256=Gdl1UNjzLQTeIc7m2BlNyLtNsdqCookQv12_WwDDkAI,1872
-ommlds/minichain/tools/execution/errorhandling.py,sha256=WLsr--DxMNkOfQinc6-Pn9XmHJfyH5AoXfy0U9KyZbE,930
-ommlds/minichain/tools/execution/errors.py,sha256=MEBdGERB3OO3fCjYa7dF2f7NnIo98gxYa3PUY4sKv-k,250
+ommlds/minichain/tools/execution/errorhandling.py,sha256=6ZymDv9BmYpS9ERt7OD_h5mLcaHNtHaLjL3vRsyWhEk,934
+ommlds/minichain/tools/execution/errors.py,sha256=rom0RTc2GUy1TbuJeA-aMagp_TMTIw33kH-1MMzOX2s,239
 ommlds/minichain/tools/execution/executors.py,sha256=cyx7JKKQfuqSVujNLXSo0qtXSkCDJ_plddvitmDUxeQ,1365
 ommlds/minichain/tools/execution/reflect.py,sha256=Oklzx5jlMyNj6ivecEQfP6Zt_ICxc-nk-x9xSsxswlg,1817
 ommlds/minichain/vectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -493,9 +497,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=sNJNkZ9rT8B-kJMO6bRz8J1USy4fyPx0m2PwTX7vxYY,3846
-ommlds-0.0.0.dev495.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev495.dist-info/METADATA,sha256=cG4wdKEIMrlxFByBKtdbI5zNlvrI_fS7Gy5pM1EF3K0,3495
-ommlds-0.0.0.dev495.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev495.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev495.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev495.dist-info/RECORD,,
+ommlds-0.0.0.dev496.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev496.dist-info/METADATA,sha256=Dd3WP3Uj6LhCcjwlsgJVmp13K6J7Q5j59328QOLpg80,3495
+ommlds-0.0.0.dev496.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev496.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev496.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev496.dist-info/RECORD,,

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

@@ -1,31 +0,0 @@
-import typing as ta
-
-from ...... import minichain as mc
-from .....inputs.asyncs import AsyncStringInput
-from .....inputs.asyncs import SyncAsyncStringInput
-from .....inputs.sync import InputSyncStringInput
-from ...drivers.user.types import UserChatInput
-
-
-##
-
-
-class InteractiveUserChatInput(UserChatInput):
-    DEFAULT_STRING_INPUT: ta.ClassVar[AsyncStringInput] = SyncAsyncStringInput(InputSyncStringInput())
-
-    def __init__(
-            self,
-            string_input: AsyncStringInput | None = None,
-    ) -> None:
-        super().__init__()
-
-        if string_input is None:
-            string_input = self.DEFAULT_STRING_INPUT
-        self._string_input = string_input
-
-    async def get_next_user_messages(self) -> 'mc.UserChat':
-        try:
-            s = await self._string_input()
-        except EOFError:
-            return []
-        return [mc.UserMessage(s)]

ommlds/minichain/content/cancontent.py

@@ -1,32 +0,0 @@
-import typing as ta
-
-from omlish.text import templating as tpl
-
-from .namespaces import ContentNamespace
-from .placeholders import ContentPlaceholder
-from .placeholders import ContentPlaceholderMarker
-from .types import ExtendedContent
-
-
-##
-
-
-_InnerCanContent: ta.TypeAlias = ta.Union[  # noqa
-    str,
-    ExtendedContent,
-
-    ContentPlaceholder,
-    type[ContentPlaceholderMarker],
-
-    type[ContentNamespace],
-
-    tpl.Templater,
-]
-
-CanContent: ta.TypeAlias = ta.Union[  # noqa
-    ta.Iterable['CanContent'],
-
-    None,
-
-    _InnerCanContent,
-]

ommlds/minichain/content/materialize.py

@@ -1,173 +0,0 @@
-"""
-TODO:
- - ExtendedCanContent
-"""
-import typing as ta
-
-from omlish import check
-from omlish import dataclasses as dc
-from omlish import dispatch
-from omlish.text import templating as tpl
-
-from .cancontent import CanContent
-from .namespaces import ContentNamespace
-from .placeholders import ContentPlaceholder
-from .placeholders import ContentPlaceholderMarker
-from .types import Content
-from .types import ExtendedContent
-
-
-##
-
-
-ContentPlaceholderKey: ta.TypeAlias = ContentPlaceholder | type[ContentPlaceholderMarker]
-ContentPlaceholderMap: ta.TypeAlias = ta.Mapping[ContentPlaceholderKey, CanContent]
-ContentPlaceholderFn: ta.TypeAlias = ta.Callable[[ContentPlaceholderKey], CanContent]
-ContentPlaceholders: ta.TypeAlias = ContentPlaceholderMap | ContentPlaceholderFn
-
-
-@dc.dataclass()
-class ContentPlaceholderMissingError(Exception):
-    key: ContentPlaceholderKey
-
-
-def _make_content_placeholder_fn(cps: ContentPlaceholders | None = None) -> ContentPlaceholderFn:
-    if cps is None:
-        def none_fn(cpk: ContentPlaceholderKey) -> CanContent:
-            raise ContentPlaceholderMissingError(cpk)
-
-        return none_fn
-
-    elif isinstance(cps, ta.Mapping):
-        def mapping_fn(cpk: ContentPlaceholderKey) -> CanContent:
-            try:
-                return cps[cpk]
-            except KeyError:
-                raise ContentPlaceholderMissingError(cpk) from None
-
-        return mapping_fn
-
-    elif callable(cps):
-        return cps
-
-    else:
-        raise TypeError(cps)
-
-
-##
-
-
-class ContentDepthExceededError(Exception):
-    pass
-
-
-class ContentMaterializer:
-    DEFAULT_MAX_DEPTH: int = 100
-
-    def __init__(
-            self,
-            *,
-            content_placeholders: ContentPlaceholders | None = None,
-            templater_context: tpl.Templater.Context | None = None,
-            max_depth: int = DEFAULT_MAX_DEPTH,
-    ) -> None:
-        super().__init__()
-
-        self._templater_context = templater_context
-        self._content_placeholders_fn = _make_content_placeholder_fn(content_placeholders)
-        self._max_depth = max_depth
-
-        self._cur_depth = 0
-
-    def materialize(self, o: CanContent) -> Content:
-        if self._cur_depth >= self._max_depth:
-            raise ContentDepthExceededError
-
-        self._cur_depth += 1
-        try:
-            return self._materialize(o)
-        finally:
-            self._cur_depth -= 1
-
-    @dispatch.method()
-    def _materialize(self, o: CanContent) -> Content:
-        raise TypeError(o)
-
-    #
-
-    @_materialize.register
-    def _materialize_str(self, o: str) -> Content:
-        return o
-
-    @_materialize.register
-    def _materialize_extended_content(self, o: ExtendedContent) -> Content:
-        return o
-
-    #
-
-    @_materialize.register
-    def _materialize_iterable(self, o: ta.Iterable) -> Content:
-        # `collections.abc.Iterable` appears as a virtual base in the dispatch c3.mro for ContentNamespace before `type`
-        # does (due to NamespaceMeta having `__iter__`), so handle that here too.
-        if isinstance(o, type) and issubclass(o, ContentNamespace):
-            return self._materialize_namespace_type(o)
-
-        else:
-            return [self.materialize(e) for e in o]
-
-    @_materialize.register
-    def _materialize_none(self, o: None) -> Content:
-        return []
-
-    #
-
-    @_materialize.register
-    def _materialize_placeholder(self, o: ContentPlaceholder) -> Content:
-        return self.materialize(self._content_placeholders_fn(o))
-
-    def _materialize_placeholder_marker_type(self, o: type[ContentPlaceholderMarker]) -> Content:
-        check.issubclass(o, ContentPlaceholderMarker)
-        return self.materialize(self._content_placeholders_fn(o))
-
-    #
-
-    def _materialize_namespace_type(self, o: type[ContentNamespace]) -> Content:
-        check.issubclass(o, ContentNamespace)
-
-        out: list[Content] = []
-        for n, e in o:
-            if n.startswith('_'):
-                continue
-            out.append(self.materialize(e))
-        return out
-
-    #
-
-    @_materialize.register
-    def _materialize_type(self, o: type) -> Content:
-        if issubclass(o, ContentPlaceholderMarker):
-            return self._materialize_placeholder_marker_type(o)
-
-        elif issubclass(o, ContentNamespace):
-            return self._materialize_namespace_type(o)
-
-        else:
-            raise TypeError(o)
-
-    #
-
-    @_materialize.register
-    def _materialize_templater(self, o: tpl.Templater) -> Content:
-        return o.render(check.not_none(self._templater_context))
-
-
-def materialize_content(
-        o: CanContent,
-        *,
-        content_placeholders: ContentPlaceholders | None = None,
-        templater_context: tpl.Templater.Context | None = None,
-) -> Content:
-    return ContentMaterializer(
-        content_placeholders=content_placeholders,
-        templater_context=templater_context,
-    ).materialize(o)

ommlds/minichain/content/transforms/base.py

@@ -1,46 +0,0 @@
-import collections.abc
-import typing as ta
-
-from omlish import dataclasses as dc
-from omlish import dispatch
-from omlish import lang
-
-from ..images import ImageContent
-from ..sequence import SequenceContent
-from ..text import TextContent
-
-
-T = ta.TypeVar('T')
-
-
-##
-
-
-class ContentTransform(lang.Abstract):
-    @dispatch.method(installable=True)
-    def apply(self, o: T) -> T:
-        raise TypeError(o)
-
-    #
-
-    @apply.register  # noqa
-    def apply_str(self, s: str) -> str:
-        return s
-
-    @apply.register  # noqa
-    def apply_sequence(self, l: collections.abc.Sequence[T]) -> collections.abc.Sequence[T]:
-        return [self.apply(e) for e in l]
-
-    #
-
-    @apply.register
-    def apply_image_content(self, c: ImageContent) -> ImageContent:
-        return c
-
-    @apply.register
-    def apply_sequence_content(self, c: SequenceContent) -> SequenceContent:
-        return dc.replace(c, l=self.apply(c.l))
-
-    @apply.register
-    def apply_text_content(self, c: TextContent) -> TextContent:
-        return dc.replace(c, s=self.apply(c.s))