ommlds 0.0.0.dev334__tar.gz → 0.0.0.dev336__tar.gz

{ommlds-0.0.0.dev334/ommlds.egg-info → ommlds-0.0.0.dev336}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev334
+Version: 0.0.0.dev336
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev334
-Requires-Dist: omlish==0.0.0.dev334
+Requires-Dist: omdev==0.0.0.dev336
+Requires-Dist: omlish==0.0.0.dev336
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.26; extra == "all"
@@ -25,7 +25,7 @@ Requires-Dist: tokenizers~=0.21; extra == "all"
 Requires-Dist: torch~=2.7; extra == "all"
 Requires-Dist: transformers~=4.52; extra == "all"
 Requires-Dist: sentence-transformers~=4.1; extra == "all"
-Requires-Dist: huggingface-hub~=0.32; extra == "all"
+Requires-Dist: huggingface-hub~=0.33; extra == "all"
 Requires-Dist: datasets~=3.6; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
@@ -47,7 +47,7 @@ Requires-Dist: torch~=2.7; extra == "backends"
 Requires-Dist: transformers~=4.52; extra == "backends"
 Requires-Dist: sentence-transformers~=4.1; extra == "backends"
 Provides-Extra: huggingface
-Requires-Dist: huggingface-hub~=0.32; extra == "huggingface"
+Requires-Dist: huggingface-hub~=0.33; extra == "huggingface"
 Requires-Dist: datasets~=3.6; extra == "huggingface"
 Provides-Extra: numpy
 Requires-Dist: numpy>=1.26; extra == "numpy"

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/.manifests.json

@@ -22,10 +22,10 @@
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.anthropic.chat",
-        "attr_name": "AnthropicChatService",
+        "attr_name": "AnthropicChatChoicesService",
         "name": "anthropic",
         "aliases": null,
-        "type": "ChatService"
+        "type": "ChatChoicesService"
       }
     }
   },
@@ -54,10 +54,10 @@
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.google.chat",
-        "attr_name": "GoogleChatService",
+        "attr_name": "GoogleChatChoicesService",
         "name": "google",
         "aliases": null,
-        "type": "ChatService"
+        "type": "ChatChoicesService"
       }
     }
   },
@@ -69,10 +69,10 @@
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.llamacpp.chat",
-        "attr_name": "LlamacppChatService",
+        "attr_name": "LlamacppChatChoicesService",
         "name": "llamacpp",
         "aliases": null,
-        "type": "ChatService"
+        "type": "ChatChoicesService"
       }
     }
   },
@@ -92,17 +92,17 @@
     }
   },
   {
-    "module": ".minichain.backends.llamacpp.streaming",
+    "module": ".minichain.backends.llamacpp.stream",
     "attr": null,
-    "file": "ommlds/minichain/backends/llamacpp/streaming.py",
+    "file": "ommlds/minichain/backends/llamacpp/stream.py",
     "line": 28,
     "value": {
       "$.minichain.registry.RegistryManifest": {
-        "mod_name": "ommlds.minichain.backends.llamacpp.streaming",
-        "attr_name": "LlamacppChatStreamService",
+        "mod_name": "ommlds.minichain.backends.llamacpp.stream",
+        "attr_name": "LlamacppChatChoicesStreamService",
         "name": "llamacpp",
         "aliases": null,
-        "type": "ChatStreamService"
+        "type": "ChatChoicesStreamService"
       }
     }
   },
@@ -114,10 +114,10 @@
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.mistral",
-        "attr_name": "MistralChatService",
+        "attr_name": "MistralChatChoicesService",
         "name": "mistral",
         "aliases": null,
-        "type": "ChatService"
+        "type": "ChatChoicesService"
       }
     }
   },
@@ -125,14 +125,14 @@
     "module": ".minichain.backends.mlx.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/mlx/chat.py",
-    "line": 28,
+    "line": 27,
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.mlx.chat",
-        "attr_name": "MlxChatService",
+        "attr_name": "MlxChatChoicesService",
         "name": "mlx",
         "aliases": null,
-        "type": "ChatService"
+        "type": "ChatChoicesService"
       }
     }
   },
@@ -144,10 +144,10 @@
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.openai.chat",
-        "attr_name": "OpenaiChatService",
+        "attr_name": "OpenaiChatChoicesService",
         "name": "openai",
         "aliases": null,
-        "type": "ChatService"
+        "type": "ChatChoicesService"
       }
     }
   },
@@ -182,17 +182,17 @@
     }
   },
   {
-    "module": ".minichain.backends.openai.streaming",
+    "module": ".minichain.backends.openai.stream",
     "attr": null,
-    "file": "ommlds/minichain/backends/openai/streaming.py",
-    "line": 28,
+    "file": "ommlds/minichain/backends/openai/stream.py",
+    "line": 29,
     "value": {
       "$.minichain.registry.RegistryManifest": {
-        "mod_name": "ommlds.minichain.backends.openai.streaming",
-        "attr_name": "OpenaiChatStreamService",
+        "mod_name": "ommlds.minichain.backends.openai.stream",
+        "attr_name": "OpenaiChatChoicesStreamService",
         "name": "openai",
         "aliases": null,
-        "type": "ChatStreamService"
+        "type": "ChatChoicesStreamService"
       }
     }
   },
@@ -204,10 +204,10 @@
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.tinygrad.chat",
-        "attr_name": "TinygradLlama3ChatService",
+        "attr_name": "TinygradLlama3ChatChoicesService",
         "name": "tinygrad_llama3",
         "aliases": null,
-        "type": "ChatService"
+        "type": "ChatChoicesService"
       }
     }
   },
@@ -253,12 +253,24 @@
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.transformers.transformers",
-        "attr_name": "TransformersChatService",
+        "attr_name": "TransformersChatChoicesService",
         "name": "transformers",
         "aliases": [
           "tfm"
         ],
-        "type": "ChatService"
+        "type": "ChatChoicesService"
+      }
+    }
+  },
+  {
+    "module": ".minichain.chat.choices.services",
+    "attr": null,
+    "file": "ommlds/minichain/chat/choices/services.py",
+    "line": 47,
+    "value": {
+      "$.minichain.registry.RegistryTypeManifest": {
+        "mod_name": "ommlds.minichain.chat.choices.services",
+        "attr_name": "ChatChoicesService"
       }
     }
   },
@@ -266,7 +278,7 @@
     "module": ".minichain.chat.services",
     "attr": null,
     "file": "ommlds/minichain/chat/services.py",
-    "line": 36,
+    "line": 47,
     "value": {
       "$.minichain.registry.RegistryTypeManifest": {
         "mod_name": "ommlds.minichain.chat.services",
@@ -275,14 +287,14 @@
     }
   },
   {
-    "module": ".minichain.chat.streaming",
+    "module": ".minichain.chat.stream.services",
     "attr": null,
-    "file": "ommlds/minichain/chat/streaming.py",
-    "line": 27,
+    "file": "ommlds/minichain/chat/stream/services.py",
+    "line": 51,
     "value": {
       "$.minichain.registry.RegistryTypeManifest": {
-        "mod_name": "ommlds.minichain.chat.streaming",
-        "attr_name": "ChatStreamService"
+        "mod_name": "ommlds.minichain.chat.stream.services",
+        "attr_name": "ChatChoicesStreamService"
       }
     }
   },

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/__about__.py

@@ -37,7 +37,7 @@ class Project(ProjectBase):
         ],
 
         'huggingface': [
-            'huggingface-hub ~= 0.32',
+            'huggingface-hub ~= 0.33',
             'datasets ~= 3.6',
         ],
 

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/cli/sessions/chat.py

@@ -41,13 +41,13 @@ class ChatState:
 
 DEFAULT_CHAT_MODEL_BACKEND = 'openai'
 
-CHAT_MODEL_FACTORIES: ta.Mapping[str, ta.Callable[..., mc.ChatService]] = {}
+CHAT_CHOICES_SERVICE_FACTORIES: ta.Mapping[str, ta.Callable[..., mc.ChatChoicesService]] = {}
 
 
 ##
 
 
-ChatOption: ta.TypeAlias = mc.ChatRequestOption | mc.LlmRequestOption
+ChatOption: ta.TypeAlias = mc.ChatChoicesRequestOptions
 ChatOptions = ta.NewType('ChatOptions', ta.Sequence[ChatOption])
 
 
@@ -102,8 +102,8 @@ class PromptChatSession(Session['PromptChatSession.Config']):
             backend = DEFAULT_CHAT_MODEL_BACKEND
 
         if self._config.stream:
-            with lang.maybe_managing(mc.registry_of[mc.ChatStreamService].new(backend)) as st_mdl:
-                with st_mdl.invoke(mc.ChatRequest(
+            with lang.maybe_managing(mc.registry_of[mc.ChatChoicesStreamService].new(backend)) as st_mdl:
+                with st_mdl.invoke(mc.ChatChoicesStreamRequest(
                         chat,
                         (self._chat_options or []),
                 )).v as st_resp:
@@ -121,16 +121,16 @@ class PromptChatSession(Session['PromptChatSession.Config']):
                 chat.append(resp_m)
 
         else:
-            csf: ta.Callable[..., mc.ChatService]
-            if (bf := CHAT_MODEL_FACTORIES.get(backend)) is not None:
+            csf: ta.Callable[..., mc.ChatChoicesService]
+            if (bf := CHAT_CHOICES_SERVICE_FACTORIES.get(backend)) is not None:
                 csf = bf
             else:
-                csf = functools.partial(mc.registry_of[mc.ChatService].new, backend)
+                csf = functools.partial(mc.registry_of[mc.ChatChoicesService].new, backend)
 
             with lang.maybe_managing(csf(
                     *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),
             )) as mdl:
-                response = mdl.invoke(mc.ChatRequest(
+                response = mdl.invoke(mc.ChatChoicesRequest(
                     chat,
                     (self._chat_options or []),
                 ))
@@ -157,7 +157,7 @@ class PromptChatSession(Session['PromptChatSession.Config']):
                     tool_res = tool.fn(**tr.args)
                     chat.append(mc.ToolExecResultMessage(tr.id, tr.spec.name, json.dumps(tool_res)))
 
-                    response = mdl.invoke(mc.ChatRequest(
+                    response = mdl.invoke(mc.ChatChoicesRequest(
                         chat,
                         (self._chat_options or []),
                     ))
@@ -219,11 +219,11 @@ class InteractiveChatSession(Session['InteractiveChatSession.Config']):
         if backend is None:
             backend = DEFAULT_CHAT_MODEL_BACKEND
 
-        csf: ta.Callable[..., mc.ChatService]
-        if (bf := CHAT_MODEL_FACTORIES.get(backend)) is not None:
+        csf: ta.Callable[..., mc.ChatChoicesService]
+        if (bf := CHAT_CHOICES_SERVICE_FACTORIES.get(backend)) is not None:
             csf = bf
         else:
-            csf = functools.partial(mc.registry_of[mc.ChatService].new, backend)
+            csf = functools.partial(mc.registry_of[mc.ChatChoicesService].new, backend)
 
         with lang.maybe_managing(csf(
                 *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),
@@ -239,7 +239,7 @@ class InteractiveChatSession(Session['InteractiveChatSession.Config']):
                     ],
                 )
 
-                response = mdl.invoke(mc.ChatRequest(state.chat))
+                response = mdl.invoke(mc.ChatChoicesRequest(state.chat))
                 print(check.isinstance(response.v[0].m.s, str).strip())
 
                 state = dc.replace(

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/minichain/__init__.py

@@ -2,6 +2,39 @@
 
 ##
 
+from .chat.choices.services import (  # noqa
+    ChatChoicesRequestOption,
+    ChatChoicesRequestOptions,
+    ChatChoicesRequest,
+
+    ChatChoicesResponseOutput,
+    ChatChoicesResponseOutputs,
+    ChatChoicesResponse,
+
+    ChatChoicesService,
+
+    AbstractChatChoicesService,
+)
+
+from .chat.choices.types import (  # noqa
+    AiChoice,
+    AiChoices,
+)
+
+from .chat.stream.services import (  # noqa
+    ChatChoicesStreamRequestOption,
+    ChatChoicesStreamRequestOptions,
+    ChatChoicesStreamRequest,
+
+    ChatChoicesStreamResponseOutput,
+    ChatChoicesStreamResponseOutputs,
+    ChatChoicesStreamResponse,
+
+    ChatChoicesStreamService,
+
+    AbstractChatChoicesStreamService,
+)
+
 from .chat.formats import (  # noqa
     JSON_RESPONSE_FORMAT,
     JsonResponseFormat,
@@ -25,11 +58,6 @@ from .chat.messages import (  # noqa
     UserMessage,
 )
 
-from .chat.choices import (  # noqa
-    AiChoice,
-    AiChoices,
-)
-
 from .chat.services import (  # noqa
     ChatRequestOption,
     ChatRequestOptions,
@@ -40,12 +68,8 @@ from .chat.services import (  # noqa
     ChatResponse,
 
     ChatService,
-)
-
-from .chat.streaming import (  # noqa
-    ChatStreamResponse,
 
-    ChatStreamService,
+    AbstractChatService,
 )
 
 from .chat.templating import (  # noqa
@@ -62,11 +86,6 @@ from .chat.tools import (  # noqa
     Tool,
 )
 
-from .chat.types import (  # noqa
-    ChatRequestOption,
-    ChatResponseOutput,
-)
-
 ##
 
 from .content.content import (  # noqa
@@ -274,7 +293,7 @@ from .standard import (  # noqa
     DefaultRequestOptions,
 )
 
-from .streaming import (  # noqa
+from .stream import (  # noqa
     ResponseGenerator,
 
     StreamResponse,

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/minichain/backends/anthropic/chat.py

@@ -14,21 +14,21 @@ from omlish.formats import json
 from omlish.http import all as http
 from omlish.secrets.secrets import Secret
 
-from ...chat.choices import AiChoice
+from ...chat.choices.services import ChatChoicesRequest
+from ...chat.choices.services import ChatChoicesResponse
+from ...chat.choices.services import ChatChoicesService
+from ...chat.choices.types import AiChoice
 from ...chat.messages import AiMessage
 from ...chat.messages import Message
 from ...chat.messages import SystemMessage
 from ...chat.messages import UserMessage
-from ...chat.services import ChatRequest
-from ...chat.services import ChatResponse
-from ...chat.services import ChatService
 
 
 ##
 
 
-# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='anthropic', type='ChatService')
-class AnthropicChatService(ChatService):
+# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='anthropic', type='ChatChoicesService')
+class AnthropicChatChoicesService(ChatChoicesService):
     model: ta.ClassVar[str] = (
         'claude-3-5-sonnet-20241022'
         # 'claude-3-opus-20240229'
@@ -61,10 +61,10 @@ class AnthropicChatService(ChatService):
 
     def invoke(
             self,
-            request: ChatRequest,
+            request: ChatChoicesRequest,
             *,
             max_tokens: int = 4096,  # FIXME: ChatRequestOption
-    ) -> ChatResponse:
+    ) -> ChatChoicesResponse:
         messages = []
         system: str | None = None
         for i, m in enumerate(request.v):
@@ -97,6 +97,6 @@ class AnthropicChatService(ChatService):
 
         response = json.loads(check.not_none(raw_response.data).decode('utf-8'))
 
-        return ChatResponse([
+        return ChatChoicesResponse([
             AiChoice(AiMessage(response['content'][0]['text'])),  # noqa
         ])

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/minichain/backends/google/chat.py

@@ -7,14 +7,14 @@ from omlish import check
 from omlish.formats import json
 from omlish.http import all as http
 
-from ...chat.choices import AiChoice
+from ...chat.choices.services import ChatChoicesRequest
+from ...chat.choices.services import ChatChoicesResponse
+from ...chat.choices.services import ChatChoicesService
+from ...chat.choices.types import AiChoice
 from ...chat.messages import AiMessage
 from ...chat.messages import Message
 from ...chat.messages import SystemMessage
 from ...chat.messages import UserMessage
-from ...chat.services import ChatRequest
-from ...chat.services import ChatResponse
-from ...chat.services import ChatService
 from ...configs import consume_configs
 from ...standard import ApiKey
 from ...standard import ModelName
@@ -23,8 +23,8 @@ from ...standard import ModelName
 ##
 
 
-# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='google', type='ChatService')
-class GoogleChatService(ChatService):
+# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='google', type='ChatChoicesService')
+class GoogleChatChoicesService(ChatChoicesService):
     DEFAULT_MODEL_NAME: ta.ClassVar[str] = (
         'gemini-2.0-flash'
     )
@@ -56,8 +56,8 @@ class GoogleChatService(ChatService):
 
     def invoke(
             self,
-            request: ChatRequest,
-    ) -> ChatResponse:
+            request: ChatChoicesRequest,
+    ) -> ChatChoicesResponse:
         key = check.not_none(self._api_key).reveal()
 
         req_dct = {
@@ -83,7 +83,7 @@ class GoogleChatService(ChatService):
 
         resp_dct = json.loads(check.not_none(resp.data).decode('utf-8'))
 
-        return ChatResponse([
+        return ChatChoicesResponse([
             AiChoice(AiMessage(c['content']['parts'][0]['text']))
             for c in resp_dct['candidates']
         ])

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/minichain/backends/llamacpp/chat.py

@@ -9,12 +9,12 @@ from omlish import lang
 from omlish import typedvalues as tv
 
 from ....backends import llamacpp as lcu
-from ...chat.choices import AiChoice
+from ...chat.choices.services import ChatChoicesRequest
+from ...chat.choices.services import ChatChoicesRequestOptions
+from ...chat.choices.services import ChatChoicesResponse
+from ...chat.choices.services import ChatChoicesService
+from ...chat.choices.types import AiChoice
 from ...chat.messages import AiMessage
-from ...chat.services import ChatRequest
-from ...chat.services import ChatRequestOptions
-from ...chat.services import ChatResponse
-from ...chat.services import ChatService
 from ...chat.tools import Tool
 from ...configs import Config
 from ...configs import consume_configs
@@ -29,8 +29,8 @@ from .format import get_msg_content
 ##
 
 
-# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='llamacpp', type='ChatService')
-class LlamacppChatService(ChatService):
+# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='llamacpp', type='ChatChoicesService')
+class LlamacppChatChoicesService(ChatChoicesService):
     DEFAULT_MODEL_PATH: ta.ClassVar[str] = os.path.join(
         os.path.expanduser('~/.cache/huggingface/hub'),
         # 'models--meta-llama--Llama-3.2-3B-Instruct/snapshots/0cb88a4f764b7a12671c53f0838cd831a0843b95/llama-2-7b-chat.Q5_0.gguf',  # noqa
@@ -44,12 +44,12 @@ class LlamacppChatService(ChatService):
         with consume_configs(*configs) as cc:
             self._model_path = cc.pop(ModelPath(self.DEFAULT_MODEL_PATH))
 
-    _OPTION_KWARG_NAMES_MAP: ta.ClassVar[ta.Mapping[str, type[ChatRequestOptions]]] = dict(
+    _OPTION_KWARG_NAMES_MAP: ta.ClassVar[ta.Mapping[str, type[ChatChoicesRequestOptions]]] = dict(
         max_tokens=MaxTokens,
         temperatur=Temperature,
     )
 
-    def invoke(self, request: ChatRequest) -> ChatResponse:
+    def invoke(self, request: ChatChoicesRequest) -> ChatChoicesResponse:
         kwargs: dict = dict(
             # temperature=0,
             max_tokens=1024,
@@ -104,7 +104,7 @@ class LlamacppChatService(ChatService):
                 **kwargs,
             )
 
-            return ChatResponse([
+            return ChatChoicesResponse([
                 AiChoice(AiMessage(c['message']['content']))  # noqa
                 for c in output['choices']  # type: ignore
             ])

ommlds-0.0.0.dev334/ommlds/minichain/backends/llamacpp/streaming.py → ommlds-0.0.0.dev336/ommlds/minichain/backends/llamacpp/stream.py

@@ -8,16 +8,16 @@ from omlish import check
 from omlish import lang
 
 from ....backends import llamacpp as lcu
-from ...chat.choices import AiChoice
-from ...chat.choices import AiChoices
+from ...chat.choices.services import ChatChoicesResponseOutputs
+from ...chat.choices.types import AiChoice
+from ...chat.choices.types import AiChoices
 from ...chat.messages import AiMessage
-from ...chat.services import ChatRequest
-from ...chat.services import ChatResponseOutputs
-from ...chat.streaming import ChatStreamResponse
-from ...chat.streaming import ChatStreamService
+from ...chat.stream.services import ChatChoicesStreamRequest
+from ...chat.stream.services import ChatChoicesStreamResponse
+from ...chat.stream.services import ChatChoicesStreamService
 from ...resources import Resources
-from ...streaming import ResponseGenerator
-from .chat import LlamacppChatService
+from ...stream import ResponseGenerator
+from .chat import LlamacppChatChoicesService
 from .format import ROLES_MAP
 from .format import get_msg_content
 
@@ -25,8 +25,8 @@ from .format import get_msg_content
 ##
 
 
-# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='llamacpp', type='ChatStreamService')
-class LlamacppChatStreamService(ChatStreamService, lang.ExitStacked):
+# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='llamacpp', type='ChatChoicesStreamService')
+class LlamacppChatChoicesStreamService(ChatChoicesStreamService, lang.ExitStacked):
     def __init__(self) -> None:
         super().__init__()
 
@@ -35,11 +35,11 @@ class LlamacppChatStreamService(ChatStreamService, lang.ExitStacked):
     @lang.cached_function(transient=True)
     def _load_model(self) -> 'lcc.Llama':
         return self._enter_context(contextlib.closing(lcc.Llama(
-            model_path=LlamacppChatService.DEFAULT_MODEL_PATH,
+            model_path=LlamacppChatChoicesService.DEFAULT_MODEL_PATH,
             verbose=False,
         )))
 
-    def invoke(self, request: ChatRequest) -> ChatStreamResponse:
+    def invoke(self, request: ChatChoicesStreamRequest) -> ChatChoicesStreamResponse:
         lcu.install_logging_hook()
 
         with Resources.new() as rs:
@@ -62,7 +62,7 @@ class LlamacppChatStreamService(ChatStreamService, lang.ExitStacked):
 
             rs.enter_context(lang.defer(close_output))
 
-            def yield_choices() -> ta.Generator[AiChoices, None, ta.Sequence[ChatResponseOutputs] | None]:
+            def yield_choices() -> ta.Generator[AiChoices, None, ta.Sequence[ChatChoicesResponseOutputs] | None]:
                 for chunk in output:
                     check.state(chunk['object'] == 'chat.completion.chunk')
                     l: list[AiChoice] = []
@@ -77,4 +77,4 @@ class LlamacppChatStreamService(ChatStreamService, lang.ExitStacked):
                     yield l
                 return None
 
-            return ChatStreamResponse(rs.new_managed(ResponseGenerator(yield_choices())))
+            return ChatChoicesStreamResponse(rs.new_managed(ResponseGenerator(yield_choices())))

{ommlds-0.0.0.dev334 → ommlds-0.0.0.dev336}/ommlds/minichain/backends/mistral.py

@@ -8,21 +8,21 @@ from omlish import check
 from omlish.formats import json
 from omlish.http import all as http
 
-from ..chat.choices import AiChoice
+from ..chat.choices.services import ChatChoicesRequest
+from ..chat.choices.services import ChatChoicesResponse
+from ..chat.choices.services import ChatChoicesService
+from ..chat.choices.types import AiChoice
 from ..chat.messages import AiMessage
 from ..chat.messages import Message
 from ..chat.messages import SystemMessage
 from ..chat.messages import UserMessage
-from ..chat.services import ChatRequest
-from ..chat.services import ChatResponse
-from ..chat.services import ChatService
 
 
 ##
 
 
-# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='mistral', type='ChatService')
-class MistralChatService(ChatService):
+# @omlish-manifest ommlds.minichain.registry.RegistryManifest(name='mistral', type='ChatChoicesService')
+class MistralChatChoicesService(ChatChoicesService):
     model: ta.ClassVar[str] = 'mistral-large-latest'
 
     ROLES_MAP: ta.ClassVar[ta.Mapping[type[Message], str]] = {
@@ -47,8 +47,8 @@ class MistralChatService(ChatService):
 
     def invoke(
             self,
-            request: ChatRequest,
-    ) -> ChatResponse:
+            request: ChatChoicesRequest,
+    ) -> ChatChoicesResponse:
         if not (key := self._api_key):
             key = os.environ['MISTRAL_API_KEY']
 
@@ -76,7 +76,7 @@ class MistralChatService(ChatService):
 
         resp_dct = json.loads(check.not_none(resp.data).decode('utf-8'))
 
-        return ChatResponse([
+        return ChatChoicesResponse([
             AiChoice(AiMessage(c['message']['content']))
             for c in resp_dct['choices']
         ])