Merge branch 'main' into feat-dataset-view

Author: chalmerlowe

google/cloud/bigquery/external_config.py

@@ -22,6 +22,7 @@
 
 import base64
 import copy
+import typing
 from typing import Any, Dict, FrozenSet, Iterable, Optional, Union
 
 from google.cloud.bigquery._helpers import _to_bytes
@@ -835,10 +836,10 @@ def schema(self):
         See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.schema
         """
-        # TODO: The typehinting for this needs work. Setting this pragma to temporarily
-        # manage a pytype issue that came up in another PR. See Issue: #2132
-        prop = self._properties.get("schema", {})  # type: ignore
-        return [SchemaField.from_api_repr(field) for field in prop.get("fields", [])]  # type: ignore
+        prop: Dict[str, Any] = typing.cast(
+            Dict[str, Any], self._properties.get("schema", {})
+        )
+        return [SchemaField.from_api_repr(field) for field in prop.get("fields", [])]
 
     @schema.setter
     def schema(self, value):

google/cloud/bigquery/job/base.py

@@ -435,9 +435,7 @@ def __init__(self, job_id, client):
     @property
     def configuration(self) -> _JobConfig:
         """Job-type specific configurtion."""
-        # TODO: The typehinting for this needs work. Setting this pragma to temporarily
-        # manage a pytype issue that came up in another PR. See Issue: #2132
-        configuration = self._CONFIG_CLASS()  # pytype: disable=not-callable
+        configuration: _JobConfig = self._CONFIG_CLASS()  # pytype: disable=not-callable
         configuration._properties = self._properties.setdefault("configuration", {})
         return configuration
 

google/cloud/bigquery/routine/routine.py

@@ -518,23 +518,17 @@ def __init__(self):
     @property
     def project(self):
         """str: ID of the project containing the routine."""
-        # TODO: The typehinting for this needs work. Setting this pragma to temporarily
-        # manage a pytype issue that came up in another PR. See Issue: #2132
-        return self._properties["projectId"]  # pytype: disable=typed-dict-error
+        return self._properties.get("projectId", "")
 
     @property
     def dataset_id(self):
         """str: ID of dataset containing the routine."""
-        # TODO: The typehinting for this needs work. Setting this pragma to temporarily
-        # manage a pytype issue that came up in another PR. See Issue: #2132
-        return self._properties["datasetId"]  # pytype: disable=typed-dict-error
+        return self._properties.get("datasetId", "")
 
     @property
     def routine_id(self):
         """str: The routine ID."""
-        # TODO: The typehinting for this needs work. Setting this pragma to temporarily
-        # manage a pytype issue that came up in another PR. See Issue: #2132
-        return self._properties["routineId"]  # pytype: disable=typed-dict-error
+        return self._properties.get("routineId", "")
 
     @property
     def path(self):

google/cloud/bigquery/schema.py

@@ -232,11 +232,9 @@ def __init__(
         if max_length is not _DEFAULT_VALUE:
             self._properties["maxLength"] = max_length
         if policy_tags is not _DEFAULT_VALUE:
-            # TODO: The typehinting for this needs work. Setting this pragma to temporarily
-            # manage a pytype issue that came up in another PR. See Issue: #2132
             self._properties["policyTags"] = (
-                policy_tags.to_api_repr()  # pytype: disable=attribute-error
-                if policy_tags is not None
+                policy_tags.to_api_repr()
+                if isinstance(policy_tags, PolicyTagList)
                 else None
             )
         if isinstance(range_element_type, str):

google/cloud/bigquery/table.py

@@ -137,9 +137,9 @@ def _reference_getter(table):
     return TableReference(dataset_ref, table.table_id)
 
 
-# TODO: The typehinting for this needs work. Setting this pragma to temporarily
-# manage a pytype issue that came up in another PR. See Issue: #2132
-def _view_use_legacy_sql_getter(table):
+def _view_use_legacy_sql_getter(
+    table: Union["Table", "TableListItem"]
+) -> Optional[bool]:
     """bool: Specifies whether to execute the view with Legacy or Standard SQL.
 
     This boolean specifies whether to execute the view with Legacy SQL
@@ -151,15 +151,16 @@ def _view_use_legacy_sql_getter(table):
         ValueError: For invalid value types.
     """
 
-    view = table._properties.get("view")  # type: ignore
+    view: Optional[Dict[str, Any]] = table._properties.get("view")
     if view is not None:
         # The server-side default for useLegacySql is True.
-        return view.get("useLegacySql", True)  # type: ignore
+        return view.get("useLegacySql", True) if view is not None else True
     # In some cases, such as in a table list no view object is present, but the
     # resource still represents a view. Use the type as a fallback.
     if table.table_type == "VIEW":
         # The server-side default for useLegacySql is True.
         return True
+    return None  # explicit return statement to appease mypy
 
 
 class _TableBase:

samples/desktopapp/requirements.txt

@@ -1,2 +1,2 @@
-google-cloud-bigquery==3.33.0
+google-cloud-bigquery==3.34.0
 google-auth-oauthlib==1.2.2

samples/geography/requirements.txt

@@ -12,8 +12,8 @@ geojson==3.2.0
 geopandas==1.0.1
 google-api-core==2.24.2
 google-auth==2.40.2
-google-cloud-bigquery==3.33.0
-google-cloud-bigquery-storage==2.31.0
+google-cloud-bigquery==3.34.0
+google-cloud-bigquery-storage==2.32.0
 google-cloud-core==2.4.3
 google-crc32c==1.7.1
 google-resumable-media==2.7.2

samples/magics/requirements.txt

@@ -1,6 +1,6 @@
 bigquery_magics==0.10.0
 db-dtypes==1.4.3
-google.cloud.bigquery==3.33.0
-google-cloud-bigquery-storage==2.31.0
+google.cloud.bigquery==3.34.0
+google-cloud-bigquery-storage==2.32.0
 ipython===8.18.1
 pandas==2.2.3

samples/notebooks/requirements.txt

@@ -1,7 +1,7 @@
 bigquery-magics==0.10.0
 db-dtypes==1.4.3
-google-cloud-bigquery==3.33.0
-google-cloud-bigquery-storage==2.31.0
+google-cloud-bigquery==3.34.0
+google-cloud-bigquery-storage==2.32.0
 ipython===8.18.1; python_version == '3.9'
 ipython==9.2.0; python_version >= '3.10'
 matplotlib===3.9.2; python_version == '3.9'

samples/snippets/requirements.txt

@@ -1,2 +1,2 @@
 # samples/snippets should be runnable with no "extras"
-google-cloud-bigquery==3.33.0
+google-cloud-bigquery==3.34.0