Skip to content

Commit

Permalink
v1.6.3-beta2 x-sign
Browse files Browse the repository at this point in the history
  • Loading branch information
lanqian528 committed Oct 31, 2024
1 parent d2d8283 commit c5492d8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
10 changes: 5 additions & 5 deletions gateway/share.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from gateway.reverseProxy import get_real_req_token, content_generator
from utils.Client import Client
from utils.Logger import logger
from utils.config import proxy_url_list, chatgpt_base_url_list, turnstile_solver_url, ark0se_token_url
from utils.config import proxy_url_list, chatgpt_base_url_list, turnstile_solver_url, x_sign

base_headers = {
'accept': '*/*',
Expand Down Expand Up @@ -130,7 +130,6 @@ async def chat_conversations(request: Request):
user_agent = ua.get("user-agent", "")
proxy_url = random.choice(proxy_url_list) if proxy_url_list else None
host_url = random.choice(chatgpt_base_url_list) if chatgpt_base_url_list else "https://chatgpt.com"
chat_token = None
proof_token = None
turnstile_token = None

Expand Down Expand Up @@ -180,7 +179,8 @@ async def chat_conversations(request: Request):
request_cookies = dict(request.cookies)
background = BackgroundTask(client.close)
r = await client.post_stream(f"{host_url}/backend-api/conversation", params=params, headers=headers, cookies=request_cookies, data=data, stream=True, allow_redirects=False)
if 'stream' in r.headers.get("content-type", ""):
return StreamingResponse(content_generator(r, token), media_type=r.headers.get("content-type"), background=background)
rheaders = r.headers.update({"x-sign": x_sign}) if x_sign else r.headers
if 'stream' in rheaders.get("content-type", ""):
return StreamingResponse(content_generator(r, token), media_type=rheaders.get("content-type"), background=background)
else:
return Response(content=(await r.atext()), media_type=r.headers.get("content-type"), status_code=r.status_code, background=background)
return Response(content=(await r.atext()), media_type=rheaders.get("content-type"), status_code=r.status_code, background=background)
5 changes: 2 additions & 3 deletions utils/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ def is_true(x):
authorization = os.getenv('AUTHORIZATION', '').replace(' ', '')
chatgpt_base_url = os.getenv('CHATGPT_BASE_URL', 'https://chatgpt.com').replace(' ', '')
auth_key = os.getenv('AUTH_KEY', None)
user_agents = os.getenv('USER_AGENTS', '[]')
random_token = is_true(os.getenv('RANDOM_TOKEN', True))
x_sign = os.getenv('X_SIGN', None)

ark0se_token_url = os.getenv('ARK' + 'OSE_TOKEN_URL', '').replace(' ', '')
if not ark0se_token_url:
Expand All @@ -45,12 +44,12 @@ def is_true(x):
upload_by_url = is_true(os.getenv('UPLOAD_BY_URL', False))
check_model = is_true(os.getenv('CHECK_MODEL', False))
scheduled_refresh = is_true(os.getenv('SCHEDULED_REFRESH', False))
random_token = is_true(os.getenv('RANDOM_TOKEN', True))

authorization_list = authorization.split(',') if authorization else []
chatgpt_base_url_list = chatgpt_base_url.split(',') if chatgpt_base_url else []
ark0se_token_url_list = ark0se_token_url.split(',') if ark0se_token_url else []
proxy_url_list = proxy_url.split(',') if proxy_url else []
user_agents_list = ast.literal_eval(user_agents)

with open('version.txt') as f:
version = f.read().strip()
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.3-beta1
1.6.3-beta2

0 comments on commit c5492d8

Please sign in to comment.