Update app.py

app.py

@@ -73,16 +73,16 @@ sdo_obj = ["HMIB","HMIBC","HMIIC","HMIIF","HMID","HMII","HMI171",
            "211193171","211193171n","211193171rg",
            "094335193","304211171"]
 sdo_size= [256,512,1024,2048,4096]
-month_dict={"01":31,"02":28,"03":31,"04":30,"05":31,"06":30,"07":31,"08":31,"09":30,"10":31,"11":30,"12":31}
-html = """
-<div>
-PAGE_LINK
-</div>
-"""
+
 css="""
+.gallery-container {
+    max-height: 80vh;
+    overflow-y: auto;
+    border: 1px solid #e0e0e0;
+    padding: 10px;
+}
 .img_box{
     display: flex;
-    height: fit-content;
     flex-direction: column;
     flex-flow: unset;
     flex-wrap: wrap;
@@ -108,7 +108,6 @@ css="""
 }
 .img_box_soho{
     display: flex;
-    height: fit-content;
     flex-direction: row;
     flex-wrap: wrap;
     justify-content: space-between;
@@ -140,8 +139,7 @@ def load_json(url1="",url2="",url3="",url4="",url5="",url6="",url7="",url8=""):
         feed1 = requests.get(get_url)
         return None, feed1.text
     elif get_url.endswith(".png") or get_url.endswith(".gif") or get_url.endswith(".jpg"):
-        html_out=f"<style>{css}</style><div>"
-        html_out+=f'<div class="img_class_raw"><a href="{get_url}" target="_blank">{get_url}</a><br><img src={get_url}></div></div>'
+        html_out=f'<div><div class="img_class_raw"><a href="{get_url}" target="_blank">{get_url}</a><br><img src={get_url}></div></div>'
         return html_out, None
     return None,None
 
@@ -162,7 +160,7 @@ def make_tree(url1="",url2="",url3="",url4="",url5="",url6="",url7="",url8=""):
         return None
 
 def get_images():
-    html_out=f"<style>{css}</style><div class='img_box'>"
+    html_out="<div class='img_box'>"
     get_url=f'{main_directory}images/geospace/'
     feed1 = requests.get(get_url)
     spl = feed1.text.split("href=")
@@ -178,12 +176,11 @@ def get_images():
         if spl2.endswith(".png") or spl2.endswith(".gif") or spl2.endswith(".jpg"):
             html_out+=f'<div class="img_class"><a href="{get_url2}{spl2}" target="_blank">{spl2}</a><br><img src={get_url2}{spl2}></div>'
     html_out+="</div>"
-    return html_out
+    return f"<div class='gallery-container'>{html_out}</div>"
 
 def make_animation_new(gif_box=[], fps=10, loop=True):
     if gif_box:
         gif_box.sort(reverse=False)
-        print("Making GIF...")
         try:
             frames = []
             for i,ea in enumerate(gif_box):
@@ -203,30 +200,19 @@ def make_animation_new(gif_box=[], fps=10, loop=True):
             gif_base64 = base64.b64encode(gif_bytes).decode('utf-8')
             gif_data_url = f"data:image/gif;base64,{gif_base64}"
 
-            html_out=f"<style>{css}</style><div>"
-            html_out+=f'<div class="img_class"><img src="{gif_data_url}"></div>'
-            html_out+="</div>"
+            html_out=f'<div><div class="img_class"><img src="{gif_data_url}"></div></div>'
             os.remove(temp_gif_path)
             for frame_file in frames:
                 os.remove(frame_file)
-            return html_out
+            return f"<div class='gallery-container'>{html_out}</div>"
 
         except Exception as e:
-            print(f"ERROR HAPPENED: {e}")
             return f"<div>An error occurred: {e}</div>"
     else:
         return "<div>No images were provided to create an animation.</div>"
 
-
-def make_html(inp_files):
-    html_out=f"<style>{css}</style><div class='img_box'>"
-    for ea in inp_files:
-        html_out+=f'<div class="img_class"><img src="file={ea}"></div>'
-    html_out+='</div>'
-    return html_out
-
 def make_nasa_soho_videos():
-    html_out=f"<style>{css}</style><div class='img_box_soho'>"
+    html_out="<div class='img_box_soho'>"
     for ea in nasa_soho_mp4:
         file_name=ea['source']
         html_out+=f'''
@@ -235,7 +221,7 @@ def make_nasa_soho_videos():
             Your browser does not support the video tag.
         </video>'''
     html_out+='</div>'
-    return html_out
+    return f"<div class='gallery-container'>{html_out}</div>"
 
 def make_nasa_soho_images(inp_src: list):
     html_out=""
@@ -245,11 +231,11 @@ def make_nasa_soho_images(inp_src: list):
     return html_out
 
 def make_nasa_soho_image_trigger():
-    html_in=f"<style>{css}</style><div class='img_box_soho'>"
+    html_in="<div class='img_box_soho'>"
     html_in+= make_nasa_soho_images(nasa_images)
     html_in+= make_nasa_soho_images(sdo_aia_latest)
     html_in+="</div>"
-    return html_in
+    return f"<div class='gallery-container'>{html_in}</div>"
 
 def generate_sdo_urls(date1_str: str, date2_str: str) -> list[str]:
     url_box = []
@@ -272,7 +258,7 @@ def generate_sdo_urls(date1_str: str, date2_str: str) -> list[str]:
     return url_box
 
 def nasa_sdo_images(obj,size,date1,date2):
-    html_in=f"<style>{css}</style><div class='img_box_soho'>"
+    html_in="<div class='img_box_soho'>"
     sdo_urls = generate_sdo_urls(date1, date2)
 
     if not sdo_urls:
@@ -293,55 +279,45 @@ def nasa_sdo_images(obj,size,date1,date2):
             feed1 = requests.get(link)
             feed1.raise_for_status()
         except requests.exceptions.RequestException as e:
-            print(f"Could not fetch {link}: {e}")
             continue
 
-        if "All" in size:
-            size_list = sdo_size
-        else:
-            size_list = size
-        if "All" in obj:
-            obj_list = sdo_obj
-        else:
-            obj_list = obj
+        size_list = sdo_size if "All" in size else size
+        obj_list = sdo_obj if "All" in obj else obj
 
         soup = bs4.BeautifulSoup(feed1.content, 'html.parser')
-        anchor_elements = soup.find_all('a')
         
-        for element in anchor_elements:
+        for element in soup.find_all('a'):
             href=element.get('href')
             if href and href.endswith('.jpg'):
                 parts = href.split('_')
                 if len(parts) < 4:
                     continue
                 
-                image_time_str = parts[1]
-                image_size_str = parts[2]
-                image_obj_str = parts[3].split('.jpg')[0]
+                image_time_str, image_size_str, image_obj_str = parts[1], parts[2], parts[3].split('.jpg')[0]
 
                 time_match = False
                 if is_first_day and is_last_day:
-                    if start_time_str <= image_time_str <= end_time_str:
-                        time_match = True
+                    if start_time_str <= image_time_str <= end_time_str: time_match = True
                 elif is_first_day:
-                    if image_time_str >= start_time_str:
-                        time_match = True
+                    if image_time_str >= start_time_str: time_match = True
                 elif is_last_day:
-                    if image_time_str <= end_time_str:
-                        time_match = True
-                else: # Middle day
+                    if image_time_str <= end_time_str: time_match = True
+                else:
                     time_match = True
 
-                if time_match:
-                    if image_obj_str in obj_list and int(image_size_str) in size_list:
-                        full_url = f'{link}{href}'
-                        out_box.append(full_url)
-                        html_in+=f'<div class="img_class_sdo"><a href="{full_url}" target="_blank">{href}</a><br><img src={full_url}></div>'
+                if time_match and image_obj_str in obj_list and int(image_size_str) in size_list:
+                    full_url = f'{link}{href}'
+                    out_box.append(full_url)
+                    html_in+=f'<div class="img_class_sdo"><a href="{full_url}" target="_blank">{href}</a><br><img src={full_url}></div>'
+    
     html_in += "</div>"
+    
     if not out_box:
-        html_in = "<div>No images found for the specified criteria.</div>"
-    return html_in, out_box
-
+        final_html = "<div>No images found for the specified criteria.</div>"
+    else:
+        final_html = f"<div class='gallery-container'>{html_in}</div>"
+        
+    return final_html, out_box
 
 def get_concat_h_cut(in1, in2):
     uid=uuid.uuid4()
@@ -357,10 +333,7 @@ def get_concat_v_cut(in1, in2, theme='dark'):
     uid=uuid.uuid4()
     im1=Image.open(in1)
     im2=Image.open(in2)
-    if theme=='dark':
-        color=(31,41,55)
-    if theme=='light':
-        color=(255,255,255)
+    color = (31,41,55) if theme=='dark' else (255,255,255)
     dst = Image.new('RGB', (min(im1.width, im2.width), im1.height + im2.height),color=color)
     dst.paste(im1, (0, 0))
     dst.paste(im2, (0, im1.height))
@@ -368,46 +341,44 @@ def get_concat_v_cut(in1, in2, theme='dark'):
     return f"v_{uid}.jpg"
 
 def nasa_sdo_composite(obj,size,date1,date2,ret_num):
-    html_in=f"<style>{css}</style><div class='img_box_soho'>"
-    in_year=f"{date2[0:4]}"
-    in_month=f"{date2[4:6]}"
-    in_day=f"{date2[6:8]}"
+    html_in="<div class='img_box_soho'>"
+    in_year, in_month, in_day = date2[0:4], date2[4:6], date2[6:8]
     sdo_source_format = f"https://sdo.gsfc.nasa.gov/assets/img/browse/{in_year}/{in_month}/{in_day}/"
-    get_url=sdo_source_format
-    feed1 = requests.get(get_url)
-    if "All" in size:
-        size = sdo_size
-    if "All" in obj:
-        obj = sdo_obj
+    
+    try:
+        feed1 = requests.get(sdo_source_format)
+        feed1.raise_for_status()
+    except requests.exceptions.RequestException:
+        return "<div>Could not fetch SDO composite images.</div>", []
+
+    size_list = sdo_size if "All" in size else size
+    obj_list = sdo_obj if "All" in obj else obj
+    
     link_box=[]
     soup = bs4.BeautifulSoup(feed1.content, 'html.parser')
-    anchor_elements = soup.find_all('a')
-    cnt=1
-    max_cnt=ret_num
-    for element in anchor_elements:
+    
+    for element in soup.find_all('a'):
         href=element.get('href')
-        if href.endswith('.jpg'):
-            for o in obj:
-                for s in size:
-                    ls=href.split("_")
-                    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):
-                                link_box.append(href)
+        if href and href.endswith('.jpg'):
+            parts=href.split("_")
+            if len(parts) < 4: continue
+            if parts[1][0:4]>=date1[8:12]:
+                src_obj=parts[3].split('.jpg')[0]
+                if src_obj in obj_list and int(parts[2]) in size_list:
+                    link_box.append(href)
+                    
     link_box.sort(reverse=True)
     out_box=[]
-    for ea in link_box:
-        if cnt<=max_cnt:
+    for i, ea in enumerate(link_box):
+        if i < ret_num:
             out_link=f'{sdo_source_format}{ea}'
             out_box.append(out_link)
-            cnt+=1
-            html_in+=f'<div class="img_class_sdo"><a href="{sdo_source_format}{ea}" target="_blank">{ea}</a><br><img src={sdo_source_format}{ea}></div>'
+            html_in+=f'<div class="img_class_sdo"><a href="{out_link}" target="_blank">{ea}</a><br><img src={out_link}></div>'
+        
     html_in+="</div>"
-    return html_in, out_box
+    return f"<div class='gallery-container'>{html_in}</div>", out_box
 
 def run():
-    out=make_tree()
     im_html=get_images()
     return im_html
 
@@ -419,55 +390,48 @@ def get_date(year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2):
         date2 = end_dt.strftime('%Y%m%d%H%M')
         return date1, date2
     except ValueError as e:
-        print(f"Error creating date: {e}")
         return None, None
 
-
 def comp_combine(inp_ims: list,comp_col,comp_row,resize=False):
     im_box=[]
-    v_box=[]
-    rows=comp_row
-    cols=comp_col
-    if not type(inp_ims)==type([]):
-        try:
-            inp_ims=eval(inp_ims)
-        except:
-            return None
-    if not inp_ims:
-        return None
+    if not isinstance(inp_ims, list):
+        try: inp_ims=eval(inp_ims)
+        except: return None
+    if not inp_ims: return None
 
-    for i,im in enumerate(inp_ims):
-        urllib.request.urlretrieve(im, f"tmp-{i}.jpg")
-        if resize:
-            pil_im = Image.open(f'tmp-{i}.jpg')
-            pil_im = pil_im.resize((int(resize[0]),int(resize[1])),resample=Image.Resampling.LANCZOS).convert('RGB')
-            pil_im.save(f'tmp-{i}.jpg')
-        im_box.append(f"tmp-{i}.jpg")
-    im_cnt=len(im_box)
-    cnt=1
-    for rr in range(rows):
-        if cnt > im_cnt: break
-        col_start=[im_box[cnt-1]]
-        for cc in range(cols-1):
-            try:
-                if cnt >= im_cnt: break
-                col_out=get_concat_h_cut(col_start[0],im_box[cnt])
-                col_start[0]=col_out
-                cnt+=1
-            except Exception as e:
-                pass
-        v_box.append(col_start[0])
-    if not v_box:
-        return None
-
-    v_cnt=1
-    v_box_cnt=len(v_box)
-    v_start=[v_box[0]]
-    for vv in range(v_box_cnt-1):
-        v_out=get_concat_v_cut(v_start[0],v_box[v_cnt])
-        v_start[0]=v_out
-        v_cnt+=1
-    return v_start[0]
+    for i,im_url in enumerate(inp_ims):
+        try:
+            tmp_file = f"tmp-{i}.jpg"
+            urllib.request.urlretrieve(im_url, tmp_file)
+            if resize:
+                with Image.open(tmp_file) as pil_im:
+                    resized_im = pil_im.resize((int(resize[0]),int(resize[1])),resample=Image.Resampling.LANCZOS).convert('RGB')
+                    resized_im.save(tmp_file)
+            im_box.append(tmp_file)
+        except Exception:
+            continue
+    
+    if not im_box: return None
+
+    rows, cols = int(comp_row), int(comp_col)
+    v_box, im_idx = [], 0
+    for _ in range(rows):
+        if im_idx >= len(im_box): break
+        h_strip = im_box[im_idx]
+        im_idx += 1
+        for _ in range(cols - 1):
+            if im_idx >= len(im_box): break
+            h_strip = get_concat_h_cut(h_strip, im_box[im_idx])
+            im_idx += 1
+        v_box.append(h_strip)
+    
+    if not v_box: return None
+    
+    final_image = v_box[0]
+    for i in range(1, len(v_box)):
+        final_image = get_concat_v_cut(final_image, v_box[i])
+        
+    return final_image
 
 def comp_1(comp_list=comp_list,col=3,row=4,resize=[640,450]):
     outp=comp_combine(comp_list,col,row,resize)
@@ -480,7 +444,7 @@ def get_time():
     return (gr.update(value=html_out), now.year, now.month, now.day, now.hour, now.minute,
             now.year, now.month, now.day, now.hour, now.minute)
 
-with gr.Blocks() as app:
+with gr.Blocks(css=css) as app:
     url_list=gr.State([])
     now = datetime.datetime.utcnow()
     
@@ -509,18 +473,18 @@ with gr.Blocks() as app:
     with gr.Tab("NASA"):
         with gr.Tab("SDO Images"):
             with gr.Row():
-                gr.Markdown("<h5 style='font-size:xx-large;'>From:")
-                year1=gr.Number(label="Year",minimum=2010,maximum=now.year,precision=0,value=now.year,min_width=10)
-                month1=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=now.month,min_width=10)
-                day1=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=now.day,min_width=10)
-                hour1=gr.Number(label="Hour",minimum=0,maximum=23,precision=0,value=now.hour,min_width=10)
-                minute1=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=now.minute,min_width=10)
-                gr.Markdown("<h5 style='font-size:xx-large;'>To:")
-                year2=gr.Number(label="Year",minimum=2010,maximum=now.year,precision=0,value=now.year,min_width=10)
-                month2=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=now.month,min_width=10)
-                day2=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=now.day,min_width=10)
-                hour2=gr.Number(label="Hour",minimum=0,maximum=23,precision=0,value=now.hour,min_width=10)
-                minute2=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=now.minute,min_width=10)
+                gr.Markdown("<h5>From:")
+                year1=gr.Number(label="Year",minimum=2010,maximum=now.year,precision=0,value=now.year)
+                month1=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=now.month)
+                day1=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=now.day)
+                hour1=gr.Number(label="Hour",minimum=0,maximum=23,precision=0,value=now.hour)
+                minute1=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=now.minute)
+                gr.Markdown("<h5>To:")
+                year2=gr.Number(label="Year",minimum=2010,maximum=now.year,precision=0,value=now.year)
+                month2=gr.Number(label="Month",minimum=1,maximum=12,precision=0,value=now.month)
+                day2=gr.Number(label="Day",minimum=1,maximum=31,precision=0,value=now.day)
+                hour2=gr.Number(label="Hour",minimum=0,maximum=23,precision=0,value=now.hour)
+                minute2=gr.Number(label="Minute",minimum=0,maximum=59,precision=0,value=now.minute)
 
             with gr.Row():
                 sdo_drop1=gr.Dropdown(label="Instrument", multiselect=True, choices=["All"]+sdo_obj, value="0094")
@@ -535,7 +499,6 @@ with gr.Blocks() as app:
                     comp_combine_btn=gr.Button("Combine")
                     sdo_comp_btn=gr.Button("Load")
                 img_out=gr.Image()
-                comp_combine_html=gr.HTML()
                 sdo_comp_html=gr.HTML()
                 image_comp_list=gr.Textbox(visible=True)
             with gr.Tab("Images"):
@@ -545,7 +508,6 @@ with gr.Blocks() as app:
                     loop_checkbox = gr.Checkbox(label="Loop Animation", value=True)
                 sdo_gif=gr.Button("Make GIF")
                 sdo_gif_html=gr.HTML()
-                sdo_gif.click(make_animation_new,[url_list, fps_slider, loop_checkbox],sdo_gif_html)
                 sdo_html=gr.HTML()
 
             date1=gr.Textbox(visible=False)
@@ -559,6 +521,7 @@ with gr.Blocks() as app:
 
     app.load(get_time,None,[time_html,year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2]).then(make_tree,None,drop1)
 
+    sdo_gif.click(make_animation_new,[url_list, fps_slider, loop_checkbox],sdo_gif_html)
     first_comp_btn.click(comp_1,None,first_comp_img)
     comp_combine_btn.click(comp_combine,[image_comp_list,comp_col,comp_row],img_out)
     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,comp_num],[sdo_comp_html,image_comp_list])