gpt4free

公开

关注 0 Fork 0 Star 1

返回提交历史

XFEstudio/gpt4free

Comprehensive Updates and Enhancements Across Multiple Providers

f1683c8d

kqlio67 <kqlio67@users.noreply.github.com>

提交于 2024-08-31 09:47

父提交 c138f30

代码差异

15 个文件 +620 -377

Modified g4f/Provider/Blackbox.py +19 -1

@@ -21,6 +21,20 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):

21 21 'llama-3.1-70b',

22 22 'llama-3.1-405b',

23 23 ]

25 model_aliases = {

26 "gemini-flash": "gemini-1.5-flash",

27 }

29 @classmethod

30 def get_model(cls, model: str) -> str:

31 if model in cls.models:

32 return model

33 elif model in cls.model_aliases:

34 return cls.model_aliases[model]

35 else:

36 return cls.default_model

24 38 @classmethod

25 39 async def create_async_generator(

26 40 cls,

@@ -55,6 +69,9 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):

55 69 async with ClientSession(headers=headers) as session:

56 70 random_id = secrets.token_hex(16)

57 71 random_user_id = str(uuid.uuid4())

73 model = cls.get_model(model) # Resolve the model alias

58 75 model_id_map = {

59 76 "blackbox": {},

60 77 "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'},

@@ -62,6 +79,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):

62 79 'llama-3.1-70b': {'mode': True, 'id': "llama-3.1-70b"},

63 80 'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405b"}

64 81 }

65 83 data = {

66 84 "messages": messages,

67 85 "id": random_id,

@@ -75,7 +93,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):

75 93 "webSearchMode": False,

76 94 "userSystemPrompt": "",

77 95 "githubToken": None,

                "trendingAgentModel": model_id_map[model], # if you actually test this on the site, just ask each model "yo", weird behavior imo

96 "trendingAgentModel": model_id_map.get(model, {}), # Default to empty dict if model not found

79 97 "maxTokens": None

80 98 }

81 99

Modified g4f/Provider/ChatgptFree.py +9 -2

@@ -43,6 +43,7 @@ class ChatgptFree(AsyncGeneratorProvider, ProviderModelMixin):

43 43 'sec-fetch-site': 'same-origin',

44 44

            'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36',

45 45 }

46 47 async with StreamSession(

47 48 headers=headers,

48 49 cookies=cookies,

@@ -55,6 +56,12 @@ class ChatgptFree(AsyncGeneratorProvider, ProviderModelMixin):

55 56 async with session.get(f"{cls.url}/") as response:

56 57 await raise_for_status(response)

57 58 response = await response.text()

60 result = re.search(r'data-post-id="([0-9]+)"', response)

61 if not result:

62 raise RuntimeError("No post id found")

63 cls._post_id = result.group(1)

58 65 result = re.search(r'data-nonce="(.*?)"', response)

59 66 if result:

60 67 cls._nonce = result.group(1)

@@ -70,7 +77,7 @@ class ChatgptFree(AsyncGeneratorProvider, ProviderModelMixin):

70 77 "message": prompt,

71 78 "bot_id": "0"

72 79 }

74 81 async with session.post(f"{cls.url}/wp-admin/admin-ajax.php", data=data, cookies=cookies) as response:

75 82 await raise_for_status(response)

76 83 buffer = ""

@@ -96,4 +103,4 @@ class ChatgptFree(AsyncGeneratorProvider, ProviderModelMixin):

96 103 if 'data' in json_response:

97 104 yield json_response['data']

98 105 except json.JSONDecodeError:

99 print(f"Failed to decode final JSON. Buffer content: {buffer}")

106 print(f"Failed to decode final JSON. Buffer content: {buffer}")

Modified g4f/Provider/DDG.py +0 -2

@@ -21,8 +21,6 @@ class DDG(AsyncGeneratorProvider, ProviderModelMixin):

21 21 default_model = "gpt-4o-mini"

22 22

    models = ["gpt-4o-mini", "claude-3-haiku-20240307", "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo", "mistralai/Mixtral-8x7B-Instruct-v0.1"]

23 23 model_aliases = {

24 "gpt-4": "gpt-4o-mini",

25 "gpt-4o": "gpt-4o-mini",

26 24 "claude-3-haiku": "claude-3-haiku-20240307",

27 25 "llama-3.1-70b": "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo",

28 26 "mixtral-8x7b": "mistralai/Mixtral-8x7B-Instruct-v0.1"

Added g4f/Provider/FluxAirforce.py +69 -0

@@ -0,0 +1,69 @@

1 from __future__ import annotations

3 from aiohttp import ClientSession

4 from urllib.parse import urlencode

6 from ..typing import AsyncResult, Messages

7 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin

8 from ..image import ImageResponse

10 class FluxAirforce(AsyncGeneratorProvider, ProviderModelMixin):

11 url = "https://flux.api.airforce/"

12 api_endpoint = "https://api.airforce/v1/imagine2"

13 working = True

14 default_model = 'flux-realism'

15 models = [

16 'flux',

17 'flux-realism',

18 'flux-anime',

19 'flux-3d',

20 'flux-disney'

21 ]

23 @classmethod

24 async def create_async_generator(

25 cls,

26 model: str,

27 messages: Messages,

28 proxy: str = None,

29 **kwargs

30 ) -> AsyncResult:

31 headers = {

32 "accept": "*/*",

33 "accept-language": "en-US,en;q=0.9",

34 "origin": "https://flux.api.airforce",

35 "priority": "u=1, i",

36 "referer": "https://flux.api.airforce/",

37 "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"',

38 "sec-ch-ua-mobile": "?0",

39 "sec-ch-ua-platform": '"Linux"',

40 "sec-fetch-dest": "empty",

41 "sec-fetch-mode": "cors",

42 "sec-fetch-site": "same-site",

            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36"

44 }

46 # Assume the last message in the messages list is the prompt

47 prompt = messages[-1]['content'] if messages else ""

49 params = {

50 "prompt": prompt,

51 "size": kwargs.get("size", "1:1"),

52 "seed": kwargs.get("seed"),

53 "model": model

54 }

56 # Remove None values from params

57 params = {k: v for k, v in params.items() if v is not None}

59 async with ClientSession(headers=headers) as session:

60 async with session.get(f"{cls.api_endpoint}", params=params, proxy=proxy) as response:

61 response.raise_for_status()

63 # Get the URL of the generated image

64 image_url = str(response.url)

66 # Create an ImageResponse object

67 image_response = ImageResponse(image_url, prompt)

69 yield image_response

Modified g4f/Provider/FreeChatgpt.py +7 -9

@@ -10,19 +10,16 @@ class FreeChatgpt(AsyncGeneratorProvider, ProviderModelMixin):

10 10 url = "https://chat.chatgpt.org.uk"

11 11 api_endpoint = "/api/openai/v1/chat/completions"

12 12 working = True

13 supports_gpt_35_turbo = True

14 default_model = 'gpt-3.5-turbo'

13 default_model = '@cf/qwen/qwen1.5-14b-chat-awq'

15 14 models = [

16 'gpt-3.5-turbo',

17 'SparkDesk-v1.1',

18 'deepseek-coder',

19 15 '@cf/qwen/qwen1.5-14b-chat-awq',

20 'deepseek-chat',

16 'SparkDesk-v1.1',

21 17 'Qwen2-7B-Instruct',

22 18 'glm4-9B-chat',

23 19 'chatglm3-6B',

24 20 'Yi-1.5-9B-Chat',

25 21 ]

26 23 model_aliases = {

27 24 "qwen-1.5-14b": "@cf/qwen/qwen1.5-14b-chat-awq",

28 25 "sparkdesk-v1.1": "SparkDesk-v1.1",

@@ -40,7 +37,7 @@ class FreeChatgpt(AsyncGeneratorProvider, ProviderModelMixin):

40 37 return cls.model_aliases[model.lower()]

41 38 else:

42 39 return cls.default_model

44 41 @classmethod

45 42 async def create_async_generator(

46 43 cls,

@@ -49,6 +46,8 @@ class FreeChatgpt(AsyncGeneratorProvider, ProviderModelMixin):

49 46 proxy: str = None,

50 47 **kwargs

51 48 ) -> AsyncResult:

49 model = cls.get_model(model)

52 51 headers = {

53 52 "accept": "application/json, text/event-stream",

54 53 "accept-language": "en-US,en;q=0.9",

@@ -64,7 +63,6 @@ class FreeChatgpt(AsyncGeneratorProvider, ProviderModelMixin):

64 63 "sec-fetch-site": "same-origin",

65 64

            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",

66 65 }

67 model = cls.get_model(model)

68 66 async with ClientSession(headers=headers) as session:

69 67 prompt = format_prompt(messages)

70 68 data = {

@@ -93,6 +91,6 @@ class FreeChatgpt(AsyncGeneratorProvider, ProviderModelMixin):

93 91 chunk = json.loads(line_str[6:])

94 92 delta_content = chunk.get("choices", [{}])[0].get("delta", {}).get("content", "")

95 93 accumulated_text += delta_content

96 yield delta_content

94 yield delta_content # Yield each chunk of content

97 95 except json.JSONDecodeError:

98 96 pass

Modified g4f/Provider/HuggingChat.py +11 -5

@@ -22,7 +22,7 @@ class HuggingChat(AbstractProvider, ProviderModelMixin):

22 22 'mistralai/Mistral-7B-Instruct-v0.3',

23 23 'microsoft/Phi-3-mini-4k-instruct',

24 24 ]

26 26 model_aliases = {

27 27 "llama-3.1-70b": "meta-llama/Meta-Llama-3.1-70B-Instruct",

28 28 "llama-3.1-405b": "meta-llama/Meta-Llama-3.1-405B-Instruct-FP8",

@@ -42,7 +42,7 @@ class HuggingChat(AbstractProvider, ProviderModelMixin):

42 42 return cls.model_aliases[model]

43 43 else:

44 44 return cls.default_model

46 46 @classmethod

47 47 def create_completion(

48 48 cls,

@@ -52,7 +52,7 @@ class HuggingChat(AbstractProvider, ProviderModelMixin):

52 52 **kwargs

53 53 ) -> CreateResult:

54 54 model = cls.get_model(model)

56 56 if model in cls.models:

57 57 session = cf_reqs.Session()

58 58 session.headers = {

@@ -71,12 +71,17 @@ class HuggingChat(AbstractProvider, ProviderModelMixin):

71 71 'sec-fetch-site': 'same-origin',

72 72

                'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36',

73 73 }

75 print(model)

74 76 json_data = {

75 77 'model': model,

76 78 }

77 80 response = session.post('https://huggingface.co/chat/conversation', json=json_data)

78 81 conversationId = response.json()['conversationId']

79 83

            response = session.get(f'https://huggingface.co/chat/conversation/{conversationId}/__data.json?x-sveltekit-invalidated=01',)

80 85 data: list = (response.json())["nodes"][1]["data"]

81 86 keys: list[int] = data[data[0]["messages"]]

82 87 message_keys: dict = data[keys[0]]

@@ -117,6 +122,7 @@ class HuggingChat(AbstractProvider, ProviderModelMixin):

117 122 headers=headers,

118 123 files=files,

119 124 )

125

120 126 first_token = True

121 127 for line in response.iter_lines():

122 128 line = json.loads(line)

@@ -133,6 +139,6 @@ class HuggingChat(AbstractProvider, ProviderModelMixin):

133 139 token = token.replace('\u0000', '')

134 140

135 141 yield token

136

142

137 143 elif line["type"] == "finalAnswer":

138 break

144 break

Modified g4f/Provider/HuggingFace.py +8 -4

@@ -1,11 +1,14 @@

1 1 from __future__ import annotations

2 3 import json

3 4 from aiohttp import ClientSession, BaseConnector

4 6 from ..typing import AsyncResult, Messages

5 7 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin

6 8 from .helper import get_connector

7 9 from ..errors import RateLimitError, ModelNotFoundError

8 10 from ..requests.raise_for_status import raise_for_status

9 12 class HuggingFace(AsyncGeneratorProvider, ProviderModelMixin):

10 13 url = "https://huggingface.co/chat"

11 14 working = True

@@ -22,7 +25,7 @@ class HuggingFace(AsyncGeneratorProvider, ProviderModelMixin):

22 25 'mistralai/Mistral-7B-Instruct-v0.3',

23 26 'microsoft/Phi-3-mini-4k-instruct',

24 27 ]

26 29 model_aliases = {

27 30 "llama-3.1-70b": "meta-llama/Meta-Llama-3.1-70B-Instruct",

28 31 "llama-3.1-405b": "meta-llama/Meta-Llama-3.1-405B-Instruct-FP8",

@@ -76,7 +79,7 @@ class HuggingFace(AsyncGeneratorProvider, ProviderModelMixin):

76 79 }

77 80 if api_key is not None:

78 81 headers["Authorization"] = f"Bearer {api_key}"

80 83 params = {

81 84 "return_full_text": False,

82 85 "max_new_tokens": max_new_tokens,

@@ -84,7 +87,7 @@ class HuggingFace(AsyncGeneratorProvider, ProviderModelMixin):

84 87 **kwargs

85 88 }

86 89 payload = {"inputs": format_prompt(messages), "parameters": params, "stream": stream}

88 91 async with ClientSession(

89 92 headers=headers,

90 93 connector=get_connector(connector, proxy)

@@ -106,6 +109,7 @@ class HuggingFace(AsyncGeneratorProvider, ProviderModelMixin):

106 109 yield chunk

107 110 else:

108 111 yield (await response.json())[0]["generated_text"].strip()

112

109 113 def format_prompt(messages: Messages) -> str:

110 114 system_messages = [message["content"] for message in messages if message["role"] == "system"]

111 115 question = " ".join([messages[-1]["content"], *system_messages])

@@ -114,4 +118,4 @@ def format_prompt(messages: Messages) -> str:

114 118 for idx, message in enumerate(messages)

115 119 if message["role"] == "assistant"

116 120 ])

117 return f"{history}<s>[INST] {question} [/INST]"

121 return f"{history}<s>[INST] {question} [/INST]"

Modified g4f/Provider/Koala.py +5 -4

@@ -4,16 +4,17 @@ import json

4 4 from typing import AsyncGenerator, Optional, List, Dict, Union, Any

5 5 from aiohttp import ClientSession, BaseConnector, ClientResponse

6 6

7 from ..typing import Messages

8 from .base_provider import AsyncGeneratorProvider

7 from ..typing import AsyncResult, Messages

8 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin

9 9 from .helper import get_random_string, get_connector

10 10 from ..requests import raise_for_status

11 11

12 class Koala(AsyncGeneratorProvider):

12 class Koala(AsyncGeneratorProvider, ProviderModelMixin):

13 13 url = "https://koala.sh"

14 14 working = True

15 supports_gpt_35_turbo = True

16 15 supports_message_history = True

16 supports_gpt_4 = True

17 default_model = 'gpt-4o-mini'

17 18

18 19 @classmethod

19 20 async def create_async_generator(

Modified g4f/Provider/Liaobots.py +193 -77

@@ -1,7 +1,6 @@

1 1 from __future__ import annotations

2 2

3 3 import uuid

4 import requests

5 4 from aiohttp import ClientSession, BaseConnector

6 5

7 6 from ..typing import AsyncResult, Messages

@@ -9,22 +8,170 @@ from .base_provider import AsyncGeneratorProvider, ProviderModelMixin

9 8 from .helper import get_connector

10 9 from ..requests import raise_for_status

11 10

11 models = {

12 "gpt-4o-mini-free": {

13 "id": "gpt-4o-mini-free",

14 "name": "GPT-4o-Mini-Free",

15 "model": "ChatGPT",

16 "provider": "OpenAI",

17 "maxLength": 31200,

18 "tokenLimit": 7800,

19 "context": "8K",

20 },

21 "gpt-4o-mini": {

22 "id": "gpt-4o-mini",

23 "name": "GPT-4o-Mini",

24 "model": "ChatGPT",

25 "provider": "OpenAI",

26 "maxLength": 260000,

27 "tokenLimit": 126000,

28 "context": "128K",

29 },

30 "gpt-4o-free": {

31 "id": "gpt-4o-free",

32 "name": "GPT-4o-free",

33 "model": "ChatGPT",

34 "provider": "OpenAI",

35 "maxLength": 31200,

36 "tokenLimit": 7800,

37 "context": "8K",

38 },

39 "gpt-4-turbo-2024-04-09": {

40 "id": "gpt-4-turbo-2024-04-09",

41 "name": "GPT-4-Turbo",

42 "model": "ChatGPT",

43 "provider": "OpenAI",

44 "maxLength": 260000,

45 "tokenLimit": 126000,

46 "context": "128K",

47 },

48 "gpt-4o-2024-08-06": {

49 "id": "gpt-4o-2024-08-06",

50 "name": "GPT-4o",

51 "model": "ChatGPT",

52 "provider": "OpenAI",

53 "maxLength": 260000,

54 "tokenLimit": 126000,

55 "context": "128K",

56 },

57 "gpt-4-0613": {

58 "id": "gpt-4-0613",

59 "name": "GPT-4-0613",

60 "model": "ChatGPT",

61 "provider": "OpenAI",

62 "maxLength": 32000,

63 "tokenLimit": 7600,

64 "context": "8K",

65 },

66 "claude-3-opus-20240229": {

67 "id": "claude-3-opus-20240229",

68 "name": "Claude-3-Opus",

69 "model": "Claude",

70 "provider": "Anthropic",

71 "maxLength": 800000,

72 "tokenLimit": 200000,

73 "context": "200K",

74 },

75 "claude-3-opus-20240229-aws": {

76 "id": "claude-3-opus-20240229-aws",

77 "name": "Claude-3-Opus-Aws",

78 "model": "Claude",

79 "provider": "Anthropic",

80 "maxLength": 800000,

81 "tokenLimit": 200000,

82 "context": "200K",

83 },

84 "claude-3-opus-20240229-gcp": {

85 "id": "claude-3-opus-20240229-gcp",

86 "name": "Claude-3-Opus-Gcp",

87 "model": "Claude",

88 "provider": "Anthropic",

89 "maxLength": 800000,

90 "tokenLimit": 200000,

91 "context": "200K",

92 },

93 "claude-3-sonnet-20240229": {

94 "id": "claude-3-sonnet-20240229",

95 "name": "Claude-3-Sonnet",

96 "model": "Claude",

97 "provider": "Anthropic",

98 "maxLength": 800000,

99 "tokenLimit": 200000,

100 "context": "200K",

101 },

102 "claude-3-5-sonnet-20240620": {

103 "id": "claude-3-5-sonnet-20240620",

104 "name": "Claude-3.5-Sonnet",

105 "model": "Claude",

106 "provider": "Anthropic",

107 "maxLength": 800000,

108 "tokenLimit": 200000,

109 "context": "200K",

110 },

111 "claude-3-haiku-20240307": {

112 "id": "claude-3-haiku-20240307",

113 "name": "Claude-3-Haiku",

114 "model": "Claude",

115 "provider": "Anthropic",

116 "maxLength": 800000,

117 "tokenLimit": 200000,

118 "context": "200K",

119 },

120 "claude-2.1": {

121 "id": "claude-2.1",

122 "name": "Claude-2.1-200k",

123 "model": "Claude",

124 "provider": "Anthropic",

125 "maxLength": 800000,

126 "tokenLimit": 200000,

127 "context": "200K",

128 },

129 "gemini-1.0-pro-latest": {

130 "id": "gemini-1.0-pro-latest",

131 "name": "Gemini-Pro",

132 "model": "Gemini",

133 "provider": "Google",

134 "maxLength": 120000,

135 "tokenLimit": 30000,

136 "context": "32K",

137 },

138 "gemini-1.5-flash-latest": {

139 "id": "gemini-1.5-flash-latest",

140 "name": "Gemini-1.5-Flash-1M",

141 "model": "Gemini",

142 "provider": "Google",

143 "maxLength": 4000000,

144 "tokenLimit": 1000000,

145 "context": "1024K",

146 },

147 "gemini-1.5-pro-latest": {

148 "id": "gemini-1.5-pro-latest",

149 "name": "Gemini-1.5-Pro-1M",

150 "model": "Gemini",

151 "provider": "Google",

152 "maxLength": 4000000,

153 "tokenLimit": 1000000,

154 "context": "1024K",

155 },

156 }

157

158

12 159 class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

13 160 url = "https://liaobots.site"

14 161 working = True

15 162 supports_message_history = True

16 163 supports_system_message = True

17 supports_gpt_35_turbo = True

18 164 supports_gpt_4 = True

19 165 default_model = "gpt-4o"

20 models = None

166 models = list(models.keys())

167

21 168 model_aliases = {

22 169 "gpt-4o-mini": "gpt-4o-mini-free",

23 170 "gpt-4o": "gpt-4o-free",

24 171 "gpt-4-turbo": "gpt-4-turbo-2024-04-09",

25 172 "gpt-4o": "gpt-4o-2024-08-06",

26 173 "gpt-4": "gpt-4-0613",

174

28 175 "claude-3-opus": "claude-3-opus-20240229",

29 176 "claude-3-opus": "claude-3-opus-20240229-aws",

30 177 "claude-3-opus": "claude-3-opus-20240229-gcp",

@@ -32,50 +179,32 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

32 179 "claude-3-5-sonnet": "claude-3-5-sonnet-20240620",

33 180 "claude-3-haiku": "claude-3-haiku-20240307",

34 181 "claude-2.1": "claude-2.1",

182

36 183 "gemini-pro": "gemini-1.0-pro-latest",

37 184 "gemini-flash": "gemini-1.5-flash-latest",

38 185 "gemini-pro": "gemini-1.5-pro-latest",

39 186 }

187

40 188 _auth_code = ""

41 189 _cookie_jar = None

42 190

43 191 @classmethod

44 def get_models(cls):

45 if cls.models is None:

46 url = 'https://liaobots.work/api/models'

47 headers = {

48 'accept': '/',

49 'accept-language': 'en-US,en;q=0.9',

50 'content-type': 'application/json',

51 'cookie': 'gkp2=ehnhUPJtkCgMmod8Sbxn',

52 'origin': 'https://liaobots.work',

53 'priority': 'u=1, i',

54 'referer': 'https://liaobots.work/',

55 'sec-ch-ua': '"Chromium";v="127", "Not)A;Brand";v="99"',

56 'sec-ch-ua-mobile': '?0',

57 'sec-ch-ua-platform': '"Linux"',

58 'sec-fetch-dest': 'empty',

59 'sec-fetch-mode': 'cors',

60 'sec-fetch-site': 'same-origin',

                'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36'

62 }

63 data = {'key': ''}

65 response = requests.post(url, headers=headers, json=data)

67 if response.status_code == 200:

68 try:

69 models_data = response.json()

70 cls.models = {model['id']: model for model in models_data}

71 except (ValueError, KeyError) as e:

72 print(f"Error processing JSON response: {e}")

73 cls.models = {}

74 else:

75 print(f"Request failed with status code: {response.status_code}")

76 cls.models = {}

192 def get_model(cls, model: str) -> str:

193 """

194 Retrieve the internal model identifier based on the provided model name or alias.

195 """

196 if model in cls.model_aliases:

197 model = cls.model_aliases[model]

198 if model not in models:

199 raise ValueError(f"Model '{model}' is not supported.")

200 return model

77 201

78 return cls.models

202 @classmethod

203 def is_supported(cls, model: str) -> bool:

204 """

205 Check if the given model is supported.

206 """

207 return model in models or model in cls.model_aliases

79 208

80 209 @classmethod

81 210 async def create_async_generator(

@@ -87,6 +216,8 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

87 216 connector: BaseConnector = None,

88 217 **kwargs

89 218 ) -> AsyncResult:

219 model = cls.get_model(model)

220

90 221 headers = {

91 222 "authority": "liaobots.com",

92 223 "content-type": "application/json",

@@ -99,10 +230,9 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

99 230 cookie_jar=cls._cookie_jar,

100 231 connector=get_connector(connector, proxy, True)

101 232 ) as session:

102 models = cls.get_models()

103 233 data = {

104 234 "conversationId": str(uuid.uuid4()),

105 "model": models[cls.get_model(model)],

235 "model": models[model],

106 236 "messages": messages,

107 237 "key": "",

108 238 "prompt": kwargs.get("system_message", "You are a helpful assistant."),

@@ -115,11 +245,20 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

115 245 ) as response:

116 246 await raise_for_status(response)

117 247 try:

118 await cls.ensure_auth_code(session)

248 async with session.post(

249 "https://liaobots.work/api/user",

250 json={"authcode": cls._auth_code},

251 verify_ssl=False

252 ) as response:

253 await raise_for_status(response)

254 cls._auth_code = (await response.json(content_type=None))["authCode"]

255 if not cls._auth_code:

256 raise RuntimeError("Empty auth code")

257 cls._cookie_jar = session.cookie_jar

119 258 async with session.post(

120 259 "https://liaobots.work/api/chat",

121 260 json=data,

122 headers={"x-auth-code": cls._auth_code},

261 headers={"x-auth-code": cls._auth_code},

123 262 verify_ssl=False

124 263 ) as response:

125 264 await raise_for_status(response)

@@ -129,7 +268,16 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

129 268 if chunk:

130 269 yield chunk.decode(errors="ignore")

131 270 except:

132 await cls.initialize_auth_code(session)

271 async with session.post(

272 "https://liaobots.work/api/user",

273 json={"authcode": "pTIQr4FTnVRfr"},

274 verify_ssl=False

275 ) as response:

276 await raise_for_status(response)

277 cls._auth_code = (await response.json(content_type=None))["authCode"]

278 if not cls._auth_code:

279 raise RuntimeError("Empty auth code")

280 cls._cookie_jar = session.cookie_jar

133 281 async with session.post(

134 282 "https://liaobots.work/api/chat",

135 283 json=data,

@@ -142,24 +290,6 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

142 290 raise RuntimeError("Invalid session")

143 291 if chunk:

144 292 yield chunk.decode(errors="ignore")

145 @classmethod

146 def get_model(cls, model: str) -> str:

147 """

148 Retrieve the internal model identifier based on the provided model name or alias.

149 """

150 if model in cls.model_aliases:

151 model = cls.model_aliases[model]

152 models = cls.get_models()

153 if model not in models:

154 raise ValueError(f"Model '{model}' is not supported.")

155 return model

156 @classmethod

157 def is_supported(cls, model: str) -> bool:

158 """

159 Check if the given model is supported.

160 """

161 models = cls.get_models()

162 return model in models or model in cls.model_aliases

163 293

164 294 @classmethod

165 295 async def initialize_auth_code(cls, session: ClientSession) -> None:

@@ -176,6 +306,7 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

176 306 if not cls._auth_code:

177 307 raise RuntimeError("Empty auth code")

178 308 cls._cookie_jar = session.cookie_jar

309

179 310 @classmethod

180 311 async def ensure_auth_code(cls, session: ClientSession) -> None:

181 312 """

@@ -183,18 +314,3 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):

183 314 """

184 315 if not cls._auth_code:

185 316 await cls.initialize_auth_code(session)

186

187 @classmethod

188 async def refresh_auth_code(cls, session: ClientSession) -> None:

189 """

190 Refresh the auth code by making a new request.

191 """

192 await cls.initialize_auth_code(session)

193

194 @classmethod

195 async def get_auth_code(cls, session: ClientSession) -> str:

196 """

197 Get the current auth code, initializing it if necessary.

198 """

199 await cls.ensure_auth_code(session)

200 return cls._auth_code

Modified g4f/Provider/LiteIcoding.py +7 -2

@@ -1,6 +1,7 @@

1 1 from __future__ import annotations

2 2

3 3 from aiohttp import ClientSession, ClientResponseError

4 import re

4 5 from ..typing import AsyncResult, Messages

5 6 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin

6 7 from .helper import format_prompt

@@ -31,7 +32,7 @@ class LiteIcoding(AsyncGeneratorProvider, ProviderModelMixin):

31 32 headers = {

32 33 "Accept": "*/*",

33 34 "Accept-Language": "en-US,en;q=0.9",

34 "Authorization": "Bearer b3b2712cf83640a5acfdc01e78369930",

35 "Authorization": "Bearer aa3020ee873e40cb8b3f515a0708ebc4",

35 36 "Connection": "keep-alive",

36 37 "Content-Type": "application/json;charset=utf-8",

37 38 "DNT": "1",

@@ -97,7 +98,11 @@ class LiteIcoding(AsyncGeneratorProvider, ProviderModelMixin):

97 98 .replace('\\"', '"')

98 99 .strip()

99 100 )

100 yield full_response.strip()

101 # Add filter to remove unwanted text

102 filtered_response = re.sub(r'\n---\n.*', '', full_response, flags=re.DOTALL)

103 # Remove extra quotes at the beginning and end

104 cleaned_response = filtered_response.strip().strip('"')

105 yield cleaned_response

101 106

102 107 except ClientResponseError as e:

103 108 raise RuntimeError(

Modified g4f/Provider/Pizzagpt.py +1 -1

@@ -47,4 +47,4 @@ class Pizzagpt(AsyncGeneratorProvider, ProviderModelMixin):

47 47 response.raise_for_status()

48 48 response_json = await response.json()

49 49 content = response_json.get("answer", {}).get("content", "")

50 yield content

Added g4f/Provider/Upstage.py +74 -0

@@ -0,0 +1,74 @@

1 from __future__ import annotations

3 from aiohttp import ClientSession

4 import json

6 from ..typing import AsyncResult, Messages

7 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin

8 from .helper import format_prompt

11 class Upstage(AsyncGeneratorProvider, ProviderModelMixin):

12 url = "https://console.upstage.ai/playground/chat"

13 api_endpoint = "https://ap-northeast-2.apistage.ai/v1/web/demo/chat/completions"

14 working = True

15 default_model = 'upstage/solar-1-mini-chat'

16 models = [

17 'upstage/solar-1-mini-chat',

18 'upstage/solar-1-mini-chat-ja',

19 ]

20 model_aliases = {

21 "solar-1-mini": "upstage/solar-1-mini-chat",

22 "solar-1-mini": "upstage/solar-1-mini-chat-ja",

23 }

25 @classmethod

26 def get_model(cls, model: str) -> str:

27 if model in cls.models:

28 return model

29 elif model in cls.model_aliases:

30 return cls.model_aliases[model]

31 else:

32 return cls.default_model

34 @classmethod

35 async def create_async_generator(

36 cls,

37 model: str,

38 messages: Messages,

39 proxy: str = None,

40 **kwargs

41 ) -> AsyncResult:

42 model = cls.get_model(model)

44 headers = {

45 "accept": "*/*",

46 "accept-language": "en-US,en;q=0.9",

47 "content-type": "application/json",

48 "origin": "https://console.upstage.ai",

49 "priority": "u=1, i",

50 "referer": "https://console.upstage.ai/",

51 "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"',

52 "sec-ch-ua-mobile": "?0",

53 "sec-ch-ua-platform": '"Linux"',

54 "sec-fetch-dest": "empty",

55 "sec-fetch-mode": "cors",

56 "sec-fetch-site": "cross-site",

            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36"

58 }

59 async with ClientSession(headers=headers) as session:

60 data = {

61 "stream": True,

62 "messages": [{"role": "user", "content": format_prompt(messages)}],

63 "model": model

64 }

65 async with session.post(f"{cls.api_endpoint}", json=data, proxy=proxy) as response:

66 response.raise_for_status()

67 async for line in response.content:

68 if line:

69 line = line.decode('utf-8').strip()

70 if line.startswith("data: ") and line != "data: [DONE]":

71 data = json.loads(line[6:])

72 content = data['choices'][0]['delta'].get('content', '')

73 if content:

74 yield content

Modified g4f/Provider/You.py +0 -1

Modified g4f/Provider/__init__.py +2 -5

Modified g4f/models.py +215 -264