Skip to content
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
14 changes: 14 additions & 0 deletions vertexai/_genai/evals.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@ def _CustomCodeExecutionSpec_from_vertex(
getv(from_object, ["evaluation_function"]),
)

if getv(from_object, ["evaluationFunction"]) is not None:
setv(
to_object,
["evaluation_function"],
getv(from_object, ["evaluationFunction"]),
)

return to_object


Expand All @@ -146,6 +153,13 @@ def _CustomCodeExecutionSpec_to_vertex(
getv(from_object, ["remote_custom_function"]),
)

if getv(from_object, ["evaluation_function"]) is not None:
setv(
to_object,
["evaluationFunction"],
getv(from_object, ["evaluation_function"]),
)

return to_object


Expand Down
50 changes: 49 additions & 1 deletion vertexai/_genai/types/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,23 @@
from .common import FileData
from .common import FileDataDict
from .common import FileDataOrDict
from .common import Framework
from .common import FunctionCall
from .common import FunctionCallDict
from .common import FunctionCallOrDict
from .common import FunctionResponse
from .common import FunctionResponseBlob
from .common import FunctionResponseBlobDict
from .common import FunctionResponseBlobOrDict
from .common import FunctionResponseDict
from .common import FunctionResponseFileData
from .common import FunctionResponseFileDataDict
from .common import FunctionResponseFileDataOrDict
from .common import FunctionResponseOrDict
from .common import FunctionResponsePart
from .common import FunctionResponsePartDict
from .common import FunctionResponsePartOrDict
from .common import FunctionResponseScheduling
from .common import GcsSource
from .common import GcsSourceDict
from .common import GcsSourceOrDict
Expand Down Expand Up @@ -605,6 +616,7 @@
from .common import MapInstance
from .common import MapInstanceDict
from .common import MapInstanceOrDict
from .common import MediaResolution
from .common import Memory
from .common import MemoryBankCustomizationConfig
from .common import MemoryBankCustomizationConfigDict
Expand Down Expand Up @@ -679,6 +691,9 @@
from .common import MetricxResult
from .common import MetricxResultDict
from .common import MetricxResultOrDict
from .common import ModelArmorConfig
from .common import ModelArmorConfigDict
from .common import ModelArmorConfigOrDict
from .common import MultimodalDataset
from .common import MultimodalDatasetDict
from .common import MultimodalDatasetOperation
Expand Down Expand Up @@ -723,6 +738,9 @@
from .common import PartialArg
from .common import PartialArgDict
from .common import PartialArgOrDict
from .common import PartMediaResolution
from .common import PartMediaResolutionDict
from .common import PartMediaResolutionOrDict
from .common import PartOrDict
from .common import PointwiseMetricInput
from .common import PointwiseMetricInputDict
Expand Down Expand Up @@ -957,6 +975,12 @@
from .common import SchemaPromptInstanceVariableValue
from .common import SchemaPromptInstanceVariableValueDict
from .common import SchemaPromptInstanceVariableValueOrDict
from .common import SchemaPromptSpecAppBuilderData
from .common import SchemaPromptSpecAppBuilderDataDict
from .common import SchemaPromptSpecAppBuilderDataLinkedResource
from .common import SchemaPromptSpecAppBuilderDataLinkedResourceDict
from .common import SchemaPromptSpecAppBuilderDataLinkedResourceOrDict
from .common import SchemaPromptSpecAppBuilderDataOrDict
from .common import SchemaPromptSpecMultimodalPrompt
from .common import SchemaPromptSpecMultimodalPromptDict
from .common import SchemaPromptSpecMultimodalPromptOrDict
Expand Down Expand Up @@ -1178,12 +1202,24 @@
"FunctionCall",
"FunctionCallDict",
"FunctionCallOrDict",
"FunctionResponseFileData",
"FunctionResponseFileDataDict",
"FunctionResponseFileDataOrDict",
"FunctionResponseBlob",
"FunctionResponseBlobDict",
"FunctionResponseBlobOrDict",
"FunctionResponsePart",
"FunctionResponsePartDict",
"FunctionResponsePartOrDict",
"FunctionResponse",
"FunctionResponseDict",
"FunctionResponseOrDict",
"Blob",
"BlobDict",
"BlobOrDict",
"PartMediaResolution",
"PartMediaResolutionDict",
"PartMediaResolutionOrDict",
"VideoMetadata",
"VideoMetadataDict",
"VideoMetadataOrDict",
Expand Down Expand Up @@ -1922,6 +1958,9 @@
"ListAgentEngineSessionEventsResponse",
"ListAgentEngineSessionEventsResponseDict",
"ListAgentEngineSessionEventsResponseOrDict",
"ModelArmorConfig",
"ModelArmorConfigDict",
"ModelArmorConfigOrDict",
"GeminiExample",
"GeminiExampleDict",
"GeminiExampleOrDict",
Expand Down Expand Up @@ -1994,6 +2033,12 @@
"SchemaPromptSpecMultimodalPrompt",
"SchemaPromptSpecMultimodalPromptDict",
"SchemaPromptSpecMultimodalPromptOrDict",
"SchemaPromptSpecAppBuilderDataLinkedResource",
"SchemaPromptSpecAppBuilderDataLinkedResourceDict",
"SchemaPromptSpecAppBuilderDataLinkedResourceOrDict",
"SchemaPromptSpecAppBuilderData",
"SchemaPromptSpecAppBuilderDataDict",
"SchemaPromptSpecAppBuilderDataOrDict",
"SchemaPromptSpecPartList",
"SchemaPromptSpecPartListDict",
"SchemaPromptSpecPartListOrDict",
Expand Down Expand Up @@ -2159,7 +2204,10 @@
"A2aTaskState",
"Outcome",
"Language",
"FunctionResponseScheduling",
"MediaResolution",
"State",
"ComputationBasedMetricType",
"PairwiseChoice",
"Strategy",
"AcceleratorType",
Expand All @@ -2170,10 +2218,10 @@
"ManagedTopicEnum",
"Operator",
"MachineConfig",
"Framework",
"EvaluationItemType",
"SamplingMethod",
"RubricContentType",
"ComputationBasedMetricType",
"EvaluationRunState",
"OptimizeTarget",
"MemoryMetadataMergeStrategy",
Expand Down
Loading
Loading