ommlds 0.0.0.dev479__tar.gz → 0.0.0.dev480__tar.gz

{ommlds-0.0.0.dev479/ommlds.egg-info → ommlds-0.0.0.dev480}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev479
+Version: 0.0.0.dev480
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev479
-Requires-Dist: omlish==0.0.0.dev479
+Requires-Dist: omdev==0.0.0.dev480
+Requires-Dist: omlish==0.0.0.dev480
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
-Requires-Dist: mlx~=0.29; extra == "all"
+Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "all"
 Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "all"
 Requires-Dist: tiktoken~=0.12; extra == "all"
 Requires-Dist: tinygrad~=0.11; extra == "all"
@@ -39,7 +39,7 @@ 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~=0.30; sys_platform == "darwin" and extra == "backends"
 Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "backends"
 Requires-Dist: tiktoken~=0.12; extra == "backends"
 Requires-Dist: tinygrad~=0.11; extra == "backends"

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/.omlish-manifests.json

@@ -18,7 +18,7 @@
     "module": ".minichain.backends.impls.anthropic.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/anthropic/chat.py",
-    "line": 38,
+    "line": 42,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.chat",
@@ -496,7 +496,7 @@
     "module": ".minichain.backends.impls.openai.names",
     "attr": "_CHAT_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/openai/names.py",
-    "line": 63,
+    "line": 65,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -520,6 +520,7 @@
             "gpt-5-chat-latest": null,
             "gpt-5-mini": null,
             "gpt-5-nano": null,
+            "gpt-5.1": null,
             "gpt3.5-turbo": "gpt-3.5-turbo",
             "gpt3.5-turbo-instruct": "gpt-3.5-turbo-instruct",
             "gpt4": "gpt-4",
@@ -533,7 +534,8 @@
             "gpt5-chat-latest": "gpt-5-chat-latest",
             "gpt5-mini": "gpt-5-mini",
             "gpt5-nano": "gpt-5-nano",
-            "gpt": "gpt-5",
+            "gpt5.1": "gpt-5.1",
+            "gpt": "gpt-5.1",
             "gpt-mini": "gpt-5-mini",
             "o3": null,
             "o3-mini": null,
@@ -548,7 +550,7 @@
     "module": ".minichain.backends.impls.openai.names",
     "attr": "_COMPLETION_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/openai/names.py",
-    "line": 77,
+    "line": 79,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -563,7 +565,7 @@
     "module": ".minichain.backends.impls.openai.names",
     "attr": "_EMBEDDING_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/openai/names.py",
-    "line": 89,
+    "line": 91,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -589,6 +591,21 @@
       }
     }
   },
+  {
+    "module": ".minichain.backends.impls.tavily",
+    "attr": null,
+    "file": "ommlds/minichain/backends/impls/tavily.py",
+    "line": 19,
+    "value": {
+      "!.minichain.registries.manifests.RegistryManifest": {
+        "module": "ommlds.minichain.backends.impls.tavily",
+        "attr": "TavilySearchService",
+        "name": "tavily",
+        "aliases": null,
+        "type": "SearchService"
+      }
+    }
+  },
   {
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/__about__.py

@@ -18,7 +18,7 @@ class Project(ProjectBase):
 
             'llama-cpp-python ~= 0.3',
 
-            'mlx ~= 0.29',
+            'mlx ~= 0.30; sys_platform == "darwin"',
             'mlx-lm ~= 0.28; sys_platform == "darwin"',
 
             # 'sentencepiece ~= 0.2',  # FIXME: https://github.com/google/sentencepiece/issues/1121

ommlds-0.0.0.dev480/ommlds/backends/tavily/protocol.py

@@ -0,0 +1,301 @@
+"""
+https://docs.tavily.com/documentation/api-reference/endpoint/search
+"""
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish import marshal as msh
+
+
+##
+
+
+def _set_class_marshal_options(cls):
+    msh.update_object_metadata(
+        cls,
+        field_defaults=msh.FieldMetadata(
+            options=msh.FieldOptions(
+                omit_if=lang.is_none,
+            ),
+        ),
+    )
+
+    return cls
+
+
+##
+
+
+KNOWN_COUNTRIES = frozenset([
+    'afghanistan',
+    'albania',
+    'algeria',
+    'andorra',
+    'angola',
+    'argentina',
+    'armenia',
+    'australia',
+    'austria',
+    'azerbaijan',
+    'bahamas',
+    'bahrain',
+    'bangladesh',
+    'barbados',
+    'belarus',
+    'belgium',
+    'belize',
+    'benin',
+    'bhutan',
+    'bolivia',
+    'bosnia and herzegovina',
+    'botswana',
+    'brazil',
+    'brunei',
+    'bulgaria',
+    'burkina faso',
+    'burundi',
+    'cambodia',
+    'cameroon',
+    'canada',
+    'cape verde',
+    'central african republic',
+    'chad',
+    'chile',
+    'china',
+    'colombia',
+    'comoros',
+    'congo',
+    'costa rica',
+    'croatia',
+    'cuba',
+    'cyprus',
+    'czech republic',
+    'denmark',
+    'djibouti',
+    'dominican republic',
+    'ecuador',
+    'egypt',
+    'el salvador',
+    'equatorial guinea',
+    'eritrea',
+    'estonia',
+    'ethiopia',
+    'fiji',
+    'finland',
+    'france',
+    'gabon',
+    'gambia',
+    'georgia',
+    'germany',
+    'ghana',
+    'greece',
+    'guatemala',
+    'guinea',
+    'haiti',
+    'honduras',
+    'hungary',
+    'iceland',
+    'india',
+    'indonesia',
+    'iran',
+    'iraq',
+    'ireland',
+    'israel',
+    'italy',
+    'jamaica',
+    'japan',
+    'jordan',
+    'kazakhstan',
+    'kenya',
+    'kuwait',
+    'kyrgyzstan',
+    'latvia',
+    'lebanon',
+    'lesotho',
+    'liberia',
+    'libya',
+    'liechtenstein',
+    'lithuania',
+    'luxembourg',
+    'madagascar',
+    'malawi',
+    'malaysia',
+    'maldives',
+    'mali',
+    'malta',
+    'mauritania',
+    'mauritius',
+    'mexico',
+    'moldova',
+    'monaco',
+    'mongolia',
+    'montenegro',
+    'morocco',
+    'mozambique',
+    'myanmar',
+    'namibia',
+    'nepal',
+    'netherlands',
+    'new zealand',
+    'nicaragua',
+    'niger',
+    'nigeria',
+    'north korea',
+    'north macedonia',
+    'norway',
+    'oman',
+    'pakistan',
+    'panama',
+    'papua new guinea',
+    'paraguay',
+    'peru',
+    'philippines',
+    'poland',
+    'portugal',
+    'qatar',
+    'romania',
+    'russia',
+    'rwanda',
+    'saudi arabia',
+    'senegal',
+    'serbia',
+    'singapore',
+    'slovakia',
+    'slovenia',
+    'somalia',
+    'south africa',
+    'south korea',
+    'south sudan',
+    'spain',
+    'sri lanka',
+    'sudan',
+    'sweden',
+    'switzerland',
+    'syria',
+    'taiwan',
+    'tajikistan',
+    'tanzania',
+    'thailand',
+    'togo',
+    'trinidad and tobago',
+    'tunisia',
+    'turkey',
+    'turkmenistan',
+    'uganda',
+    'ukraine',
+    'united arab emirates',
+    'united kingdom',
+    'united states',
+    'uruguay',
+    'uzbekistan',
+    'venezuela',
+    'vietnam',
+    'yemen',
+    'zambia',
+    'zimbabwe',
+])
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class SearchRequest:
+    query: str
+
+    # optional
+    auto_parameters: bool | None = None
+
+    topic: ta.Literal['general', 'news', 'finance'] | None = None
+    search_depth: ta.Literal['basic', 'advanced'] | None = None
+
+    chunks_per_source: int | None = None
+    max_results: int | None = None
+
+    time_range: ta.Literal['day', 'week', 'month', 'year', 'd', 'w', 'm', 'y'] | None = None
+    start_date: str | None = None  # YYYY-MM-DD
+    end_date: str | None = None    # YYYY-MM-DD
+
+    # Booleans with extra enum-like modes per docs
+    include_answer: bool | ta.Literal['basic', 'advanced'] | None = None
+    include_raw_content: bool | ta.Literal['markdown', 'text'] | None = None
+
+    include_images: bool | None = None
+    include_image_descriptions: bool | None = None
+    include_favicon: bool | None = None
+
+    include_domains: ta.Sequence[str] | None = None
+    exclude_domains: ta.Sequence[str] | None = None
+
+    country: str | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class SearchResponse:
+    query: str
+    answer: str
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
+    class Image:
+        url: str | None = None
+        description: str | None = None
+
+    images: ta.Sequence[Image] | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
+    class Result:
+        title: str | None = None
+        url: str | None = None
+        content: str | None = None
+        score: float | None = None
+        raw_content: str | None = None
+        favicon: str | None = None
+
+    results: ta.Sequence[Result] | None = None
+
+    follow_up_questions: ta.Sequence[str] | None = None
+
+    auto_parameters: ta.Mapping[str, ta.Any] | None = None
+
+    response_time: str | None = None  # seconds
+    request_id: str | None = None
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ExtractRequest:
+    urls: str | ta.Sequence[str]
+    include_images: bool | None = None
+    include_favicon: bool | None = None
+    extract_depth: ta.Literal['basic', 'advanced'] | None = None
+    format: ta.Literal['markdown', 'text'] | None = None
+    timeout: str | None = None  # seconds
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ExtractResponse:
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Result:
+        url: str
+        raw_content: str
+        images: ta.Sequence[str] | None = None
+        favicon: str | None = None
+
+    results: ta.Sequence[Result]
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    class FailedResult:
+        url: str
+        error: str
+
+    failed_results: ta.Sequence[FailedResult] | None = None
+
+    response_time: str | None = None
+    request_id: str | None = None

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/minichain/__init__.py

@@ -308,6 +308,7 @@ with _lang.auto_proxy_init(
         TopK,
         Temperature,
         MaxTokens,
+        MaxCompletionTokens,
 
         LlmOutput,
 

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/minichain/backends/impls/anthropic/chat.py

@@ -17,6 +17,7 @@ from ....chat.choices.services import ChatChoicesRequest
 from ....chat.choices.services import ChatChoicesResponse
 from ....chat.choices.services import static_check_is_chat_choices_service
 from ....chat.choices.types import AiChoice
+from ....chat.choices.types import ChatChoicesOptions
 from ....chat.messages import AiMessage
 from ....chat.messages import AnyAiMessage
 from ....chat.messages import Message
@@ -24,9 +25,12 @@ from ....chat.messages import SystemMessage
 from ....chat.messages import ToolUseMessage
 from ....chat.messages import UserMessage
 from ....chat.tools.types import Tool
+from ....llms.types import MaxTokens
+from ....llms.types import Temperature
 from ....models.configs import ModelName
 from ....standard import ApiKey
 from ....tools.types import ToolUse
+from ....types import Option
 from .names import MODEL_NAMES
 from .protocol import build_protocol_chat_messages
 from .protocol import build_protocol_tool
@@ -67,16 +71,31 @@ class AnthropicChatChoicesService:
         else:
             raise TypeError(m)
 
+    DEFAULT_OPTIONS: ta.ClassVar[tv.TypedValues[Option]] = tv.TypedValues[Option](
+        MaxTokens(4096),
+    )
+
+    _OPTION_KWARG_NAMES_MAP: ta.ClassVar[ta.Mapping[str, type[ChatChoicesOptions]]] = dict(
+        temperature=Temperature,
+        max_tokens=MaxTokens,
+    )
+
     async def invoke(
             self,
             request: ChatChoicesRequest,
-            *,
-            max_tokens: int = 4096,  # FIXME: ChatOption
     ) -> ChatChoicesResponse:
         messages, system = build_protocol_chat_messages(request.v)
 
+        kwargs: dict = dict()
+
         tools: list[pt.ToolSpec] = []
-        with tv.TypedValues(*request.options).consume() as oc:
+        with tv.TypedValues(
+            *self.DEFAULT_OPTIONS,
+                *request.options,
+                override=True,
+        ).consume() as oc:
+            kwargs.update(oc.pop_scalar_kwargs(**self._OPTION_KWARG_NAMES_MAP))
+
             t: Tool
             for t in oc.pop(Tool, []):
                 tools.append(build_protocol_tool(t))
@@ -86,7 +105,7 @@ class AnthropicChatChoicesService:
             system=system,
             messages=messages,
             tools=tools or None,
-            max_tokens=max_tokens,
+            **kwargs,
         )
 
         raw_request = msh.marshal(a_req)

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/minichain/backends/impls/openai/format.py

@@ -23,6 +23,7 @@ from ....chat.stream.types import PartialToolUseAiDelta
 from ....chat.tools.types import Tool
 from ....content.json import JsonContent
 from ....content.prepare import prepare_content_str
+from ....llms.types import MaxCompletionTokens
 from ....llms.types import MaxTokens
 from ....llms.types import Temperature
 from ....llms.types import TokenUsage
@@ -173,6 +174,7 @@ class OpenaiChatRequestHandler:
     _OPTION_KWARG_NAMES_MAP: ta.ClassVar[ta.Mapping[str, type[ChatChoicesOptions]]] = dict(
         temperature=Temperature,
         max_tokens=MaxTokens,
+        max_completion_tokens=MaxCompletionTokens,
     )
 
     class _ProcessedOptions(ta.NamedTuple):

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/minichain/backends/impls/openai/names.py

@@ -30,6 +30,8 @@ _GPT_MODEL_NAMES = [
     'gpt-5-chat-latest',
     'gpt-5-mini',
     'gpt-5-nano',
+
+    'gpt-5.1',
 ]
 
 
@@ -46,7 +48,7 @@ CHAT_MODEL_NAMES = ModelNameCollection(
             for n in _GPT_MODEL_NAMES
         },
 
-        'gpt': 'gpt-5',
+        'gpt': 'gpt-5.1',
         'gpt-mini': 'gpt-5-mini',
 
         #

ommlds-0.0.0.dev480/ommlds/minichain/backends/impls/tavily.py

@@ -0,0 +1,66 @@
+from omlish import check
+from omlish import marshal as msh
+from omlish import typedvalues as tv
+from omlish.formats import json
+from omlish.http import all as http
+
+from ....backends.tavily import protocol as pt
+from ...search import SearchHit
+from ...search import SearchHits
+from ...search import SearchRequest
+from ...search import SearchResponse
+from ...search import static_check_is_search_service
+from ...standard import ApiKey
+
+
+##
+
+
+# @omlish-manifest $.minichain.registries.manifests.RegistryManifest(
+#     name='tavily',
+#     type='SearchService',
+# )
+@static_check_is_search_service
+class TavilySearchService:
+    def __init__(
+            self,
+            *configs: ApiKey,
+            http_client: http.AsyncHttpClient | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._http_client = http_client
+
+        with tv.consume(*configs) as cc:
+            self._api_key = ApiKey.pop_secret(cc, env='TAVILY_API_KEY')
+
+    async def invoke(self, request: SearchRequest) -> SearchResponse:
+        pt_request = pt.SearchRequest(
+            query=request.v,
+        )
+
+        raw_request = msh.marshal(pt_request)
+
+        http_response = await http.async_request(
+            'https://api.tavily.com/search',
+            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()),
+            },
+            data=json.dumps(raw_request).encode('utf-8'),
+            client=self._http_client,
+        )
+
+        raw_response = json.loads(check.not_none(http_response.data).decode('utf-8'))
+
+        pt_response = msh.unmarshal(raw_response, pt.SearchResponse)
+
+        return SearchResponse(SearchHits(
+            l=[
+                SearchHit(
+                    title=r.title,
+                    url=r.url,
+                )
+                for r in pt_response.results or []
+            ],
+        ))

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/minichain/llms/types.py

@@ -31,6 +31,10 @@ class MaxTokens(LlmOption, tv.UniqueScalarTypedValue[int]):
     pass
 
 
+class MaxCompletionTokens(LlmOption, tv.UniqueScalarTypedValue[int]):
+    pass
+
+
 ##
 
 

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/minichain/search.py

@@ -19,7 +19,7 @@ class SearchHit(lang.Final):
     title: str | None
     url: str | None
     description: str | None = None
-    snippets: lang.SequenceNotStr[str] | None
+    snippets: lang.SequenceNotStr[str] | None = None
 
 
 @dc.dataclass(frozen=True, kw_only=True)

{ommlds-0.0.0.dev479 → ommlds-0.0.0.dev480}/ommlds/minichain/standard.py

@@ -25,6 +25,7 @@ class Device(tv.UniqueScalarTypedValue[ta.Any], Config):
 ##
 
 
+# TODO: ApiEndpointPath, ApiEndpointUrl, ApiBaseUrl, ...
 class ApiUrl(tv.UniqueScalarTypedValue[str], Config):
     pass
 

ommlds-0.0.0.dev480/ommlds/specs/mcp/_marshal.py

@@ -0,0 +1,23 @@
+from omlish import lang
+from omlish import marshal as msh
+
+from .protocol import ContentBlock
+
+
+##
+
+
+@lang.static_init
+def _install_standard_marshaling() -> None:
+    for root_cls, tag_field in [
+        (ContentBlock, 'type'),
+    ]:
+        msh.install_standard_factories(*msh.standard_polymorphism_factories(
+            msh.polymorphism_from_subclasses(
+                root_cls,
+                naming=msh.Naming.SNAKE,
+                strip_suffix=msh.AutoStripSuffix,
+            ),
+            msh.FieldTypeTagging(tag_field),
+            unions='partial',
+        ))