mirror of
https://github.com/xtekky/gpt4free.git
synced 2024-09-17 10:29:29 -04:00
~ | Merge pull request #876 from Lin-jun-xiang/join_messages
~ | Following PEP8, use `.join()` to process `messages`
This commit is contained in:
commit
ae9702ecf0
@ -19,10 +19,8 @@ class AItianhu(BaseProvider):
|
|||||||
messages: list[dict[str, str]],
|
messages: list[dict[str, str]],
|
||||||
stream: bool, **kwargs: Any) -> CreateResult:
|
stream: bool, **kwargs: Any) -> CreateResult:
|
||||||
|
|
||||||
base = ""
|
base = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
|
||||||
for message in messages:
|
base += "\nassistant: "
|
||||||
base += "%s: %s\n" % (message["role"], message["content"])
|
|
||||||
base += "assistant:"
|
|
||||||
|
|
||||||
headers = {
|
headers = {
|
||||||
"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
|
"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
|
||||||
|
@ -18,10 +18,8 @@ class AiService(BaseProvider):
|
|||||||
stream: bool,
|
stream: bool,
|
||||||
**kwargs: Any,
|
**kwargs: Any,
|
||||||
) -> CreateResult:
|
) -> CreateResult:
|
||||||
base = ""
|
base = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
|
||||||
for message in messages:
|
base += "\nassistant: "
|
||||||
base += "%s: %s\n" % (message["role"], message["content"])
|
|
||||||
base += "assistant:"
|
|
||||||
|
|
||||||
headers = {
|
headers = {
|
||||||
"accept": "*/*",
|
"accept": "*/*",
|
||||||
|
@ -17,10 +17,8 @@ class Aichat(BaseProvider):
|
|||||||
messages: list[dict[str, str]],
|
messages: list[dict[str, str]],
|
||||||
stream: bool, **kwargs: Any) -> CreateResult:
|
stream: bool, **kwargs: Any) -> CreateResult:
|
||||||
|
|
||||||
base = ""
|
chat = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
|
||||||
for message in messages:
|
chat += "\nassistant: "
|
||||||
base += "%s: %s\n" % (message["role"], message["content"])
|
|
||||||
base += "assistant:"
|
|
||||||
|
|
||||||
headers = {
|
headers = {
|
||||||
"authority": "chat-gpt.org",
|
"authority": "chat-gpt.org",
|
||||||
|
@ -48,10 +48,7 @@ class Bing(AsyncGeneratorProvider):
|
|||||||
return stream_generate(prompt, context, cookies_dict)
|
return stream_generate(prompt, context, cookies_dict)
|
||||||
|
|
||||||
def create_context(messages: list[dict[str, str]]):
|
def create_context(messages: list[dict[str, str]]):
|
||||||
context = ""
|
context = "".join(f"[{message['role']}](#message)\n{message['content']}\n\n" for message in messages)
|
||||||
|
|
||||||
for message in messages:
|
|
||||||
context += "[%s](#message)\n%s\n\n" % (message["role"], message["content"])
|
|
||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
@ -19,10 +19,8 @@ class ChatgptAi(BaseProvider):
|
|||||||
messages: list[dict[str, str]],
|
messages: list[dict[str, str]],
|
||||||
stream: bool, **kwargs: Any) -> CreateResult:
|
stream: bool, **kwargs: Any) -> CreateResult:
|
||||||
|
|
||||||
chat = ""
|
chat = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
|
||||||
for message in messages:
|
chat += "\nassistant: "
|
||||||
chat += "%s: %s\n" % (message["role"], message["content"])
|
|
||||||
chat += "assistant: "
|
|
||||||
|
|
||||||
response = requests.get("https://chatgpt.ai/")
|
response = requests.get("https://chatgpt.ai/")
|
||||||
nonce, post_id, _, bot_id = re.findall(
|
nonce, post_id, _, bot_id = re.findall(
|
||||||
|
@ -22,10 +22,8 @@ class Theb(BaseProvider):
|
|||||||
messages: list[dict[str, str]],
|
messages: list[dict[str, str]],
|
||||||
stream: bool, **kwargs: Any) -> CreateResult:
|
stream: bool, **kwargs: Any) -> CreateResult:
|
||||||
|
|
||||||
conversation = ''
|
conversation = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
|
||||||
for message in messages:
|
conversation += "\nassistant: "
|
||||||
conversation += '%s: %s\n' % (message['role'], message['content'])
|
|
||||||
conversation += 'assistant: '
|
|
||||||
|
|
||||||
auth = kwargs.get("auth", {
|
auth = kwargs.get("auth", {
|
||||||
"bearer_token":"free",
|
"bearer_token":"free",
|
||||||
|
@ -21,11 +21,9 @@ class V50(BaseProvider):
|
|||||||
messages: list[dict[str, str]],
|
messages: list[dict[str, str]],
|
||||||
stream: bool, **kwargs: Any) -> CreateResult:
|
stream: bool, **kwargs: Any) -> CreateResult:
|
||||||
|
|
||||||
conversation = ''
|
conversation = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
|
||||||
for message in messages:
|
conversation += "\nassistant: "
|
||||||
conversation += '%s: %s\n' % (message['role'], message['content'])
|
|
||||||
|
|
||||||
conversation += 'assistant: '
|
|
||||||
payload = {
|
payload = {
|
||||||
"prompt" : conversation,
|
"prompt" : conversation,
|
||||||
"options" : {},
|
"options" : {},
|
||||||
|
Loading…
Reference in New Issue
Block a user