ommlds 0.0.0.dev447__py3-none-any.whl → 0.0.0.dev448__py3-none-any.whl

ommlds/.omlish-manifests.json

@@ -138,7 +138,7 @@
     "module": ".minichain.backends.impls.google.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/google/stream.py",
-    "line": 34,
+    "line": 36,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.google.stream",

ommlds/minichain/backends/impls/google/stream.py

@@ -19,7 +19,9 @@ from ....chat.messages import UserMessage
 from ....chat.stream.services import ChatChoicesStreamRequest
 from ....chat.stream.services import ChatChoicesStreamResponse
 from ....chat.stream.services import static_check_is_chat_choices_stream_service
+from ....chat.stream.types import AiChoiceDelta
 from ....chat.stream.types import AiChoiceDeltas
+from ....chat.stream.types import AiMessageDelta
 from ....models.configs import ModelName
 from ....resources import UseResources
 from ....standard import ApiKey
@@ -64,6 +66,8 @@ class GoogleChatChoicesStreamService:
         AiMessage: 'assistant',
     }
 
+    READ_CHUNK_SIZE = 64 * 1024
+
     async def invoke(
             self,
             request: ChatChoicesStreamRequest,
@@ -87,7 +91,7 @@ class GoogleChatChoicesStreamService:
         model_name = MODEL_NAMES.resolve(self._model_name.v)
 
         http_request = http.HttpRequest(
-            f'{self.BASE_URL.rstrip("/")}/{model_name}:generateContent?key={key}',
+            f'{self.BASE_URL.rstrip("/")}/{model_name}:streamGenerateContent?alt=sse&key={key}',
             headers={'Content-Type': 'application/json'},
             data=json.dumps_compact(req_dct).encode('utf-8'),
             method='POST',
@@ -111,6 +115,11 @@ class GoogleChatChoicesStreamService:
                             continue
                         if l.startswith('data: '):
                             gcr = msh.unmarshal(json.loads(l[6:]), pt.GenerateContentResponse)  # noqa
-                            await sink.emit([])
+                            cnd = check.single(check.not_none(gcr.candidates))
+                            for p in check.not_none(cnd.content).parts or []:
+                                await sink.emit([AiChoiceDelta(AiMessageDelta(check.not_none(p.text)))])
+
+                    if not b:
+                        return []
 
             return await new_stream_response(rs, inner)

ommlds/minichain/stream/services.py

@@ -1,5 +1,6 @@
 import abc
 import itertools
+import types
 import typing as ta
 
 from omlish import check
@@ -40,15 +41,11 @@ class StreamResponseSink(lang.Abstract, ta.Generic[V]):
         raise NotImplementedError
 
 
-class StreamResponseIterator(lang.Abstract, ta.Generic[V, OutputT]):
-    @abc.abstractmethod
-    def __aenter__(self) -> ta.Awaitable[ta.Self]:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def __aexit__(self, exc_type, exc_val, exc_tb) -> ta.Awaitable[None]:
-        raise NotImplementedError
-
+class StreamResponseIterator(
+    ta.AsyncContextManager['StreamResponseIterator[V, OutputT]'],
+    lang.Abstract,
+    ta.Generic[V, OutputT],
+):
     @property
     @abc.abstractmethod
     def outputs(self) -> tv.TypedValues[OutputT]:
@@ -120,7 +117,8 @@ class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
         self._g = iter(self._a)
         return self
 
-    async def __aexit__(self, exc_type, exc_val, exc_tb) -> None:
+    @types.coroutine
+    def _aexit(self, exc_type, exc_val, exc_tb):
         old_state = self._state
         self._state = 'closed'
         if old_state != 'running':
@@ -137,7 +135,7 @@ class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
                     if cex2 is cex:
                         break
                     raise
-                await x
+                yield x
         if self._cr.cr_running:
             raise RuntimeError(f'Coroutine {self._cr!r} not terminated')
         if self._g is not self._a:
@@ -145,13 +143,17 @@ class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
         self._a.close()
         self._cr.close()
 
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        return await self._aexit(exc_type, exc_val, exc_tb)
+
     _outputs: tv.TypedValues[OutputT]
 
     @property
     def outputs(self) -> tv.TypedValues[OutputT]:
         return self._outputs
 
-    async def __anext__(self) -> V:
+    @types.coroutine
+    def _anext(self):
         check.state(self._state == 'running')
         while True:
             try:
@@ -168,7 +170,10 @@ class _StreamServiceResponse(StreamResponseIterator[V, OutputT]):
                 x.done = True
                 return x.value
 
-            await x
+            yield x
+
+    async def __anext__(self) -> V:
+        return await self._anext()
 
 
 ##

{ommlds-0.0.0.dev447.dist-info → ommlds-0.0.0.dev448.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev447
+Version: 0.0.0.dev448
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev447
-Requires-Dist: omlish==0.0.0.dev447
+Requires-Dist: omdev==0.0.0.dev448
+Requires-Dist: omlish==0.0.0.dev448
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev447.dist-info → ommlds-0.0.0.dev448.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=0nHO21Xk5kpNbvdLvitrGGWPsn0baEhGD9I835QE_Es,17984
+ommlds/.omlish-manifests.json,sha256=s92cmVTNvGiopN6a0kMNziKvMkcePcRspm8dsIL6_SM,17984
 ommlds/__about__.py,sha256=Z9VIVQnuNBbIYEtIm9XZU4T2QGRqMNjtmQX2OOTaUc0,1759
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/huggingface.py,sha256=JfEyfKOxU3-SY_ojtXBJFNeD-NIuKjvMe3GL3e93wNA,1175
@@ -133,7 +133,7 @@ ommlds/minichain/backends/impls/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 ommlds/minichain/backends/impls/google/chat.py,sha256=Dq_PrkRt07dN5A3UPj0qwB3IMIS9caAQff6076q6kUQ,3192
 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=3XWZwYFQrA8U_QIexjJkjaWfLo2lfLbF_x7DsqcNRF4,4313
+ommlds/minichain/backends/impls/google/stream.py,sha256=8DbgK61HRovW1dq_VBXYDnjU7oVFsE2DmCfLLHoznNI,4736
 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=8BDxJmra9elSQL2vzp2nr2p4Hpq56A3zTk7hTTnfJU4,861
@@ -242,7 +242,7 @@ ommlds/minichain/services/requests.py,sha256=VAfKbYu4T0CZTWVQmZ2LUmYU7DNm6IerYMN
 ommlds/minichain/services/responses.py,sha256=4W6Z4Fx4_GFqKgle27OeLr0zzjVTA0pkZrlsZiFQNdo,1534
 ommlds/minichain/services/services.py,sha256=WjkQNYIp87SflLSReOHMkG2qIVAOem6vsrs_2NxWN_M,325
 ommlds/minichain/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/stream/services.py,sha256=OQ-CjCM8iKYReTg8aj0VK3XzZLdRude86kg6FNr-wew,5279
+ommlds/minichain/stream/services.py,sha256=fFR1klP_PZJ3Pqmqx_SGap8gRDuthJah1fyoke6G9Ww,5328
 ommlds/minichain/stream/wrap.py,sha256=nQC0aCi49I18nF0Yx8qiiLkhIAECV6s6o4pvOy5Kx98,2041
 ommlds/minichain/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/text/applypatch.py,sha256=YIN5JChJ0FXyK1I6OiAHQmE7BT-exHfaAMM9ay7ylyc,17705
@@ -300,9 +300,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.dev447.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev447.dist-info/METADATA,sha256=a2muFyUNAsNLhxd5yCTZTUo1ZwX7RpjX8HI03hB57Lc,3224
-ommlds-0.0.0.dev447.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev447.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev447.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev447.dist-info/RECORD,,
+ommlds-0.0.0.dev448.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev448.dist-info/METADATA,sha256=olU6t7Q0JXStieKFJ3XjgEQTA3bIlhtdzysQ_UW0ak0,3224
+ommlds-0.0.0.dev448.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev448.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev448.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev448.dist-info/RECORD,,