@@ -38,13 +38,7 @@ def open_data(self, data_id: str, **open_params) -> xr.Dataset:
3838 open_params = self ._convert_point_to_bbox (data_id , open_params )
3939 point = open_params .pop ("point" )
4040 time_range = open_params .pop ("time_range" )
41- self .notify (
42- GeneratorState (
43- self .identifier ,
44- message = f"Open dataset { self .identifier !r} 0%." ,
45- )
46- )
47- ds , _ = self ._open_with_split (data_id , time_range , open_params , time_range )
41+ ds = self ._open_with_split (data_id , time_range , open_params , time_range )
4842
4943 if time_series :
5044 # noinspection PyUnboundLocalVariable
@@ -70,31 +64,24 @@ def _open_with_split(
7064 time_range : tuple [str , str ],
7165 open_params : dict ,
7266 original_time_range : tuple [str , str ],
73- progress : int | None = None ,
74- ) -> tuple [xr .Dataset , int ]:
67+ ) -> xr .Dataset :
7568 """
7669 Recursively fetch data by splitting time_range into smaller ranges
7770 until store.open_data() succeeds.
7871 """
79- if progress is None :
80- progress = 0
8172 try :
8273 open_params ["time_range" ] = time_range
8374 ds = self .store .open_data (data_id , ** open_params )
84- progress += 1
85- time_diff = get_timedelta (open_params ["time_range" ]).days
86- time_diff_orig = get_timedelta (original_time_range ).days
87- nb_requests = time_diff_orig // time_diff
8875 self .notify (
8976 GeneratorState (
9077 self .identifier ,
9178 message = (
9279 f"Open dataset { self .identifier !r} "
93- f"{ progress / nb_requests * 100 :.0f } %. "
80+ f"time range: { open_params [ 'time_range' ] } "
9481 ),
9582 )
9683 )
97- return ds , progress
84+ return ds
9885
9986 except Exception :
10087 # Split the request into two halves
@@ -121,22 +108,20 @@ def _open_with_split(
121108 ),
122109 datetime .datetime .strftime (end , "%Y-%m-%d" ),
123110 )
124- left , progress = self ._open_with_split (
111+ left = self ._open_with_split (
125112 data_id ,
126113 time_range_left ,
127114 open_params ,
128115 original_time_range ,
129- progress = progress ,
130116 )
131- right , progress = self ._open_with_split (
117+ right = self ._open_with_split (
132118 data_id ,
133119 time_range_right ,
134120 open_params ,
135121 original_time_range ,
136- progress = progress ,
137122 )
138123
139- return xr .concat ((left , right ), dim = "time" ), progress
124+ return xr .concat ((left , right ), dim = "time" )
140125
141126
142127def get_timedelta (time_range : tuple [str , str ]) -> datetime .timedelta :
0 commit comments