Skip to content

Commit 43e67ea

Browse files
jscudcopybara-github
jscud
authored and
copybara-github
committed
feat: Update data types from discovery doc.
PiperOrigin-RevId: 874934656
1 parent 87a5125 commit 43e67ea

3 files changed

Lines changed: 486 additions & 1218 deletions

File tree

‎vertexai/_genai/evals.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ def _CustomCodeExecutionSpec_from_vertex(
131131
getv(from_object, ["evaluation_function"]),
132132
)
133133

134+
if getv(from_object, ["evaluationFunction"]) is not None:
135+
setv(
136+
to_object,
137+
["evaluation_function"],
138+
getv(from_object, ["evaluationFunction"]),
139+
)
140+
134141
return to_object
135142

136143

@@ -146,6 +153,13 @@ def _CustomCodeExecutionSpec_to_vertex(
146153
getv(from_object, ["remote_custom_function"]),
147154
)
148155

156+
if getv(from_object, ["evaluation_function"]) is not None:
157+
setv(
158+
to_object,
159+
["evaluationFunction"],
160+
getv(from_object, ["evaluation_function"]),
161+
)
162+
149163
return to_object
150164

151165

‎vertexai/_genai/types/__init__.py‎

Lines changed: 29 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
from .common import A2aTask
9999
from .common import A2aTaskDict
100100
from .common import A2aTaskOrDict
101-
from .common import A2aTaskState
102101
from .common import AcceleratorType
103102
from .common import AgentEngine
104103
from .common import AgentEngineConfig
@@ -185,9 +184,6 @@
185184
from .common import BleuResults
186185
from .common import BleuResultsDict
187186
from .common import BleuResultsOrDict
188-
from .common import Blob
189-
from .common import BlobDict
190-
from .common import BlobOrDict
191187
from .common import CandidateResponse
192188
from .common import CandidateResponseDict
193189
from .common import CandidateResponseOrDict
@@ -196,9 +192,6 @@
196192
from .common import Chunk
197193
from .common import ChunkDict
198194
from .common import ChunkOrDict
199-
from .common import CodeExecutionResult
200-
from .common import CodeExecutionResultDict
201-
from .common import CodeExecutionResultOrDict
202195
from .common import CometResult
203196
from .common import CometResultDict
204197
from .common import CometResultOrDict
@@ -417,24 +410,13 @@
417410
from .common import ExactMatchSpec
418411
from .common import ExactMatchSpecDict
419412
from .common import ExactMatchSpecOrDict
420-
from .common import ExecutableCode
421-
from .common import ExecutableCodeDict
422-
from .common import ExecutableCodeOrDict
423413
from .common import ExecuteCodeAgentEngineSandboxConfig
424414
from .common import ExecuteCodeAgentEngineSandboxConfigDict
425415
from .common import ExecuteCodeAgentEngineSandboxConfigOrDict
426416
from .common import ExecuteSandboxEnvironmentResponse
427417
from .common import ExecuteSandboxEnvironmentResponseDict
428418
from .common import ExecuteSandboxEnvironmentResponseOrDict
429-
from .common import FileData
430-
from .common import FileDataDict
431-
from .common import FileDataOrDict
432-
from .common import FunctionCall
433-
from .common import FunctionCallDict
434-
from .common import FunctionCallOrDict
435-
from .common import FunctionResponse
436-
from .common import FunctionResponseDict
437-
from .common import FunctionResponseOrDict
419+
from .common import Framework
438420
from .common import GcsSource
439421
from .common import GcsSourceDict
440422
from .common import GcsSourceOrDict
@@ -679,6 +661,9 @@
679661
from .common import MetricxResult
680662
from .common import MetricxResultDict
681663
from .common import MetricxResultOrDict
664+
from .common import ModelArmorConfig
665+
from .common import ModelArmorConfigDict
666+
from .common import ModelArmorConfigOrDict
682667
from .common import MultimodalDataset
683668
from .common import MultimodalDatasetDict
684669
from .common import MultimodalDatasetOperation
@@ -706,7 +691,6 @@
706691
from .common import OptimizeResponseEndpointOrDict
707692
from .common import OptimizeResponseOrDict
708693
from .common import OptimizeTarget
709-
from .common import Outcome
710694
from .common import PairwiseChoice
711695
from .common import PairwiseMetricInput
712696
from .common import PairwiseMetricInputDict
@@ -718,12 +702,6 @@
718702
from .common import PairwiseMetricResultDict
719703
from .common import PairwiseMetricResultOrDict
720704
from .common import ParsedResponseUnion
721-
from .common import Part
722-
from .common import PartDict
723-
from .common import PartialArg
724-
from .common import PartialArgDict
725-
from .common import PartialArgOrDict
726-
from .common import PartOrDict
727705
from .common import PointwiseMetricInput
728706
from .common import PointwiseMetricInputDict
729707
from .common import PointwiseMetricInputOrDict
@@ -817,9 +795,6 @@
817795
from .common import ReasoningEngineSpecPackageSpecOrDict
818796
from .common import ReasoningEngineSpecSourceCodeSpec
819797
from .common import ReasoningEngineSpecSourceCodeSpecAgentConfigSource
820-
from .common import ReasoningEngineSpecSourceCodeSpecAgentConfigSourceAdkConfig
821-
from .common import ReasoningEngineSpecSourceCodeSpecAgentConfigSourceAdkConfigDict
822-
from .common import ReasoningEngineSpecSourceCodeSpecAgentConfigSourceAdkConfigOrDict
823798
from .common import ReasoningEngineSpecSourceCodeSpecAgentConfigSourceDict
824799
from .common import ReasoningEngineSpecSourceCodeSpecAgentConfigSourceOrDict
825800
from .common import ReasoningEngineSpecSourceCodeSpecDeveloperConnectConfig
@@ -957,6 +932,12 @@
957932
from .common import SchemaPromptInstanceVariableValue
958933
from .common import SchemaPromptInstanceVariableValueDict
959934
from .common import SchemaPromptInstanceVariableValueOrDict
935+
from .common import SchemaPromptSpecAppBuilderData
936+
from .common import SchemaPromptSpecAppBuilderDataDict
937+
from .common import SchemaPromptSpecAppBuilderDataLinkedResource
938+
from .common import SchemaPromptSpecAppBuilderDataLinkedResourceDict
939+
from .common import SchemaPromptSpecAppBuilderDataLinkedResourceOrDict
940+
from .common import SchemaPromptSpecAppBuilderDataOrDict
960941
from .common import SchemaPromptSpecMultimodalPrompt
961942
from .common import SchemaPromptSpecMultimodalPromptDict
962943
from .common import SchemaPromptSpecMultimodalPromptOrDict
@@ -1022,39 +1003,9 @@
10221003
from .common import SummaryMetric
10231004
from .common import SummaryMetricDict
10241005
from .common import SummaryMetricOrDict
1025-
from .common import TaskArtifact
1026-
from .common import TaskArtifactChange
1027-
from .common import TaskArtifactChangeDict
1028-
from .common import TaskArtifactChangeOrDict
1029-
from .common import TaskArtifactDict
1030-
from .common import TaskArtifactOrDict
10311006
from .common import TaskEvent
1032-
from .common import TaskEventData
1033-
from .common import TaskEventDataDict
1034-
from .common import TaskEventDataOrDict
10351007
from .common import TaskEventDict
10361008
from .common import TaskEventOrDict
1037-
from .common import TaskMessage
1038-
from .common import TaskMessageDict
1039-
from .common import TaskMessageOrDict
1040-
from .common import TaskMetadataChange
1041-
from .common import TaskMetadataChangeDict
1042-
from .common import TaskMetadataChangeOrDict
1043-
from .common import TaskOutput
1044-
from .common import TaskOutputChange
1045-
from .common import TaskOutputChangeDict
1046-
from .common import TaskOutputChangeOrDict
1047-
from .common import TaskOutputDict
1048-
from .common import TaskOutputOrDict
1049-
from .common import TaskStateChange
1050-
from .common import TaskStateChangeDict
1051-
from .common import TaskStateChangeOrDict
1052-
from .common import TaskStatusDetails
1053-
from .common import TaskStatusDetailsChange
1054-
from .common import TaskStatusDetailsChangeDict
1055-
from .common import TaskStatusDetailsChangeOrDict
1056-
from .common import TaskStatusDetailsDict
1057-
from .common import TaskStatusDetailsOrDict
10581009
from .common import ToolCallValidInput
10591010
from .common import ToolCallValidInputDict
10601011
from .common import ToolCallValidInputOrDict
@@ -1149,9 +1100,6 @@
11491100
from .common import VertexBaseConfig
11501101
from .common import VertexBaseConfigDict
11511102
from .common import VertexBaseConfigOrDict
1152-
from .common import VideoMetadata
1153-
from .common import VideoMetadataDict
1154-
from .common import VideoMetadataOrDict
11551103
from .common import WinRateStats
11561104
from .common import WinRateStatsDict
11571105
from .common import WinRateStatsOrDict
@@ -1163,45 +1111,6 @@
11631111
"GetAgentEngineTaskConfig",
11641112
"GetAgentEngineTaskConfigDict",
11651113
"GetAgentEngineTaskConfigOrDict",
1166-
"CodeExecutionResult",
1167-
"CodeExecutionResultDict",
1168-
"CodeExecutionResultOrDict",
1169-
"ExecutableCode",
1170-
"ExecutableCodeDict",
1171-
"ExecutableCodeOrDict",
1172-
"FileData",
1173-
"FileDataDict",
1174-
"FileDataOrDict",
1175-
"PartialArg",
1176-
"PartialArgDict",
1177-
"PartialArgOrDict",
1178-
"FunctionCall",
1179-
"FunctionCallDict",
1180-
"FunctionCallOrDict",
1181-
"FunctionResponse",
1182-
"FunctionResponseDict",
1183-
"FunctionResponseOrDict",
1184-
"Blob",
1185-
"BlobDict",
1186-
"BlobOrDict",
1187-
"VideoMetadata",
1188-
"VideoMetadataDict",
1189-
"VideoMetadataOrDict",
1190-
"Part",
1191-
"PartDict",
1192-
"PartOrDict",
1193-
"TaskArtifact",
1194-
"TaskArtifactDict",
1195-
"TaskArtifactOrDict",
1196-
"TaskOutput",
1197-
"TaskOutputDict",
1198-
"TaskOutputOrDict",
1199-
"TaskMessage",
1200-
"TaskMessageDict",
1201-
"TaskMessageOrDict",
1202-
"TaskStatusDetails",
1203-
"TaskStatusDetailsDict",
1204-
"TaskStatusDetailsOrDict",
12051114
"A2aTask",
12061115
"A2aTaskDict",
12071116
"A2aTaskOrDict",
@@ -1214,24 +1123,6 @@
12141123
"CreateAgentEngineTaskConfig",
12151124
"CreateAgentEngineTaskConfigDict",
12161125
"CreateAgentEngineTaskConfigOrDict",
1217-
"TaskMetadataChange",
1218-
"TaskMetadataChangeDict",
1219-
"TaskMetadataChangeOrDict",
1220-
"TaskArtifactChange",
1221-
"TaskArtifactChangeDict",
1222-
"TaskArtifactChangeOrDict",
1223-
"TaskOutputChange",
1224-
"TaskOutputChangeDict",
1225-
"TaskOutputChangeOrDict",
1226-
"TaskStateChange",
1227-
"TaskStateChangeDict",
1228-
"TaskStateChangeOrDict",
1229-
"TaskStatusDetailsChange",
1230-
"TaskStatusDetailsChangeDict",
1231-
"TaskStatusDetailsChangeOrDict",
1232-
"TaskEventData",
1233-
"TaskEventDataDict",
1234-
"TaskEventDataOrDict",
12351126
"TaskEvent",
12361127
"TaskEventDict",
12371128
"TaskEventOrDict",
@@ -1610,15 +1501,6 @@
16101501
"ReasoningEngineSpecPackageSpec",
16111502
"ReasoningEngineSpecPackageSpecDict",
16121503
"ReasoningEngineSpecPackageSpecOrDict",
1613-
"ReasoningEngineSpecSourceCodeSpecAgentConfigSourceAdkConfig",
1614-
"ReasoningEngineSpecSourceCodeSpecAgentConfigSourceAdkConfigDict",
1615-
"ReasoningEngineSpecSourceCodeSpecAgentConfigSourceAdkConfigOrDict",
1616-
"ReasoningEngineSpecSourceCodeSpecInlineSource",
1617-
"ReasoningEngineSpecSourceCodeSpecInlineSourceDict",
1618-
"ReasoningEngineSpecSourceCodeSpecInlineSourceOrDict",
1619-
"ReasoningEngineSpecSourceCodeSpecAgentConfigSource",
1620-
"ReasoningEngineSpecSourceCodeSpecAgentConfigSourceDict",
1621-
"ReasoningEngineSpecSourceCodeSpecAgentConfigSourceOrDict",
16221504
"ReasoningEngineSpecSourceCodeSpecDeveloperConnectConfig",
16231505
"ReasoningEngineSpecSourceCodeSpecDeveloperConnectConfigDict",
16241506
"ReasoningEngineSpecSourceCodeSpecDeveloperConnectConfigOrDict",
@@ -1628,6 +1510,9 @@
16281510
"ReasoningEngineSpecSourceCodeSpecImageSpec",
16291511
"ReasoningEngineSpecSourceCodeSpecImageSpecDict",
16301512
"ReasoningEngineSpecSourceCodeSpecImageSpecOrDict",
1513+
"ReasoningEngineSpecSourceCodeSpecInlineSource",
1514+
"ReasoningEngineSpecSourceCodeSpecInlineSourceDict",
1515+
"ReasoningEngineSpecSourceCodeSpecInlineSourceOrDict",
16311516
"ReasoningEngineSpecSourceCodeSpecPythonSpec",
16321517
"ReasoningEngineSpecSourceCodeSpecPythonSpecDict",
16331518
"ReasoningEngineSpecSourceCodeSpecPythonSpecOrDict",
@@ -1922,6 +1807,9 @@
19221807
"ListAgentEngineSessionEventsResponse",
19231808
"ListAgentEngineSessionEventsResponseDict",
19241809
"ListAgentEngineSessionEventsResponseOrDict",
1810+
"ModelArmorConfig",
1811+
"ModelArmorConfigDict",
1812+
"ModelArmorConfigOrDict",
19251813
"GeminiExample",
19261814
"GeminiExampleDict",
19271815
"GeminiExampleOrDict",
@@ -1994,6 +1882,12 @@
19941882
"SchemaPromptSpecMultimodalPrompt",
19951883
"SchemaPromptSpecMultimodalPromptDict",
19961884
"SchemaPromptSpecMultimodalPromptOrDict",
1885+
"SchemaPromptSpecAppBuilderDataLinkedResource",
1886+
"SchemaPromptSpecAppBuilderDataLinkedResourceDict",
1887+
"SchemaPromptSpecAppBuilderDataLinkedResourceOrDict",
1888+
"SchemaPromptSpecAppBuilderData",
1889+
"SchemaPromptSpecAppBuilderDataDict",
1890+
"SchemaPromptSpecAppBuilderDataOrDict",
19971891
"SchemaPromptSpecPartList",
19981892
"SchemaPromptSpecPartListDict",
19991893
"SchemaPromptSpecPartListOrDict",
@@ -2114,6 +2008,9 @@
21142008
"AgentEngine",
21152009
"AgentEngineDict",
21162010
"AgentEngineOrDict",
2011+
"ReasoningEngineSpecSourceCodeSpecAgentConfigSource",
2012+
"ReasoningEngineSpecSourceCodeSpecAgentConfigSourceDict",
2013+
"ReasoningEngineSpecSourceCodeSpecAgentConfigSourceOrDict",
21172014
"AgentEngineConfig",
21182015
"AgentEngineConfigDict",
21192016
"AgentEngineConfigOrDict",
@@ -2156,10 +2053,7 @@
21562053
"OptimizeJobConfig",
21572054
"OptimizeJobConfigDict",
21582055
"OptimizeJobConfigOrDict",
2159-
"A2aTaskState",
2160-
"Outcome",
2161-
"Language",
2162-
"State",
2056+
"ComputationBasedMetricType",
21632057
"PairwiseChoice",
21642058
"Strategy",
21652059
"AcceleratorType",
@@ -2169,11 +2063,13 @@
21692063
"AgentServerMode",
21702064
"ManagedTopicEnum",
21712065
"Operator",
2066+
"Language",
21722067
"MachineConfig",
2068+
"State",
2069+
"Framework",
21732070
"EvaluationItemType",
21742071
"SamplingMethod",
21752072
"RubricContentType",
2176-
"ComputationBasedMetricType",
21772073
"EvaluationRunState",
21782074
"OptimizeTarget",
21792075
"MemoryMetadataMergeStrategy",

0 commit comments

Comments
 (0)