Skip to content

Commit 99accec

Browse files
kaxilkaxil
authored
Fix incorrect Usage of Optional[str] & Optional[int] (#11141)
From https://docs.python.org/3/library/typing.html#typing.Optional ``` Optional[X] is equivalent to Union[X, None]. ``` >Note that this is not the same concept as an optional argument, which is one that has a default. An optional argument with a default does not require the Optional qualifier on its type annotation just because it is optional. There were incorrect usages where the default was already set to a string or int value but still Optional was used
1 parent ce6b257 commit 99accec

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

β€Žairflow/providers/apache/kylin/hooks/kylin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class KylinHook(BaseHook):
3636

3737
def __init__(
3838
self,
39-
kylin_conn_id: Optional[str] = 'kylin_default',
39+
kylin_conn_id: str = 'kylin_default',
4040
project: Optional[str] = None,
4141
dsn: Optional[str] = None,
4242
):

β€Žairflow/providers/apache/kylin/operators/kylin_cube.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class KylinCubeOperator(BaseOperator):
115115
def __init__(
116116
self,
117117
*,
118-
kylin_conn_id: Optional[str] = 'kylin_default',
118+
kylin_conn_id: str = 'kylin_default',
119119
project: Optional[str] = None,
120120
cube: Optional[str] = None,
121121
dsn: Optional[str] = None,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ def list_tags(
683683
entry_group: str,
684684
entry: str,
685685
project_id: str,
686-
page_size: Optional[int] = 100,
686+
page_size: int = 100,
687687
retry: Optional[Retry] = None,
688688
timeout: Optional[float] = None,
689689
metadata: Optional[Sequence[Tuple[str, str]]] = None,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -620,21 +620,21 @@ def __init__(
620620
*,
621621
sql: Union[str, Iterable],
622622
destination_dataset_table: Optional[str] = None,
623-
write_disposition: Optional[str] = 'WRITE_EMPTY',
624-
allow_large_results: bool = False,
623+
write_disposition: str = 'WRITE_EMPTY',
624+
allow_large_results: Optional[bool] = False,
625625
flatten_results: Optional[bool] = None,
626-
gcp_conn_id: Optional[str] = 'google_cloud_default',
626+
gcp_conn_id: str = 'google_cloud_default',
627627
bigquery_conn_id: Optional[str] = None,
628628
delegate_to: Optional[str] = None,
629629
udf_config: Optional[list] = None,
630630
use_legacy_sql: bool = True,
631631
maximum_billing_tier: Optional[int] = None,
632632
maximum_bytes_billed: Optional[float] = None,
633-
create_disposition: Optional[str] = 'CREATE_IF_NEEDED',
633+
create_disposition: str = 'CREATE_IF_NEEDED',
634634
schema_update_options: Optional[Union[list, tuple, set]] = None,
635635
query_params: Optional[list] = None,
636636
labels: Optional[dict] = None,
637-
priority: Optional[str] = 'INTERACTIVE',
637+
priority: str = 'INTERACTIVE',
638638
time_partitioning: Optional[dict] = None,
639639
api_resource_configs: Optional[dict] = None,
640640
cluster_fields: Optional[List[str]] = None,
@@ -1553,7 +1553,7 @@ def __init__(
15531553
dataset_id: str,
15541554
project_id: Optional[str] = None,
15551555
max_results: Optional[int] = None,
1556-
gcp_conn_id: Optional[str] = 'google_cloud_default',
1556+
gcp_conn_id: str = 'google_cloud_default',
15571557
delegate_to: Optional[str] = None,
15581558
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
15591559
**kwargs,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1419,6 +1419,7 @@ class CloudDataCatalogListTagsOperator(BaseOperator):
14191419
:param page_size: The maximum number of resources contained in the underlying API response. If page
14201420
streaming is performed per- resource, this parameter does not affect the return value. If page
14211421
streaming is performed per-page, this determines the maximum number of resources in a page.
1422+
(Default: 100)
14221423
:type page_size: int
14231424
:param project_id: The ID of the Google Cloud project that owns the entry group.
14241425
If set to ``None`` or missing, the default project_id from the Google Cloud connection is used.
@@ -1465,7 +1466,7 @@ def __init__(
14651466
location: str,
14661467
entry_group: str,
14671468
entry: str,
1468-
page_size: Optional[int] = None,
1469+
page_size: int = 100,
14691470
project_id: Optional[str] = None,
14701471
retry: Optional[Retry] = None,
14711472
timeout: Optional[float] = None,

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def __init__(
103103
retry: Optional[str] = DEFAULT,
104104
timeout: Optional[float] = DEFAULT,
105105
metadata: Optional[str] = None,
106-
gcp_conn_id: Optional[str] = 'google_cloud_default',
106+
gcp_conn_id: str = 'google_cloud_default',
107107
project_id: Optional[str] = None,
108108
delegate_to: Optional[str] = None,
109109
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -207,7 +207,7 @@ def __init__(
207207
retry: Optional[str] = DEFAULT,
208208
timeout: Optional[float] = DEFAULT,
209209
metadata: Optional[str] = None,
210-
gcp_conn_id: Optional[str] = 'google_cloud_default',
210+
gcp_conn_id: str = 'google_cloud_default',
211211
project_id: Optional[str] = None,
212212
delegate_to: Optional[str] = None,
213213
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -298,7 +298,7 @@ def __init__(
298298
retry: Optional[str] = DEFAULT,
299299
timeout: Optional[float] = DEFAULT,
300300
metadata: Optional[str] = None,
301-
gcp_conn_id: Optional[str] = 'google_cloud_default',
301+
gcp_conn_id: str = 'google_cloud_default',
302302
project_id: Optional[str] = None,
303303
delegate_to: Optional[str] = None,
304304
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -391,7 +391,7 @@ def __init__(
391391
retry: Optional[str] = DEFAULT,
392392
timeout: Optional[float] = DEFAULT,
393393
metadata: Optional[str] = None,
394-
gcp_conn_id: Optional[str] = 'google_cloud_default',
394+
gcp_conn_id: str = 'google_cloud_default',
395395
project_id: Optional[str] = None,
396396
delegate_to: Optional[str] = None,
397397
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -480,7 +480,7 @@ def __init__(
480480
retry: Optional[str] = DEFAULT,
481481
timeout: Optional[float] = DEFAULT,
482482
metadata: Optional[str] = None,
483-
gcp_conn_id: Optional[str] = 'google_cloud_default',
483+
gcp_conn_id: str = 'google_cloud_default',
484484
project_id: Optional[str] = None,
485485
delegate_to: Optional[str] = None,
486486
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -592,7 +592,7 @@ def __init__(
592592
retry: Optional[str] = DEFAULT,
593593
timeout: Optional[float] = DEFAULT,
594594
metadata: Optional[str] = None,
595-
gcp_conn_id: Optional[str] = 'google_cloud_default',
595+
gcp_conn_id: str = 'google_cloud_default',
596596
project_id: Optional[str] = None,
597597
delegate_to: Optional[str] = None,
598598
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -696,7 +696,7 @@ def __init__(
696696
retry: Optional[str] = DEFAULT,
697697
timeout: Optional[float] = DEFAULT,
698698
metadata: Optional[str] = None,
699-
gcp_conn_id: Optional[str] = 'google_cloud_default',
699+
gcp_conn_id: str = 'google_cloud_default',
700700
project_id: Optional[str] = None,
701701
delegate_to: Optional[str] = None,
702702
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -789,7 +789,7 @@ def __init__(
789789
retry: Optional[str] = DEFAULT,
790790
timeout: Optional[float] = DEFAULT,
791791
metadata: Optional[str] = None,
792-
gcp_conn_id: Optional[str] = 'google_cloud_default',
792+
gcp_conn_id: str = 'google_cloud_default',
793793
project_id: Optional[str] = None,
794794
delegate_to: Optional[str] = None,
795795
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -884,7 +884,7 @@ def __init__(
884884
retry: Optional[str] = DEFAULT,
885885
timeout: Optional[str] = DEFAULT,
886886
metadata: Optional[str] = None,
887-
gcp_conn_id: Optional[str] = 'google_cloud_default',
887+
gcp_conn_id: str = 'google_cloud_default',
888888
project_id: Optional[str] = None,
889889
delegate_to: Optional[str] = None,
890890
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -975,7 +975,7 @@ def __init__(
975975
retry: Optional[str] = DEFAULT,
976976
timeout: Optional[float] = DEFAULT,
977977
metadata: Optional[str] = None,
978-
gcp_conn_id: Optional[str] = 'google_cloud_default',
978+
gcp_conn_id: str = 'google_cloud_default',
979979
project_id: Optional[str] = None,
980980
delegate_to: Optional[str] = None,
981981
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,

0 commit comments

Comments
 (0)