Update app.py

app.py

@@ -624,7 +624,7 @@ def server(input, output, session):
             threshold = 24
             scaling_factor = 1.5  # Adjust this factor as needed
             
-            # Iterate over the top 10 players in the sorted dataframe
+             # Iterate over the top 10 players in the sorted dataframe
             for i, (_, team_row) in enumerate(df_pandas.head(10).iterrows()):
                 team = team_row[f'team']
                 player = team_row[f'name']
@@ -636,98 +636,111 @@ def server(input, output, session):
                 
                 # Create a subplot in the GridSpec layout
                 ax = fig.add_subplot(gs[row, col])
-                #ax
+                
+                # Plot the player picture
+                try:
+                    img = plt.imread(logo_url)
+                    ax.set_xlim(-1.25, 1.25)
+                    ax.imshow(img, extent=[-1.02, -0.84, 0.05, 0.95], aspect=0.2)
+                except Exception as e:
+                    print(f"Failed to load player image from {logo_url}: {e}")
                 
                 # Plot the team logo
-                img = plt.imread(logo_url)
-                ax.set_xlim(-1.25, 1.25)
-                #ax.set_ylim(0, 0.2)
-                ax.imshow(img, extent=[-1.02, -0.84, 0.05, 0.95],aspect=0.2)
-
-                # # Plot the team logo
-                # img = plt.imread(team_url)
-                # #ax.set_ylim(0, 0.2)
-                response = requests.get(team_url)
-        
-                png_data = cairosvg.svg2png(bytestring=response.content, output_width=400,output_height=400)
+                try:
+                    headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'}
+                    response = requests.get(team_url, headers=headers, timeout=10)
+                    
+                    # Validate response
+                    if response.status_code != 200:
+                        print(f"Failed to fetch {team_url}: HTTP {response.status_code}")
+                        raise ValueError(f"HTTP {response.status_code}")
+                    
+                    if not response.content:
+                        print(f"Empty response for {team_url}")
+                        raise ValueError("Empty response")
+                    
+                    # Check if it's actually SVG or already a raster format
+                    content_type = response.headers.get('content-type', '').lower()
+                    
+                    if 'svg' in content_type or team_url.lower().endswith('.svg'):
+                        # Convert SVG to PNG
+                        png_data = cairosvg.svg2png(
+                            bytestring=response.content, 
+                            output_width=400, 
+                            output_height=400
+                        )
+                        img = Image.open(BytesIO(png_data))
+                    else:
+                        # Already a raster format
+                        img = Image.open(BytesIO(response.content))
+                    
+                    ax.imshow(img, extent=[-0.81, -0.63, 0.05, 0.95], aspect=0.2)
+                    
+                except Exception as e:
+                    print(f"Failed to process team logo from {team_url}: {e}")
+                    # Create blank placeholder
+                    blank_image = np.ones((100, 100, 3), dtype=np.uint8) * 240
+                    img = Image.fromarray(blank_image)
+                    ax.imshow(img, extent=[-0.81, -0.63, 0.05, 0.95], aspect=0.2)
                 
-                # Open the PNG with PIL
-                img = Image.open(BytesIO(png_data))    
-                # img = img.convert("LA")
-                        
-                ax.imshow(img, extent=[-0.81, -0.63, 0.05, 0.95],aspect=0.2)
                 ax.axis('off')
-
+                
                 # Add the rank number to the left of the logo, italicized
-                ax.text(0.05, 0.5, f'{i + 1}', transform=ax.transAxes, ha='center', va='center', fontsize=36, style='italic')
+                ax.text(0.05, 0.5, f'{i + 1}', transform=ax.transAxes, ha='center', va='center', 
+                        fontsize=36, style='italic')
+                
                 adjusted_fontsize = max(20, base_size - max(0, (len(player) - threshold) * scaling_factor))
-                                
-                # # Add the team name and metric value as text with bigger font size, bold the metric
-                ax.text(0.27, 0.5, f'{player}', transform=ax.transAxes, ha='left', va='center', fontsize=adjusted_fontsize, style='italic')
-
-                ax.text(0.90, 0.5, f'{team_row["total"]:{format_string}}', transform=ax.transAxes, ha='center', va='center', fontsize=36, weight='bold')
-                #     ax.add_patch(Rectangle((-1.25, 0), 2.5, 1, fill=True,
-                #                            lw=2, zorder=10, alpha=0.075, facecolor='yellow',ec=None))
-
-                # if i in rect_list:
-                #     ax.add_patch(Rectangle((-1.1, 0.02), 2.2, 0.96, fill=True,
-                #                         lw=2, zorder=10, alpha=0.1, facecolor=mlb_team_colors_abb[team],
-                #                         ec=None))
-
-                #     ax.add_patch(Rectangle((-1.1, 0.02), 2.2, 0.96, fill=False,
-                #                         lw=4, zorder=11, alpha=1, facecolor=None,
-                #                         ec=mlb_team_secondary_colors_abb[team]))
-                    
-
+                
+                # Add the player name
+                ax.text(0.27, 0.5, f'{player}', transform=ax.transAxes, ha='left', va='center', 
+                        fontsize=adjusted_fontsize, style='italic')
+                
+                # Add the metric value
+                ax.text(0.90, 0.5, f'{team_row["total"]:{format_string}}', transform=ax.transAxes, 
+                        ha='center', va='center', fontsize=36, weight='bold')
+            
+            
             # Adjust the spacing between subplots to place them on the borders
             ax_top = fig.add_subplot(gs[0, :])
             ax_bot = fig.add_subplot(gs[-1, :])
             ax_left = fig.add_subplot(gs[:, 0])
             ax_right = fig.add_subplot(gs[:, -1])
-
-
+            
             ax_top.axis('off')
             ax_bot.axis('off')
             ax_left.axis('off')
             ax_right.axis('off')
-
+            
             ax_bot.text(s='By: @TJStats', x=0.1, y=0.5, fontsize=24, ha='left')
             ax_bot.text(s='Data: MLB', x=0.9, y=0.5, fontsize=24, ha='right')
-            ax_bot.text(s=f"2025 MLB Season\n{datetime.datetime.today().strftime('%Y-%m-%d')}", x=0.5, y=0.5, fontsize=16, ha='center')
-
-            #↑↓
-
+            ax_bot.text(s=f"2025 MLB Season\n{datetime.datetime.today().strftime('%Y-%m-%d')}", 
+                        x=0.5, y=0.5, fontsize=16, ha='center')
+            
             ax_stat_select = fig.add_subplot(gs[1, 1])
             ax_stat_select.set_xlim(0, 2.5)
-
-            import numpy as np
-            from PIL import Image
+            
             blank_image = np.ones((100, 100, 3), dtype=np.uint8) * 255
-            ax_stat_select.imshow(blank_image, extent=[-0.76, -0.58, 0.05, 0.95],aspect=0.2)
-
-            ax_stat_select.text(0.90*2.5, 0.0, f'{stat_label}', ha='center', va='bottom', fontsize=36,  style='italic')
+            ax_stat_select.imshow(blank_image, extent=[-0.76, -0.58, 0.05, 0.95], aspect=0.2)
+            
+            ax_stat_select.text(0.90*2.5, 0.0, f'{stat_label}', ha='center', va='bottom', 
+                                fontsize=36, style='italic')
             ax_stat_select.axis('off')
-
-            # Fine-tune the spacing between subplots
-            #plt.subplots_adjust(left=0.05, right=0.95, top=0.95, bottom=0.05, wspace=0.1, hspace=0.1)
-
-            ax_top.text(s=f'{title_full}', x=0.5, y=0.0, fontsize=40, ha='center', va='bottom', style='italic', weight='bold')
-
-
-
-            ax_watermark = fig.add_subplot(gs[1:-1,1:-1],zorder=-1) 
-            # Hide axes ticks and labels
+            
+            ax_top.text(s=f'{title_full}', x=0.5, y=0.0, fontsize=40, ha='center', va='bottom', 
+                        style='italic', weight='bold')
+            
+            ax_watermark = fig.add_subplot(gs[1:-1, 1:-1], zorder=-1) 
             ax_watermark.set_xticks([])
             ax_watermark.set_yticks([])
-            ax_watermark.set_frame_on(False)  # Optional: Hide border
-
-
-            img = Image.open('tj stats circle-01_new.jpg')
-            img = img.convert("LA")
-            # Display the image
-            ax_watermark.imshow(img, extent=[0, 1, 0, 1], origin='upper',zorder=-1, alpha=0.075)
-
-
+            ax_watermark.set_frame_on(False)
+            
+            try:
+                img = Image.open('tj stats circle-01_new.jpg')
+                img = img.convert("LA")
+                ax_watermark.imshow(img, extent=[0, 1, 0, 1], origin='upper', zorder=-1, alpha=0.075)
+            except Exception as e:
+                print(f"Failed to load watermark image: {e}")
+    
     @output
     @render.plot
     @reactive.event(input.generate_plot, ignore_none=True)