Upload 3 files

app.py

@@ -1123,44 +1123,23 @@ def index():
 
 
 def num_tokens_from_string(string, model=""):
-    """计算字符串的token数量"""
     try:
-        # 准备请求数据
-        request_data = {
-            "model": model,
-            "messages": [{"role": "user", "content": string}]
-        }
-        
-        # 发送POST请求到token计算服务
         response = requests.post(
             TOKENIZER_SERVICE_URL,
-            json=request_data,
+            json={"model": model, "messages": [{"role": "user", "content": string}]},
             timeout=10
         )
         
-        # 解析响应
         if response.status_code == 200:
             result = response.json()
-            # 检查响应中是否包含warning字段，有则表示是估算值
-            calculation_method = "estimate" if "warning" in result else "api"
             input_tokens = result.get("input_tokens", 0)
-            return input_tokens, calculation_method
-        elif response.status_code == 400:
-            # 服务返回400错误，但可能提供了估算值
-            result = response.json()
-            if "input_tokens" in result:
-                print(f"使用估算token值: {result.get('input_tokens')}")
-                return result.get("input_tokens", 0), "估算"
-            # 如果没有提供估算值，使用字符数/4作为预估
-            return len(string) // 4, "估算"
+            return input_tokens, "精确"  # 直接返回精确
         else:
-            # 如果服务返回其他错误，记录错误并返回字符串长度/4作为预估值
             print(f"Tokenizer服务错误: {response.status_code} - {response.text}")
-            return len(string) // 4, "估算"
+            return len(string) // 4, "估算"  # 直接返回估算
     except Exception as e:
-        # 如果发生其他错误，记录错误并返回字符串长度/4作为预估值
         print(f"计算token错误: {e}")
-        return len(string) // 4, "估算"
+        return len(string) // 4, "估算"  # 直接返回估算
 
 
 # 更新模型使用统计
@@ -1179,7 +1158,7 @@ def update_model_stats(model, prompt_tokens, completion_tokens, calculation_meth
         "call_time": call_time,
         "prompt_tokens": prompt_tokens,
         "completion_tokens": completion_tokens,
-        "calculation_method": "精确" if calculation_method == "api" else "估算",
+        "calculation_method": calculation_method,  # 直接使用传入的值
         "compute_points": compute_points
     }
     model_usage_records.append(record)