Update app.py

app.py

@@ -318,12 +318,21 @@ def visualize_molecule_2d_3d(smiles: str, name: str):
         drawer.drawOptions().backgroundColour = (0.11, 0.11, 0.11)  # Dark background
         drawer.drawOptions().symbolColour = (1, 1, 1)  # White symbols
         drawer.drawOptions().defaultColour = (1, 1, 1)  # White default color
+        
+        # Try to set annotation color (this might help with (R)/(S) labels)
+        try:
+            drawer.drawOptions().annotationColour = (1, 1, 1)  # White annotations
+        except:
+            pass
 
         drawer.DrawMolecule(mol)
         drawer.FinishDrawing()
         svg_2d = drawer.GetDrawingText().replace('svg:', '')
 
-        # Comprehensive SVG color fixes for dark background
+        # More aggressive SVG text color fixes - target all possible black text variations
+        import re
+        
+        # First, comprehensive string replacements
         svg_2d = svg_2d.replace('stroke="black"', 'stroke="white"')
         svg_2d = svg_2d.replace('fill="black"', 'fill="white"')
         svg_2d = svg_2d.replace('stroke="#000000"', 'stroke="#FFFFFF"')
@@ -336,30 +345,34 @@ def visualize_molecule_2d_3d(smiles: str, name: str):
         svg_2d = svg_2d.replace('fill:#000000', 'fill:#FFFFFF')
         svg_2d = svg_2d.replace('stroke:#000', 'stroke:#FFF')
         svg_2d = svg_2d.replace('fill:#000', 'fill:#FFF')
-        
-        # Replace any remaining RGB black values
         svg_2d = svg_2d.replace('stroke="rgb(0,0,0)"', 'stroke="rgb(255,255,255)"')
         svg_2d = svg_2d.replace('fill="rgb(0,0,0)"', 'fill="rgb(255,255,255)"')
         svg_2d = svg_2d.replace('stroke:rgb(0,0,0)', 'stroke:rgb(255,255,255)')
         svg_2d = svg_2d.replace('fill:rgb(0,0,0)', 'fill:rgb(255,255,255)')
-        
-        # Fix text/font colors for atom labels and stereochemistry labels
-        svg_2d = svg_2d.replace('<text', '<text fill="white"')
-        svg_2d = svg_2d.replace('fill="white" fill="white"', 'fill="white"')  # Remove duplicates
         svg_2d = svg_2d.replace('color="black"', 'color="white"')
         svg_2d = svg_2d.replace('color:#000000', 'color:#FFFFFF')
         svg_2d = svg_2d.replace('color:#000', 'color:#FFF')
         
-        # Additional fixes for stereochemistry labels (R) and (S) that might be rendered differently
-        # These labels are often in separate text elements
-        import re
-        # Find all text elements and ensure they have white fill
-        svg_2d = re.sub(r'<text([^>]*?)(?:fill="[^"]*")?([^>]*?)>', r'<text\1 fill="white"\2>', svg_2d)
-        # Fix any remaining black text in style attributes
-        svg_2d = re.sub(r'style="([^"]*?)fill:\s*black([^"]*?)"', r'style="\1fill:white\2"', svg_2d)
-        svg_2d = re.sub(r'style="([^"]*?)fill:\s*#000000([^"]*?)"', r'style="\1fill:#FFFFFF\2"', svg_2d)
-        svg_2d = re.sub(r'style="([^"]*?)fill:\s*#000([^"]*?)"', r'style="\1fill:#FFF\2"', svg_2d)
-        svg_2d = re.sub(r'style="([^"]*?)fill:\s*rgb\(0,0,0\)([^"]*?)"', r'style="\1fill:rgb(255,255,255)\2"', svg_2d)
+        # Aggressive regex-based fixes for all text elements
+        # Remove any existing fill attributes from text elements and add white fill
+        svg_2d = re.sub(r'<text([^>]*?)\s+fill="[^"]*"([^>]*?)>', r'<text\1\2 fill="white">', svg_2d)
+        svg_2d = re.sub(r'<text([^>]*?)(?<!fill="white")>', r'<text\1 fill="white">', svg_2d)
+        
+        # Fix style attributes in text elements
+        svg_2d = re.sub(r'<text([^>]*?)style="([^"]*?)fill:\s*(?:black|#000000|#000|rgb\(0,0,0\))([^"]*?)"([^>]*?)>', 
+                       r'<text\1style="\2fill:white\3"\4>', svg_2d)
+        
+        # If text elements don't have any fill specified, ensure they get white
+        svg_2d = re.sub(r'<text(?![^>]*fill=)([^>]*?)>', r'<text fill="white"\1>', svg_2d)
+        
+        # Clean up any duplicate fill attributes
+        svg_2d = re.sub(r'fill="white"\s+fill="white"', 'fill="white"', svg_2d)
+        
+        # Final catch-all: replace any remaining black in the entire SVG
+        svg_2d = re.sub(r'\bblack\b', 'white', svg_2d)
+        svg_2d = re.sub(r'#000000', '#FFFFFF', svg_2d)
+        svg_2d = re.sub(r'#000\b', '#FFF', svg_2d)
+        svg_2d = re.sub(r'rgb\(0,\s*0,\s*0\)', 'rgb(255,255,255)', svg_2d)
         
         # Embed the SVG within a div with a dark background for consistency
         svg_2d = f'<div style="background-color: #1C1C1C; padding: 10px; border-radius: 5px;">{svg_2d}</div>'