mirror of
https://github.com/wassname/openrouter-python-sdk-retry-errors.git
synced 2026-07-29 11:23:49 +08:00
fix: add overlay to remove nullable from pagination offset params (#121)
This commit is contained in:
Matt Apperson
@@ -2,6 +2,8 @@
|
||||
|
||||
from __future__ import annotations
|
||||
from .searchcontextsizeenum import SearchContextSizeEnum
|
||||
from .websearchdomainfilter import WebSearchDomainFilter, WebSearchDomainFilterTypedDict
|
||||
from .websearchengineenum import WebSearchEngineEnum
|
||||
from .websearchuserlocation import WebSearchUserLocation, WebSearchUserLocationTypedDict
|
||||
from openrouter.types import (
|
||||
BaseModel,
|
||||
@@ -9,85 +11,30 @@ from openrouter.types import (
|
||||
OptionalNullable,
|
||||
UNSET,
|
||||
UNSET_SENTINEL,
|
||||
UnrecognizedStr,
|
||||
)
|
||||
from openrouter.utils import validate_open_enum
|
||||
from pydantic import model_serializer
|
||||
from pydantic.functional_validators import PlainValidator
|
||||
from typing import List, Literal, Optional, Union
|
||||
from typing import Literal, Optional
|
||||
from typing_extensions import Annotated, NotRequired, TypedDict
|
||||
|
||||
|
||||
LegacyWebSearchServerToolType = Literal["web_search",]
|
||||
|
||||
|
||||
class LegacyWebSearchServerToolFiltersTypedDict(TypedDict):
|
||||
allowed_domains: NotRequired[Nullable[List[str]]]
|
||||
excluded_domains: NotRequired[Nullable[List[str]]]
|
||||
|
||||
|
||||
class LegacyWebSearchServerToolFilters(BaseModel):
|
||||
allowed_domains: OptionalNullable[List[str]] = UNSET
|
||||
|
||||
excluded_domains: OptionalNullable[List[str]] = UNSET
|
||||
|
||||
@model_serializer(mode="wrap")
|
||||
def serialize_model(self, handler):
|
||||
optional_fields = ["allowed_domains", "excluded_domains"]
|
||||
nullable_fields = ["allowed_domains", "excluded_domains"]
|
||||
null_default_fields = []
|
||||
|
||||
serialized = handler(self)
|
||||
|
||||
m = {}
|
||||
|
||||
for n, f in type(self).model_fields.items():
|
||||
k = f.alias or n
|
||||
val = serialized.get(k)
|
||||
serialized.pop(k, None)
|
||||
|
||||
optional_nullable = k in optional_fields and k in nullable_fields
|
||||
is_set = (
|
||||
self.__pydantic_fields_set__.intersection({n})
|
||||
or k in null_default_fields
|
||||
) # pylint: disable=no-member
|
||||
|
||||
if val is not None and val != UNSET_SENTINEL:
|
||||
m[k] = val
|
||||
elif val != UNSET_SENTINEL and (
|
||||
not k in optional_fields or (optional_nullable and is_set)
|
||||
):
|
||||
m[k] = val
|
||||
|
||||
return m
|
||||
|
||||
|
||||
LegacyWebSearchServerToolEngine = Union[
|
||||
Literal[
|
||||
"auto",
|
||||
"native",
|
||||
"exa",
|
||||
"firecrawl",
|
||||
"parallel",
|
||||
],
|
||||
UnrecognizedStr,
|
||||
]
|
||||
r"""Which search engine to use. \"auto\" (default) uses native if the provider supports it, otherwise Exa. \"native\" forces the provider's built-in search. \"exa\" forces the Exa search API. \"firecrawl\" uses Firecrawl (requires BYOK). \"parallel\" uses the Parallel search API."""
|
||||
|
||||
|
||||
class LegacyWebSearchServerToolTypedDict(TypedDict):
|
||||
r"""Web search tool configuration"""
|
||||
|
||||
type: LegacyWebSearchServerToolType
|
||||
filters: NotRequired[Nullable[LegacyWebSearchServerToolFiltersTypedDict]]
|
||||
engine: NotRequired[WebSearchEngineEnum]
|
||||
r"""Which search engine to use. \"auto\" (default) uses native if the provider supports it, otherwise Exa. \"native\" forces the provider's built-in search. \"exa\" forces the Exa search API. \"firecrawl\" uses Firecrawl (requires BYOK). \"parallel\" uses the Parallel search API."""
|
||||
filters: NotRequired[Nullable[WebSearchDomainFilterTypedDict]]
|
||||
max_results: NotRequired[int]
|
||||
r"""Maximum number of search results to return per search call. Defaults to 5. Applies to Exa, Firecrawl, and Parallel engines; ignored with native provider search."""
|
||||
search_context_size: NotRequired[SearchContextSizeEnum]
|
||||
r"""Size of the search context for web search tools"""
|
||||
user_location: NotRequired[Nullable[WebSearchUserLocationTypedDict]]
|
||||
r"""User location information for web search"""
|
||||
engine: NotRequired[LegacyWebSearchServerToolEngine]
|
||||
r"""Which search engine to use. \"auto\" (default) uses native if the provider supports it, otherwise Exa. \"native\" forces the provider's built-in search. \"exa\" forces the Exa search API. \"firecrawl\" uses Firecrawl (requires BYOK). \"parallel\" uses the Parallel search API."""
|
||||
max_results: NotRequired[float]
|
||||
r"""Maximum number of search results to return per search call. Defaults to 5. Applies to Exa, Firecrawl, and Parallel engines; ignored with native provider search."""
|
||||
|
||||
|
||||
class LegacyWebSearchServerTool(BaseModel):
|
||||
@@ -95,7 +42,15 @@ class LegacyWebSearchServerTool(BaseModel):
|
||||
|
||||
type: LegacyWebSearchServerToolType
|
||||
|
||||
filters: OptionalNullable[LegacyWebSearchServerToolFilters] = UNSET
|
||||
engine: Annotated[
|
||||
Optional[WebSearchEngineEnum], PlainValidator(validate_open_enum(False))
|
||||
] = None
|
||||
r"""Which search engine to use. \"auto\" (default) uses native if the provider supports it, otherwise Exa. \"native\" forces the provider's built-in search. \"exa\" forces the Exa search API. \"firecrawl\" uses Firecrawl (requires BYOK). \"parallel\" uses the Parallel search API."""
|
||||
|
||||
filters: OptionalNullable[WebSearchDomainFilter] = UNSET
|
||||
|
||||
max_results: Optional[int] = None
|
||||
r"""Maximum number of search results to return per search call. Defaults to 5. Applies to Exa, Firecrawl, and Parallel engines; ignored with native provider search."""
|
||||
|
||||
search_context_size: Annotated[
|
||||
Optional[SearchContextSizeEnum], PlainValidator(validate_open_enum(False))
|
||||
@@ -105,23 +60,14 @@ class LegacyWebSearchServerTool(BaseModel):
|
||||
user_location: OptionalNullable[WebSearchUserLocation] = UNSET
|
||||
r"""User location information for web search"""
|
||||
|
||||
engine: Annotated[
|
||||
Optional[LegacyWebSearchServerToolEngine],
|
||||
PlainValidator(validate_open_enum(False)),
|
||||
] = None
|
||||
r"""Which search engine to use. \"auto\" (default) uses native if the provider supports it, otherwise Exa. \"native\" forces the provider's built-in search. \"exa\" forces the Exa search API. \"firecrawl\" uses Firecrawl (requires BYOK). \"parallel\" uses the Parallel search API."""
|
||||
|
||||
max_results: Optional[float] = None
|
||||
r"""Maximum number of search results to return per search call. Defaults to 5. Applies to Exa, Firecrawl, and Parallel engines; ignored with native provider search."""
|
||||
|
||||
@model_serializer(mode="wrap")
|
||||
def serialize_model(self, handler):
|
||||
optional_fields = [
|
||||
"engine",
|
||||
"filters",
|
||||
"max_results",
|
||||
"search_context_size",
|
||||
"user_location",
|
||||
"engine",
|
||||
"max_results",
|
||||
]
|
||||
nullable_fields = ["filters", "user_location"]
|
||||
null_default_fields = []
|
||||
|
||||
Reference in New Issue
Block a user