feat: Added GA support for PersistentResource management

PiperOrigin-RevId: 621337736

google/cloud/aiplatform/compat/services/__init__.py

@@ -124,6 +124,9 @@
 from google.cloud.aiplatform_v1.services.model_service import (
     client as model_service_client_v1,
 )
+from google.cloud.aiplatform_v1.services.persistent_resource_service import (
+    client as persistent_resource_service_client_v1,
+)
 from google.cloud.aiplatform_v1.services.pipeline_service import (
     client as pipeline_service_client_v1,
 )
@@ -160,6 +163,7 @@
     metadata_service_client_v1,
     model_garden_service_client_v1,
     model_service_client_v1,
+    persistent_resource_service_client_v1,
     pipeline_service_client_v1,
     prediction_service_client_v1,
     prediction_service_async_client_v1,

google/cloud/aiplatform/compat/types/__init__.py

@@ -156,6 +156,8 @@
     model_service as model_service_v1,
     model_monitoring as model_monitoring_v1,
     operation as operation_v1,
+    persistent_resource as persistent_resource_v1,
+    persistent_resource_service as persistent_resource_service_v1,
     pipeline_failure_policy as pipeline_failure_policy_v1,
     pipeline_job as pipeline_job_v1,
     pipeline_service as pipeline_service_v1,
@@ -230,7 +232,8 @@
     model_service_v1,
     model_monitoring_v1,
     operation_v1,
-    persistent_resource_v1beta1,
+    persistent_resource_v1,
+    persistent_resource_service_v1,
     pipeline_failure_policy_v1,
     pipeline_job_v1,
     pipeline_service_v1,
@@ -306,6 +309,8 @@
     model_service_v1beta1,
     model_monitoring_v1beta1,
     operation_v1beta1,
+    persistent_resource_v1beta1,
+    persistent_resource_service_v1beta1,
     pipeline_failure_policy_v1beta1,
     pipeline_job_v1beta1,
     pipeline_service_v1beta1,

google/cloud/aiplatform/preview/persistent_resource.py → google/cloud/aiplatform/persistent_resource.py

@@ -23,13 +23,11 @@
 from google.cloud.aiplatform import initializer
 from google.cloud.aiplatform import utils
 from google.cloud.aiplatform.compat.services import (
-    persistent_resource_service_client_v1beta1 as persistent_resource_service_client_compat,
+    persistent_resource_service_client_v1 as persistent_resource_service_client_compat,
 )
 from google.cloud.aiplatform.compat.types import (
-    persistent_resource_v1beta1 as gca_persistent_resource_compat,
-)
-from google.cloud.aiplatform_v1beta1.types import (
-    encryption_spec as gca_encryption_spec,
+    encryption_spec as gca_encryption_spec_compat,
+    persistent_resource_v1 as gca_persistent_resource_compat,
 )
 from google.protobuf import timestamp_pb2  # type: ignore
 from google.rpc import status_pb2  # type: ignore
@@ -194,7 +192,7 @@ def create(
                 This corresponds to the ``persistent_resource_id`` field
                 on the ``request`` instance; if ``request`` is provided, this
                 should not be set.
-            resource_pools (MutableSequence[google.cloud.aiplatform_v1beta1.types.ResourcePool]):
+            resource_pools (MutableSequence[google.cloud.aiplatform_v1.types.ResourcePool]):
                 Required. The list of resource pools to create for the
                 PersistentResource.
             display_name (str):
@@ -294,7 +292,7 @@ def create(
 
         if kms_key_name:
             gca_persistent_resource.encryption_spec = (
-                gca_encryption_spec.EncryptionSpec(kms_key_name=kms_key_name)
+                gca_encryption_spec_compat.EncryptionSpec(kms_key_name=kms_key_name)
             )
 
         if service_account:

google/cloud/aiplatform/preview/vertex_ray/util/_gapic_utils.py

@@ -47,7 +47,7 @@ def create_persistent_resource_client():
     return initializer.global_config.create_client(
         client_class=PersistentResourceClientWithOverride,
         appended_gapic_version="vertex_ray",
-    )
+    ).select_version("v1beta1")
 
 
 def polling_delay(num_attempts: int, time_scale: float) -> datetime.timedelta:

google/cloud/aiplatform/utils/__init__.py

@@ -79,6 +79,7 @@
     schedule_service_client_v1,
     tensorboard_service_client_v1,
     vizier_service_client_v1,
+    persistent_resource_service_client_v1,
 )
 
 from google.cloud.aiplatform.compat.types import (
@@ -739,8 +740,12 @@ class ModelGardenClientWithOverride(ClientWithOverride):
 
 class PersistentResourceClientWithOverride(ClientWithOverride):
     _is_temporary = True
-    _default_version = compat.V1BETA1
+    _default_version = compat.DEFAULT_VERSION
     _version_map = (
+        (
+            compat.V1,
+            persistent_resource_service_client_v1.PersistentResourceServiceClient,
+        ),
         (
             compat.V1BETA1,
             persistent_resource_service_client_v1beta1.PersistentResourceServiceClient,