Update app.py

app.py

@@ -9,13 +9,11 @@ import cartopy.feature as cfeature
 import cftime
 import fsspec
 import hvplot.xarray
-
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import panel as pn
 import xarray as xr
-
 from ipywidgets import (
     Checkbox,
     Dropdown,
@@ -26,14 +24,14 @@ from ipywidgets import (
     interactive,
 )
 
-pn.extension('tabulator')
+pn.extension("tabulator")
 
-#df = pd.read_csv("table.csv", index_col=None)
-#df = df.sort_values(by="year")
-#df2 = pd.read_csv("test_table.csv", index_col=None)
-#file_names = df["file_name"].tolist()
-#df = df.sort_values(by="year")
-#years = sorted(df["year"].unique())
+# df = pd.read_csv("table.csv", index_col=None)
+# df = df.sort_values(by="year")
+# df2 = pd.read_csv("test_table.csv", index_col=None)
+# file_names = df["file_name"].tolist()
+# df = df.sort_values(by="year")
+# years = sorted(df["year"].unique())
 
 
 def greg_0h(jourjul):
@@ -84,7 +82,7 @@ def fix_time(dataset):
 
     time = dataset["TIME"]
     time2 = time.dropna(dim="MAXT")
-    time2 = time2.reindex_like(time, method='nearest')
+    time2 = time2.reindex_like(time, method="nearest")
     jourjul = [greg_0h(jourjul) for jourjul in time2.values]
     date = [
         datetime(jourjul[0], jourjul[1], jourjul[2], jourjul[3], jourjul[4], jourjul[5])
@@ -93,6 +91,7 @@ def fix_time(dataset):
 
     return date
 
+
 from datetime import datetime, timedelta
 
 import cartopy.crs as ccrs
@@ -112,9 +111,10 @@ from ipywidgets import (
 )
 
 # Loaddonnées bathymétry data
-fs = fsspec.filesystem("https")
-bathy = xr.open_dataset(fs.open('https://data-eurogoship.ifremer.fr/bathymetrie/bathy6min.nc'))
-
+#fs = fsspec.filesystem("https")
+#bathy = xr.open_dataset(
+    #fs.open("https://data-eurogoship.ifremer.fr/bathymetrie/bathy6min.nc")
+#)
 
 
 import os
@@ -124,12 +124,46 @@ import panel as pn
 import param
 import xarray as xr
 
+@pn.cache(max_items=32,policy='LRU')
+def load_csv(url):
+    fs = fsspec.filesystem("https")
+    with fs.open(url) as f:
+        df = pd.read_csv(f,index_col=None)
+    df.sort_values(by="year") 
+    return df
+
+@pn.cache(max_items=4,policy='LRU')
+def load_bathymetry(url):
+    fs = fsspec.filesystem("https")
+    return xr.open_dataset(fs.open(url), decode_times=False, use_cftime=True)
+
+@pn.cache(max_items=16,policy='LRU')
+def load_netCDF(file_path):
+    fs = fsspec.filesystem("https")
+    ds= ds = (
+                xr.open_dataset(
+                    fs.open(file_path), decode_cf=True, decode_times=False, engine="scipy"
+                )
+                .squeeze()
+                .set_coords(["LONGITUDE", "LATITUDE", "TIME", "PROFZ"])
+                .set_xindex("PROFZ")
+                .set_xindex("TIME")
+            )
+    return ds
+
+
+
+
+
+
 
 class SADCP_Viewer(param.Parameterized):
-    file_csv='https://data-eurogoship.ifremer.fr/data/table.csv'
-    file=fs.open(file_csv)
-    df = pd.read_csv(file, index_col=None).sort_values(by="year")
-    #df = pd.read_csv("table.csv", index_col=None).sort_values(by="year")
+    #file_csv = "https://data-eurogoship.ifremer.fr/data/table.csv"
+    #file = fs.open(file_csv)
+    df = load_csv("https://data-eurogoship.ifremer.fr/data/table.csv")
+    bathy = load_bathymetry("https://data-eurogoship.ifremer.fr/bathymetrie/bathy6min.nc")
+    #df = pd.read_csv(file, index_col=None).sort_values(by="year")
+    # df = pd.read_csv("table.csv", index_col=None).sort_values(by="year")
     file_names = df["file_name"].tolist()
     years = sorted(df["year"].unique())
 
@@ -138,7 +172,7 @@ class SADCP_Viewer(param.Parameterized):
     )
     file_dropdown = pn.widgets.Select(name="File Selector")
     data_table = pn.widgets.Tabulator(df, name="metadata", height=200, width=300)
-   # data_table2 = pn.widgets.Tabulator(df2, name="metadata", height=900, width=400)
+    # data_table2 = pn.widgets.Tabulator(df2, name="metadata", height=900, width=400)
 
     longitude_slider = pn.widgets.RangeSlider(
         name="Longitude Range", start=-180, end=180, step=1
@@ -170,14 +204,10 @@ class SADCP_Viewer(param.Parameterized):
 
     plot = pn.pane.HoloViews()
     plot_map = pn.pane.Matplotlib(width=800, height=600, sizing_mode="fixed")
-    
-    data_table = pn.widgets.Tabulator(
-        width=400, height=200
-    )
-    
-    metadata_table = pn.widgets.Tabulator(
-        width=600, height=800
-    )  
+
+    data_table = pn.widgets.Tabulator(width=400, height=200)
+
+    metadata_table = pn.widgets.Tabulator(width=600, height=800)
     download_button = pn.widgets.Button(name="Download", button_type="primary")
     # plot = pn.Column()
 
@@ -203,24 +233,48 @@ class SADCP_Viewer(param.Parameterized):
                 selected_file = files[0]
                 self.file_dropdown.value = selected_file
             dataframe = sorted_df[sorted_df["file_name"] == selected_file].drop(
-            columns=["file_name", "title", "Conventions", "featureType", "date_update", "ADCP_beam_angle", "ADCP_ship_angle", "middle_bin1_depth", "heading_corr", "pitch_corr", "ampli_corr", "pitch_roll_used", "date_creation", "ADCP_type", "data_type"]
+                columns=[
+                    "file_name",
+                    "title",
+                    "Conventions",
+                    "featureType",
+                    "date_update",
+                    "ADCP_beam_angle",
+                    "ADCP_ship_angle",
+                    "middle_bin1_depth",
+                    "heading_corr",
+                    "pitch_corr",
+                    "ampli_corr",
+                    "pitch_roll_used",
+                    "date_creation",
+                    "ADCP_type",
+                    "data_type",
+                ]
             )
             dataframe2 = sorted_df[sorted_df["file_name"] == selected_file].drop(
-            columns=["file_name","date_start","date_end","ADCP_frequency(kHz)","bin_length(meter)","year"])
-        
-            
+                columns=[
+                    "file_name",
+                    "date_start",
+                    "date_end",
+                    "ADCP_frequency(kHz)",
+                    "bin_length(meter)",
+                    "year",
+                ]
+            )
+
             data_dir = "https://data-eurogoship.ifremer.fr/copy_seadatanet/"
             file_path = os.path.join(data_dir, selected_file)
-            file_path=fs.open(file_path)
-            self.ds = (
-                xr.open_dataset(
-                    file_path, decode_cf=True, decode_times=False, engine="scipy"
-                )
-                .squeeze()
-                .set_coords(["LONGITUDE", "LATITUDE", "TIME", "PROFZ"])
-                .set_xindex("PROFZ")
-                .set_xindex("TIME")
-            )
+            self.ds=load_netCDF(file_path)
+            #file_path = fs.open(file_path)
+            #self.ds = (
+                #xr.open_dataset(
+                    #file_path, decode_cf=True, decode_times=False, engine="scipy"
+                #)
+               # .squeeze()
+               # .set_coords(["LONGITUDE", "LATITUDE", "TIME", "PROFZ"])
+            #@.set_xindex("PROFZ")
+               # .set_xindex("TIME")
+           # )
 
             lon_range = (
                 int(self.ds["LONGITUDE"].min().round() - 1),
@@ -289,9 +343,6 @@ class SADCP_Viewer(param.Parameterized):
             self.depth3_range_slider.start = deph_range[0]
             self.depth3_range_slider.end = deph_range[1]
             self.depth3_range_slider.value = deph_range
-            
-            
-
 
             # self.update_plots()
             self.ds.close()
@@ -431,9 +482,9 @@ class SADCP_Viewer(param.Parameterized):
         if self.bathy_checkbox.value:
             contour_levels = [-2000]
             ax.contour(
-                bathy.longitude,
-                bathy.latitude,
-                bathy.z,
+                self.bathy.longitude,
+                self.bathy.latitude,
+                self.bathy.z,
                 levels=contour_levels,
                 colors="black",
                 transform=ccrs.PlateCarree(),
@@ -468,13 +519,12 @@ class SADCP_Viewer(param.Parameterized):
         return self.file_names
 
 
-
 explorer = SADCP_Viewer()
 # Instantiate the SADCP_Viewer class and create a template
 tabs = pn.Tabs(
     ("Plots", pn.Column(explorer.update_plots)),
     (
-       "Metadata",
+        "Metadata",
         pn.Column(
             explorer.metadata_table, explorer.download_button, height=500, margin=10
         ),
@@ -497,6 +547,8 @@ sidebar = [
     explorer.scale_factor_slider,
     explorer.data_table,
 ]
-template = pn.template.FastListTemplate(title="SADCP data Viewer", sidebar=sidebar, main=[tabs])
-template.servable()
+template = pn.template.FastListTemplate(
+    title="SADCP data Viewer", sidebar=sidebar, main=[tabs]
+)
+template.show()