diff --git a/.librarian/state.yaml b/.librarian/state.yaml index 25ceb08d84b2..92cd40a8c3d1 100644 --- a/.librarian/state.yaml +++ b/.librarian/state.yaml @@ -288,7 +288,7 @@ libraries: tag_format: '{id}-v{version}' - id: google-cloud-alloydb version: 0.7.0 - last_generated_commit: d4a34bf03d617723146fe3ae15192c4d93981a27 + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/cloud/alloydb/v1beta service_config: alloydb_v1beta.yaml @@ -523,7 +523,7 @@ libraries: tag_format: '{id}-v{version}' - id: google-cloud-auditmanager version: 0.1.0 - last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/cloud/auditmanager/v1 service_config: auditmanager_v1.yaml @@ -1041,7 +1041,7 @@ libraries: tag_format: '{id}-v{version}' - id: google-cloud-commerce-consumer-procurement version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/cloud/commerce/consumer/procurement/v1 service_config: cloudcommerceconsumerprocurement_v1.yaml @@ -1587,7 +1587,7 @@ libraries: tag_format: '{id}-v{version}' - id: google-cloud-documentai version: 3.10.0 - last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/cloud/documentai/v1beta3 service_config: documentai_v1beta3.yaml @@ -2413,7 +2413,7 @@ libraries: tag_format: '{id}-v{version}' - id: google-cloud-network-management version: 1.32.0 - last_generated_commit: cfe62b3c5ceb9f81879c61480f26707980534462 + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/cloud/networkmanagement/v1 service_config: networkmanagement_v1.yaml @@ -3129,7 +3129,7 @@ libraries: tag_format: '{id}-v{version}' - id: google-cloud-storagebatchoperations version: 0.4.0 - last_generated_commit: 1133adb136f742df62864f1d9d307df25d451880 + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/cloud/storagebatchoperations/v1 service_config: storagebatchoperations_v1.yaml @@ -3307,7 +3307,7 @@ libraries: tag_format: '{id}-v{version}' - id: google-cloud-vectorsearch version: 0.5.0 - last_generated_commit: 45e46bdae3874d2b92a2ced22529fc7037a1878f + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/cloud/vectorsearch/v1beta service_config: vectorsearch_v1beta.yaml @@ -3952,7 +3952,7 @@ libraries: tag_format: '{id}-v{version}' - id: googleapis-common-protos version: 1.72.0 - last_generated_commit: c662840a94dbdf708caa44893a2d49119cdd391c + last_generated_commit: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3 apis: - path: google/api service_config: serviceconfig.yaml diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py index 779a451097a4..1d185531d40c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py @@ -939,6 +939,9 @@ class Cluster(proto.Message): "123/environment": "production", "123/costCenter": "marketing". + dataplex_config (google.cloud.alloydb_v1.types.Cluster.DataplexConfig): + Optional. Configuration for Dataplex + integration. """ class State(proto.Enum): @@ -1129,6 +1132,23 @@ class TrialMetadata(proto.Message): message=timestamp_pb2.Timestamp, ) + class DataplexConfig(proto.Message): + r"""Configuration for Dataplex integration. + + Attributes: + enabled (bool): + Dataplex is enabled by default for resources + such as clusters and instances. This flag + controls the integration of AlloyDB PG resources + (like databases, schemas, and tables) with + Dataplex.". + """ + + enabled: bool = proto.Field( + proto.BOOL, + number=1, + ) + backup_source: "BackupSource" = proto.Field( proto.MESSAGE, number=15, @@ -1295,6 +1315,11 @@ class TrialMetadata(proto.Message): proto.STRING, number=41, ) + dataplex_config: DataplexConfig = proto.Field( + proto.MESSAGE, + number=47, + message=DataplexConfig, + ) class Instance(proto.Message): diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py index 7c02c6636765..5e4ac27f3d3d 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py @@ -954,6 +954,9 @@ class Cluster(proto.Message): the per-project service account. The per-cluster service account naming format is subject to change. + dataplex_config (google.cloud.alloydb_v1alpha.types.Cluster.DataplexConfig): + Optional. Configuration for Dataplex + integration. """ class State(proto.Enum): @@ -1144,6 +1147,23 @@ class TrialMetadata(proto.Message): message=timestamp_pb2.Timestamp, ) + class DataplexConfig(proto.Message): + r"""Configuration for Dataplex integration. + + Attributes: + enabled (bool): + Dataplex is enabled by default for resources + such as clusters and instances. This flag + controls the integration of AlloyDB PG resources + (like databases, schemas, and tables) with + Dataplex.". + """ + + enabled: bool = proto.Field( + proto.BOOL, + number=1, + ) + backup_source: "BackupSource" = proto.Field( proto.MESSAGE, number=15, @@ -1323,6 +1343,11 @@ class TrialMetadata(proto.Message): proto.STRING, number=46, ) + dataplex_config: DataplexConfig = proto.Field( + proto.MESSAGE, + number=47, + message=DataplexConfig, + ) class Instance(proto.Message): diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py index 3899d17bf3c4..624e72dd7c1d 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py @@ -952,6 +952,9 @@ class Cluster(proto.Message): the per-project service account. The per-cluster service account naming format is subject to change. + dataplex_config (google.cloud.alloydb_v1beta.types.Cluster.DataplexConfig): + Optional. Configuration for Dataplex + integration. """ class State(proto.Enum): @@ -1142,6 +1145,23 @@ class TrialMetadata(proto.Message): message=timestamp_pb2.Timestamp, ) + class DataplexConfig(proto.Message): + r"""Configuration for Dataplex integration. + + Attributes: + enabled (bool): + Dataplex is enabled by default for resources + such as clusters and instances. This flag + controls the integration of AlloyDB PG resources + (like databases, schemas, and tables) with + Dataplex.". + """ + + enabled: bool = proto.Field( + proto.BOOL, + number=1, + ) + backup_source: "BackupSource" = proto.Field( proto.MESSAGE, number=15, @@ -1317,6 +1337,11 @@ class TrialMetadata(proto.Message): proto.STRING, number=46, ) + dataplex_config: DataplexConfig = proto.Field( + proto.MESSAGE, + number=47, + message=DataplexConfig, + ) class Instance(proto.Message): diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py index e44985cba813..d8e49963ce63 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py @@ -24938,6 +24938,7 @@ def test_create_cluster_rest_call_success(request_type): "grace_end_time": {}, }, "tags": {}, + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -25225,6 +25226,7 @@ def test_update_cluster_rest_call_success(request_type): "grace_end_time": {}, }, "tags": {}, + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -26347,6 +26349,7 @@ def test_create_secondary_cluster_rest_call_success(request_type): "grace_end_time": {}, }, "tags": {}, + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py index b2847a10a03d..81cf2acf3c9e 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py @@ -25629,6 +25629,7 @@ def test_create_cluster_rest_call_success(request_type): }, "tags": {}, "service_account_email": "service_account_email_value", + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -25919,6 +25920,7 @@ def test_update_cluster_rest_call_success(request_type): }, "tags": {}, "service_account_email": "service_account_email_value", + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -27044,6 +27046,7 @@ def test_create_secondary_cluster_rest_call_success(request_type): }, "tags": {}, "service_account_email": "service_account_email_value", + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py index 6ff441dc74d1..d9f54930d923 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py @@ -25611,6 +25611,7 @@ def test_create_cluster_rest_call_success(request_type): }, "tags": {}, "service_account_email": "service_account_email_value", + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -25900,6 +25901,7 @@ def test_update_cluster_rest_call_success(request_type): }, "tags": {}, "service_account_email": "service_account_email_value", + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -27024,6 +27026,7 @@ def test_create_secondary_cluster_rest_call_success(request_type): }, "tags": {}, "service_account_email": "service_account_email_value", + "dataplex_config": {"enabled": True}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py index c57eed75ed3d..183d1e75c82f 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py @@ -143,6 +143,12 @@ class LayoutConfig(proto.Message): return_bounding_boxes (bool): Optional. Whether to include bounding boxes in layout parser processor response. + enable_image_annotation (bool): + Optional. Whether to include image + annotations in layout parser response. + enable_table_annotation (bool): + Optional. Whether to include table + annotations in layout parser response. """ class ChunkingConfig(proto.Message): @@ -179,6 +185,14 @@ class ChunkingConfig(proto.Message): proto.BOOL, number=3, ) + enable_image_annotation: bool = proto.Field( + proto.BOOL, + number=4, + ) + enable_table_annotation: bool = proto.Field( + proto.BOOL, + number=6, + ) class IndividualPageSelector(proto.Message): r"""A list of individual page numbers. diff --git a/packages/google-cloud-network-management/google/cloud/network_management/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management/__init__.py index 01e0615d027c..66cf9e53123f 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management/__init__.py @@ -68,6 +68,8 @@ ForwardInfo, ForwardingRuleInfo, GKEMasterInfo, + GkeNetworkPolicyInfo, + GkeNetworkPolicySkippedInfo, GkePodInfo, GoogleServiceInfo, HybridSubnetInfo, @@ -80,6 +82,7 @@ LoadBalancerType, NatInfo, NetworkInfo, + NgfwPacketInspectionInfo, ProxyConnectionInfo, RedisClusterInfo, RedisInstanceInfo, @@ -144,6 +147,8 @@ "ForwardInfo", "ForwardingRuleInfo", "GKEMasterInfo", + "GkeNetworkPolicyInfo", + "GkeNetworkPolicySkippedInfo", "GkePodInfo", "GoogleServiceInfo", "HybridSubnetInfo", @@ -155,6 +160,7 @@ "LoadBalancerInfo", "NatInfo", "NetworkInfo", + "NgfwPacketInspectionInfo", "ProxyConnectionInfo", "RedisClusterInfo", "RedisInstanceInfo", diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py index b4ed647bc98c..f2088a328734 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py @@ -73,6 +73,8 @@ ForwardInfo, ForwardingRuleInfo, GKEMasterInfo, + GkeNetworkPolicyInfo, + GkeNetworkPolicySkippedInfo, GkePodInfo, GoogleServiceInfo, HybridSubnetInfo, @@ -85,6 +87,7 @@ LoadBalancerType, NatInfo, NetworkInfo, + NgfwPacketInspectionInfo, ProxyConnectionInfo, RedisClusterInfo, RedisInstanceInfo, @@ -232,6 +235,8 @@ def _get_version(dependency_name): "GKEMasterInfo", "GetConnectivityTestRequest", "GetVpcFlowLogsConfigRequest", + "GkeNetworkPolicyInfo", + "GkeNetworkPolicySkippedInfo", "GkePodInfo", "GoogleServiceInfo", "HybridSubnetInfo", @@ -250,6 +255,7 @@ def _get_version(dependency_name): "LoadBalancerType", "NatInfo", "NetworkInfo", + "NgfwPacketInspectionInfo", "OperationMetadata", "OrganizationVpcFlowLogsServiceClient", "ProbingDetails", diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py index fd4153430f2d..1bf019bc86ac 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py @@ -45,6 +45,8 @@ ForwardInfo, ForwardingRuleInfo, GKEMasterInfo, + GkeNetworkPolicyInfo, + GkeNetworkPolicySkippedInfo, GkePodInfo, GoogleServiceInfo, HybridSubnetInfo, @@ -57,6 +59,7 @@ LoadBalancerType, NatInfo, NetworkInfo, + NgfwPacketInspectionInfo, ProxyConnectionInfo, RedisClusterInfo, RedisInstanceInfo, @@ -115,6 +118,8 @@ "ForwardInfo", "ForwardingRuleInfo", "GKEMasterInfo", + "GkeNetworkPolicyInfo", + "GkeNetworkPolicySkippedInfo", "GkePodInfo", "GoogleServiceInfo", "HybridSubnetInfo", @@ -126,6 +131,7 @@ "LoadBalancerInfo", "NatInfo", "NetworkInfo", + "NgfwPacketInspectionInfo", "ProxyConnectionInfo", "RedisClusterInfo", "RedisInstanceInfo", diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py index c35cc9974d55..430f34f8a4f4 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py @@ -45,6 +45,8 @@ "GKEMasterInfo", "GkePodInfo", "IpMasqueradingSkippedInfo", + "GkeNetworkPolicyInfo", + "GkeNetworkPolicySkippedInfo", "CloudSQLInstanceInfo", "RedisInstanceInfo", "RedisClusterInfo", @@ -59,6 +61,7 @@ "LoadBalancerBackendInfo", "StorageBucketInfo", "ServerlessNegInfo", + "NgfwPacketInspectionInfo", }, ) @@ -299,6 +302,15 @@ class Step(proto.Message): Display information of the reason why GKE Pod IP masquerading was skipped. + This field is a member of `oneof`_ ``step_info``. + gke_network_policy (google.cloud.network_management_v1.types.GkeNetworkPolicyInfo): + Display information of a GKE Network Policy. + + This field is a member of `oneof`_ ``step_info``. + gke_network_policy_skipped (google.cloud.network_management_v1.types.GkeNetworkPolicySkippedInfo): + Display information of the reason why GKE + Network Policy evaluation was skipped. + This field is a member of `oneof`_ ``step_info``. cloud_sql_instance (google.cloud.network_management_v1.types.CloudSQLInstanceInfo): Display information of a Cloud SQL instance. @@ -348,6 +360,11 @@ class Step(proto.Message): endpoint group backend. Used only for return traces. + This field is a member of `oneof`_ ``step_info``. + ngfw_packet_inspection (google.cloud.network_management_v1.types.NgfwPacketInspectionInfo): + Display information of a layer 7 packet + inspection by the firewall. + This field is a member of `oneof`_ ``step_info``. """ @@ -460,6 +477,8 @@ class State(proto.Enum): ARRIVE_AT_VPC_CONNECTOR (24): Forwarding state: arriving at a VPC connector. + ARRIVE_AT_GKE_POD (44): + Forwarding state: arriving at a GKE Pod. DIRECT_VPC_EGRESS_CONNECTION (35): Forwarding state: for packets originating from a serverless endpoint forwarded through @@ -468,6 +487,10 @@ class State(proto.Enum): Forwarding state: for packets originating from a serverless endpoint forwarded through public (external) connectivity. + NGFW_PACKET_INSPECTION (47): + Forwarding state: Layer 7 packet inspection + by the firewall endpoint based on the configured + security profile group. NAT (14): Transition state: packet header translated. The ``nat`` field is populated with the translation information. @@ -475,6 +498,20 @@ class State(proto.Enum): Transition state: GKE Pod IP masquerading is skipped. The ``ip_masquerading_skipped`` field is populated with the reason. + SKIP_GKE_INGRESS_NETWORK_POLICY (41): + Transition state: GKE Ingress Network Policy is skipped. The + ``gke_network_policy_skipped`` field is populated with the + reason. + SKIP_GKE_EGRESS_NETWORK_POLICY (42): + Transition state: GKE Egress Network Policy is skipped. The + ``gke_network_policy_skipped`` field is populated with the + reason. + APPLY_INGRESS_GKE_NETWORK_POLICY (45): + Config checking state: verify ingress GKE + network policy. + APPLY_EGRESS_GKE_NETWORK_POLICY (46): + Config checking state: verify egress GKE + network policy. PROXY_CONNECTION (15): Transition state: original connection is terminated and a new proxied connection is @@ -524,10 +561,16 @@ class State(proto.Enum): ARRIVE_AT_VPN_TUNNEL = 13 ARRIVE_AT_INTERCONNECT_ATTACHMENT = 37 ARRIVE_AT_VPC_CONNECTOR = 24 + ARRIVE_AT_GKE_POD = 44 DIRECT_VPC_EGRESS_CONNECTION = 35 SERVERLESS_EXTERNAL_CONNECTION = 36 + NGFW_PACKET_INSPECTION = 47 NAT = 14 SKIP_GKE_POD_IP_MASQUERADING = 40 + SKIP_GKE_INGRESS_NETWORK_POLICY = 41 + SKIP_GKE_EGRESS_NETWORK_POLICY = 42 + APPLY_INGRESS_GKE_NETWORK_POLICY = 45 + APPLY_EGRESS_GKE_NETWORK_POLICY = 46 PROXY_CONNECTION = 15 DELIVER = 16 DROP = 17 @@ -684,6 +727,18 @@ class State(proto.Enum): oneof="step_info", message="IpMasqueradingSkippedInfo", ) + gke_network_policy: "GkeNetworkPolicyInfo" = proto.Field( + proto.MESSAGE, + number=39, + oneof="step_info", + message="GkeNetworkPolicyInfo", + ) + gke_network_policy_skipped: "GkeNetworkPolicySkippedInfo" = proto.Field( + proto.MESSAGE, + number=40, + oneof="step_info", + message="GkeNetworkPolicySkippedInfo", + ) cloud_sql_instance: "CloudSQLInstanceInfo" = proto.Field( proto.MESSAGE, number=19, @@ -750,6 +805,12 @@ class State(proto.Enum): oneof="step_info", message="ServerlessNegInfo", ) + ngfw_packet_inspection: "NgfwPacketInspectionInfo" = proto.Field( + proto.MESSAGE, + number=42, + oneof="step_info", + message="NgfwPacketInspectionInfo", + ) class InstanceInfo(proto.Message): @@ -2929,6 +2990,12 @@ class Cause(proto.Enum): HYBRID_SUBNET_NO_ROUTE (106): Packet is dropped because no matching route was found in the hybrid subnet. + GKE_NETWORK_POLICY (108): + Packet is dropped by GKE Network Policy. + NO_VALID_ROUTE_FROM_GOOGLE_MANAGED_NETWORK_TO_DESTINATION (110): + Packet is dropped because there is no valid + matching route from the network of the + Google-managed service to the destination. """ CAUSE_UNSPECIFIED = 0 @@ -3034,6 +3101,8 @@ class Cause(proto.Enum): NCC_ROUTE_WITHIN_HYBRID_SUBNET_UNSUPPORTED = 104 HYBRID_SUBNET_REGION_MISMATCH = 105 HYBRID_SUBNET_NO_ROUTE = 106 + GKE_NETWORK_POLICY = 108 + NO_VALID_ROUTE_FROM_GOOGLE_MANAGED_NETWORK_TO_DESTINATION = 110 cause: Cause = proto.Field( proto.ENUM, @@ -3205,6 +3274,93 @@ class Reason(proto.Enum): ) +class GkeNetworkPolicyInfo(proto.Message): + r"""For display only. Metadata associated with a GKE Network + Policy. + + Attributes: + display_name (str): + The name of the Network Policy. + uri (str): + The URI of the Network Policy. Format for a Network Policy + in a zonal cluster: + ``projects//zones//clusters//k8s/namespaces//networking.k8s.io/networkpolicies/`` + Format for a Network Policy in a regional cluster: + ``projects//locations//clusters//k8s/namespaces//networking.k8s.io/networkpolicies/`` + direction (str): + Possible values: INGRESS, EGRESS + action (str): + Possible values: ALLOW, DENY + """ + + display_name: str = proto.Field( + proto.STRING, + number=1, + ) + uri: str = proto.Field( + proto.STRING, + number=2, + ) + direction: str = proto.Field( + proto.STRING, + number=3, + ) + action: str = proto.Field( + proto.STRING, + number=4, + ) + + +class GkeNetworkPolicySkippedInfo(proto.Message): + r"""For display only. Contains information about why GKE Network + Policy evaluation was skipped. + + Attributes: + reason (google.cloud.network_management_v1.types.GkeNetworkPolicySkippedInfo.Reason): + Reason why Network Policy evaluation was + skipped. + """ + + class Reason(proto.Enum): + r""" + + Values: + REASON_UNSPECIFIED (0): + Unused default value. + NETWORK_POLICY_DISABLED (1): + Network Policy is disabled on the cluster. + INGRESS_SOURCE_ON_SAME_NODE (2): + Ingress traffic to a Pod from a source on the + same Node is always allowed. + EGRESS_FROM_NODE_NETWORK_NAMESPACE_POD (3): + Egress traffic from a Pod that uses the + Node's network namespace is not subject to + Network Policy. + NETWORK_POLICY_NOT_APPLIED_TO_RESPONSE_TRAFFIC (4): + Network Policy is not applied to response + traffic. This is because GKE Network Policy + evaluation is stateful in both GKE Dataplane V2 + (eBPF) and legacy (iptables) implementations. + NETWORK_POLICY_ANALYSIS_UNSUPPORTED (100): + Network Policy evaluation is currently not + supported for clusters with FQDN Network + Policies enabled. + """ + + REASON_UNSPECIFIED = 0 + NETWORK_POLICY_DISABLED = 1 + INGRESS_SOURCE_ON_SAME_NODE = 2 + EGRESS_FROM_NODE_NETWORK_NAMESPACE_POD = 3 + NETWORK_POLICY_NOT_APPLIED_TO_RESPONSE_TRAFFIC = 4 + NETWORK_POLICY_ANALYSIS_UNSUPPORTED = 100 + + reason: Reason = proto.Field( + proto.ENUM, + number=1, + enum=Reason, + ) + + class CloudSQLInstanceInfo(proto.Message): r"""For display only. Metadata associated with a Cloud SQL instance. @@ -3928,4 +4084,20 @@ class ServerlessNegInfo(proto.Message): ) +class NgfwPacketInspectionInfo(proto.Message): + r"""For display only. Metadata associated with a layer 7 packet + inspection by the firewall. + + Attributes: + security_profile_group_uri (str): + URI of the security profile group associated + with this firewall packet inspection. + """ + + security_profile_group_uri: str = proto.Field( + proto.STRING, + number=1, + ) + + __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py index ce38ce30a0be..2bc8d7f1807e 100644 --- a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py +++ b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py @@ -5840,6 +5840,13 @@ def test_create_connectivity_test_rest_call_success(request_type): "reason": 1, "non_masquerade_range": "non_masquerade_range_value", }, + "gke_network_policy": { + "display_name": "display_name_value", + "uri": "uri_value", + "direction": "direction_value", + "action": "action_value", + }, + "gke_network_policy_skipped": {"reason": 1}, "cloud_sql_instance": { "display_name": "display_name_value", "uri": "uri_value", @@ -5925,6 +5932,9 @@ def test_create_connectivity_test_rest_call_success(request_type): }, "storage_bucket": {"bucket": "bucket_value"}, "serverless_neg": {"neg_uri": "neg_uri_value"}, + "ngfw_packet_inspection": { + "security_profile_group_uri": "security_profile_group_uri_value" + }, } ], "forward_trace_id": 1679, @@ -6438,6 +6448,13 @@ def test_update_connectivity_test_rest_call_success(request_type): "reason": 1, "non_masquerade_range": "non_masquerade_range_value", }, + "gke_network_policy": { + "display_name": "display_name_value", + "uri": "uri_value", + "direction": "direction_value", + "action": "action_value", + }, + "gke_network_policy_skipped": {"reason": 1}, "cloud_sql_instance": { "display_name": "display_name_value", "uri": "uri_value", @@ -6523,6 +6540,9 @@ def test_update_connectivity_test_rest_call_success(request_type): }, "storage_bucket": {"bucket": "bucket_value"}, "serverless_neg": {"neg_uri": "neg_uri_value"}, + "ngfw_packet_inspection": { + "security_profile_group_uri": "security_profile_group_uri_value" + }, } ], "forward_trace_id": 1679, diff --git a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations/__init__.py b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations/__init__.py index a6df9b7819e7..f31acdfa16a7 100644 --- a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations/__init__.py +++ b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations/__init__.py @@ -41,17 +41,20 @@ BucketList, BucketOperation, Counters, + CustomContextUpdates, DeleteObject, ErrorLogEntry, ErrorSummary, Job, LoggingConfig, Manifest, + ObjectCustomContextPayload, ObjectRetention, PrefixList, PutMetadata, PutObjectHold, RewriteObject, + UpdateObjectCustomContext, ) __all__ = ( @@ -71,15 +74,18 @@ "BucketList", "BucketOperation", "Counters", + "CustomContextUpdates", "DeleteObject", "ErrorLogEntry", "ErrorSummary", "Job", "LoggingConfig", "Manifest", + "ObjectCustomContextPayload", "ObjectRetention", "PrefixList", "PutMetadata", "PutObjectHold", "RewriteObject", + "UpdateObjectCustomContext", ) diff --git a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py index 80f2fe2b23c4..c036f16a9218 100644 --- a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py +++ b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py @@ -50,17 +50,20 @@ BucketList, BucketOperation, Counters, + CustomContextUpdates, DeleteObject, ErrorLogEntry, ErrorSummary, Job, LoggingConfig, Manifest, + ObjectCustomContextPayload, ObjectRetention, PrefixList, PutMetadata, PutObjectHold, RewriteObject, + UpdateObjectCustomContext, ) if hasattr(api_core, "check_python_version") and hasattr( @@ -165,6 +168,7 @@ def _get_version(dependency_name): "CancelJobResponse", "Counters", "CreateJobRequest", + "CustomContextUpdates", "DeleteJobRequest", "DeleteObject", "ErrorLogEntry", @@ -178,6 +182,7 @@ def _get_version(dependency_name): "ListJobsResponse", "LoggingConfig", "Manifest", + "ObjectCustomContextPayload", "ObjectRetention", "OperationMetadata", "PrefixList", @@ -185,4 +190,5 @@ def _get_version(dependency_name): "PutObjectHold", "RewriteObject", "StorageBatchOperationsClient", + "UpdateObjectCustomContext", ) diff --git a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/__init__.py b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/__init__.py index b67553f211e0..0887b96ff7d5 100644 --- a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/__init__.py +++ b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/__init__.py @@ -30,17 +30,20 @@ BucketList, BucketOperation, Counters, + CustomContextUpdates, DeleteObject, ErrorLogEntry, ErrorSummary, Job, LoggingConfig, Manifest, + ObjectCustomContextPayload, ObjectRetention, PrefixList, PutMetadata, PutObjectHold, RewriteObject, + UpdateObjectCustomContext, ) __all__ = ( @@ -58,15 +61,18 @@ "BucketList", "BucketOperation", "Counters", + "CustomContextUpdates", "DeleteObject", "ErrorLogEntry", "ErrorSummary", "Job", "LoggingConfig", "Manifest", + "ObjectCustomContextPayload", "ObjectRetention", "PrefixList", "PutMetadata", "PutObjectHold", "RewriteObject", + "UpdateObjectCustomContext", ) diff --git a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/storage_batch_operations_types.py b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/storage_batch_operations_types.py index f030c2759e47..d38a03ffc415 100644 --- a/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/storage_batch_operations_types.py +++ b/packages/google-cloud-storagebatchoperations/google/cloud/storagebatchoperations_v1/types/storage_batch_operations_types.py @@ -34,6 +34,9 @@ "RewriteObject", "ObjectRetention", "PutMetadata", + "ObjectCustomContextPayload", + "CustomContextUpdates", + "UpdateObjectCustomContext", "ErrorSummary", "ErrorLogEntry", "Counters", @@ -88,6 +91,10 @@ class Job(proto.Message): Rewrite the object and updates metadata like KMS key. + This field is a member of `oneof`_ ``transformation``. + update_object_custom_context (google.cloud.storagebatchoperations_v1.types.UpdateObjectCustomContext): + Update object custom context. + This field is a member of `oneof`_ ``transformation``. logging_config (google.cloud.storagebatchoperations_v1.types.LoggingConfig): Optional. Logging configuration. @@ -184,6 +191,12 @@ class State(proto.Enum): oneof="transformation", message="RewriteObject", ) + update_object_custom_context: "UpdateObjectCustomContext" = proto.Field( + proto.MESSAGE, + number=23, + oneof="transformation", + message="UpdateObjectCustomContext", + ) logging_config: "LoggingConfig" = proto.Field( proto.MESSAGE, number=9, @@ -275,6 +288,10 @@ class BucketOperation(proto.Message): Rewrite the object and updates metadata like KMS key. + This field is a member of `oneof`_ ``transformation``. + update_object_custom_context (google.cloud.storagebatchoperations_v1.types.UpdateObjectCustomContext): + Update object custom context. + This field is a member of `oneof`_ ``transformation``. create_time (google.protobuf.timestamp_pb2.Timestamp): Output only. The time that the @@ -364,6 +381,12 @@ class State(proto.Enum): oneof="transformation", message="RewriteObject", ) + update_object_custom_context: "UpdateObjectCustomContext" = proto.Field( + proto.MESSAGE, + number=15, + oneof="transformation", + message="UpdateObjectCustomContext", + ) create_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=5, @@ -774,6 +797,93 @@ class PutMetadata(proto.Message): ) +class ObjectCustomContextPayload(proto.Message): + r"""Describes the payload of a user defined object custom + context. + + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + + Attributes: + value (str): + The value of the object custom context. If set, ``value`` + must NOT be an empty string since it is a required field in + custom context. If unset, ``value`` will be ignored and no + changes will be made to the ``value`` field of the custom + context payload. + + This field is a member of `oneof`_ ``_value``. + """ + + value: str = proto.Field( + proto.STRING, + number=1, + optional=True, + ) + + +class CustomContextUpdates(proto.Message): + r"""Describes a collection of updates to apply to custom contexts + identified by key. + + Attributes: + updates (MutableMapping[str, google.cloud.storagebatchoperations_v1.types.ObjectCustomContextPayload]): + Optional. Insert or update the existing + custom contexts. + keys_to_clear (MutableSequence[str]): + Optional. Custom contexts to clear by key. A key cannot be + present in both ``updates`` and ``keys_to_clear``. + """ + + updates: MutableMapping[str, "ObjectCustomContextPayload"] = proto.MapField( + proto.STRING, + proto.MESSAGE, + number=1, + message="ObjectCustomContextPayload", + ) + keys_to_clear: MutableSequence[str] = proto.RepeatedField( + proto.STRING, + number=2, + ) + + +class UpdateObjectCustomContext(proto.Message): + r"""Describes options to update object custom contexts. + + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + + Attributes: + custom_context_updates (google.cloud.storagebatchoperations_v1.types.CustomContextUpdates): + A collection of updates to apply to specific + custom contexts. Use this to add, update or + delete individual contexts by key. + + This field is a member of `oneof`_ ``action``. + clear_all (bool): + If set, must be set to true and all existing + object custom contexts will be deleted. + + This field is a member of `oneof`_ ``action``. + """ + + custom_context_updates: "CustomContextUpdates" = proto.Field( + proto.MESSAGE, + number=1, + oneof="action", + message="CustomContextUpdates", + ) + clear_all: bool = proto.Field( + proto.BOOL, + number=2, + oneof="action", + ) + + class ErrorSummary(proto.Message): r"""A summary of errors by error code, plus a count and sample error log entries. diff --git a/packages/google-cloud-storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py b/packages/google-cloud-storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py index 6a9c7ae1fd58..b6f5dd648520 100644 --- a/packages/google-cloud-storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py +++ b/packages/google-cloud-storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py @@ -6419,6 +6419,13 @@ def test_create_job_rest_call_success(request_type): }, }, "rewrite_object": {"kms_key": "kms_key_value"}, + "update_object_custom_context": { + "custom_context_updates": { + "updates": {}, + "keys_to_clear": ["keys_to_clear_value1", "keys_to_clear_value2"], + }, + "clear_all": True, + }, "logging_config": {"log_actions": [6], "log_action_states": [1]}, "create_time": {"seconds": 751, "nanos": 543}, "schedule_time": {}, diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch/__init__.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch/__init__.py index c13f219064a5..692deab9c58c 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch/__init__.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch/__init__.py @@ -62,7 +62,6 @@ SemanticSearch, TextSearch, VectorSearch, - VertexRanker, ) from google.cloud.vectorsearch_v1.types.data_object_service import ( BatchCreateDataObjectsRequest, @@ -133,7 +132,6 @@ "SemanticSearch", "TextSearch", "VectorSearch", - "VertexRanker", "AggregationMethod", "BatchCreateDataObjectsRequest", "BatchCreateDataObjectsResponse", diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/__init__.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/__init__.py index e1454ceae0ef..235689c7aa79 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/__init__.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/__init__.py @@ -62,7 +62,6 @@ SemanticSearch, TextSearch, VectorSearch, - VertexRanker, ) from .types.data_object_service import ( BatchCreateDataObjectsRequest, @@ -258,5 +257,4 @@ def _get_version(dependency_name): "VectorSearch", "VectorSearchServiceClient", "VertexEmbeddingConfig", - "VertexRanker", ) diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/__init__.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/__init__.py index a641e3272e02..e03762f0c69e 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/__init__.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/__init__.py @@ -41,7 +41,6 @@ SemanticSearch, TextSearch, VectorSearch, - VertexRanker, ) from .data_object_service import ( BatchCreateDataObjectsRequest, @@ -106,7 +105,6 @@ "SemanticSearch", "TextSearch", "VectorSearch", - "VertexRanker", "AggregationMethod", "BatchCreateDataObjectsRequest", "BatchCreateDataObjectsResponse", diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/data_object_search_service.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/data_object_search_service.py index fe5f43cc3628..0371aeb7d95e 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/data_object_search_service.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1/types/data_object_search_service.py @@ -43,7 +43,6 @@ "BatchSearchDataObjectsRequest", "Ranker", "ReciprocalRankFusion", - "VertexRanker", "BatchSearchDataObjectsResponse", }, ) @@ -764,21 +763,12 @@ class CombineResultsOptions(proto.Message): class Ranker(proto.Message): r"""Defines a ranker to combine results from multiple searches. - This message has `oneof`_ fields (mutually exclusive fields). - For each oneof, at most one member field can be set at the same time. - Setting any member of the oneof automatically clears all other - members. - .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields Attributes: rrf (google.cloud.vectorsearch_v1.types.ReciprocalRankFusion): Reciprocal Rank Fusion ranking. - This field is a member of `oneof`_ ``ranker``. - vertex (google.cloud.vectorsearch_v1.types.VertexRanker): - Vertex AI ranking. - This field is a member of `oneof`_ ``ranker``. """ @@ -788,12 +778,6 @@ class Ranker(proto.Message): oneof="ranker", message="ReciprocalRankFusion", ) - vertex: "VertexRanker" = proto.Field( - proto.MESSAGE, - number=2, - oneof="ranker", - message="VertexRanker", - ) class ReciprocalRankFusion(proto.Message): @@ -812,46 +796,6 @@ class ReciprocalRankFusion(proto.Message): ) -class VertexRanker(proto.Message): - r"""Defines a ranker using the Vertex AI ranking service. - See - https://cloud.google.com/generative-ai-app-builder/docs/ranking - for details. - - Attributes: - query (str): - Required. The query against which the records - are ranked and scored. - title_template (str): - Optional. The template used to generate the - record's title. - content_template (str): - Optional. The template used to generate the - record's content. - model (str): - Required. The model used for ranking - documents. If no model is specified, then - semantic-ranker-default@latest is used. - """ - - query: str = proto.Field( - proto.STRING, - number=1, - ) - title_template: str = proto.Field( - proto.STRING, - number=2, - ) - content_template: str = proto.Field( - proto.STRING, - number=3, - ) - model: str = proto.Field( - proto.STRING, - number=4, - ) - - class BatchSearchDataObjectsResponse(proto.Message): r"""A response from a batch search operation. diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/__init__.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/__init__.py index 9fb2e81bdd8c..31f25c39487c 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/__init__.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/__init__.py @@ -63,7 +63,6 @@ SemanticSearch, TextSearch, VectorSearch, - VertexRanker, ) from .types.data_object_service import ( BatchCreateDataObjectsRequest, @@ -81,8 +80,10 @@ Collection, CreateCollectionRequest, CreateIndexRequest, + DedicatedInfrastructure, DeleteCollectionRequest, DeleteIndexRequest, + DenseScannIndex, DenseVectorField, ExportDataObjectsMetadata, ExportDataObjectsRequest, @@ -218,9 +219,11 @@ def _get_version(dependency_name): "DataObject", "DataObjectSearchServiceClient", "DataObjectServiceClient", + "DedicatedInfrastructure", "DeleteCollectionRequest", "DeleteDataObjectRequest", "DeleteIndexRequest", + "DenseScannIndex", "DenseVector", "DenseVectorField", "DistanceMetric", @@ -262,5 +265,4 @@ def _get_version(dependency_name): "VectorSearch", "VectorSearchServiceClient", "VertexEmbeddingConfig", - "VertexRanker", ) diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/async_client.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/async_client.py index ab90d4927385..2a71b560223e 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/async_client.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/async_client.py @@ -90,6 +90,8 @@ class DataObjectSearchServiceAsyncClient: parse_data_object_path = staticmethod( DataObjectSearchServiceClient.parse_data_object_path ) + index_path = staticmethod(DataObjectSearchServiceClient.index_path) + parse_index_path = staticmethod(DataObjectSearchServiceClient.parse_index_path) common_billing_account_path = staticmethod( DataObjectSearchServiceClient.common_billing_account_path ) diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/client.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/client.py index 357b57c202e3..850a220c7b25 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/client.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/services/data_object_search_service/client.py @@ -277,6 +277,30 @@ def parse_data_object_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def index_path( + project: str, + location: str, + collection: str, + index: str, + ) -> str: + """Returns a fully-qualified index string.""" + return "projects/{project}/locations/{location}/collections/{collection}/indexes/{index}".format( + project=project, + location=location, + collection=collection, + index=index, + ) + + @staticmethod + def parse_index_path(path: str) -> Dict[str, str]: + """Parses a index path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/collections/(?P.+?)/indexes/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def common_billing_account_path( billing_account: str, diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/__init__.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/__init__.py index 52def09e9d8a..ed53e2dd49a0 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/__init__.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/__init__.py @@ -42,7 +42,6 @@ SemanticSearch, TextSearch, VectorSearch, - VertexRanker, ) from .data_object_service import ( BatchCreateDataObjectsRequest, @@ -63,8 +62,10 @@ Collection, CreateCollectionRequest, CreateIndexRequest, + DedicatedInfrastructure, DeleteCollectionRequest, DeleteIndexRequest, + DenseScannIndex, DenseVectorField, ExportDataObjectsMetadata, ExportDataObjectsRequest, @@ -109,7 +110,6 @@ "SemanticSearch", "TextSearch", "VectorSearch", - "VertexRanker", "AggregationMethod", "BatchCreateDataObjectsRequest", "BatchCreateDataObjectsResponse", @@ -125,8 +125,10 @@ "Collection", "CreateCollectionRequest", "CreateIndexRequest", + "DedicatedInfrastructure", "DeleteCollectionRequest", "DeleteIndexRequest", + "DenseScannIndex", "DenseVectorField", "ExportDataObjectsMetadata", "ExportDataObjectsRequest", diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object.py index b260db8851fe..9b48b5aeb2bb 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object.py @@ -56,6 +56,8 @@ class DataObject(proto.Message): Optional. The data of the dataObject. vectors (MutableMapping[str, google.cloud.vectorsearch_v1beta.types.Vector]): Optional. The vectors of the dataObject. + etag (str): + Optional. The etag of the dataObject. """ name: str = proto.Field( @@ -87,6 +89,10 @@ class DataObject(proto.Message): number=7, message="Vector", ) + etag: str = proto.Field( + proto.STRING, + number=8, + ) class Vector(proto.Message): @@ -109,7 +115,7 @@ class Vector(proto.Message): This field is a member of `oneof`_ ``vector_type``. values (MutableSequence[float]): - The values of the vector. + Deprecated: Use ``dense`` or ``sparse`` instead. """ dense: "DenseVector" = proto.Field( diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_search_service.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_search_service.py index 7edcdde93bd7..fb3f0fe42e08 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_search_service.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_search_service.py @@ -44,7 +44,6 @@ "BatchSearchDataObjectsRequest", "Ranker", "ReciprocalRankFusion", - "VertexRanker", "BatchSearchDataObjectsResponse", }, ) @@ -106,14 +105,25 @@ class SearchHint(proto.Message): Attributes: use_index (google.cloud.vectorsearch_v1beta.types.SearchHint.IndexHint): - Optional. Specifies that the search should - use a particular index. + Optional. Deprecated: Use ``index_hint`` instead. Specifies + that the search should use a particular index. This field is a member of `oneof`_ ``index_type``. use_knn (bool): - Optional. If set to true, the search will use - the system's default K-Nearest Neighbor (KNN) - index engine. + Optional. Deprecated: Use ``knn_hint`` instead. If set to + true, the search will use the system's default K-Nearest + Neighbor (KNN) index engine. + + This field is a member of `oneof`_ ``index_type``. + knn_hint (google.cloud.vectorsearch_v1beta.types.SearchHint.KnnHint): + Optional. If set, the search will use the + system's default K-Nearest Neighbor (KNN) index + engine. + + This field is a member of `oneof`_ ``index_type``. + index_hint (google.cloud.vectorsearch_v1beta.types.SearchHint.IndexHint): + Optional. Specifies that the search should + use a particular index. This field is a member of `oneof`_ ``index_type``. """ @@ -121,7 +131,13 @@ class SearchHint(proto.Message): class IndexHint(proto.Message): r"""Message to specify the index to use for the search. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: + dense_scann_params (google.cloud.vectorsearch_v1beta.types.SearchHint.IndexHint.DenseScannParams): + Optional. Dense ScaNN parameters. + + This field is a member of `oneof`_ ``params``. name (str): Required. The resource name of the index to use for the search. The index must be in the same project, location, and @@ -129,11 +145,45 @@ class IndexHint(proto.Message): ``projects/{project}/locations/{location}/collections/{collection}/indexes/{index}`` """ + class DenseScannParams(proto.Message): + r"""Parameters for dense ScaNN. + + Attributes: + search_leaves_pct (int): + Optional. Dense ANN param overrides to control recall and + latency. The percentage of leaves to search, in the range + [0, 100]. + initial_candidate_count (int): + Optional. The number of initial candidates. + Must be a positive integer (> 0). + """ + + search_leaves_pct: int = proto.Field( + proto.INT32, + number=1, + ) + initial_candidate_count: int = proto.Field( + proto.INT32, + number=2, + ) + + dense_scann_params: "SearchHint.IndexHint.DenseScannParams" = proto.Field( + proto.MESSAGE, + number=2, + oneof="params", + message="SearchHint.IndexHint.DenseScannParams", + ) name: str = proto.Field( proto.STRING, number=1, ) + class KnnHint(proto.Message): + r"""KnnHint will be used if search should be explicitly done on + system's default K-Nearest Neighbor (KNN) index engine. + + """ + use_index: IndexHint = proto.Field( proto.MESSAGE, number=1, @@ -145,6 +195,18 @@ class IndexHint(proto.Message): number=2, oneof="index_type", ) + knn_hint: KnnHint = proto.Field( + proto.MESSAGE, + number=3, + oneof="index_type", + message=KnnHint, + ) + index_hint: IndexHint = proto.Field( + proto.MESSAGE, + number=4, + oneof="index_type", + message=IndexHint, + ) class Search(proto.Message): @@ -291,7 +353,7 @@ class SemanticSearch(proto.Message): search_field (str): Required. The vector field to search. task_type (google.cloud.vectorsearch_v1beta.types.EmbeddingTaskType): - Optional. The task type of the query + Required. The task type of the query embedding. output_fields (google.cloud.vectorsearch_v1beta.types.OutputFields): Optional. The fields to return in the search @@ -423,7 +485,10 @@ class SearchDataObjectsRequest(proto.Message): search. Format: ``projects/{project}/locations/{location}/collections/{collection}`` page_size (int): - Optional. The standard list page size. + Optional. The standard list page size. Only supported for + KNN. If not set, up to search_type.top_k results will be + returned. The maximum value is 1000; values above 1000 will + be coerced to 1000. page_token (str): Optional. The standard list page token. Typically obtained via @@ -474,7 +539,8 @@ class SearchResult(proto.Message): data_object (google.cloud.vectorsearch_v1beta.types.DataObject): Output only. The matching data object. distance (float): - Output only. The similarity distance. + Output only. Similarity distance or ranker + score returned by BatchSearchDataObjects. This field is a member of `oneof`_ ``_distance``. """ @@ -620,7 +686,8 @@ class AggregateDataObjectsResponse(proto.Message): Attributes: aggregate_results (MutableSequence[google.protobuf.struct_pb2.Struct]): - The aggregated results of the query. + Output only. The aggregated results of the + query. """ aggregate_results: MutableSequence[struct_pb2.Struct] = proto.RepeatedField( @@ -648,6 +715,8 @@ class QueryDataObjectsRequest(proto.Message): return. page_size (int): Optional. The standard list page size. + Default is 100. The maximum value is 1000; + values above 1000 will be coerced to 1000. page_token (str): Optional. The standard list page token. Typically obtained via @@ -687,9 +756,11 @@ class QueryDataObjectsResponse(proto.Message): Attributes: data_objects (MutableSequence[google.cloud.vectorsearch_v1beta.types.DataObject]): - The list of dataObjects that match the query. + Output only. The list of dataObjects that + match the query. next_page_token (str): - A token to retrieve next page of results. Pass to + Output only. A token to retrieve next page of results. Pass + to [DataObjectSearchService.QueryDataObjectsRequest.page_token][] to obtain that page. """ @@ -775,21 +846,12 @@ class CombineResultsOptions(proto.Message): class Ranker(proto.Message): r"""Defines a ranker to combine results from multiple searches. - This message has `oneof`_ fields (mutually exclusive fields). - For each oneof, at most one member field can be set at the same time. - Setting any member of the oneof automatically clears all other - members. - .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields Attributes: rrf (google.cloud.vectorsearch_v1beta.types.ReciprocalRankFusion): Reciprocal Rank Fusion ranking. - This field is a member of `oneof`_ ``ranker``. - vertex (google.cloud.vectorsearch_v1beta.types.VertexRanker): - Vertex AI ranking. - This field is a member of `oneof`_ ``ranker``. """ @@ -799,12 +861,6 @@ class Ranker(proto.Message): oneof="ranker", message="ReciprocalRankFusion", ) - vertex: "VertexRanker" = proto.Field( - proto.MESSAGE, - number=2, - oneof="ranker", - message="VertexRanker", - ) class ReciprocalRankFusion(proto.Message): @@ -823,46 +879,6 @@ class ReciprocalRankFusion(proto.Message): ) -class VertexRanker(proto.Message): - r"""Defines a ranker using the Vertex AI ranking service. - See - https://cloud.google.com/generative-ai-app-builder/docs/ranking - for details. - - Attributes: - query (str): - Required. The query against which the records - are ranked and scored. - title_template (str): - Optional. The template used to generate the - record's title. - content_template (str): - Optional. The template used to generate the - record's content. - model (str): - Required. The model used for ranking - documents. If no model is specified, then - semantic-ranker-default@latest is used. - """ - - query: str = proto.Field( - proto.STRING, - number=1, - ) - title_template: str = proto.Field( - proto.STRING, - number=2, - ) - content_template: str = proto.Field( - proto.STRING, - number=3, - ) - model: str = proto.Field( - proto.STRING, - number=4, - ) - - class BatchSearchDataObjectsResponse(proto.Message): r"""A response from a batch search operation. diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_service.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_service.py index 0425142a4cb4..79fdc89d8fa3 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_service.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/data_object_service.py @@ -106,7 +106,7 @@ class BatchCreateDataObjectsResponse(proto.Message): Attributes: data_objects (MutableSequence[google.cloud.vectorsearch_v1beta.types.DataObject]): - DataObjects created. + Output only. DataObjects created. """ data_objects: MutableSequence[gcv_data_object.DataObject] = proto.RepeatedField( @@ -201,12 +201,21 @@ class DeleteDataObjectRequest(proto.Message): Required. The name of the DataObject resource to be deleted. Format: ``projects/{project}/locations/{location}/collections/{collection}/dataObjects/{dataObject}`` + etag (str): + Optional. The current etag of the DataObject. + If an etag is provided and does not match the + current etag of the DataObject, deletion will be + blocked and an ABORTED error will be returned. """ name: str = proto.Field( proto.STRING, number=1, ) + etag: str = proto.Field( + proto.STRING, + number=2, + ) class BatchDeleteDataObjectsRequest(proto.Message): diff --git a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/vectorsearch_service.py b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/vectorsearch_service.py index aefb8bd0a54c..5d569511e99c 100644 --- a/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/vectorsearch_service.py +++ b/packages/google-cloud-vectorsearch/google/cloud/vectorsearch_v1beta/types/vectorsearch_service.py @@ -51,6 +51,8 @@ "ExportDataObjectsRequest", "ExportDataObjectsMetadata", "ExportDataObjectsResponse", + "DedicatedInfrastructure", + "DenseScannIndex", }, ) @@ -446,7 +448,18 @@ class DeleteCollectionRequest(proto.Message): class Index(proto.Message): r"""Message describing Index object + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: + dedicated_infrastructure (google.cloud.vectorsearch_v1beta.types.DedicatedInfrastructure): + Optional. Dedicated infrastructure for the + index. + + This field is a member of `oneof`_ ``infra_type``. + dense_scann (google.cloud.vectorsearch_v1beta.types.DenseScannIndex): + Optional. Dense ScaNN index. + + This field is a member of `oneof`_ ``index_type``. name (str): Identifier. name of resource display_name (str): @@ -475,6 +488,18 @@ class Index(proto.Message): to enable inline data retrieval. """ + dedicated_infrastructure: "DedicatedInfrastructure" = proto.Field( + proto.MESSAGE, + number=11, + oneof="infra_type", + message="DedicatedInfrastructure", + ) + dense_scann: "DenseScannIndex" = proto.Field( + proto.MESSAGE, + number=12, + oneof="index_type", + message="DenseScannIndex", + ) name: str = proto.Field( proto.STRING, number=1, @@ -833,15 +858,17 @@ class ImportDataObjectsMetadata(proto.Message): Attributes: create_time (google.protobuf.timestamp_pb2.Timestamp): - The time the operation was created. + Output only. The time the operation was + created. update_time (google.protobuf.timestamp_pb2.Timestamp): - The time the operation was last updated. + Output only. The time the operation was last + updated. success_count (int): - Number of DataObjects that were processed - successfully. + Output only. Number of DataObjects that were + processed successfully. failure_count (int): - Number of DataObjects that failed during - processing. + Output only. Number of DataObjects that + failed during processing. """ create_time: timestamp_pb2.Timestamp = proto.Field( @@ -915,7 +942,6 @@ class GcsExportDestination(proto.Message): class Format(proto.Enum): r"""Options for the format of the exported Data Objects. - New formats may be added in the future. Values: FORMAT_UNSPECIFIED (0): @@ -955,9 +981,10 @@ class ExportDataObjectsMetadata(proto.Message): Attributes: create_time (google.protobuf.timestamp_pb2.Timestamp): - The time the operation was created. + Output only. The time the operation was + created. finish_time (google.protobuf.timestamp_pb2.Timestamp): - The time the operation finished. + Output only. The time the operation finished. """ create_time: timestamp_pb2.Timestamp = proto.Field( @@ -976,4 +1003,103 @@ class ExportDataObjectsResponse(proto.Message): r"""Response for the ExportDataObjects LRO.""" +class DedicatedInfrastructure(proto.Message): + r"""Represents dedicated infrastructure for the index. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + + Attributes: + mode (google.cloud.vectorsearch_v1beta.types.DedicatedInfrastructure.Mode): + Optional. Mode of the dedicated + infrastructure. + + This field is a member of `oneof`_ ``_mode``. + autoscaling_spec (google.cloud.vectorsearch_v1beta.types.DedicatedInfrastructure.AutoscalingSpec): + Optional. Autoscaling specification. + """ + + class Mode(proto.Enum): + r"""Mode of the dedicated infrastructure. + + Values: + MODE_UNSPECIFIED (0): + Default will use ``PERFORMANCE_OPTIMIZED``. + STORAGE_OPTIMIZED (1): + This is storage optimized variation. + PERFORMANCE_OPTIMIZED (2): + This is Performance optimized on E2 or + equivalent family. + """ + + MODE_UNSPECIFIED = 0 + STORAGE_OPTIMIZED = 1 + PERFORMANCE_OPTIMIZED = 2 + + class AutoscalingSpec(proto.Message): + r"""Specification for autoscaling. + + Attributes: + min_replica_count (int): + Optional. The minimum number of replicas. If not set or set + to ``0``, defaults to ``2``. Must be >= ``2`` and <= + ``1000``. + max_replica_count (int): + Optional. The maximum number of replicas. If not set or set + to ``0``, defaults to the greater of ``min_replica_count`` + and ``5``. Must be >= ``min_replica_count`` and <= ``1000``. + """ + + min_replica_count: int = proto.Field( + proto.INT32, + number=1, + ) + max_replica_count: int = proto.Field( + proto.INT32, + number=2, + ) + + mode: Mode = proto.Field( + proto.ENUM, + number=1, + optional=True, + enum=Mode, + ) + autoscaling_spec: AutoscalingSpec = proto.Field( + proto.MESSAGE, + number=2, + message=AutoscalingSpec, + ) + + +class DenseScannIndex(proto.Message): + r"""Dense ScaNN index configuration. + + Attributes: + feature_norm_type (google.cloud.vectorsearch_v1beta.types.DenseScannIndex.FeatureNormType): + Optional. Feature norm type. + """ + + class FeatureNormType(proto.Enum): + r"""Feature norm type for ScaNN index. + + Values: + FEATURE_NORM_TYPE_UNSPECIFIED (0): + Unspecified feature norm type. + NONE (1): + No norm applied. + UNIT_L2_NORM (2): + Unit L2 norm. + """ + + FEATURE_NORM_TYPE_UNSPECIFIED = 0 + NONE = 1 + UNIT_L2_NORM = 2 + + feature_norm_type: FeatureNormType = proto.Field( + proto.ENUM, + number=2, + enum=FeatureNormType, + ) + + __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_search_service.py b/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_search_service.py index 06f8f246cc19..069b7bd008e7 100644 --- a/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_search_service.py +++ b/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_search_service.py @@ -5311,8 +5311,39 @@ def test_parse_data_object_path(): assert expected == actual +def test_index_path(): + project = "whelk" + location = "octopus" + collection = "oyster" + index = "nudibranch" + expected = "projects/{project}/locations/{location}/collections/{collection}/indexes/{index}".format( + project=project, + location=location, + collection=collection, + index=index, + ) + actual = DataObjectSearchServiceClient.index_path( + project, location, collection, index + ) + assert expected == actual + + +def test_parse_index_path(): + expected = { + "project": "cuttlefish", + "location": "mussel", + "collection": "winkle", + "index": "nautilus", + } + path = DataObjectSearchServiceClient.index_path(**expected) + + # Check that the path construction is reversible. + actual = DataObjectSearchServiceClient.parse_index_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "whelk" + billing_account = "scallop" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -5322,7 +5353,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "octopus", + "billing_account": "abalone", } path = DataObjectSearchServiceClient.common_billing_account_path(**expected) @@ -5332,7 +5363,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "oyster" + folder = "squid" expected = "folders/{folder}".format( folder=folder, ) @@ -5342,7 +5373,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "nudibranch", + "folder": "clam", } path = DataObjectSearchServiceClient.common_folder_path(**expected) @@ -5352,7 +5383,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "cuttlefish" + organization = "whelk" expected = "organizations/{organization}".format( organization=organization, ) @@ -5362,7 +5393,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "mussel", + "organization": "octopus", } path = DataObjectSearchServiceClient.common_organization_path(**expected) @@ -5372,7 +5403,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "winkle" + project = "oyster" expected = "projects/{project}".format( project=project, ) @@ -5382,7 +5413,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "nautilus", + "project": "nudibranch", } path = DataObjectSearchServiceClient.common_project_path(**expected) @@ -5392,8 +5423,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "scallop" - location = "abalone" + project = "cuttlefish" + location = "mussel" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -5404,8 +5435,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "squid", - "location": "clam", + "project": "winkle", + "location": "nautilus", } path = DataObjectSearchServiceClient.common_location_path(**expected) diff --git a/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_service.py b/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_service.py index 2ebc0208e3a8..dec1e26949dd 100644 --- a/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_service.py +++ b/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_data_object_service.py @@ -1374,6 +1374,7 @@ def test_create_data_object(request_type, transport: str = "grpc"): call.return_value = gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) response = client.create_data_object(request) @@ -1387,6 +1388,7 @@ def test_create_data_object(request_type, transport: str = "grpc"): assert isinstance(response, gcv_data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" def test_create_data_object_non_empty_request_with_auto_populated_field(): @@ -1525,6 +1527,7 @@ async def test_create_data_object_async( gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) ) response = await client.create_data_object(request) @@ -1539,6 +1542,7 @@ async def test_create_data_object_async( assert isinstance(response, gcv_data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" @pytest.mark.asyncio @@ -1991,6 +1995,7 @@ def test_get_data_object(request_type, transport: str = "grpc"): call.return_value = data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) response = client.get_data_object(request) @@ -2004,6 +2009,7 @@ def test_get_data_object(request_type, transport: str = "grpc"): assert isinstance(response, data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" def test_get_data_object_non_empty_request_with_auto_populated_field(): @@ -2132,6 +2138,7 @@ async def test_get_data_object_async( data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) ) response = await client.get_data_object(request) @@ -2146,6 +2153,7 @@ async def test_get_data_object_async( assert isinstance(response, data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" @pytest.mark.asyncio @@ -2321,6 +2329,7 @@ def test_update_data_object(request_type, transport: str = "grpc"): call.return_value = gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) response = client.update_data_object(request) @@ -2334,6 +2343,7 @@ def test_update_data_object(request_type, transport: str = "grpc"): assert isinstance(response, gcv_data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" def test_update_data_object_non_empty_request_with_auto_populated_field(): @@ -2466,6 +2476,7 @@ async def test_update_data_object_async( gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) ) response = await client.update_data_object(request) @@ -2480,6 +2491,7 @@ async def test_update_data_object_async( assert isinstance(response, gcv_data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" @pytest.mark.asyncio @@ -3067,6 +3079,7 @@ def test_delete_data_object_non_empty_request_with_auto_populated_field(): # if they meet the requirements of AIP 4235. request = data_object_service.DeleteDataObjectRequest( name="name_value", + etag="etag_value", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3081,6 +3094,7 @@ def test_delete_data_object_non_empty_request_with_auto_populated_field(): _, args, _ = call.mock_calls[0] assert args[0] == data_object_service.DeleteDataObjectRequest( name="name_value", + etag="etag_value", ) @@ -4680,6 +4694,8 @@ def test_delete_data_object_rest_required_fields( unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() ).delete_data_object._get_unset_required_fields(jsonified_request) + # Check that path parameters and body parameters are not mixing in. + assert not set(unset_fields) - set(("etag",)) jsonified_request.update(unset_fields) # verify required fields with non-default values are left alone @@ -4731,7 +4747,7 @@ def test_delete_data_object_rest_unset_required_fields(): ) unset_fields = transport.delete_data_object._get_unset_required_fields({}) - assert set(unset_fields) == (set(()) & set(("name",))) + assert set(unset_fields) == (set(("etag",)) & set(("name",))) def test_delete_data_object_rest_flattened(): @@ -5280,6 +5296,7 @@ async def test_create_data_object_empty_call_grpc_asyncio(): gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) ) await client.create_data_object(request=None) @@ -5335,6 +5352,7 @@ async def test_get_data_object_empty_call_grpc_asyncio(): data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) ) await client.get_data_object(request=None) @@ -5365,6 +5383,7 @@ async def test_update_data_object_empty_call_grpc_asyncio(): gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) ) await client.update_data_object(request=None) @@ -5507,6 +5526,7 @@ def test_create_data_object_rest_call_success(request_type): "update_time": {}, "data": {"fields": {}}, "vectors": {}, + "etag": "etag_value", } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -5583,6 +5603,7 @@ def get_message_fields(field): return_value = gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) # Wrap the value into a proper Response obj @@ -5601,6 +5622,7 @@ def get_message_fields(field): assert isinstance(response, gcv_data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" @pytest.mark.parametrize("null_interceptor", [True, False]) @@ -5849,6 +5871,7 @@ def test_get_data_object_rest_call_success(request_type): return_value = data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) # Wrap the value into a proper Response obj @@ -5867,6 +5890,7 @@ def test_get_data_object_rest_call_success(request_type): assert isinstance(response, data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" @pytest.mark.parametrize("null_interceptor", [True, False]) @@ -5986,6 +6010,7 @@ def test_update_data_object_rest_call_success(request_type): "update_time": {}, "data": {"fields": {}}, "vectors": {}, + "etag": "etag_value", } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -6062,6 +6087,7 @@ def get_message_fields(field): return_value = gcv_data_object.DataObject( name="name_value", data_object_id="data_object_id_value", + etag="etag_value", ) # Wrap the value into a proper Response obj @@ -6080,6 +6106,7 @@ def get_message_fields(field): assert isinstance(response, gcv_data_object.DataObject) assert response.name == "name_value" assert response.data_object_id == "data_object_id_value" + assert response.etag == "etag_value" @pytest.mark.parametrize("null_interceptor", [True, False]) diff --git a/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_vector_search_service.py b/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_vector_search_service.py index 40ed1c9c72a0..caabc7717451 100644 --- a/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_vector_search_service.py +++ b/packages/google-cloud-vectorsearch/tests/unit/gapic/vectorsearch_v1beta/test_vector_search_service.py @@ -4432,7 +4432,11 @@ def test_create_index_flattened(): # using the keyword arguments to the method. client.create_index( parent="parent_value", - index=vectorsearch_service.Index(name="name_value"), + index=vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ), index_id="index_id_value", ) @@ -4444,7 +4448,11 @@ def test_create_index_flattened(): mock_val = "parent_value" assert arg == mock_val arg = args[0].index - mock_val = vectorsearch_service.Index(name="name_value") + mock_val = vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ) assert arg == mock_val arg = args[0].index_id mock_val = "index_id_value" @@ -4462,7 +4470,11 @@ def test_create_index_flattened_error(): client.create_index( vectorsearch_service.CreateIndexRequest(), parent="parent_value", - index=vectorsearch_service.Index(name="name_value"), + index=vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ), index_id="index_id_value", ) @@ -4485,7 +4497,11 @@ async def test_create_index_flattened_async(): # using the keyword arguments to the method. response = await client.create_index( parent="parent_value", - index=vectorsearch_service.Index(name="name_value"), + index=vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ), index_id="index_id_value", ) @@ -4497,7 +4513,11 @@ async def test_create_index_flattened_async(): mock_val = "parent_value" assert arg == mock_val arg = args[0].index - mock_val = vectorsearch_service.Index(name="name_value") + mock_val = vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ) assert arg == mock_val arg = args[0].index_id mock_val = "index_id_value" @@ -4516,7 +4536,11 @@ async def test_create_index_flattened_error_async(): await client.create_index( vectorsearch_service.CreateIndexRequest(), parent="parent_value", - index=vectorsearch_service.Index(name="name_value"), + index=vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ), index_id="index_id_value", ) @@ -7027,7 +7051,11 @@ def test_create_index_rest_flattened(): # get truthy value for each flattened field mock_args = dict( parent="parent_value", - index=vectorsearch_service.Index(name="name_value"), + index=vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ), index_id="index_id_value", ) mock_args.update(sample_request) @@ -7065,7 +7093,11 @@ def test_create_index_rest_flattened_error(transport: str = "rest"): client.create_index( vectorsearch_service.CreateIndexRequest(), parent="parent_value", - index=vectorsearch_service.Index(name="name_value"), + index=vectorsearch_service.Index( + dedicated_infrastructure=vectorsearch_service.DedicatedInfrastructure( + mode=vectorsearch_service.DedicatedInfrastructure.Mode.STORAGE_OPTIMIZED + ) + ), index_id="index_id_value", ) @@ -9287,6 +9319,11 @@ def test_create_index_rest_call_success(request_type): # send a request that will satisfy transcoding request_init = {"parent": "projects/sample1/locations/sample2/collections/sample3"} request_init["index"] = { + "dedicated_infrastructure": { + "mode": 1, + "autoscaling_spec": {"min_replica_count": 1803, "max_replica_count": 1805}, + }, + "dense_scann": {"feature_norm_type": 1}, "name": "name_value", "display_name": "display_name_value", "description": "description_value", diff --git a/packages/googleapis-common-protos/google/api/annotations_pb2.py b/packages/googleapis-common-protos/google/api/annotations_pb2.py index ac5cf8d8b5b9..ac84d0398d53 100644 --- a/packages/googleapis-common-protos/google/api/annotations_pb2.py +++ b/packages/googleapis-common-protos/google/api/annotations_pb2.py @@ -29,9 +29,8 @@ _sym_db = _symbol_database.Default() -from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 - from google.api import http_pb2 as google_dot_api_dot_http__pb2 +from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b'\n\x1cgoogle/api/annotations.proto\x12\ngoogle.api\x1a\x15google/api/http.proto\x1a google/protobuf/descriptor.proto:E\n\x04http\x12\x1e.google.protobuf.MethodOptions\x18\xb0\xca\xbc" \x01(\x0b\x32\x14.google.api.HttpRuleBn\n\x0e\x63om.google.apiB\x10\x41nnotationsProtoP\x01ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\xa2\x02\x04GAPIb\x06proto3' diff --git a/packages/googleapis-common-protos/google/api/annotations_pb2.pyi b/packages/googleapis-common-protos/google/api/annotations_pb2.pyi index 4c4afeb9545f..41b6de69d5f5 100644 --- a/packages/googleapis-common-protos/google/api/annotations_pb2.pyi +++ b/packages/googleapis-common-protos/google/api/annotations_pb2.pyi @@ -14,11 +14,10 @@ from typing import ClassVar as _ClassVar +from google.api import http_pb2 as _http_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pb2 as _descriptor_pb2 -from google.api import http_pb2 as _http_pb2 - DESCRIPTOR: _descriptor.FileDescriptor HTTP_FIELD_NUMBER: _ClassVar[int] http: _descriptor.FieldDescriptor diff --git a/packages/googleapis-common-protos/google/api/client_pb2.py b/packages/googleapis-common-protos/google/api/client_pb2.py index 1f28f3c2375d..eae4b6a292a7 100644 --- a/packages/googleapis-common-protos/google/api/client_pb2.py +++ b/packages/googleapis-common-protos/google/api/client_pb2.py @@ -29,11 +29,10 @@ _sym_db = _symbol_database.Default() +from google.api import launch_stage_pb2 as google_dot_api_dot_launch__stage__pb2 from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 -from google.api import launch_stage_pb2 as google_dot_api_dot_launch__stage__pb2 - DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b'\n\x17google/api/client.proto\x12\ngoogle.api\x1a\x1dgoogle/api/launch_stage.proto\x1a google/protobuf/descriptor.proto\x1a\x1egoogle/protobuf/duration.proto"\xbe\x01\n\x16\x43ommonLanguageSettings\x12\x1e\n\x12reference_docs_uri\x18\x01 \x01(\tB\x02\x18\x01\x12:\n\x0c\x64\x65stinations\x18\x02 \x03(\x0e\x32$.google.api.ClientLibraryDestination\x12H\n\x1aselective_gapic_generation\x18\x03 \x01(\x0b\x32$.google.api.SelectiveGapicGeneration"\xfb\x03\n\x15\x43lientLibrarySettings\x12\x0f\n\x07version\x18\x01 \x01(\t\x12-\n\x0claunch_stage\x18\x02 \x01(\x0e\x32\x17.google.api.LaunchStage\x12\x1a\n\x12rest_numeric_enums\x18\x03 \x01(\x08\x12/\n\rjava_settings\x18\x15 \x01(\x0b\x32\x18.google.api.JavaSettings\x12-\n\x0c\x63pp_settings\x18\x16 \x01(\x0b\x32\x17.google.api.CppSettings\x12-\n\x0cphp_settings\x18\x17 \x01(\x0b\x32\x17.google.api.PhpSettings\x12\x33\n\x0fpython_settings\x18\x18 \x01(\x0b\x32\x1a.google.api.PythonSettings\x12/\n\rnode_settings\x18\x19 \x01(\x0b\x32\x18.google.api.NodeSettings\x12\x33\n\x0f\x64otnet_settings\x18\x1a \x01(\x0b\x32\x1a.google.api.DotnetSettings\x12/\n\rruby_settings\x18\x1b \x01(\x0b\x32\x18.google.api.RubySettings\x12+\n\x0bgo_settings\x18\x1c \x01(\x0b\x32\x16.google.api.GoSettings"\xa8\x03\n\nPublishing\x12\x33\n\x0fmethod_settings\x18\x02 \x03(\x0b\x32\x1a.google.api.MethodSettings\x12\x15\n\rnew_issue_uri\x18\x65 \x01(\t\x12\x19\n\x11\x64ocumentation_uri\x18\x66 \x01(\t\x12\x16\n\x0e\x61pi_short_name\x18g \x01(\t\x12\x14\n\x0cgithub_label\x18h \x01(\t\x12\x1e\n\x16\x63odeowner_github_teams\x18i \x03(\t\x12\x16\n\x0e\x64oc_tag_prefix\x18j \x01(\t\x12;\n\x0corganization\x18k \x01(\x0e\x32%.google.api.ClientLibraryOrganization\x12;\n\x10library_settings\x18m \x03(\x0b\x32!.google.api.ClientLibrarySettings\x12)\n!proto_reference_documentation_uri\x18n \x01(\t\x12(\n rest_reference_documentation_uri\x18o \x01(\t"\xe3\x01\n\x0cJavaSettings\x12\x17\n\x0flibrary_package\x18\x01 \x01(\t\x12L\n\x13service_class_names\x18\x02 \x03(\x0b\x32/.google.api.JavaSettings.ServiceClassNamesEntry\x12\x32\n\x06\x63ommon\x18\x03 \x01(\x0b\x32".google.api.CommonLanguageSettings\x1a\x38\n\x16ServiceClassNamesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01"A\n\x0b\x43ppSettings\x12\x32\n\x06\x63ommon\x18\x01 \x01(\x0b\x32".google.api.CommonLanguageSettings"A\n\x0bPhpSettings\x12\x32\n\x06\x63ommon\x18\x01 \x01(\x0b\x32".google.api.CommonLanguageSettings"\x9b\x02\n\x0ePythonSettings\x12\x32\n\x06\x63ommon\x18\x01 \x01(\x0b\x32".google.api.CommonLanguageSettings\x12N\n\x15\x65xperimental_features\x18\x02 \x01(\x0b\x32/.google.api.PythonSettings.ExperimentalFeatures\x1a\x84\x01\n\x14\x45xperimentalFeatures\x12\x1d\n\x15rest_async_io_enabled\x18\x01 \x01(\x08\x12\'\n\x1fprotobuf_pythonic_types_enabled\x18\x02 \x01(\x08\x12$\n\x1cunversioned_package_disabled\x18\x03 \x01(\x08"B\n\x0cNodeSettings\x12\x32\n\x06\x63ommon\x18\x01 \x01(\x0b\x32".google.api.CommonLanguageSettings"\xaa\x03\n\x0e\x44otnetSettings\x12\x32\n\x06\x63ommon\x18\x01 \x01(\x0b\x32".google.api.CommonLanguageSettings\x12I\n\x10renamed_services\x18\x02 \x03(\x0b\x32/.google.api.DotnetSettings.RenamedServicesEntry\x12K\n\x11renamed_resources\x18\x03 \x03(\x0b\x32\x30.google.api.DotnetSettings.RenamedResourcesEntry\x12\x19\n\x11ignored_resources\x18\x04 \x03(\t\x12 \n\x18\x66orced_namespace_aliases\x18\x05 \x03(\t\x12\x1e\n\x16handwritten_signatures\x18\x06 \x03(\t\x1a\x36\n\x14RenamedServicesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x37\n\x15RenamedResourcesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01"B\n\x0cRubySettings\x12\x32\n\x06\x63ommon\x18\x01 \x01(\x0b\x32".google.api.CommonLanguageSettings"\xbf\x01\n\nGoSettings\x12\x32\n\x06\x63ommon\x18\x01 \x01(\x0b\x32".google.api.CommonLanguageSettings\x12\x45\n\x10renamed_services\x18\x02 \x03(\x0b\x32+.google.api.GoSettings.RenamedServicesEntry\x1a\x36\n\x14RenamedServicesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01"\xcf\x02\n\x0eMethodSettings\x12\x10\n\x08selector\x18\x01 \x01(\t\x12<\n\x0clong_running\x18\x02 \x01(\x0b\x32&.google.api.MethodSettings.LongRunning\x12\x1d\n\x15\x61uto_populated_fields\x18\x03 \x03(\t\x1a\xcd\x01\n\x0bLongRunning\x12\x35\n\x12initial_poll_delay\x18\x01 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1d\n\x15poll_delay_multiplier\x18\x02 \x01(\x02\x12\x31\n\x0emax_poll_delay\x18\x03 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x12total_poll_timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration"Q\n\x18SelectiveGapicGeneration\x12\x0f\n\x07methods\x18\x01 \x03(\t\x12$\n\x1cgenerate_omitted_as_internal\x18\x02 \x01(\x08*\xa3\x01\n\x19\x43lientLibraryOrganization\x12+\n\'CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED\x10\x00\x12\t\n\x05\x43LOUD\x10\x01\x12\x07\n\x03\x41\x44S\x10\x02\x12\n\n\x06PHOTOS\x10\x03\x12\x0f\n\x0bSTREET_VIEW\x10\x04\x12\x0c\n\x08SHOPPING\x10\x05\x12\x07\n\x03GEO\x10\x06\x12\x11\n\rGENERATIVE_AI\x10\x07*g\n\x18\x43lientLibraryDestination\x12*\n&CLIENT_LIBRARY_DESTINATION_UNSPECIFIED\x10\x00\x12\n\n\x06GITHUB\x10\n\x12\x13\n\x0fPACKAGE_MANAGER\x10\x14:9\n\x10method_signature\x12\x1e.google.protobuf.MethodOptions\x18\x9b\x08 \x03(\t:6\n\x0c\x64\x65\x66\x61ult_host\x12\x1f.google.protobuf.ServiceOptions\x18\x99\x08 \x01(\t:6\n\x0coauth_scopes\x12\x1f.google.protobuf.ServiceOptions\x18\x9a\x08 \x01(\t:8\n\x0b\x61pi_version\x12\x1f.google.protobuf.ServiceOptions\x18\xc1\xba\xab\xfa\x01 \x01(\tBi\n\x0e\x63om.google.apiB\x0b\x43lientProtoP\x01ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\xa2\x02\x04GAPIb\x06proto3' ) diff --git a/packages/googleapis-common-protos/google/api/client_pb2.pyi b/packages/googleapis-common-protos/google/api/client_pb2.pyi index 7a7f26d5984f..6e89b68b8cba 100644 --- a/packages/googleapis-common-protos/google/api/client_pb2.pyi +++ b/packages/googleapis-common-protos/google/api/client_pb2.pyi @@ -18,6 +18,7 @@ from typing import Mapping as _Mapping from typing import Optional as _Optional from typing import Union as _Union +from google.api import launch_stage_pb2 as _launch_stage_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pb2 as _descriptor_pb2 from google.protobuf import duration_pb2 as _duration_pb2 @@ -25,8 +26,6 @@ from google.protobuf import message as _message from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper -from google.api import launch_stage_pb2 as _launch_stage_pb2 - DESCRIPTOR: _descriptor.FileDescriptor class ClientLibraryOrganization(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): diff --git a/packages/googleapis-common-protos/google/api/control_pb2.pyi b/packages/googleapis-common-protos/google/api/control_pb2.pyi index c7898c3aca57..94af7c7865e3 100644 --- a/packages/googleapis-common-protos/google/api/control_pb2.pyi +++ b/packages/googleapis-common-protos/google/api/control_pb2.pyi @@ -18,12 +18,11 @@ from typing import Mapping as _Mapping from typing import Optional as _Optional from typing import Union as _Union +from google.api import policy_pb2 as _policy_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf.internal import containers as _containers -from google.api import policy_pb2 as _policy_pb2 - DESCRIPTOR: _descriptor.FileDescriptor class Control(_message.Message): diff --git a/packages/googleapis-common-protos/google/api/log_pb2.pyi b/packages/googleapis-common-protos/google/api/log_pb2.pyi index e1778599e961..4fafcd722a78 100644 --- a/packages/googleapis-common-protos/google/api/log_pb2.pyi +++ b/packages/googleapis-common-protos/google/api/log_pb2.pyi @@ -18,12 +18,11 @@ from typing import Mapping as _Mapping from typing import Optional as _Optional from typing import Union as _Union +from google.api import label_pb2 as _label_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf.internal import containers as _containers -from google.api import label_pb2 as _label_pb2 - DESCRIPTOR: _descriptor.FileDescriptor class LogDescriptor(_message.Message): diff --git a/packages/googleapis-common-protos/google/api/metric_pb2.py b/packages/googleapis-common-protos/google/api/metric_pb2.py index 53ab18b97266..2a44f7bf2dfa 100644 --- a/packages/googleapis-common-protos/google/api/metric_pb2.py +++ b/packages/googleapis-common-protos/google/api/metric_pb2.py @@ -29,10 +29,9 @@ _sym_db = _symbol_database.Default() -from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 - from google.api import label_pb2 as google_dot_api_dot_label__pb2 from google.api import launch_stage_pb2 as google_dot_api_dot_launch__stage__pb2 +from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b'\n\x17google/api/metric.proto\x12\ngoogle.api\x1a\x16google/api/label.proto\x1a\x1dgoogle/api/launch_stage.proto\x1a\x1egoogle/protobuf/duration.proto"\xac\x08\n\x10MetricDescriptor\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x08 \x01(\t\x12+\n\x06labels\x18\x02 \x03(\x0b\x32\x1b.google.api.LabelDescriptor\x12<\n\x0bmetric_kind\x18\x03 \x01(\x0e\x32\'.google.api.MetricDescriptor.MetricKind\x12:\n\nvalue_type\x18\x04 \x01(\x0e\x32&.google.api.MetricDescriptor.ValueType\x12\x0c\n\x04unit\x18\x05 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x06 \x01(\t\x12\x14\n\x0c\x64isplay_name\x18\x07 \x01(\t\x12G\n\x08metadata\x18\n \x01(\x0b\x32\x35.google.api.MetricDescriptor.MetricDescriptorMetadata\x12-\n\x0claunch_stage\x18\x0c \x01(\x0e\x32\x17.google.api.LaunchStage\x12 \n\x18monitored_resource_types\x18\r \x03(\t\x1a\xbd\x03\n\x18MetricDescriptorMetadata\x12\x31\n\x0claunch_stage\x18\x01 \x01(\x0e\x32\x17.google.api.LaunchStageB\x02\x18\x01\x12\x30\n\rsample_period\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\x12/\n\x0cingest_delay\x18\x03 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x84\x01\n$time_series_resource_hierarchy_level\x18\x04 \x03(\x0e\x32V.google.api.MetricDescriptor.MetricDescriptorMetadata.TimeSeriesResourceHierarchyLevel"\x83\x01\n TimeSeriesResourceHierarchyLevel\x12\x34\n0TIME_SERIES_RESOURCE_HIERARCHY_LEVEL_UNSPECIFIED\x10\x00\x12\x0b\n\x07PROJECT\x10\x01\x12\x10\n\x0cORGANIZATION\x10\x02\x12\n\n\x06\x46OLDER\x10\x03"O\n\nMetricKind\x12\x1b\n\x17METRIC_KIND_UNSPECIFIED\x10\x00\x12\t\n\x05GAUGE\x10\x01\x12\t\n\x05\x44\x45LTA\x10\x02\x12\x0e\n\nCUMULATIVE\x10\x03"q\n\tValueType\x12\x1a\n\x16VALUE_TYPE_UNSPECIFIED\x10\x00\x12\x08\n\x04\x42OOL\x10\x01\x12\t\n\x05INT64\x10\x02\x12\n\n\x06\x44OUBLE\x10\x03\x12\n\n\x06STRING\x10\x04\x12\x10\n\x0c\x44ISTRIBUTION\x10\x05\x12\t\n\x05MONEY\x10\x06"u\n\x06Metric\x12\x0c\n\x04type\x18\x03 \x01(\t\x12.\n\x06labels\x18\x02 \x03(\x0b\x32\x1e.google.api.Metric.LabelsEntry\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42_\n\x0e\x63om.google.apiB\x0bMetricProtoP\x01Z7google.golang.org/genproto/googleapis/api/metric;metric\xa2\x02\x04GAPIb\x06proto3' diff --git a/packages/googleapis-common-protos/google/api/metric_pb2.pyi b/packages/googleapis-common-protos/google/api/metric_pb2.pyi index 2ff6b7439a28..f0c2fa50858c 100644 --- a/packages/googleapis-common-protos/google/api/metric_pb2.pyi +++ b/packages/googleapis-common-protos/google/api/metric_pb2.pyi @@ -18,15 +18,14 @@ from typing import Mapping as _Mapping from typing import Optional as _Optional from typing import Union as _Union +from google.api import label_pb2 as _label_pb2 +from google.api import launch_stage_pb2 as _launch_stage_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import duration_pb2 as _duration_pb2 from google.protobuf import message as _message from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper -from google.api import label_pb2 as _label_pb2 -from google.api import launch_stage_pb2 as _launch_stage_pb2 - DESCRIPTOR: _descriptor.FileDescriptor class MetricDescriptor(_message.Message): diff --git a/packages/googleapis-common-protos/google/api/monitored_resource_pb2.py b/packages/googleapis-common-protos/google/api/monitored_resource_pb2.py index 51cc782b1b41..fd764a5f3e89 100644 --- a/packages/googleapis-common-protos/google/api/monitored_resource_pb2.py +++ b/packages/googleapis-common-protos/google/api/monitored_resource_pb2.py @@ -29,10 +29,9 @@ _sym_db = _symbol_database.Default() -from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2 - from google.api import label_pb2 as google_dot_api_dot_label__pb2 from google.api import launch_stage_pb2 as google_dot_api_dot_launch__stage__pb2 +from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b'\n#google/api/monitored_resource.proto\x12\ngoogle.api\x1a\x16google/api/label.proto\x1a\x1dgoogle/api/launch_stage.proto\x1a\x1cgoogle/protobuf/struct.proto"\xc0\x01\n\x1bMonitoredResourceDescriptor\x12\x0c\n\x04name\x18\x05 \x01(\t\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x14\n\x0c\x64isplay_name\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12+\n\x06labels\x18\x04 \x03(\x0b\x32\x1b.google.api.LabelDescriptor\x12-\n\x0claunch_stage\x18\x07 \x01(\x0e\x32\x17.google.api.LaunchStage"\x8b\x01\n\x11MonitoredResource\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x39\n\x06labels\x18\x02 \x03(\x0b\x32).google.api.MonitoredResource.LabelsEntry\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01"\xca\x01\n\x19MonitoredResourceMetadata\x12.\n\rsystem_labels\x18\x01 \x01(\x0b\x32\x17.google.protobuf.Struct\x12J\n\x0buser_labels\x18\x02 \x03(\x0b\x32\x35.google.api.MonitoredResourceMetadata.UserLabelsEntry\x1a\x31\n\x0fUserLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42v\n\x0e\x63om.google.apiB\x16MonitoredResourceProtoP\x01ZCgoogle.golang.org/genproto/googleapis/api/monitoredres;monitoredres\xa2\x02\x04GAPIb\x06proto3' diff --git a/packages/googleapis-common-protos/google/api/monitored_resource_pb2.pyi b/packages/googleapis-common-protos/google/api/monitored_resource_pb2.pyi index 17b13e507bb7..2f5c8773ee1a 100644 --- a/packages/googleapis-common-protos/google/api/monitored_resource_pb2.pyi +++ b/packages/googleapis-common-protos/google/api/monitored_resource_pb2.pyi @@ -18,14 +18,13 @@ from typing import Mapping as _Mapping from typing import Optional as _Optional from typing import Union as _Union +from google.api import label_pb2 as _label_pb2 +from google.api import launch_stage_pb2 as _launch_stage_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import struct_pb2 as _struct_pb2 from google.protobuf.internal import containers as _containers -from google.api import label_pb2 as _label_pb2 -from google.api import launch_stage_pb2 as _launch_stage_pb2 - DESCRIPTOR: _descriptor.FileDescriptor class MonitoredResourceDescriptor(_message.Message): diff --git a/packages/googleapis-common-protos/google/api/service_pb2.py b/packages/googleapis-common-protos/google/api/service_pb2.py index cc6f719d263e..e5d6882093e5 100644 --- a/packages/googleapis-common-protos/google/api/service_pb2.py +++ b/packages/googleapis-common-protos/google/api/service_pb2.py @@ -29,10 +29,6 @@ _sym_db = _symbol_database.Default() -from google.protobuf import api_pb2 as google_dot_protobuf_dot_api__pb2 -from google.protobuf import type_pb2 as google_dot_protobuf_dot_type__pb2 -from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 - from google.api import auth_pb2 as google_dot_api_dot_auth__pb2 from google.api import backend_pb2 as google_dot_api_dot_backend__pb2 from google.api import billing_pb2 as google_dot_api_dot_billing__pb2 @@ -53,6 +49,9 @@ from google.api import source_info_pb2 as google_dot_api_dot_source__info__pb2 from google.api import system_parameter_pb2 as google_dot_api_dot_system__parameter__pb2 from google.api import usage_pb2 as google_dot_api_dot_usage__pb2 +from google.protobuf import api_pb2 as google_dot_protobuf_dot_api__pb2 +from google.protobuf import type_pb2 as google_dot_protobuf_dot_type__pb2 +from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b"\n\x18google/api/service.proto\x12\ngoogle.api\x1a\x15google/api/auth.proto\x1a\x18google/api/backend.proto\x1a\x18google/api/billing.proto\x1a\x17google/api/client.proto\x1a\x18google/api/context.proto\x1a\x18google/api/control.proto\x1a\x1egoogle/api/documentation.proto\x1a\x19google/api/endpoint.proto\x1a\x15google/api/http.proto\x1a\x14google/api/log.proto\x1a\x18google/api/logging.proto\x1a\x17google/api/metric.proto\x1a#google/api/monitored_resource.proto\x1a\x1bgoogle/api/monitoring.proto\x1a\x16google/api/quota.proto\x1a\x1cgoogle/api/source_info.proto\x1a!google/api/system_parameter.proto\x1a\x16google/api/usage.proto\x1a\x19google/protobuf/api.proto\x1a\x1agoogle/protobuf/type.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\x82\x08\n\x07Service\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05title\x18\x02 \x01(\t\x12\x1b\n\x13producer_project_id\x18\x16 \x01(\t\x12\n\n\x02id\x18! \x01(\t\x12\"\n\x04\x61pis\x18\x03 \x03(\x0b\x32\x14.google.protobuf.Api\x12$\n\x05types\x18\x04 \x03(\x0b\x32\x15.google.protobuf.Type\x12$\n\x05\x65nums\x18\x05 \x03(\x0b\x32\x15.google.protobuf.Enum\x12\x30\n\rdocumentation\x18\x06 \x01(\x0b\x32\x19.google.api.Documentation\x12$\n\x07\x62\x61\x63kend\x18\x08 \x01(\x0b\x32\x13.google.api.Backend\x12\x1e\n\x04http\x18\t \x01(\x0b\x32\x10.google.api.Http\x12 \n\x05quota\x18\n \x01(\x0b\x32\x11.google.api.Quota\x12\x32\n\x0e\x61uthentication\x18\x0b \x01(\x0b\x32\x1a.google.api.Authentication\x12$\n\x07\x63ontext\x18\x0c \x01(\x0b\x32\x13.google.api.Context\x12 \n\x05usage\x18\x0f \x01(\x0b\x32\x11.google.api.Usage\x12'\n\tendpoints\x18\x12 \x03(\x0b\x32\x14.google.api.Endpoint\x12$\n\x07\x63ontrol\x18\x15 \x01(\x0b\x32\x13.google.api.Control\x12'\n\x04logs\x18\x17 \x03(\x0b\x32\x19.google.api.LogDescriptor\x12-\n\x07metrics\x18\x18 \x03(\x0b\x32\x1c.google.api.MetricDescriptor\x12\x44\n\x13monitored_resources\x18\x19 \x03(\x0b\x32'.google.api.MonitoredResourceDescriptor\x12$\n\x07\x62illing\x18\x1a \x01(\x0b\x32\x13.google.api.Billing\x12$\n\x07logging\x18\x1b \x01(\x0b\x32\x13.google.api.Logging\x12*\n\nmonitoring\x18\x1c \x01(\x0b\x32\x16.google.api.Monitoring\x12\x37\n\x11system_parameters\x18\x1d \x01(\x0b\x32\x1c.google.api.SystemParameters\x12+\n\x0bsource_info\x18% \x01(\x0b\x32\x16.google.api.SourceInfo\x12*\n\npublishing\x18- \x01(\x0b\x32\x16.google.api.Publishing\x12\x34\n\x0e\x63onfig_version\x18\x14 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueBn\n\x0e\x63om.google.apiB\x0cServiceProtoP\x01ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\xa2\x02\x04GAPIb\x06proto3" diff --git a/packages/googleapis-common-protos/google/api/service_pb2.pyi b/packages/googleapis-common-protos/google/api/service_pb2.pyi index a2e79a453be8..46478065c5c0 100644 --- a/packages/googleapis-common-protos/google/api/service_pb2.pyi +++ b/packages/googleapis-common-protos/google/api/service_pb2.pyi @@ -18,13 +18,6 @@ from typing import Mapping as _Mapping from typing import Optional as _Optional from typing import Union as _Union -from google.protobuf import api_pb2 as _api_pb2 -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import type_pb2 as _type_pb2 -from google.protobuf import wrappers_pb2 as _wrappers_pb2 -from google.protobuf.internal import containers as _containers - from google.api import auth_pb2 as _auth_pb2 from google.api import backend_pb2 as _backend_pb2 from google.api import billing_pb2 as _billing_pb2 @@ -43,6 +36,12 @@ from google.api import quota_pb2 as _quota_pb2 from google.api import source_info_pb2 as _source_info_pb2 from google.api import system_parameter_pb2 as _system_parameter_pb2 from google.api import usage_pb2 as _usage_pb2 +from google.protobuf import api_pb2 as _api_pb2 +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import type_pb2 as _type_pb2 +from google.protobuf import wrappers_pb2 as _wrappers_pb2 +from google.protobuf.internal import containers as _containers DESCRIPTOR: _descriptor.FileDescriptor diff --git a/packages/googleapis-common-protos/google/cloud/common_resources_pb2.pyi b/packages/googleapis-common-protos/google/cloud/common_resources_pb2.pyi index 524a461dc1fc..c2b5735d2e3b 100644 --- a/packages/googleapis-common-protos/google/cloud/common_resources_pb2.pyi +++ b/packages/googleapis-common-protos/google/cloud/common_resources_pb2.pyi @@ -14,8 +14,7 @@ from typing import ClassVar as _ClassVar -from google.protobuf import descriptor as _descriptor - from google.api import resource_pb2 as _resource_pb2 +from google.protobuf import descriptor as _descriptor DESCRIPTOR: _descriptor.FileDescriptor diff --git a/packages/googleapis-common-protos/google/cloud/location/locations_pb2.py b/packages/googleapis-common-protos/google/cloud/location/locations_pb2.py index d903a84385ad..d77b5983617c 100644 --- a/packages/googleapis-common-protos/google/cloud/location/locations_pb2.py +++ b/packages/googleapis-common-protos/google/cloud/location/locations_pb2.py @@ -29,10 +29,9 @@ _sym_db = _symbol_database.Default() -from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 - from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 from google.api import client_pb2 as google_dot_api_dot_client__pb2 +from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b'\n%google/cloud/location/locations.proto\x12\x15google.cloud.location\x1a\x1cgoogle/api/annotations.proto\x1a\x19google/protobuf/any.proto\x1a\x17google/api/client.proto"[\n\x14ListLocationsRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\x12\x11\n\tpage_size\x18\x03 \x01(\x05\x12\x12\n\npage_token\x18\x04 \x01(\t"d\n\x15ListLocationsResponse\x12\x32\n\tlocations\x18\x01 \x03(\x0b\x32\x1f.google.cloud.location.Location\x12\x17\n\x0fnext_page_token\x18\x02 \x01(\t""\n\x12GetLocationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t"\xd7\x01\n\x08Location\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0blocation_id\x18\x04 \x01(\t\x12\x14\n\x0c\x64isplay_name\x18\x05 \x01(\t\x12;\n\x06labels\x18\x02 \x03(\x0b\x32+.google.cloud.location.Location.LabelsEntry\x12&\n\x08metadata\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x32\xa4\x03\n\tLocations\x12\xab\x01\n\rListLocations\x12+.google.cloud.location.ListLocationsRequest\x1a,.google.cloud.location.ListLocationsResponse"?\x82\xd3\xe4\x93\x02\x39\x12\x14/v1/{name=locations}Z!\x12\x1f/v1/{name=projects/*}/locations\x12\x9e\x01\n\x0bGetLocation\x12).google.cloud.location.GetLocationRequest\x1a\x1f.google.cloud.location.Location"C\x82\xd3\xe4\x93\x02=\x12\x16/v1/{name=locations/*}Z#\x12!/v1/{name=projects/*/locations/*}\x1aH\xca\x41\x14\x63loud.googleapis.com\xd2\x41.https://www.googleapis.com/auth/cloud-platformBo\n\x19\x63om.google.cloud.locationB\x0eLocationsProtoP\x01Z=google.golang.org/genproto/googleapis/cloud/location;location\xf8\x01\x01\x62\x06proto3' diff --git a/packages/googleapis-common-protos/google/cloud/location/locations_pb2.pyi b/packages/googleapis-common-protos/google/cloud/location/locations_pb2.pyi index 714050027ecf..9da2987cc707 100644 --- a/packages/googleapis-common-protos/google/cloud/location/locations_pb2.pyi +++ b/packages/googleapis-common-protos/google/cloud/location/locations_pb2.pyi @@ -18,14 +18,13 @@ from typing import Mapping as _Mapping from typing import Optional as _Optional from typing import Union as _Union +from google.api import annotations_pb2 as _annotations_pb2 +from google.api import client_pb2 as _client_pb2 from google.protobuf import any_pb2 as _any_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf.internal import containers as _containers -from google.api import annotations_pb2 as _annotations_pb2 -from google.api import client_pb2 as _client_pb2 - DESCRIPTOR: _descriptor.FileDescriptor class ListLocationsRequest(_message.Message):