Merge branch 'main' into shuowei-gbq-delegation-telemetry-mvp

Author: shuoweil

.github/workflows/import-profiler.yml

@@ -26,6 +26,7 @@ jobs:
       with:
         python-version: "3.15"
         allow-prereleases: true
+        cache: 'pip'
     - name: Run import profiler
       env:
         BUILD_TYPE: presubmit

packages/google-api-core/google/api_core/gapic_v1/requests.py

@@ -65,7 +65,7 @@ def setup_request_id(
                 setattr(request, field_name, str(uuid.uuid4()))
         except (AttributeError, ValueError):
             # Proto-plus messages or other objects
-            if not getattr(request, field_name, None):
+            if getattr(request, field_name, None) is None:
                 setattr(request, field_name, str(uuid.uuid4()))
     else:
         if not getattr(request, field_name, None):

packages/google-api-core/tests/unit/gapic/test_requests.py

@@ -27,9 +27,6 @@ def __init__(self, **kwargs):
         for k, v in kwargs.items():
             setattr(self, k, v)
 
-    def __contains__(self, key):
-        return hasattr(self, key)
-
 
 class MockProtoRequest:
     def __init__(self, **kwargs):
@@ -44,9 +41,6 @@ class MockValueErrorRequest:
     def HasField(self, key):
         raise ValueError("Mismatched field")
 
-    def __contains__(self, key):
-        return hasattr(self, key)
-
 
 # --- Parameterized Test ---
 
@@ -59,6 +53,7 @@ def __contains__(self, key):
         # MockRequest cases
         (MockRequest(), True, "uuid"),
         (MockRequest(request_id="already_set"), True, "already_set"),
+        (MockRequest(request_id=""), True, ""),
         (MockRequest(request_id=""), False, "uuid"),
         (MockRequest(request_id="already_set"), False, "already_set"),
         # MockProtoRequest cases
@@ -70,6 +65,7 @@ def __contains__(self, key):
         ({}, True, "uuid"),
         ({"request_id": None}, True, "uuid"),
         ({"request_id": "already_set"}, True, "already_set"),
+        ({"request_id": ""}, True, ""),
         ({"request_id": ""}, False, "uuid"),
         ({"request_id": None}, False, "uuid"),
         ({"request_id": "already_set"}, False, "already_set"),
@@ -79,6 +75,7 @@ def __contains__(self, key):
     ids=[
         "proto3_optional_not_in_request",
         "proto3_optional_already_in_request",
+        "proto3_optional_explicit_empty",
         "non_proto3_optional_empty",
         "non_proto3_optional_already_set",
         "proto3_optional_not_in_request_proto",
@@ -87,6 +84,7 @@ def __contains__(self, key):
         "dict_proto3_optional_not_in_request",
         "dict_proto3_optional_value_none",
         "dict_proto3_optional_already_in_request",
+        "dict_proto3_optional_explicit_empty",
         "dict_non_proto3_optional_empty",
         "dict_non_proto3_optional_value_none",
         "dict_non_proto3_optional_already_set",
@@ -110,6 +108,20 @@ def test_setup_request_id(request_obj, is_proto3_optional, expected):
     )
 
     if expected == "uuid":
-        assert re.match(UUID_REGEX, value)
+        assert re.fullmatch(UUID_REGEX, value)
     else:
         assert value == expected
+
+
+def test_setup_request_id_assertion_strictness(mocker):
+    # Mock uuid.uuid4 to return a UUID with trailing characters
+    mock_uuid = mocker.patch("uuid.uuid4")
+    mock_uuid.return_value.__str__.return_value = (
+        "12345678-1234-4123-8123-123456789012-extra"
+    )
+
+    # We expect test_setup_request_id to fail (raise AssertionError) because the UUID is invalid.
+    # If test_setup_request_id uses re.fullmatch, it will fail (raise AssertionError), so pytest.raises passes.
+    # If test_setup_request_id uses re.match, it will NOT fail, so pytest.raises fails!
+    with pytest.raises(AssertionError):
+        test_setup_request_id(MockRequest(), is_proto3_optional=True, expected="uuid")

packages/sqlalchemy-bigquery/setup.py

@@ -121,7 +121,7 @@ def readme():
         "sqlalchemy>=1.4.16,<3.0.0",
     ],
     extras_require=extras,
-    python_requires=">=3.10, <3.15",
+    python_requires=">=3.10",
     tests_require=["packaging", "pytz"],
     entry_points={
         "sqlalchemy.dialects": ["bigquery = sqlalchemy_bigquery:BigQueryDialect"]

packages/sqlalchemy-bigquery/tests/system/test_geography.py

@@ -22,8 +22,6 @@
 geoalchemy2 = pytest.importorskip("geoalchemy2")
 
 
-# TODO(http://github.com/googleapis/google-cloud-python/issues/17287): Unskip once bug is resolved.
-@pytest.mark.skip(reason="Failing in CI with AssertionError.")
 def test_geoalchemy2_core(bigquery_dataset):
     """Make sure GeoAlchemy 2 Core Tutorial works as adapted to only having geography
 
@@ -44,7 +42,7 @@ def test_geoalchemy2_core(bigquery_dataset):
 
     from sqlalchemy import Column, MetaData, String, Table
 
-    from sqlalchemy_bigquery import GEOGRAPHY
+    from sqlalchemy_bigquery import GEOGRAPHY, WKT
 
     metadata = MetaData()
     lake_table = Table(
@@ -86,7 +84,7 @@ def test_geoalchemy2_core(bigquery_dataset):
 
     [[result]] = conn.execute(
         select(lake_table.c.name).where(
-            func.ST_Contains(lake_table.c.geog, "POINT(4 1)")
+            func.ST_Contains(lake_table.c.geog, WKT("POINT(4 1)"))
         )
     )
     assert result == "Orta"
@@ -119,8 +117,6 @@ def test_geoalchemy2_core(bigquery_dataset):
 
     # and, while we're at it, that we can insert WKTs, although we
     # normally wouldn't want to.
-    from sqlalchemy_bigquery import WKT
-
     conn.execute(
         lake_table.insert().values(
             name="test2",
@@ -141,8 +137,6 @@ def test_geoalchemy2_core(bigquery_dataset):
     )
 
 
-# TODO(http://github.com/googleapis/google-cloud-python/issues/17287): Unskip once bug is resolved.
-@pytest.mark.skip(reason="Failing in CI with AssertionError.")
 def test_geoalchemy2_orm(bigquery_dataset):
     """Make sure GeoAlchemy 2 ORM Tutorial works as adapted to only having geometry
 
@@ -160,7 +154,7 @@ def test_geoalchemy2_orm(bigquery_dataset):
     from sqlalchemy import Column, Integer, String
     from sqlalchemy.ext.declarative import declarative_base
 
-    from sqlalchemy_bigquery import GEOGRAPHY
+    from sqlalchemy_bigquery import GEOGRAPHY, WKT
 
     Base = declarative_base()
 
@@ -224,19 +218,19 @@ class Lake(Base):
 
     from sqlalchemy import func
 
-    query = session.query(Lake).filter(func.ST_Contains(Lake.geog, "POINT(4 1)"))
+    query = session.query(Lake).filter(func.ST_Contains(Lake.geog, WKT("POINT(4 1)")))
 
     assert [lake.name for lake in query] == ["Orta"]
 
     query = (
         session.query(Lake)
-        .filter(Lake.geog.ST_Intersects("LINESTRING(2 1,4 1)"))
+        .filter(Lake.geog.ST_Intersects(WKT("LINESTRING(2 1,4 1)")))
         .order_by(Lake.name)
     )
     assert [lake.name for lake in query] == ["Garde", "Orta"]
 
     lake = session.query(Lake).filter_by(name="Garde").one()
-    assert session.scalar(lake.geog.ST_Intersects("LINESTRING(2 1,4 1)"))
+    assert session.scalar(lake.geog.ST_Intersects(WKT("LINESTRING(2 1,4 1)")))
 
     # Use Other Spatial Functions
     query = session.query(Lake.name, func.ST_Area(Lake.geog).label("area")).order_by(
@@ -258,8 +252,6 @@ class Lake(Base):
     ]
 
 
-# TODO(http://github.com/googleapis/google-cloud-python/issues/17287): Unskip once bug is resolved.
-@pytest.mark.skip(reason="Failing in CI with AssertionError.")
 def test_geoalchemy2_orm_w_relationship(bigquery_dataset):
     from sqlalchemy import create_engine