🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Author: gcf-owl-bot[bot]

google/cloud/aiplatform_v1/services/migration_service/client.py

@@ -243,40 +243,40 @@ def parse_annotated_dataset_path(path: str) -> Dict[str, str]:
     @staticmethod
     def dataset_path(
         project: str,
-        location: str,
         dataset: str,
     ) -> str:
         """Returns a fully-qualified dataset string."""
-        return "projects/{project}/locations/{location}/datasets/{dataset}".format(
+        return "projects/{project}/datasets/{dataset}".format(
             project=project,
-            location=location,
             dataset=dataset,
         )
 
     @staticmethod
     def parse_dataset_path(path: str) -> Dict[str, str]:
         """Parses a dataset path into its component segments."""
-        m = re.match(
-            r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
-            path,
-        )
+        m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
         return m.groupdict() if m else {}
 
     @staticmethod
     def dataset_path(
         project: str,
+        location: str,
         dataset: str,
     ) -> str:
         """Returns a fully-qualified dataset string."""
-        return "projects/{project}/datasets/{dataset}".format(
+        return "projects/{project}/locations/{location}/datasets/{dataset}".format(
             project=project,
+            location=location,
             dataset=dataset,
         )
 
     @staticmethod
     def parse_dataset_path(path: str) -> Dict[str, str]:
         """Parses a dataset path into its component segments."""
-        m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
+        m = re.match(
+            r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
+            path,
+        )
         return m.groupdict() if m else {}
 
     @staticmethod

google/cloud/aiplatform_v1/types/accelerator_type.py

@@ -63,6 +63,8 @@ class AcceleratorType(proto.Enum):
             Nvidia B200 GPU.
         NVIDIA_GB200 (17):
             Nvidia GB200 GPU.
+        NVIDIA_RTX_PRO_6000 (18):
+            Nvidia RTX Pro 6000 GPU.
         TPU_V2 (6):
             TPU v2.
         TPU_V3 (7):
@@ -87,6 +89,7 @@ class AcceleratorType(proto.Enum):
     NVIDIA_H200_141GB = 15
     NVIDIA_B200 = 16
     NVIDIA_GB200 = 17
+    NVIDIA_RTX_PRO_6000 = 18
     TPU_V2 = 6
     TPU_V3 = 7
     TPU_V4_POD = 10

google/cloud/aiplatform_v1beta1/services/migration_service/client.py

@@ -243,40 +243,40 @@ def parse_annotated_dataset_path(path: str) -> Dict[str, str]:
     @staticmethod
     def dataset_path(
         project: str,
+        location: str,
         dataset: str,
     ) -> str:
         """Returns a fully-qualified dataset string."""
-        return "projects/{project}/datasets/{dataset}".format(
+        return "projects/{project}/locations/{location}/datasets/{dataset}".format(
             project=project,
+            location=location,
             dataset=dataset,
         )
 
     @staticmethod
     def parse_dataset_path(path: str) -> Dict[str, str]:
         """Parses a dataset path into its component segments."""
-        m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
+        m = re.match(
+            r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
+            path,
+        )
         return m.groupdict() if m else {}
 
     @staticmethod
     def dataset_path(
         project: str,
-        location: str,
         dataset: str,
     ) -> str:
         """Returns a fully-qualified dataset string."""
-        return "projects/{project}/locations/{location}/datasets/{dataset}".format(
+        return "projects/{project}/datasets/{dataset}".format(
             project=project,
-            location=location,
             dataset=dataset,
         )
 
     @staticmethod
     def parse_dataset_path(path: str) -> Dict[str, str]:
         """Parses a dataset path into its component segments."""
-        m = re.match(
-            r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
-            path,
-        )
+        m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
         return m.groupdict() if m else {}
 
     @staticmethod

google/cloud/aiplatform_v1beta1/types/accelerator_type.py

@@ -63,6 +63,8 @@ class AcceleratorType(proto.Enum):
             Nvidia B200 GPU.
         NVIDIA_GB200 (17):
             Nvidia GB200 GPU.
+        NVIDIA_RTX_PRO_6000 (18):
+            Nvidia RTX Pro 6000 GPU.
         TPU_V2 (6):
             TPU v2.
         TPU_V3 (7):
@@ -87,6 +89,7 @@ class AcceleratorType(proto.Enum):
     NVIDIA_H200_141GB = 15
     NVIDIA_B200 = 16
     NVIDIA_GB200 = 17
+    NVIDIA_RTX_PRO_6000 = 18
     TPU_V2 = 6
     TPU_V3 = 7
     TPU_V4_POD = 10

google/cloud/aiplatform_v1beta1/types/tool.py

@@ -107,21 +107,73 @@ class Tool(proto.Message):
             specific Function Declarations.
     """
 
+    class PhishBlockThreshold(proto.Enum):
+        r"""These are available confidence level user can set to block
+        malicious urls with chosen confidence and above. For
+        understanding different confidence of webrisk, please refer to
+        https://cloud.google.com/web-risk/docs/reference/rpc/google.cloud.webrisk.v1eap1#confidencelevel
+
+        Values:
+            PHISH_BLOCK_THRESHOLD_UNSPECIFIED (0):
+                Defaults to unspecified.
+            BLOCK_LOW_AND_ABOVE (30):
+                Blocks Low and above confidence URL that is
+                risky.
+            BLOCK_MEDIUM_AND_ABOVE (40):
+                Blocks Medium and above confidence URL that
+                is risky.
+            BLOCK_HIGH_AND_ABOVE (50):
+                Blocks High and above confidence URL that is
+                risky.
+            BLOCK_HIGHER_AND_ABOVE (55):
+                Blocks Higher and above confidence URL that
+                is risky.
+            BLOCK_VERY_HIGH_AND_ABOVE (60):
+                Blocks Very high and above confidence URL
+                that is risky.
+            BLOCK_ONLY_EXTREMELY_HIGH (100):
+                Blocks Extremely high confidence URL that is
+                risky.
+        """
+
+        PHISH_BLOCK_THRESHOLD_UNSPECIFIED = 0
+        BLOCK_LOW_AND_ABOVE = 30
+        BLOCK_MEDIUM_AND_ABOVE = 40
+        BLOCK_HIGH_AND_ABOVE = 50
+        BLOCK_HIGHER_AND_ABOVE = 55
+        BLOCK_VERY_HIGH_AND_ABOVE = 60
+        BLOCK_ONLY_EXTREMELY_HIGH = 100
+
     class GoogleSearch(proto.Message):
         r"""GoogleSearch tool type.
         Tool to support Google Search in Model. Powered by Google.
 
+
+        .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
         Attributes:
             exclude_domains (MutableSequence[str]):
                 Optional. List of domains to be excluded from the search
                 results. The default limit is 2000 domains. Example:
                 ["amazon.com", "facebook.com"].
+            blocking_confidence (google.cloud.aiplatform_v1beta1.types.Tool.PhishBlockThreshold):
+                Optional. Sites with confidence level chosen
+                & above this value will be blocked from the
+                search results.
+
+                This field is a member of `oneof`_ ``_blocking_confidence``.
         """
 
         exclude_domains: MutableSequence[str] = proto.RepeatedField(
             proto.STRING,
             number=3,
         )
+        blocking_confidence: "Tool.PhishBlockThreshold" = proto.Field(
+            proto.ENUM,
+            number=4,
+            optional=True,
+            enum="Tool.PhishBlockThreshold",
+        )
 
     class CodeExecution(proto.Message):
         r"""Tool that executes code generated by the model, and automatically
@@ -816,17 +868,32 @@ class EnterpriseWebSearch(proto.Message):
     r"""Tool to search public web data, powered by Vertex AI Search
     and Sec4 compliance.
 
+
+    .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
     Attributes:
         exclude_domains (MutableSequence[str]):
             Optional. List of domains to be excluded from
             the search results. The default limit is 2000
             domains.
+        blocking_confidence (google.cloud.aiplatform_v1beta1.types.Tool.PhishBlockThreshold):
+            Optional. Sites with confidence level chosen
+            & above this value will be blocked from the
+            search results.
+
+            This field is a member of `oneof`_ ``_blocking_confidence``.
     """
 
     exclude_domains: MutableSequence[str] = proto.RepeatedField(
         proto.STRING,
         number=1,
     )
+    blocking_confidence: "Tool.PhishBlockThreshold" = proto.Field(
+        proto.ENUM,
+        number=4,
+        optional=True,
+        enum="Tool.PhishBlockThreshold",
+    )
 
 
 class DynamicRetrievalConfig(proto.Message):