Skip to content

Commit 6611c29

Browse files
committed
linters
1 parent 16f347c commit 6611c29

File tree

8 files changed

+224
-162
lines changed

8 files changed

+224
-162
lines changed

tests/topics/test_control_plane.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def test_drop_topic(self, driver_sync, topic_path):
6262

6363
def test_describe_topic(self, driver_sync, topic_path: str, topic_consumer):
6464
res = driver_sync.topic_client.describe(topic_path)
65+
res.partition_count_limit
6566

6667
assert res.self.name == os.path.basename(topic_path)
6768

ydb/_grpc/grpcwrapper/common_utils.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def to_proto(self) -> Message:
5454

5555

5656
class IFromPublic(abc.ABC):
57-
5857
@staticmethod
5958
@abc.abstractmethod
6059
def from_public(o: typing.Any) -> typing.Any:
@@ -259,12 +258,17 @@ def proto_timestamp_from_datetime(t: Optional[datetime.datetime]) -> ProtoTimeSt
259258
res.FromDatetime(t)
260259

261260

262-
def datetime_from_proto_timestamp(ts: Optional[ProtoTimeStamp]) -> Optional[datetime.datetime]:
261+
def datetime_from_proto_timestamp(
262+
ts: Optional[ProtoTimeStamp],
263+
) -> Optional[datetime.datetime]:
263264
if ts is None:
264265
return None
265266
return ts.ToDatetime()
266267

267-
def timedelta_from_proto_duration(d: Optional[ProtoDuration]) -> Optional[datetime.timedelta]:
268+
269+
def timedelta_from_proto_duration(
270+
d: Optional[ProtoDuration],
271+
) -> Optional[datetime.timedelta]:
268272
if d is None:
269273
return None
270274
return d.ToTimedelta()

ydb/_grpc/grpcwrapper/ydb_topic.py

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import enum
33
import typing
44
from dataclasses import dataclass, field
5-
from enum import IntEnum
65
from typing import List, Union, Dict, Optional
76

87
from google.protobuf.message import Message
@@ -26,7 +25,9 @@
2625
ServerStatus,
2726
UnknownGrpcMessageError,
2827
proto_duration_from_timedelta,
29-
proto_timestamp_from_datetime, datetime_from_proto_timestamp, timedelta_from_proto_duration,
28+
proto_timestamp_from_datetime,
29+
datetime_from_proto_timestamp,
30+
timedelta_from_proto_duration,
3031
)
3132

3233

@@ -686,7 +687,9 @@ class MultipleWindowsStat(IFromProto, IToPublic):
686687
per_day: int
687688

688689
@staticmethod
689-
def from_proto(msg: Optional[ydb_topic_pb2.MultipleWindowsStat]) -> Optional["MultipleWindowsStat"]:
690+
def from_proto(
691+
msg: Optional[ydb_topic_pb2.MultipleWindowsStat],
692+
) -> Optional["MultipleWindowsStat"]:
690693
if msg is None:
691694
return None
692695
return MultipleWindowsStat(
@@ -702,6 +705,7 @@ def to_public(self) -> ydb_topic_public_types.PublicMultipleWindowsStat:
702705
per_day=self.per_day,
703706
)
704707

708+
705709
@dataclass
706710
class Consumer(IToProto, IFromProto, IFromPublic, IToPublic):
707711
name: str
@@ -745,9 +749,7 @@ def from_public(consumer: ydb_topic_public_types.PublicConsumer):
745749
name=consumer.name,
746750
important=consumer.important,
747751
read_from=consumer.read_from,
748-
supported_codecs=SupportedCodecs(
749-
codecs=supported_codecs
750-
),
752+
supported_codecs=SupportedCodecs(codecs=supported_codecs),
751753
attributes=consumer.attributes,
752754
consumer_stats=None,
753755
)
@@ -769,11 +771,17 @@ class ConsumerStats(IFromProto):
769771
bytes_read: MultipleWindowsStat
770772

771773
@staticmethod
772-
def from_proto(msg: ydb_topic_pb2.Consumer.ConsumerStats) -> "Consumer.ConsumerStats":
774+
def from_proto(
775+
msg: ydb_topic_pb2.Consumer.ConsumerStats,
776+
) -> "Consumer.ConsumerStats":
773777
return Consumer.ConsumerStats(
774-
min_partitions_last_read_time=datetime_from_proto_timestamp(msg.min_partitions_last_read_time),
778+
min_partitions_last_read_time=datetime_from_proto_timestamp(
779+
msg.min_partitions_last_read_time
780+
),
775781
max_read_time_lag=timedelta_from_proto_duration(msg.max_read_time_lag),
776-
max_write_time_lag=timedelta_from_proto_duration(msg.max_write_time_lag),
782+
max_write_time_lag=timedelta_from_proto_duration(
783+
msg.max_write_time_lag
784+
),
777785
bytes_read=MultipleWindowsStat.from_proto(msg.bytes_read),
778786
)
779787

@@ -803,7 +811,9 @@ class MeteringMode(int, IFromProto, IFromPublic, IToPublic):
803811
REQUEST_UNITS = 2
804812

805813
@staticmethod
806-
def from_public(m: Optional[ydb_topic_public_types.PublicMeteringMode]) -> Optional["MeteringMode"]:
814+
def from_public(
815+
m: Optional[ydb_topic_public_types.PublicMeteringMode],
816+
) -> Optional["MeteringMode"]:
807817
if m is None:
808818
return None
809819

@@ -875,15 +885,14 @@ def from_public(req: ydb_topic_public_types.CreateTopicRequestParams):
875885
supported_codecs=SupportedCodecs(
876886
codecs=supported_codecs,
877887
),
878-
partition_write_speed_bytes_per_second = req.partition_write_speed_bytes_per_second,
888+
partition_write_speed_bytes_per_second=req.partition_write_speed_bytes_per_second,
879889
partition_write_burst_bytes=req.partition_write_burst_bytes,
880890
attributes=req.attributes,
881891
consumers=consumers,
882892
metering_mode=MeteringMode.from_public(req.metering_mode),
883893
)
884894

885895

886-
887896
@dataclass
888897
class CreateTopicResult:
889898
pass
@@ -914,8 +923,12 @@ class DescribeTopicResult(IFromProtoWithProtoType, IToPublic):
914923
def from_proto(msg: ydb_topic_pb2.DescribeTopicResult) -> "DescribeTopicResult":
915924
return DescribeTopicResult(
916925
self_proto=msg.self,
917-
partitioning_settings=PartitioningSettings.from_proto(msg.partitioning_settings),
918-
partitions=list(map(DescribeTopicResult.PartitionInfo.from_proto, msg.partitions)),
926+
partitioning_settings=PartitioningSettings.from_proto(
927+
msg.partitioning_settings
928+
),
929+
partitions=list(
930+
map(DescribeTopicResult.PartitionInfo.from_proto, msg.partitions)
931+
),
919932
retention_period=msg.retention_period,
920933
retention_storage_mb=msg.retention_storage_mb,
921934
supported_codecs=SupportedCodecs.from_proto(msg.supported_codecs),
@@ -936,7 +949,9 @@ def to_public(self) -> ydb_topic_public_types.PublicDescribeTopicResult:
936949
self=scheme._wrap_scheme_entry(self.self_proto),
937950
min_active_partitions=self.partitioning_settings.min_active_partitions,
938951
partition_count_limit=self.partitioning_settings.partition_count_limit,
939-
partitions=list(map(DescribeTopicResult.PartitionInfo.to_public, self.partitions)),
952+
partitions=list(
953+
map(DescribeTopicResult.PartitionInfo.to_public, self.partitions)
954+
),
940955
retention_period=self.retention_period,
941956
retention_storage_mb=self.retention_storage_mb,
942957
supported_codecs=self.supported_codecs.to_public(),
@@ -957,7 +972,9 @@ class PartitionInfo(IFromProto, IToPublic):
957972
partition_stats: "PartitionStats"
958973

959974
@staticmethod
960-
def from_proto(msg: Optional[ydb_topic_pb2.DescribeTopicResult.PartitionInfo]) -> Optional["DescribeTopicResult.PartitionInfo"]:
975+
def from_proto(
976+
msg: Optional[ydb_topic_pb2.DescribeTopicResult.PartitionInfo],
977+
) -> Optional["DescribeTopicResult.PartitionInfo"]:
961978
if msg is None:
962979
return None
963980

@@ -966,10 +983,12 @@ def from_proto(msg: Optional[ydb_topic_pb2.DescribeTopicResult.PartitionInfo]) -
966983
active=msg.active,
967984
child_partition_ids=list(msg.child_partition_ids),
968985
parent_partition_ids=list(msg.parent_partition_ids),
969-
partition_stats=PartitionStats.from_proto(msg.partition_stats)
986+
partition_stats=PartitionStats.from_proto(msg.partition_stats),
970987
)
971988

972-
def to_public(self) -> ydb_topic_public_types.PublicDescribeTopicResult.PartitionInfo:
989+
def to_public(
990+
self,
991+
) -> ydb_topic_public_types.PublicDescribeTopicResult.PartitionInfo:
973992
partition_stats = None
974993
if self.partition_stats is not None:
975994
partition_stats = self.partition_stats.to_public()
@@ -989,18 +1008,26 @@ class TopicStats(IFromProto, IToPublic):
9891008
bytes_written: "MultipleWindowsStat"
9901009

9911010
@staticmethod
992-
def from_proto(msg: Optional[ydb_topic_pb2.DescribeTopicResult.TopicStats]) -> Optional["DescribeTopicResult.TopicStats"]:
1011+
def from_proto(
1012+
msg: Optional[ydb_topic_pb2.DescribeTopicResult.TopicStats],
1013+
) -> Optional["DescribeTopicResult.TopicStats"]:
9931014
if msg is None:
9941015
return None
9951016

9961017
return DescribeTopicResult.TopicStats(
9971018
store_size_bytes=msg.store_size_bytes,
998-
min_last_write_time=datetime_from_proto_timestamp(msg.min_last_write_time),
999-
max_write_time_lag=timedelta_from_proto_duration(msg.max_write_time_lag),
1019+
min_last_write_time=datetime_from_proto_timestamp(
1020+
msg.min_last_write_time
1021+
),
1022+
max_write_time_lag=timedelta_from_proto_duration(
1023+
msg.max_write_time_lag
1024+
),
10001025
bytes_written=MultipleWindowsStat.from_proto(msg.bytes_written),
10011026
)
10021027

1003-
def to_public(self) -> ydb_topic_public_types.PublicDescribeTopicResult.TopicStats:
1028+
def to_public(
1029+
self,
1030+
) -> ydb_topic_public_types.PublicDescribeTopicResult.TopicStats:
10041031
return ydb_topic_public_types.PublicDescribeTopicResult.TopicStats(
10051032
store_size_bytes=self.store_size_bytes,
10061033
min_last_write_time=self.min_last_write_time,
@@ -1019,7 +1046,9 @@ class PartitionStats(IFromProto, IToPublic):
10191046
partition_node_id: int
10201047

10211048
@staticmethod
1022-
def from_proto(msg: Optional[ydb_topic_pb2.PartitionStats]) -> Optional["PartitionStats"]:
1049+
def from_proto(
1050+
msg: Optional[ydb_topic_pb2.PartitionStats],
1051+
) -> Optional["PartitionStats"]:
10231052
if msg is None:
10241053
return None
10251054
return PartitionStats(

0 commit comments

Comments
 (0)