Update app.py

app.py

@@ -1,35 +1,19 @@
-from flask import Flask, session, request, redirect, url_for, render_template_string, send_file
-import datetime
-import os
-import secrets
 import torch
-from PIL import Image, ImageDraw
+from PIL import Image, ImageDraw, ImageFont
 from transformers import GroundingDinoProcessor
 from modeling_grounding_dino import GroundingDinoForObjectDetection
+
+from PIL import Image, ImageDraw, ImageFont
 from itertools import cycle
+import os
+from datetime import datetime
+import gradio as gr
 import tempfile
-import io
-
-app = Flask(__name__)
-app.secret_key = os.environ.get('SECRET_KEY', secrets.token_hex(16))
-SECRET_PASSWORD = "VeronaTrento25!"
-app.permanent_session_lifetime = datetime.timedelta(hours=24)
-
-# ===== AUTHENTICATION FUNCTIONS =====
-def is_authenticated():
-    return session.get('authenticated', False)
-
-def require_auth(f):
-    def decorated_function(*args, **kwargs):
-        if not is_authenticated():
-            return redirect(url_for('login'))
-        return f(*args, **kwargs)
-    decorated_function.__name__ = f.__name__
-    return decorated_function
-
-# ===== ML MODEL SETUP =====
-DEVICE = "cpu"
+
+# Load model and processor
+model_id = "fushh7/llmdet_swin_large_hf"
 model_id = "fushh7/llmdet_swin_tiny_hf"
+DEVICE = "cpu"
 
 print(f"[INFO] Using device: {DEVICE}")
 print(f"[INFO] Loading model from {model_id}...")
@@ -40,346 +24,266 @@ model.eval()
 
 print("[INFO] Model loaded successfully.")
 
-# Pre-defined palette
+# Pre-defined palette (extend or tweak as you like)
 BOX_COLORS = [
     "deepskyblue", "red", "lime", "dodgerblue",
-    "cyan", "magenta", "yellow", "orange", "chartreuse"
+    "cyan", "magenta", "yellow",
+    "orange", "chartreuse"
 ]
 
-# ===== ML FUNCTIONS =====
 def save_cropped_images(original_image, boxes, labels, scores):
+    """
+    Salva ogni regione ritagliata definita dalle bounding box in file temporanei.
+    
+    :param original_image: Immagine PIL originale
+    :param boxes: Lista di bounding box [x_min, y_min, x_max, y_max]
+    :param labels: Lista di etichette per ogni box
+    :param scores: Lista di punteggi di confidenza
+    :return: Lista dei percorsi dei file temporanei salvati
+    """
     saved_paths = []
+    
     for i, (box, label, score) in enumerate(zip(boxes, labels, scores)):
+        # Crea un file temporaneo
         with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as tmp_file:
             filepath = tmp_file.name
+        
+        # Ritaglia la regione dall'immagine originale
         cropped_img = original_image.crop(box)
+        
+        # Salva l'immagine ritagliata
         cropped_img.save(filepath)
         saved_paths.append(filepath)
+    
     return saved_paths
 
-def draw_boxes(image, boxes, labels, scores, colors=BOX_COLORS, font_size=16):
+def draw_boxes(image, boxes, labels, scores, colors=BOX_COLORS, font_path="arial.ttf", font_size=16):
+    """
+    Draw bounding boxes and labels on a PIL Image.
+
+    :param image: PIL Image object
+    :param boxes: Iterable of [x_min, y_min, x_max, y_max]
+    :param labels: Iterable of label strings
+    :param scores: Iterable of scalar confidences (0-1)
+    :param colors: List/tuple of colour names or RGB tuples
+    :param font_path: Path to a TTF font for labels
+    :param font_size: Int size of font to use, default 16
+    :return: PIL Image with drawn boxes
+    """
+    # Ensure we can iterate colours indefinitely
     colour_cycle = cycle(colors)
     draw = ImageDraw.Draw(image)
-    
+
+    # Pick a font (fallback to default if missing)
     try:
-        font = ImageFont.truetype("arial.ttf", size=font_size)
-    except:
-        font = ImageFont.load_default()
-    
+        font = ImageFont.truetype(font_path, size=font_size)
+    except IOError:
+        font = ImageFont.load_default(size=font_size)
+
+    # Assign a consistent colour per label (optional)
     label_to_colour = {}
-    
+
     for box, label, score in zip(boxes, labels, scores):
+        # Reuse colour if label seen before, else take next from cycle
         colour = label_to_colour.setdefault(label, next(colour_cycle))
+
         x_min, y_min, x_max, y_max = map(int, box)
-        
+
+        # Draw rectangle
         draw.rectangle([x_min, y_min, x_max, y_max], outline=colour, width=2)
+
+        # Compose text
         text = f"{label} ({score:.3f})"
-        text_bbox = draw.textbbox((0, 0), text, font=font)
-        text_width = text_bbox[2] - text_bbox[0]
-        text_height = text_bbox[3] - text_bbox[1]
-        
-        bg_coords = [x_min, y_min - text_height - 4, x_min + text_width + 4, y_min]
+        text_size = draw.textbbox((0, 0), text, font=font)[2:]
+
+        # Draw text background for legibility
+        bg_coords = [x_min, y_min - text_size[1] - 4,
+                     x_min + text_size[0] + 4, y_min]
         draw.rectangle(bg_coords, fill=colour)
-        draw.text((x_min + 2, y_min - text_height - 2), text, fill="black", font=font)
-    
+
+        # Draw text
+        draw.text((x_min + 2, y_min - text_size[1] - 2),
+                  text, fill="black", font=font)
+
     return image
 
-def resize_image_max_dimension(image, max_size=1024):
+def resize_image_max_dimension(image, max_size=4096):
+    """
+    Resize an image so that the longest side is at most max_size pixels,
+    while maintaining the aspect ratio.
+
+    :param image: PIL Image object
+    :param max_size: Maximum dimension in pixels (default: 1024)
+    :return: PIL Image object (resized)
+    """
     width, height = image.size
+
+    # Check if resizing is needed
     if max(width, height) <= max_size:
         return image
+
+    # Calculate new dimensions maintaining aspect ratio
     ratio = max_size / max(width, height)
     new_width = int(width * ratio)
     new_height = int(height * ratio)
+
+    # Resize the image using high-quality resampling
     return image.resize((new_width, new_height), Image.Resampling.LANCZOS)
 
-def detect_and_draw(img, text_query, box_threshold=0.14, text_threshold=0.13):
+def detect_and_draw(
+    img: Image.Image,
+    text_query: str,
+    box_threshold: float = 0.14,
+    text_threshold: float = 0.13,
+    save_crops: bool = True
+):
+    """
+    Detect objects described in `text_query`, draw boxes, return the image and crops.
+    Note: `text_query` must be lowercase and each concept ends with a dot
+          (e.g. 'a cat. a remote control.')
+    """
+
+    # Make sure text is lowered
     text_query = text_query.lower()
-    img = resize_image_max_dimension(img, max_size=1024)
-    
+
+    # If the image size is too large, we make it smaller
+    img = resize_image_max_dimension(img, max_size=4096)
+
+    # Preprocess the image
     inputs = processor(images=img, text=text_query, return_tensors="pt").to(DEVICE)
-    
+
     with torch.no_grad():
         outputs = model(**inputs)
-    
+
     results = processor.post_process_grounded_object_detection(
         outputs,
         inputs.input_ids,
+        box_threshold=box_threshold,
         text_threshold=text_threshold,
         target_sizes=[img.size[::-1]]
     )[0]
-    
+
     img_out = img.copy()
     img_out = draw_boxes(
         img_out,
-        boxes=results["boxes"].cpu().numpy(),
-        labels=results.get("text_labels", results.get("labels", [])),
-        scores=results["scores"]
+        boxes  = results["boxes"].cpu().numpy(),
+        labels = results.get("text_labels", results.get("labels", [])),
+        scores = results["scores"]
     )
     
-    crop_paths = save_cropped_images(
-        img,
-        boxes=results["boxes"].cpu().numpy(),
-        labels=results.get("text_labels", results.get("labels", [])),
-        scores=results["scores"]
-    )
+    # Lista per i percorsi dei crop
+    crop_paths = []
     
+    if save_crops:
+        crop_paths = save_cropped_images(
+            img,
+            boxes=results["boxes"].cpu().numpy(),
+            labels=results.get("text_labels", results.get("labels", [])),
+            scores=results["scores"]
+        )
+        print(f"Generated {len(crop_paths)} cropped images")
+
     return img_out, crop_paths
 
-# ===== FLASK ROUTES =====
-@app.route('/')
-#@require_auth
-def index():
-    return render_template_string('''
-    <!DOCTYPE html>
-    <html>
-    <head>
-        <title>Student Finder - Protetto</title>
-        <style>
-            body { font-family: Arial, sans-serif; max-width: 1200px; margin: 0 auto; padding: 20px; }
-            .header { background: #e8f5e8; padding: 20px; border-radius: 10px; margin-bottom: 20px; }
-            .content { background: #f5f5f5; padding: 30px; border-radius: 10px; }
-            .form-group { margin-bottom: 15px; }
-            label { display: block; margin-bottom: 5px; font-weight: bold; }
-            input, textarea, select { width: 100%; padding: 8px; border: 1px solid #ddd; border-radius: 4px; }
-            button { background: #007bff; color: white; padding: 10px 20px; border: none; border-radius: 4px; cursor: pointer; }
-            button:hover { background: #0056b3; }
-            .logout { float: right; }
-            .results { margin-top: 20px; }
-            .gallery { display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 10px; margin-top: 20px; }
-            .gallery img { max-width: 100%; height: auto; border: 1px solid #ddd; border-radius: 4px; }
-        </style>
-    </head>
-    <body>
-        <div class="header">
-            <h1>🎓 Student Finder</h1>
-            <p>Carica una foto di classe e trova gli studenti</p>
-            <a href="/logout" class="logout">🔓 Logout</a>
-            <div style="clear: both;"></div>
-        </div>
-        
-        <div class="content">
-            <form method="post" enctype="multipart/form-data" action="/detect">
-                <div class="form-group">
-                    <label for="image">Immagine:</label>
-                    <input type="file" id="image" name="image" accept="image/*" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="text_query">Text Query:</label>
-                    <textarea id="text_query" name="text_query" rows="2" required>heads.</textarea>
-                    <small>Testo in lowercase, ogni concetto termina con '.' (es. 'heads. faces.')</small>
-                </div>
-                
-                <div class="form-group">
-                    <label for="box_threshold">Box Threshold ({{ box_threshold }}):</label>
-                    <input type="range" id="box_threshold" name="box_threshold" min="0" max="1" step="0.05" value="0.14">
-                </div>
-                
-                <div class="form-group">
-                    <label for="text_threshold">Text Threshold ({{ text_threshold }}):</label>
-                    <input type="range" id="text_threshold" name="text_threshold" min="0" max="1" step="0.05" value="0.13">
-                </div>
-                
-                <button type="submit">🔍 Rileva Studenti</button>
-            </form>
-            
-            {% if result_image %}
-            <div class="results">
-                <h3>Risultati:</h3>
-                <img src="data:image/jpeg;base64,{{ result_image }}" alt="Risultato" style="max-width: 100%;">
-                
-                {% if crops %}
-                <h4>Ritagli individuati ({{ crops|length }}):</h4>
-                <div class="gallery">
-                    {% for crop in crops %}
-                    <img src="data:image/jpeg;base64,{{ crop }}" alt="Ritaglio {{ loop.index }}">
-                    {% endfor %}
-                </div>
-                {% endif %}
-            </div>
-            {% endif %}
-        </div>
-    </body>
-    </html>
-    ''', box_threshold=0.14, text_threshold=0.13)
-
-@app.route('/detect', methods=['POST'])
-@require_auth
-def detect():
-    if 'image' not in request.files:
-        return redirect(url_for('index'))
+# Create example list dynamically from examples directory
+def load_examples_from_directory(directory="examples"):
+    """
+    Carica automaticamente tutti i file JPG dalla directory degli esempi.
     
-    image_file = request.files['image']
-    if image_file.filename == '':
-        return redirect(url_for('index'))
+    :param directory: Percorso della directory contenente gli esempi
+    :return: Lista di esempi nel formato [filepath, text_query, box_threshold, text_threshold]
+    """
+    examples = []
     
-    try:
-        # Process image
-        image = Image.open(image_file.stream).convert('RGB')
-        text_query = request.form.get('text_query', 'heads.')
-        box_threshold = float(request.form.get('box_threshold', 0.14))
-        text_threshold = float(request.form.get('text_threshold', 0.13))
-        
-        # Run detection
-        result_image, crop_paths = detect_and_draw(image, text_query, box_threshold, text_threshold)
-        
-        # Convert images to base64 for display
-        import base64
-        
-        # Convert result image to base64
-        img_buffer = io.BytesIO()
-        result_image.save(img_buffer, format='JPEG')
-        result_b64 = base64.b64encode(img_buffer.getvalue()).decode()
-        
-        # Convert crops to base64
-        crops_b64 = []
-        for crop_path in crop_paths:
-            with open(crop_path, 'rb') as f:
-                crop_b64 = base64.b64encode(f.read()).decode()
-                crops_b64.append(crop_b64)
-            # Cleanup temp file
-            os.unlink(crop_path)
-        
-        return render_template_string('''
-        <!DOCTYPE html>
-        <html>
-        <head>
-            <title>Risultati - Student Finder</title>
-            <style>
-                body { font-family: Arial, sans-serif; max-width: 1200px; margin: 0 auto; padding: 20px; }
-                .header { background: #e8f5e8; padding: 20px; border-radius: 10px; margin-bottom: 20px; }
-                .content { background: #f5f5f5; padding: 30px; border-radius: 10px; }
-                .logout { float: right; }
-                .gallery { display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 10px; margin-top: 20px; }
-                .gallery img { max-width: 100%; height: auto; border: 1px solid #ddd; border-radius: 4px; }
-                .back-btn { background: #6c757d; color: white; padding: 10px 20px; border: none; border-radius: 4px; cursor: pointer; text-decoration: none; display: inline-block; margin-bottom: 20px; }
-                .back-btn:hover { background: #545b62; }
-            </style>
-        </head>
-        <body>
-            <div class="header">
-                <h1>🎓 Risultati Student Finder</h1>
-                <a href="/logout" class="logout">🔓 Logout</a>
-                <div style="clear: both;"></div>
-            </div>
-            
-            <a href="/" class="back-btn">← Nuova Analisi</a>
-            
-            <div class="content">
-                <h3>Immagine con bounding box:</h3>
-                <img src="data:image/jpeg;base64,{{ result_image }}" alt="Risultato" style="max-width: 100%; border: 1px solid #ddd; border-radius: 4px;">
-                
-                {% if crops %}
-                <h3>Ritagli individuati ({{ crops|length }}):</h3>
-                <div class="gallery">
-                    {% for crop in crops %}
-                    <img src="data:image/jpeg;base64,{{ crop }}" alt="Ritaglio {{ loop.index }}">
-                    {% endfor %}
-                </div>
-                {% else %}
-                <p>Nessun ritaglio individuato.</p>
-                {% endif %}
-            </div>
-        </body>
-        </html>
-        ''', result_image=result_b64, crops=crops_b64)
-        
-    except Exception as e:
-        return f"Errore durante l'elaborazione: {str(e)}", 500
+    # Verifica se la directory esiste
+    if not os.path.exists(directory):
+        print(f"[WARNING] Directory '{directory}' non trovata. Creala e aggiungi file JPG.")
+        return examples
+    
+    # Cerca tutti i file JPG nella directory
+    #jpg_files = [f for f in os.listdir(directory) if f.lower().endswith('.jpg')]
+    jpg_files = [f for f in os.listdir(directory) if f.lower().endswith(('.jpg', '.png'))]
+    if not jpg_files:
+        print(f"[WARNING] Nessun file JPG trovato nella directory '{directory}'")
+        return examples
+    
+    print(f"[INFO] Trovati {len(jpg_files)} file JPG nella directory examples/")
+    
+    # Crea gli esempi per ogni file JPG
+    for jpg_file in jpg_files:
+        filepath = os.path.join(directory, jpg_file)
+        examples.append([filepath, "heads.", 0.24, 0.23])
+    
+    return examples
+
+# Popola automaticamente la lista degli esempi
+examples = load_examples_from_directory()
+
+# Se non sono stati trovati esempi, usa un esempio di fallback
+if not examples:
+    print("[INFO] Usando esempio di fallback")
+    examples = [
+        ["examples/stickers(1).jpg", "heads.", 0.24, 0.23],
+    ]
 
-@app.route('/login', methods=['GET', 'POST'])
-def login():
-    if is_authenticated():
-        return redirect(url_for('index'))
+# Funzione per pulire i file temporanei dopo l'uso
+def cleanup_temp_files(crop_paths):
+    for path in crop_paths:
+        try:
+            os.unlink(path)
+        except:
+            pass
+
+# Create Gradio demo
+with gr.Blocks(title="ClasmateFaceFinder", css=".gradio-container {max-width: 100% !important}") as demo:
+    gr.Markdown("# Classmate  Finder")
+    gr.Markdown("Upload an image  and adjust thresholds to see detections.")
+    
+    with gr.Row():
+        with gr.Column():
+            image_input = gr.Image(type="pil", label="Input Image")
+            text_query = gr.Textbox(
+                value="head.",
+                label="Text Query (lowercase, end each with '.', for example 'a bird. a tree.')"
+            )
+            box_threshold = gr.Slider(0.0, 1.0, 0.14, step=0.05, label="Box Threshold")
+            text_threshold = gr.Slider(0.0, 1.0, 0.13, step=0.05, label="Text Threshold")
+            submit_btn = gr.Button("Detect")
+        
+        with gr.Column():
+            image_output = gr.Image(type="pil", label="Detections")
+    
+    # Galleria per i crop
+    gallery = gr.Gallery(
+        label="Detected Crops",
+        columns=[4],
+        rows=[2],
+        object_fit="contain",
+        height="auto"
+    )
     
-    error = None
-    if request.method == 'POST':
-        if request.form.get('password') == SECRET_PASSWORD:
-            session.permanent = True
-            session['authenticated'] = True
-            return redirect(url_for('index'))
-        else:
-            error = "❌ Password errata. Riprova."
+    # Esempi
+    gr.Examples(
+        examples=examples,
+        inputs=[image_input, text_query, box_threshold, text_threshold],
+        outputs=[image_output, gallery],
+        fn=detect_and_draw,
+        cache_examples=True
+    )
     
-    return render_template_string('''
-    <!DOCTYPE html>
-    <html>
-    <head>
-        <title>Login - Student Finder</title>
-        <style>
-            body { 
-                font-family: Arial, sans-serif; 
-                max-width: 400px; 
-                margin: 100px auto; 
-                padding: 20px;
-                background: #f5f5f5;
-            }
-            .login-form { 
-                background: white; 
-                padding: 30px; 
-                border-radius: 10px;
-                box-shadow: 0 2px 10px rgba(0,0,0,0.1);
-            }
-            h2 {
-                color: #333;
-                text-align: center;
-                margin-bottom: 20px;
-            }
-            input[type="password"] { 
-                width: 100%; 
-                padding: 12px; 
-                margin: 15px 0; 
-                border: 1px solid #ddd; 
-                border-radius: 5px;
-                box-sizing: border-box;
-                font-size: 16px;
-            }
-            button { 
-                background: #007bff; 
-                color: white; 
-                padding: 12px 20px; 
-                border: none; 
-                border-radius: 5px; 
-                cursor: pointer;
-                width: 100%;
-                font-size: 16px;
-            }
-            button:hover {
-                background: #0056b3;
-            }
-            .error { 
-                color: red; 
-                margin-bottom: 15px;
-                text-align: center;
-                padding: 10px;
-                background: #ffe6e6;
-                border-radius: 5px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="login-form">
-            <h2>🔒 Student Finder - Accesso Protetto</h2>
-            <p style="text-align: center; color: #666;">Inserisci la password per accedere</p>
-            {% if error %}
-                <div class="error">{{ error }}</div>
-            {% endif %}
-            <form method="POST">
-                <input type="password" name="password" placeholder="Password" required>
-                <button type="submit">🔑 Accedi</button>
-            </form>
-        </div>
-    </body>
-    </html>
-    ''', error=error)
-
-@app.route('/logout')
-def logout():
-    session.clear()
-    return redirect(url_for('login'))
+    # Pulsante di submit
+    submit_btn.click(
+        fn=detect_and_draw,
+        inputs=[image_input, text_query, box_threshold, text_threshold],
+        outputs=[image_output, gallery]
+    )
     
+    # Pulisci i file temporanei quando viene caricato un nuovo esempio
+    demo.load(
+        fn=lambda: None,
+        inputs=None,
+        outputs=None,
+    )
 
-if __name__ == '__main__':
-    port = int(os.environ.get('PORT', 7860))
-    app.run(host='0.0.0.0', port=port, debug=False)
+if __name__ == "__main__":
+    demo.launch(server_name="0.0.0.0", share=False)