Skip to content

Commit cdaa9a2

Browse files
authored
Fix MyPy errors for google.cloud.tasks (#20233)
Part of #19891
1 parent 77813b4 commit cdaa9a2

File tree

3 files changed

+37
-17
lines changed

3 files changed

+37
-17
lines changed

β€Žairflow/providers/google/cloud/hooks/tasks.py

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(
6969
delegate_to=delegate_to,
7070
impersonation_chain=impersonation_chain,
7171
)
72-
self._client = None
72+
self._client: Optional[CloudTasksClient] = None
7373

7474
def get_conn(self) -> CloudTasksClient:
7575
"""
@@ -78,7 +78,7 @@ def get_conn(self) -> CloudTasksClient:
7878
:return: Google Cloud Tasks API Client
7979
:rtype: google.cloud.tasks_v2.CloudTasksClient
8080
"""
81-
if not self._client:
81+
if self._client is None:
8282
self._client = CloudTasksClient(credentials=self._get_credentials(), client_info=self.client_info)
8383
return self._client
8484

@@ -232,7 +232,10 @@ def get_queue(
232232

233233
full_queue_name = f"projects/{project_id}/locations/{location}/queues/{queue_name}"
234234
return client.get_queue(
235-
request={'name': full_queue_name}, retry=retry, timeout=timeout, metadata=metadata or ()
235+
request={'name': full_queue_name},
236+
retry=retry,
237+
timeout=timeout,
238+
metadata=metadata or (),
236239
)
237240

238241
@GoogleBaseHook.fallback_to_default_project_id
@@ -315,7 +318,10 @@ def delete_queue(
315318

316319
full_queue_name = f"projects/{project_id}/locations/{location}/queues/{queue_name}"
317320
client.delete_queue(
318-
request={'name': full_queue_name}, retry=retry, timeout=timeout, metadata=metadata or ()
321+
request={'name': full_queue_name},
322+
retry=retry,
323+
timeout=timeout,
324+
metadata=metadata or (),
319325
)
320326

321327
@GoogleBaseHook.fallback_to_default_project_id
@@ -353,7 +359,10 @@ def purge_queue(
353359

354360
full_queue_name = f"projects/{project_id}/locations/{location}/queues/{queue_name}"
355361
return client.purge_queue(
356-
request={'name': full_queue_name}, retry=retry, timeout=timeout, metadata=metadata or ()
362+
request={'name': full_queue_name},
363+
retry=retry,
364+
timeout=timeout,
365+
metadata=metadata or (),
357366
)
358367

359368
@GoogleBaseHook.fallback_to_default_project_id
@@ -391,7 +400,10 @@ def pause_queue(
391400

392401
full_queue_name = f"projects/{project_id}/locations/{location}/queues/{queue_name}"
393402
return client.pause_queue(
394-
request={'name': full_queue_name}, retry=retry, timeout=timeout, metadata=metadata or ()
403+
request={'name': full_queue_name},
404+
retry=retry,
405+
timeout=timeout,
406+
metadata=metadata or (),
395407
)
396408

397409
@GoogleBaseHook.fallback_to_default_project_id
@@ -429,7 +441,10 @@ def resume_queue(
429441

430442
full_queue_name = f"projects/{project_id}/locations/{location}/queues/{queue_name}"
431443
return client.resume_queue(
432-
request={'name': full_queue_name}, retry=retry, timeout=timeout, metadata=metadata or ()
444+
request={'name': full_queue_name},
445+
retry=retry,
446+
timeout=timeout,
447+
metadata=metadata or (),
433448
)
434449

435450
@GoogleBaseHook.fallback_to_default_project_id
@@ -440,7 +455,7 @@ def create_task(
440455
task: Union[Dict, Task],
441456
project_id: str,
442457
task_name: Optional[str] = None,
443-
response_view: Optional = None,
458+
response_view: Optional[Task.View] = None,
444459
retry: Optional[Retry] = None,
445460
timeout: Optional[float] = None,
446461
metadata: Optional[Sequence[Tuple[str, str]]] = None,
@@ -502,7 +517,7 @@ def get_task(
502517
queue_name: str,
503518
task_name: str,
504519
project_id: str,
505-
response_view: Optional = None,
520+
response_view: Optional[Task.View] = None,
506521
retry: Optional[Retry] = None,
507522
timeout: Optional[float] = None,
508523
metadata: Optional[Sequence[Tuple[str, str]]] = None,
@@ -549,7 +564,7 @@ def list_tasks(
549564
location: str,
550565
queue_name: str,
551566
project_id: str,
552-
response_view: Optional = None,
567+
response_view: Optional[Task.View] = None,
553568
page_size: Optional[int] = None,
554569
retry: Optional[Retry] = None,
555570
timeout: Optional[float] = None,
@@ -629,7 +644,10 @@ def delete_task(
629644

630645
full_task_name = f"projects/{project_id}/locations/{location}/queues/{queue_name}/tasks/{task_name}"
631646
client.delete_task(
632-
request={'name': full_task_name}, retry=retry, timeout=timeout, metadata=metadata or ()
647+
request={'name': full_task_name},
648+
retry=retry,
649+
timeout=timeout,
650+
metadata=metadata or (),
633651
)
634652

635653
@GoogleBaseHook.fallback_to_default_project_id
@@ -639,7 +657,7 @@ def run_task(
639657
queue_name: str,
640658
task_name: str,
641659
project_id: str,
642-
response_view: Optional = None,
660+
response_view: Optional[Task.View] = None,
643661
retry: Optional[Retry] = None,
644662
timeout: Optional[float] = None,
645663
metadata: Optional[Sequence[Tuple[str, str]]] = None,

β€Žairflow/providers/google/cloud/operators/tasks.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def __init__(
206206
project_id: Optional[str] = None,
207207
location: Optional[str] = None,
208208
queue_name: Optional[str] = None,
209-
update_mask: Union[Dict, FieldMask] = None,
209+
update_mask: Optional[Union[Dict, FieldMask]] = None,
210210
retry: Optional[Retry] = None,
211211
timeout: Optional[float] = None,
212212
metadata: Optional[MetaData] = None,
@@ -828,7 +828,7 @@ def __init__(
828828
task: Union[Dict, Task],
829829
project_id: Optional[str] = None,
830830
task_name: Optional[str] = None,
831-
response_view: Optional = None,
831+
response_view: Optional[Task.View] = None,
832832
retry: Optional[Retry] = None,
833833
timeout: Optional[float] = None,
834834
metadata: Optional[MetaData] = None,
@@ -928,7 +928,7 @@ def __init__(
928928
queue_name: str,
929929
task_name: str,
930930
project_id: Optional[str] = None,
931-
response_view: Optional = None,
931+
response_view: Optional[Task.View] = None,
932932
retry: Optional[Retry] = None,
933933
timeout: Optional[float] = None,
934934
metadata: Optional[MetaData] = None,
@@ -1025,7 +1025,7 @@ def __init__(
10251025
location: str,
10261026
queue_name: str,
10271027
project_id: Optional[str] = None,
1028-
response_view: Optional = None,
1028+
response_view: Optional[Task.View] = None,
10291029
page_size: Optional[int] = None,
10301030
retry: Optional[Retry] = None,
10311031
timeout: Optional[float] = None,
@@ -1213,7 +1213,7 @@ def __init__(
12131213
queue_name: str,
12141214
task_name: str,
12151215
project_id: Optional[str] = None,
1216-
response_view: Optional = None,
1216+
response_view: Optional[Task.View] = None,
12171217
retry: Optional[Retry] = None,
12181218
timeout: Optional[float] = None,
12191219
metadata: Optional[MetaData] = None,

β€Žsetup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ pretty = True
202202

203203
[mypy-airflow.migrations.*]
204204
ignore_errors = True
205+
[mypy-google.cloud.tasks_v2.*]
206+
no_implicit_optional = False
205207

206208
[isort]
207209
line_length=110

0 commit comments

Comments
 (0)