diff --git a/agentplatform/_genai/evals.py b/agentplatform/_genai/evals.py index 4b600f7054..20575deb65 100644 --- a/agentplatform/_genai/evals.py +++ b/agentplatform/_genai/evals.py @@ -108,6 +108,9 @@ def _CreateEvaluationMetricParameters_to_vertex( t.t_metric_for_registry(getv(from_object, ["metric"])), ) + if getv(from_object, ["encryption_spec"]) is not None: + setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"])) + if getv(from_object, ["config"]) is not None: setv(to_object, ["config"], getv(from_object, ["config"])) @@ -181,6 +184,9 @@ def _CreateEvaluationSetParameters_to_vertex( if getv(from_object, ["display_name"]) is not None: setv(to_object, ["displayName"], getv(from_object, ["display_name"])) + if getv(from_object, ["encryption_spec"]) is not None: + setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"])) + if getv(from_object, ["config"]) is not None: setv(to_object, ["config"], getv(from_object, ["config"])) @@ -1336,6 +1342,7 @@ def _create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> types.EvaluationMetric: """ @@ -1346,6 +1353,7 @@ def _create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) @@ -1505,6 +1513,7 @@ def _create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """ @@ -1514,6 +1523,7 @@ def _create_evaluation_set( parameter_model = types._CreateEvaluationSetParameters( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) @@ -3531,6 +3541,7 @@ def create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """Creates an EvaluationSet. @@ -3539,6 +3550,8 @@ def create_evaluation_set( evaluation_items: The list of evaluation item names. Format: `projects/{project}/locations/{location}/evaluationItems/{evaluation_item}` display_name: The display name of the evaluation set. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationSet will be secured by the provided key. config: The optional configuration for the evaluation set. Must be a dict or `types.CreateEvaluationSetConfigOrDict` type. @@ -3548,6 +3561,7 @@ def create_evaluation_set( return self._create_evaluation_set( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) @@ -3695,9 +3709,22 @@ def create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> str: - """Creates an EvaluationMetric.""" + """Creates an EvaluationMetric. + + Args: + display_name: The display name of the EvaluationMetric. + description: The description of the EvaluationMetric. + metric: The metric configuration. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationMetric will be secured by the provided key. + config: Optional configuration for the request. + + Returns: + The resource name of the created EvaluationMetric. + """ if metric and not isinstance(metric, dict): # metric is now Metric | LazyLoadedPrebuiltMetric (RubricMetric) # Mypy correctly narrows the type here, so cast is not needed. @@ -3717,6 +3744,7 @@ def create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) # result.name is Optional[str], but we know it's always returned on creation @@ -3978,6 +4006,7 @@ async def _create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> types.EvaluationMetric: """ @@ -3988,6 +4017,7 @@ async def _create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) @@ -4151,6 +4181,7 @@ async def _create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """ @@ -4160,6 +4191,7 @@ async def _create_evaluation_set( parameter_model = types._CreateEvaluationSetParameters( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) @@ -5816,6 +5848,7 @@ async def create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """Creates an EvaluationSet. @@ -5824,6 +5857,8 @@ async def create_evaluation_set( evaluation_items: The list of evaluation item names. Format: `projects/{project}/locations/{location}/evaluationItems/{evaluation_item}` display_name: The display name of the evaluation set. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationSet will be secured by the provided key. config: The optional configuration for the evaluation set. Must be a dict or `types.CreateEvaluationSetConfigOrDict` type. @@ -5833,6 +5868,7 @@ async def create_evaluation_set( result = await self._create_evaluation_set( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) return result @@ -5981,9 +6017,22 @@ async def create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> str: - """Creates an EvaluationMetric.""" + """Creates an EvaluationMetric. + + Args: + display_name: The display name of the EvaluationMetric. + description: The description of the EvaluationMetric. + metric: The metric configuration. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationMetric will be secured by the provided key. + config: Optional configuration for the request. + + Returns: + The resource name of the created EvaluationMetric. + """ if metric and not isinstance(metric, dict): resolved_metrics = _evals_common._resolve_metrics( [metric], self._api_client @@ -6001,6 +6050,7 @@ async def create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) return cast(str, result.name) diff --git a/agentplatform/_genai/types/common.py b/agentplatform/_genai/types/common.py index b0343429c1..d1a30cdce7 100644 --- a/agentplatform/_genai/types/common.py +++ b/agentplatform/_genai/types/common.py @@ -2301,6 +2301,10 @@ class _CreateEvaluationMetricParameters(_common.BaseModel): default=None, description="""The metric configuration of the evaluation metric.""", ) + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""", + ) config: Optional[CreateEvaluationMetricConfig] = Field( default=None, description="""""" ) @@ -2322,6 +2326,9 @@ class _CreateEvaluationMetricParametersDict(TypedDict, total=False): metric: Optional[MetricDict] """The metric configuration of the evaluation metric.""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""" + config: Optional[CreateEvaluationMetricConfigDict] """""" @@ -2446,6 +2453,10 @@ class EvaluationMetric(_common.BaseModel): default=None, description="""The metric configuration of the evaluation metric.""", ) + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""", + ) class EvaluationMetricDict(TypedDict, total=False): @@ -2463,6 +2474,9 @@ class EvaluationMetricDict(TypedDict, total=False): metric: Optional[UnifiedMetricDict] """The metric configuration of the evaluation metric.""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""" + EvaluationMetricOrDict = Union[EvaluationMetric, EvaluationMetricDict] @@ -4076,6 +4090,10 @@ class _CreateEvaluationSetParameters(_common.BaseModel): evaluation_items: Optional[list[str]] = Field(default=None, description="""""") display_name: Optional[str] = Field(default=None, description="""""") + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""", + ) config: Optional[CreateEvaluationSetConfig] = Field( default=None, description="""""" ) @@ -4090,6 +4108,9 @@ class _CreateEvaluationSetParametersDict(TypedDict, total=False): display_name: Optional[str] """""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""" + config: Optional[CreateEvaluationSetConfigDict] """""" @@ -4121,6 +4142,10 @@ class EvaluationSet(_common.BaseModel): metadata: Optional[dict[str, Any]] = Field( default=None, description="""The metadata of the evaluation set.""" ) + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""", + ) class EvaluationSetDict(TypedDict, total=False): @@ -4144,6 +4169,9 @@ class EvaluationSetDict(TypedDict, total=False): metadata: Optional[dict[str, Any]] """The metadata of the evaluation set.""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""" + EvaluationSetOrDict = Union[EvaluationSet, EvaluationSetDict] diff --git a/tests/unit/agentplatform/genai/replays/test_create_evaluation_set.py b/tests/unit/agentplatform/genai/replays/test_create_evaluation_set.py index 694c94851f..2aa8cfd3e7 100644 --- a/tests/unit/agentplatform/genai/replays/test_create_evaluation_set.py +++ b/tests/unit/agentplatform/genai/replays/test_create_evaluation_set.py @@ -36,6 +36,26 @@ def test_create_eval_set(client): assert evaluation_set.evaluation_items == EVAL_ITEMS +_KMS_KEY = ( + "projects/503583131166/locations/us-central1" + "/keyRings/test-kr/cryptoKeys/test-key" +) + + +def test_create_eval_set_with_cmek(client): + """CMEK: encryption_spec is forwarded in the request and returned on the resource.""" + evaluation_set = client.evals.create_evaluation_set( + evaluation_items=EVAL_ITEMS, + display_name=DISPLAY_NAME, + encryption_spec=types.genai_types.EncryptionSpec(kms_key_name=_KMS_KEY), + ) + assert isinstance(evaluation_set, types.EvaluationSet) + assert evaluation_set.display_name == DISPLAY_NAME + assert evaluation_set.evaluation_items == EVAL_ITEMS + assert evaluation_set.encryption_spec is not None + assert evaluation_set.encryption_spec.kms_key_name == _KMS_KEY + + pytest_plugins = ("pytest_asyncio",) diff --git a/tests/unit/agentplatform/genai/replays/test_evaluation_metric.py b/tests/unit/agentplatform/genai/replays/test_evaluation_metric.py index c9443f9395..db1add00d6 100644 --- a/tests/unit/agentplatform/genai/replays/test_evaluation_metric.py +++ b/tests/unit/agentplatform/genai/replays/test_evaluation_metric.py @@ -69,6 +69,35 @@ def test_list_evaluation_metrics_with_filter(client): assert metric.display_name == "tone-check-v1" +def test_create_evaluation_metric_with_cmek(client): + """CMEK: encryption_spec is forwarded in the request and returned on GET.""" + client._api_client._http_options.api_version = "v1beta1" + _KMS_KEY = ( + "projects/977012026409/locations/us-central1" + "/keyRings/test-kr/cryptoKeys/test-key" + ) + result = client.evals.create_evaluation_metric( + display_name="test_cmek_metric", + description="test_cmek_description", + metric=types.LLMMetric( + name="custom_llm_metric", prompt_template="test_prompt_template" + ), + encryption_spec=types.genai_types.EncryptionSpec(kms_key_name=_KMS_KEY), + ) + assert isinstance(result, str) + assert re.match( + r"^projects/[^/]+/locations/[^/]+/evaluationMetrics/[^/]+$", + result, + ) + + metric = client.evals.get_evaluation_metric(metric_resource_name=result) + assert isinstance(metric, types.EvaluationMetric) + assert metric.display_name == "test_cmek_metric" + # encryption_spec is returned from the API and surfaced on the resource. + assert metric.encryption_spec is not None + assert metric.encryption_spec.kms_key_name == _KMS_KEY + + # The setup function registers the module and method for the recorder pytestmark = pytest_helper.setup( file=__file__, diff --git a/vertexai/_genai/evals.py b/vertexai/_genai/evals.py index 3715571d96..244199eb6a 100644 --- a/vertexai/_genai/evals.py +++ b/vertexai/_genai/evals.py @@ -85,6 +85,9 @@ def _CreateEvaluationMetricParameters_to_vertex( t.t_metric_for_registry(getv(from_object, ["metric"])), ) + if getv(from_object, ["encryption_spec"]) is not None: + setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"])) + if getv(from_object, ["config"]) is not None: setv(to_object, ["config"], getv(from_object, ["config"])) @@ -181,6 +184,9 @@ def _CreateEvaluationSetParameters_to_vertex( if getv(from_object, ["display_name"]) is not None: setv(to_object, ["displayName"], getv(from_object, ["display_name"])) + if getv(from_object, ["encryption_spec"]) is not None: + setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"])) + if getv(from_object, ["config"]) is not None: setv(to_object, ["config"], getv(from_object, ["config"])) @@ -1226,6 +1232,7 @@ def _create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> types.EvaluationMetric: """ @@ -1236,6 +1243,7 @@ def _create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) @@ -1395,6 +1403,7 @@ def _create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """ @@ -1404,6 +1413,7 @@ def _create_evaluation_set( parameter_model = types._CreateEvaluationSetParameters( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) @@ -3024,6 +3034,7 @@ def create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """Creates an EvaluationSet. @@ -3032,6 +3043,8 @@ def create_evaluation_set( evaluation_items: The list of evaluation item names. Format: `projects/{project}/locations/{location}/evaluationItems/{evaluation_item}` display_name: The display name of the evaluation set. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationSet will be secured by the provided key. config: The optional configuration for the evaluation set. Must be a dict or `types.CreateEvaluationSetConfigOrDict` type. @@ -3041,6 +3054,7 @@ def create_evaluation_set( return self._create_evaluation_set( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) @@ -3160,9 +3174,22 @@ def create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> str: - """Creates an EvaluationMetric.""" + """Creates an EvaluationMetric. + + Args: + display_name: The display name of the EvaluationMetric. + description: The description of the EvaluationMetric. + metric: The metric configuration. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationMetric will be secured by the provided key. + config: Optional configuration for the request. + + Returns: + The resource name of the created EvaluationMetric. + """ if metric and not isinstance(metric, dict): # metric is now Metric | LazyLoadedPrebuiltMetric (RubricMetric) # Mypy correctly narrows the type here, so cast is not needed. @@ -3182,6 +3209,7 @@ def create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) # result.name is Optional[str], but we know it's always returned on creation @@ -3776,6 +3804,7 @@ async def _create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> types.EvaluationMetric: """ @@ -3786,6 +3815,7 @@ async def _create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) @@ -3949,6 +3979,7 @@ async def _create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """ @@ -3958,6 +3989,7 @@ async def _create_evaluation_set( parameter_model = types._CreateEvaluationSetParameters( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) @@ -5224,6 +5256,7 @@ async def create_evaluation_set( *, evaluation_items: list[str], display_name: Optional[str] = None, + encryption_spec: Optional[types.genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationSetConfigOrDict] = None, ) -> types.EvaluationSet: """Creates an EvaluationSet. @@ -5232,6 +5265,8 @@ async def create_evaluation_set( evaluation_items: The list of evaluation item names. Format: `projects/{project}/locations/{location}/evaluationItems/{evaluation_item}` display_name: The display name of the evaluation set. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationSet will be secured by the provided key. config: The optional configuration for the evaluation set. Must be a dict or `types.CreateEvaluationSetConfigOrDict` type. @@ -5241,6 +5276,7 @@ async def create_evaluation_set( result = await self._create_evaluation_set( evaluation_items=evaluation_items, display_name=display_name, + encryption_spec=encryption_spec, config=config, ) return result @@ -5361,9 +5397,22 @@ async def create_evaluation_metric( display_name: Optional[str] = None, description: Optional[str] = None, metric: Optional[types.MetricOrDict] = None, + encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, config: Optional[types.CreateEvaluationMetricConfigOrDict] = None, ) -> str: - """Creates an EvaluationMetric.""" + """Creates an EvaluationMetric. + + Args: + display_name: The display name of the EvaluationMetric. + description: The description of the EvaluationMetric. + metric: The metric configuration. + encryption_spec: Customer-managed encryption key spec. If set, this + EvaluationMetric will be secured by the provided key. + config: Optional configuration for the request. + + Returns: + The resource name of the created EvaluationMetric. + """ if metric and not isinstance(metric, dict): resolved_metrics = _evals_common._resolve_metrics( [metric], self._api_client @@ -5381,6 +5430,7 @@ async def create_evaluation_metric( display_name=display_name, description=description, metric=metric, + encryption_spec=encryption_spec, config=config, ) return cast(str, result.name) diff --git a/vertexai/_genai/types/common.py b/vertexai/_genai/types/common.py index 17d95148d1..c433ed8379 100644 --- a/vertexai/_genai/types/common.py +++ b/vertexai/_genai/types/common.py @@ -2115,6 +2115,10 @@ class _CreateEvaluationMetricParameters(_common.BaseModel): default=None, description="""The metric configuration of the evaluation metric.""", ) + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""", + ) config: Optional[CreateEvaluationMetricConfig] = Field( default=None, description="""""" ) @@ -2136,6 +2140,9 @@ class _CreateEvaluationMetricParametersDict(TypedDict, total=False): metric: Optional[MetricDict] """The metric configuration of the evaluation metric.""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""" + config: Optional[CreateEvaluationMetricConfigDict] """""" @@ -2260,6 +2267,10 @@ class EvaluationMetric(_common.BaseModel): default=None, description="""The metric configuration of the evaluation metric.""", ) + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""", + ) class EvaluationMetricDict(TypedDict, total=False): @@ -2277,6 +2288,9 @@ class EvaluationMetricDict(TypedDict, total=False): metric: Optional[UnifiedMetricDict] """The metric configuration of the evaluation metric.""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationMetric. If set, this EvaluationMetric will be secured by this key.""" + EvaluationMetricOrDict = Union[EvaluationMetric, EvaluationMetricDict] @@ -3816,6 +3830,10 @@ class _CreateEvaluationSetParameters(_common.BaseModel): evaluation_items: Optional[list[str]] = Field(default=None, description="""""") display_name: Optional[str] = Field(default=None, description="""""") + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""", + ) config: Optional[CreateEvaluationSetConfig] = Field( default=None, description="""""" ) @@ -3830,6 +3848,9 @@ class _CreateEvaluationSetParametersDict(TypedDict, total=False): display_name: Optional[str] """""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""" + config: Optional[CreateEvaluationSetConfigDict] """""" @@ -3861,6 +3882,10 @@ class EvaluationSet(_common.BaseModel): metadata: Optional[dict[str, Any]] = Field( default=None, description="""The metadata of the evaluation set.""" ) + encryption_spec: Optional[genai_types.EncryptionSpec] = Field( + default=None, + description="""Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""", + ) class EvaluationSetDict(TypedDict, total=False): @@ -3884,6 +3909,9 @@ class EvaluationSetDict(TypedDict, total=False): metadata: Optional[dict[str, Any]] """The metadata of the evaluation set.""" + encryption_spec: Optional[genai_types.EncryptionSpecDict] + """Customer-managed encryption key spec for this EvaluationSet. If set, this EvaluationSet will be secured by this key.""" + EvaluationSetOrDict = Union[EvaluationSet, EvaluationSetDict]