Skip to content

Commit 21cc3be

Browse files
GWealeShaharKatz
authored andcommitted
fix: OpenAPI schema generation by skipping JSON schema for judge_model_config
Close #3750 Co-authored-by: George Weale <gweale@google.com> PiperOrigin-RevId: 841991676
1 parent 539d856 commit 21cc3be

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/google/adk/evaluation/eval_metrics.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from pydantic import BaseModel
2424
from pydantic import ConfigDict
2525
from pydantic import Field
26+
from pydantic.json_schema import SkipJsonSchema
2627
from typing_extensions import TypeAlias
2728

2829
from .common import EvalBaseModel
@@ -71,8 +72,10 @@ class JudgeModelOptions(EvalBaseModel):
7172
),
7273
)
7374

74-
judge_model_config: Optional[genai_types.GenerateContentConfig] = Field(
75-
default=genai_types.GenerateContentConfig,
75+
judge_model_config: SkipJsonSchema[
76+
Optional[genai_types.GenerateContentConfig]
77+
] = Field(
78+
default=None,
7679
description="The configuration for the judge model.",
7780
)
7881

src/google/adk/evaluation/hallucinations_v1.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,10 @@ def __init__(self, eval_metric: EvalMetric):
298298
self.segmenter_prompt = _HALLUCINATIONS_V1_SEGMENTER_PROMPT
299299
self.sentence_validator_prompt = _HALLUCINATIONS_V1_VALIDATOR_PROMPT
300300
self._model = self._judge_model_options.judge_model
301-
self._model_config = self._judge_model_options.judge_model_config
301+
self._model_config = (
302+
self._judge_model_options.judge_model_config
303+
or genai_types.GenerateContentConfig()
304+
)
302305

303306
def _setup_auto_rater(self) -> BaseLlm:
304307
model_id = self._judge_model_options.judge_model

src/google/adk/evaluation/llm_as_judge.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ async def evaluate_invocations(
141141
role="user",
142142
)
143143
],
144-
config=self._judge_model_options.judge_model_config,
144+
config=self._judge_model_options.judge_model_config
145+
or genai_types.GenerateContentConfig(),
145146
)
146147
add_default_retry_options_if_not_present(llm_request)
147148
num_samples = self._judge_model_options.num_samples

0 commit comments

Comments
 (0)