Import typehint breakages

Author: jrmccluskey

sdks/python/apache_beam/io/gcp/bigquery.py

@@ -421,13 +421,21 @@ def chain_after(result):
 from apache_beam.utils.annotations import deprecated
 
 try:
-  from apache_beam.io.gcp.internal.clients.bigquery import DatasetReference
-  from apache_beam.io.gcp.internal.clients.bigquery import JobReference
-  from apache_beam.io.gcp.internal.clients.bigquery import TableReference
+  from google.cloud import bigquery as gcp_bigquery
+  DatasetReference = gcp_bigquery.DatasetReference
+  TableReference = gcp_bigquery.TableReference
+  JobReference = gcp_bigquery.JobReference
 except ImportError:
-  DatasetReference = None
-  TableReference = None
-  JobReference = None
+
+  class DatasetReference(object):
+    pass
+
+  class TableReference(object):
+    pass
+
+  class JobReference(object):
+    pass
+
 
 _LOGGER = logging.getLogger(__name__)
 

sdks/python/apache_beam/io/gcp/bigquery_read_internal.py

@@ -52,11 +52,17 @@
   from apache_beam.io.gcp.bigquery import ReadFromBigQueryRequest
 
 try:
-  from apache_beam.io.gcp.internal.clients.bigquery import DatasetReference
-  from apache_beam.io.gcp.internal.clients.bigquery import TableReference
+  from google.cloud import bigquery as gcp_bigquery
+  DatasetReference = gcp_bigquery.DatasetReference
+  TableReference = gcp_bigquery.TableReference
 except ImportError:
-  DatasetReference = None
-  TableReference = None
+
+  class DatasetReference(object):
+    pass
+
+  class TableReference(object):
+    pass
+
 
 _LOGGER = logging.getLogger(__name__)
 

sdks/python/apache_beam/io/gcp/bigquery_tools.py

@@ -91,9 +91,14 @@
 
 # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
 try:
-  from apache_beam.io.gcp.internal.clients.bigquery import TableReference
+  from google.cloud import bigquery as gcp_bigquery
+  TableReference = gcp_bigquery.TableReference
 except ImportError:
-  TableReference = None
+
+  class TableReference(object):
+    pass
+
+
 # pylint: enable=wrong-import-order, wrong-import-position, ungrouped-imports
 
 _LOGGER = logging.getLogger(__name__)