@@ -128,10 +128,11 @@ async def create_mrd(
128128 client : AsyncGrpcClient ,
129129 bucket_name : str ,
130130 object_name : str ,
131- generation_number : Optional [int ] = None ,
131+ generation : Optional [int ] = None ,
132132 read_handle : Optional [_storage_v2 .BidiReadHandle ] = None ,
133133 retry_policy : Optional [AsyncRetry ] = None ,
134134 metadata : Optional [List [Tuple [str , str ]]] = None ,
135+ ** kwargs ,
135136 ) -> AsyncMultiRangeDownloader :
136137 """Initializes a MultiRangeDownloader and opens the underlying bidi-gRPC
137138 object for reading.
@@ -145,8 +146,8 @@ async def create_mrd(
145146 :type object_name: str
146147 :param object_name: The name of the object to be read.
147148
148- :type generation_number : int
149- :param generation_number : (Optional) If present, selects a specific
149+ :type generation : int
150+ :param generation : (Optional) If present, selects a specific
150151 revision of this object.
151152
152153 :type read_handle: _storage_v2.BidiReadHandle
@@ -162,7 +163,14 @@ async def create_mrd(
162163 :rtype: :class:`~google.cloud.storage.asyncio.async_multi_range_downloader.AsyncMultiRangeDownloader`
163164 :returns: An initialized AsyncMultiRangeDownloader instance for reading.
164165 """
165- mrd = cls (client , bucket_name , object_name , generation_number , read_handle )
166+ mrd = cls (
167+ client ,
168+ bucket_name ,
169+ object_name ,
170+ generation = generation ,
171+ read_handle = read_handle ,
172+ ** kwargs ,
173+ )
166174 await mrd .open (retry_policy = retry_policy , metadata = metadata )
167175 return mrd
168176
@@ -171,8 +179,9 @@ def __init__(
171179 client : AsyncGrpcClient ,
172180 bucket_name : str ,
173181 object_name : str ,
174- generation_number : Optional [int ] = None ,
182+ generation : Optional [int ] = None ,
175183 read_handle : Optional [_storage_v2 .BidiReadHandle ] = None ,
184+ ** kwargs ,
176185 ) -> None :
177186 """Constructor for AsyncMultiRangeDownloader, clients are not adviced to
178187 use it directly. Instead it's adviced to use the classmethod `create_mrd`.
@@ -186,20 +195,27 @@ def __init__(
186195 :type object_name: str
187196 :param object_name: The name of the object to be read.
188197
189- :type generation_number : int
190- :param generation_number : (Optional) If present, selects a specific revision of
198+ :type generation : int
199+ :param generation : (Optional) If present, selects a specific revision of
191200 this object.
192201
193202 :type read_handle: _storage_v2.BidiReadHandle
194203 :param read_handle: (Optional) An existing read handle.
195204 """
205+ if "generation_number" in kwargs :
206+ if generation is not None :
207+ raise TypeError (
208+ "Cannot set both 'generation' and 'generation_number'. "
209+ "Use 'generation' for new code."
210+ )
211+ generation = kwargs .pop ("generation_number" )
196212
197213 raise_if_no_fast_crc32c ()
198214
199215 self .client = client
200216 self .bucket_name = bucket_name
201217 self .object_name = object_name
202- self .generation_number = generation_number
218+ self .generation = generation
203219 self .read_handle : Optional [_storage_v2 .BidiReadHandle ] = read_handle
204220 self .read_obj_str : Optional [_AsyncReadObjectStream ] = None
205221 self ._is_stream_open : bool = False
@@ -276,7 +292,7 @@ async def _do_open():
276292 client = self .client .grpc_client ,
277293 bucket_name = self .bucket_name ,
278294 object_name = self .object_name ,
279- generation_number = self .generation_number ,
295+ generation_number = self .generation ,
280296 read_handle = self .read_handle ,
281297 )
282298
@@ -291,7 +307,7 @@ async def _do_open():
291307 )
292308
293309 if self .read_obj_str .generation_number :
294- self .generation_number = self .read_obj_str .generation_number
310+ self .generation = self .read_obj_str .generation_number
295311 if self .read_obj_str .read_handle :
296312 self .read_handle = self .read_obj_str .read_handle
297313 if self .read_obj_str .persisted_size is not None :
@@ -435,7 +451,7 @@ async def generator():
435451 client = self .client .grpc_client ,
436452 bucket_name = self .bucket_name ,
437453 object_name = self .object_name ,
438- generation_number = self .generation_number ,
454+ generation_number = self .generation ,
439455 read_handle = current_handle ,
440456 )
441457
0 commit comments