ommlds 0.0.0.dev465__py3-none-any.whl → 0.0.0.dev467__py3-none-any.whl

{ommlds-0.0.0.dev465.dist-info → ommlds-0.0.0.dev467.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=5HdEXx21B_B9DSFeEoQ1teSsanB_NOU5F2o5yjrAtKI,17930
+ommlds/.omlish-manifests.json,sha256=MyJQsh5T1CMMXcGdxwqI9abQ8-j-ZlRGRluiikbeKRY,18414
 ommlds/__about__.py,sha256=uAJgr2I_m_oZPlV5P8XLFeYpBlEM-DdzeyF6O5OK_qs,1759
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/huggingface.py,sha256=JfEyfKOxU3-SY_ojtXBJFNeD-NIuKjvMe3GL3e93wNA,1175
@@ -16,7 +16,7 @@ ommlds/backends/anthropic/protocol/sse/events.py,sha256=pLscyLFpxcrtOijNPRgivrxY
 ommlds/backends/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/google/protocol/__init__.py,sha256=OWmhuCS_sZ08ZaBtSSDRIudHKzkzgmqxY-3jgQxTidw,105
 ommlds/backends/google/protocol/_marshal.py,sha256=LWikcdMDrKQ0lMtclNXwK9qamijUBzK62nrEVo2OFtc,305
-ommlds/backends/google/protocol/types.py,sha256=-szndCfo4h4TnfWY23B-_ksgDO0W_Qnu958h4NEWJFw,17494
+ommlds/backends/google/protocol/types.py,sha256=JDft5-5sPuy8sFWTvid4JuC9a9EnuQizt9dyAV2L56s,17536
 ommlds/backends/llamacpp/__init__.py,sha256=zXFpLXE4a2vEl0jcPDyKlPHHfZ3Z8Dz0twhEIyZ8-vg,59
 ommlds/backends/llamacpp/buildwheel.py,sha256=q9ghCLVbm8Jm6syrZlBP-x1qNDd0wSl15B2OXBtDBQ8,3813
 ommlds/backends/llamacpp/logging.py,sha256=nCEC6ASEuTpJqx47DMLhnbr5KelDlbxhM0nKQt4bc3w,773
@@ -91,7 +91,7 @@ ommlds/cli/sessions/chat/driver.py,sha256=ddnCYTKqWiPxV8U4UbFwb7E3yi81ItjZ9j3AJd
 ommlds/cli/sessions/chat/inject.py,sha256=7Yg6wUs2Oej4UjNZCAWCJCEsDJZWvT4G8XvkvVUMC7U,1928
 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/catalog.py,sha256=gc03dqXEUUSi4WCWJ30HrkHPWlAkZHXkj1pOq7KVakU,1764
 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
@@ -100,7 +100,7 @@ ommlds/cli/sessions/chat/chat/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 ommlds/cli/sessions/chat/chat/ai/inject.py,sha256=FCq-E8auVJ-gnK18NoKiINGBHgDllroZRG7z5ZY63L8,2514
 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/services.py,sha256=-XcMEatIDA0h_h-crL45c3qvC5VbDdhvKcWsxzioQA8,2507
 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
@@ -147,7 +147,7 @@ ommlds/cli/state/storage.py,sha256=tRPmgCANRrw7A5Qr700OaH58F6S96O37I8Ivrbo7_gI,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=5pHq8Tlhgqx5p9ilC0EjN8dpOZ2Xc1ADHgwa1V-FFkk,10829
+ommlds/minichain/__init__.py,sha256=EqNJpuMwqkkdlNmipjaoC30yAqH7c8oziszlkCcXBrQ,10982
 ommlds/minichain/_marshal.py,sha256=n9PGWrHhvAmGIc7KDOYt3IF9Z6G0ncXskyICTp3Ji6k,1923
 ommlds/minichain/_typedvalues.py,sha256=Vl1Edt5khC0e5RPFBPmPCxn0IzrfVd0NHzAjAN2E6Kc,2183
 ommlds/minichain/completion.py,sha256=lQ0LfCIYZsvDqteHhhDIv16D2_gn_xMfEL0ouywE5Yo,1033
@@ -172,14 +172,14 @@ ommlds/minichain/backends/impls/anthropic/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 ommlds/minichain/backends/impls/anthropic/chat.py,sha256=LVaRP_Pbz4UghSHD8GZ22hMWE4Rsd_6bSysgl2BR_AM,4166
 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/stream.py,sha256=agET8PPbKg-7gYL3FGyU45J-QqV65VkEo15ipScEzUA,7667
+ommlds/minichain/backends/impls/anthropic/stream.py,sha256=AvoLk25R7E_aSS1tAN-P-UKjhKPxYtQoeGakXvFdblI,8677
 ommlds/minichain/backends/impls/duckduckgo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/duckduckgo/search.py,sha256=igzeU9P9b1MMiu4KAJVS9H6KLIoPm68wXi4Kx3_DHyQ,940
 ommlds/minichain/backends/impls/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/google/chat.py,sha256=q6LasmAh3Xn78kNlgpgwoKhdTj3o76j0X3_xitdyAE0,6316
 ommlds/minichain/backends/impls/google/names.py,sha256=HxHJ31HeKZg6aW1C_Anqp-gamCXpq9pOdKj8_yVgE8Y,871
 ommlds/minichain/backends/impls/google/search.py,sha256=5-2nAZ1QmbqHSQcwWnqqcgCM-Duy2ryctJEIv2tcpZg,3260
-ommlds/minichain/backends/impls/google/stream.py,sha256=no8MM4rrduvxrDWKIPAaYUiH5la3OxuVgAvDP3mkmnE,4921
+ommlds/minichain/backends/impls/google/stream.py,sha256=Mhg5cOe7PKbnlQURyk2IRermtpzxU5Y0j3w4fkt2ZRg,7900
 ommlds/minichain/backends/impls/google/tools.py,sha256=Tty0gsyx7-PbeoNqMuql_ewQ6q-ZsDaDdsD5ShinGVY,5089
 ommlds/minichain/backends/impls/huggingface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/huggingface/configs.py,sha256=6jsBtPNXOP57PcpxNTVLGWLc-18Iwn_lDbGouwCJTIQ,258
@@ -190,15 +190,14 @@ ommlds/minichain/backends/impls/llamacpp/completion.py,sha256=oJ2I6wUoIPXYLm9Vc7
 ommlds/minichain/backends/impls/llamacpp/format.py,sha256=fcLMwk7r7FbNrYCH39G3fDRInKvlPIqcoxyLj95CooA,778
 ommlds/minichain/backends/impls/llamacpp/stream.py,sha256=uGog3xPNqCjGgyZjXEjhlxKbIbakWbapjANAEsmW-U4,3378
 ommlds/minichain/backends/impls/mlx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/mlx/chat.py,sha256=kNIDvkvNpoB80LfA1y7UpSzEEm2Z4K2w56HOuMwT9zE,4558
+ommlds/minichain/backends/impls/mlx/chat.py,sha256=sMlhgiFZrxAC-kKkLSJ6c-2uJn0IHZXH4EiPET_-CKI,7458
 ommlds/minichain/backends/impls/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/openai/chat.py,sha256=3hiKX2WqRo1cwF4AhcnzcCb2fsmwNLW7YPGYpask41A,2660
+ommlds/minichain/backends/impls/openai/chat.py,sha256=eMRjxPNrzrRjaw83LJuYzP9DGvwGyY2ObJSZub4Z9bY,2658
 ommlds/minichain/backends/impls/openai/completion.py,sha256=0XTC08mZzbW23Y2DNW2xfRR0eDX4nTyejF8CR1BdHZs,1756
 ommlds/minichain/backends/impls/openai/embedding.py,sha256=kkDJ3_0EqwQ_E0eXsSH1TuWXQmRqaijK8zG90fnlf3s,1582
-ommlds/minichain/backends/impls/openai/format.py,sha256=xzd7iuyEcu8aROZQJ14A6C0Vxylg75yQbWwk-Oz8Q74,7150
-ommlds/minichain/backends/impls/openai/format2.py,sha256=OQ3N8VR4uL3PvHxjOQSdgg1bQ4_WiDz_sOV4WhVEXpQ,6611
+ommlds/minichain/backends/impls/openai/format.py,sha256=teGX8mNU3sXNWP4YWGD8d59M4X9_r75ImSzfTJgtNCM,7351
 ommlds/minichain/backends/impls/openai/names.py,sha256=b74t8FwSbGEveVtVz4SqM5tiRDyTKNlUKlseV6AX3Yo,1211
-ommlds/minichain/backends/impls/openai/stream.py,sha256=X45qIXgwAk7IVe4LL6gzL3uJivdaB-hUGutltHeswTc,5280
+ommlds/minichain/backends/impls/openai/stream.py,sha256=M7II7kZFsy33j8NQwdM1CCeKet3lw-XLOQdDzrzn-Yo,5297
 ommlds/minichain/backends/impls/sentencepiece/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/sentencepiece/tokens.py,sha256=tUEBKyBgkTowssS_AdcAuPkyFzfyDfE935x4JG8PXM0,1602
 ommlds/minichain/backends/impls/tinygrad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -228,9 +227,10 @@ ommlds/minichain/chat/choices/services.py,sha256=p_FsCZEsGJun8epzAHoeNdjwJ86Zwih
 ommlds/minichain/chat/choices/types.py,sha256=OPnMUp0KUKGGPJKsQZiXUtd8Z9b_JnhOy7SXKL6QDWU,725
 ommlds/minichain/chat/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/chat/stream/_marshal.py,sha256=r6NYBUviV7jIssaFprzv2rVEj8cFEuBlt71BSMZ-448,397
-ommlds/minichain/chat/stream/adapters.py,sha256=Mxftmg6izUoeZnVZM4v5o0_eCtY0QuYAd-X7BkqYHWY,2627
+ommlds/minichain/chat/stream/adapters.py,sha256=3hKo3-MLtVIB-Nhdlxt17LP9vZESr-2fBZQ3Yr6l_Ps,1077
+ommlds/minichain/chat/stream/joining.py,sha256=oPxLT4qEYWCaxclnZvt54ztQP5md4V6u6Uwn4qd2e9M,2936
 ommlds/minichain/chat/stream/services.py,sha256=TxNEOm85QEFYtKb59q_uP6eSNh75v1fF-IpsJjhY4to,1252
-ommlds/minichain/chat/stream/types.py,sha256=OoPNYpPZxFNZcEbr36U1zpA_hsVU16ujsFnnHcq5W-0,1252
+ommlds/minichain/chat/stream/types.py,sha256=kpHsWLNHk7hmaNPDSCqLH-ECSAiz83lRfr00LhSWb5U,1589
 ommlds/minichain/chat/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/chat/tools/execution.py,sha256=tCPsz1kCt5RcoRX7dwfaJRvObniJJv_D2hCwz1Slo_A,573
 ommlds/minichain/chat/tools/ids.py,sha256=DFBKrpeDTCnMcU-P38VbPWX0YBDaz_HzMgx3yXWjFWQ,759
@@ -367,9 +367,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.dev465.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev465.dist-info/METADATA,sha256=JAD5TLj7Vqeese-787MMUhAcQFykg29h_upNHQ5XUFA,3224
-ommlds-0.0.0.dev465.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev465.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev465.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev465.dist-info/RECORD,,
+ommlds-0.0.0.dev467.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev467.dist-info/METADATA,sha256=NvYqf0PtfEdrj2en5RFFpTHB_cGjm41groVHgy54WZQ,3224
+ommlds-0.0.0.dev467.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev467.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev467.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev467.dist-info/RECORD,,

ommlds/minichain/backends/impls/openai/format2.py

@@ -1,210 +0,0 @@
-import typing as ta
-
-from omlish import cached
-from omlish import check
-from omlish import typedvalues as tv
-from omlish.formats import json
-
-from .....backends.openai import protocol as pt
-from ....chat.choices.services import ChatChoicesResponse
-from ....chat.choices.types import AiChoice
-from ....chat.choices.types import AiChoices
-from ....chat.choices.types import ChatChoicesOptions
-from ....chat.messages import AiMessage
-from ....chat.messages import AnyAiMessage
-from ....chat.messages import Chat
-from ....chat.messages import SystemMessage
-from ....chat.messages import ToolUseMessage
-from ....chat.messages import ToolUseResultMessage
-from ....chat.messages import UserMessage
-from ....chat.tools.types import Tool
-from ....content.json import JsonContent
-from ....content.prepare import prepare_content_str
-from ....llms.types import MaxTokens
-from ....llms.types import Temperature
-from ....llms.types import TokenUsage
-from ....llms.types import TokenUsageOutput
-from ....tools.jsonschema import build_tool_spec_params_json_schema
-from ....tools.types import ToolSpec
-from ....tools.types import ToolUse
-from ....types import Option
-
-
-##
-
-
-def build_oai_request_msgs(mc_chat: Chat) -> ta.Sequence[pt.ChatCompletionMessage]:
-    oai_msgs: list[pt.ChatCompletionMessage] = []
-
-    for mc_msg in mc_chat:
-        if isinstance(mc_msg, SystemMessage):
-            oai_msgs.append(pt.SystemChatCompletionMessage(
-                content=check.isinstance(mc_msg.c, str),
-            ))
-
-        elif isinstance(mc_msg, AiMessage):
-            oai_msgs.append(pt.AssistantChatCompletionMessage(
-                content=check.isinstance(mc_msg.c, (str, None)),
-            ))
-
-        elif isinstance(mc_msg, ToolUseMessage):
-            oai_msgs.append(pt.AssistantChatCompletionMessage(
-                tool_calls=[pt.AssistantChatCompletionMessage.ToolCall(
-                    id=check.not_none(mc_msg.tu.id),
-                    function=pt.AssistantChatCompletionMessage.ToolCall.Function(
-                        arguments=check.not_none(mc_msg.tu.raw_args),
-                        name=mc_msg.tu.name,
-                    ),
-                )],
-            ))
-
-        elif isinstance(mc_msg, UserMessage):
-            oai_msgs.append(pt.UserChatCompletionMessage(
-                content=prepare_content_str(mc_msg.c),
-            ))
-
-        elif isinstance(mc_msg, ToolUseResultMessage):
-            tc: str
-            if isinstance(mc_msg.tur.c, str):
-                tc = mc_msg.tur.c
-            elif isinstance(mc_msg.tur.c, JsonContent):
-                tc = json.dumps_compact(mc_msg.tur.c)
-            else:
-                raise TypeError(mc_msg.tur.c)
-            oai_msgs.append(pt.ToolChatCompletionMessage(
-                tool_call_id=check.not_none(mc_msg.tur.id),
-                content=tc,
-            ))
-
-        else:
-            raise TypeError(mc_msg)
-
-    return oai_msgs
-
-
-#
-
-
-def build_mc_ai_choice(oai_choice: pt.ChatCompletionResponseChoice) -> AiChoice:
-    cur: list[AnyAiMessage] = []
-
-    oai_msg = oai_choice.message
-
-    if (oai_c := oai_msg.content) is not None:
-        cur.append(AiMessage(check.isinstance(oai_c, str)))
-
-    for oai_tc in oai_msg.tool_calls or []:
-        cur.append(ToolUseMessage(ToolUse(
-            id=oai_tc.id,
-            name=oai_tc.function.name,
-            args=json.loads(oai_tc.function.arguments or '{}'),
-            raw_args=oai_tc.function.arguments,
-        )))
-
-    return AiChoice(cur)
-
-
-def build_mc_ai_choices(oai_resp: pt.ChatCompletionResponse) -> AiChoices:
-    return [
-        build_mc_ai_choice(oai_choice)
-        for oai_choice in oai_resp.choices
-    ]
-
-
-def build_mc_choices_response(oai_resp: pt.ChatCompletionResponse) -> ChatChoicesResponse:
-    return ChatChoicesResponse(
-        build_mc_ai_choices(oai_resp),
-
-        tv.TypedValues(
-            *([TokenUsageOutput(TokenUsage(
-                input=tu.prompt_tokens,
-                output=tu.completion_tokens,
-                total=tu.total_tokens,
-            ))] if (tu := oai_resp.usage) is not None else []),
-        ),
-    )
-
-
-##
-
-
-class OpenaiChatRequestHandler:
-    def __init__(
-            self,
-            chat: Chat,
-            *options: ChatChoicesOptions,
-            model: str,
-            mandatory_kwargs: ta.Mapping[str, ta.Any] | None = None,
-    ) -> None:
-        super().__init__()
-
-        self._chat = chat
-        self._options = options
-        self._model = model
-        self._mandatory_kwargs = mandatory_kwargs
-
-    DEFAULT_OPTIONS: ta.ClassVar[tv.TypedValues[Option]] = tv.TypedValues[Option](
-        Temperature(0.),
-        MaxTokens(1024),
-    )
-
-    _OPTION_KWARG_NAMES_MAP: ta.ClassVar[ta.Mapping[str, type[ChatChoicesOptions]]] = dict(
-        temperature=Temperature,
-        max_tokens=MaxTokens,
-    )
-
-    class _ProcessedOptions(ta.NamedTuple):
-        kwargs: dict[str, ta.Any]
-        tools_by_name: dict[str, ToolSpec]
-
-    @cached.function
-    def _process_options(self) -> _ProcessedOptions:
-        kwargs: dict = dict(
-            temperature=0,
-            max_tokens=1024,
-        )
-
-        tools_by_name: dict[str, ToolSpec] = {}
-
-        with tv.TypedValues(*self._options).consume() as oc:
-            kwargs.update(oc.pop_scalar_kwargs(**self._OPTION_KWARG_NAMES_MAP))
-
-            for t in oc.pop(Tool, []):
-                if t.spec.name in tools_by_name:
-                    raise NameError(t.spec.name)
-                tools_by_name[check.non_empty_str(t.spec.name)] = t.spec
-
-        if (mk := self._mandatory_kwargs):
-            for k, v in mk.items():
-                check.not_in(k, kwargs)
-                kwargs[k] = v
-
-        return self._ProcessedOptions(
-            kwargs=kwargs,
-            tools_by_name=tools_by_name,
-        )
-
-    @cached.function
-    def oai_request(self) -> pt.ChatCompletionRequest:
-        po = self._process_options()
-
-        tools: list[pt.ChatCompletionRequestTool] = [
-            pt.ChatCompletionRequestTool(
-                function=pt.ChatCompletionRequestTool.Function(
-                    name=check.not_none(ts.name),
-                    description=prepare_content_str(ts.desc),
-                    parameters=build_tool_spec_params_json_schema(ts),
-                ),
-            )
-            for ts in po.tools_by_name.values()
-        ]
-
-        return pt.ChatCompletionRequest(
-            model=self._model,
-            messages=build_oai_request_msgs(self._chat),
-            top_p=1,
-            tools=tools or None,
-            frequency_penalty=0.0,
-            presence_penalty=0.0,
-            **po.kwargs,
-        )