Skip to content

Commit d73dcda

Browse files
committed
fix review comments
1 parent badb27a commit d73dcda

File tree

1 file changed

+22
-18
lines changed

1 file changed

+22
-18
lines changed

ydb/_grpc/grpcwrapper/ydb_topic.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -886,17 +886,19 @@ def from_proto(
886886
@dataclass
887887
class AlterConsumer(IToProto, IFromPublic):
888888
name: str
889-
set_important: bool
890-
set_read_from: datetime.datetime
891-
set_supported_codecs: SupportedCodecs
892-
alter_attributes: Dict[str, str]
889+
set_important: Optional[bool]
890+
set_read_from: Optional[datetime.datetime]
891+
set_supported_codecs: Optional[SupportedCodecs]
892+
alter_attributes: Optional[Dict[str, str]]
893893

894894
def to_proto(self) -> ydb_topic_pb2.AlterConsumer:
895+
supported_codecs = self.set_supported_codecs.to_proto() if self.set_supported_codecs else None
896+
895897
return ydb_topic_pb2.AlterConsumer(
896898
name=self.name,
897899
set_important=self.set_important,
898900
set_read_from=proto_timestamp_from_datetime(self.set_read_from),
899-
set_supported_codecs=self.set_supported_codecs.to_proto(),
901+
set_supported_codecs=supported_codecs,
900902
alter_attributes=self.alter_attributes,
901903
)
902904

@@ -905,13 +907,15 @@ def from_public(alter_consumer: ydb_topic_public_types.PublicAlterConsumer) -> A
905907
if not alter_consumer:
906908
return None
907909

908-
supported_codecs = alter_consumer.set_supported_codecs if alter_consumer.set_supported_codecs else []
910+
supported_codecs = None
911+
if alter_consumer.set_supported_codecs is not None:
912+
supported_codecs = SupportedCodecs(alter_consumer.set_supported_codecs)
909913

910914
return AlterConsumer(
911915
name=alter_consumer.name,
912916
set_important=alter_consumer.set_important,
913917
set_read_from=alter_consumer.set_read_from,
914-
set_supported_codecs=SupportedCodecs(codecs=supported_codecs),
918+
set_supported_codecs=supported_codecs,
915919
alter_attributes=alter_consumer.alter_attributes,
916920
)
917921

@@ -937,8 +941,8 @@ def to_proto(self) -> ydb_topic_pb2.PartitioningSettings:
937941

938942
@dataclass
939943
class AlterPartitioningSettings(IToProto, IFromProto):
940-
set_min_active_partitions: int
941-
set_partition_count_limit: int
944+
set_min_active_partitions: Optional[int]
945+
set_partition_count_limit: Optional[int]
942946

943947
@staticmethod
944948
def from_proto(msg: ydb_topic_pb2.AlterPartitioningSettings) -> "AlterPartitioningSettings":
@@ -1053,17 +1057,17 @@ class AlterTopicRequest(IToProto, IFromPublic):
10531057
add_consumers: List["Consumer"]
10541058
alter_partitioning_settings: AlterPartitioningSettings
10551059
set_retention_period: datetime.timedelta
1056-
set_retention_storage_mb: int
1057-
set_supported_codecs: SupportedCodecs
1058-
set_partition_write_burst_bytes: typing.Optional[int]
1059-
set_partition_write_speed_bytes_per_second: typing.Optional[int]
1060+
set_retention_storage_mb: Optional[int]
1061+
set_supported_codecs: Optional[SupportedCodecs]
1062+
set_partition_write_burst_bytes: Optional[int]
1063+
set_partition_write_speed_bytes_per_second: Optional[int]
10601064
alter_attributes: Dict[str, str]
10611065
alter_consumers: List[AlterConsumer]
10621066
drop_consumers: List[str]
10631067
set_metering_mode: "MeteringMode"
10641068

10651069
def to_proto(self) -> ydb_topic_pb2.AlterTopicRequest:
1066-
supported_codecs = self.set_supported_codecs.to_proto() if self.set_supported_codecs.codecs else None
1070+
supported_codecs = self.set_supported_codecs.to_proto() if self.set_supported_codecs else None
10671071

10681072
return ydb_topic_pb2.AlterTopicRequest(
10691073
path=self.path,
@@ -1098,7 +1102,9 @@ def from_public(req: ydb_topic_public_types.AlterTopicRequestParams) -> AlterTop
10981102

10991103
drop_consumers = req.drop_consumers if req.drop_consumers else []
11001104

1101-
supported_codecs = req.set_supported_codecs if req.set_supported_codecs else []
1105+
supported_codecs = None
1106+
if req.set_supported_codecs is not None:
1107+
supported_codecs = SupportedCodecs(req.set_supported_codecs)
11021108

11031109
return AlterTopicRequest(
11041110
path=req.path,
@@ -1109,9 +1115,7 @@ def from_public(req: ydb_topic_public_types.AlterTopicRequestParams) -> AlterTop
11091115
add_consumers=add_consumers,
11101116
set_retention_period=req.set_retention_period,
11111117
set_retention_storage_mb=req.set_retention_storage_mb,
1112-
set_supported_codecs=SupportedCodecs(
1113-
codecs=supported_codecs,
1114-
),
1118+
set_supported_codecs=supported_codecs,
11151119
set_partition_write_burst_bytes=req.set_partition_write_burst_bytes,
11161120
set_partition_write_speed_bytes_per_second=req.set_partition_write_speed_bytes_per_second,
11171121
alter_attributes=req.alter_attributes,

0 commit comments

Comments
 (0)