Update app.py

app.py

@@ -43,6 +43,8 @@ model_key_indices = {}
 
 request_timestamps = []
 token_counts = []
+request_timestamps_day = []
+token_counts_day = []
 data_lock = threading.Lock()
 
 def get_credit_summary(api_key):
@@ -445,11 +447,11 @@ def index():
         tpm = sum(token_counts)
 
     with data_lock:
-        while request_timestamps and request_timestamps[0] < one_day_ago:
-            request_timestamps.pop(0)
-            token_counts.pop(0)
+        while request_timestamps_day and request_timestamps_day[0] < one_day_ago:
+            request_timestamps_day.pop(0)
+            token_counts_day.pop(0)
 
-        rpd = len(request_timestamps)
+        rpd = len(request_timestamps_day)
         tpd = sum(token_counts)
 
     return jsonify({"rpm": rpm, "tpm": tpm, "rpd": rpd, "tpd": tpd})
@@ -642,6 +644,8 @@ def handsome_embeddings():
         with data_lock:
             request_timestamps.append(time.time())
             token_counts.append(prompt_tokens)
+            request_timestamps_day.append(time.time())
+            token_counts_day.append(prompt_tokens)
         
         return jsonify({
             "object": "list",
@@ -822,6 +826,8 @@ def handsome_images_generations():
             with data_lock:
                 request_timestamps.append(time.time())
                 token_counts.append(0)
+                request_timestamps_day.append(time.time())
+                token_counts_day.append(0)
 
             return jsonify(response_data)
 
@@ -1040,6 +1046,8 @@ def handsome_chat_completions():
                         with data_lock:
                             request_timestamps.append(time.time())
                             token_counts.append(0)
+                            request_timestamps_day.append(time.time())
+                            token_counts_day.append(0)
                     except requests.exceptions.RequestException as e:
                         logging.error(f"请求转发异常: {e}")
                         error_chunk_data = {
@@ -1144,6 +1152,8 @@ def handsome_chat_completions():
                 with data_lock:
                     request_timestamps.append(time.time())
                     token_counts.append(0)
+                    request_timestamps_day.append(time.time())
+                    token_counts_day.append(0)
                 return jsonify(response_data)
 
         except requests.exceptions.RequestException as e:
@@ -1270,6 +1280,8 @@ def handsome_chat_completions():
                     with data_lock:
                         request_timestamps.append(time.time())
                         token_counts.append(prompt_tokens+completion_tokens)
+                        request_timestamps_day.append(time.time())
+                        token_counts_day.append(prompt_tokens+completion_tokens)
 
                 return Response(
                     stream_with_context(generate()),
@@ -1339,6 +1351,11 @@ def handsome_chat_completions():
                         token_counts.append(response_json["usage"]["prompt_tokens"] + response_json["usage"]["completion_tokens"])
                     else:
                         token_counts.append(0)
+                    request_timestamps_day.append(time.time())
+                    if "prompt_tokens" in response_json["usage"] and "completion_tokens" in response_json["usage"]:
+                        token_counts_day.append(response_json["usage"]["prompt_tokens"] + response_json["usage"]["completion_tokens"])
+                    else:
+                        token_counts_day.append(0)
 
                 return jsonify(response_json)