Update app.py

app.py

@@ -102,44 +102,52 @@ class AuthManager:
         self.logger.info(f"\033[92mRefresh Token: {self.refresh_token}\033[0m")
         
     def fetch_apikey(self) -> str:
-        """获取API密钥。"""
-        if self.api_key:
-            return self.api_key
-
-        try:
-            url = "https://chat.notdiamond.ai/login"
-            headers = {
-                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36'
-            }
-            response = self.session.get(url, headers=headers)
-            response.raise_for_status()
+    """获取API密钥。"""
+    if self.api_key:
+        return self.api_key
 
-            match = re.search(r'<script src="(/_next/static/chunks/app/layout-[^"]+\.js)"', response.text)
-            if not match:
-                self.logger.warning("未找到匹配的脚本标签")
-                return ""
+    try:
+        url = "https://chat.notdiamond.ai/login"
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36'
+        }
+        response = self.session.get(url, headers=headers)
+        response.raise_for_status()
 
-            js_url = f"https://chat.notdiamond.ai{match.group(1)}"
-            js_response = self.session.get(js_url, headers=headers)
-            js_response.raise_for_status()
-            
-            api_key_match = re.search(r'$"https://spuckhogycrxcbomznwo\.supabase\.co","([^"]+)"$', js_response.text)
-            if api_key_match:
-                self.api_key = api_key_match.group(1)
-                return self.api_key
-            else:
-                self.logger.error("未能匹配API key")
-                return ""
+        # 匹配 <script> 标签中的 JS 文件路径
+        match = re.search(r'<script src="(/_next/static/chunks/app/layout-[^"]+\.js)"', response.text)
+        if not match:
+            self.logger.warning("未找到匹配的脚本标签")
+            return ""
 
-        except requests.RequestException as e:
-            self.logger.error(f"请求JS文件时发生错误: {e}")
+        js_url = f"https://chat.notdiamond.ai{match.group(1)}"
+        js_response = self.session.get(js_url, headers=headers)
+        js_response.raise_for_status()
+        
+        # 匹配 API key
+        api_key_match = re.search(r'\("https://spuckhogycrxcbomznwo\.supabase\.co","([^"]+)"\)', js_response.text)
+        if api_key_match:
+            self.api_key = api_key_match.group(1)
+            logger.info(f"Extracted API key: {self.api_key}")
+            return self.api_key
+        else:
+            self.logger.error("未能匹配API key")
             return ""
 
+    except requests.RequestException as e:
+        self.logger.error(f"请求JS文件时发生错误: {e}")
+        return ""
+
     def login(self) -> None:
         """使用电子邮件和密码进行用户登录，并获取用户信息。"""
+        api_key = self.fetch_apikey()
+        if not api_key:
+            self.logger.error("API key is missing, cannot proceed with login.")
+            return
+    
         url = "https://spuckhogycrxcbomznwo.supabase.co/auth/v1/token?grant_type=password"
         headers = {
-            'apikey': self.fetch_apikey(),
+            'apikey': api_key,
             'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36',
             'Content-Type': 'application/json'
         }
@@ -148,7 +156,7 @@ class AuthManager:
             "password": self.password,
             "gotrue_meta_security": {}
         }
-
+    
         try:
             response = self.session.post(url, headers=headers, json=data)
             response.raise_for_status()
@@ -159,8 +167,10 @@ class AuthManager:
             cache_key = f"{self.email}|{self.password}"
             refresh_token_cache[cache_key] = self.refresh_token
             
+            logger.info(f"Login successful for email: {self.email}")
+    
         except requests.RequestException as e:
-            self.logger.error(f"\033[91m登录请求错误: {e}\033[0m")
+            self.logger.error(f"登录请求错误: {e}")
 
     def refresh_user_token(self) -> None:
         """使用刷新令牌来请求一个新的访问令牌并更新实例变量。"""
@@ -362,14 +372,21 @@ def generate_stream_response(response, model, prompt_tokens):
 def get_auth_credentials():
     """从请求头中获取认证凭据"""
     auth_header = request.headers.get('Authorization')
-    if not auth_header or not auth_header.startswith('Bearer '):
+    if not auth_header:
+        logger.error("Authorization header is missing")
+        return None, None
+    
+    if not auth_header.startswith('Bearer '):
+        logger.error(f"Authorization header format is incorrect: {auth_header}")
         return None, None
     
     try:
         credentials = auth_header.split('Bearer ')[1]
         email, password = credentials.split('|')
+        logger.info(f"Extracted email: {email}, password: {'*' * len(password)}")
         return email.strip(), password.strip()
-    except:
+    except Exception as e:
+        logger.error(f"Error parsing Authorization header: {e}")
         return None, None
 
 @app.before_request