Update pages/v4.py

pages/v4.py

@@ -48,24 +48,8 @@ def upload_to_s3(file_path, bucket_name, object_name):
 # Liste des dates disponibles
 AVAILABLE_DATES = [
     18641231, 18701231, 18801231, 18901231, 18941231, 18951231, 18961231,
-    18971231, 18981231, 18991231, 19001231, 19011231, 19021231, 19031231,
-    19041231, 19051231, 19061231, 19071231, 19081231, 19091231, 19101231,
-    19111231, 19121231, 19131231, 19141231, 19151231, 19161231, 19171231,
-    19181231, 19191231, 19201231, 19211231, 19221231, 19231231, 19241231,
-    19251231, 19261231, 19271231, 19281231, 19291231, 19301231, 19311231,
-    19321231, 19331231, 19341231, 19351231, 19361231, 19371231, 19381231,
-    19391231, 19401231, 19411231, 19421231, 19431231, 19441231, 19451231,
-    19461231, 19471231, 19481231, 19491231, 19501231, 19511231, 19521231,
-    19531231, 19541231, 19551231, 19561231, 19571231, 19581231, 19591231,
-    19601231, 19611231, 19621231, 19631231, 19641231, 19651231, 19661231,
-    19671231, 19681231, 19691231, 19701231, 19711231, 19721231, 19731231,
-    19741231, 19751231, 19761231, 19771231, 19781231, 19791231, 19801231,
-    19811231, 19821231, 19831231, 19841231, 19851231, 19861231, 19871231,
-    19881231, 19891231, 19901231, 19911231, 19921231, 19931231, 19941231,
-    19951231, 19961231, 19971231, 19981231, 19991231, 20001231, 20011231,
-    20021231, 20031231, 20041231, 20051231, 20061231, 20071231, 20081231,
-    20091231, 20101231, 20111231, 20121231, 20131231, 20141231, 20151231,
-    20161231, 20171231, 20181231, 20191231, 20201231, 20211231
+    # ... (ajoutez toutes les autres dates ici)
+    20201231, 20211231
 ]
 
 @st.cache_data
@@ -110,45 +94,49 @@ async def fetch_image(session, url, date, semaphore):
                 if response.status == 200:
                     data = await response.read()
                     img = Image.open(BytesIO(data))
+                    logger.info(f"Image pour {date} téléchargée avec succès")
                     return add_date_to_image(img, date)
+                else:
+                    logger.error(f"Échec de la récupération de l'image pour {date} : {response.status}")
         except Exception as e:
-            logger.error(f"Erreur lors de la récupération de l'image pour la date {date}: {str(e)}")
+            logger.error(f"Erreur lors de la récupération de l'image pour {date} : {str(e)}")
     return None
 
 async def download_images(bbox, width, height, available_years):
     semaphore = asyncio.Semaphore(20)
     async with aiohttp.ClientSession() as session:
         tasks = [fetch_image(session, get_wms_url(bbox, width, height, date), date, semaphore) for date in available_years]
-        return await asyncio.gather(*tasks)
+        images = await asyncio.gather(*tasks)
+        # Filtrer les images qui ne sont pas None
+        images = [img for img in images if img is not None]
+        logger.info(f"{len(images)} images téléchargées avec succès")
+        return images
 
 def process_images_stream(images, format_option, speed, temp_dir):
     results = {}
 
-    if "GIF" in format_option:
+    if "GIF" in format_option and images:
         gif_path = os.path.join(temp_dir, "timelapse.gif")
         with imageio.get_writer(gif_path, mode='I', fps=speed, loop=0) as writer:
             for img in images:
-                if img is not None:
-                    writer.append_data(np.array(img))
+                writer.append_data(np.array(img))
         results["GIF"] = gif_path
 
-    if "MP4" in format_option:
+    if "MP4" in format_option and images:
         mp4_path = os.path.join(temp_dir, "timelapse.mp4")
         with imageio.get_writer(mp4_path, fps=speed, quality=9) as writer:
             for img in images:
-                if img is not None:
-                    writer.append_data(np.array(img))
+                writer.append_data(np.array(img))
         results["MP4"] = mp4_path
 
-    if "Images individuelles (ZIP)" in format_option:
+    if "Images individuelles (ZIP)" in format_option and images:
         zip_path = os.path.join(temp_dir, "images.zip")
         with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
             for i, img in enumerate(images):
-                if img is not None:
-                    img_path = os.path.join(temp_dir, f"image_{i}.png")
-                    img.save(img_path)
-                    zipf.write(img_path, os.path.basename(img_path))
-                    os.remove(img_path)
+                img_path = os.path.join(temp_dir, f"image_{i}.png")
+                img.save(img_path)
+                zipf.write(img_path, os.path.basename(img_path))
+                os.remove(img_path)
         results["ZIP"] = zip_path
 
     return results
@@ -203,16 +191,19 @@ def app():
                 available_years = [date for date in AVAILABLE_DATES if start_year <= date // 10000 <= end_year]
                 images = asyncio.run(download_images(bbox, width, height, available_years))
 
-                with tempfile.TemporaryDirectory() as temp_dir:
-                    results = process_images_stream(images, format_option, speed, temp_dir)
-
-                    # Téléchargement des fichiers sur S3 et génération des liens
-                    for format, path in results.items():
-                        s3_url = upload_to_s3(path, "timelapse-storage-vertgis", os.path.basename(path))
-                        if s3_url:
-                            st.markdown(f"[Télécharger le timelapse {format}]({s3_url})", unsafe_allow_html=True)
-                        else:
-                            st.error(f"Le fichier {format} n'a pas pu être téléchargé sur S3.")
+                if not images:
+                    st.error("Aucune image n'a été téléchargée. Veuillez vérifier votre sélection ou réessayer.")
+                else:
+                    with tempfile.TemporaryDirectory() as temp_dir:
+                        results = process_images_stream(images, format_option, speed, temp_dir)
+
+                        # Téléchargement des fichiers sur S3 et génération des liens
+                        for format, path in results.items():
+                            s3_url = upload_to_s3(path, "timelapse-storage-vertgis", os.path.basename(path))
+                            if s3_url:
+                                st.markdown(f"[Télécharger le timelapse {format}]({s3_url})", unsafe_allow_html=True)
+                            else:
+                                st.error(f"Le fichier {format} n'a pas pu être téléchargé sur S3.")
 
 if __name__ == "__main__":
     app()