Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions google/genai/_automatic_function_calling_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@


if sys.version_info >= (3, 10):
VersionedUnionType = builtin_types.UnionType
VersionedUnionType = (builtin_types.UnionType, type(Union[int, str]))
else:
VersionedUnionType = typing._UnionGenericAlias # type: ignore[attr-defined]
VersionedUnionType = (type(Union[int, str]),)


__all__ = [
Expand Down
4 changes: 2 additions & 2 deletions google/genai/_transformers.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
logger = logging.getLogger('google_genai._transformers')

if sys.version_info >= (3, 10):
VersionedUnionType = builtin_types.UnionType
VersionedUnionType = (builtin_types.UnionType, type(Union[int, str]))
_UNION_TYPES = (typing.Union, builtin_types.UnionType)
from typing import TypeGuard
else:
VersionedUnionType = typing._UnionGenericAlias # type: ignore[attr-defined]
VersionedUnionType = (type(Union[int, str]),)
_UNION_TYPES = (typing.Union,)
from typing_extensions import TypeGuard

Expand Down
28 changes: 20 additions & 8 deletions google/genai/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import sys
import types as builtin_types
import typing
from typing import Any, Callable, Dict, List, Literal, Optional, Sequence, Union, _UnionGenericAlias # type: ignore
from typing import Any, Callable, Dict, List, Literal, Optional, Sequence, Union
import pydantic
from pydantic import ConfigDict, Field, PrivateAttr, model_validator
from typing_extensions import Self, TypedDict
from typing_extensions import Self, TypeAlias, TypedDict
from . import _common
from ._operations_converters import (
_GenerateVideosOperation_from_mldev,
Expand All @@ -40,11 +40,11 @@

if sys.version_info >= (3, 10):
# Supports both Union[t1, t2] and t1 | t2
VersionedUnionType = Union[builtin_types.UnionType, _UnionGenericAlias]
VersionedUnionType = (builtin_types.UnionType, type(Union[int, str]))
_UNION_TYPES = (typing.Union, builtin_types.UnionType)
else:
# Supports only Union[t1, t2]
VersionedUnionType = _UnionGenericAlias
VersionedUnionType = (type(Union[int, str]),)
_UNION_TYPES = (typing.Union,)

_is_pillow_image_imported = False
Expand Down Expand Up @@ -4251,10 +4251,22 @@ class ToolDict(TypedDict, total=False):
ToolListUnion = list[ToolUnion]
ToolListUnionDict = list[ToolUnionDict]

SchemaUnion = Union[
dict[Any, Any], type, Schema, builtin_types.GenericAlias, VersionedUnionType # type: ignore[valid-type]
]
SchemaUnionDict = Union[SchemaUnion, SchemaDict]
if typing.TYPE_CHECKING:
# For type checkers, use the most complete type (Python 3.10+)
SchemaUnion: TypeAlias = Union[
dict[Any, Any], type, Schema, builtin_types.GenericAlias, builtin_types.UnionType, type(Union[int, str])
]
else:
# At runtime, use version-appropriate types
if sys.version_info >= (3, 10):
SchemaUnion: TypeAlias = Union[
dict[Any, Any], type, Schema, builtin_types.GenericAlias, builtin_types.UnionType, type(Union[int, str])
]
else:
SchemaUnion: TypeAlias = Union[
dict[Any, Any], type, Schema, builtin_types.GenericAlias, type(Union[int, str])
]
SchemaUnionDict: TypeAlias = Union[SchemaUnion, SchemaDict]


class LatLng(_common.BaseModel):
Expand Down