Skip to content
Closed
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
2 changes: 2 additions & 0 deletions py/packages/genkit/src/genkit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
FinishReason,
Message,
ModelConfig,
ModelConfigDict,
ModelInfo,
ModelRequest,
ModelResponse,
Expand Down Expand Up @@ -96,6 +97,7 @@
'EmbedderOptions',
'EmbedderRef',
'ModelConfig',
'ModelConfigDict',
'ModelInfo',
'ModelStreamResponse',
# Errors
Expand Down
1 change: 1 addition & 0 deletions py/packages/genkit/src/genkit/_ai/_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from genkit._core._model import (
Message,
ModelConfig,
ModelConfigDict,
ModelRef,
ModelRequest,
ModelResponse,
Expand Down
1 change: 1 addition & 0 deletions py/packages/genkit/src/genkit/_core/_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
GenerateResponseChunk,
GenerationCommonConfig,
GenerationUsage,
ModelConfigDict,
Media,
MediaModel,
MediaPart,
Expand Down
17 changes: 17 additions & 0 deletions py/packages/genkit/src/genkit/_core/_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,23 @@ class GenerateResponseChunk(GenkitModel):
aggregated: bool | None = None


from typing import TypedDict

class ModelConfigDict(TypedDict, total=False):
"""TypedDict for model configuration options.

This provides IDE autocompletion and static type checking for users
who prefer to pass configuration as plain dictionaries.
"""

version: str
temperature: float
max_output_tokens: float
top_k: float
top_p: float
stop_sequences: list[str]
api_key: str

class GenerationCommonConfig(GenkitModel):
"""Model for generationcommonconfig data."""

Expand Down
2 changes: 2 additions & 0 deletions py/packages/genkit/src/genkit/model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

from genkit._ai._model import (
ModelConfig,
ModelConfigDict,
model_action_metadata,
model_ref,
)
Expand Down Expand Up @@ -76,6 +77,7 @@
'ModelRef',
# Config
'ModelConfig',
'ModelConfigDict',
# Message
'Message',
# Usage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
VertexEmbeddingModels,
)
from genkit.plugins.google_genai.models.gemini import (
GeminiConfigDict,
GeminiConfigSchema,
GeminiImageConfigSchema,
GeminiTtsConfigSchema,
Expand Down Expand Up @@ -241,6 +242,7 @@ def package_name() -> str:
GoogleAIGeminiVersion.__name__,
VertexAIGeminiVersion.__name__,
EmbeddingTaskType.__name__,
GeminiConfigDict.__name__,
GeminiConfigSchema.__name__,
GeminiImageConfigSchema.__name__,
GeminiTtsConfigSchema.__name__,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
from enum import StrEnum

from functools import cached_property
from typing import Annotated, Any, Any as JsonAny, cast
from typing import Annotated, Any, Any as JsonAny, TypedDict, cast

from google import genai
from google.genai import types as genai_types
Expand All @@ -167,7 +167,7 @@
TextPart,
ToolDefinition,
)
from genkit.model import Candidate, FinishReason, get_basic_usage_stats
from genkit.model import Candidate, FinishReason, ModelConfigDict, get_basic_usage_stats
from genkit.plugin_api import (
ActionRunContext,
StatusName,
Expand Down Expand Up @@ -301,6 +301,22 @@ class VoiceConfigSchema(BaseModel):
prebuilt_voice_config: PrebuiltVoiceConfig | None = Field(None, alias='prebuiltVoiceConfig')


class GeminiConfigDict(ModelConfigDict, total=False):
"""Gemini Config TypedDict."""

api_key: str
base_url: str
api_version: str
safety_settings: list[dict[str, Any]]
code_execution: bool | dict[str, Any]
context_cache: bool
function_calling_config: dict[str, Any]
response_modalities: list[str]
google_search_retrieval: bool | dict[str, Any]
file_search: dict[str, Any]
url_context: bool | dict[str, Any]


class GeminiConfigSchema(ModelConfig):
"""Gemini Config Schema."""

Expand Down
Loading