Skip to content

Commit a142e80

Browse files
authored
Merge pull request #213 from ydb-platform/black-up-line-length
use line-length=120 for better code readability
2 parents df3a7fa + ba6c081 commit a142e80

File tree

83 files changed

+513
-1608
lines changed

Some content is hidden

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

83 files changed

+513
-1608
lines changed

Diff for: examples/_sqlalchemy_example/example.py

+5-9
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ def simple_select(conn):
2424

2525

2626
def simple_insert(conn):
27-
stm = Episodes.__table__.insert().values(
28-
series_id=3, season_id=6, episode_id=1, title="TBD"
29-
)
27+
stm = Episodes.__table__.insert().values(series_id=3, season_id=6, episode_id=1, title="TBD")
3028
conn.execute(stm)
3129

3230

@@ -51,9 +49,7 @@ def test_types(conn):
5149
conn.execute(stm)
5250

5351
# GROUP BY
54-
stm = sa.select(types_tb.c.str, sa.func.max(types_tb.c.num)).group_by(
55-
types_tb.c.str
56-
)
52+
stm = sa.select(types_tb.c.str, sa.func.max(types_tb.c.num)).group_by(types_tb.c.str)
5753
rs = conn.execute(stm)
5854
for x in rs:
5955
print(x)
@@ -171,9 +167,9 @@ def run_example_core(engine):
171167
simple_insert(conn)
172168

173169
# simple join
174-
stm = sa.select(
175-
[Episodes.__table__.join(Series, Episodes.series_id == Series.series_id)]
176-
).where(sa.and_(Series.series_id == 1, Episodes.season_id == 1))
170+
stm = sa.select([Episodes.__table__.join(Series, Episodes.series_id == Series.series_id)]).where(
171+
sa.and_(Series.series_id == 1, Episodes.season_id == 1)
172+
)
177173
rs = conn.execute(stm)
178174
for row in rs:
179175
print(f"{row.series_title}({row.episode_id}): {row.title}")

Diff for: examples/access-token-credentials/main.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ def main():
2424
driver = ydb.Driver(
2525
endpoint=os.getenv("YDB_ENDPOINT"),
2626
database=os.getenv("YDB_DATABASE"),
27-
credentials=ydb.AccessTokenCredentials(
28-
os.getenv("YDB_ACCESS_TOKEN_CREDENTIALS")
29-
),
27+
credentials=ydb.AccessTokenCredentials(os.getenv("YDB_ACCESS_TOKEN_CREDENTIALS")),
3028
)
3129

3230
# Start driver context manager.

Diff for: examples/aio/driver_example.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
async def describe_database():
77
endpoint = os.getenv("YDB_ENDPOINT")
88
database = os.getenv("YDB_DATABASE")
9-
driver = ydb.aio.Driver(
10-
endpoint=endpoint, database=database
11-
) # Creating new database driver to execute queries
9+
driver = ydb.aio.Driver(endpoint=endpoint, database=database) # Creating new database driver to execute queries
1210

1311
await driver.wait(timeout=10) # Wait until driver can execute calls
1412

Diff for: examples/asyncio/main.py

+4-12
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,23 @@ async def execute_query(pool):
1010
with pool.async_checkout() as session_holder:
1111
try:
1212
# wait for the session checkout to complete.
13-
session = await asyncio.wait_for(
14-
asyncio.wrap_future(session_holder), timeout=5
15-
)
13+
session = await asyncio.wait_for(asyncio.wrap_future(session_holder), timeout=5)
1614
except asyncio.TimeoutError:
1715
raise ydb.SessionPoolEmpty()
1816

1917
return await asyncio.wrap_future(
2018
session.transaction().async_execute(
2119
"select 1 as cnt;",
2220
commit_tx=True,
23-
settings=ydb.BaseRequestSettings()
24-
.with_timeout(3)
25-
.with_operation_timeout(2),
21+
settings=ydb.BaseRequestSettings().with_timeout(3).with_operation_timeout(2),
2622
)
2723
)
2824

2925

3026
async def main():
31-
with ydb.Driver(
32-
endpoint=os.getenv("YDB_ENDPOINT"), database=os.getenv("YDB_DATABASE")
33-
) as driver:
27+
with ydb.Driver(endpoint=os.getenv("YDB_ENDPOINT"), database=os.getenv("YDB_DATABASE")) as driver:
3428
# Wait for the driver to become active for requests.
35-
await asyncio.wait_for(
36-
asyncio.wrap_future(driver.async_wait(fail_fast=True)), timeout=5
37-
)
29+
await asyncio.wait_for(asyncio.wrap_future(driver.async_wait(fail_fast=True)), timeout=5)
3830

3931
# Create the session pool instance to manage YDB session.
4032
session_pool = ydb.SessionPool(driver)

Diff for: examples/basic_example_v1/__main__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
formatter_class=argparse.RawDescriptionHelpFormatter,
1010
description="""\033[92mYandex.Database examples binary.\x1b[0m\n""",
1111
)
12-
parser.add_argument(
13-
"-d", "--database", required=True, help="Name of the database to use"
14-
)
12+
parser.add_argument("-d", "--database", required=True, help="Name of the database to use")
1513
parser.add_argument("-e", "--endpoint", required=True, help="Endpoint url to use")
1614
parser.add_argument("-p", "--path", default="")
1715
parser.add_argument("-v", "--verbose", default=False, action="store_true")

Diff for: examples/cloud-function-trivial-example/index.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
import ydb
33

44
# create driver in global space.
5-
driver = ydb.Driver(
6-
endpoint=os.getenv("YDB_ENDPOINT"), database=os.getenv("YDB_DATABASE")
7-
)
5+
driver = ydb.Driver(endpoint=os.getenv("YDB_ENDPOINT"), database=os.getenv("YDB_DATABASE"))
86
# Wait for the driver to become active for requests.
97
driver.wait(fail_fast=True, timeout=5)
108
# Create the session pool instance to manage YDB sessions.

Diff for: examples/pagination/__main__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
formatter_class=argparse.RawDescriptionHelpFormatter,
1010
description="""\033[92mYandex.Database example pagination.\x1b[0m\n""",
1111
)
12-
parser.add_argument(
13-
"-d", "--database", required=True, help="Name of the database to use"
14-
)
12+
parser.add_argument("-d", "--database", required=True, help="Name of the database to use")
1513
parser.add_argument("-e", "--endpoint", required=True, help="Endpoint url to use")
1614
parser.add_argument("-p", "--path", default="", help="Base path for tables")
1715

Diff for: examples/reservations-bot-demo/cloud_function/controller.py

+5-16
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@ class Controller(object):
1616
def __init__(self, storage: Storage):
1717
self._storage = storage
1818

19-
def _find_available_table_id(
20-
self, request: ReservationCreateRequest
21-
) -> typing.Optional[int]:
19+
def _find_available_table_id(self, request: ReservationCreateRequest) -> typing.Optional[int]:
2220
table_ids = set(self._storage.list_table_ids(cnt=request.cnt))
23-
reserved_table_ids = set(
24-
self._storage.find_reserved_table_ids(cnt=request.cnt, dt=request.dt)
25-
)
21+
reserved_table_ids = set(self._storage.find_reserved_table_ids(cnt=request.cnt, dt=request.dt))
2622
for table_id in table_ids.difference(reserved_table_ids):
2723
return table_id
2824

29-
def maybe_create_reservation(
30-
self, request: ReservationCreateRequest
31-
) -> ReservationCreateResponse:
25+
def maybe_create_reservation(self, request: ReservationCreateRequest) -> ReservationCreateResponse:
3226
table_id = self._find_available_table_id(request)
3327
if table_id is None:
3428
logging.warning("reservation failed")
@@ -47,16 +41,11 @@ def maybe_create_reservation(
4741
logging.warning(f"failed to reserve a table due to {repr(e)}")
4842
return ReservationCreateResponse(success=False)
4943

50-
def maybe_cancel_reservation(
51-
self, request: ReservationCancelRequest
52-
) -> ReservationCancelResponse:
44+
def maybe_cancel_reservation(self, request: ReservationCancelRequest) -> ReservationCancelResponse:
5345
try:
5446
self._storage.delete_reservation(phone=request.phone, dt=request.dt)
5547
logging.warning(f"reservation {request.phone} {request.dt} cancelled")
5648
return ReservationCancelResponse(success=True)
5749
except Exception as e:
58-
logging.warning(
59-
f"failed to cancel reservation for {request.phone} "
60-
f"{request.dt} due to {repr(e)}"
61-
)
50+
logging.warning(f"failed to cancel reservation for {request.phone} " f"{request.dt} due to {repr(e)}")
6251
return ReservationCancelResponse(success=False)

Diff for: examples/reservations-bot-demo/cloud_function/storage.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ def transaction(session):
2626
tables = session_pool.retry_operation_sync(transaction)
2727
return list(map(lambda x: getattr(x, "table_id"), tables))
2828

29-
def find_reserved_table_ids(
30-
self, *, cnt: int, dt: datetime.datetime
31-
) -> typing.List[int]:
29+
def find_reserved_table_ids(self, *, cnt: int, dt: datetime.datetime) -> typing.List[int]:
3230
query = f"""PRAGMA TablePathPrefix("{self._database}");
3331
DECLARE $dt AS DateTime;
3432
DECLARE $reservation_period_minutes AS Int32;

Diff for: examples/reservations-bot-demo/cloud_function/utils.py

+3-8
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,17 @@ def make_driver_config(endpoint, database, path):
1313

1414

1515
@contextlib.contextmanager
16-
def session_pool_context(
17-
driver_config: ydb.DriverConfig, size=1, workers_threads_count=1
18-
):
16+
def session_pool_context(driver_config: ydb.DriverConfig, size=1, workers_threads_count=1):
1917
with ydb.Driver(driver_config) as driver:
2018
try:
2119
logging.info("connecting to the database")
2220
driver.wait(timeout=15)
2321
except TimeoutError:
2422
logging.critical(
25-
f"connection failed\n"
26-
f"last reported errors by discovery: {driver.discovery_debug_details()}"
23+
f"connection failed\n" f"last reported errors by discovery: {driver.discovery_debug_details()}"
2724
)
2825
raise
29-
with ydb.SessionPool(
30-
driver, size=size, workers_threads_count=workers_threads_count
31-
) as session_pool:
26+
with ydb.SessionPool(driver, size=size, workers_threads_count=workers_threads_count) as session_pool:
3227
try:
3328
yield session_pool
3429
except Exception as e:

Diff for: examples/secondary_indexes_builtin/__main__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
formatter_class=argparse.RawDescriptionHelpFormatter,
1414
description="""\033[92mYandex.Database examples binary.\x1b[0m\n""",
1515
)
16-
parser.add_argument(
17-
"-d", "--database", required=True, help="Name of the database to use"
18-
)
16+
parser.add_argument("-d", "--database", required=True, help="Name of the database to use")
1917
parser.add_argument("-e", "--endpoint", required=True, help="Endpoint url to use")
2018
parser.add_argument("-p", "--path", default="")
2119
parser.add_argument("-v", "--verbose", default=False, action="store_true")

Diff for: examples/secondary_indexes_builtin/secondary_indexes_builtin.py

+6-18
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ class Series(object):
7373
def __init__(self, series_id, title, release_date, info, views, uploaded_user_id):
7474
self.series_id = series_id
7575
self.title = title
76-
self.release_date = (
77-
to_days(release_date) if isinstance(release_date, str) else release_date
78-
)
76+
self.release_date = to_days(release_date) if isinstance(release_date, str) else release_date
7977
self.info = info
8078
self.views = views
8179
self.uploaded_user_id = uploaded_user_id
@@ -138,17 +136,11 @@ def callee(session):
138136
ydb.Column("series_id", ydb.OptionalType(ydb.PrimitiveType.Uint64)),
139137
ydb.Column("title", ydb.OptionalType(ydb.PrimitiveType.Utf8)),
140138
ydb.Column("info", ydb.OptionalType(ydb.PrimitiveType.Utf8)),
141-
ydb.Column(
142-
"release_date", ydb.OptionalType(ydb.PrimitiveType.Datetime)
143-
),
139+
ydb.Column("release_date", ydb.OptionalType(ydb.PrimitiveType.Datetime)),
144140
ydb.Column("views", ydb.OptionalType(ydb.PrimitiveType.Uint64)),
145-
ydb.Column(
146-
"uploaded_user_id", ydb.OptionalType(ydb.PrimitiveType.Uint64)
147-
),
141+
ydb.Column("uploaded_user_id", ydb.OptionalType(ydb.PrimitiveType.Uint64)),
148142
)
149-
.with_indexes(
150-
ydb.TableIndex("users_index").with_index_columns("uploaded_user_id")
151-
),
143+
.with_indexes(ydb.TableIndex("users_index").with_index_columns("uploaded_user_id")),
152144
)
153145

154146
session.create_table(
@@ -188,9 +180,7 @@ def get_series_data():
188180
),
189181
Series(5, "Fifth episode", "2006-05-01", "Cercei is not good person.", 5000, 1),
190182
Series(6, "Sixth episode", "2006-06-01", "Tyrion is not big.", 6000, 2),
191-
Series(
192-
7, "Seventh episode", "2006-07-01", "Tywin should close the door.", 7000, 2
193-
),
183+
Series(7, "Seventh episode", "2006-07-01", "Tywin should close the door.", 7000, 2),
194184
Series(
195185
8,
196186
"Eighth episode",
@@ -244,9 +234,7 @@ def callee(session):
244234

245235

246236
def run(endpoint, database, path):
247-
driver_config = ydb.DriverConfig(
248-
endpoint, database, credentials=ydb.credentials_from_env_variables()
249-
)
237+
driver_config = ydb.DriverConfig(endpoint, database, credentials=ydb.credentials_from_env_variables())
250238
with ydb.Driver(driver_config) as driver:
251239
try:
252240
driver.wait(timeout=5)

Diff for: examples/time-series-serverless/response.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ class Response:
99
body = {}
1010

1111
def as_dict(self):
12-
return dict(
13-
status=self.status, headers=self.headers, body=json.dumps(self.body)
14-
)
12+
return dict(status=self.status, headers=self.headers, body=json.dumps(self.body))
1513

1614

1715
class Ok(Response):

Diff for: examples/topic/reader_async_example.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ async def connect():
1414

1515

1616
async def create_reader_and_close_with_context_manager(db: ydb.aio.Driver):
17-
async with db.topic_client.reader(
18-
"/database/topic/path", consumer="consumer"
19-
) as reader: # noqa
17+
async with db.topic_client.reader("/database/topic/path", consumer="consumer") as reader: # noqa
2018
...
2119

2220

Diff for: examples/topic/reader_example.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ def connect():
1313

1414

1515
def create_reader_and_close_with_context_manager(db: ydb.Driver):
16-
with db.topic_client.reader(
17-
"/database/topic/path", consumer="consumer", buffer_size_bytes=123
18-
) as reader:
16+
with db.topic_client.reader("/database/topic/path", consumer="consumer", buffer_size_bytes=123) as reader:
1917
while True:
2018
message = reader.receive_message() # noqa
2119
pass

Diff for: examples/topic/writer_async_example.py

+3-9
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,10 @@ async def send_messages(writer: ydb.TopicWriterAsyncIO):
4848
) # send few messages by one call
4949

5050
# with meta
51-
await writer.write(
52-
ydb.TopicWriterMessage("asd", seqno=123, created_at=datetime.datetime.now())
53-
)
51+
await writer.write(ydb.TopicWriterMessage("asd", seqno=123, created_at=datetime.datetime.now()))
5452

5553

56-
async def send_message_without_block_if_internal_buffer_is_full(
57-
writer: ydb.TopicWriterAsyncIO, msg
58-
) -> bool:
54+
async def send_message_without_block_if_internal_buffer_is_full(writer: ydb.TopicWriterAsyncIO, msg) -> bool:
5955
try:
6056
# put message to internal queue for send, but if buffer is full - fast return
6157
# without wait
@@ -99,9 +95,7 @@ async def send_messages_and_wait_all_commit_with_results(
9995
await writer.flush()
10096

10197

102-
async def switch_messages_with_many_producers(
103-
writers: Dict[str, ydb.TopicWriterAsyncIO], messages: List[str]
104-
):
98+
async def switch_messages_with_many_producers(writers: Dict[str, ydb.TopicWriterAsyncIO], messages: List[str]):
10599
futures = [] # type: List[asyncio.Future]
106100

107101
for msg in messages:

Diff for: examples/topic/writer_example.py

+4-12
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,13 @@ def send_messages(writer: ydb.TopicWriter):
5555
# full forms
5656
writer.write(ydb.TopicWriterMessage("mess")) # send text
5757
writer.write(ydb.TopicWriterMessage(bytes([1, 2, 3]))) # send bytes
58-
writer.write(
59-
[ydb.TopicWriterMessage("mess-1"), ydb.TopicWriterMessage("mess-2")]
60-
) # send few messages by one call
58+
writer.write([ydb.TopicWriterMessage("mess-1"), ydb.TopicWriterMessage("mess-2")]) # send few messages by one call
6159

6260
# with meta
63-
writer.write(
64-
ydb.TopicWriterMessage("asd", seqno=123, created_at=datetime.datetime.now())
65-
)
61+
writer.write(ydb.TopicWriterMessage("asd", seqno=123, created_at=datetime.datetime.now()))
6662

6763

68-
def send_message_without_block_if_internal_buffer_is_full(
69-
writer: ydb.TopicWriter, msg
70-
) -> bool:
64+
def send_message_without_block_if_internal_buffer_is_full(writer: ydb.TopicWriter, msg) -> bool:
7165
try:
7266
# put message to internal queue for send, but if buffer is full - fast return
7367
# without wait
@@ -123,9 +117,7 @@ def send_messages_and_wait_all_commit_with_results(writer: ydb.TopicWriter):
123117
raise future.exception()
124118

125119

126-
def switch_messages_with_many_producers(
127-
writers: Dict[str, ydb.TopicWriter], messages: List[str]
128-
):
120+
def switch_messages_with_many_producers(writers: Dict[str, ydb.TopicWriter], messages: List[str]):
129121
futures = [] # type: List[Future]
130122

131123
for msg in messages:

Diff for: examples/ttl/__main__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
formatter_class=argparse.RawDescriptionHelpFormatter,
99
description="""\033[92mYandex.Database examples binary.\x1b[0m\n""",
1010
)
11-
parser.add_argument(
12-
"-d", "--database", required=True, help="Name of the database to use"
13-
)
11+
parser.add_argument("-d", "--database", required=True, help="Name of the database to use")
1412
parser.add_argument("-e", "--endpoint", required=True, help="Endpoint url to use")
1513
parser.add_argument("-p", "--path", default="")
1614

0 commit comments

Comments
 (0)