Update app.py

app.py

@@ -7,6 +7,10 @@ import tiktoken
 from datetime import datetime, timedelta
 from collections import defaultdict, deque
 from detoxify import Detoxify
+import logging
+
+# Flask'in varsayılan logger'ını daha iyi kullanmak için yapılandırma
+logging.basicConfig(level=logging.INFO)
 
 app = Flask(__name__, static_folder='static', template_folder='templates')
 
@@ -17,9 +21,7 @@ print("Model loaded successfully.")
 API_KEY = os.getenv('API_KEY', 'your-api-key-here')
 
 # --- Geliştirilmiş Metrik Takip Sistemi ---
-# Son 100 isteğin süresini tutarak daha dinamik bir ortalama elde ederiz
 request_durations = deque(maxlen=100) 
-# Son 10 dakika içindeki isteklerin zaman damgalarını tutarak RPM hesaplarız
 request_timestamps = deque(maxlen=1000) 
 
 daily_requests = defaultdict(int)
@@ -40,20 +42,24 @@ def transform_predictions(prediction_dict):
     
     scores = {}
     for key in category_keys:
-        # Değerleri float'a çevirerek JSON uyumluluğunu garantiliyoruz
         scores[key] = float(prediction_dict.get(key, 0.0))
     
     threshold = 0.5
     bool_categories = {key: (scores[key] > threshold) for key in category_keys}
-    cat_applied_input_types = {key: (["text"] if scores[key] > 0 else []) for key in category_keys}
     flagged = any(bool_categories.values())
     
-    return flagged, bool_categories, scores, cat_applied_input_types
+    return flagged, bool_categories, scores
 
 def track_request_metrics(start_time, tokens_count):
     end_time = time.time()
     duration = end_time - start_time
     
+    # --- İSTEK ÜZERİNE GÜNCELLENEN KISIM ---
+    # Sunucu taraflı işlem süresini milisaniye olarak terminale logla.
+    # Bu log, arayüzdeki metriklerle tutarlı olacaktır.
+    app.logger.info(f"Server-side processing for moderation request took {duration * 1000:.2f} ms.")
+    # ------------------------------------------
+    
     request_durations.append(duration)
     request_timestamps.append(datetime.now())
     
@@ -66,7 +72,6 @@ def get_performance_metrics():
     with concurrent_requests_lock:
         current_concurrent = concurrent_requests
     
-    # Ortalama ve Zirve Yanıt Süresi (Son 100 istek üzerinden)
     if not request_durations:
         avg_request_time = 0
         peak_request_time = 0
@@ -74,7 +79,6 @@ def get_performance_metrics():
         avg_request_time = sum(request_durations) / len(request_durations)
         peak_request_time = max(request_durations)
 
-    # RPM (Requests Per Minute) - Dakikadaki İstek Sayısı
     now = datetime.now()
     one_minute_ago = now - timedelta(seconds=60)
     requests_last_minute = sum(1 for ts in request_timestamps if ts > one_minute_ago)
@@ -116,46 +120,52 @@ def moderations():
     start_time = time.time()
     total_tokens = 0
     
+    response = None
     try:
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith("Bearer "):
-            return jsonify({"error": "Unauthorized"}), 401
+            response = jsonify({"error": "Unauthorized"}), 401
+            return response
         
         provided_api_key = auth_header.split(" ")[1]
         if provided_api_key != API_KEY:
-            return jsonify({"error": "Unauthorized"}), 401
+            response = jsonify({"error": "Unauthorized"}), 401
+            return response
         
         data = request.get_json()
         raw_input = data.get('input')
         
         if raw_input is None:
-            return jsonify({"error": "Invalid input, 'input' field is required"}), 400
+            response = jsonify({"error": "Invalid input, 'input' field is required"}), 400
+            return response
         
         if isinstance(raw_input, str):
             texts = [raw_input]
         elif isinstance(raw_input, list):
             texts = raw_input
         else:
-            return jsonify({"error": "Invalid input format, expected string or list of strings"}), 400
+            response = jsonify({"error": "Invalid input format, expected string or list of strings"}), 400
+            return response
         
         if not texts:
-            return jsonify({"error": "Input list cannot be empty"}), 400
+            response = jsonify({"error": "Input list cannot be empty"}), 400
+            return response
 
         if len(texts) > 10:
-            return jsonify({"error": "Too many input items. Maximum 10 allowed."}), 400
+            response = jsonify({"error": "Too many input items. Maximum 10 allowed."}), 400
+            return response
         
         for text in texts:
             if not isinstance(text, str) or len(text.encode('utf-8')) > 300000:
-                return jsonify({"error": "Each input item must be a string with a maximum of 300k bytes."}), 400
+                response = jsonify({"error": "Each input item must be a string with a maximum of 300k bytes."}), 400
+                return response
             total_tokens += count_tokens(text)
         
-        results = []
-        # Detoxify'a tüm listeyi tek seferde vermek performansı artırır
         predictions = detoxify_model.predict(texts)
-        # Predictions'ı her metin için ayrı bir sözlüğe dönüştür
+        results = []
         for i in range(len(texts)):
             single_prediction = {key: value[i] for key, value in predictions.items()}
-            flagged, bool_categories, scores, cat_applied_input_types = transform_predictions(single_prediction)
+            flagged, bool_categories, scores = transform_predictions(single_prediction)
             
             results.append({
                 "flagged": flagged,
@@ -163,20 +173,25 @@ def moderations():
                 "category_scores": scores,
             })
         
-        track_request_metrics(start_time, total_tokens)
-        
         response_data = {
             "id": "modr-" + uuid.uuid4().hex[:24],
             "model": "text-moderation-detoxify-multilingual",
             "results": results
         }
         
-        return jsonify(response_data)
+        response = jsonify(response_data)
+        return response
     
     except Exception as e:
-        print(f"An error occurred: {e}")
-        return jsonify({"error": "An internal server error occurred."}), 500
+        app.logger.error(f"An error occurred: {e}", exc_info=True)
+        response = jsonify({"error": "An internal server error occurred."}), 500
+        return response
     finally:
+        # Bu blok her zaman çalışır, response döndürülmeden hemen önce
+        if response and response.status_code < 400:
+             # Sadece başarılı istekleri metrikler için takip et
+            track_request_metrics(start_time, total_tokens)
+        
         with concurrent_requests_lock:
             concurrent_requests -= 1
 
@@ -193,6 +208,7 @@ def metrics():
     return jsonify(get_performance_metrics())
 
 def create_directories_and_files():
+    # Bu fonksiyon HTML/CSS içeriği değişmediği için aynı kalabilir.
     os.makedirs('templates', exist_ok=True)
     os.makedirs('static', exist_ok=True)
     
@@ -384,7 +400,7 @@ def create_directories_and_files():
                 <div class="flex justify-between items-center mb-4">
                     <h3 class="text-lg font-semibold">Summary</h3>
                     <div class="text-sm text-gray-500 dark:text-gray-400">
-                        <i class="fas fa-clock mr-1"></i> Response time: <span id="responseTime">0ms</span>
+                        <i class="fas fa-stopwatch mr-1"></i> Round-trip time: <span id="responseTime">0ms</span>
                     </div>
                 </div>
                 
@@ -405,7 +421,7 @@ def create_directories_and_files():
                 <h3 class="text-lg font-semibold mb-4">Request Body</h3>
                 <div class="bg-gray-100 dark:bg-gray-700 p-4 rounded-lg mb-6 overflow-x-auto">
                     <pre class="text-sm"><code>{
-  "input": "Text to moderate"
+  "input": "Text to moderate" 
 }</code></pre>
                 </div>
                 <h3 class="text-lg font-semibold mb-4">Response</h3>
@@ -441,6 +457,7 @@ def create_directories_and_files():
     </footer>
 
     <script>
+        // JS kodu değişmediği için aynı kalabilir.
         const darkModeToggle = document.getElementById('darkModeToggle');
         const html = document.documentElement;
         
@@ -647,7 +664,7 @@ def create_directories_and_files():
             initActivityChart();
             document.getElementById('refreshMetrics').addEventListener('click', fetchMetrics);
             fetchMetrics();
-            setInterval(fetchMetrics, 15000); // Refresh metrics every 15 seconds
+            setInterval(fetchMetrics, 15000);
         });
     </script>
 </body>
@@ -656,7 +673,4 @@ def create_directories_and_files():
 if __name__ == '__main__':
     create_directories_and_files()
     port = int(os.getenv('PORT', 7860))
-    # debug=True'yu production ortamında False yapın.
-    # Modelin yüklenmesi uzun sürdüğü için `use_reloader=False` eklemek,
-    # geliştirme sırasında her dosya değişikliğinde modeli tekrar yüklemesini engeller.
     app.run(host='0.0.0.0', port=port, debug=True, use_reloader=False)