Copybara import of the project:

--
3e05303 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>:

🦉 Updates from OwlBot post-processor

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

--
75aa48e by Ayush Agrawal <ayushagra@google.com>:

Revert generated metadata files to resolve conflicts

COPYBARA_INTEGRATE_REVIEW=#6212 from googleapis:owl-bot-copy 75aa48e
PiperOrigin-RevId: 858867075

Author: speedstorm1

google/cloud/aiplatform_v1beta1/types/vertex_rag_data.py

@@ -1546,20 +1546,32 @@ class RagManagedDbConfig(proto.Message):
 
             This field is a member of `oneof`_ ``tier``.
         scaled (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Scaled):
-            Sets the RagManagedDb to the Scaled tier.
-            This is the default tier if not explicitly
-            chosen.
+            Deprecated: Use ``mode`` instead to set the tier under
+            Spanner. Sets the RagManagedDb to the Scaled tier.
 
             This field is a member of `oneof`_ ``tier``.
         basic (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Basic):
-            Sets the RagManagedDb to the Basic tier.
+            Deprecated: Use ``mode`` instead to set the tier under
+            Spanner. Sets the RagManagedDb to the Basic tier.
 
             This field is a member of `oneof`_ ``tier``.
         unprovisioned (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Unprovisioned):
-            Sets the RagManagedDb to the Unprovisioned
-            tier.
+            Deprecated: Use ``mode`` instead to set the tier under
+            Spanner. Sets the RagManagedDb to the Unprovisioned tier.
 
             This field is a member of `oneof`_ ``tier``.
+        serverless (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Serverless):
+            Sets the backend to be the serverless mode
+            offered by RAG Engine.
+
+            This field is a member of `oneof`_ ``mode``.
+        spanner (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Spanner):
+            Sets the RAG Engine backend to be
+            RagManagedDb, built on top of Spanner.
+            NOTE: This is the default mode (w/ Basic Tier)
+            if not explicitly chosen.
+
+            This field is a member of `oneof`_ ``mode``.
     """
 
     class Enterprise(proto.Message):
@@ -1585,7 +1597,8 @@ class Basic(proto.Message):
         - Latency insensitive workload.
         - Only using RAG Engine with external vector DBs.
 
-        NOTE: This is the default tier if not explicitly chosen.
+        NOTE: This is the default tier under Spanner mode if not explicitly
+        chosen.
 
         """
 
@@ -1600,6 +1613,60 @@ class Unprovisioned(proto.Message):
 
         """
 
+    class Spanner(proto.Message):
+        r"""Message to configure the Spanner database used by
+        RagManagedDb.
+
+        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:
+            scaled (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Scaled):
+                Sets the RagManagedDb to the Scaled tier.
+
+                This field is a member of `oneof`_ ``tier``.
+            basic (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Basic):
+                Sets the RagManagedDb to the Basic tier. This
+                is the default tier for Spanner mode if not
+                explicitly chosen.
+
+                This field is a member of `oneof`_ ``tier``.
+            unprovisioned (google.cloud.aiplatform_v1beta1.types.RagManagedDbConfig.Unprovisioned):
+                Sets the RagManagedDb to the Unprovisioned
+                tier.
+
+                This field is a member of `oneof`_ ``tier``.
+        """
+
+        scaled: "RagManagedDbConfig.Scaled" = proto.Field(
+            proto.MESSAGE,
+            number=1,
+            oneof="tier",
+            message="RagManagedDbConfig.Scaled",
+        )
+        basic: "RagManagedDbConfig.Basic" = proto.Field(
+            proto.MESSAGE,
+            number=2,
+            oneof="tier",
+            message="RagManagedDbConfig.Basic",
+        )
+        unprovisioned: "RagManagedDbConfig.Unprovisioned" = proto.Field(
+            proto.MESSAGE,
+            number=3,
+            oneof="tier",
+            message="RagManagedDbConfig.Unprovisioned",
+        )
+
+    class Serverless(proto.Message):
+        r"""Message to configure the serverless mode offered by RAG
+        Engine.
+
+        """
+
     enterprise: Enterprise = proto.Field(
         proto.MESSAGE,
         number=1,
@@ -1624,6 +1691,18 @@ class Unprovisioned(proto.Message):
         oneof="tier",
         message=Unprovisioned,
     )
+    serverless: Serverless = proto.Field(
+        proto.MESSAGE,
+        number=5,
+        oneof="mode",
+        message=Serverless,
+    )
+    spanner: Spanner = proto.Field(
+        proto.MESSAGE,
+        number=6,
+        oneof="mode",
+        message=Spanner,
+    )
 
 
 class RagEngineConfig(proto.Message):

tests/unit/gapic/aiplatform_v1beta1/test_vertex_rag_data_service.py

@@ -10756,6 +10756,8 @@ def test_update_rag_engine_config_rest_call_success(request_type):
             "scaled": {},
             "basic": {},
             "unprovisioned": {},
+            "serverless": {},
+            "spanner": {"scaled": {}, "basic": {}, "unprovisioned": {}},
         },
     }
     # The version of a generated dependency at test runtime may differ from the version used during generation.
@@ -13773,6 +13775,8 @@ async def test_update_rag_engine_config_rest_asyncio_call_success(request_type):
             "scaled": {},
             "basic": {},
             "unprovisioned": {},
+            "serverless": {},
+            "spanner": {"scaled": {}, "basic": {}, "unprovisioned": {}},
         },
     }
     # The version of a generated dependency at test runtime may differ from the version used during generation.