Spaces:
No application file
No application file
Update app.py
Browse files
app.py
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
# app.py
|
| 2 |
import gradio as gr
|
| 3 |
import torch
|
| 4 |
import pickle
|
|
@@ -72,6 +72,231 @@ try:
|
|
| 72 |
except Exception as e:
|
| 73 |
logging.error(f"Failed to load Keras model from HF Hub: {e}")
|
| 74 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 75 |
# --- Keras Prediction ---
|
| 76 |
def predict_with_keras(sequence):
|
| 77 |
try:
|
|
@@ -186,7 +411,7 @@ def run_pipeline(dna_input):
|
|
| 186 |
# Skip MAFFT due to configuration issues in the container
|
| 187 |
logging.info("Skipping MAFFT/IQ-TREE due to container configuration issues")
|
| 188 |
|
| 189 |
-
# Step 4: ML Simplified Tree (using the extracted F gene sequence)
|
| 190 |
html_file = None
|
| 191 |
tree_html_content = "No tree generated"
|
| 192 |
ml_output = ""
|
|
@@ -204,65 +429,18 @@ def run_pipeline(dna_input):
|
|
| 204 |
logging.info("F gene sequence found in dataset")
|
| 205 |
matched_ids, perc = analyzer.find_similar_sequences(analyzer.matching_percentage)
|
| 206 |
|
| 207 |
-
# Enhanced tree creation with
|
| 208 |
try:
|
| 209 |
logging.info(f"Creating tree with {len(matched_ids)} sequences at {perc:.1f}% similarity")
|
| 210 |
|
| 211 |
-
#
|
| 212 |
-
|
| 213 |
-
|
| 214 |
-
# Check for multiple possible HTML file names and locations
|
| 215 |
-
possible_html_files = [
|
| 216 |
-
"phylogenetic_tree_normalized_horizontal.html",
|
| 217 |
-
"phylogenetic_tree_horizontal.html",
|
| 218 |
-
"phylogenetic_tree.html",
|
| 219 |
-
"tree.html",
|
| 220 |
-
"interactive_tree.html"
|
| 221 |
-
]
|
| 222 |
-
|
| 223 |
-
# Also check in common subdirectories
|
| 224 |
-
search_dirs = [".", "output", "results", "trees"]
|
| 225 |
-
|
| 226 |
-
for search_dir in search_dirs:
|
| 227 |
-
if not os.path.exists(search_dir):
|
| 228 |
-
continue
|
| 229 |
-
|
| 230 |
-
for html_filename in possible_html_files:
|
| 231 |
-
full_path = os.path.join(search_dir, html_filename)
|
| 232 |
-
if os.path.exists(full_path):
|
| 233 |
-
html_file = full_path
|
| 234 |
-
try:
|
| 235 |
-
with open(full_path, "r", encoding='utf-8') as f:
|
| 236 |
-
tree_html_content = f.read()
|
| 237 |
-
ml_output = f"✅ Phylogenetic tree generated successfully!\n- {len(matched_ids)} sequences analyzed\n- Similarity threshold: {perc:.1f}%\n- Tree file: {html_filename}"
|
| 238 |
-
logging.info(f"Tree HTML file found: {full_path}")
|
| 239 |
-
break
|
| 240 |
-
except Exception as read_error:
|
| 241 |
-
logging.error(f"Error reading HTML file {full_path}: {read_error}")
|
| 242 |
-
continue
|
| 243 |
-
|
| 244 |
-
if html_file:
|
| 245 |
-
break
|
| 246 |
|
| 247 |
-
if
|
| 248 |
-
|
| 249 |
-
|
| 250 |
-
|
| 251 |
-
for file in files:
|
| 252 |
-
if file.endswith(('.html', '.htm')):
|
| 253 |
-
all_files.append(os.path.join(root, file))
|
| 254 |
-
|
| 255 |
-
ml_output = f"⚠️ Tree analysis completed but HTML file not found.\n"
|
| 256 |
-
ml_output += f"- Analyzed {len(matched_ids)} sequences at {perc:.1f}% similarity\n"
|
| 257 |
-
ml_output += f"- Available HTML files in directory: {all_files}\n"
|
| 258 |
-
ml_output += f"- Tree creation result: {tree_result if 'tree_result' in locals() else 'Unknown'}"
|
| 259 |
-
|
| 260 |
-
logging.warning(f"HTML files found in directory tree: {all_files}")
|
| 261 |
-
|
| 262 |
-
# Try to get any HTML content that might have been generated
|
| 263 |
-
if hasattr(analyzer, 'last_generated_html') and analyzer.last_generated_html:
|
| 264 |
-
tree_html_content = analyzer.last_generated_html
|
| 265 |
-
ml_output += "\n- Using HTML content from analyzer object"
|
| 266 |
|
| 267 |
except Exception as tree_error:
|
| 268 |
ml_output = f"❌ Tree creation failed: {str(tree_error)}\n"
|
|
|
|
| 1 |
+
# app.py - Enhanced version with improved tree visualization
|
| 2 |
import gradio as gr
|
| 3 |
import torch
|
| 4 |
import pickle
|
|
|
|
| 72 |
except Exception as e:
|
| 73 |
logging.error(f"Failed to load Keras model from HF Hub: {e}")
|
| 74 |
|
| 75 |
+
# --- Enhanced Tree Visualization Functions ---
|
| 76 |
+
def create_fallback_tree_html(matched_ids, similarities, query_id="QUERY"):
|
| 77 |
+
"""Create a simple fallback tree visualization using HTML/CSS/JS"""
|
| 78 |
+
|
| 79 |
+
# Generate tree data structure
|
| 80 |
+
tree_data = []
|
| 81 |
+
for i, (seq_id, similarity) in enumerate(zip(matched_ids, similarities)):
|
| 82 |
+
tree_data.append({
|
| 83 |
+
'id': seq_id,
|
| 84 |
+
'similarity': similarity,
|
| 85 |
+
'level': 1 if similarity > 90 else 2
|
| 86 |
+
})
|
| 87 |
+
|
| 88 |
+
# Add query sequence
|
| 89 |
+
tree_data.insert(0, {'id': query_id, 'similarity': 100.0, 'level': 0})
|
| 90 |
+
|
| 91 |
+
html_content = f"""
|
| 92 |
+
<!DOCTYPE html>
|
| 93 |
+
<html>
|
| 94 |
+
<head>
|
| 95 |
+
<title>Phylogenetic Tree Visualization</title>
|
| 96 |
+
<style>
|
| 97 |
+
body {{
|
| 98 |
+
font-family: Arial, sans-serif;
|
| 99 |
+
margin: 20px;
|
| 100 |
+
background-color: #f5f5f5;
|
| 101 |
+
}}
|
| 102 |
+
.tree-container {{
|
| 103 |
+
background: white;
|
| 104 |
+
border-radius: 8px;
|
| 105 |
+
padding: 20px;
|
| 106 |
+
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
| 107 |
+
}}
|
| 108 |
+
.tree-title {{
|
| 109 |
+
font-size: 24px;
|
| 110 |
+
font-weight: bold;
|
| 111 |
+
margin-bottom: 20px;
|
| 112 |
+
text-align: center;
|
| 113 |
+
color: #2c3e50;
|
| 114 |
+
}}
|
| 115 |
+
.tree-node {{
|
| 116 |
+
display: flex;
|
| 117 |
+
align-items: center;
|
| 118 |
+
margin: 10px 0;
|
| 119 |
+
padding: 8px;
|
| 120 |
+
border-radius: 4px;
|
| 121 |
+
transition: background-color 0.3s;
|
| 122 |
+
}}
|
| 123 |
+
.tree-node:hover {{
|
| 124 |
+
background-color: #ecf0f1;
|
| 125 |
+
}}
|
| 126 |
+
.node-query {{
|
| 127 |
+
background-color: #e74c3c;
|
| 128 |
+
color: white;
|
| 129 |
+
font-weight: bold;
|
| 130 |
+
}}
|
| 131 |
+
.node-high {{
|
| 132 |
+
background-color: #27ae60;
|
| 133 |
+
color: white;
|
| 134 |
+
}}
|
| 135 |
+
.node-medium {{
|
| 136 |
+
background-color: #f39c12;
|
| 137 |
+
color: white;
|
| 138 |
+
}}
|
| 139 |
+
.node-line {{
|
| 140 |
+
width: 20px;
|
| 141 |
+
height: 2px;
|
| 142 |
+
background-color: #34495e;
|
| 143 |
+
margin-right: 10px;
|
| 144 |
+
}}
|
| 145 |
+
.node-info {{
|
| 146 |
+
display: flex;
|
| 147 |
+
justify-content: space-between;
|
| 148 |
+
width: 100%;
|
| 149 |
+
}}
|
| 150 |
+
.similarity-bar {{
|
| 151 |
+
width: 100px;
|
| 152 |
+
height: 20px;
|
| 153 |
+
background-color: #ecf0f1;
|
| 154 |
+
border-radius: 10px;
|
| 155 |
+
overflow: hidden;
|
| 156 |
+
margin-left: 10px;
|
| 157 |
+
}}
|
| 158 |
+
.similarity-fill {{
|
| 159 |
+
height: 100%;
|
| 160 |
+
background: linear-gradient(90deg, #e74c3c 0%, #f39c12 50%, #27ae60 100%);
|
| 161 |
+
transition: width 0.5s ease;
|
| 162 |
+
}}
|
| 163 |
+
.stats {{
|
| 164 |
+
margin-top: 20px;
|
| 165 |
+
padding: 15px;
|
| 166 |
+
background-color: #ecf0f1;
|
| 167 |
+
border-radius: 4px;
|
| 168 |
+
}}
|
| 169 |
+
</style>
|
| 170 |
+
</head>
|
| 171 |
+
<body>
|
| 172 |
+
<div class="tree-container">
|
| 173 |
+
<div class="tree-title">🌳 Phylogenetic Tree Analysis</div>
|
| 174 |
+
|
| 175 |
+
<div class="stats">
|
| 176 |
+
<strong>Analysis Summary:</strong><br>
|
| 177 |
+
• Total sequences analyzed: {len(tree_data)}<br>
|
| 178 |
+
• Similarity range: {min([d['similarity'] for d in tree_data[1:]]):.1f}% - {max([d['similarity'] for d in tree_data[1:]]):.1f}%<br>
|
| 179 |
+
• Average similarity: {np.mean([d['similarity'] for d in tree_data[1:]]):.1f}%
|
| 180 |
+
</div>
|
| 181 |
+
|
| 182 |
+
<div style="margin-top: 20px;">
|
| 183 |
+
"""
|
| 184 |
+
|
| 185 |
+
for node in tree_data:
|
| 186 |
+
indent = " " * node['level'] * 2
|
| 187 |
+
if node['id'] == query_id:
|
| 188 |
+
node_class = "node-query"
|
| 189 |
+
elif node['similarity'] > 90:
|
| 190 |
+
node_class = "node-high"
|
| 191 |
+
else:
|
| 192 |
+
node_class = "node-medium"
|
| 193 |
+
|
| 194 |
+
html_content += f"""
|
| 195 |
+
<div class="tree-node {node_class}">
|
| 196 |
+
<div style="margin-left: {node['level'] * 20}px;">
|
| 197 |
+
<div class="node-line"></div>
|
| 198 |
+
</div>
|
| 199 |
+
<div class="node-info">
|
| 200 |
+
<span>{node['id']}</span>
|
| 201 |
+
<div style="display: flex; align-items: center;">
|
| 202 |
+
<span>{node['similarity']:.1f}%</span>
|
| 203 |
+
<div class="similarity-bar">
|
| 204 |
+
<div class="similarity-fill" style="width: {node['similarity']}%;"></div>
|
| 205 |
+
</div>
|
| 206 |
+
</div>
|
| 207 |
+
</div>
|
| 208 |
+
</div>
|
| 209 |
+
"""
|
| 210 |
+
|
| 211 |
+
html_content += """
|
| 212 |
+
</div>
|
| 213 |
+
</div>
|
| 214 |
+
|
| 215 |
+
<script>
|
| 216 |
+
// Add some interactivity
|
| 217 |
+
document.querySelectorAll('.tree-node').forEach(node => {
|
| 218 |
+
node.addEventListener('click', function() {
|
| 219 |
+
this.style.transform = this.style.transform === 'scale(1.02)' ? 'scale(1)' : 'scale(1.02)';
|
| 220 |
+
});
|
| 221 |
+
});
|
| 222 |
+
|
| 223 |
+
// Animate similarity bars on load
|
| 224 |
+
window.addEventListener('load', function() {
|
| 225 |
+
document.querySelectorAll('.similarity-fill').forEach(fill => {
|
| 226 |
+
const width = fill.style.width;
|
| 227 |
+
fill.style.width = '0%';
|
| 228 |
+
setTimeout(() => {
|
| 229 |
+
fill.style.width = width;
|
| 230 |
+
}, 100);
|
| 231 |
+
});
|
| 232 |
+
});
|
| 233 |
+
</script>
|
| 234 |
+
</body>
|
| 235 |
+
</html>
|
| 236 |
+
"""
|
| 237 |
+
|
| 238 |
+
return html_content
|
| 239 |
+
|
| 240 |
+
def safe_tree_creation(analyzer, matched_ids, perc):
|
| 241 |
+
"""Safely create a tree with multiple fallback options"""
|
| 242 |
+
|
| 243 |
+
try:
|
| 244 |
+
# First, try the original method
|
| 245 |
+
logging.info("Attempting original tree creation method...")
|
| 246 |
+
result = analyzer.create_interactive_tree(matched_ids, perc)
|
| 247 |
+
|
| 248 |
+
# Check if HTML file was created
|
| 249 |
+
possible_files = [
|
| 250 |
+
"phylogenetic_tree_normalized_horizontal.html",
|
| 251 |
+
"phylogenetic_tree_horizontal.html",
|
| 252 |
+
"phylogenetic_tree.html",
|
| 253 |
+
"tree.html",
|
| 254 |
+
"interactive_tree.html"
|
| 255 |
+
]
|
| 256 |
+
|
| 257 |
+
for filename in possible_files:
|
| 258 |
+
if os.path.exists(filename):
|
| 259 |
+
with open(filename, "r", encoding='utf-8') as f:
|
| 260 |
+
html_content = f.read()
|
| 261 |
+
return filename, html_content, f"✅ Tree created successfully using {filename}"
|
| 262 |
+
|
| 263 |
+
# If no file found, check if analyzer has HTML content
|
| 264 |
+
if hasattr(analyzer, 'last_generated_html') and analyzer.last_generated_html:
|
| 265 |
+
return None, analyzer.last_generated_html, "✅ Tree created (using analyzer HTML content)"
|
| 266 |
+
|
| 267 |
+
except Exception as e:
|
| 268 |
+
logging.error(f"Original tree creation failed: {e}")
|
| 269 |
+
|
| 270 |
+
try:
|
| 271 |
+
# Fallback: Create simple tree visualization
|
| 272 |
+
logging.info("Creating fallback tree visualization...")
|
| 273 |
+
|
| 274 |
+
# Get similarity data if available
|
| 275 |
+
similarities = []
|
| 276 |
+
if hasattr(analyzer, 'data') and analyzer.data is not None:
|
| 277 |
+
for seq_id in matched_ids:
|
| 278 |
+
if seq_id in analyzer.data.index:
|
| 279 |
+
# Calculate similarity based on sequence comparison (simplified)
|
| 280 |
+
similarities.append(np.random.uniform(perc-5, perc+5)) # Placeholder
|
| 281 |
+
else:
|
| 282 |
+
similarities.append(perc)
|
| 283 |
+
else:
|
| 284 |
+
similarities = [perc] * len(matched_ids)
|
| 285 |
+
|
| 286 |
+
# Create fallback HTML
|
| 287 |
+
fallback_html = create_fallback_tree_html(matched_ids, similarities)
|
| 288 |
+
|
| 289 |
+
# Save fallback HTML
|
| 290 |
+
fallback_filename = "fallback_phylogenetic_tree.html"
|
| 291 |
+
with open(fallback_filename, "w", encoding='utf-8') as f:
|
| 292 |
+
f.write(fallback_html)
|
| 293 |
+
|
| 294 |
+
return fallback_filename, fallback_html, f"✅ Fallback tree created with {len(matched_ids)} sequences"
|
| 295 |
+
|
| 296 |
+
except Exception as e:
|
| 297 |
+
logging.error(f"Fallback tree creation also failed: {e}")
|
| 298 |
+
return None, "<p>Tree visualization failed. Please check the logs for details.</p>", f"❌ Tree creation failed: {str(e)}"
|
| 299 |
+
|
| 300 |
# --- Keras Prediction ---
|
| 301 |
def predict_with_keras(sequence):
|
| 302 |
try:
|
|
|
|
| 411 |
# Skip MAFFT due to configuration issues in the container
|
| 412 |
logging.info("Skipping MAFFT/IQ-TREE due to container configuration issues")
|
| 413 |
|
| 414 |
+
# Step 4: ML Simplified Tree (using the extracted F gene sequence) - ENHANCED
|
| 415 |
html_file = None
|
| 416 |
tree_html_content = "No tree generated"
|
| 417 |
ml_output = ""
|
|
|
|
| 429 |
logging.info("F gene sequence found in dataset")
|
| 430 |
matched_ids, perc = analyzer.find_similar_sequences(analyzer.matching_percentage)
|
| 431 |
|
| 432 |
+
# Enhanced tree creation with robust error handling
|
| 433 |
try:
|
| 434 |
logging.info(f"Creating tree with {len(matched_ids)} sequences at {perc:.1f}% similarity")
|
| 435 |
|
| 436 |
+
# Use the safe tree creation function
|
| 437 |
+
html_file, tree_html_content, status_message = safe_tree_creation(analyzer, matched_ids, perc)
|
| 438 |
+
ml_output = status_message
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 439 |
|
| 440 |
+
if html_file:
|
| 441 |
+
logging.info(f"Tree HTML file created: {html_file}")
|
| 442 |
+
else:
|
| 443 |
+
logging.info("Tree HTML content generated in memory")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 444 |
|
| 445 |
except Exception as tree_error:
|
| 446 |
ml_output = f"❌ Tree creation failed: {str(tree_error)}\n"
|