mirror of
https://github.com/xtekky/gpt4free.git
synced 2025-12-06 02:30:41 -08:00
Enhance GLM provider with authentication signature generation and caching; update setup.py dependencies
This commit is contained in:
hlohaus
parent
230a725748
commit
a727866caa
2 changed files with 186 additions and 8 deletions
|
|
@ -1,20 +1,170 @@
|
|||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import json
|
||||
import time
|
||||
import hashlib
|
||||
import hmac
|
||||
import uuid
|
||||
import requests
|
||||
import urllib.parse
|
||||
|
||||
from ..typing import AsyncResult, Messages
|
||||
from ..providers.response import Usage, Reasoning
|
||||
from ..requests import StreamSession, raise_for_status
|
||||
from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
|
||||
from ..errors import ModelNotFoundError, ProviderException
|
||||
from .base_provider import AsyncGeneratorProvider, ProviderModelMixin, AuthFileMixin
|
||||
|
||||
class GLM(AsyncGeneratorProvider, ProviderModelMixin):
|
||||
class GLM(AsyncGeneratorProvider, ProviderModelMixin, AuthFileMixin):
|
||||
url = "https://chat.z.ai"
|
||||
api_endpoint = "https://chat.z.ai/api/chat/completions"
|
||||
working = True
|
||||
active_by_default = True
|
||||
default_model = "GLM-4.5"
|
||||
|
||||
api_key = None
|
||||
auth_user_id = None
|
||||
|
||||
@classmethod
|
||||
def create_signature_with_timestamp(cls,e: str, t: str):
|
||||
current_time = int(time.time() * 1000) # Current time in milliseconds
|
||||
current_time_string = str(current_time)
|
||||
data_string = f"{e}|{t}|{current_time_string}"
|
||||
time_window = current_time // (5 * 60 * 1000) # 5 minutes in milliseconds
|
||||
|
||||
base_signature = hmac.new(
|
||||
"junjie".encode("utf-8"),
|
||||
str(time_window).encode("utf-8"),
|
||||
hashlib.sha256
|
||||
).hexdigest()
|
||||
|
||||
signature = hmac.new(
|
||||
base_signature.encode("utf-8"),
|
||||
data_string.encode("utf-8"),
|
||||
hashlib.sha256
|
||||
).hexdigest()
|
||||
|
||||
return {
|
||||
"signature": signature,
|
||||
"timestamp": current_time
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def prepare_auth_params(cls, token: str, user_id: str):
|
||||
# Basic parameters
|
||||
current_time = str(int(time.time() * 1000))
|
||||
request_id = str(uuid.uuid1()) # Using uuid1 which is equivalent to v1
|
||||
|
||||
basic_params = {
|
||||
"timestamp": current_time,
|
||||
"requestId": request_id,
|
||||
"user_id": user_id,
|
||||
}
|
||||
|
||||
# Additional parameters
|
||||
additional_params = {
|
||||
"version": "0.0.1",
|
||||
"platform": "web",
|
||||
"token": token,
|
||||
"user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
|
||||
"language": "en-US",
|
||||
"languages": "en-US,en",
|
||||
"timezone": "Asia/Jakarta",
|
||||
"cookie_enabled": "true",
|
||||
"screen_width": "1920",
|
||||
"screen_height": "1080",
|
||||
"screen_resolution": "1920x1080",
|
||||
"viewport_height": "900",
|
||||
"viewport_width": "1440",
|
||||
"viewport_size": "1440x900",
|
||||
"color_depth": "24",
|
||||
"pixel_ratio": "1",
|
||||
"current_url": "https://chat.z.ai/c/e1295904-98d3-4d85-b6ee-a211471101e9",
|
||||
"pathname": "/",
|
||||
"search": "",
|
||||
"hash": "",
|
||||
"host": "z.ai",
|
||||
"hostname": "chat.z.ai",
|
||||
"protocol": "https",
|
||||
"referrer": "https://accounts.google.com/",
|
||||
"title": "A Little House Keeping",
|
||||
"timezone_offset": str(-(time.timezone if time.daylight == 0 else time.altzone) // 60),
|
||||
"local_time": time.strftime('%Y-%m-%dT%H:%M:%S.%fZ', time.gmtime()),
|
||||
"utc_time": time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.gmtime()),
|
||||
"is_mobile": "false",
|
||||
"is_touch": "false",
|
||||
"max_touch_points": "5",
|
||||
"browser_name": "Chrome",
|
||||
"os_name": "Linux",
|
||||
}
|
||||
|
||||
# Combine parameters
|
||||
all_params = {**basic_params, **additional_params}
|
||||
|
||||
# Create URLSearchParams equivalent
|
||||
url_params_string = urllib.parse.urlencode(all_params)
|
||||
|
||||
# Create sorted payload (basic params only, sorted by key)
|
||||
sorted_payload = ','.join([f"{k},{v}" for k, v in sorted(basic_params.items())])
|
||||
|
||||
return {
|
||||
"sortedPayload": sorted_payload,
|
||||
"urlParams": url_params_string
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def get_endpoint_signature(cls, token: str, user_id: str, user_prompt: str):
|
||||
# Get auth parameters
|
||||
auth_params = cls.prepare_auth_params(token, user_id)
|
||||
sorted_payload = auth_params["sortedPayload"]
|
||||
url_params = auth_params["urlParams"]
|
||||
|
||||
# debug.log(f"Prompt:{user_prompt}")
|
||||
last_user_prompt = user_prompt.strip()
|
||||
|
||||
# Create signature with timestamp
|
||||
signature_data = cls.create_signature_with_timestamp(sorted_payload, last_user_prompt)
|
||||
signature = signature_data["signature"]
|
||||
timestamp = signature_data["timestamp"]
|
||||
|
||||
# Construct the endpoint URL
|
||||
endpoint = f"{cls.api_endpoint}?{url_params}&signature_timestamp={timestamp}"
|
||||
|
||||
return (endpoint, signature, timestamp)
|
||||
|
||||
@classmethod
|
||||
def get_auth_from_cache(cls):
|
||||
cache_file_path = cls.get_cache_file()
|
||||
#get file mtime
|
||||
#if time compared by now is less than 5 minutes
|
||||
# read cache_file_path and return json
|
||||
#else return none
|
||||
if cache_file_path.is_file():
|
||||
# Get the modification time of the file
|
||||
file_mtime = cache_file_path.stat().st_mtime
|
||||
# Get current time
|
||||
current_time = time.time()
|
||||
# Calculate the difference in seconds
|
||||
time_diff = current_time - file_mtime
|
||||
# Check if the file is less than 30 minutes old (30 * 60 seconds)
|
||||
if time_diff < 5 * 60:
|
||||
try:
|
||||
with open(cache_file_path, 'r') as file:
|
||||
return json.load(file)
|
||||
except (json.JSONDecodeError, IOError):
|
||||
# If there's an error reading or parsing the file, delete it and return None
|
||||
try:
|
||||
os.remove(cache_file_path)
|
||||
except OSError:
|
||||
pass # If we can't delete the file, just return None
|
||||
return None
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
def save_auth_to_cache(cls,data):
|
||||
cache_file_path = cls.get_cache_file()
|
||||
with cache_file_path.open('w') as file:
|
||||
json.dump(data, file)
|
||||
|
||||
@classmethod
|
||||
def get_models(cls, **kwargs) -> str:
|
||||
|
|
@ -27,6 +177,18 @@ class GLM(AsyncGeneratorProvider, ProviderModelMixin):
|
|||
cls.models = list(cls.model_aliases.keys())
|
||||
return cls.models
|
||||
|
||||
@classmethod
|
||||
def get_last_user_message_content(cls, messages):
|
||||
"""
|
||||
Get the content of the last message with role 'user'
|
||||
"""
|
||||
# Iterate through messages in reverse order to find the last user message
|
||||
for message in reversed(messages):
|
||||
if message.get('role') == 'user':
|
||||
return message.get('content')
|
||||
# Return None if no user message is found
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
async def create_async_generator(
|
||||
cls,
|
||||
|
|
@ -36,7 +198,18 @@ class GLM(AsyncGeneratorProvider, ProviderModelMixin):
|
|||
**kwargs
|
||||
) -> AsyncResult:
|
||||
cls.get_models()
|
||||
model = cls.get_model(model)
|
||||
try:
|
||||
model = cls.get_model(model)
|
||||
except ModelNotFoundError:
|
||||
# If get_model fails, use the provided model directly
|
||||
model = model
|
||||
|
||||
# Ensure we have an API key before proceeding
|
||||
if not cls.api_key:
|
||||
raise ProviderException("Failed to obtain API key from authentication endpoint")
|
||||
|
||||
user_prompt = cls.get_last_user_message_content(messages)
|
||||
endpoint, signature, timestamp = cls.get_endpoint_signature(cls.api_key,cls.auth_user_id,user_prompt)
|
||||
data = {
|
||||
"chat_id": "local",
|
||||
"id": str(uuid.uuid4()),
|
||||
|
|
@ -54,9 +227,13 @@ class GLM(AsyncGeneratorProvider, ProviderModelMixin):
|
|||
proxy=proxy,
|
||||
) as session:
|
||||
async with session.post(
|
||||
cls.api_endpoint,
|
||||
endpoint,
|
||||
json=data,
|
||||
headers={"Authorization": f"Bearer {cls.api_key}", "x-fe-version": "prod-fe-1.0.57"},
|
||||
headers={
|
||||
"Authorization": f"Bearer {cls.api_key}",
|
||||
"x-fe-version": "prod-fe-1.0.95",
|
||||
"x-signature": signature
|
||||
},
|
||||
) as response:
|
||||
await raise_for_status(response)
|
||||
usage = None
|
||||
|
|
@ -78,4 +255,4 @@ class GLM(AsyncGeneratorProvider, ProviderModelMixin):
|
|||
else:
|
||||
delta_content = chunk.get("data", {}).get("delta_content")
|
||||
if delta_content:
|
||||
yield delta_content
|
||||
yield delta_content
|
||||
5
setup.py
5
setup.py
|
|
@ -53,7 +53,8 @@ EXTRA_REQUIRE = {
|
|||
"nodriver",
|
||||
"python-multipart",
|
||||
"a2wsgi",
|
||||
"markitdown[docx,pdf,pptx]",
|
||||
"pypdf2",
|
||||
"python-docx",
|
||||
"python-dotenv",
|
||||
"aiofile"
|
||||
],
|
||||
|
|
@ -72,11 +73,11 @@ EXTRA_REQUIRE = {
|
|||
"loguru", "fastapi",
|
||||
"uvicorn",
|
||||
"python-multipart",
|
||||
"a2wsgi",
|
||||
],
|
||||
"gui": [
|
||||
"werkzeug", "flask",
|
||||
"beautifulsoup4", "pillow",
|
||||
"ddgs",
|
||||
],
|
||||
"search": [
|
||||
"beautifulsoup4",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue