Skip to content

Commit e8b12cb

Browse files
BenjaminKazemicopybara-github
authored andcommitted
fix: GenAI SDK client(eval) - Reorder the params to put the Config param at the last place.
PiperOrigin-RevId: 835315926
1 parent 7ca4226 commit e8b12cb

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

vertexai/_genai/evals.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ def _CreateEvaluationRunParameters_to_vertex(
8181
if getv(from_object, ["labels"]) is not None:
8282
setv(to_object, ["labels"], getv(from_object, ["labels"]))
8383

84-
if getv(from_object, ["config"]) is not None:
85-
setv(to_object, ["config"], getv(from_object, ["config"]))
86-
8784
if getv(from_object, ["inference_configs"]) is not None:
8885
setv(to_object, ["inferenceConfigs"], getv(from_object, ["inference_configs"]))
8986

87+
if getv(from_object, ["config"]) is not None:
88+
setv(to_object, ["config"], getv(from_object, ["config"]))
89+
9090
return to_object
9191

9292

@@ -472,10 +472,10 @@ def _create_evaluation_run(
472472
data_source: types.EvaluationRunDataSourceOrDict,
473473
evaluation_config: types.EvaluationRunConfigOrDict,
474474
labels: Optional[dict[str, str]] = None,
475-
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
476475
inference_configs: Optional[
477476
dict[str, types.EvaluationRunInferenceConfigOrDict]
478477
] = None,
478+
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
479479
) -> types.EvaluationRun:
480480
"""
481481
Creates an EvaluationRun.
@@ -487,8 +487,8 @@ def _create_evaluation_run(
487487
data_source=data_source,
488488
evaluation_config=evaluation_config,
489489
labels=labels,
490-
config=config,
491490
inference_configs=inference_configs,
491+
config=config,
492492
)
493493

494494
request_url_dict: Optional[dict[str, str]]
@@ -1627,10 +1627,10 @@ async def _create_evaluation_run(
16271627
data_source: types.EvaluationRunDataSourceOrDict,
16281628
evaluation_config: types.EvaluationRunConfigOrDict,
16291629
labels: Optional[dict[str, str]] = None,
1630-
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
16311630
inference_configs: Optional[
16321631
dict[str, types.EvaluationRunInferenceConfigOrDict]
16331632
] = None,
1633+
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
16341634
) -> types.EvaluationRun:
16351635
"""
16361636
Creates an EvaluationRun.
@@ -1642,8 +1642,8 @@ async def _create_evaluation_run(
16421642
data_source=data_source,
16431643
evaluation_config=evaluation_config,
16441644
labels=labels,
1645-
config=config,
16461645
inference_configs=inference_configs,
1646+
config=config,
16471647
)
16481648

16491649
request_url_dict: Optional[dict[str, str]]

vertexai/_genai/types/common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,10 +1034,10 @@ class _CreateEvaluationRunParameters(_common.BaseModel):
10341034
default=None, description=""""""
10351035
)
10361036
labels: Optional[dict[str, str]] = Field(default=None, description="""""")
1037-
config: Optional[CreateEvaluationRunConfig] = Field(
1037+
inference_configs: Optional[dict[str, "EvaluationRunInferenceConfig"]] = Field(
10381038
default=None, description=""""""
10391039
)
1040-
inference_configs: Optional[dict[str, "EvaluationRunInferenceConfig"]] = Field(
1040+
config: Optional[CreateEvaluationRunConfig] = Field(
10411041
default=None, description=""""""
10421042
)
10431043

@@ -1060,10 +1060,10 @@ class _CreateEvaluationRunParametersDict(TypedDict, total=False):
10601060
labels: Optional[dict[str, str]]
10611061
""""""
10621062

1063-
config: Optional[CreateEvaluationRunConfigDict]
1063+
inference_configs: Optional[dict[str, "EvaluationRunInferenceConfigDict"]]
10641064
""""""
10651065

1066-
inference_configs: Optional[dict[str, "EvaluationRunInferenceConfigDict"]]
1066+
config: Optional[CreateEvaluationRunConfigDict]
10671067
""""""
10681068

10691069

0 commit comments

Comments
 (0)