v1.2.4 fix bugs

chat2api.py

@@ -14,7 +14,7 @@ from starlette.background import BackgroundTask
 from chatgpt.ChatService import ChatService
 from chatgpt.reverseProxy import chatgpt_reverse_proxy
 from utils.Logger import logger
-from utils.authorization import token_list, refresh_all_tokens
+from utils.authorization import token_list, error_token_list, refresh_all_tokens
 from utils.config import api_prefix, scheduled_refresh
 from utils.retry import async_retry
 
@@ -88,7 +88,7 @@ async def send_conversation(request: Request, req_token: str = Depends(oauth2_sc
 
 @app.get(f"/{api_prefix}/tokens" if api_prefix else "/tokens", response_class=HTMLResponse)
 async def upload_html(request: Request):
-    tokens_count = len(token_list)
+    tokens_count = len(set(token_list) - set(error_token_list))
     return templates.TemplateResponse("tokens.html",
                                       {"request": request, "api_prefix": api_prefix, "tokens_count": tokens_count})
 
@@ -102,20 +102,27 @@ async def upload_post(text: str = Form(...)):
             with open("data/token.txt", "a", encoding="utf-8") as f:
                 f.write(line.strip() + "\n")
     logger.info(f"Token list count: {len(token_list)}")
-    tokens_count = len(token_list)
+    tokens_count = len(set(token_list) - set(error_token_list))
     return {"status": "success", "tokens_count": tokens_count}
 
 
 @app.post(f"/{api_prefix}/tokens/clear" if api_prefix else "/tokens/clear")
 async def upload_post():
     token_list.clear()
+    error_token_list.clear()
     with open("data/token.txt", "w", encoding="utf-8") as f:
         pass
     logger.info(f"Token list count: {len(token_list)}")
-    tokens_count = len(token_list)
+    tokens_count = len(set(token_list) - set(error_token_list))
     return {"status": "success", "tokens_count": tokens_count}
 
 
+@app.post(f"/{api_prefix}/tokens/error" if api_prefix else "/tokens/error")
+async def error_tokens():
+    error_tokens_list = list(set(error_token_list))
+    return {"status": "success", "error_tokens": error_tokens_list}
+
+
 @app.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD", "PATCH", "TRACE"])
 async def reverse_proxy(request: Request, path: str):
     return await chatgpt_reverse_proxy(request, path)

chatgpt/refreshToken.py

@@ -33,11 +33,14 @@ async def rt2ac(refresh_token, force_refresh=False):
         logger.info(f"refresh_token -> access_token from cache")
         return access_token
     else:
-        access_token = await chat_refresh(refresh_token)
-        refresh_map[refresh_token] = {"token": access_token, "timestamp": int(time.time())}
-        save_refresh_map(refresh_map)
-        logger.info(f"refresh_token -> access_token with openai: {access_token}")
-        return access_token
+        try:
+            access_token = await chat_refresh(refresh_token)
+            refresh_map[refresh_token] = {"token": access_token, "timestamp": int(time.time())}
+            save_refresh_map(refresh_map)
+            logger.info(f"refresh_token -> access_token with openai: {access_token}")
+            return access_token
+        except HTTPException as e:
+            raise HTTPException(status_code=e.status_code, detail=e.detail)
 
 
 async def chat_refresh(refresh_token):
@@ -56,7 +59,7 @@ async def chat_refresh(refresh_token):
         else:
             raise Exception(r.text[:100])
     except Exception as e:
-        logger.error(f"Failed to refresh access_token: {str(e)}")
+        logger.error(f"Failed to refresh access_token `{refresh_token}`: {str(e)}")
         raise HTTPException(status_code=500, detail=f"Failed to refresh access_token.")
     finally:
         await client.close()

templates/tokens.html

@@ -10,35 +10,73 @@
             const apiPrefix = "{{ api_prefix }}";
             const uploadForm = document.getElementById('uploadForm');
             const clearForm = document.getElementById('clearForm');
+            const errorButton = document.getElementById('errorButton');
 
             if (apiPrefix === "None") {
                 uploadForm.action = "/tokens/upload";
                 clearForm.action = "/tokens/clear";
+                errorButton.dataset.api = "/tokens/error";
             } else {
                 uploadForm.action = `/${apiPrefix}/tokens/upload`;
                 clearForm.action = `/${apiPrefix}/tokens/clear`;
+                errorButton.dataset.api = `/${apiPrefix}/tokens/error`;
             }
+
+            errorButton.addEventListener('click', async () => {
+                const response = await fetch(errorButton.dataset.api, {
+                    method: 'POST',
+                });
+                const result = await response.json();
+                const errorTokens = result.error_tokens;
+
+                const errorModal = document.getElementById('errorModal');
+                const errorModalContent = document.getElementById('errorModalContent');
+
+                errorModalContent.innerHTML = errorTokens.map(token => `<p>${token}</p>`).join('');
+                errorModal.classList.remove('hidden');
+            });
+
+            document.getElementById('errorModalClose').addEventListener('click', () => {
+                document.getElementById('errorModal').classList.add('hidden');
+            });
+
+            document.getElementById('errorModalCopy').addEventListener('click', () => {
+                const errorModalContent = document.getElementById('errorModalContent');
+                const textToCopy = errorModalContent.innerText.replace(/\n\n/g, '\n');
+                navigator.clipboard.writeText(textToCopy).then(() => {
+                    alert('错误 Tokens 已复制到剪贴板');
+                }).catch(err => {
+                    alert('复制失败，请手动复制');
+                });
+            });
         });
     </script>
 </head>
 <body class="bg-gradient-to-r from-blue-200 via-purple-200 to-pink-200 flex justify-center items-center min-h-screen">
-<div class="bg-white p-10 rounded-lg shadow-2xl w-128 text-center">
-    <h1 class="text-4xl font-extrabold text-gray-900 mb-6">Tokens 管理</h1>
-    <p class="text-gray-600 mb-6">当前可用 Tokens 数量：<span class="text-blue-600">{{ tokens_count }}</span></p>
-    <form class="mb-6" id="uploadForm" method="post">
-        <textarea class="w-full p-4 mb-4 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-400 resize-none" name="text" placeholder="一行一个Token，可以是 AccessToken 或 RefreshToken"
-                  rows="10"></textarea>
-        <p class="text-gray-600 mb-4">注：使用docker时如果挂载了data文件夹则重启后不需要再次上传</p>
-        <button class="w-full bg-blue-600 text-white py-3 rounded-md hover:bg-blue-700 transition duration-300 mb-4"
-                type="submit">上传
-        </button>
-    </form>
-    <form id="clearForm" method="post">
-        <button class="w-full bg-red-600 text-white py-3 rounded-md hover:bg-red-700 transition duration-300"
-                type="submit">清空Tokens
-        </button>
-    </form>
-    <p class="text-gray-600 mt-6">点击清空，将会清空所有已保存的 Tokens</p>
-</div>
+    <div class="bg-white p-10 rounded-lg shadow-2xl w-128 text-center">
+        <h1 class="text-4xl font-extrabold text-gray-900 mb-6">Tokens 管理</h1>
+        <p class="text-gray-600 mb-4">当前可用 Tokens 数量：<span class="text-blue-600">{{ tokens_count }}</span></p>
+        <form class="mb-2" id="uploadForm" method="post">
+            <textarea class="w-full p-4 mb-4 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-400 resize-none" name="text" placeholder="一行一个Token，可以是 AccessToken 或 RefreshToken" rows="10"></textarea>
+            <p class="text-gray-600 mb-2">注：使用docker时如果挂载了data文件夹则重启后不需要再次上传</p>
+            <button class="w-full bg-blue-600 text-white py-3 rounded-md hover:bg-blue-700 transition duration-300 mb-2" type="submit">上传</button>
+        </form>
+        <button id="errorButton" class="w-full bg-yellow-600 text-white py-3 rounded-md hover:bg-yellow-700 transition duration-200 mt-2">查看错误Tokens</button>
+        <p class="text-gray-600 mt-2">点击清空，将会清空上传和错误的 Tokens</p>
+        <form id="clearForm" method="post">
+            <button class="w-full bg-red-600 text-white py-3 rounded-md hover:bg-red-700 transition duration-300" type="submit">清空Tokens</button>
+        </form>
+    </div>
+    
+    <div id="errorModal" class="fixed inset-0 bg-gray-800 bg-opacity-75 flex justify-center items-center hidden">
+        <div class="bg-white p-6 rounded-lg shadow-lg w-150">
+            <h2 class="text-2xl font-bold mb-4">错误 Tokens</h2>
+            <div id="errorModalContent" class="list-disc list-inside text-left mb-4"></div>
+            <div class="flex justify-end space-x-4">
+                <button id="errorModalCopy" class="bg-green-600 text-white py-2 px-4 rounded-md hover:bg-green-700 transition duration-300">复制</button>
+                <button id="errorModalClose" class="bg-red-600 text-white py-2 px-4 rounded-md hover:bg-red-700 transition duration-300">关闭</button>
+            </div>
+        </div>
+    </div>
 </body>
-</html>
+</html>

utils/authorization.py

@@ -9,9 +9,11 @@ from utils.config import authorization_list
 
 count = 0
 token_list = []
+error_token_list = []
 
 DATA_FOLDER = "data"
 TOKENS_FILE = os.path.join(DATA_FOLDER, "token.txt")
+ERROR_TOKENS_FILE = os.path.join(DATA_FOLDER, "error_token.txt")
 
 if not os.path.exists(DATA_FOLDER):
     os.makedirs(DATA_FOLDER)
@@ -25,6 +27,15 @@ else:
     with open(TOKENS_FILE, "w", encoding="utf-8") as f:
         pass
 
+if os.path.exists(ERROR_TOKENS_FILE):
+    with open(ERROR_TOKENS_FILE, "r", encoding="utf-8") as f:
+        for line in f:
+            if line.strip() and not line.startswith("#"):
+                error_token_list.append(line.strip())
+else:
+    with open(ERROR_TOKENS_FILE, "w", encoding="utf-8") as f:
+        pass
+
 if token_list:
     logger.info(f"Token list count: {len(token_list)}")
 
@@ -35,6 +46,9 @@ def get_req_token(req_token):
             global count
             count += 1
             count %= len(token_list)
+            while token_list[count] in error_token_list:
+                count += 1
+                count %= len(token_list)
             return token_list[count]
         else:
             return None
@@ -70,7 +84,9 @@ async def refresh_all_tokens(force_refresh=False):
             try:
                 await asyncio.sleep(2)
                 await rt2ac(token, force_refresh=force_refresh)
-            except HTTPException as e:
-                logger.error(f"{e.detail}: {token}")
-                raise HTTPException(status_code=e.status_code, detail=e.detail)
+            except HTTPException:
+                with open(ERROR_TOKENS_FILE, "a", encoding="utf-8") as f:
+                    f.write(token + "\n")
+                if token not in error_token_list:
+                    error_token_list.append(token)
     logger.info("All tokens refreshed.")