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

ommlds/minichain/wrappers/retry.py

@@ -1,19 +1,25 @@
 """
 TODO:
  - tenacity shit
-  - exception filter
+  - exception filter - retryable vs not
+   - explicit RetryableError wrapper?
   - sleep
    - jitter
+ - log, on retry / on except callbacks, blah blah
  - stream retry:
   - failed to open
   - failed during stream
    - buffer and replay??
   - accept death mid-stream?
+  - ** probably **: cannot sanely impose any nontrivial stream retry strat at this layer -
 """
 import typing as ta
 
 from omlish import dataclasses as dc
 
+from ..resources import Resources
+from ..stream.services import StreamResponseSink
+from ..stream.services import new_stream_response
 from ..types import Output
 from .services import WrappedOptionT
 from .services import WrappedOutputT
@@ -38,7 +44,7 @@ AnyRetryService: ta.TypeAlias = ta.Union[
 ##
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass()
 class RetryServiceMaxRetriesExceededError(Exception):
     pass
 
@@ -127,7 +133,32 @@ class RetryStreamService(
 
         while True:
             try:
-                resp = await self._service.invoke(request)
+                async with Resources.new() as rs:
+                    in_resp = await self._service.invoke(request)
+                    in_vs = await rs.enter_async_context(in_resp.v)
+
+                    async def inner(sink: StreamResponseSink[WrappedResponseV]) -> ta.Sequence[WrappedOutputT] | None:
+                        async for v in in_vs:
+                            await sink.emit(v)
+
+                        return in_vs.outputs
+
+                    outs = [
+                        *in_resp.outputs,
+                        RetryServiceOutput(
+                            retry_service=self,
+                            num_retries=n,
+                        ),
+                    ]
+
+                    # FIXME: ??
+                    # if (ur := tv.as_collection(request.options).get(UseResources)) is not None:
+
+                    return await new_stream_response(
+                        rs,
+                        inner,
+                        outs,
+                    )
 
             except Exception as e:  # noqa
                 if n < self._max_retries:
@@ -135,13 +166,3 @@ class RetryStreamService(
                     continue
 
                 raise RetryServiceMaxRetriesExceededError from e
-
-            # FIXME: lol no:
-            #  - async def inner(sink: StreamResponseSink[...]) -> ta.Sequence[...Outputs] | None:
-            #   - async with resp.v as st_resp:
-            return resp.with_outputs(RetryServiceOutput(
-                retry_service=self,
-                num_retries=n,
-            ))
-
-        raise RuntimeError  # unreachable

{ommlds-0.0.0.dev502.dist-info → ommlds-0.0.0.dev504.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=s6qy0XrbNb0iojn6OOLp-nuuELfpYGwX_SB9GFyShqU,28066
+ommlds/.omlish-manifests.json,sha256=8fbwe2p3vu-qOXuBIKtwadocgl-rNP6H42qRRR_j9mY,28359
 ommlds/README.md,sha256=xhbl2n19GznXrIzAGdlX8PAYJYsOo_Zu63I7G1UFRZE,398
 ommlds/__about__.py,sha256=cdexoZ9J6msGQeIwveAx4JM0WlBDrWdjRkhSI9VHB9Q,1901
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,7 +11,7 @@ ommlds/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/huggingface.py,sha256=JfEyfKOxU3-SY_ojtXBJFNeD-NIuKjvMe3GL3e93wNA,1175
 ommlds/backends/anthropic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/anthropic/protocol/__init__.py,sha256=g05gJKHqrySqtvMBAaZUueRxYafBTGOLw7FfEDiXi34,248
-ommlds/backends/anthropic/protocol/_dataclasses.py,sha256=ZErSw7rjLzRQL0P65ffipzIidCz9_3UhprmRUMPloNI,80697
+ommlds/backends/anthropic/protocol/_dataclasses.py,sha256=LJGB0yaRbdwRgNlMR0nDQrYRk4uv9R7mtRZDcjR91nw,80681
 ommlds/backends/anthropic/protocol/_marshal.py,sha256=RHbwekaw21lTS_1KBX9z6dLpbmWmyYUE5j6Uyq1tn0w,539
 ommlds/backends/anthropic/protocol/types.py,sha256=f-_VXg_-KlhGIKp0R8vL50Rg_ZxqiBvQUGexQaDf8HY,2761
 ommlds/backends/anthropic/protocol/sse/__init__.py,sha256=LpijqXk0ceMDcgwOvZ8iLoh0I328JSfG8V0JalcZD3I,98
@@ -19,16 +19,16 @@ ommlds/backends/anthropic/protocol/sse/_marshal.py,sha256=2No-qWRKV9ilOhC5NqHAA9
 ommlds/backends/anthropic/protocol/sse/assemble.py,sha256=MVpA0iSU2LNMXy4VpIVV8Oe7nj3dgmXpfLe-7nnA5QE,6552
 ommlds/backends/anthropic/protocol/sse/events.py,sha256=77xVcT6H22uRIxZcxc0_-79jpnR_ZyVXdRjILxoeS5A,2574
 ommlds/backends/cerebras/__init__.py,sha256=-RtLrdEGN2da1KCf7YNs32jN-kJhT_kNVrcOv4x_J-w,101
-ommlds/backends/cerebras/_dataclasses.py,sha256=Z4NZSwc1mFZqScqRWvv-LK69bsX2XFYkzw9oqk6nKgM,215150
+ommlds/backends/cerebras/_dataclasses.py,sha256=VPR97XO7Qka5_R6GERCgrtNEFuYCaMM5JGfjPcbx0Xw,215108
 ommlds/backends/cerebras/_marshal.py,sha256=KqhIymYaVUJ5-XubSHLDiEagK_jmp-738mbduazlEE8,658
 ommlds/backends/cerebras/protocol.py,sha256=gfOdPgJRg0XsZIMgrZh8yppAB7iuzgSVM8qFv2Spq_I,8848
 ommlds/backends/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/google/protocol/__init__.py,sha256=5fguMBg9qGfTEvEBCgjFbDBfRzaiRdil6d1DakJGvPY,214
-ommlds/backends/google/protocol/_dataclasses.py,sha256=tySVfhYQuufyrsB2-kPBPVFqtu86IjhiED_O3HHcH3o,305060
+ommlds/backends/google/protocol/_dataclasses.py,sha256=KECT4r6gBPVtiEvb1y0kj_HLeH-Y8Rgp_a5CTbd4Q14,304996
 ommlds/backends/google/protocol/_marshal.py,sha256=LWikcdMDrKQ0lMtclNXwK9qamijUBzK62nrEVo2OFtc,305
 ommlds/backends/google/protocol/types.py,sha256=JDft5-5sPuy8sFWTvid4JuC9a9EnuQizt9dyAV2L56s,17536
 ommlds/backends/groq/__init__.py,sha256=-RtLrdEGN2da1KCf7YNs32jN-kJhT_kNVrcOv4x_J-w,101
-ommlds/backends/groq/_dataclasses.py,sha256=4l1oBNjYYqL8Ye_ZQCF0pPszL1NkoNiAM25Any2xmUw,200765
+ommlds/backends/groq/_dataclasses.py,sha256=8XK7IEEJNGqSFib_s3dFf2bMH1TJ1RT-NvGBSXf6sCE,200729
 ommlds/backends/groq/_marshal.py,sha256=3o4CVK9VbP_UnEbXZ4fQJuZK3Sy9xnkXTTempSDSvgE,602
 ommlds/backends/groq/clients.py,sha256=n1zvVPvk5lJ42JMSSU3EFGYUJ9Az-YAOU6DTGNsJ8_M,152
 ommlds/backends/groq/protocol.py,sha256=ieKrjlxcDE5RqWcugc996O5Ksy4Chse_RdigPQPbP2Y,7823
@@ -53,12 +53,12 @@ ommlds/backends/mlx/tokenization/detokenization/bpe.py,sha256=cIw6-r-cyXTfZdyfGR
 ommlds/backends/mlx/tokenization/detokenization/naive.py,sha256=6L-SvphzP1z16cmVB4QC9VraF7khE8ZcvKqIwwFqN6U,1779
 ommlds/backends/mlx/tokenization/detokenization/spm.py,sha256=IYSnEm-C0z_o5TKLJE_Rj6P0nNd-prT6psVPKsERWAE,1751
 ommlds/backends/ollama/__init__.py,sha256=-RtLrdEGN2da1KCf7YNs32jN-kJhT_kNVrcOv4x_J-w,101
-ommlds/backends/ollama/_dataclasses.py,sha256=WRJ1eKO0PDKRGkE6ZciAHbZRtDUVok3fOuat_7msPW0,188008
+ommlds/backends/ollama/_dataclasses.py,sha256=D3Jz0K7BuDMO5BB3XYW7fC-wzXXCDd9hyBCY15zlazQ,187980
 ommlds/backends/ollama/protocol.py,sha256=Zq9MTvE8moUUVqtUcuhmn_DdDELPp9xb1r3dzwxm4MI,4505
 ommlds/backends/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/openai/protocol/__init__.py,sha256=S-p81JfMaS0nwdII9jyhcmj0c5fJJD5sHwphnY45WdI,1862
 ommlds/backends/openai/protocol/_common.py,sha256=r4EXmw1fBFHjU5vbWTDvlM_fsafdIVg3d3PNw4F9m-Q,313
-ommlds/backends/openai/protocol/_dataclasses.py,sha256=I7w3VKjkXqAp2pOCn6jyWL2OLuAj1PbpnyJhp7nICFY,375746
+ommlds/backends/openai/protocol/_dataclasses.py,sha256=2vLfQyErQlOINwviL_4ZzkdmyLTXJgsbY5EAaQQjdPg,375658
 ommlds/backends/openai/protocol/_marshal.py,sha256=V9s7old4lRzabr28kKVMNfa5lkrJ_F1MqYfAEed4cMo,839
 ommlds/backends/openai/protocol/completionusage.py,sha256=hoJ68nUU3IoCl1QVT8tcprQRbAZbgksCdnYrQS8xdPs,944
 ommlds/backends/openai/protocol/chatcompletion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,7 +70,7 @@ ommlds/backends/openai/protocol/chatcompletion/response.py,sha256=_e-uw9fbpudTJs
 ommlds/backends/openai/protocol/chatcompletion/responseformat.py,sha256=UtkyOKlEMVv_OyeLYvL4dROV4ZdqUge7MmuBFQGTn7k,999
 ommlds/backends/openai/protocol/chatcompletion/tokenlogprob.py,sha256=VTj9aI_wqcOArzHFG8W4R8RCIJZ8izpIUosVzAnrhQ8,573
 ommlds/backends/tavily/__init__.py,sha256=-RtLrdEGN2da1KCf7YNs32jN-kJhT_kNVrcOv4x_J-w,101
-ommlds/backends/tavily/_dataclasses.py,sha256=aYPNb9-FegU8IjhQzoJjQwARSAY9-4fQWKorPsCPo-A,90755
+ommlds/backends/tavily/_dataclasses.py,sha256=Vy3vrxYzVhaMww5GRqsWFNcRSC5mNKYLQcGmR2qBpiA,90739
 ommlds/backends/tavily/protocol.py,sha256=8ioCdovoD3dwfsK-B2YSQCh-6CyujaxzUaEUJ8yL1EA,5930
 ommlds/backends/tinygrad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/tinygrad/tinygrad.py,sha256=Va2mI11Q76IN9vLCYozMRXbEDVKxjKvRI0iQXJNJtJI,342
@@ -102,7 +102,7 @@ ommlds/backends/transformers/filecache.py,sha256=ycfswt7f4qRrPSTFRhofXZaDBuDPpyp
 ommlds/backends/transformers/streamers.py,sha256=Hu_9lp_kUilKjOfs7Ixqr2NoA5FuRn2eRh8JdvaBDYc,1688
 ommlds/cli/__init__.py,sha256=-RtLrdEGN2da1KCf7YNs32jN-kJhT_kNVrcOv4x_J-w,101
 ommlds/cli/__main__.py,sha256=1ffCb0fcUOJMzxROJmJRXQ8PSOVYv7KrcuBtT95cf0c,140
-ommlds/cli/_dataclasses.py,sha256=bvMEFRUiIrRvWhlvxbEYCkmwA5yu-SKgfVuDoSfYORo,166944
+ommlds/cli/_dataclasses.py,sha256=qUx7WaHCYwvjZ5_jQjAr_EZ0Pouk5AjQG0HnisxZCEw,164764
 ommlds/cli/asyncs.py,sha256=NAMzzaZq7ORjlbbBB_Y9vcM9qoBpGf4VJNtl_3p_8G4,629
 ommlds/cli/inject.py,sha256=Bt-T-vQIbp8vh6q21Tt3wDztFZ9FPxNhH2ocrAfjArE,815
 ommlds/cli/main.py,sha256=n_13EimSCt2x9wkn4tULk9gNOvuCHuHeDcuEYtrcUgQ,11172
@@ -110,9 +110,9 @@ ommlds/cli/secrets.py,sha256=wwtcKjDH34wywfs5zixx3TMbWXCvlZj-PwQoLMM7Fqs,473
 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=NBXfTNZiRD476FUn9TgzbaCTkm2RoOYSl97CoMLRYWE,3997
+ommlds/cli/backends/inject.py,sha256=TbYdh9VsbhIobZSw1RSF1YjMOrcV-et0_U6RgwXjkUc,4946
 ommlds/cli/backends/injection.py,sha256=aCscVcq0_gobzNgLEflGInFC9b_dtnuQgLZ0wX_iTWg,325
-ommlds/cli/backends/meta.py,sha256=MXlFBq2pq7PNtJysETvr7xsTXk_6f7OHk7BEo7Albao,1001
+ommlds/cli/backends/meta.py,sha256=4BfVDJp8jIt28LSvg4lleB9m279mx-t5Jamf5zDp4Z8,2249
 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=4qW8ac2umJxnehNI0eS0sqVWlzjv8BDDg4WBOOx-pkM,925
@@ -146,7 +146,7 @@ ommlds/cli/sessions/chat/drivers/ai/inject.py,sha256=aipgnPRDwxFKkSBU__uMNc1RVzY
 ommlds/cli/sessions/chat/drivers/ai/injection.py,sha256=2O_ELMusxQsYaB2oqvzjYpZQzjshocJup7Z5unzoUIY,404
 ommlds/cli/sessions/chat/drivers/ai/rendering.py,sha256=srDRaepttzHSn8w4Cet07bDtGiSApUO4xyhiPbuMU0A,2277
 ommlds/cli/sessions/chat/drivers/ai/services.py,sha256=PUySl7Fz4ttElW-V6poEnvF-RaRmbjU3cHULHun5rdk,2508
-ommlds/cli/sessions/chat/drivers/ai/tools.py,sha256=XmF-HF7OiUiqXuIgT0QuePmqnHTmpjK-lLt5WocAiws,1093
+ommlds/cli/sessions/chat/drivers/ai/tools.py,sha256=q8YSsYWAKa4lIlzs4yiyjA47ABDEmfnwidNkFIE4-LY,954
 ommlds/cli/sessions/chat/drivers/ai/types.py,sha256=_Ees5ia0fKMr-BvKpTeryY-KXWP0bAfWrOGg2JDFpuE,913
 ommlds/cli/sessions/chat/drivers/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/drivers/events/inject.py,sha256=quPbkuhPyJ_zFpFzh5hrkqWspwk9El0a8_82r1LphIY,449
@@ -192,7 +192,7 @@ ommlds/cli/sessions/chat/facades/facade.py,sha256=3O8IdcuPquCA8fKMjmaj3p0P-OpNAg
 ommlds/cli/sessions/chat/facades/inject.py,sha256=V7vxYtG7w6BdOKU-ntQfu1BfKSpDXyK22FCdUoyCsT8,632
 ommlds/cli/sessions/chat/facades/ui.py,sha256=GVbLgydHBhc3z0WOjyCDwTw5IOq1l0u0FLDbAwe093c,618
 ommlds/cli/sessions/chat/facades/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/facades/commands/base.py,sha256=_VMSdD0L-PES7BoVUZiYJaK9pScb9_1XqZaMnLXdDkE,2033
+ommlds/cli/sessions/chat/facades/commands/base.py,sha256=G4G0-xXi4xAExSrL1zDl_wR6_8m59nVhZuCFjWeIgk8,2022
 ommlds/cli/sessions/chat/facades/commands/configs.py,sha256=qMTC7zMn80iS85t06WptCx-XS6V2pt19j6TzutXGVZo,116
 ommlds/cli/sessions/chat/facades/commands/inject.py,sha256=HlwJoN_yequ6ls_7YLg0aNhbsqR-vByEfwQmOnJP54g,821
 ommlds/cli/sessions/chat/facades/commands/injection.py,sha256=qdYn791FsYH5kHOOneoHXvfPfY6ag6cw43h5-LORKQ0,319
@@ -237,8 +237,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=vJkLRL9sbR1fH5pPNUdKNWkZCtX5JbFHw98-5501zbc,13129
-ommlds/minichain/_dataclasses.py,sha256=OIBmfIHAmXID0BO8WAxlPleWp3Lnm0-s5rse85VjZMM,940770
+ommlds/minichain/__init__.py,sha256=GryYNuSiSv7LvoIyP6rYGDnHe2Q4Rkr4majHaEd2nhs,13794
+ommlds/minichain/_dataclasses.py,sha256=F-kqXtzODV1RbcjR3LpTwLWqbj4CU872AhFdXECbVos,948452
 ommlds/minichain/_marshal.py,sha256=n9PGWrHhvAmGIc7KDOYt3IF9Z6G0ncXskyICTp3Ji6k,1923
 ommlds/minichain/_typedvalues.py,sha256=NEQ7YCD7YtYJoEKHRwBksHFv-CULvyXniju_IeVfD5s,2349
 ommlds/minichain/completion.py,sha256=lQ0LfCIYZsvDqteHhhDIv16D2_gn_xMfEL0ouywE5Yo,1033
@@ -246,7 +246,7 @@ ommlds/minichain/configs.py,sha256=WwrHxfkDAfo_RtuCqUgySthj-2W26lZbpuQoghUyGNw,1
 ommlds/minichain/envs.py,sha256=vE2CSeT6KYxOpPY72VbFLzGUnBERYdhfiEUlvSRHkXE,225
 ommlds/minichain/json.py,sha256=0_5rV5Zi2qPOvXi2CLAc5DF7FN3jK3ABbjoKdjtTuVo,360
 ommlds/minichain/metadata.py,sha256=NRrcfN2l4XArHXje3vA9AmkDceXsN-ymT8fbmbW0Ka8,2228
-ommlds/minichain/resources.py,sha256=CcFIUrxPGuxUabG74zL0yByZsyGJISxLVK1nULSZPyo,5488
+ommlds/minichain/resources.py,sha256=ERGSVNcfuvjY8lLpcIvoB1X4KVn831F4lmUn7wnYw-M,5880
 ommlds/minichain/search.py,sha256=YOMJKkTLLSfGKaxltk9bf5OdPq7MpCtLOC3NZ_4iq-E,1269
 ommlds/minichain/standard.py,sha256=l7C6EXE4FgfJOphl0vHMwCq4FvMNViloz7pPfMsRnGU,2637
 ommlds/minichain/types.py,sha256=K6RRjpUi17UEG0cqPrrvbVANU0iRVh3WLiH-y6oEWFI,414
@@ -264,27 +264,28 @@ ommlds/minichain/backends/impls/anthropic/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 ommlds/minichain/backends/impls/anthropic/chat.py,sha256=e4Kcbjvca_yaZsNB_-h335gSCbz4ma1lMUvuR4WzEFE,4874
 ommlds/minichain/backends/impls/anthropic/names.py,sha256=t70dOuzqpSu9LE_MxfOl2mQmwfTkELT7jWduvuEVMbk,1099
 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/anthropic/stream.py,sha256=86nYXeJGwz86n_PXZ-2Azli7FTtgBZPYw8eqO6d3LbQ,8803
 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/names.py,sha256=g0Chpq80JIha4xdV7coxJblLgckKY2bNfLnn1pe_6zk,874
 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/cerebras/stream.py,sha256=o-GUC3y34HzfP0ibOndPe1eSCkgv0J9I0uZqkbR8kVo,3956
 ommlds/minichain/backends/impls/duckduckgo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/duckduckgo/search.py,sha256=HA5UriBVvNw6-6vmeYJsm83LxsFsksLtzFxj-kdzoPE,1010
 ommlds/minichain/backends/impls/dummy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/dummy/chat.py,sha256=FUTvNPWmb4Hm-axglvPiqbvLwE7sajHOM5H7j9Qj2-c,2283
 ommlds/minichain/backends/impls/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/google/chat.py,sha256=lGb5blGLlcBlt9xeDZJvbh5SlV7fgfezd5_As_SPBXo,6499
+ommlds/minichain/backends/impls/google/chat.py,sha256=jT7AIevnP5jKxArp0VPppEGCNCihcIdblO3qKGpWGPo,3876
 ommlds/minichain/backends/impls/google/names.py,sha256=Yt7xL84JZEtPf7CIcBzEBrWAfEUUs2_gXk2W7m5wC3g,1051
+ommlds/minichain/backends/impls/google/protocol.py,sha256=Re4iKzXwNQEeBhMe3Mu2yYfGrOOJemupy5JaL0i9MHU,2585
 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/stream.py,sha256=3_rUtobcF3kSeQqfhsowhYbjZ7IYRDIzwsFYKvdhxrI,4711
 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=75Zst0j1VNSUYzP2eArKEOSvRI9TrRqtoTNwVMqO-1s,2845
 ommlds/minichain/backends/impls/groq/names.py,sha256=RnvBSytxPF1a9Bj_OPVELuD1nAKJnJrG3ZwJfYo6Szs,1075
 ommlds/minichain/backends/impls/groq/protocol.py,sha256=QNvqcfR9FbAIJv1fVerayws5gYU1am3oLFXmYMnQdX4,5261
-ommlds/minichain/backends/impls/groq/stream.py,sha256=nyY3r6yu8T7oo7XkCg9-x2n1oPfDz4GDf6Rxxg328uw,5226
+ommlds/minichain/backends/impls/groq/stream.py,sha256=CEjNQEibiQWB7znyj1GE7dG2eA7KrPA7y_6-hgrRKa4,3995
 ommlds/minichain/backends/impls/huggingface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/huggingface/configs.py,sha256=6jsBtPNXOP57PcpxNTVLGWLc-18Iwn_lDbGouwCJTIQ,258
 ommlds/minichain/backends/impls/huggingface/repos.py,sha256=NDanA_rFwT-K2gKghkHMxqejbYy6uctz10S6yREfbg0,807
@@ -296,15 +297,15 @@ ommlds/minichain/backends/impls/llamacpp/stream.py,sha256=XMKNMGzn5dFIZCqfEQdUvy
 ommlds/minichain/backends/impls/mlx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/chat.py,sha256=jg9qwNYiJg8xvkluSkAAR9pfV7KjpBCA6X7k0hmvTMU,6825
 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=yhQNvDWN9xWhb8e6M25JLiln-C5wYmaULH4Aib-DcbM,7459
+ommlds/minichain/backends/impls/openai/format.py,sha256=aWzkTy8F8glVNQaPvSw1jy3YjbzOfTL_IBLtdmfmHIk,7479
 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/openai/stream.py,sha256=gRQxC4C7cU1NFHDsonOH88_bXN7fx1SNuEil6NrGYSY,4173
 ommlds/minichain/backends/impls/sentencepiece/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/sentencepiece/tokens.py,sha256=S32bkN5bbAeLrRLW0VW2N4dEOKvBwt2mMS3CGbcmzQI,1679
 ommlds/minichain/backends/impls/tinygrad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -391,6 +392,8 @@ ommlds/minichain/docs/__init__.py,sha256=vNpT6sA5YDalFqsCFn0DjUvarxRtRl3w2V9liEU
 ommlds/minichain/docs/docs.py,sha256=Ex7hiqaiYDB9hQhUjuzot8MFktl3LIGG41YBFaNoC80,1340
 ommlds/minichain/docs/dtypes.py,sha256=BRZmLK9NfQwITBYmDOmRPDlFg1RP5BYWT0Xw04AinF8,499
 ommlds/minichain/docs/filters.py,sha256=rIW_x4QR7P2a2sqsEDw0xWJOKtK670i_bWfMZ52Jt_c,2277
+ommlds/minichain/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/minichain/http/stream.py,sha256=GmN53v4ZW_Zyxy51yW-Un7-rdBQceAtZjazi3llbRDE,5371
 ommlds/minichain/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/lib/bash.py,sha256=a7HUzb0KOCPRjJuWuJW6IGUxcF53Zx13q6huHO_82nw,872
 ommlds/minichain/lib/code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -437,8 +440,7 @@ ommlds/minichain/services/requests.py,sha256=PznUkVISx8PEPtio7KGH0YEvktkBp9FqU_W
 ommlds/minichain/services/responses.py,sha256=jSUFUrY0DDnRyimh3pD2ee2ZnOcH8oQxxZnwiLf5p9A,3381
 ommlds/minichain/services/services.py,sha256=c2uHH5Pt0wtUDQgJQEbw6NsS5NVSXMJirWISJ5FaRNg,685
 ommlds/minichain/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/stream/services.py,sha256=YXfEj3ZXKZ3Svkig6f3hOReHgZnLY2tDn2bgB0RIoRI,5566
-ommlds/minichain/stream/wrap.py,sha256=nQC0aCi49I18nF0Yx8qiiLkhIAECV6s6o4pvOy5Kx98,2041
+ommlds/minichain/stream/services.py,sha256=H6osaS7bhU451llcAc71_lhjR8bts7IFyNB66N2BNEc,5674
 ommlds/minichain/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/text/applypatch.py,sha256=rHB6nG_2RqUAJFvrP1blrONy6ZpVP_M3aX5XQInonA0,17718
 ommlds/minichain/text/toolparsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -477,9 +479,9 @@ ommlds/minichain/vectors/similarity.py,sha256=etqSswPH7ERThueqnCUHULsM3rpsVslRFu
 ommlds/minichain/vectors/stores.py,sha256=etbLCS0RXAEmqcCdqiys8twa8R7Y_DcjQ_VqnEnRF4s,530
 ommlds/minichain/vectors/types.py,sha256=xSAK1Xfkubqf95QgJhSHrwBu_C5quuye3wZAASmxJkM,3473
 ommlds/minichain/wrappers/__init__.py,sha256=kXyc5BHVI35GXGmIf0zkKfCVIqD8q9PFENblye5qCqc,110
-ommlds/minichain/wrappers/firstinwins.py,sha256=fqTq7siw28IsjGar8tXlxBsMJuCbogiv7nBCPcxhHe4,3464
-ommlds/minichain/wrappers/instrument.py,sha256=I51u7k6oYG5PX2r3jGRHDl_IqbAEFUCZ_oWwlIiNbLY,3730
-ommlds/minichain/wrappers/retry.py,sha256=1A4TTD8RXUpCDjo7a0T1qeB5n8i7bsw473bmPCOS00c,3444
+ommlds/minichain/wrappers/firstinwins.py,sha256=pY0qZejjDlYDiH-3sA5vr4mAOwlGN-awsTKsFY5-QFU,3453
+ommlds/minichain/wrappers/instrument.py,sha256=vU_rVe3jbt9q_oXK-OBLcOPKRRjAnEpQjJTNHHNZNDc,3731
+ommlds/minichain/wrappers/retry.py,sha256=rYNKZT-VuP7qbQYtbmKAYadZWSdEI_6hwT7yB4DoFxg,4342
 ommlds/minichain/wrappers/services.py,sha256=6AAwgCtzHzmJZWteKJJgdfSQtYuDBxuRFoT6NttV5RY,1912
 ommlds/minichain/wrappers/stream.py,sha256=-H0O_Eyzsabk--mtIzobWdMdj3WnqonEZ9-k9_XdWiI,1223
 ommlds/nanochat/LICENSE,sha256=QrsJ8zmor4uQ07SWm29uS6Sv87XGFBA7Ax_M33HI93I,1072
@@ -513,9 +515,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.dev502.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev502.dist-info/METADATA,sha256=gaDPjUyCBXbQflQQZvorRw3dRZyJ5cDtalsPcM9L-X4,3495
-ommlds-0.0.0.dev502.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev502.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev502.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev502.dist-info/RECORD,,
+ommlds-0.0.0.dev504.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev504.dist-info/METADATA,sha256=27dO2cQB4Y10EcKB2ZammM2Ctk9TuRKiZgfIEz7MbaA,3495
+ommlds-0.0.0.dev504.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev504.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev504.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev504.dist-info/RECORD,,

ommlds/minichain/stream/wrap.py

@@ -1,62 +0,0 @@
-# ruff: noqa: UP028
-import typing as ta
-
-from ..resources import UseResources
-from ..services import Request
-from ..services import Service
-from ..types import Output
-from .services import StreamResponse
-from .services import StreamResponseSink
-from .services import new_stream_response
-
-
-StreamRequestT = ta.TypeVar('StreamRequestT', bound=Request)
-V = ta.TypeVar('V')
-OutputT = ta.TypeVar('OutputT', bound=Output)
-StreamOutputT = ta.TypeVar('StreamOutputT', bound=Output)
-
-
-##
-
-
-class WrappedStreamService(ta.Generic[StreamRequestT, V, OutputT, StreamOutputT]):
-    """Only handles simple, non-type-modifying usecases."""
-
-    def __init__(self, inner: Service[StreamRequestT, StreamResponse[V, OutputT, StreamOutputT]]) -> None:
-        super().__init__()
-
-        self._inner = inner
-
-    #
-
-    async def _process_request(self, request: StreamRequestT) -> StreamRequestT:
-        return request
-
-    async def _process_stream_outputs(self, outputs: ta.Sequence[StreamOutputT]) -> ta.Sequence[StreamOutputT]:
-        return outputs
-
-    async def _process_value(self, v: V) -> ta.Iterable[V]:
-        return [v]
-
-    async def _process_outputs(self, outputs: ta.Sequence[OutputT]) -> ta.Sequence[OutputT]:
-        return outputs
-
-    #
-
-    async def invoke(self, request: StreamRequestT) -> StreamResponse[V, OutputT, StreamOutputT]:
-        async with UseResources.or_new(request.options) as rs:  # noqa
-            in_resp = await self._inner.invoke(await self._process_request(request))
-            in_vs = await rs.enter_async_context(in_resp.v)
-
-            async def inner(sink: StreamResponseSink[V]) -> ta.Sequence[OutputT] | None:
-                async for in_v in in_vs:
-                    for out_v in (await self._process_value(in_v)):
-                        await sink.emit(out_v)
-
-                return await self._process_outputs(in_vs.outputs)
-
-            return await new_stream_response(
-                rs,
-                inner,
-                await self._process_stream_outputs(in_resp.outputs),
-            )