Update app.py

app.py

@@ -251,26 +251,21 @@ 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 int(date2[6:8])-int(date1[6:8]) >0:
         return ("<div style='font-size:xxx-large'>Reduce Timespan to 24 hours</div>")
         
     in_year=f"{date2[0:4]}"
     in_month=f"{date2[4:6]}"
     in_day=f"{date2[6:8]}"
-    file_name="DATE_IDENT_SIZE_TOOL.jpg"
+    file_name="DATE_TIME_SIZE_TOOL.jpg"
     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)    
-
-    
     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')
@@ -291,6 +286,46 @@ def nasa_sdo_images(obj,size,date1,date2):
                                 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 nasa_sdo_composite(obj,size,date1,date2):
+    html_in=f"<style>{css}</style><div class='img_box_soho'>"
+    if int(date2[6:8])-int(date1[6:8]) >0:
+        return ("<div style='font-size:xxx-large'>Reduce Timespan to 24 hours</div>")
+    in_year=f"{date2[0:4]}"
+    in_month=f"{date2[4:6]}"
+    in_day=f"{date2[6:8]}"
+    file_name="DATE_TIME_SIZE_TOOL.jpg"
+    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)    
+    if "All" in size:
+        size = sdo_size
+    if "All" in obj:
+        obj = sdo_obj
+    link_box=[]
+    soup = bs4.BeautifulSoup(feed1.content, 'html.parser')
+    anchor_elements = soup.find_all('a')
+    anchor_elements.sort()
+    cnt=0
+    max_cnt=4
+    for element in anchor_elements:
+        if cnt<=max_cnt:
+            href=element.get('href')
+            if href.endswith('.jpg'):
+                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(s):
+                                    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():
     out=make_tree()
     im_html=get_images()
@@ -344,13 +379,13 @@ with gr.Blocks() as app:
     with gr.Tab("NASA"):
         with gr.Tab("SDO Images"):
             with gr.Row():
-                gr.Markdown("<h5>From:")
+                gr.Markdown("<h5 style='font-size:xx-large;'>From:")
                 year1=gr.Number(label="Year",minimum=2000,maximum=2024,precision=0,value=int(datestamp[0]),min_width=10)
                 month1=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=int(datestamp[1]),min_width=10)
                 day1=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=int(datestamp[2]),min_width=10)
                 hour1=gr.Number(label="Hour",minimum=0,maximum=23,precision=0,value=int(timestamp[0]),min_width=10)
                 minute1=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=int(timestamp[1]),min_width=10)
-                gr.Markdown("<h5>To:")
+                gr.Markdown("<h5 style='font-size:xx-large;'>To:")
                 year2=gr.Number(label="Year",minimum=2000,maximum=2024,precision=0,value=int(datestamp[0]),min_width=10)
                 month2=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=int(datestamp[1]),min_width=10)
                 day2=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=int(datestamp[2]),min_width=10)
@@ -360,11 +395,17 @@ with gr.Blocks() as app:
             with gr.Row():
                 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)
+            
+            with gr.Tab("Composite"):
+                sdo_comp_btn=gr.Button("Load")
+                sdo_comp_html=gr.HTML()                
+            with gr.Tab("Images"):
+                sdo_btn=gr.Button("Load")
+                sdo_html=gr.HTML()
+        
                 
-            sdo_btn=gr.Button("Load")
-            sdo_html=gr.HTML()
-            date1=gr.Textbox()
-            date2=gr.Textbox()
+            date1=gr.Textbox(visible=False)
+            date2=gr.Textbox(visible=False)
             #sdo_json=gr.JSON()
         with gr.Tab("SOHO Images"):
             soho_btn=gr.Button("Load")
@@ -374,6 +415,7 @@ with gr.Blocks() as app:
             html_vid_nasa=gr.HTML()
 
     ###### NASA Images ##########
+    sdo_comp_btn.click(get_date,[year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2],[date1,date2]).then(nasa_sdo_composite,[sdo_drop1,sdo_drop2,date1,date2],sdo_comp_html)
     sdo_btn.click(get_date,[year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2],[date1,date2]).then(nasa_sdo_images,[sdo_drop1,sdo_drop2,date1,date2],sdo_html)
     soho_btn.click(make_nasa_soho_image_trigger,None,html_nasa)
     soho_vid_btn.click(make_nasa_soho_videos,None,html_vid_nasa)