Skip to content

Commit ed604b6

Browse files
potiukpotiuk
authored
Fix remaining MyPy errors in Google Provider (#20358)
1 parent 05e4cd1 commit ed604b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+755
-661
lines changed

‎airflow/providers/google/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# HACK:
2121
# Sphinx-autoapi doesn't like imports to excluded packages in the main module.
22-
conf = importlib.import_module('airflow.configuration').conf
22+
conf = importlib.import_module('airflow.configuration').conf # type: ignore[attr-defined]
2323

2424
PROVIDERS_GOOGLE_VERBOSE_LOGGING: bool = conf.getboolean(
2525
'providers_google', 'VERBOSE_LOGGING', fallback=False

‎airflow/providers/google/cloud/hooks/automl.py‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
)
4848
from google.protobuf.field_mask_pb2 import FieldMask
4949

50-
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
50+
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID, GoogleBaseHook
5151

5252

5353
class CloudAutoMLHook(GoogleBaseHook):
@@ -102,9 +102,9 @@ def create_model(
102102
self,
103103
model: Union[dict, Model],
104104
location: str,
105-
project_id: str,
105+
project_id: str = PROVIDE_PROJECT_ID,
106106
timeout: Optional[float] = None,
107-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
107+
metadata: Sequence[Tuple[str, str]] = (),
108108
retry: Optional[Retry] = None,
109109
) -> Operation:
110110
"""
@@ -138,7 +138,7 @@ def create_model(
138138
request={'parent': parent, 'model': model},
139139
retry=retry,
140140
timeout=timeout,
141-
metadata=metadata or (),
141+
metadata=metadata,
142142
)
143143

144144
@GoogleBaseHook.fallback_to_default_project_id
@@ -148,11 +148,11 @@ def batch_predict(
148148
input_config: Union[dict, BatchPredictInputConfig],
149149
output_config: Union[dict, BatchPredictOutputConfig],
150150
location: str,
151-
project_id: str,
151+
project_id: str = PROVIDE_PROJECT_ID,
152152
params: Optional[Dict[str, str]] = None,
153153
retry: Optional[Retry] = None,
154154
timeout: Optional[float] = None,
155-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
155+
metadata: Sequence[Tuple[str, str]] = (),
156156
) -> Operation:
157157
"""
158158
Perform a batch prediction. Unlike the online `Predict`, batch
@@ -199,7 +199,7 @@ def batch_predict(
199199
},
200200
retry=retry,
201201
timeout=timeout,
202-
metadata=metadata or (),
202+
metadata=metadata,
203203
)
204204
return result
205205

@@ -209,11 +209,11 @@ def predict(
209209
model_id: str,
210210
payload: Union[dict, ExamplePayload],
211211
location: str,
212-
project_id: str,
212+
project_id: str = PROVIDE_PROJECT_ID,
213213
params: Optional[Dict[str, str]] = None,
214214
retry: Optional[Retry] = None,
215215
timeout: Optional[float] = None,
216-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
216+
metadata: Sequence[Tuple[str, str]] = (),
217217
) -> PredictResponse:
218218
"""
219219
Perform an online prediction. The prediction result will be directly
@@ -249,7 +249,7 @@ def predict(
249249
request={'name': name, 'payload': payload, 'params': params},
250250
retry=retry,
251251
timeout=timeout,
252-
metadata=metadata or (),
252+
metadata=metadata,
253253
)
254254
return result
255255

@@ -258,10 +258,10 @@ def create_dataset(
258258
self,
259259
dataset: Union[dict, Dataset],
260260
location: str,
261-
project_id: str,
261+
project_id: str = PROVIDE_PROJECT_ID,
262262
retry: Optional[Retry] = None,
263263
timeout: Optional[float] = None,
264-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
264+
metadata: Sequence[Tuple[str, str]] = (),
265265
) -> Dataset:
266266
"""
267267
Creates a dataset.
@@ -291,7 +291,7 @@ def create_dataset(
291291
request={'parent': parent, 'dataset': dataset},
292292
retry=retry,
293293
timeout=timeout,
294-
metadata=metadata or (),
294+
metadata=metadata,
295295
)
296296
return result
297297

@@ -301,10 +301,10 @@ def import_data(
301301
dataset_id: str,
302302
location: str,
303303
input_config: Union[dict, InputConfig],
304-
project_id: str,
304+
project_id: str = PROVIDE_PROJECT_ID,
305305
retry: Optional[Retry] = None,
306306
timeout: Optional[float] = None,
307-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
307+
metadata: Sequence[Tuple[str, str]] = (),
308308
) -> Operation:
309309
"""
310310
Imports data into a dataset. For Tables this method can only be called on an empty Dataset.
@@ -336,7 +336,7 @@ def import_data(
336336
request={'name': name, 'input_config': input_config},
337337
retry=retry,
338338
timeout=timeout,
339-
metadata=metadata or (),
339+
metadata=metadata,
340340
)
341341
return result
342342

@@ -346,13 +346,13 @@ def list_column_specs(
346346
dataset_id: str,
347347
table_spec_id: str,
348348
location: str,
349-
project_id: str,
349+
project_id: str = PROVIDE_PROJECT_ID,
350350
field_mask: Optional[Union[dict, FieldMask]] = None,
351351
filter_: Optional[str] = None,
352352
page_size: Optional[int] = None,
353353
retry: Optional[Retry] = None,
354354
timeout: Optional[float] = None,
355-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
355+
metadata: Sequence[Tuple[str, str]] = (),
356356
) -> ListColumnSpecsPager:
357357
"""
358358
Lists column specs in a table spec.
@@ -399,7 +399,7 @@ def list_column_specs(
399399
request={'parent': parent, 'field_mask': field_mask, 'filter': filter_, 'page_size': page_size},
400400
retry=retry,
401401
timeout=timeout,
402-
metadata=metadata or (),
402+
metadata=metadata,
403403
)
404404
return result
405405

@@ -408,10 +408,10 @@ def get_model(
408408
self,
409409
model_id: str,
410410
location: str,
411-
project_id: str,
411+
project_id: str = PROVIDE_PROJECT_ID,
412412
retry: Optional[Retry] = None,
413413
timeout: Optional[float] = None,
414-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
414+
metadata: Sequence[Tuple[str, str]] = (),
415415
) -> Model:
416416
"""
417417
Gets a AutoML model.
@@ -440,7 +440,7 @@ def get_model(
440440
request={'name': name},
441441
retry=retry,
442442
timeout=timeout,
443-
metadata=metadata or (),
443+
metadata=metadata,
444444
)
445445
return result
446446

@@ -449,10 +449,10 @@ def delete_model(
449449
self,
450450
model_id: str,
451451
location: str,
452-
project_id: str,
452+
project_id: str = PROVIDE_PROJECT_ID,
453453
retry: Optional[Retry] = None,
454454
timeout: Optional[float] = None,
455-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
455+
metadata: Sequence[Tuple[str, str]] = (),
456456
) -> Model:
457457
"""
458458
Deletes a AutoML model.
@@ -481,7 +481,7 @@ def delete_model(
481481
request={'name': name},
482482
retry=retry,
483483
timeout=timeout,
484-
metadata=metadata or (),
484+
metadata=metadata,
485485
)
486486
return result
487487

@@ -491,7 +491,7 @@ def update_dataset(
491491
update_mask: Optional[Union[dict, FieldMask]] = None,
492492
retry: Optional[Retry] = None,
493493
timeout: Optional[float] = None,
494-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
494+
metadata: Sequence[Tuple[str, str]] = (),
495495
) -> Dataset:
496496
"""
497497
Updates a dataset.
@@ -518,7 +518,7 @@ def update_dataset(
518518
request={'dataset': dataset, 'update_mask': update_mask},
519519
retry=retry,
520520
timeout=timeout,
521-
metadata=metadata or (),
521+
metadata=metadata,
522522
)
523523
return result
524524

@@ -527,11 +527,11 @@ def deploy_model(
527527
self,
528528
model_id: str,
529529
location: str,
530-
project_id: str,
530+
project_id: str = PROVIDE_PROJECT_ID,
531531
image_detection_metadata: Optional[Union[ImageObjectDetectionModelDeploymentMetadata, dict]] = None,
532532
retry: Optional[Retry] = None,
533533
timeout: Optional[float] = None,
534-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
534+
metadata: Sequence[Tuple[str, str]] = (),
535535
) -> Operation:
536536
"""
537537
Deploys a model. If a model is already deployed, deploying it with the same parameters
@@ -572,7 +572,7 @@ def deploy_model(
572572
},
573573
retry=retry,
574574
timeout=timeout,
575-
metadata=metadata or (),
575+
metadata=metadata,
576576
)
577577
return result
578578

@@ -585,7 +585,7 @@ def list_table_specs(
585585
page_size: Optional[int] = None,
586586
retry: Optional[Retry] = None,
587587
timeout: Optional[float] = None,
588-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
588+
metadata: Sequence[Tuple[str, str]] = (),
589589
) -> ListTableSpecsPager:
590590
"""
591591
Lists table specs in a dataset_id.
@@ -625,7 +625,7 @@ def list_table_specs(
625625
request={'parent': parent, 'filter': filter_, 'page_size': page_size},
626626
retry=retry,
627627
timeout=timeout,
628-
metadata=metadata or (),
628+
metadata=metadata,
629629
)
630630
return result
631631

@@ -636,7 +636,7 @@ def list_datasets(
636636
project_id: str,
637637
retry: Optional[Retry] = None,
638638
timeout: Optional[float] = None,
639-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
639+
metadata: Sequence[Tuple[str, str]] = (),
640640
) -> ListDatasetsPager:
641641
"""
642642
Lists datasets in a project.
@@ -666,7 +666,7 @@ def list_datasets(
666666
request={'parent': parent},
667667
retry=retry,
668668
timeout=timeout,
669-
metadata=metadata or (),
669+
metadata=metadata,
670670
)
671671
return result
672672

@@ -678,7 +678,7 @@ def delete_dataset(
678678
project_id: str,
679679
retry: Optional[Retry] = None,
680680
timeout: Optional[float] = None,
681-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
681+
metadata: Sequence[Tuple[str, str]] = (),
682682
) -> Operation:
683683
"""
684684
Deletes a dataset and all of its contents.
@@ -707,6 +707,6 @@ def delete_dataset(
707707
request={'name': name},
708708
retry=retry,
709709
timeout=timeout,
710-
metadata=metadata or (),
710+
metadata=metadata,
711711
)
712712
return result

‎airflow/providers/google/cloud/hooks/bigquery_dts.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
)
3030
from googleapiclient.discovery import Resource
3131

32-
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
32+
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID, GoogleBaseHook
3333

3434

3535
def get_object_id(obj: dict) -> str:
@@ -104,11 +104,11 @@ def get_conn(self) -> DataTransferServiceClient:
104104
def create_transfer_config(
105105
self,
106106
transfer_config: Union[dict, TransferConfig],
107-
project_id: str,
107+
project_id: str = PROVIDE_PROJECT_ID,
108108
authorization_code: Optional[str] = None,
109109
retry: Optional[Retry] = None,
110110
timeout: Optional[float] = None,
111-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
111+
metadata: Sequence[Tuple[str, str]] = (),
112112
) -> TransferConfig:
113113
"""
114114
Creates a new data transfer configuration.
@@ -146,17 +146,17 @@ def create_transfer_config(
146146
},
147147
retry=retry,
148148
timeout=timeout,
149-
metadata=metadata or (),
149+
metadata=metadata,
150150
)
151151

152152
@GoogleBaseHook.fallback_to_default_project_id
153153
def delete_transfer_config(
154154
self,
155155
transfer_config_id: str,
156-
project_id: str,
156+
project_id: str = PROVIDE_PROJECT_ID,
157157
retry: Optional[Retry] = None,
158158
timeout: Optional[float] = None,
159-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
159+
metadata: Sequence[Tuple[str, str]] = (),
160160
) -> None:
161161
"""
162162
Deletes transfer configuration.
@@ -192,12 +192,12 @@ def delete_transfer_config(
192192
def start_manual_transfer_runs(
193193
self,
194194
transfer_config_id: str,
195-
project_id: str,
195+
project_id: str = PROVIDE_PROJECT_ID,
196196
requested_time_range: Optional[dict] = None,
197197
requested_run_time: Optional[dict] = None,
198198
retry: Optional[Retry] = None,
199199
timeout: Optional[float] = None,
200-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
200+
metadata: Sequence[Tuple[str, str]] = (),
201201
) -> StartManualTransferRunsResponse:
202202
"""
203203
Start manual transfer runs to be executed now with schedule_time equal
@@ -245,18 +245,18 @@ def start_manual_transfer_runs(
245245
},
246246
retry=retry,
247247
timeout=timeout,
248-
metadata=metadata or (),
248+
metadata=metadata,
249249
)
250250

251251
@GoogleBaseHook.fallback_to_default_project_id
252252
def get_transfer_run(
253253
self,
254254
run_id: str,
255255
transfer_config_id: str,
256-
project_id: str,
256+
project_id: str = PROVIDE_PROJECT_ID,
257257
retry: Optional[Retry] = None,
258258
timeout: Optional[float] = None,
259-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
259+
metadata: Sequence[Tuple[str, str]] = (),
260260
) -> TransferRun:
261261
"""
262262
Returns information about the particular transfer run.

0 commit comments

Comments
 (0)