ommlds 0.0.0.dev441__py3-none-any.whl → 0.0.0.dev443__py3-none-any.whl

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/__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/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/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/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/backends/openai/protocol/chatcompletion/chunk.py

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

ommlds/backends/openai/protocol/chatcompletion/contentpart.py

@@ -1,77 +1,74 @@
-# ruff: noqa: UP007 UP045
 import typing as ta
 
+from omlish import dataclasses as dc
+from omlish import lang
+
 
 ##
 
 
-class TextChatCompletionContentPart(ta.TypedDict):
-    text: str
-    type: ta.Literal['text']
+class ChatCompletionContentPart(lang.Abstract):
+    pass
 
 
 #
 
 
-class ImageChatCompletionContentPartImageUrl(ta.TypedDict):
-    url: ta.Required[str]
-    detail: ta.NotRequired[ta.Literal[
-        'auto',
-        'low',
-        'high',
-    ]]
-
-
-class ImageChatCompletionContentPart(ta.TypedDict):
-    image_url: ImageChatCompletionContentPartImageUrl
-    type: ta.Literal['image_url']
+@dc.dataclass(frozen=True, kw_only=True)
+class TextChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
+    text: str
 
 
 #
 
 
-class FileChatCompletionContentPartFileInfo(ta.TypedDict, total=False):
-    file_data: str
-    file_id: str
-    filename: 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',
+        ]
 
-
-class FileChatCompletionContentPart(ta.TypedDict):
-    file: FileChatCompletionContentPartFileInfo
-    type: ta.Literal['file']
+    image_url: ImageUrl
 
 
 #
 
 
-class InputAudioChatCompletionContentPartInputAudio(ta.TypedDict):
-    data: str
-    format: ta.Literal[
-        'wav',
-        'mp3',
-    ]
-
+@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
 
-class InputAudioChatCompletionContentPart(ta.TypedDict):
-    input_audio: InputAudioChatCompletionContentPartInputAudio
-    type: ta.Literal['input_audio']
+    file: File
 
 
 #
 
 
-class RefusalChatCompletionContentPart(ta.TypedDict):
-    refusal: str
-    type: ta.Literal['refusal']
+@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
 
 
 #
 
 
-ChatCompletionContentPart: ta.TypeAlias = ta.Union[
-    TextChatCompletionContentPart,
-    ImageChatCompletionContentPart,
-    FileChatCompletionContentPart,
-    InputAudioChatCompletionContentPart,
-    RefusalChatCompletionContentPart,
-]
+@dc.dataclass(frozen=True, kw_only=True)
+class RefusalChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
+    refusal: str

ommlds/backends/openai/protocol/chatcompletion/message.py

@@ -1,6 +1,8 @@
-# ruff: noqa: UP007 UP045
 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
@@ -9,83 +11,83 @@ from .contentpart import TextChatCompletionContentPart
 ##
 
 
-class DeveloperChatCompletionMessage(ta.TypedDict):
+class ChatCompletionMessage(lang.Abstract, lang.Sealed):
+    pass
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class DeveloperChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[TextChatCompletionContentPart]
-    role: ta.Literal['developer']
-    name: ta.NotRequired[str]
+    name: str | None = None
 
 
 #
 
 
-class SystemChatCompletionMessage(ta.TypedDict):
+@dc.dataclass(frozen=True, kw_only=True)
+class SystemChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[TextChatCompletionContentPart]
-    role: ta.Literal['system']
-    name: ta.NotRequired[str]
+    name: str | None = None
 
 
 #
 
 
-class UserChatCompletionMessage(ta.TypedDict):
+@dc.dataclass(frozen=True, kw_only=True)
+class UserChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[ChatCompletionContentPart]
-    role: ta.Literal['user']
-    name: ta.NotRequired[str]
+    name: str | None = None
 
 
 #
 
 
-class AssistantChatCompletionMessageAudio(ta.TypedDict):
-    id: str
+@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
 
-class AssistantChatCompletionMessageToolCallFunction(ta.TypedDict):
-    arguments: str
-    name: str
+    content: str | ta.Iterable[TextChatCompletionContentPart | RefusalChatCompletionContentPart] | None = None
 
+    name: str | None = None
 
-class AssistantChatCompletionMessageToolCall(ta.TypedDict):
-    id: str
-    function: AssistantChatCompletionMessageToolCallFunction
-    type: ta.Literal['function']
+    refusal: str | None = None
 
+    @dc.dataclass(frozen=True, kw_only=True)
+    class ToolCall(lang.Final):
+        id: str
 
-class AssistantChatCompletionMessage(ta.TypedDict, total=False):
-    role: ta.Required[ta.Literal['assistant']]
-    audio: AssistantChatCompletionMessageAudio
-    content: str | ta.Iterable[TextChatCompletionContentPart | RefusalChatCompletionContentPart]
-    name: str
-    refusal: str
-    tool_calls: ta.Iterable[AssistantChatCompletionMessageToolCall]
+        @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
 
 
 #
 
 
-class ToolChatCompletionMessage(ta.TypedDict):
+@dc.dataclass(frozen=True, kw_only=True)
+class ToolChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[TextChatCompletionContentPart]
-    role: ta.Literal['tool']
     tool_call_id: str
 
 
 #
 
 
-class FunctionChatCompletionMessage(ta.TypedDict):
+@dc.dataclass(frozen=True, kw_only=True)
+class FunctionChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | None
     name: str
-    role: ta.Literal['function']
-
-
-#
-
-
-ChatCompletionMessage: ta.TypeAlias = ta.Union[
-    DeveloperChatCompletionMessage,
-    SystemChatCompletionMessage,
-    UserChatCompletionMessage,
-    AssistantChatCompletionMessage,
-    ToolChatCompletionMessage,
-    FunctionChatCompletionMessage,
-]