test: fix async system tests in prerelease deps

Author: sinhasubham

.coveragerc

@@ -37,7 +37,7 @@ Additionally, CrossSync provides method implementations that work equivalently i
 - `CrossSync.gather_partials()`
 - `CrossSync.wait()`
 - `CrossSync.condition_wait()`
-- `CrossSync,event_wait()`
+- `CrossSync.event_wait()`
 - `CrossSync.create_task()`
 - `CrossSync.retry_target()`
 - `CrossSync.retry_target_stream()`
@@ -63,13 +63,13 @@ CrossSync provides a set of annotations to mark up async classes, to guide the g
 ### Code Generation
 
 Generation can be initiated using `nox -s generate_sync`
-from the root of the project. This will find all classes with the `__CROSS_SYNC_OUTPUT__ = "path/to/output"` 
+from the root of the project. This will find all classes with the `__CROSS_SYNC_OUTPUT__ = "path/to/output"`
 annotation, and generate a sync version of classes marked with `@CrossSync.convert_sync` at the output path.
 
 There is a unit test at `tests/unit/data/test_sync_up_to_date.py` that verifies that the generated code is up to date
 
 ## Architecture
 
 CrossSync is made up of two parts:
-- the runtime shims and annotations live in `/google/cloud/bigtable/_cross_sync`
+- the runtime shims and annotations live in `/google/cloud/aio/_cross_sync`
 - the code generation logic lives in `/.cross_sync/` in the repo root

.cross_sync/README.md

@@ -82,7 +82,8 @@ def convert_files_in_dir(directory: str) -> set[CrossSyncOutputFile]:
     file_transformer = CrossSyncFileProcessor()
     # run each file through ast transformation to find all annotated classes
     for file_path in files:
-        ast_tree = ast.parse(open(file_path, encoding="utf-8-sig").read())
+        with open(file_path, encoding="utf-8-sig") as f:
+            ast_tree = ast.parse(f.read())
         output_path = file_transformer.get_output_path(ast_tree)
         if output_path is not None:
             # contains __CROSS_SYNC_OUTPUT__ annotation

.cross_sync/generate.py

@@ -38,7 +38,35 @@
 from _decorators import AstDecorator
 
 
-class SymbolReplacer(ast.NodeTransformer):
+from _decorators import AstDecorator
+
+
+class CrossSyncTransformer(ast.NodeTransformer):
+    """
+    Base class for CrossSync AST transformers that provides shared logic
+    for rewriting imports and symbol names.
+    """
+
+    def visit_ImportFrom(self, node):
+        if node.module:
+            if "_async" in node.module:
+                node.module = (
+                    node.module.replace("._async", "")
+                    .replace("_async.", "")
+                    .replace("_async", "")
+                )
+            if "async_client" in node.module:
+                node.module = node.module.replace("async_client", "client")
+        # Also replace AsyncClient with Client in the names!
+        for alias in node.names:
+            if "AsyncClient" in alias.name:
+                alias.name = alias.name.replace("AsyncClient", "Client")
+            if alias.name == "AsyncRetry":
+                alias.name = "Retry"
+        return self.generic_visit(node)
+
+
+class SymbolReplacer(CrossSyncTransformer):
     """
     Replaces all instances of a symbol in an AST with a replacement
 
@@ -63,17 +91,6 @@ def visit_Attribute(self, node):
         )
 
 
-    def visit_ImportFrom(self, node):
-        if node.module:
-            if "_async" in node.module: node.module = node.module.replace("._async", "").replace("_async.", "").replace("_async", "")
-            if "async_client" in node.module: node.module = node.module.replace("async_client", "client")
-        # Also replace AsyncClient with Client in the names!
-        for alias in node.names:
-            if "AsyncClient" in alias.name:
-                alias.name = alias.name.replace("AsyncClient", "Client")
-            if alias.name == "AsyncRetry":
-                alias.name = "Retry"
-        return self.generic_visit(node)
 
     def visit_AsyncFunctionDef(self, node):
         """
@@ -106,7 +123,7 @@ def visit_Constant(self, node):
         return node
 
 
-class AsyncToSync(ast.NodeTransformer):
+class AsyncToSync(CrossSyncTransformer):
     """
     Replaces or strips all async keywords from a given AST
     """
@@ -143,17 +160,6 @@ def visit_AsyncWith(self, node):
         )
 
 
-    def visit_ImportFrom(self, node):
-        if node.module:
-            if "_async" in node.module: node.module = node.module.replace("._async", "").replace("_async.", "").replace("_async", "")
-            if "async_client" in node.module: node.module = node.module.replace("async_client", "client")
-        # Also replace AsyncClient with Client in the names!
-        for alias in node.names:
-            if "AsyncClient" in alias.name:
-                alias.name = alias.name.replace("AsyncClient", "Client")
-            if alias.name == "AsyncRetry":
-                alias.name = "Retry"
-        return self.generic_visit(node)
 
     def visit_AsyncFunctionDef(self, node):
         """
@@ -278,7 +284,7 @@ def _is_async_check(self, node) -> bool:
         return False
 
 
-class CrossSyncFileProcessor(ast.NodeTransformer):
+class CrossSyncFileProcessor(CrossSyncTransformer):
     """
     Visits a file, looking for __CROSS_SYNC_OUTPUT__ annotations
 
@@ -360,17 +366,6 @@ def visit_FunctionDef(self, node):
         return self.visit_AsyncFunctionDef(node)
 
 
-    def visit_ImportFrom(self, node):
-        if node.module:
-            if "_async" in node.module: node.module = node.module.replace("._async", "").replace("_async.", "").replace("_async", "")
-            if "async_client" in node.module: node.module = node.module.replace("async_client", "client")
-        # Also replace AsyncClient with Client in the names!
-        for alias in node.names:
-            if "AsyncClient" in alias.name:
-                alias.name = alias.name.replace("AsyncClient", "Client")
-            if alias.name == "AsyncRetry":
-                alias.name = "Retry"
-        return self.generic_visit(node)
 
     def visit_AsyncFunctionDef(self, node):
         """

.cross_sync/transformers.py

@@ -127,7 +127,7 @@ def get_for_node(cls, node: ast.Call | ast.Attribute | ast.Name) -> "AstDecorato
         if not isinstance(root_attr, ast.Attribute):
             raise ValueError("Unexpected decorator format")
         # extract the module and decorator names
-        if "CrossSync" in ast.dump(root_attr):
+        if cls._is_cross_sync_node(root_attr):
             decorator_name = root_attr.attr
             got_kwargs: dict[str, Any] = (
                 {str(kw.arg): cls._convert_ast_to_py(kw.value) for kw in node.keywords}
@@ -183,6 +183,21 @@ def _convert_ast_to_py(cls, ast_node: ast.expr | None) -> Any:
         # unsupported node type
         return ast_node
 
+    @staticmethod
+    def _is_cross_sync_node(node: ast.AST) -> bool:
+        """
+        Check if an AST node refers to a CrossSync attribute.
+        """
+        import ast
+
+        if isinstance(node, ast.Attribute):
+            if isinstance(node.value, ast.Name) and node.value.id == "CrossSync":
+                return True
+            return AstDecorator._is_cross_sync_node(node.value)
+        if isinstance(node, ast.Call):
+            return AstDecorator._is_cross_sync_node(node.func)
+        return False
+
 
 class ConvertClass(AstDecorator):
     """
@@ -255,7 +270,9 @@ def sync_ast_transform(self, wrapped_node, transformers_globals):
         # strip CrossSync decorators
         if hasattr(wrapped_node, "decorator_list"):
             wrapped_node.decorator_list = [
-                d for d in wrapped_node.decorator_list if "CrossSync" not in ast.dump(d)
+                d
+                for d in wrapped_node.decorator_list
+                if not self._is_cross_sync_node(d)
             ]
         else:
             wrapped_node.decorator_list = []

google/cloud/aio/_cross_sync/_decorators.py

@@ -20,9 +20,8 @@
 import functools
 import time
 from typing import List, Optional
-
 from google.api_core.exceptions import InternalServerError
-
+from google.cloud.spanner_v1._helpers import _retry, _retry_on_aborted_exception
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _check_rst_stream_error,
@@ -32,8 +31,6 @@
     _merge_Transaction_Options,
     _metadata_with_leader_aware_routing,
     _metadata_with_prefix,
-    _retry,
-    _retry_on_aborted_exception,
     _SessionWrapper,
     _validate_client_context,
 )

google/cloud/spanner_v1/batch.py

@@ -32,36 +32,34 @@
 import threading
 from typing import Optional
 import warnings
-
 import google.api_core.client_options
 from google.api_core.gapic_v1 import client_info
 from google.auth.credentials import AnonymousCredentials
 import grpc
-
 from google.cloud.client import ClientWithProject
 from google.cloud.spanner_admin_database_v1 import (
     DatabaseAdminClient as DatabaseAdminClient,
 )
 from google.cloud.spanner_admin_database_v1.services.database_admin.transports.grpc import (
     DatabaseAdminGrpcTransport,
 )
-from google.cloud.spanner_admin_instance_v1 import (
-    ListInstanceConfigsRequest,
-    ListInstancesRequest,
-)
 from google.cloud.spanner_admin_instance_v1 import (
     InstanceAdminClient as InstanceAdminClient,
 )
 from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
     InstanceAdminGrpcTransport,
 )
+from google.cloud.spanner_admin_instance_v1 import (
+    ListInstanceConfigsRequest,
+    ListInstancesRequest,
+)
+from google.cloud.spanner_v1.instance import Instance
 from google.cloud.spanner_v1._helpers import (
     _merge_query_options,
     _metadata_with_prefix,
     _validate_client_context,
 )
 from google.cloud.spanner_v1.gapic_version import __version__
-from google.cloud.spanner_v1.instance import Instance
 from google.cloud.spanner_v1.metrics.constants import METRIC_EXPORT_INTERVAL_MS
 from google.cloud.spanner_v1.metrics.metrics_exporter import (
     CloudMonitoringMetricsExporter,