diff --git a/config.py b/config.py index f3c9ecb05..383549c21 100644 --- a/config.py +++ b/config.py @@ -43,7 +43,7 @@ # AVAIL_LLM_MODELS = [ # "glm-4-0520", "glm-4-air", "glm-4-airx", "glm-4-flash", # "qianfan", "deepseekcoder", -# "spark", "sparkv2", "sparkv3", "sparkv3.5", +# "spark", "sparkv2", "sparkv3", "sparkv3.5", "sparkv4", # "qwen-turbo", "qwen-plus", "qwen-max", "qwen-local", # "moonshot-v1-128k", "moonshot-v1-32k", "moonshot-v1-8k", # "gpt-3.5-turbo-0613", "gpt-3.5-turbo-16k-0613", "gpt-3.5-turbo-0125", "gpt-4o-2024-05-13" diff --git a/request_llms/bridge_all.py b/request_llms/bridge_all.py index 92416ad62..1d4089432 100644 --- a/request_llms/bridge_all.py +++ b/request_llms/bridge_all.py @@ -860,6 +860,15 @@ def decode(self, *args, **kwargs): "max_token": 4096, "tokenizer": tokenizer_gpt35, "token_cnt": get_token_num_gpt35, + }, + "sparkv4":{ + "fn_with_ui": spark_ui, + "fn_without_ui": spark_noui, + "can_multi_thread": True, + "endpoint": None, + "max_token": 4096, + "tokenizer": tokenizer_gpt35, + "token_cnt": get_token_num_gpt35, } }) except: diff --git a/request_llms/com_sparkapi.py b/request_llms/com_sparkapi.py index 359e407ae..a91960029 100644 --- a/request_llms/com_sparkapi.py +++ b/request_llms/com_sparkapi.py @@ -67,6 +67,7 @@ def __init__(self): self.gpt_url_v3 = "ws://spark-api.xf-yun.com/v3.1/chat" self.gpt_url_v35 = "wss://spark-api.xf-yun.com/v3.5/chat" self.gpt_url_img = "wss://spark-api.cn-huabei-1.xf-yun.com/v2.1/image" + self.gpt_url_v4 = "wss://spark-api.xf-yun.com/v4.0/chat" self.time_to_yield_event = threading.Event() self.time_to_exit_event = threading.Event() @@ -94,6 +95,8 @@ def create_blocking_request(self, inputs, llm_kwargs, history, system_prompt, us gpt_url = self.gpt_url_v3 elif llm_kwargs['llm_model'] == 'sparkv3.5': gpt_url = self.gpt_url_v35 + elif llm_kwargs['llm_model'] == 'sparkv4': + gpt_url = self.gpt_url_v4 else: gpt_url = self.gpt_url file_manifest = [] @@ -194,6 +197,7 @@ def gen_params(appid, inputs, llm_kwargs, history, system_prompt, file_manifest) "sparkv2": "generalv2", "sparkv3": "generalv3", "sparkv3.5": "generalv3.5", + "sparkv4": "4.0Ultra" } domains_select = domains[llm_kwargs['llm_model']] if file_manifest: domains_select = 'image'