ommlds 0.0.0.dev499__tar.gz → 0.0.0.dev500__tar.gz

{ommlds-0.0.0.dev499/ommlds.egg-info → ommlds-0.0.0.dev500}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev499
+Version: 0.0.0.dev500
 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.dev499
+Requires-Dist: omlish==0.0.0.dev500
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev499; extra == "all"
+Requires-Dist: omdev==0.0.0.dev500; 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"
@@ -32,13 +32,13 @@ Requires-Dist: regex>=2025.0; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
-Requires-Dist: pillow~=12.0; extra == "all"
+Requires-Dist: pillow~=12.1; extra == "all"
 Requires-Dist: ddgs~=9.10; extra == "all"
 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.dev499; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev500; 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"
@@ -60,7 +60,7 @@ Provides-Extra: ocr
 Requires-Dist: pytesseract~=0.3; extra == "ocr"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
-Requires-Dist: pillow~=12.0; extra == "pillow"
+Requires-Dist: pillow~=12.1; extra == "pillow"
 Provides-Extra: search
 Requires-Dist: ddgs~=9.10; extra == "search"
 Provides-Extra: wiki

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds/.omlish-manifests.json

@@ -252,7 +252,7 @@
     "module": ".minichain.backends.impls.groq.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/groq/chat.py",
-    "line": 26,
+    "line": 27,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.groq.chat",
@@ -291,7 +291,7 @@
     "module": ".minichain.backends.impls.groq.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/groq/stream.py",
-    "line": 33,
+    "line": 34,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.groq.stream",

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds/__about__.py

@@ -59,7 +59,7 @@ class Project(ProjectBase):
         ],
 
         'pillow': [
-            'pillow ~= 12.0',
+            'pillow ~= 12.1',
         ],
 
         'search': [

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds/backends/anthropic/protocol/sse/events.py

@@ -56,6 +56,8 @@ class AnthropicSseDecoderEvents(lang.Namespace):
         delta: Delta
         usage: Usage
 
+        context_management: ta.Mapping[str, ta.Any] | None = None
+
     @dc.dataclass(frozen=True)
     class MessageStop(MessageEvent):
         pass

ommlds-0.0.0.dev500/ommlds/backends/groq/clients.py

@@ -0,0 +1,9 @@
+import typing as ta
+
+
+##
+
+
+REQUIRED_HTTP_HEADERS: ta.Mapping[bytes, bytes] = {
+    b'User-Agent': b'python-httpx/0.28.1',  # required or it 403's lol
+}

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds/minichain/backends/impls/groq/chat.py

@@ -7,6 +7,7 @@ from omlish.formats import json
 from omlish.http import all as http
 
 from .....backends.groq import protocol as pt
+from .....backends.groq.clients import REQUIRED_HTTP_HEADERS
 from ....chat.choices.services import ChatChoicesRequest
 from ....chat.choices.services import ChatChoicesResponse
 from ....chat.choices.services import static_check_is_chat_choices_service
@@ -65,6 +66,7 @@ class GroqChatChoicesService:
             headers={
                 http.consts.HEADER_CONTENT_TYPE: http.consts.CONTENT_TYPE_JSON,
                 http.consts.HEADER_AUTH: http.consts.format_bearer_auth_header(check.not_none(self._api_key).reveal()),
+                **REQUIRED_HTTP_HEADERS,
             },
             data=json.dumps(raw_request).encode('utf-8'),
             client=self._http_client,

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds/minichain/backends/impls/groq/stream.py

@@ -9,6 +9,7 @@ from omlish.http import sse
 from omlish.io.buffers import DelimitingBuffer
 
 from .....backends.groq import protocol as pt
+from .....backends.groq.clients import REQUIRED_HTTP_HEADERS
 from ....chat.choices.services import ChatChoicesOutputs
 from ....chat.choices.stream.services import ChatChoicesStreamRequest
 from ....chat.choices.stream.services import ChatChoicesStreamResponse
@@ -72,6 +73,7 @@ class GroqChatChoicesStreamService:
             headers={
                 http.consts.HEADER_CONTENT_TYPE: http.consts.CONTENT_TYPE_JSON,
                 http.consts.HEADER_AUTH: http.consts.format_bearer_auth_header(check.not_none(self._api_key).reveal()),
+                **REQUIRED_HTTP_HEADERS,
             },
             data=json.dumps(raw_request).encode('utf-8'),
         )

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds/minichain/wrappers/firstinwins.py

@@ -17,12 +17,20 @@ from .services import WrappedRequest
 from .services import WrappedRequestV
 from .services import WrappedResponse
 from .services import WrappedResponseV
+from .stream import WrappedStreamOutputT
+from .stream import WrapperStreamService
 
 
 with lang.auto_proxy_import(globals()):
     import asyncio
 
 
+AnyFirstInWinsService: ta.TypeAlias = ta.Union[
+    'FirstInWinsService',
+    'FirstInWinsStreamService',
+]
+
+
 ##
 
 
@@ -37,11 +45,14 @@ class FirstInWinsServiceExceptionGroup(ExceptionGroup):
 
 @dc.dataclass(frozen=True)
 class FirstInWinsServiceOutput(Output):
-    first_in_wins_service: 'FirstInWinsService'
+    first_in_wins_service: AnyFirstInWinsService
     response_service: Service
     service_exceptions: ta.Mapping[Service, Exception] | None = None
 
 
+##
+
+
 class FirstInWinsService(
     MultiWrapperService[
         WrappedRequestV,
@@ -57,6 +68,22 @@ class FirstInWinsService(
 ##
 
 
+class FirstInWinsStreamService(
+    WrapperStreamService[
+        WrappedRequestV,
+        WrappedOptionT,
+        WrappedResponseV,
+        WrappedOutputT,
+        WrappedStreamOutputT,
+    ],
+    lang.Abstract,
+):
+    pass
+
+
+##
+
+
 class AsyncioFirstInWinsService(
     FirstInWinsService[
         WrappedRequestV,

ommlds-0.0.0.dev500/ommlds/minichain/wrappers/retry.py

@@ -0,0 +1,147 @@
+"""
+TODO:
+ - tenacity shit
+  - exception filter
+  - sleep
+   - jitter
+ - stream retry:
+  - failed to open
+  - failed during stream
+   - buffer and replay??
+  - accept death mid-stream?
+"""
+import typing as ta
+
+from omlish import dataclasses as dc
+
+from ..types import Output
+from .services import WrappedOptionT
+from .services import WrappedOutputT
+from .services import WrappedRequest
+from .services import WrappedRequestV
+from .services import WrappedResponse
+from .services import WrappedResponseV
+from .services import WrappedService
+from .services import WrapperService
+from .stream import WrappedStreamOutputT
+from .stream import WrappedStreamResponse
+from .stream import WrappedStreamService
+from .stream import WrapperStreamService
+
+
+AnyRetryService: ta.TypeAlias = ta.Union[
+    'RetryService',
+    'RetryStreamService',
+]
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class RetryServiceMaxRetriesExceededError(Exception):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class RetryServiceOutput(Output):
+    retry_service: AnyRetryService
+    num_retries: int
+
+
+##
+
+
+class RetryService(
+    WrapperService[
+        WrappedRequestV,
+        WrappedOptionT,
+        WrappedResponseV,
+        WrappedOutputT,
+    ],
+):
+    DEFAULT_MAX_RETRIES: ta.ClassVar[int] = 3
+
+    def __init__(
+            self,
+            service: WrappedService,
+            *,
+            max_retries: int | None = None,
+    ) -> None:
+        super().__init__(service)
+
+        if max_retries is None:
+            max_retries = self.DEFAULT_MAX_RETRIES
+        self._max_retries = max_retries
+
+    async def invoke(self, request: WrappedRequest) -> WrappedResponse:
+        n = 0
+
+        while True:
+            try:
+                resp = await self._service.invoke(request)
+
+            except Exception as e:  # noqa
+                if n < self._max_retries:
+                    n += 1
+                    continue
+
+                raise RetryServiceMaxRetriesExceededError from e
+
+            return resp.with_outputs(RetryServiceOutput(
+                retry_service=self,
+                num_retries=n,
+            ))
+
+        raise RuntimeError  # unreachable
+
+
+##
+
+
+class RetryStreamService(
+    WrapperStreamService[
+        WrappedRequestV,
+        WrappedOptionT,
+        WrappedResponseV,
+        WrappedOutputT,
+        WrappedStreamOutputT,
+    ],
+):
+    DEFAULT_MAX_RETRIES: ta.ClassVar[int] = 3
+
+    def __init__(
+            self,
+            service: WrappedStreamService,
+            *,
+            max_retries: int | None = None,
+    ) -> None:
+        super().__init__(service)
+
+        if max_retries is None:
+            max_retries = self.DEFAULT_MAX_RETRIES
+        self._max_retries = max_retries
+
+    async def invoke(self, request: WrappedRequest) -> WrappedStreamResponse:
+        n = 0
+
+        while True:
+            try:
+                resp = await self._service.invoke(request)
+
+            except Exception as e:  # noqa
+                if n < self._max_retries:
+                    n += 1
+                    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.dev499 → ommlds-0.0.0.dev500/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev499
+Version: 0.0.0.dev500
 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.dev499
+Requires-Dist: omlish==0.0.0.dev500
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev499; extra == "all"
+Requires-Dist: omdev==0.0.0.dev500; 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"
@@ -32,13 +32,13 @@ Requires-Dist: regex>=2025.0; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
-Requires-Dist: pillow~=12.0; extra == "all"
+Requires-Dist: pillow~=12.1; extra == "all"
 Requires-Dist: ddgs~=9.10; extra == "all"
 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.dev499; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev500; 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"
@@ -60,7 +60,7 @@ Provides-Extra: ocr
 Requires-Dist: pytesseract~=0.3; extra == "ocr"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
-Requires-Dist: pillow~=12.0; extra == "pillow"
+Requires-Dist: pillow~=12.1; extra == "pillow"
 Provides-Extra: search
 Requires-Dist: ddgs~=9.10; extra == "search"
 Provides-Extra: wiki

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ ommlds/backends/google/protocol/types.py
 ommlds/backends/groq/__init__.py
 ommlds/backends/groq/_dataclasses.py
 ommlds/backends/groq/_marshal.py
+ommlds/backends/groq/clients.py
 ommlds/backends/groq/protocol.py
 ommlds/backends/llamacpp/__init__.py
 ommlds/backends/llamacpp/buildwheel.py

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/ommlds.egg-info/requires.txt

@@ -1,7 +1,7 @@
-omlish==0.0.0.dev499
+omlish==0.0.0.dev500
 
 [all]
-omdev==0.0.0.dev499
+omdev==0.0.0.dev500
 llama-cpp-python~=0.3
 tiktoken~=0.12
 tinygrad~=0.11
@@ -15,7 +15,7 @@ regex>=2025.0
 numpy>=1.26
 pytesseract~=0.3
 rapidocr-onnxruntime~=1.4
-pillow~=12.0
+pillow~=12.1
 ddgs~=9.10
 mwparserfromhell~=0.7
 wikitextparser~=0.56
@@ -55,10 +55,10 @@ pytesseract~=0.3
 rapidocr-onnxruntime~=1.4
 
 [omdev]
-omdev==0.0.0.dev499
+omdev==0.0.0.dev500
 
 [pillow]
-pillow~=12.0
+pillow~=12.1
 
 [search]
 ddgs~=9.10

{ommlds-0.0.0.dev499 → ommlds-0.0.0.dev500}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev499'
+version = '0.0.0.dev500'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,12 +24,12 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omlish == 0.0.0.dev499',
+    'omlish == 0.0.0.dev500',
 ]
 
 [project.optional-dependencies]
 all = [
-    'omdev == 0.0.0.dev499',
+    'omdev == 0.0.0.dev500',
     'llama-cpp-python ~= 0.3',
     'mlx ~= 0.30; sys_platform == "darwin"',
     'mlx-lm ~= 0.29; sys_platform == "darwin"',
@@ -45,14 +45,14 @@ all = [
     'numpy >= 1.26',
     'pytesseract ~= 0.3',
     'rapidocr-onnxruntime ~= 1.4',
-    'pillow ~= 12.0',
+    'pillow ~= 12.1',
     'ddgs ~= 9.10',
     'mwparserfromhell ~= 0.7',
     'wikitextparser ~= 0.56',
     'lxml >= 5.3; python_version < "3.13"',
 ]
 omdev = [
-    'omdev == 0.0.0.dev499',
+    'omdev == 0.0.0.dev500',
 ]
 backends = [
     'llama-cpp-python ~= 0.3',
@@ -80,7 +80,7 @@ ocr = [
     'rapidocr-onnxruntime ~= 1.4',
 ]
 pillow = [
-    'pillow ~= 12.0',
+    'pillow ~= 12.1',
 ]
 search = [
     'ddgs ~= 9.10',

ommlds-0.0.0.dev499/ommlds/minichain/wrappers/retry.py

@@ -1,78 +0,0 @@
-"""
-TODO:
- - tenacity shit
-  - exception filter
-  - sleep
-   - jitter
-"""
-import typing as ta
-
-from omlish import dataclasses as dc
-
-from ..types import Output
-from .services import WrappedOptionT
-from .services import WrappedOutputT
-from .services import WrappedRequest
-from .services import WrappedRequestV
-from .services import WrappedResponse
-from .services import WrappedResponseV
-from .services import WrappedService
-from .services import WrapperService
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class RetryServiceMaxRetriesExceededError(Exception):
-    pass
-
-
-@dc.dataclass(frozen=True)
-class RetryServiceOutput(Output):
-    retry_service: 'RetryService'
-    num_retries: int
-
-
-class RetryService(
-    WrapperService[
-        WrappedRequestV,
-        WrappedOptionT,
-        WrappedResponseV,
-        WrappedOutputT,
-    ],
-):
-    DEFAULT_MAX_RETRIES: ta.ClassVar[int] = 3
-
-    def __init__(
-            self,
-            service: WrappedService,
-            *,
-            max_retries: int | None = None,
-    ) -> None:
-        super().__init__(service)
-
-        if max_retries is None:
-            max_retries = self.DEFAULT_MAX_RETRIES
-        self._max_retries = max_retries
-
-    async def invoke(self, request: WrappedRequest) -> WrappedResponse:
-        n = 0
-
-        while True:
-            try:
-                resp = await self._service.invoke(request)
-
-            except Exception as e:  # noqa
-                if n < self._max_retries:
-                    n += 1
-                    continue
-
-                raise RetryServiceMaxRetriesExceededError from e
-
-            return resp.with_outputs(RetryServiceOutput(
-                retry_service=self,
-                num_retries=n,
-            ))
-
-        raise RuntimeError  # unreachable