Fix unit

Author: vgvoleg

ydb/_grpc/grpcwrapper/ydb_topic.py

@@ -980,11 +980,15 @@ def from_proto(msg: ydb_topic_pb2.PartitioningSettings) -> "PartitioningSettings
         )
 
     def to_proto(self) -> ydb_topic_pb2.PartitioningSettings:
+        auto_partitioning_settings = None
+        if self.auto_partitioning_settings is not None:
+            auto_partitioning_settings = self.auto_partitioning_settings.to_proto()
+
         return ydb_topic_pb2.PartitioningSettings(
             min_active_partitions=self.min_active_partitions,
             partition_count_limit=self.partition_count_limit,
             max_active_partitions=self.max_active_partitions,
-            auto_partitioning_settings=self.auto_partitioning_settings.to_proto(),
+            auto_partitioning_settings=auto_partitioning_settings,
         )
 
 
@@ -1041,6 +1045,9 @@ def from_public(
 
     @staticmethod
     def from_proto(msg: ydb_topic_pb2.AutoPartitioningSettings) -> AutoPartitioningSettings:
+        if msg is None:
+            return None
+
         return AutoPartitioningSettings(
             strategy=AutoPartitioningStrategy.from_proto(msg.strategy),
             partition_write_speed=AutoPartitioningWriteSpeedStrategy.from_proto(msg.partition_write_speed),
@@ -1074,7 +1081,12 @@ def to_proto(self):
         )
 
     @staticmethod
-    def from_proto(msg: ydb_topic_pb2.AutoPartitioningWriteSpeedStrategy) -> AutoPartitioningWriteSpeedStrategy:
+    def from_proto(
+        msg: Optional[ydb_topic_pb2.AutoPartitioningWriteSpeedStrategy],
+    ) -> Optional[AutoPartitioningWriteSpeedStrategy]:
+        if msg is None:
+            return None
+
         return AutoPartitioningWriteSpeedStrategy(
             stabilization_window=timedelta_from_proto_duration(msg.stabilization_window),
             up_utilization_percent=msg.up_utilization_percent,
@@ -1090,10 +1102,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,
         )
 
 
@@ -1109,12 +1126,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,
             ),
         )
 
@@ -1185,9 +1202,13 @@ class CreateTopicRequest(IToProto, IFromPublic):
     metering_mode: "MeteringMode"
 
     def to_proto(self) -> ydb_topic_pb2.CreateTopicRequest:
+        partitioning_settings = None
+        if self.partitioning_settings is not None:
+            partitioning_settings = self.partitioning_settings.to_proto()
+
         return ydb_topic_pb2.CreateTopicRequest(
             path=self.path,
-            partitioning_settings=self.partitioning_settings.to_proto(),
+            partitioning_settings=partitioning_settings,
             retention_period=proto_duration_from_timedelta(self.retention_period),
             retention_storage_mb=self.retention_storage_mb,
             supported_codecs=self.supported_codecs.to_proto(),
@@ -1295,7 +1316,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
             )
 

ydb/_grpc/grpcwrapper/ydb_topic_public_types.py

@@ -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

ydb/_grpc/grpcwrapper/ydb_topic_test.py

@@ -7,6 +7,8 @@
 from .ydb_topic_public_types import (
     AlterTopicRequestParams,
     PublicAlterConsumer,
+    PublicAlterAutoPartitioningSettings,
+    PublicAutoPartitioningStrategy,
     PublicConsumer,
     PublicCodec,
 )
@@ -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)
@@ -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]},

ydb/topic.py

@@ -111,6 +111,7 @@ async def create_topic(
         self,
         path: str,
         min_active_partitions: Optional[int] = None,
+        max_active_partitions: Optional[int] = None,
         partition_count_limit: Optional[int] = None,
         retention_period: Optional[datetime.timedelta] = None,
         retention_storage_mb: Optional[int] = None,
@@ -312,6 +313,7 @@ def create_topic(
         self,
         path: str,
         min_active_partitions: Optional[int] = None,
+        max_active_partitions: Optional[int] = None,
         partition_count_limit: Optional[int] = None,
         retention_period: Optional[datetime.timedelta] = None,
         retention_storage_mb: Optional[int] = None,