Update app.py

app.py

@@ -6,7 +6,7 @@ from PIL import Image
 import moviepy.video.io.ImageSequenceClip as ic
 from pathlib import Path
 import bs4
-
+import datetime
 import urllib.request 
 import uuid
 main_directory = "https://services.swpc.noaa.gov/"
@@ -245,14 +245,15 @@ def make_nasa_soho_image_trigger():
     html_in+="</div>"
     return html_in
 
-def nasa_sdo_images(obj,size):
+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
-    html_out=""
+    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="2024"
     in_month="03"
     in_day="24"
@@ -271,21 +272,41 @@ def nasa_sdo_images(obj,size):
         href=element.get('href')
         if href.endswith('.jpg'):
             ls=href.split("_")
-            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],'dump':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>'
+            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>'
     html_in+="</div>"
     return html_in
 def run():
     out=make_tree()
     im_html=get_images()
     return out, im_html
+def get_date(year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2):
+    m1 = 0 if len(month1)<2 else m1=None
+    d1 = 0 if len(day1)<2 else d1=None
+    h1 = 0 if len(hour1)<2 else h1=None
+    mi1 = 0 if len(minute1)<2 else mi1=None
+    date1=f'{year1}{m1}{month1}{d1}{day1}{h1}{hour1}{mi1}{minute1}'
+
+    m2 = 0 if len(month1)<2 else m2=None
+    d2 = 0 if len(day1)<2 else d2=None
+    h2 = 0 if len(hour1)<2 else h2=None
+    mi2 = 0 if len(minute1)<2 else mi2=None
+    date2=f'{year2}{m2}{month2}{d2}{day2}{h2}{hour2}{mi2}{minute2}'
+    print(date1)
+    print(date2)
+    return date1,date2
 
 with gr.Blocks() as app:
+    gr.HTML(f"""<div style='font-size:xxx-large;'>Current: {datetime.datetime.now().split(".")[0]} UTC</div>""")
     with gr.Tab("NOAA"):
         with gr.Tab("Images"):
             html_im=gr.HTML()
@@ -304,6 +325,20 @@ with gr.Blocks() as app:
             links=gr.JSON()
     with gr.Tab("NASA"):
         with gr.Tab("SDO Images"):
+            with gr.Row():
+                gr.Markdown("<h5>From:")
+                year1=gr.Number(label="Year",minimum=2000,maximum=2024,precision=0,value=2024,min_width=10)
+                month1=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=1,min_width=10)
+                day1=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=1,min_width=10)
+                hour1=gr.Number(label="Hour",minimum=0,maximum=23,precision=0,value=0,min_width=10)
+                minute1=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=0,min_width=10)
+                gr.Markdown("<h5>To:")
+                year2=gr.Number(label="Year",minimum=2000,maximum=2024,precision=0,value=2024,min_width=10)
+                month2=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=1,min_width=10)
+                day2=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=1,min_width=10)
+                hour2=gr.Number(label="Hour",minimum=0,maximum=23,precision=0,value=0,min_width=10)
+                minute2=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=0,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",
@@ -314,6 +349,8 @@ with gr.Blocks() as app:
                 
             sdo_btn=gr.Button("Load")
             sdo_html=gr.HTML()
+            date1=gr.Textbox()
+            date2=gr.Textbox()
             #sdo_json=gr.JSON()
         with gr.Tab("SOHO Images"):
             soho_btn=gr.Button("Load")
@@ -323,7 +360,7 @@ with gr.Blocks() as app:
             html_vid_nasa=gr.HTML()
 
     ###### NASA Images ##########
-    sdo_btn.click(nasa_sdo_images,[sdo_drop1,sdo_drop2],sdo_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)
     ###### NOAA Images ##########