Skip to content

fix(py/plugins/genai): expose full Gemini config schema #2540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 29, 2025
Merged
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-ai/src/genkit/ai/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
Role,
Supports,
TextPart,
ToolDefinition,
ToolRequest,
ToolRequestPart,
ToolResponse,
Expand Down Expand Up @@ -85,5 +86,6 @@
ToolResponsePart.__name__,
GenerationCommonConfig.__name__,
GenerationUsage.__name__,
ToolDefinition.__name__,
tool_response.__name__,
]
2 changes: 0 additions & 2 deletions py/packages/genkit-ai/src/genkit/blocks/prompt.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,6 @@ def to_generate_action_options(
model = model or registry.default_model
if model is None:
raise Exception('No model configured.')
if not isinstance(config, GenerationCommonConfig | dict | None):
raise AttributeError('Invalid generate config provided')
resolved_msgs: list[Message] = []
if system:
resolved_msgs.append(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
GeminiEmbeddingModels,
VertexEmbeddingModels,
)
from genkit.plugins.google_genai.models.gemini import GeminiVersion
from genkit.plugins.google_genai.models.gemini import (
GeminiConfigSchema,
GeminiVersion,
)


def package_name() -> str:
Expand All @@ -40,4 +43,5 @@ def package_name() -> str:
VertexEmbeddingModels.__name__,
GeminiVersion.__name__,
EmbeddingTaskType.__name__,
GeminiConfigSchema.__name__,
]
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
)
from genkit.plugins.google_genai.models.gemini import (
GeminiApiOnlyVersion,
GeminiConfigSchema,
GeminiModel,
GeminiVersion,
)
Expand Down Expand Up @@ -101,6 +102,7 @@ def initialize(self, ai: GenkitRegistry) -> None:
name=google_genai_name(version),
fn=gemini_model.generate,
metadata=gemini_model.metadata,
config_schema=GeminiConfigSchema,
)

embeding_models = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,27 @@
from google import genai
from google.genai import types as genai_types

from genkit.ai.registry import GenkitRegistry
from genkit.core.action import ActionKind, ActionRunContext
from genkit.core.typing import (
from genkit.ai import (
ActionKind,
ActionRunContext,
GenerateRequest,
GenerateResponse,
GenerateResponseChunk,
GenerationCommonConfig,
GenkitRegistry,
Message,
ModelInfo,
Role,
Supports,
TextPart,
ToolDefinition,
)
from genkit.plugins.google_genai.models.utils import PartConverter


class GeminiConfigSchema(genai_types.GenerateContentConfig):
pass


GEMINI_1_0_PRO = ModelInfo(
label='Google AI - Gemini Pro',
versions=['gemini-pro', 'gemini-1.0-pro-latest', 'gemini-1.0-pro-001'],
Expand Down Expand Up @@ -605,6 +610,8 @@ def _genkit_to_googleai_cfg(
temperature=request_config.temperature,
stop_sequences=request_config.stop_sequences,
)
elif isinstance(request_config, GeminiConfigSchema):
cfg = request_config
elif isinstance(request_config, dict):
cfg = genai_types.GenerateContentConfig(**request_config)

Expand Down
12 changes: 11 additions & 1 deletion py/samples/hello-google-genai/src/hello.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
from genkit.plugins.google_ai.models import gemini
from genkit.plugins.google_genai import (
EmbeddingTaskType,
GeminiConfigSchema,
GeminiEmbeddingModels,
GoogleGenai,
google_genai_name,
)

ai = Genkit(
plugins=[GoogleGenai()],
model=google_genai_name('gemini-2.0-flash'),
model=google_genai_name('gemini-2.0-flash-exp'),
)


Expand Down Expand Up @@ -191,6 +192,15 @@ async def generate_character_unconstrained(name: str, ctx):
return result.output


@ai.flow()
async def generate_images(name: str, ctx):
result = await ai.generate(
prompt=f'tell me a about the Eifel Tower with photos',
config=GeminiConfigSchema(response_modalities=['text', 'image']),
)
return result


async def main() -> None:
print(await say_hi(', tell me a joke'))

Expand Down
Loading