update post processing script for spanner

Author: ohmayr

.librarian/generator-input/client-post-processing/spanner-integration.yaml

@@ -11,5 +11,77 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-description: Integrate Google Cloud Spanner customizations for MetricsInterceptor and gRPC options
+description: Integrate Google Cloud Logging Spanner Handwritten code
 url: https://github.com/googleapis/gapic-generator-python/issues/123
+replacements:
+  - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/client.py]
+    before: '(import google\.rpc\.status_pb2 as status_pb2  # type: ignore\n\n)(?!from google\.cloud\.spanner_v1\.metrics)'
+    after: |
+      \g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+    count: 1
+
+  - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/client.py]
+    before: '(\s+api_audience=self\._client_options\.api_audience,\n)(?!\s+metrics_interceptor=MetricsInterceptor)'
+    after: |
+      \g<1>            metrics_interceptor=MetricsInterceptor(),
+    count: 1
+
+  - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/base.py]
+    before: '(from google\.cloud\.spanner_v1 import gapic_version as package_version\n)(?!from google\.cloud\.spanner_v1\.metrics)'
+    after: |
+      \g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+    count: 1
+
+  - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/rest.py]
+    before: '(from requests import __version__ as requests_version\n\n)(?!from google\.cloud\.spanner_v1\.metrics)'
+    after: |
+      \g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+    count: 1
+  
+  - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py]
+    before: '(from grpc\.experimental import aio  # type: ignore\n\n)(?!from google\.cloud\.spanner_v1\.metrics)'
+    after: |
+      \g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+    count: 1
+  
+  - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc.py]
+    before: '(from google\.protobuf\.json_format import MessageToJson\n\n)(?!from google\.cloud\.spanner_v1\.metrics)'
+    after: |
+      \g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+    count: 1
+  
+  - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/rest_base.py]
+    before: '(from google\.protobuf import json_format\n\n)(?!from google\.cloud\.spanner_v1\.metrics)'
+    after: |
+      \g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+    count: 1
+
+  - paths:
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/base.py
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc.py
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/rest.py
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/rest_base.py
+    before: '(\s+api_audience: Optional\[str\] = None,\n)(?!\s+metrics_interceptor: Optional\[MetricsInterceptor\])'
+    after: |
+      \g<1>        metrics_interceptor: Optional[MetricsInterceptor] = None,
+    count: 5
+
+  - paths: 
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc.py
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py
+      - packages/google-cloud-spanner/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py
+      - packages/google-cloud-spanner/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc_asyncio.py
+      - packages/google-cloud-spanner/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py
+      - packages/google-cloud-spanner/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc_asyncio.py
+    before: '(\s+\("grpc\.max_receive_message_length", -1\),\n)(?!\s+\("grpc\.keepalive_time_ms")'
+    after: |
+      \g<1>                    ("grpc.keepalive_time_ms", 120000),
+    count: 6
+
+  - paths:
+      - packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc.py
+    before: '(\s+self\._stubs: Dict\[str, Callable\] = \{\}\n)(?!\s+self\._metrics_interceptor = None)'
+    after: |
+      \g<1>        self._metrics_interceptor = None
+    count: 1

verify_integration.py

@@ -0,0 +1,67 @@
+import re
+import yaml
+import os
+
+def main():
+    # Adjusted path to match your structure
+    yaml_path = ".librarian/generator-input/client-post-processing/spanner-integration.yaml"
+    
+    if not os.path.exists(yaml_path):
+        print(f"❌ Error: YAML not found at {yaml_path}")
+        return
+
+    with open(yaml_path, "r") as f:
+        config = yaml.safe_load(f)
+    replacements = config.get("replacements", [])
+    
+    # Track which files actually exist locally
+    all_paths = set()
+    for r in replacements:
+        for path in r.get("paths", []):
+            all_paths.add(path)
+
+    for file_path in sorted(all_paths):
+        if not os.path.exists(file_path):
+            print(f"⏭️  Skipping: {file_path} (not found)")
+            continue
+
+        with open(file_path, "r") as f:
+            content = f.read()
+
+        working_content = content
+        modified = False
+        
+        print(f"\nPROCESSING: {file_path}")
+
+        # PASS 1: Apply replacements
+        for i, r in enumerate(replacements):
+            if file_path in r.get("paths", []):
+                # We check if the 'before' pattern exists
+                if re.search(r["before"], working_content, flags=re.MULTILINE):
+                    working_content = re.sub(r["before"], r["after"], working_content, flags=re.MULTILINE)
+                    modified = True
+                    print(f"  [Pass 1] Block {i+1}: Applied.")
+                else:
+                    print(f"  [Pass 1] Block {i+1}: No match (already applied or pattern mismatch).")
+
+        if not modified:
+            print("  No changes made.")
+            continue
+
+        # PASS 2: Idempotency check (Should be 0 matches now)
+        idempotent_fail = False
+        for i, r in enumerate(replacements):
+            if file_path in r.get("paths", []):
+                if re.search(r["before"], working_content, flags=re.MULTILINE):
+                    print(f"  [Pass 2] ❌ FAIL: Block {i+1} matched again. Fix lookahead logic!")
+                    idempotent_fail = True
+
+        if not idempotent_fail:
+            with open(file_path, "w") as f:
+                f.write(working_content)
+            print("  ✅ SUCCESS: Disk updated and verified idempotent.")
+        else:
+            print("  ⚠️  WARNING: File NOT updated due to idempotency failure.")
+
+if __name__ == "__main__":
+    main()