Upload app.py

app.py

@@ -374,7 +374,8 @@ def get_notdiamond_headers(auth_manager):
             'accept-language': 'zh-CN,zh;q=0.9',
             'content-type': 'application/json',
             'user-agent': _USER_AGENT,
-            'authorization': f'Bearer {auth_manager.get_jwt_value()}'
+            'authorization': f'Bearer {auth_manager.get_jwt_value()}',
+            'Host': NOTDIAMOND_DOMAIN  # 添加 Host 头
         }
         headers_cache[cache_key] = headers
         return headers
@@ -953,56 +954,57 @@ def make_request(payload, auth_manager, model_id):
         logger.info(f"尝试使用账号 {auth_manager._email}")
 
         for attempt in range(max_retries):
-            # 获取代理
-            proxy_manager = get_proxy_manager()
-            proxy = proxy_manager.get_proxy()
-            proxies = {'https': proxy} if proxy else None
-            
             try:
                 url = get_notdiamond_url()
                 headers = get_notdiamond_headers(auth_manager)
                 
-                logger.info(f"使用代理: {proxy}" if proxy else "不使用代理")
-                
-                # 添加重试和超时设置
+                # 创建新的会话
                 session = requests.Session()
-                session.mount('https://', CustomHTTPAdapter(max_retries=3))
+                adapter = CustomHTTPAdapter(max_retries=3)
+                session.mount('https://', adapter)
+                session.mount('http://', adapter)
                 
-                response = session.post(
-                    url,
-                    headers=headers,
-                    json=payload,
-                    stream=True,
-                    proxies=proxies,
-                    timeout=(5, 30)  # (连接超时, 读取超时)
-                )
+                # 直接使用IP而不是域名
+                url = url.replace(NOTDIAMOND_DOMAIN, NOTDIAMOND_IP)
                 
-                if response.status_code == 200:
-                    return response
+                try:
+                    response = session.post(
+                        url,
+                        headers=headers,
+                        json=payload,
+                        stream=True,
+                        timeout=(5, 30),  # (连接超时, 读取超时)
+                        verify=False  # 禁用SSL验证
+                    )
+                    
+                    if response.status_code == 200:
+                        return response
+                        
+                    if response.status_code == 401:
+                        logger.info(f"Token expired for account {auth_manager._email}, attempting refresh")
+                        if auth_manager.ensure_valid_token():
+                            continue
+                    
+                    if response.status_code == 403:
+                        logger.warning(f"Model {model_id} usage limit reached for account {auth_manager._email}")
+                        auth_manager.set_model_unavailable(model_id)
+                        break
                     
-                if response.status_code == 429 and proxy:  # 代理限流
-                    proxy_manager.mark_proxy_failed(proxy)
+                    logger.error(f"Request failed with status {response.status_code}")
+                    
+                except requests.exceptions.RequestException as e:
+                    logger.error(f"Request attempt {attempt + 1} failed: {e}")
+                    if attempt < max_retries - 1:
+                        time.sleep(retry_delay)
                     continue
                     
-                if response.status_code == 401:
-                    logger.info(f"Token expired for account {auth_manager._email}, attempting refresh")
-                    if auth_manager.ensure_valid_token():
-                        continue
-                
-                if response.status_code == 403:
-                    logger.warning(f"Model {model_id} usage limit reached for account {auth_manager._email}")
-                    auth_manager.set_model_unavailable(model_id)
-                    break
-                
-                logger.error(f"Request failed with status {response.status_code}")
-                
-            except requests.exceptions.RequestException as e:
-                logger.error(f"Request attempt {attempt + 1} failed: {e}")
-                if proxy:
-                    proxy_manager.mark_proxy_failed(proxy)
+            except Exception as e:
+                logger.error(f"Unexpected error during request: {e}")
                 if attempt < max_retries - 1:
                     time.sleep(retry_delay)
                 continue
+            finally:
+                session.close()
 
     if len(tried_accounts) == len(multi_auth_manager.auth_managers):
         logger.info("所有现有账号都已尝试，开始注册新账号")