ommlds 0.0.0.dev441__tar.gz → 0.0.0.dev443__tar.gz

{ommlds-0.0.0.dev441/ommlds.egg-info → ommlds-0.0.0.dev443}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev441
+Version: 0.0.0.dev443
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,12 +14,12 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev441
-Requires-Dist: omlish==0.0.0.dev441
+Requires-Dist: omdev==0.0.0.dev443
+Requires-Dist: omlish==0.0.0.dev443
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"
-Requires-Dist: mlx-lm~=0.27; sys_platform == "darwin" and extra == "all"
+Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "all"
 Requires-Dist: tiktoken~=0.11; extra == "all"
 Requires-Dist: tinygrad~=0.11; extra == "all"
 Requires-Dist: tokenizers~=0.22; extra == "all"
@@ -32,14 +32,14 @@ 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~=11.3; extra == "all"
-Requires-Dist: ddgs~=9.5; extra == "all"
+Requires-Dist: ddgs~=9.6; 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: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.29; extra == "backends"
-Requires-Dist: mlx-lm~=0.27; sys_platform == "darwin" and extra == "backends"
+Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "backends"
 Requires-Dist: tiktoken~=0.11; extra == "backends"
 Requires-Dist: tinygrad~=0.11; extra == "backends"
 Requires-Dist: tokenizers~=0.22; extra == "backends"
@@ -57,7 +57,7 @@ Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
 Requires-Dist: pillow~=11.3; extra == "pillow"
 Provides-Extra: search
-Requires-Dist: ddgs~=9.5; extra == "search"
+Requires-Dist: ddgs~=9.6; extra == "search"
 Provides-Extra: wiki
 Requires-Dist: mwparserfromhell~=0.7; extra == "wiki"
 Requires-Dist: wikitextparser~=0.56; extra == "wiki"

{ommlds-0.0.0.dev441 → ommlds-0.0.0.dev443}/ommlds/.omlish-manifests.json

@@ -63,7 +63,7 @@
     "module": ".minichain.backends.impls.anthropic.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/anthropic/stream.py",
-    "line": 29,
+    "line": 35,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.stream",
@@ -95,7 +95,7 @@
     "module": ".minichain.backends.impls.google.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/google/chat.py",
-    "line": 27,
+    "line": 30,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.google.chat",
@@ -184,7 +184,7 @@
     "module": ".minichain.backends.impls.llamacpp.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/llamacpp/stream.py",
-    "line": 31,
+    "line": 32,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.llamacpp.stream",
@@ -341,7 +341,7 @@
     "module": ".minichain.backends.impls.openai.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/openai/stream.py",
-    "line": 31,
+    "line": 37,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.openai.stream",
@@ -356,7 +356,7 @@
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/tinygrad/chat.py",
-    "line": 113,
+    "line": 115,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.tinygrad.chat",
@@ -371,7 +371,7 @@
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/tinygrad/chat.py",
-    "line": 133,
+    "line": 135,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.tinygrad.chat",
@@ -386,7 +386,7 @@
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/tinygrad/chat.py",
-    "line": 159,
+    "line": 161,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [

{ommlds-0.0.0.dev441 → ommlds-0.0.0.dev443}/ommlds/__about__.py

@@ -19,7 +19,7 @@ class Project(ProjectBase):
             'llama-cpp-python ~= 0.3',
 
             'mlx ~= 0.29',
-            'mlx-lm ~= 0.27; sys_platform == "darwin"',
+            'mlx-lm ~= 0.28; sys_platform == "darwin"',
 
             # 'sentencepiece ~= 0.2',  # FIXME: https://github.com/google/sentencepiece/issues/1121
 
@@ -56,7 +56,7 @@ class Project(ProjectBase):
         ],
 
         'search': [
-            'ddgs ~= 9.5',
+            'ddgs ~= 9.6',
         ],
 
         'wiki': [

ommlds-0.0.0.dev443/ommlds/backends/google/protocol/types.py

@@ -0,0 +1,75 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish import marshal as msh
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class GenerateContentRequest:
+    """https://ai.google.dev/api/generate-content#request-body"""
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+    class Content(lang.Final):
+        @dc.dataclass(frozen=True, kw_only=True)
+        @msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+        class Part(lang.Final):
+            text: str
+
+        parts: ta.Sequence[Part]
+        role: ta.Literal['user', 'model']
+
+    contents: ta.Sequence[Content]
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class GenerateContentResponse:
+    """https://ai.google.dev/api/generate-content#v1beta.GenerateContentResponse"""
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+    class Candidate(lang.Final):
+        @dc.dataclass(frozen=True, kw_only=True)
+        @msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+        class Content(lang.Final):
+            @dc.dataclass(frozen=True, kw_only=True)
+            @msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+            class Part(lang.Final):
+                text: str
+
+            parts: ta.Sequence[Part]
+            role: ta.Literal['user', 'model']
+
+        content: Content
+        finish_reason: ta.Literal['STOP'] | None
+        index: int
+
+    candidates: ta.Sequence[Candidate]
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+    class UsageMetadata(lang.Final):
+        prompt_token_count: int
+        candidates_token_count: int
+        total_token_count: int
+        thoughts_token_count: int
+
+        @dc.dataclass(frozen=True, kw_only=True)
+        @msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+        class ModalityTokenCount:
+            modality: str
+            token_count: int
+
+        prompt_tokens_details: ta.Sequence[ModalityTokenCount]
+
+    usage_metadata: UsageMetadata
+
+    model_version: str
+
+    response_id: str

{ommlds-0.0.0.dev441 → ommlds-0.0.0.dev443}/ommlds/backends/openai/protocol/__init__.py

@@ -5,11 +5,8 @@ https://github.com/openai/openai-openapi/blob/master/openapi.yaml
 # ruff: noqa: I001
 
 from .chatcompletion.chunk import (  # noqa
-    ChatCompletionChunkChoiceDeltaToolCallFunction,
-    ChatCompletionChunkChoiceDeltaToolCall,
     ChatCompletionChunkChoiceDelta,
 
-    ChatCompletionChunkChoiceLogprobs,
     ChatCompletionChunkChoice,
 
     ChatCompletionChunk,
@@ -18,13 +15,10 @@ from .chatcompletion.chunk import (  # noqa
 from .chatcompletion.contentpart import (  # noqa
     TextChatCompletionContentPart,
 
-    ImageChatCompletionContentPartImageUrl,
-    ImageChatCompletionContentPart,
+    ImageUrlChatCompletionContentPart,
 
-    FileChatCompletionContentPartFileInfo,
     FileChatCompletionContentPart,
 
-    InputAudioChatCompletionContentPartInputAudio,
     InputAudioChatCompletionContentPart,
 
     RefusalChatCompletionContentPart,
@@ -39,9 +33,6 @@ from .chatcompletion.message import (  # noqa
 
     UserChatCompletionMessage,
 
-    AssistantChatCompletionMessageAudio,
-    AssistantChatCompletionMessageToolCallFunction,
-    AssistantChatCompletionMessageToolCall,
     AssistantChatCompletionMessage,
 
     ToolChatCompletionMessage,
@@ -52,18 +43,12 @@ from .chatcompletion.message import (  # noqa
 )
 
 from .chatcompletion.request import (  # noqa
-    ChatCompletionRequestWebSearchOptionsUserLocationApproximate,
-    ChatCompletionRequestWebSearchOptionsUserLocation,
     ChatCompletionRequestWebSearchOptions,
 
     ChatCompletionRequestPrediction,
 
-    ChatCompletionRequestToolFunction,
     ChatCompletionRequestTool,
 
-    ChatCompletionRequestStreamOptions,
-
-    ChatCompletionRequestNamedToolChoiceFunction,
     ChatCompletionRequestNamedToolChoice,
 
     ChatCompletionRequestAudio,
@@ -72,16 +57,8 @@ from .chatcompletion.request import (  # noqa
 )
 
 from .chatcompletion.response import (  # noqa
-    ChatCompletionResponseAnnotationUrlCitation,
-    ChatCompletionResponseAnnotation,
-
-    ChatCompletionResponseAudio,
-
-    ChatCompletionResponseMessageToolCallFunction,
-    ChatCompletionResponseMessageToolCall,
     ChatCompletionResponseMessage,
 
-    ChatCompletionResponseChoiceLogprobs,
     ChatCompletionResponseChoice,
 
     ChatCompletionResponse,
@@ -90,7 +67,6 @@ from .chatcompletion.response import (  # noqa
 from .chatcompletion.responseformat import (  # noqa
     TextChatCompletionResponseFormat,
 
-    JsonSchemaChatCompletionResponseFormatJsonSchema,
     JsonSchemaChatCompletionResponseFormat,
 
     JsonObjectChatCompletionResponseFormat,
@@ -99,12 +75,17 @@ from .chatcompletion.responseformat import (  # noqa
 )
 
 from .chatcompletion.tokenlogprob import (  # noqa
-    ChatCompletionTokenLogprobTopLogprob,
     ChatCompletionTokenLogprob,
 )
 
 from .completionusage import (  # noqa
-    CompletionUsageCompletionTokensDetails,
-    CompletionUsagePromptTokensDetails,
     CompletionUsage,
 )
+
+
+##
+
+
+from omlish import marshal as _msh  # noqa
+
+_msh.register_global_module_import('._marshal', __package__)

ommlds-0.0.0.dev443/ommlds/backends/openai/protocol/_marshal.py

@@ -0,0 +1,26 @@
+from omlish import lang
+from omlish import marshal as msh
+
+from .chatcompletion.contentpart import ChatCompletionContentPart
+from .chatcompletion.message import ChatCompletionMessage
+from .chatcompletion.responseformat import ChatCompletionResponseFormat
+
+
+##
+
+
+@lang.static_init
+def _install_standard_marshalling() -> None:
+    for root_cls, tag_field in [
+        (ChatCompletionContentPart, 'type'),
+        (ChatCompletionMessage, 'role'),
+        (ChatCompletionResponseFormat, 'type'),
+    ]:
+        msh.install_standard_factories(*msh.standard_polymorphism_factories(
+            msh.polymorphism_from_subclasses(
+                root_cls,
+                naming=msh.Naming.SNAKE,
+                strip_suffix='auto',
+            ),
+            msh.FieldTypeTagging(tag_field),
+        ))

ommlds-0.0.0.dev443/ommlds/backends/openai/protocol/chatcompletion/chunk.py

@@ -0,0 +1,94 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ..completionusage import CompletionUsage
+from .tokenlogprob import ChatCompletionTokenLogprob
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ChatCompletionChunkChoiceDelta(lang.Final):
+    content: str | None = None
+
+    refusal: str | None = None
+
+    role: ta.Literal[
+        'developer',
+        'system',
+        'user',
+        'assistant',
+        'tool',
+    ] | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    class ToolCall(lang.Final):
+        index: int
+
+        id: str | None = None
+
+        @dc.dataclass(frozen=True, kw_only=True)
+        class Function(lang.Final):
+            arguments: str | None = None
+            name: str | None = None
+
+        function: Function | None = None
+
+        type: ta.Literal['function'] = dc.xfield('function', repr=False)
+
+    tool_calls: ta.Sequence[ToolCall] | None = None
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ChatCompletionChunkChoice(lang.Final):
+    delta: ChatCompletionChunkChoiceDelta
+
+    finish_reason: ta.Literal[
+        'stop',
+        'length',
+        'tool_calls',
+        'content_filter',
+    ] | None = None
+
+    index: int
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Logprobs(lang.Final):
+        content: ta.Sequence[ChatCompletionTokenLogprob] | None = None
+        refusal: ta.Sequence[ChatCompletionTokenLogprob] | None = None
+
+    logprobs: Logprobs | None = None
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ChatCompletionChunk(lang.Final):
+    id: str
+
+    choices: ta.Sequence[ChatCompletionChunkChoice]
+
+    created: int
+
+    model: str
+
+    object: ta.Literal['chat.completion.chunk'] = dc.xfield('chat.completion.chunk', repr=False)
+
+    service_tier: ta.Literal[
+        'auto',
+        'default',
+        'flex',
+    ] | None = None
+
+    system_fingerprint: str | None = None
+
+    usage: CompletionUsage | None = None
+
+    obfuscation: str | None = None

ommlds-0.0.0.dev443/ommlds/backends/openai/protocol/chatcompletion/contentpart.py

@@ -0,0 +1,74 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+##
+
+
+class ChatCompletionContentPart(lang.Abstract):
+    pass
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class TextChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
+    text: str
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ImageUrlChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class ImageUrl(lang.Final):
+        url: str
+        detail: ta.Literal[
+            'auto',
+            'low',
+            'high',
+        ]
+
+    image_url: ImageUrl
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class FileChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class File(lang.Final):
+        file_data: str | None = None
+        file_id: str | None = None
+        filename: str | None = None
+
+    file: File
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class InputAudioChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class InputAudio(lang.Final):
+        data: str
+        format: ta.Literal[
+            'wav',
+            'mp3',
+        ]
+
+    input_audio: InputAudio
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class RefusalChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
+    refusal: str

ommlds-0.0.0.dev443/ommlds/backends/openai/protocol/chatcompletion/message.py

@@ -0,0 +1,93 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .contentpart import ChatCompletionContentPart
+from .contentpart import RefusalChatCompletionContentPart
+from .contentpart import TextChatCompletionContentPart
+
+
+##
+
+
+class ChatCompletionMessage(lang.Abstract, lang.Sealed):
+    pass
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class DeveloperChatCompletionMessage(ChatCompletionMessage, lang.Final):
+    content: str | ta.Iterable[TextChatCompletionContentPart]
+    name: str | None = None
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class SystemChatCompletionMessage(ChatCompletionMessage, lang.Final):
+    content: str | ta.Iterable[TextChatCompletionContentPart]
+    name: str | None = None
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class UserChatCompletionMessage(ChatCompletionMessage, lang.Final):
+    content: str | ta.Iterable[ChatCompletionContentPart]
+    name: str | None = None
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class AssistantChatCompletionMessage(ChatCompletionMessage, lang.Final):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Audio(lang.Final):
+        id: str
+
+    audio: Audio | None = None
+
+    content: str | ta.Iterable[TextChatCompletionContentPart | RefusalChatCompletionContentPart] | None = None
+
+    name: str | None = None
+
+    refusal: str | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    class ToolCall(lang.Final):
+        id: str
+
+        @dc.dataclass(frozen=True, kw_only=True)
+        class Function(lang.Final):
+            arguments: str
+            name: str
+
+        function: Function
+
+        type: ta.Literal['function'] = dc.xfield('function', repr=False)
+
+    tool_calls: ta.Iterable[ToolCall] | None = None
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ToolChatCompletionMessage(ChatCompletionMessage, lang.Final):
+    content: str | ta.Iterable[TextChatCompletionContentPart]
+    tool_call_id: str
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class FunctionChatCompletionMessage(ChatCompletionMessage, lang.Final):
+    content: str | None
+    name: str