Update app.py

app.py

@@ -18,7 +18,7 @@ os.environ['TZ'] = 'Asia/Shanghai'
 time.tzset()
 
 logging.basicConfig(level=logging.INFO,
-                    format='%(asctime)s - %(levelname)s - %(client_ip)s - %(message)s')
+                    format='%(asctime)s - %(levelname)s - %(message)s')
 
 API_ENDPOINT = "https://api.siliconflow.cn/v1/user/info"
 TEST_MODEL_ENDPOINT = "https://api.siliconflow.cn/v1/chat/completions"
@@ -46,15 +46,6 @@ request_timestamps = []
 token_counts = []
 data_lock = threading.Lock()
 
-def get_client_ip():
-    """
-    获取客户端IP地址。
-    """
-    if request.headers.getlist("X-Forwarded-For"):
-        return request.headers.getlist("X-Forwarded-For")[0]
-    else:
-        return request.remote_addr
-
 def get_credit_summary(api_key):
     """
     使用 API 密钥获取额度信息。
@@ -552,8 +543,7 @@ def check_tokens():
                     )
             except Exception as exc:
                 logging.error(
-                    f"处理 Token {token} 生成异常: {exc}", 
-                    extra={'client_ip': get_client_ip()}
+                    f"处理 Token {token} 生成异常: {exc}"
                 )
 
     return jsonify(results)
@@ -783,8 +773,7 @@ def handsome_embeddings():
         except (KeyError, ValueError, IndexError) as e:
             logging.error(
                 f"解析响应 JSON 失败: {e}, "
-                f"完整内容: {response_json}", 
-                extra={'client_ip': get_client_ip()}
+                f"完整内容: {response_json}"
             )
             prompt_tokens = 0
             embedding_data = []
@@ -793,8 +782,7 @@ def handsome_embeddings():
             f"使用的key: {api_key}, "
             f"提示token: {prompt_tokens}, "
             f"总共用时: {total_time:.4f}秒, "
-            f"使用的模型: {model_name}", 
-            extra={'client_ip': get_client_ip()}
+            f"使用的模型: {model_name}"
         )
 
         with data_lock:
@@ -948,12 +936,12 @@ def handsome_images_generations():
                                 img_str = base64.b64encode(buffered.getvalue()).decode()
                                 openai_images.append({"b64_json": img_str})
                            except Exception as e:
-                                logging.error(f"图片转base64失败: {e}", extra={'client_ip': get_client_ip()})
+                                logging.error(f"图片转base64失败: {e}")
                                 openai_images.append({"url": image_url})
                         else:
                             openai_images.append({"url": image_url})
                     else:
-                        logging.error(f"无效的图片数据: {item}", extra={'client_ip': get_client_ip()})
+                        logging.error(f"无效的图片数据: {item}")
                         openai_images.append({"url": item})
 
 
@@ -964,8 +952,7 @@ def handsome_images_generations():
             except (KeyError, ValueError, IndexError) as e:
                 logging.error(
                     f"解析响应 JSON 失败: {e}, "
-                    f"完整内容: {response_json}", 
-                    extra={'client_ip': get_client_ip()}
+                    f"完整内容: {response_json}"
                 )
                 response_data = {
                     "created": int(time.time()),
@@ -975,8 +962,7 @@ def handsome_images_generations():
             logging.info(
                 f"使用的key: {api_key}, "
                 f"总共用时: {total_time:.4f}秒, "
-                f"使用的模型: {model_name}", 
-                extra={'client_ip': get_client_ip()}
+                f"使用的模型: {model_name}"
             )
 
             with data_lock:
@@ -986,7 +972,7 @@ def handsome_images_generations():
             return jsonify(response_data)
 
         except requests.exceptions.RequestException as e:
-            logging.error(f"请求转发异常: {e}", extra={'client_ip': get_client_ip()})
+            logging.error(f"请求转发异常: {e}")
             return jsonify({"error": str(e)}), 500
     else:
         return jsonify({"error": "Unsupported model"}), 400
@@ -1144,10 +1130,10 @@ def handsome_chat_completions():
                         image_url = ""
                         if images and isinstance(images[0], dict) and "url" in images[0]:
                             image_url = images[0]["url"]
-                            logging.info(f"Extracted image URL: {image_url}", extra={'client_ip': get_client_ip()})
+                            logging.info(f"Extracted image URL: {image_url}")
                         elif images and isinstance(images[0], str):
                             image_url = images[0]
-                            logging.info(f"Extracted image URL: {image_url}", extra={'client_ip': get_client_ip()})
+                            logging.info(f"Extracted image URL: {image_url}")
                         
                         markdown_image_link = f"![image]({image_url})"
                         if image_url:
@@ -1207,7 +1193,7 @@ def handsome_chat_completions():
                             request_timestamps.append(time.time())
                             token_counts.append(0)
                     except requests.exceptions.RequestException as e:
-                        logging.error(f"请求转发异常: {e}", extra={'client_ip': get_client_ip()})
+                        logging.error(f"请求转发异常: {e}")
                         error_chunk_data = {
                             "id": f"chatcmpl-{uuid.uuid4()}",
                             "object": "chat.completion.chunk",
@@ -1241,8 +1227,7 @@ def handsome_chat_completions():
                         yield f"data: {json.dumps(end_chunk_data)}\n\n".encode('utf-8')
                     logging.info(
                         f"使用的key: {api_key}, "
-                        f"使用的模型: {model_name}", 
-                        extra={'client_ip': get_client_ip()}
+                        f"使用的模型: {model_name}"
                     )
                     yield "data: [DONE]\n\n".encode('utf-8')
                 return Response(stream_with_context(generate()), content_type='text/event-stream')
@@ -1259,10 +1244,10 @@ def handsome_chat_completions():
                     image_url = ""
                     if images and isinstance(images[0], dict) and "url" in images[0]:
                         image_url = images[0]["url"]
-                        logging.info(f"Extracted image URL: {image_url}", extra={'client_ip': get_client_ip()})
+                        logging.info(f"Extracted image URL: {image_url}")
                     elif images and isinstance(images[0], str):
                         image_url = images[0]
-                        logging.info(f"Extracted image URL: {image_url}", extra={'client_ip': get_client_ip()})
+                        logging.info(f"Extracted image URL: {image_url}")
                     
                     markdown_image_link = f"![image]({image_url})"
                     response_data = {
@@ -1284,8 +1269,7 @@ def handsome_chat_completions():
                 except (KeyError, ValueError, IndexError) as e:
                     logging.error(
                         f"解析响应 JSON 失败: {e}, "
-                        f"完整内容: {response_json}", 
-                        extra={'client_ip': get_client_ip()}
+                        f"完整内容: {response_json}"
                     )
                     response_data = {
                         "id": f"chatcmpl-{uuid.uuid4()}",
@@ -1307,8 +1291,7 @@ def handsome_chat_completions():
                 logging.info(
                     f"使用的key: {api_key}, "
                     f"总共用时: {total_time:.4f}秒, "
-                    f"使用的模型: {model_name}", 
-                    extra={'client_ip': get_client_ip()}
+                    f"使用的模型: {model_name}"
                 )
                 with data_lock:
                     request_timestamps.append(time.time())
@@ -1316,7 +1299,7 @@ def handsome_chat_completions():
                 return jsonify(response_data)
 
         except requests.exceptions.RequestException as e:
-            logging.error(f"请求转发异常: {e}", extra={'client_ip': get_client_ip()})
+            logging.error(f"请求转发异常: {e}")
             return jsonify({"error": str(e)}), 500
     else:
         try:
@@ -1341,7 +1324,7 @@ def handsome_chat_completions():
                                 chunk = chunk.decode('utf-8')
                                 yield f"{chunk}\n\n".encode('utf-8')
                     except requests.exceptions.RequestException as e:
-                        logging.error(f"请求转发异常: {e}", extra={'client_ip': get_client_ip()})
+                        logging.error(f"请求转发异常: {e}")
                         error_chunk_data = {
                             "id": f"chatcmpl-{uuid.uuid4()}",
                             "object": "chat.completion.chunk",
@@ -1408,8 +1391,7 @@ def handsome_chat_completions():
                 except (KeyError, ValueError, IndexError) as e:
                     logging.error(
                         f"解析响应 JSON 失败: {e}, "
-                        f"完整内容: {response_json}", 
-                        extra={'client_ip': get_client_ip()}
+                        f"完整内容: {response_json}"
                     )
                     response_data = {
                         "id": f"chatcmpl-{uuid.uuid4()}",
@@ -1431,20 +1413,19 @@ def handsome_chat_completions():
                 logging.info(
                    f"使用的key: {api_key}, "
                    f"总共用时: {total_time:.4f}秒, "
-                   f"使用的模型: {model_name}", 
-                    extra={'client_ip': get_client_ip()}
+                   f"使用的模型: {model_name}"
                 )
                 with data_lock:
                     request_timestamps.append(time.time())
                     token_counts.append(0)
                 return jsonify(response_data)
         except requests.exceptions.RequestException as e:
-            logging.error(f"请求转发异常: {e}", extra={'client_ip': get_client_ip()})
+            logging.error(f"请求转发异常: {e}")
             return jsonify({"error": str(e)}), 500
 
 if __name__ == '__main__':
     import json
-    logging.info(f"环境变量：{os.environ}", extra={'client_ip': get_client_ip()})
+    logging.info(f"环境变量：{os.environ}")
 
     invalid_keys_global = []
     free_keys_global = []
@@ -1452,14 +1433,14 @@ if __name__ == '__main__':
     valid_keys_global = []
 
     load_keys()
-    logging.info("程序启动时首次加载 keys 已执行", extra={'client_ip': get_client_ip()})
+    logging.info("程序启动时首次加载 keys 已执行")
 
     scheduler.start()
 
-    logging.info("首次加载 keys 已手动触发执行", extra={'client_ip': get_client_ip()})
+    logging.info("首次加载 keys 已手动触发执行")
 
     refresh_models()
-    logging.info("首次刷新模型列表已手动触发执行", extra={'client_ip': get_client_ip()})
+    logging.info("首次刷新模型列表已手动触发执行")
 
     app.run(
         debug=False,