updates from_api_repr and a number of tests and cleans up miscellaneous cruft'

Author: chalmerlowe

google/cloud/bigquery/_helpers.py

@@ -1007,35 +1007,11 @@ def _verify_job_config_type(job_config, expected_type, param_name="job_config"):
         )
 
 
-class ResourceBase:
-    """Base class providing the from_api_repr method."""
-
-    def __init__(self):
-        self._properties = {}
-
-    @classmethod
-    def from_api_repr(cls, resource: dict):
-        """Factory: constructs an instance of the class (cls)
-        given its API representation.
-
-        Args:
-            resource (Dict[str, Any]):
-                API representation of the object to be instantiated.
-
-        Returns:
-            ResourceBase: An instance of the class initialized with data
-                from 'resource'.
-        """
-        config = cls()
-        config._properties = copy.deepcopy(resource)
-        return config
-
-
 def _isinstance_or_raise(
-        value: Any,
-        dtype: Union[Type, Tuple[Type, ...]],
-        none_allowed: Optional[bool]=False,
-    ) -> Any:
+    value: Any,
+    dtype: Union[Type, Tuple[Type, ...], None],
+    none_allowed: Optional[bool] = False,
+) -> Any:
     """Determine whether a value type matches a given datatype or None.
 
     Args:
@@ -1055,10 +1031,26 @@ def _isinstance_or_raise(
 
     if isinstance(value, dtype):
         return value
-    
-    or_none = ''
+
+    or_none = ""
     if none_allowed:
-        or_none = ' (or None)'
+        or_none = " (or None)"
 
     msg = f"Pass {value} as a '{dtype}'{or_none}. Got {type(value)}."
     raise TypeError(msg)
+
+
+def _from_api_repr(obj, resource: dict):
+    """Factory: constructs an instance of the class (cls)
+    given its API representation.
+
+    Args:
+        resource (Dict[str, Any]):
+            API representation of the object to be instantiated.
+
+    Returns:
+        An instance of the class initialized with data from 'resource'.
+    """
+    config = obj
+    config._properties = copy.deepcopy(resource)
+    return config

google/cloud/bigquery/external_config.py

@@ -30,7 +30,7 @@
     _int_or_none,
     _str_or_none,
     _isinstance_or_raise,
-    ResourceBase,
+    _from_api_repr,
 )
 from google.cloud.bigquery.format_options import AvroOptions, ParquetOptions
 from google.cloud.bigquery.schema import SchemaField
@@ -1009,7 +1009,7 @@ def from_api_repr(cls, resource: dict) -> "ExternalConfig":
         return config
 
 
-class ExternalCatalogDatasetOptions(ResourceBase):
+class ExternalCatalogDatasetOptions:
     """Options defining open source compatible datasets living in the BigQuery catalog.
     Contains metadata of open source database, schema or namespace represented
     by the current dataset.
@@ -1041,7 +1041,7 @@ def default_storage_location_uri(self) -> Any:
 
     @default_storage_location_uri.setter
     def default_storage_location_uri(self, value: str):
-        value = _isinstance_or_raise(value, (str, None))
+        value = _isinstance_or_raise(value, str, none_allowed=True)
         self._properties["defaultStorageLocationUri"] = value
 
     @property
@@ -1053,7 +1053,7 @@ def parameters(self) -> Any:
 
     @parameters.setter
     def parameters(self, value: dict[str, Any]):
-        value = _isinstance_or_raise(value, (dict, None))
+        value = _isinstance_or_raise(value, dict, none_allowed=True)
         self._properties["parameters"] = value
 
     def to_api_repr(self) -> dict:
@@ -1066,8 +1066,11 @@ def to_api_repr(self) -> dict:
         config = copy.deepcopy(self._properties)
         return config
 
+    def from_api_repr(self, resource):
+        return _from_api_repr(self, resource)
 
-class ExternalCatalogTableOptions(ResourceBase):
+
+class ExternalCatalogTableOptions:
     """Metadata about open source compatible table. The fields contained in these
     options correspond to hive metastore's table level properties.
 
@@ -1109,7 +1112,7 @@ def connection_id(self):
 
     @connection_id.setter
     def connection_id(self, value: Optional[str]):
-        value = _isinstance_or_raise(value, (str, None))
+        value = _isinstance_or_raise(value, str, none_allowed=True)
         self._properties["connectionId"] = value
 
     @property
@@ -1123,7 +1126,7 @@ def parameters(self) -> Any:
 
     @parameters.setter
     def parameters(self, value: Union[Dict[str, Any], None]):
-        value = _isinstance_or_raise(value, (dict, None))
+        value = _isinstance_or_raise(value, dict, none_allowed=True)
         self._properties["parameters"] = value
 
     @property
@@ -1135,9 +1138,8 @@ def storage_descriptor(self) -> Any:
 
     @storage_descriptor.setter
     def storage_descriptor(self, value: Optional[str]):
-        value = _isinstance_or_raise(value, (str, None))
+        value = _isinstance_or_raise(value, str, none_allowed=True)
         self._properties["storageDescriptor"] = value
-   
 
     def to_api_repr(self) -> dict:
         """Build an API representation of this object.
@@ -1148,3 +1150,6 @@ def to_api_repr(self) -> dict:
         """
         config = copy.deepcopy(self._properties)
         return config
+
+    def from_api_repr(self, resource):
+        return _from_api_repr(self, resource)

google/cloud/bigquery/query.py

@@ -1003,7 +1003,6 @@ def __init__(
     ):
         self.name = name
         self.range_element_type = self._parse_range_element_type(range_element_type)
-        print(self.range_element_type.type_._type)
         self.start = start
         self.end = end