chore: librarian generate pull request: 20260325T160917Z

.librarian/generator-input/noxfile.py

@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
+# The source of truth for this file is `.librarian/generator-input`
+
+
 # Generated by synthtool. DO NOT EDIT!
 
 from __future__ import absolute_import
@@ -64,6 +68,7 @@
 SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [
     "mock",
     "pytest",
+    "pytest-asyncio",
     "google-cloud-testutils",
 ]
 SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
@@ -217,9 +222,8 @@ def unit(session, protobuf_implementation):
         session.install("protobuf<4")
 
     # Run py.test against the unit tests.
-    session.run(
+    args = [
         "py.test",
-        "--quiet",
         "-s",
         f"--junitxml=unit_{session.python}_sponge_log.xml",
         "--cov=google",
@@ -228,8 +232,13 @@ def unit(session, protobuf_implementation):
         "--cov-config=.coveragerc",
         "--cov-report=",
         "--cov-fail-under=0",
-        os.path.join("tests", "unit"),
-        *session.posargs,
+    ]
+    if not session.posargs:
+        args.append(os.path.join("tests", "unit"))
+    args.extend(session.posargs)
+
+    session.run(
+        *args,
         env={
             "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
         },
@@ -362,25 +371,67 @@ def system(session, protobuf_implementation, database_dialect):
 
     # Run py.test against the system tests.
     if system_test_exists:
-        session.run(
+        args = [
             "py.test",
             "--quiet",
+            "-o",
+            "asyncio_mode=auto",
             f"--junitxml=system_{session.python}_sponge_log.xml",
-            system_test_path,
-            *session.posargs,
+        ]
+        if not session.posargs:
+            args.append(system_test_path)
+        args.extend(session.posargs)
+
+        session.run(
+            *args,
             env={
                 "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
                 "SPANNER_DATABASE_DIALECT": database_dialect,
                 "SKIP_BACKUP_TESTS": "true",
             },
         )
     elif system_test_folder_exists:
+        # Run sync tests
+        sync_args = [
+            "py.test",
+            "--quiet",
+            "-o",
+            "asyncio_mode=auto",
+            f"--junitxml=system_{session.python}_sync_sponge_log.xml",
+        ]
+        if not session.posargs:
+            sync_args.append(os.path.join("tests", "system"))
+            sync_args.append("--ignore=tests/system/_async")
+        else:
+            sync_args.extend(session.posargs)
+
         session.run(
+            *sync_args,
+            env={
+                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+                "SPANNER_DATABASE_DIALECT": database_dialect,
+                "SKIP_BACKUP_TESTS": "true",
+            },
+        )
+
+        # Run async tests
+        async_args = [
             "py.test",
             "--quiet",
-            f"--junitxml=system_{session.python}_sponge_log.xml",
-            system_test_folder_path,
-            *session.posargs,
+            "-o",
+            "asyncio_mode=auto",
+            f"--junitxml=system_{session.python}_async_sponge_log.xml",
+        ]
+        if not session.posargs:
+            async_args.append(os.path.join("tests", "system", "_async"))
+        else:
+            # If posargs are provided, only run if they match async tests
+            # or just skip if they were already run in sync.
+            # For simplicity, we only run async folder if no posargs.
+            return
+
+        session.run(
+            *async_args,
             env={
                 "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
                 "SPANNER_DATABASE_DIALECT": database_dialect,
@@ -551,6 +602,10 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
         "google-cloud-testutils",
         # dependencies of google-cloud-testutils"
         "click",
+        # dependency of google-auth
+        "cffi",
+        "cryptography",
+        "cachetools",
     ]
 
     for dep in prerel_deps:
@@ -589,6 +644,8 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
             session.run(
                 "py.test",
                 "--verbose",
+                "-o",
+                "asyncio_mode=auto",
                 f"--junitxml=system_{session.python}_sponge_log.xml",
                 system_test_path,
                 *session.posargs,
@@ -602,6 +659,8 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
             session.run(
                 "py.test",
                 "--verbose",
+                "-o",
+                "asyncio_mode=auto",
                 f"--junitxml=system_{session.python}_sponge_log.xml",
                 system_test_folder_path,
                 *session.posargs,
@@ -611,3 +670,10 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
                     "SKIP_BACKUP_TESTS": "true",
                 },
             )
+
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def generate(session):
+    """Regenerate synchronous code from asynchronous code."""
+    session.install("black", "autoflake")
+    session.run("python", ".cross_sync/generate.py", "google/cloud/spanner_v1")

.librarian/state.yaml

@@ -2,7 +2,7 @@ image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-li
 libraries:
   - id: google-cloud-spanner
     version: 3.63.0
-    last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7
+    last_generated_commit: 8b491c86c6c25e413c7f3e4b76675e5db535b0cc
     apis:
       - path: google/spanner/admin/instance/v1
         service_config: spanner.yaml
@@ -21,7 +21,8 @@ libraries:
       - ^google/cloud/spanner_v1/types
       - ^google/cloud/spanner_admin_database_v1
       - ^google/cloud/spanner_admin_instance_v1
-      - ^tests/unit/gapic
+      - ^tests/unit/gapic/spanner
+      - ^tests/unit/gapic/__init__.py
       - ^tests/__init__.py
       - ^tests/unit/__init__.py
       - ^.pre-commit-config.yaml

google/cloud/spanner_admin_database_v1/__init__.py

@@ -13,11 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import sys
+from google.cloud.spanner_admin_database_v1 import gapic_version as package_version
 
 import google.api_core as api_core
-
-from google.cloud.spanner_admin_database_v1 import gapic_version as package_version
+import sys
 
 __version__ = package_version.__version__
 
@@ -28,76 +27,71 @@
     # this code path once we drop support for Python 3.7
     import importlib_metadata as metadata
 
-from .services.database_admin import DatabaseAdminAsyncClient, DatabaseAdminClient
-from .types.backup import (
-    Backup,
-    BackupInfo,
-    BackupInstancePartition,
-    CopyBackupEncryptionConfig,
-    CopyBackupMetadata,
-    CopyBackupRequest,
-    CreateBackupEncryptionConfig,
-    CreateBackupMetadata,
-    CreateBackupRequest,
-    DeleteBackupRequest,
-    FullBackupSpec,
-    GetBackupRequest,
-    IncrementalBackupSpec,
-    ListBackupOperationsRequest,
-    ListBackupOperationsResponse,
-    ListBackupsRequest,
-    ListBackupsResponse,
-    UpdateBackupRequest,
-)
-from .types.backup_schedule import (
-    BackupSchedule,
-    BackupScheduleSpec,
-    CreateBackupScheduleRequest,
-    CrontabSpec,
-    DeleteBackupScheduleRequest,
-    GetBackupScheduleRequest,
-    ListBackupSchedulesRequest,
-    ListBackupSchedulesResponse,
-    UpdateBackupScheduleRequest,
-)
-from .types.common import (
-    DatabaseDialect,
-    EncryptionConfig,
-    EncryptionInfo,
-    OperationProgress,
-)
-from .types.spanner_database_admin import (
-    AddSplitPointsRequest,
-    AddSplitPointsResponse,
-    CreateDatabaseMetadata,
-    CreateDatabaseRequest,
-    Database,
-    DatabaseRole,
-    DdlStatementActionInfo,
-    DropDatabaseRequest,
-    GetDatabaseDdlRequest,
-    GetDatabaseDdlResponse,
-    GetDatabaseRequest,
-    InternalUpdateGraphOperationRequest,
-    InternalUpdateGraphOperationResponse,
-    ListDatabaseOperationsRequest,
-    ListDatabaseOperationsResponse,
-    ListDatabaseRolesRequest,
-    ListDatabaseRolesResponse,
-    ListDatabasesRequest,
-    ListDatabasesResponse,
-    OptimizeRestoredDatabaseMetadata,
-    RestoreDatabaseEncryptionConfig,
-    RestoreDatabaseMetadata,
-    RestoreDatabaseRequest,
-    RestoreInfo,
-    RestoreSourceType,
-    SplitPoints,
-    UpdateDatabaseDdlMetadata,
-    UpdateDatabaseDdlRequest,
-    UpdateDatabaseMetadata,
-    UpdateDatabaseRequest,
-)
+
+from .services.database_admin import DatabaseAdminClient
+from .services.database_admin import DatabaseAdminAsyncClient
+
+from .types.backup import Backup
+from .types.backup import BackupInfo
+from .types.backup import BackupInstancePartition
+from .types.backup import CopyBackupEncryptionConfig
+from .types.backup import CopyBackupMetadata
+from .types.backup import CopyBackupRequest
+from .types.backup import CreateBackupEncryptionConfig
+from .types.backup import CreateBackupMetadata
+from .types.backup import CreateBackupRequest
+from .types.backup import DeleteBackupRequest
+from .types.backup import FullBackupSpec
+from .types.backup import GetBackupRequest
+from .types.backup import IncrementalBackupSpec
+from .types.backup import ListBackupOperationsRequest
+from .types.backup import ListBackupOperationsResponse
+from .types.backup import ListBackupsRequest
+from .types.backup import ListBackupsResponse
+from .types.backup import UpdateBackupRequest
+from .types.backup_schedule import BackupSchedule
+from .types.backup_schedule import BackupScheduleSpec
+from .types.backup_schedule import CreateBackupScheduleRequest
+from .types.backup_schedule import CrontabSpec
+from .types.backup_schedule import DeleteBackupScheduleRequest
+from .types.backup_schedule import GetBackupScheduleRequest
+from .types.backup_schedule import ListBackupSchedulesRequest
+from .types.backup_schedule import ListBackupSchedulesResponse
+from .types.backup_schedule import UpdateBackupScheduleRequest
+from .types.common import EncryptionConfig
+from .types.common import EncryptionInfo
+from .types.common import OperationProgress
+from .types.common import DatabaseDialect
+from .types.spanner_database_admin import AddSplitPointsRequest
+from .types.spanner_database_admin import AddSplitPointsResponse
+from .types.spanner_database_admin import CreateDatabaseMetadata
+from .types.spanner_database_admin import CreateDatabaseRequest
+from .types.spanner_database_admin import Database
+from .types.spanner_database_admin import DatabaseRole
+from .types.spanner_database_admin import DdlStatementActionInfo
+from .types.spanner_database_admin import DropDatabaseRequest
+from .types.spanner_database_admin import GetDatabaseDdlRequest
+from .types.spanner_database_admin import GetDatabaseDdlResponse
+from .types.spanner_database_admin import GetDatabaseRequest
+from .types.spanner_database_admin import InternalUpdateGraphOperationRequest
+from .types.spanner_database_admin import InternalUpdateGraphOperationResponse
+from .types.spanner_database_admin import ListDatabaseOperationsRequest
+from .types.spanner_database_admin import ListDatabaseOperationsResponse
+from .types.spanner_database_admin import ListDatabaseRolesRequest
+from .types.spanner_database_admin import ListDatabaseRolesResponse
+from .types.spanner_database_admin import ListDatabasesRequest
+from .types.spanner_database_admin import ListDatabasesResponse
+from .types.spanner_database_admin import OptimizeRestoredDatabaseMetadata
+from .types.spanner_database_admin import RestoreDatabaseEncryptionConfig
+from .types.spanner_database_admin import RestoreDatabaseMetadata
+from .types.spanner_database_admin import RestoreDatabaseRequest
+from .types.spanner_database_admin import RestoreInfo
+from .types.spanner_database_admin import SplitPoints
+from .types.spanner_database_admin import UpdateDatabaseDdlMetadata
+from .types.spanner_database_admin import UpdateDatabaseDdlRequest
+from .types.spanner_database_admin import UpdateDatabaseMetadata
+from .types.spanner_database_admin import UpdateDatabaseRequest
+from .types.spanner_database_admin import RestoreSourceType
 
 if hasattr(api_core, "check_python_version") and hasattr(
     api_core, "check_dependency_versions"
@@ -108,8 +102,8 @@
     # An older version of api_core is installed which does not define the
     # functions above. We do equivalent checks manually.
     try:
-        import sys
         import warnings
+        import sys
 
         _py_version_str = sys.version.split()[0]
         _package_label = "google.cloud.spanner_admin_database_v1"

google/cloud/spanner_admin_database_v1/services/database_admin/__init__.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .async_client import DatabaseAdminAsyncClient
 from .client import DatabaseAdminClient
+from .async_client import DatabaseAdminAsyncClient
 
 __all__ = (
     "DatabaseAdminClient",