Update app.py

app.py

@@ -10,43 +10,31 @@ from detoxify import Detoxify
 
 app = Flask(__name__, static_folder='static', template_folder='templates')
 
-# Load the detoxify model
 detoxify_model = Detoxify('multilingual')
 
-# API key from environment variable
 API_KEY = os.getenv('API_KEY', 'your-api-key-here')
 
-# Performance metrics tracking
-request_times = deque(maxlen=1000)  # Store last 1000 request times
+request_times = deque(maxlen=1000)
 daily_requests = defaultdict(int)
 daily_tokens = defaultdict(int)
 concurrent_requests = 0
 concurrent_requests_lock = threading.Lock()
 
-# Token encoding for counting tokens
 encoding = tiktoken.get_encoding("cl100k_base")
 
 def count_tokens(text):
-    """Count tokens in the given text using tiktoken."""
     return len(encoding.encode(text))
 
 def transform_predictions(prediction_dict):
-    """
-    Transform predictions to OpenAI-style format.
-    Returns: flagged, categories, category_scores, category_applied_input_types
-    """
-    # Define the categories we want to track
     category_keys = [
         "toxicity", "severe_toxicity", "obscene", "threat", 
         "insult", "identity_attack", "sexual_explicit"
     ]
     
-    # Map detoxify output to our categories
     scores = {}
     for key in category_keys:
         scores[key] = prediction_dict.get(key, 0.0)
     
-    # Set threshold for flagging content
     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}
@@ -55,36 +43,28 @@ def transform_predictions(prediction_dict):
     return flagged, bool_categories, scores, cat_applied_input_types
 
 def track_request_metrics(start_time, tokens_count):
-    """Track performance metrics for requests."""
     end_time = time.time()
-    request_time = end_time - start_time
-    request_times.append(request_time)
+    request_times.append(end_time - start_time)
     
     today = datetime.now().strftime("%Y-%m-%d")
     daily_requests[today] += 1
     daily_tokens[today] += tokens_count
 
 def get_performance_metrics():
-    """Get current performance metrics."""
     global concurrent_requests
     with concurrent_requests_lock:
         current_concurrent = concurrent_requests
     
-    # Calculate average request time
     avg_request_time = sum(request_times) / len(request_times) if request_times else 0
     
-    # Get today's date
     today = datetime.now().strftime("%Y-%m-%d")
     
-    # Calculate requests per second (based on last 100 requests)
     recent_requests = list(request_times)[-100:] if len(request_times) >= 100 else list(request_times)
     requests_per_second = len(recent_requests) / sum(recent_requests) if recent_requests and sum(recent_requests) > 0 else 0
     
-    # Get daily stats
     today_requests = daily_requests.get(today, 0)
     today_tokens = daily_tokens.get(today, 0)
     
-    # Get last 7 days stats
     last_7_days = []
     for i in range(7):
         date = (datetime.now() - timedelta(days=i)).strftime("%Y-%m-%d")
@@ -111,7 +91,6 @@ def home():
 def moderations():
     global concurrent_requests
     
-    # Track concurrent requests
     with concurrent_requests_lock:
         concurrent_requests += 1
     
@@ -119,7 +98,6 @@ def moderations():
     total_tokens = 0
     
     try:
-        # Check authorization
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith("Bearer "):
             return jsonify({"error": "Unauthorized"}), 401
@@ -128,14 +106,12 @@ def moderations():
         if provided_api_key != API_KEY:
             return jsonify({"error": "Unauthorized"}), 401
         
-        # Get input data
         data = request.get_json()
         raw_input = data.get('input') or data.get('texts')
         
         if raw_input is None:
             return jsonify({"error": "Invalid input, expected 'input' or 'texts' field"}), 400
         
-        # Handle both string and list inputs
         if isinstance(raw_input, str):
             texts = [raw_input]
         elif isinstance(raw_input, list):
@@ -143,7 +119,6 @@ def moderations():
         else:
             return jsonify({"error": "Invalid input format, expected string or list of strings"}), 400
         
-        # Validate input size
         if len(texts) > 10:
             return jsonify({"error": "Too many input items. Maximum 10 allowed."}), 400
         
@@ -152,7 +127,6 @@ def moderations():
                 return jsonify({"error": "Each input item must be a string with a maximum of 100k characters."}), 400
             total_tokens += count_tokens(text)
         
-        # Process each text
         results = []
         for text in texts:
             pred = detoxify_model.predict([text])
@@ -166,10 +140,8 @@ def moderations():
                 "category_applied_input_types": cat_applied_input_types
             })
         
-        # Track metrics
         track_request_metrics(start_time, total_tokens)
         
-        # Prepare response
         response_data = {
             "id": "modr-" + uuid.uuid4().hex[:24],
             "model": "unitaryai/detoxify-multilingual",
@@ -183,13 +155,11 @@ def moderations():
         return jsonify(response_data)
     
     finally:
-        # Decrement concurrent requests counter
         with concurrent_requests_lock:
             concurrent_requests -= 1
 
 @app.route('/v1/metrics', methods=['GET'])
 def metrics():
-    """Endpoint to get performance metrics."""
     auth_header = request.headers.get('Authorization')
     if not auth_header or not auth_header.startswith("Bearer "):
         return jsonify({"error": "Unauthorized"}), 401
@@ -200,13 +170,10 @@ def metrics():
     
     return jsonify(get_performance_metrics())
 
-# Create a simple file-based approach for the HTML template
 def create_directories_and_files():
-    """Create necessary directories and files if they don't exist."""
     os.makedirs('templates', exist_ok=True)
     os.makedirs('static', exist_ok=True)
     
-    # Create index.html if it doesn't exist
     index_path = os.path.join('templates', 'index.html')
     if not os.path.exists(index_path):
         with open(index_path, 'w') as f:
@@ -275,7 +242,6 @@ def create_directories_and_files():
     </style>
 </head>
 <body class="bg-gray-50 dark:bg-gray-900 text-gray-900 dark:text-gray-100 min-h-screen">
-    <!-- Header -->
     <header class="gradient-bg text-white shadow-lg">
         <div class="container mx-auto px-4 py-6 flex justify-between items-center">
             <div class="flex items-center space-x-3">
@@ -297,7 +263,6 @@ def create_directories_and_files():
     </header>
 
     <main class="container mx-auto px-4 py-8">
-        <!-- Performance Metrics Section -->
         <section class="mb-12">
             <h2 class="text-2xl font-bold mb-6 flex items-center">
                 <i class="fas fa-chart-line mr-3 text-primary-600"></i>
@@ -362,7 +327,6 @@ def create_directories_and_files():
             </div>
         </section>
 
-        <!-- API Testing Section -->
         <section class="mb-12">
             <h2 class="text-2xl font-bold mb-6 flex items-center">
                 <i class="fas fa-code mr-3 text-primary-600"></i>
@@ -417,7 +381,6 @@ def create_directories_and_files():
             </div>
         </section>
 
-        <!-- Results Section -->
         <section id="resultsSection" class="hidden">
             <h2 class="text-2xl font-bold mb-6 flex items-center">
                 <i class="fas fa-clipboard-check mr-3 text-primary-600"></i>
@@ -434,12 +397,10 @@ def create_directories_and_files():
                 </div>
                 
                 <div id="resultsContainer" class="space-y-6">
-                    <!-- Results will be dynamically inserted here -->
                 </div>
             </div>
         </section>
 
-        <!-- API Documentation Section -->
         <section>
             <h2 class="text-2xl font-bold mb-6 flex items-center">
                 <i class="fas fa-book mr-3 text-primary-600"></i>
@@ -507,7 +468,6 @@ def create_directories_and_files():
         </section>
     </main>
 
-    <!-- Footer -->
     <footer class="bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 mt-12">
         <div class="container mx-auto px-4 py-6">
             <div class="flex flex-col md:flex-row justify-between items-center">
@@ -530,11 +490,9 @@ def create_directories_and_files():
     </footer>
 
     <script>
-        // Dark mode toggle
         const darkModeToggle = document.getElementById('darkModeToggle');
         const html = document.documentElement;
         
-        // Check for saved dark mode preference or default to light mode
         const currentTheme = localStorage.getItem('theme') || 'light';
         if (currentTheme === 'dark') {
             html.classList.add('dark');
@@ -546,7 +504,6 @@ def create_directories_and_files():
             localStorage.setItem('theme', theme);
         });
 
-        // Chart for activity
         let activityChart;
         
         function initActivityChart() {
@@ -601,7 +558,6 @@ def create_directories_and_files():
             });
         }
 
-        // Fetch performance metrics
         async function fetchMetrics() {
             const apiKey = document.getElementById('apiKey').value;
             if (!apiKey) {
@@ -629,14 +585,12 @@ def create_directories_and_files():
             }
         }
 
-        // Update metrics display
         function updateMetricsDisplay(data) {
             document.getElementById('avgResponseTime').textContent = (data.avg_request_time * 1000).toFixed(2) + 'ms';
             document.getElementById('requestsPerSecond').textContent = data.requests_per_second.toFixed(2);
             document.getElementById('concurrentRequests').textContent = data.concurrent_requests;
             document.getElementById('todayTokens').textContent = data.today_tokens.toLocaleString();
 
-            // Update activity chart
             if (activityChart) {
                 const labels = data.last_7_days.map(day => {
                     const date = new Date(day.date);
@@ -653,7 +607,6 @@ def create_directories_and_files():
             }
         }
 
-        // Add text input
         document.getElementById('addTextInput').addEventListener('click', () => {
             const container = document.getElementById('textInputsContainer');
             const inputGroups = container.querySelectorAll('.text-input-group');
@@ -674,7 +627,6 @@ def create_directories_and_files():
             
             container.appendChild(newInputGroup);
             
-            // Add event listener to remove button
             newInputGroup.querySelector('.remove-input').addEventListener('click', function() {
                 newInputGroup.remove();
                 updateRemoveButtons();
@@ -683,7 +635,6 @@ def create_directories_and_files():
             updateRemoveButtons();
         });
 
-        // Update remove buttons visibility
         function updateRemoveButtons() {
             const inputGroups = document.querySelectorAll('.text-input-group');
             inputGroups.forEach((group, index) => {
@@ -696,7 +647,6 @@ def create_directories_and_files():
             });
         }
 
-        // Remove text input
         document.addEventListener('click', function(e) {
             if (e.target.closest('.remove-input')) {
                 e.target.closest('.text-input-group').remove();
@@ -704,7 +654,6 @@ def create_directories_and_files():
             }
         });
 
-        // Clear form
         document.getElementById('clearBtn').addEventListener('click', () => {
             document.getElementById('apiTestForm').reset();
             const container = document.getElementById('textInputsContainer');
@@ -719,7 +668,6 @@ def create_directories_and_files():
             document.getElementById('resultsSection').classList.add('hidden');
         });
 
-        // Analyze text
         document.getElementById('apiTestForm').addEventListener('submit', async (e) => {
             e.preventDefault();
             
@@ -773,7 +721,7 @@ def create_directories_and_files():
                 }
                 
                 const data = await response.json();
-                displayResults(data, responseTime);
+                displayResults(data, responseTime, texts);
                 
             } catch (error) {
                 console.error('Error analyzing text:', error);
@@ -784,8 +732,7 @@ def create_directories_and_files():
             }
         });
 
-        // Display results
-        function displayResults(data, responseTime) {
+        function displayResults(data, responseTime, texts) {
             const resultsSection = document.getElementById('resultsSection');
             const resultsContainer = document.getElementById('resultsContainer');
             
@@ -842,17 +789,13 @@ def create_directories_and_files():
             resultsSection.scrollIntoView({ behavior: 'smooth' });
         }
 
-        // Initialize chart on page load
         document.addEventListener('DOMContentLoaded', () => {
             initActivityChart();
             
-            // Set up refresh metrics button
             document.getElementById('refreshMetrics').addEventListener('click', fetchMetrics);
             
-            // Initial metrics fetch
             fetchMetrics();
             
-            // Auto-refresh metrics every 30 seconds
             setInterval(fetchMetrics, 30000);
         });
     </script>
@@ -860,7 +803,6 @@ def create_directories_and_files():
 </html>''')
 
 if __name__ == '__main__':
-    # Create directories and files
     create_directories_and_files()
     
     port = int(os.getenv('PORT', 7860))