Update app.py

app.py

@@ -51,8 +51,12 @@ nasa_soho_mp4=[
     {"name":"SDO/HMI Magnetogram", "source":"https://soho.nascom.nasa.gov/data/LATEST/current_hmi_mag-512.mp4"},
 ]  
 
-
-
+sdo_obj = ["HMIB","HMIBC","HMIIC","HMIIF","HMID","HMII","HMI171",
+           "0094","0131","0171","0193","0211",
+           "0304","0335","1600","1700","4500",
+           "211193171","211193171n","211193171rg",
+           "094335193","304211171"]
+sdo_size= [256,512,1024,2048,4096]
 html = """
 <div>
 PAGE_LINK
@@ -247,10 +251,8 @@ def make_nasa_soho_image_trigger():
 
 def nasa_sdo_images(obj,size,date1,date2):
     html_in=f"<style>{css}</style><div class='img_box_soho'>"
-    if size=="All":
-        size1=9999
-    else:
-        size1=size
+    
+    
     if int(date2[6:8])-int(date1[6:8]) >0:
         return ("<div style='font-size:xxx-large'>Reduce Timespan to 24 hours</div>")
         
@@ -261,8 +263,14 @@ def nasa_sdo_images(obj,size,date1,date2):
     sdo_source_format = f"https://sdo.gsfc.nasa.gov/assets/img/browse/{in_year}/{in_month}/{in_day}/"
     get_url=sdo_source_format
     print(get_url)
-    feed1 = requests.get(get_url)
+    feed1 = requests.get(get_url)    
 
+    
+    if "All" in size:
+        size = sdo_size
+    if "All" in obj:
+        obj = sdo_obj
+        
     link_box=[]
     # Parse the HTML content using BeautifulSoup
     soup = bs4.BeautifulSoup(feed1.content, 'html.parser')
@@ -271,18 +279,16 @@ def nasa_sdo_images(obj,size,date1,date2):
     for element in anchor_elements:
         href=element.get('href')
         if href.endswith('.jpg'):
-            ls=href.split("_")
-            print(ls[1][0:4])
-            print(date1[8:13])
-            if ls[1][0:4]>=date1[8:13]:
-                src_obj=ls[3].split('.jpg')[0]
-                if src_obj == obj or obj=="All":
-                    if int(ls[2]) == int(size1) or size=="All":
-                        
-                        #link_json={'year':ls[0][0:4],'month':ls[0][4:6],'day':ls[0][6:8],'time':ls[1],'size':ls[2],'obj':src_obj}
-                        #print(href)
-                        #link_box.append(link_json)
-                        html_in+=f'<div class="img_class_sdo"><a href="{sdo_source_format}{href}" target="_blank">{href}</a><br><img src={sdo_source_format}{href}></div>'
+            for o in obj:
+                for s in size:
+                    ls=href.split("_")
+                    print(ls[1][0:4])
+                    print(date1[8:13])
+                    if ls[1][0:4]>=date1[8:13]:
+                        src_obj=ls[3].split('.jpg')[0]
+                        if src_obj == o:
+                            if int(ls[2]) == int(size):
+                                html_in+=f'<div class="img_class_sdo"><a href="{sdo_source_format}{href}" target="_blank">{href}</a><br><img src={sdo_source_format}{href}></div>'
     html_in+="</div>"
     return html_in
 def run():
@@ -352,12 +358,8 @@ with gr.Blocks() as app:
                 minute2=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=int(timestamp[1]),min_width=10)
                 
             with gr.Row():
-                sdo_drop1=gr.Dropdown(label="Instrument", choices=["All","HMIB","HMIBC","HMIIC","HMIIF","HMID","HMII","HMI171",
-                                                                   "0094","0131","0171","0193","0211",
-                                                                   "0304","0335","1600","1700","4500",
-                                                                   "211193171","211193171n","211193171rg",
-                                                                   "094335193","304211171"], value="All")
-                sdo_drop2=gr.Dropdown(label="Size", choices=[256,512,1024,2048,4096,"All"],value=512)
+                sdo_drop1=gr.Dropdown(label="Instrument", multiselect=True, choices=["All"]+sdo_obj, value="0094")
+                sdo_drop2=gr.Dropdown(label="Size", multiselect=True, choices=["All"]+sdo_size,value=512)
                 
             sdo_btn=gr.Button("Load")
             sdo_html=gr.HTML()