Skip to content

Commit

Permalink
Fix unit
Browse files Browse the repository at this point in the history
  • Loading branch information
vgvoleg committed Jan 31, 2025
1 parent 4f38b65 commit c1313ff
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 17 deletions.
19 changes: 12 additions & 7 deletions ydb/_grpc/grpcwrapper/ydb_topic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1090,10 +1090,15 @@ class AlterPartitioningSettings(IToProto):
alter_auto_partitioning_settings: Optional[AlterAutoPartitioningSettings]

def to_proto(self) -> ydb_topic_pb2.AlterPartitioningSettings:
alter_auto_partitioning_settings = None
if self.alter_auto_partitioning_settings is not None:
alter_auto_partitioning_settings = self.alter_auto_partitioning_settings.to_proto()

return ydb_topic_pb2.AlterPartitioningSettings(
set_min_active_partitions=self.set_min_active_partitions,
set_partition_count_limit=self.set_partition_count_limit,
set_max_active_partitions=self.set_max_active_partitions,
alter_auto_partitioning_settings=alter_auto_partitioning_settings,
)


Expand All @@ -1109,12 +1114,12 @@ def from_public(
if not settings:
return None

return AutoPartitioningSettings(
strategy=settings.set_strategy,
partition_write_speed=AlterAutoPartitioningWriteSpeedStrategy(
stabilization_window=settings.set_stabilization_window,
up_utilization_percent=settings.set_up_utilization_percent,
down_utilization_percent=settings.set_down_utilization_percent,
return AlterAutoPartitioningSettings(
set_strategy=settings.set_strategy,
set_partition_write_speed=AlterAutoPartitioningWriteSpeedStrategy(
set_stabilization_window=settings.set_stabilization_window,
set_up_utilization_percent=settings.set_up_utilization_percent,
set_down_utilization_percent=settings.set_down_utilization_percent,
),
)

Expand Down Expand Up @@ -1295,7 +1300,7 @@ def from_public(req: ydb_topic_public_types.AlterTopicRequestParams) -> AlterTop

alter_auto_partitioning_settings = None
if req.alter_auto_partitioning_settings is not None:
alter_auto_partitioning_settings = AutoPartitioningSettings.from_public(
alter_auto_partitioning_settings = AlterAutoPartitioningSettings.from_public(
req.alter_auto_partitioning_settings
)

Expand Down
16 changes: 8 additions & 8 deletions ydb/_grpc/grpcwrapper/ydb_topic_public_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,18 @@ class PublicAutoPartitioningStrategy(IntEnum):

@dataclass
class PublicAutoPartitioningSettings:
strategy: Optional["PublicAutoPartitioningStrategy"]
stabilization_window: Optional[datetime.timedelta]
up_utilization_percent: Optional[int]
down_utilization_percent: Optional[int]
strategy: Optional["PublicAutoPartitioningStrategy"] = 0
stabilization_window: Optional[datetime.timedelta] = None
up_utilization_percent: Optional[int] = None
down_utilization_percent: Optional[int] = None


@dataclass
class PublicAlterAutoPartitioningSettings:
set_strategy: Optional["PublicAutoPartitioningStrategy"]
set_stabilization_window: Optional[datetime.timedelta]
set_up_utilization_percent: Optional[int]
set_down_utilization_percent: Optional[int]
set_strategy: Optional["PublicAutoPartitioningStrategy"] = 0
set_stabilization_window: Optional[datetime.timedelta] = None
set_up_utilization_percent: Optional[int] = None
set_down_utilization_percent: Optional[int] = None


@dataclass
Expand Down
18 changes: 16 additions & 2 deletions ydb/_grpc/grpcwrapper/ydb_topic_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
from .ydb_topic_public_types import (
AlterTopicRequestParams,
PublicAlterConsumer,
PublicAlterAutoPartitioningSettings,
PublicAutoPartitioningStrategy,
PublicConsumer,
PublicCodec,
)
Expand Down Expand Up @@ -51,7 +53,11 @@ def test_alter_topic_request_from_public_to_proto():
"alter_attributes": {"key": "value"},
"set_metering_mode": 1,
"set_min_active_partitions": 2,
"set_partition_count_limit": 4,
"set_max_active_partitions": 8,
"set_partition_count_limit": 10,
"alter_auto_partitioning_settings": PublicAlterAutoPartitioningSettings(
set_strategy=PublicAutoPartitioningStrategy.DISABLED,
),
}

params_public = AlterTopicRequestParams(**params)
Expand All @@ -62,7 +68,15 @@ def test_alter_topic_request_from_public_to_proto():

expected_dict = {
"path": "topic_name",
"alter_partitioning_settings": {"set_min_active_partitions": "2", "set_partition_count_limit": "4"},
"alter_partitioning_settings": {
"set_min_active_partitions": "2",
"set_max_active_partitions": "8",
"set_partition_count_limit": "10",
"alter_auto_partitioning_settings": {
"set_strategy": "AUTO_PARTITIONING_STRATEGY_DISABLED",
"set_partition_write_speed": {},
},
},
"set_retention_period": "2419200s",
"set_retention_storage_mb": "4",
"set_supported_codecs": {"codecs": [1, 2]},
Expand Down

0 comments on commit c1313ff

Please sign in to comment.