From a6a13db0eb4508a5e7519cbbb1100627cccefe9d Mon Sep 17 00:00:00 2001 From: grouazel Date: Tue, 19 Sep 2023 11:37:39 +0200 Subject: [PATCH] reduce info logs and fix slice_number which could have a wrong number of values --- sentinelrequest/__init__.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sentinelrequest/__init__.py b/sentinelrequest/__init__.py index cf50b72..496b5cd 100755 --- a/sentinelrequest/__init__.py +++ b/sentinelrequest/__init__.py @@ -552,9 +552,13 @@ def decode_date(strdate): values = [] logger.debug("Ignoring field %s (not found)." % field) if len(values) >= 1: - chunk_safes_df[field] = values - if tag in decode_tags: - chunk_safes_df[field] = chunk_safes_df[field].apply(decode_tags[tag]) + try: + chunk_safes_df[field] = values + if tag in decode_tags: + chunk_safes_df[field] = chunk_safes_df[field].apply(decode_tags[tag]) + except: + print('impossible to get field: %s because number of values is not coherent with the other fields.'%field) + try: shp_footprints = chunk_safes_df['footprint'].apply(wkt.loads) except: @@ -600,7 +604,7 @@ def _colocalize(safes, gdf, crs=scihub_crs, coloc=[geopandas_coloc.colocalize_lo # initialise an empty index for both gdf idx_safes = safes.index.delete(slice(None)) idx_gdf = gdf.index.delete(slice(None)) - logger.info('========= safes : %s',safes) + logger.debug('========= safes : %s',safes) if len(safes) == 0: # set same index as gdf, even if empty, to not throw an error on possible merge later safes.index = idx_gdf @@ -867,7 +871,7 @@ def normalize_gdf(gdf, startdate=None, stopdate=None, date=None, dtime=None, tim islice = 0 nslices = math.ceil((maxdate - mindate) / timedelta_slice) if nslices > 1: - logger.info("Slicing into %d chunks of %s ..." % (nslices, timedelta_slice)) + logger.debug("Slicing into %d chunks of %s ..." % (nslices, timedelta_slice)) while slice_end < maxdate: islice += 1 slice_end = slice_begin + timedelta_slice @@ -1092,7 +1096,7 @@ def scihubQuery(gdf=None, startdate=None, stopdate=None, date=None, dtime=None, if 'filename:S1' in str_query: # some buggy safes on scihub have stopdate < startdate : remove them safes_unfiltered = safes_unfiltered[safes_unfiltered['endposition'] - safes_unfiltered['beginposition'] > datetime.timedelta(0)] - logger.info('safes_unfiltered : %s',safes_unfiltered) + logger.debug('safes_unfiltered : %s',safes_unfiltered) safes = _colocalize(safes_unfiltered, gdf_slice, crs=crs, progress=False) elapsed_coloc = time.time() - t logger.debug("colocated with user query : %s SAFES in %.1f secs" % (len(safes), elapsed_coloc))