Update app.py

app.py

@@ -16,6 +16,7 @@ from flask_cors import CORS
 from typing import Dict, Any
 from requests.adapters import HTTPAdapter
 from urllib3.util.connection import create_connection
+import urllib3
 
 # Constants
 CHAT_COMPLETION_CHUNK = 'chat.completion.chunk'
@@ -33,14 +34,23 @@ proxy_url = os.getenv('PROXY_URL')
 
 # 获取环境变量中指定的 IP 地址
 NOTDIAMOND_IP = os.getenv('NOTDIAMOND_IP')
+NOTDIAMOND_DOMAIN = 'not-diamond-workers.t7-cc4.workers.dev'
+
+if not NOTDIAMOND_IP:
+    logger.error("NOTDIAMOND_IP environment variable is not set!")
+    raise ValueError("NOTDIAMOND_IP must be set")
 
 # 自定义连接函数
 def patched_create_connection(address, *args, **kwargs):
     host, port = address
-    if host == 'not-diamond-workers.t7-cc4.workers.dev':
+    if host == NOTDIAMOND_DOMAIN:
+        logger.info(f"Connecting to {NOTDIAMOND_DOMAIN} using IP: {NOTDIAMOND_IP}")
         return create_connection((NOTDIAMOND_IP, port), *args, **kwargs)
     return create_connection(address, *args, **kwargs)
 
+# 替换 urllib3 的默认连接函数
+urllib3.util.connection.create_connection = patched_create_connection
+
 # 自定义 HTTPAdapter
 class CustomHTTPAdapter(HTTPAdapter):
     def init_poolmanager(self, *args, **kwargs):
@@ -471,20 +481,38 @@ def make_request(payload):
     url = get_notdiamond_url()
     headers = get_notdiamond_headers()
     session = create_custom_session()
-    response = executor.submit(session.post, url, headers=headers, json=payload, stream=True).result()
-    if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
-        return response
+    logger.info(f"Sending request to URL: {url}")
+    try:
+        response = executor.submit(session.post, url, headers=headers, json=payload, stream=True).result()
+        logger.info(f"Response status code: {response.status_code}")
+        if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
+            return response
+    except Exception as e:
+        logger.error(f"Error in make_request: {str(e)}")
+        raise
 
+    logger.info("Refreshing user token...")
     auth_manager.refresh_user_token()
     headers = get_notdiamond_headers()
-    response = executor.submit(session.post, url, headers=headers, json=payload, stream=True).result()
-    if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
-        return response
+    try:
+        response = executor.submit(session.post, url, headers=headers, json=payload, stream=True).result()
+        logger.info(f"Response status code after token refresh: {response.status_code}")
+        if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
+            return response
+    except Exception as e:
+        logger.error(f"Error in make_request after token refresh: {str(e)}")
+        raise
 
+    logger.info("Logging in again...")
     auth_manager.login()
     headers = get_notdiamond_headers()
-    response = executor.submit(session.post, url, headers=headers, json=payload, stream=True).result()
-    return response
+    try:
+        response = executor.submit(session.post, url, headers=headers, json=payload, stream=True).result()
+        logger.info(f"Response status code after login: {response.status_code}")
+        return response
+    except Exception as e:
+        logger.error(f"Error in make_request after login: {str(e)}")
+        raise
 
 if __name__ == "__main__":
     port = int(os.environ.get("PORT", 3000))