Upload 24 files

app.py

@@ -7,3 +7,4 @@ log_config["formatters"]["default"]["fmt"] = default_format
 log_config["formatters"]["access"]["fmt"] = access_format
 
 uvicorn.run("chat2api:app", host="0.0.0.0", port=5005)
+# uvicorn.run("chat2api:app", host="0.0.0.0", port=5005, ssl_keyfile="key.pem", ssl_certfile="cert.pem")

chat2api.py

@@ -131,19 +131,33 @@ async def error_tokens():
     return {"status": "success", "error_tokens": error_tokens_list}
 
 
+@app.get(f"/{api_prefix}/tokens/add/{{token}}" if api_prefix else "/tokens/add/{token}")
+async def add_token(token: str):
+    if token.strip() and not token.startswith("#"):
+        globals.token_list.append(token.strip())
+        with open("data/token.txt", "a", encoding="utf-8") as f:
+            f.write(token.strip() + "\n")
+    logger.info(f"Token count: {len(globals.token_list)}, Error token count: {len(globals.error_token_list)}")
+    tokens_count = len(set(globals.token_list) - set(globals.error_token_list))
+    return {"status": "success", "tokens_count": tokens_count}
+
+
 if enable_gateway:
     @app.get("/", response_class=HTMLResponse)
-    async def chatgpt(request: Request):
-        seed_token = request.query_params.get("seed")
-        if not seed_token:
-            seed_token = request.cookies.get("seed_token")
-        if not seed_token:
-            seed_token = str(int(time.time()))
-        req_token = get_req_token(seed_token)
-        seed_token = await verify_token(req_token)
-
-        response = templates.TemplateResponse("chatgpt.html", {"request": request, "access_token": seed_token})
-        response.set_cookie("seed_token", value=seed_token)
+    async def chatgpt_html(request: Request):
+        token = request.query_params.get("token")
+        if not token:
+            token = request.cookies.get("token")
+        if not token:
+            return await login_html(request)
+
+        response = templates.TemplateResponse("chatgpt.html", {"request": request, "token": token})
+        response.set_cookie("token", value=token)
+        return response
+
+    @app.get("/login", response_class=HTMLResponse)
+    async def login_html(request: Request):
+        response = templates.TemplateResponse("login.html", {"request": request})
         return response
 
 
@@ -205,8 +219,13 @@ if enable_gateway:
         }
 
 
-    banned_paths = ["backend-api/accounts/logout_all", "backend-api/accounts/deactivate",
-                    "backend-api/user_system_messages"]
+    banned_paths = [
+        "backend-api/accounts/logout_all",
+        "backend-api/accounts/deactivate",
+        "backend-api/user_system_messages",
+        "backend-api/memories",
+        "backend-api/settings/clear_account_user_memory"
+    ]
     redirect_paths = ["auth/logout"]
     chatgpt_paths = ["c/"]
 
@@ -215,7 +234,7 @@ if enable_gateway:
     async def reverse_proxy(request: Request, path: str):
         for chatgpt_path in chatgpt_paths:
             if chatgpt_path in path:
-                return await chatgpt(request)
+                return await chatgpt_html(request)
 
         for banned_path in banned_paths:
             if banned_path in path:
@@ -224,7 +243,9 @@ if enable_gateway:
         for redirect_path in redirect_paths:
             if redirect_path in path:
                 redirect_url = str(request.base_url)
-                return RedirectResponse(url=f"{redirect_url}?seed={int(time.time())}", status_code=302)
+                response = RedirectResponse(url=f"{redirect_url}", status_code=302)
+                response.delete_cookie("token")
+                return response
 
         return await chatgpt_reverse_proxy(request, path)
 else:

chatgpt/ChatService.py

@@ -37,7 +37,7 @@ class ChatService:
         self.req_token = get_req_token(origin_token)
         self.ua = get_ua(self.req_token)
         self.user_agent = self.ua.get(
-            "User-Agent",
+            "user-agent",
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
         )
         self.chat_token = "gAAAAAB"
@@ -95,22 +95,22 @@ class ChatService:
         self.chat_request = None
 
         self.base_headers = {
-            'Accept': '*/*',
-            'Accept-Encoding': 'gzip, deflate, br, zstd',
-            'Accept-Language': 'en-US,en;q=0.9',
-            'Content-Type': 'application/json',
-            'Oai-Device-Id': self.oai_device_id,
-            'Oai-Language': 'en-US',
-            'Origin': self.host_url,
-            'Priority': 'u=1, i',
-            'Referer': f'{self.host_url}/',
-            'Sec-Ch-Ua': self.ua.get("Sec-Ch-Ua", '"Chromium";v="124", "Microsoft Edge";v="124", "Not-A.Brand";v="99"'),
-            'Sec-Ch-Ua-Mobile': self.ua.get("Sec-Ch-Ua-Mobile", "?0"),
-            'Sec-Ch-Ua-Platform': self.ua.get("Sec-Ch-Ua-Platform", '"Windows"'),
-            'Sec-Fetch-Dest': 'empty',
-            'Sec-Fetch-Mode': 'cors',
-            'Sec-Fetch-Site': 'same-origin',
-            'User-Agent': self.user_agent,
+            'accept': '*/*',
+            'accept-encoding': 'gzip, deflate, br, zstd',
+            'accept-language': 'en-US,en;q=0.9',
+            'content-type': 'application/json',
+            'oai-device-id': self.oai_device_id,
+            'oai-language': 'en-US',
+            'origin': self.host_url,
+            'priority': 'u=1, i',
+            'referer': f'{self.host_url}/',
+            'sec-ch-ua': self.ua.get("sec-ch-ua", '"Chromium";v="124", "Microsoft Edge";v="124", "Not-A.Brand";v="99"'),
+            'sec-ch-ua-mobile': self.ua.get("sec-ch-ua-mobile", "?0"),
+            'sec-ch-ua-platform': self.ua.get("sec-ch-ua-platform", '"Windows"'),
+            'sec-fetch-dest': 'empty',
+            'sec-fetch-mode': 'cors',
+            'sec-fetch-site': 'same-origin',
+            'user-agent': self.user_agent
         }
         if self.access_token:
             self.base_url = self.host_url + "/backend-api"
@@ -281,22 +281,22 @@ class ChatService:
         self.chat_headers = self.base_headers.copy()
         self.chat_headers.update(
             {
-                'Accept': 'text/event-stream',
-                'Openai-Sentinel-Chat-Requirements-Token': self.chat_token,
-                'Openai-Sentinel-Proof-Token': self.proof_token,
+                'accept': 'text/event-stream',
+                'openai-sentinel-chat-requirements-token': self.chat_token,
+                'openai-sentinel-proof-token': self.proof_token,
             }
         )
         if self.ark0se_token:
-            self.chat_headers['Openai-Sentinel-Ark' + 'ose-Token'] = self.ark0se_token
+            self.chat_headers['openai-sentinel-ark' + 'ose-token'] = self.ark0se_token
 
         if self.turnstile_token:
-            self.chat_headers['Openai-Sentinel-Turnstile-Token'] = self.turnstile_token
+            self.chat_headers['openai-sentinel-turnstile-token'] = self.turnstile_token
 
         if conversation_only:
-            self.chat_headers.pop('Openai-Sentinel-Chat-Requirements-Token', None)
-            self.chat_headers.pop('Openai-Sentinel-Proof-Token', None)
-            self.chat_headers.pop('Openai-Sentinel-Ark' + 'ose-Token', None)
-            self.chat_headers.pop('Openai-Sentinel-Turnstile-Token', None)
+            self.chat_headers.pop('openai-sentinel-chat-requirements-token', None)
+            self.chat_headers.pop('openai-sentinel-proof-token', None)
+            self.chat_headers.pop('openai-sentinel-ark' + 'ose-token', None)
+            self.chat_headers.pop('openai-sentinel-turnstile-token', None)
 
         if "gpt-4-gizmo" in self.origin_model:
             gizmo_id = self.origin_model.split("gpt-4-gizmo-")[-1]
@@ -429,10 +429,10 @@ class ChatService:
         headers = self.base_headers.copy()
         headers.update(
             {
-                'Accept': 'application/json, text/plain, */*',
-                'Content-Type': mime_type,
-                'X-Ms-Blob-Type': 'BlockBlob',
-                'X-Ms-Version': '2020-04-08',
+                'accept': 'application/json, text/plain, */*',
+                'content-type': mime_type,
+                'x-ms-blob-type': 'BlockBlob',
+                'x-ms-version': '2020-04-08',
             }
         )
         headers.pop('Authorization', None)

chatgpt/authorization.py

@@ -1,4 +1,5 @@
 import asyncio
+import json
 import os
 import random
 
@@ -40,16 +41,30 @@ def get_req_token(req_token, seed=None):
 
 def get_ua(req_token):
     user_agent = globals.user_agent_map.get(req_token, "")
-    # token为空，免登录用户，则随机生成ua
+    user_agent = {k.lower(): v for k, v in user_agent.items()}
     if not user_agent:
-        ua = ua_generator.generate(device='desktop', browser=('chrome', 'edge'), platform=('windows', 'macos'))
-        return {
-            "User-Agent": ua.text,
-            "Sec-Ch-Ua-Platform": ua.platform,
-            "Sec-Ch-Ua": ua.ch.brands,
-            "Sec-Ch-Ua-Mobile": ua.ch.mobile,
-            "impersonate": random.choice(globals.impersonate_list),
-        }
+        if not req_token:
+            ua = ua_generator.generate(device='desktop', browser=('chrome', 'edge'), platform=('windows', 'macos'))
+            return {
+                "user-agent": ua.text,
+                "sec-ch-ua-platform": ua.platform,
+                "sec-ch-ua": ua.ch.brands,
+                "sec-ch-ua-mobile": ua.ch.mobile,
+                "impersonate": random.choice(globals.impersonate_list),
+            }
+        else:
+            ua = ua_generator.generate(device='desktop', browser=('chrome', 'edge'), platform=('windows', 'macos'))
+            user_agent = {
+                "user-agent": ua.text,
+                "sec-ch-ua-platform": ua.platform,
+                "sec-ch-ua": ua.ch.brands,
+                "sec-ch-ua-mobile": ua.ch.mobile,
+                "impersonate": random.choice(globals.impersonate_list),
+            }
+            globals.user_agent_map[req_token] = user_agent
+            with open(globals.USER_AGENTS_FILE, "a", encoding="utf-8") as f:
+                f.write(json.dumps({req_token: user_agent}, indent=4))
+            return user_agent
     else:
         return user_agent
 

chatgpt/globals.py

@@ -78,10 +78,10 @@ if os.path.exists(USER_AGENTS_FILE):
         for token in new_tokens:
             ua = ua_generator.generate(device='desktop', browser=('chrome', 'edge'), platform=('windows', 'macos'))
             ua_dict = {
-                "User-Agent": ua.text,
-                "Sec-Ch-Ua-Platform": ua.platform,
-                "Sec-Ch-Ua": ua.ch.brands,
-                "Sec-Ch-Ua-Mobile": ua.ch.mobile,
+                "user-agent": ua.text,
+                "sec-ch-ua-platform": ua.platform,
+                "sec-ch-ua": ua.ch.brands,
+                "sec-ch-ua-mobile": ua.ch.mobile,
                 "impersonate": random.choice(impersonate_list),
             }
             user_agent_map[token] = ua_dict
@@ -91,10 +91,10 @@ else:
     for token in token_list:
         ua = ua_generator.generate(device='desktop', browser=('chrome', 'edge'), platform=('windows', 'macos'))
         ua_dict = {
-            "User-Agent": ua.text,
-            "Sec-Ch-Ua-Platform": ua.platform,
-            "Sec-Ch-Ua": ua.ch.brands,
-            "Sec-Ch-Ua-Mobile": ua.ch.mobile,
+            "user-agent": ua.text,
+            "sec-ch-ua-platform": ua.platform,
+            "sec-ch-ua": ua.ch.brands,
+            "sec-ch-ua-mobile": ua.ch.mobile,
             "impersonate": random.choice(impersonate_list),
         }
         user_agent_map[token] = ua_dict

chatgpt/reverseProxy.py

@@ -5,7 +5,7 @@ from fastapi import Request, HTTPException
 from fastapi.responses import StreamingResponse, Response
 from starlette.background import BackgroundTask
 
-from chatgpt.authorization import verify_token, get_req_token
+from chatgpt.authorization import verify_token, get_req_token, get_ua
 from utils.Client import Client
 from utils.config import chatgpt_base_url_list, proxy_url_list, enable_gateway
 
@@ -61,6 +61,15 @@ headers_reject_list = [
 ]
 
 
+async def get_real_req_token(token):
+    req_token = get_req_token(token)
+    if len(req_token) == 45 or req_token.startswith("eyJhbGciOi"):
+        return req_token
+    else:
+        req_token = get_req_token(None, token)
+        return req_token
+
+
 async def chatgpt_reverse_proxy(request: Request, path: str):
     try:
         origin_host = request.url.netloc
@@ -79,7 +88,7 @@ async def chatgpt_reverse_proxy(request: Request, path: str):
 
         headers = {
             key: value for key, value in request.headers.items()
-            if (key.lower() not in ["host", "origin", "referer"] and key.lower() not in headers_reject_list)
+            if (key.lower() not in ["host", "origin", "referer", "priority", "oai-device-id"] and key.lower() not in headers_reject_list)
         }
 
         base_url = random.choice(chatgpt_base_url_list) if chatgpt_base_url_list else "https://chatgpt.com"
@@ -88,31 +97,23 @@ async def chatgpt_reverse_proxy(request: Request, path: str):
         if "file-" in path and "backend-api" not in path:
             base_url = "https://files.oaiusercontent.com"
 
-        # req_token = request.cookies.get("req_token")
-        # ua = get_ua(req_token)
-        # headers.update(ua)
+        token = request.cookies.get("token")
+        req_token = await get_real_req_token(token)
+        ua = get_ua(req_token)
+        headers.update(ua)
+
         headers.update({
             "accept-language": "en-US,en;q=0.9",
             "host": base_url.replace("https://", "").replace("http://", ""),
             "origin": base_url,
-            "referer": f"{base_url}/",
-            "sec-fetch-dest": "empty",
-            "sec-fetch-mode": "cors",
-            "sec-fetch-site": "same-origin",
+            "referer": f"{base_url}/"
         })
 
-        seed_token = headers.get("authorization", "").replace("Bearer ", "")
-        if seed_token:
-            req_token = get_req_token(seed_token)
+        token = headers.get("authorization", "").replace("Bearer ", "")
+        if token:
+            req_token = await get_real_req_token(token)
             access_token = await verify_token(req_token)
-            if access_token.startswith("eyJhbGciOi"):
-                headers.update({"authorization": access_token})
-            else:
-                req_token = get_req_token(None, seed_token)
-                access_token = await verify_token(req_token)
-                headers.update({"authorization": access_token})
-        else:
-            headers.pop("authorization", None)
+            headers.update({"authorization": access_token})
 
         data = await request.body()
 

utils/config.py

@@ -52,7 +52,7 @@ proxy_url_list = proxy_url.split(',') if proxy_url else []
 user_agents_list = ast.literal_eval(user_agents)
 
 logger.info("-" * 60)
-logger.info("Chat2Api 1.5.6 | https://github.com/lanqian528/chat2api")
+logger.info("Chat2Api 1.5.10 | https://github.com/lanqian528/chat2api")
 logger.info("-" * 60)
 logger.info("Environment variables:")
 logger.info("API_PREFIX:        " + str(api_prefix))