ommlds 0.0.0.dev499__py3-none-any.whl → 0.0.0.dev503__py3-none-any.whl

ommlds/minichain/backends/impls/anthropic/names.py

@@ -14,9 +14,9 @@ from ...strings.manifests import BackendStringsManifest
 MODEL_NAMES = ModelNameCollection(
     default='claude',
     aliases={
-        'claude-opus-4-1-20250805': None,
-        'claude-opus-4-1': 'claude-opus-4-1-20250805',
-        'claude-opus': 'claude-opus-4-1',
+        'claude-opus-4-5-20251101': None,
+        'claude-opus-4-5': 'claude-opus-4-5-20251101',
+        'claude-opus': 'claude-opus-4-5',
 
         'claude-sonnet-4-5-20250929': None,
         'claude-sonnet-4-5': 'claude-sonnet-4-5-20250929',

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

@@ -105,7 +105,7 @@ class AnthropicChatChoicesStreamService:
                     for l in db.feed(b):
                         if isinstance(l, DelimitingBuffer.Incomplete):
                             # FIXME: handle
-                            return []
+                            raise TypeError(l)
 
                         # FIXME: https://docs.anthropic.com/en/docs/build-with-claude/streaming
                         for so in sd.process_line(l):

ommlds/minichain/backends/impls/cerebras/names.py

@@ -12,9 +12,24 @@ MODEL_NAMES = ModelNameCollection(
     default='gpt-oss-120b',
     aliases={
         'llama3.1-8b': None,
+
         'llama-3.3-70b': None,
+        'llama3': 'llama-3.3-70b',
+
         'gpt-oss-120b': None,
+        'gpt-oss': 'gpt-oss-120b',
+
         'qwen-3-32b': None,
+        'qwen3': 'qwen-3-32b',
+
+        ##
+        # preview
+
+        'qwen-3-235b-a22b-instruct-2507': None,
+        'qwen-3-235b': 'qwen-3-235b-a22b-instruct-2507',
+
+        'zai-glm-4.7': None,
+        'glm': 'zai-glm-4.7',
     },
 )
 

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

@@ -88,7 +88,7 @@ class CerebrasChatChoicesStreamService:
                     for l in db.feed(b):
                         if isinstance(l, DelimitingBuffer.Incomplete):
                             # FIXME: handle
-                            return []
+                            raise TypeError(l)
 
                         # FIXME: https://platform.openai.com/docs/guides/function-calling?api-mode=responses#streaming
                         for so in sd.process_line(l):

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

@@ -16,6 +16,12 @@ from ...strings.manifests import BackendStringsManifest
 MODEL_NAMES = ModelNameCollection(
     default='gemini',
     aliases={
+        'gemini-3-pro-preview': None,
+        'gemini-3-pro': 'gemini-3-pro-preview',
+
+        'gemini-3-flash-preview': None,
+        'gemini-3-flash': 'gemini-3-flash-preview',
+
         'gemini-2.5-pro': None,
         'gemini-2.5-flash': None,
         'gemini-2.5-flash-lite': None,

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

@@ -179,7 +179,7 @@ class GoogleChatChoicesStreamService:
                     for bl in db.feed(b):
                         if isinstance(bl, DelimitingBuffer.Incomplete):
                             # FIXME: handle
-                            return []
+                            raise TypeError(bl)
 
                         l = bl.decode('utf-8')
                         if not l:

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/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'),
         )
@@ -88,7 +90,7 @@ class GroqChatChoicesStreamService:
                     for l in db.feed(b):
                         if isinstance(l, DelimitingBuffer.Incomplete):
                             # FIXME: handle
-                            return []
+                            raise TypeError(l)
 
                         # FIXME: https://platform.openai.com/docs/guides/function-calling?api-mode=responses#streaming
                         for so in sd.process_line(l):

ommlds/minichain/backends/impls/ollama/chat.py

@@ -179,7 +179,7 @@ class OllamaChatChoicesStreamService(BaseOllamaChatChoicesService):
                     for l in db.feed(b):
                         if isinstance(l, DelimitingBuffer.Incomplete):
                             # FIXME: handle
-                            return []
+                            raise TypeError(l)
 
                         lj = json.loads(l.decode('utf-8'))
                         lp: pt.ChatResponse = msh.unmarshal(lj, pt.ChatResponse)

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

@@ -145,7 +145,8 @@ def build_mc_ai_delta(delta: pt.ChatCompletionChunkChoiceDelta) -> AiDelta:
         )
 
     else:
-        raise ValueError(delta)
+        # FIXME: no
+        return ContentAiDelta('')
 
 
 ##

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

@@ -4,6 +4,7 @@ https://platform.openai.com/docs/api-reference/responses-streaming
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import marshal as msh
 from omlish import typedvalues as tv
 from omlish.formats import json
@@ -35,6 +36,12 @@ from .names import CHAT_MODEL_NAMES
 ##
 
 
+@dc.dataclass()
+class OpenaiChatChoicesStreamServiceError(Exception):
+    status: int
+    data: ta.Any | None = None
+
+
 # @omlish-manifest $.minichain.registries.manifests.RegistryManifest(
 #     name='openai',
 #     type='ChatChoicesStreamService',
@@ -90,18 +97,43 @@ class OpenaiChatChoicesStreamService:
             http_client = await rs.enter_async_context(http.manage_async_client(self._http_client))
             http_response = await rs.enter_async_context(await http_client.stream_request(http_request))
 
+            if http_response.status != 200:
+                data: ta.Any
+                try:
+                    data = await http_response.stream.readall()
+                except Exception as e:  # noqa
+                    data = e
+                try:
+                    data_obj = json.loads(data.decode())
+                except Exception as e:  # noqa
+                    pass
+                else:
+                    data = data_obj
+                raise OpenaiChatChoicesStreamServiceError(http_response.status, data)
+
             async def inner(sink: StreamResponseSink[AiChoicesDeltas]) -> ta.Sequence[ChatChoicesOutputs]:
                 db = DelimitingBuffer([b'\r', b'\n', b'\r\n'])
                 sd = sse.SseDecoder()
+
+                # bs = []
+                # ls = []
+                # sos = []
+
                 while True:
                     b = await http_response.stream.read1(self.READ_CHUNK_SIZE)
+                    # bs.append(b)
+
                     for l in db.feed(b):
+                        # ls.append(l)
+
                         if isinstance(l, DelimitingBuffer.Incomplete):
                             # FIXME: handle
-                            return []
+                            raise TypeError(l)
 
                         # FIXME: https://platform.openai.com/docs/guides/function-calling?api-mode=responses#streaming
                         for so in sd.process_line(l):
+                            # sos.append(so)
+
                             if isinstance(so, sse.SseEvent) and so.type == b'message':
                                 ss = so.data.decode('utf-8')
                                 if ss == '[DONE]':

ommlds/minichain/chat/messages.py

@@ -41,7 +41,7 @@ class Message(  # noqa
     def replace(self, **kwargs: ta.Any) -> ta.Self:
         if (n := dc.replace_is_not(self, **kwargs)) is self:
             return self
-        return n.update_metadata(MessageOriginal(self), discard=[MessageOriginal], override=True)
+        return n.with_metadata(MessageOriginal(self), discard=[MessageOriginal], override=True)
 
 
 Chat: ta.TypeAlias = ta.Sequence[Message]

ommlds/minichain/chat/stream/joining.py

@@ -22,8 +22,9 @@ class AiDeltaJoiner:
     def __init__(self) -> None:
         super().__init__()
 
-        self._deltas: list[AiDelta] = []
-        self._messages: list[AnyAiMessage] = []
+        self._all: list[AiDelta] = []
+        self._queue: list[AiDelta] = []
+        self._out: list[AnyAiMessage] = []
 
     def _build_joined(self, deltas: ta.Sequence[AiDelta]) -> AnyAiMessage:
         dty = check.single(set(map(type, check.not_empty(deltas))))
@@ -43,6 +44,9 @@ class AiDeltaJoiner:
 
             ra = ''.join(filter(None, (td.raw_args for td in tds)))
 
+            if not ra:
+                ra = '{}'
+
             return ToolUseMessage(ToolUse(
                 id=tds[0].id,
                 name=check.non_empty_str(tds[0].name),
@@ -53,19 +57,39 @@ class AiDeltaJoiner:
         else:
             raise TypeError(dty)
 
-    def _maybe_join(self) -> None:
-        if not self._deltas:
+    def _join(self) -> None:
+        if not self._queue:
             return
 
-        self._messages.append(self._build_joined(self._deltas))
-        self._deltas.clear()
+        self._out.append(self._build_joined(self._queue))
+        self._queue.clear()
+
+    def _should_join(self, *, new: AiDelta | None = None) -> bool:
+        if not self._queue:
+            return False
+
+        if new is not None and type(self._queue[0]) is not type(new):
+            return True
+
+        if (
+                isinstance(d0 := self._queue[0], PartialToolUseAiDelta) and
+                isinstance(new, PartialToolUseAiDelta) and
+                d0.id is not None and
+                new.id is not None and
+                d0.id != new.id
+        ):
+            return True
+
+        return False
 
     def _add_one(self, d: AiDelta) -> None:
-        if self._deltas and type(self._deltas[0]) is not type(d):
-            self._maybe_join()
+        if self._should_join(new=d):
+            self._join()
+
+        self._all.append(d)
 
         if isinstance(d, ToolUseAiDelta):
-            self._messages.append(ToolUseMessage(ToolUse(
+            self._out.append(ToolUseMessage(ToolUse(
                 id=d.id,
                 name=check.not_none(d.name),
                 args=d.args or {},
@@ -73,13 +97,13 @@ class AiDeltaJoiner:
             )))
 
         else:
-            self._deltas.append(d)
+            self._queue.append(d)
 
     def add(self, deltas: AiDeltas) -> None:
         for d in deltas:
             self._add_one(d)
 
     def build(self) -> AiChat:
-        self._maybe_join()
+        self._join()
 
-        return list(self._messages)
+        return list(self._out)

ommlds/minichain/chat/transforms/metadata.py

@@ -26,7 +26,7 @@ class UuidAddingMessageTransform(MessageTransform):
 
     def transform_message(self, m: Message) -> Chat:
         if Uuid not in m.metadata:
-            m = m.update_metadata(Uuid(self.uuid_factory()))
+            m = m.with_metadata(Uuid(self.uuid_factory()))
         return [m]
 
 
@@ -36,7 +36,7 @@ class CreatedAtAddingMessageTransform(MessageTransform):
 
     def transform_message(self, m: Message) -> Chat:
         if CreatedAt not in m.metadata:
-            m = m.update_metadata(CreatedAt(self.clock()))
+            m = m.with_metadata(CreatedAt(self.clock()))
         return [m]
 
 
@@ -54,6 +54,6 @@ class OriginAddingMessageTransform(MessageTransform):
 
     def transform_message(self, m: Message) -> Chat:
         return [
-            o.update_metadata(TransformedMessageOrigin(m)) if TransformedMessageOrigin not in o.metadata else m
+            o.with_metadata(TransformedMessageOrigin(m)) if TransformedMessageOrigin not in o.metadata else m
             for o in self.child.transform_message(m)
         ]

ommlds/minichain/content/standard.py

@@ -29,4 +29,4 @@ class StandardContent(  # noqa
     def replace(self, **kwargs: ta.Any) -> ta.Self:
         if (n := dc.replace_is_not(self, **kwargs)) is self:
             return self
-        return n.update_metadata(ContentOriginal(self), discard=[ContentOriginal], override=True)
+        return n.with_metadata(ContentOriginal(self), discard=[ContentOriginal], override=True)

ommlds/minichain/content/transform/json.py

@@ -52,4 +52,4 @@ class JsonContentRenderer(ContentTransform[None]):
             case _:
                 raise ValueError(self._code)
 
-        return nc.update_metadata(ContentOriginal(c))
+        return nc.with_metadata(ContentOriginal(c))

ommlds/minichain/content/transform/metadata.py

@@ -9,7 +9,7 @@ from ..visitors import ContentTransform
 
 class OriginalMetadataStrippingContentTransform(ContentTransform[None]):
     def visit_standard_content(self, c: StandardContent, ctx: None) -> StandardContent:
-        return c.discard_metadata(ContentOriginal)
+        return c.with_metadata(discard=[ContentOriginal])
 
 
 def strip_content_original_metadata(c: Content) -> Content:

ommlds/minichain/content/transform/standard.py

@@ -26,7 +26,7 @@ class LiftToStandardContentTransform(ContentTransform[None]):
         self._sequence_mode = sequence_mode
 
     def visit_str(self, s: str, ctx: None) -> Content:
-        return TextContent(s).update_metadata(ContentOriginal(s))
+        return TextContent(s).with_metadata(ContentOriginal(s))
 
     def visit_sequence(self, c: ta.Sequence[Content], ctx: None) -> Content:
         cc = check.isinstance(super().visit_sequence(c, ctx), collections.abc.Sequence)
@@ -40,4 +40,4 @@ class LiftToStandardContentTransform(ContentTransform[None]):
             case _:
                 raise ValueError(self._sequence_mode)
 
-        return nc.update_metadata(ContentOriginal(c))
+        return nc.with_metadata(ContentOriginal(c))

ommlds/minichain/content/transform/strings.py

@@ -20,7 +20,7 @@ class StringFnContentTransform(ContentTransform[None]):
     fn: ta.Callable[[str], str]
 
     def visit_str(self, c: str, ctx: None) -> TextContent:
-        return TextContent(self.fn(c)).update_metadata(ContentOriginal(c))
+        return TextContent(self.fn(c)).with_metadata(ContentOriginal(c))
 
     def visit_text_content(self, c: TextContent, ctx: None) -> TextContent:
         return c.replace(s=self.fn(c.s))

ommlds/minichain/content/transform/templates.py

@@ -22,4 +22,4 @@ class TemplateContentMaterializer(ContentTransform[None]):
 
     def visit_template_content(self, c: TemplateContent, ctx: None) -> Content:
         s = c.t.render(check.not_none(self._templater_context))
-        return TextContent(s).update_metadata(ContentOriginal(c))
+        return TextContent(s).with_metadata(ContentOriginal(c))

ommlds/minichain/metadata.py

@@ -25,9 +25,9 @@ MetadataT = ta.TypeVar('MetadataT', bound=Metadata)
 
 
 class MetadataContainer(
-    tv.TypedValueGeneric[MetadataT],
     lang.Abstract,
     lang.PackageSealed,
+    ta.Generic[MetadataT],
 ):
     @property
     @abc.abstractmethod
@@ -35,7 +35,12 @@ class MetadataContainer(
         raise NotImplementedError
 
     @abc.abstractmethod
-    def update_metadata(self, *mds: MetadataT, override: bool = False) -> ta.Self:
+    def with_metadata(
+            self,
+            *add: MetadataT,
+            discard: ta.Iterable[type] | None = None,
+            override: bool = False,
+    ) -> ta.Self:
         raise NotImplementedError
 
 
@@ -66,30 +71,22 @@ class MetadataContainerDataclass(  # noqa
     def metadata(self) -> tv.TypedValues[MetadataT]:
         return check.isinstance(getattr(self, '_metadata'), tv.TypedValues)
 
-    def discard_metadata(self, *tys: type) -> ta.Self:
-        nmd = (md := self.metadata).discard(*tys)
-
-        if nmd is md:
-            return self
-
-        return dc.replace(self, _metadata=nmd)  # type: ignore[call-arg]  # noqa
-
-    def update_metadata(
+    def with_metadata(
             self,
-            *mds: MetadataT,
+            *add: MetadataT,
             discard: ta.Iterable[type] | None = None,
             override: bool = False,
     ) -> ta.Self:
-        nmd = (md := self.metadata).update(
-            *mds,
+        new = (old := self.metadata).update(
+            *add,
             discard=discard,
             override=override,
         )
 
-        if nmd is md:
+        if new is old:
             return self
 
-        return dc.replace(self, _metadata=nmd)  # type: ignore[call-arg]  # noqa
+        return dc.replace(self, _metadata=new)  # type: ignore[call-arg]  # noqa
 
 
 ##

ommlds/minichain/resources.py

@@ -33,6 +33,10 @@ class ResourcesRefNotRegisteredError(Exception):
 
 @ta.final
 class Resources(lang.Final, lang.NotPicklable):
+    """
+    Essentially a reference-tracked AsyncContextManager.
+    """
+
     def __init__(
             self,
             *,
@@ -80,10 +84,14 @@ class Resources(lang.Final, lang.NotPicklable):
         @contextlib.asynccontextmanager
         async def inner():
             init_ref = Resources._InitRef()
+
             res = Resources(init_ref=init_ref, **kwargs)
+
             await res.init()
+
             try:
                 yield res
+
             finally:
                 await res.remove_ref(init_ref)
 
@@ -94,6 +102,7 @@ class Resources(lang.Final, lang.NotPicklable):
     def add_ref(self, ref: ResourcesRef) -> None:
         check.isinstance(ref, ResourcesRef)
         check.state(not self._closed)
+
         self._refs.add(ref)
 
     def has_ref(self, ref: ResourcesRef) -> bool:
@@ -101,10 +110,13 @@ class Resources(lang.Final, lang.NotPicklable):
 
     async def remove_ref(self, ref: ResourcesRef) -> None:
         check.isinstance(ref, ResourcesRef)
+
         try:
             self._refs.remove(ref)
+
         except KeyError:
             raise ResourcesRefNotRegisteredError(ref) from None
+
         if not self._no_autoclose and not self._refs:
             await self.aclose()
 
@@ -112,10 +124,12 @@ class Resources(lang.Final, lang.NotPicklable):
 
     def enter_context(self, cm: ta.ContextManager[T]) -> T:
         check.state(not self._closed)
+
         return self._aes.enter_context(cm)
 
     async def enter_async_context(self, cm: ta.AsyncContextManager[T]) -> T:
         check.state(not self._closed)
+
         return await self._aes.enter_async_context(cm)
 
     #
@@ -150,7 +164,11 @@ class Resources(lang.Final, lang.NotPicklable):
 class ResourceManaged(ResourcesRef, lang.Final, lang.NotPicklable, ta.Generic[T]):
     """
     A class to 'handoff' a ref to a `Resources`, allowing the `Resources` to temporarily survive being passed from
-    instantiation within a callee to being `__aenter__`'d in the caller.
+    instantiation within a callee.
+
+    This class wraps an arbitrary value, likely an object referencing resources managed by the `Resources`, which is
+    accessed by `__aenter__`'ing. However, as the point of this class is handoff of a `Resources`, not necessarily some
+    arbitrary value, the value needn't necessarily be related to the `Resources`, or may even be `None`.
 
     The ref to the `Resources` is allocated in the ctor, so the contract is that an instance of this must be immediately
     `__aenter__`'d before doing anything else with the return value of the call. Failure to do so leaks the `Resources`.
@@ -172,11 +190,13 @@ class ResourceManaged(ResourcesRef, lang.Final, lang.NotPicklable, ta.Generic[T]
     async def __aenter__(self) -> T:
         check.state(self.__state == 'new')
         self.__state = 'entered'
+
         return self.__v
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         check.state(self.__state == 'entered')
         self.__state = 'exited'
+
         await self.__resources.remove_ref(self)
 
     def __del__(self) -> None:
@@ -203,6 +223,7 @@ class UseResources(tv.UniqueScalarTypedValue[Resources], ResourcesOption, lang.F
         if (ur := tv.as_collection(options).get(UseResources)) is not None:
             async with ResourceManaged(ur.v, ur.v) as rs:
                 yield rs
+
         else:
             async with Resources.new() as rs:
                 yield rs