Skip to content

Commit b67f92d

Browse files
chore: fix implicit optionals with RUF013
Co-Authored-By: Aaron <AJ> Steers <aj@airbyte.io>
1 parent 7f7a3fe commit b67f92d

11 files changed

Lines changed: 52 additions & 54 deletions

unit_tests/sources/declarative/partition_routers/test_substream_partition_router.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ def stream_slices(
106106
self,
107107
*,
108108
sync_mode: SyncMode,
109-
cursor_field: list[str] = None,
110-
stream_state: Mapping[str, Any] = None,
109+
cursor_field: list[str] | None = None,
110+
stream_state: Mapping[str, Any] | None = None,
111111
) -> Iterable[StreamSlice | None]:
112112
for s in self._slices:
113113
if isinstance(s, StreamSlice):
@@ -118,9 +118,9 @@ def stream_slices(
118118
def read_records(
119119
self,
120120
sync_mode: SyncMode,
121-
cursor_field: list[str] = None,
122-
stream_slice: Mapping[str, Any] = None,
123-
stream_state: Mapping[str, Any] = None,
121+
cursor_field: list[str] | None = None,
122+
stream_slice: Mapping[str, Any] | None = None,
123+
stream_state: Mapping[str, Any] | None = None,
124124
) -> Iterable[Mapping[str, Any]]:
125125
# The parent stream's records should always be read as full refresh
126126
assert sync_mode == SyncMode.full_refresh
@@ -158,9 +158,9 @@ def __init__(self, slices, records, name, cursor_field="", cursor=None, date_ran
158158
def read_records(
159159
self,
160160
sync_mode: SyncMode,
161-
cursor_field: list[str] = None,
162-
stream_slice: Mapping[str, Any] = None,
163-
stream_state: Mapping[str, Any] = None,
161+
cursor_field: list[str] | None = None,
162+
stream_slice: Mapping[str, Any] | None = None,
163+
stream_state: Mapping[str, Any] | None = None,
164164
) -> Iterable[Mapping[str, Any]]:
165165
results = [
166166
record
@@ -192,9 +192,9 @@ def __init__(
192192
def read_records(
193193
self,
194194
sync_mode: SyncMode,
195-
cursor_field: list[str] = None,
196-
stream_slice: Mapping[str, Any] = None,
197-
stream_state: Mapping[str, Any] = None,
195+
cursor_field: list[str] | None = None,
196+
stream_slice: Mapping[str, Any] | None = None,
197+
stream_state: Mapping[str, Any] | None = None,
198198
) -> Iterable[Mapping[str, Any]]:
199199
page_number = self.state.get("next_page_token") or 1
200200
yield from self._record_pages[page_number - 1]

unit_tests/sources/declarative/requesters/test_http_requester.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def factory(
5656
error_handler: ErrorHandler | None = None,
5757
api_budget: HttpAPIBudget | None = None,
5858
config: Config | None = None,
59-
parameters: Mapping[str, Any] = None,
59+
parameters: Mapping[str, Any] | None = None,
6060
disable_retries: bool = False,
6161
message_repository: MessageRepository | None = None,
6262
use_cache: bool = False,

unit_tests/sources/declarative/retrievers/test_lazy_simple_retriever.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def get_records(
193193
source: ConcurrentDeclarativeSource,
194194
config: dict,
195195
catalog: ConfiguredAirbyteCatalog,
196-
state: list = None,
196+
state: list | None = None,
197197
) -> list:
198198
"""
199199
Reads records from the source given a configuration, catalog, and optional state.

unit_tests/sources/declarative/test_state_delegating_stream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def get_records(
173173
source: ConcurrentDeclarativeSource,
174174
config: dict,
175175
catalog: ConfiguredAirbyteCatalog,
176-
state: list = None,
176+
state: list | None = None,
177177
) -> list:
178178
"""
179179
Reads records from the source given a configuration, catalog, and optional state.

unit_tests/sources/fixtures/source_test_fixture.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ def primary_key(self) -> str | list[str] | list[list[str]] | None:
102102
def path(
103103
self,
104104
*,
105-
stream_state: Mapping[str, Any] = None,
106-
stream_slice: Mapping[str, Any] = None,
107-
next_page_token: Mapping[str, Any] = None,
105+
stream_state: Mapping[str, Any] | None = None,
106+
stream_slice: Mapping[str, Any] | None = None,
107+
next_page_token: Mapping[str, Any] | None = None,
108108
) -> str:
109109
return "cast"
110110

@@ -113,8 +113,8 @@ def parse_response(
113113
response: requests.Response,
114114
*,
115115
stream_state: Mapping[str, Any],
116-
stream_slice: Mapping[str, Any] = None,
117-
next_page_token: Mapping[str, Any] = None,
116+
stream_slice: Mapping[str, Any] | None = None,
117+
next_page_token: Mapping[str, Any] | None = None,
118118
) -> Iterable[Mapping]:
119119
body = response.json() or {}
120120
return body["records"]

unit_tests/sources/streams/http/test_http.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ def test_that_response_was_cached(mocker, requests_mock):
506506
class CacheHttpStreamWithSlices(CacheHttpStream):
507507
paths = ["", "search"]
508508

509-
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
509+
def path(self, stream_slice: Mapping[str, Any] | None = None, **kwargs) -> str:
510510
return f"{stream_slice['path']}" if stream_slice else ""
511511

512512
def stream_slices(self, **kwargs) -> Iterable[Mapping[str, Any] | None]:

unit_tests/sources/streams/test_stream_read.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class _MockStream(Stream):
5050
def __init__(
5151
self,
5252
slice_to_records: Mapping[str, list[Mapping[str, Any]]],
53-
json_schema: dict[str, Any] = None,
53+
json_schema: dict[str, Any] | None = None,
5454
):
5555
self._slice_to_records = slice_to_records
5656
self._mocked_json_schema = json_schema or {}

unit_tests/sources/streams/test_streams_core.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ class StreamStubFullRefresh(Stream):
3535
def read_records(
3636
self,
3737
sync_mode: SyncMode,
38-
cursor_field: list[str] = None,
39-
stream_slice: Mapping[str, Any] = None,
40-
stream_state: Mapping[str, Any] = None,
38+
cursor_field: list[str] | None = None,
39+
stream_slice: Mapping[str, Any] | None = None,
40+
stream_state: Mapping[str, Any] | None = None,
4141
) -> Iterable[Mapping[str, Any]]:
4242
pass
4343

@@ -54,9 +54,9 @@ class StreamStubIncremental(Stream, CheckpointMixin):
5454
def read_records(
5555
self,
5656
sync_mode: SyncMode,
57-
cursor_field: list[str] = None,
58-
stream_slice: Mapping[str, Any] = None,
59-
stream_state: Mapping[str, Any] = None,
57+
cursor_field: list[str] | None = None,
58+
stream_slice: Mapping[str, Any] | None = None,
59+
stream_state: Mapping[str, Any] | None = None,
6060
) -> Iterable[Mapping[str, Any]]:
6161
pass
6262

@@ -83,9 +83,9 @@ class StreamStubResumableFullRefresh(Stream, CheckpointMixin):
8383
def read_records(
8484
self,
8585
sync_mode: SyncMode,
86-
cursor_field: list[str] = None,
87-
stream_slice: Mapping[str, Any] = None,
88-
stream_state: Mapping[str, Any] = None,
86+
cursor_field: list[str] | None = None,
87+
stream_slice: Mapping[str, Any] | None = None,
88+
stream_state: Mapping[str, Any] | None = None,
8989
) -> Iterable[Mapping[str, Any]]:
9090
pass
9191

@@ -110,9 +110,9 @@ class StreamStubLegacyStateInterface(Stream):
110110
def read_records(
111111
self,
112112
sync_mode: SyncMode,
113-
cursor_field: list[str] = None,
114-
stream_slice: Mapping[str, Any] = None,
115-
stream_state: Mapping[str, Any] = None,
113+
cursor_field: list[str] | None = None,
114+
stream_slice: Mapping[str, Any] | None = None,
115+
stream_state: Mapping[str, Any] | None = None,
116116
) -> Iterable[Mapping[str, Any]]:
117117
pass
118118

@@ -134,9 +134,9 @@ class StreamStubIncrementalEmptyNamespace(Stream):
134134
def read_records(
135135
self,
136136
sync_mode: SyncMode,
137-
cursor_field: list[str] = None,
138-
stream_slice: Mapping[str, Any] = None,
139-
stream_state: Mapping[str, Any] = None,
137+
cursor_field: list[str] | None = None,
138+
stream_slice: Mapping[str, Any] | None = None,
139+
stream_state: Mapping[str, Any] | None = None,
140140
) -> Iterable[Mapping[str, Any]]:
141141
pass
142142

@@ -248,9 +248,9 @@ class ParentHttpStreamStub(HttpStream):
248248
def read_records(
249249
self,
250250
sync_mode: SyncMode,
251-
cursor_field: list[str] = None,
252-
stream_slice: Mapping[str, Any] = None,
253-
stream_state: Mapping[str, Any] = None,
251+
cursor_field: list[str] | None = None,
252+
stream_slice: Mapping[str, Any] | None = None,
253+
stream_state: Mapping[str, Any] | None = None,
254254
) -> Iterable[Mapping[str, Any]]:
255255
return [{"id": 400, "name": "a_parent_record"}]
256256

unit_tests/sources/test_abstract_source.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
class MockSource(AbstractSource):
6060
def __init__(
6161
self,
62-
check_lambda: Callable[[], tuple[bool, Any | None]] = None,
63-
streams: list[Stream] = None,
62+
check_lambda: Callable[[], tuple[bool, Any | None]] | None = None,
63+
streams: list[Stream] | None = None,
6464
message_repository: MessageRepository = None,
6565
exception_on_missing_stream: bool = True,
6666
stop_sync_on_stream_failure: bool = False,
@@ -174,10 +174,8 @@ def test_raising_check(mocker):
174174
class MockStream(Stream):
175175
def __init__(
176176
self,
177-
inputs_and_mocked_outputs: list[
178-
tuple[Mapping[str, Any], Iterable[Mapping[str, Any]]]
179-
] = None,
180-
name: str = None,
177+
inputs_and_mocked_outputs: list[tuple[Mapping[str, Any], Iterable[Mapping[str, Any]]]] | None = None,
178+
name: str | None = None,
181179
):
182180
self._inputs_and_mocked_outputs = inputs_and_mocked_outputs
183181
self._name = name
@@ -240,8 +238,8 @@ def state(self, value):
240238
class MockStreamEmittingAirbyteMessages(MockStreamWithState):
241239
def __init__(
242240
self,
243-
inputs_and_mocked_outputs: list[tuple[Mapping[str, Any], Iterable[AirbyteMessage]]] = None,
244-
name: str = None,
241+
inputs_and_mocked_outputs: list[tuple[Mapping[str, Any], Iterable[AirbyteMessage]]] | None = None,
242+
name: str | None = None,
245243
state=None,
246244
):
247245
super().__init__(inputs_and_mocked_outputs, name, state)
@@ -268,8 +266,8 @@ def state(self, value: MutableMapping[str, Any]):
268266
class MockResumableFullRefreshStream(Stream):
269267
def __init__(
270268
self,
271-
inputs_and_mocked_outputs: list[tuple[Mapping[str, Any], Mapping[str, Any]]] = None,
272-
name: str = None,
269+
inputs_and_mocked_outputs: list[tuple[Mapping[str, Any], Mapping[str, Any]]] | None = None,
270+
name: str | None = None,
273271
):
274272
self._inputs_and_mocked_outputs = inputs_and_mocked_outputs
275273
self._name = name
@@ -477,7 +475,7 @@ def _as_stream_status(stream: str, status: AirbyteStreamStatus) -> AirbyteMessag
477475
return AirbyteMessage(type=MessageType.TRACE, trace=trace_message)
478476

479477

480-
def _as_state(stream_name: str = "", per_stream_state: dict[str, Any] = None):
478+
def _as_state(stream_name: str = "", per_stream_state: dict[str, Any] | None = None):
481479
return AirbyteMessage(
482480
type=Type.STATE,
483481
state=AirbyteStateMessage(

unit_tests/sources/test_source.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def read(
3838
logger: logging.Logger,
3939
config: Mapping[str, Any],
4040
catalog: ConfiguredAirbyteCatalog,
41-
state: MutableMapping[str, Any] = None,
41+
state: MutableMapping[str, Any] | None = None,
4242
):
4343
pass
4444

0 commit comments

Comments
 (0)