summaryrefslogtreecommitdiffstats
path: root/g4f/Provider
diff options
context:
space:
mode:
authorTekky <98614666+xtekky@users.noreply.github.com>2023-08-20 05:48:19 +0200
committerGitHub <noreply@github.com>2023-08-20 05:48:19 +0200
commit649fd42655e80f676258a618ed58eb48b2285420 (patch)
treea48eea78fe9d3c67c81f2ee1025d7086d4bb6104 /g4f/Provider
parent ~ | Merge pull request #820 (diff)
parentFix bard provider, add async support (diff)
downloadgpt4free-649fd42655e80f676258a618ed58eb48b2285420.tar
gpt4free-649fd42655e80f676258a618ed58eb48b2285420.tar.gz
gpt4free-649fd42655e80f676258a618ed58eb48b2285420.tar.bz2
gpt4free-649fd42655e80f676258a618ed58eb48b2285420.tar.lz
gpt4free-649fd42655e80f676258a618ed58eb48b2285420.tar.xz
gpt4free-649fd42655e80f676258a618ed58eb48b2285420.tar.zst
gpt4free-649fd42655e80f676258a618ed58eb48b2285420.zip
Diffstat (limited to '')
-rw-r--r--g4f/Provider/Bard.py136
1 files changed, 67 insertions, 69 deletions
diff --git a/g4f/Provider/Bard.py b/g4f/Provider/Bard.py
index cc8ea055..cbe728cd 100644
--- a/g4f/Provider/Bard.py
+++ b/g4f/Provider/Bard.py
@@ -3,99 +3,97 @@ import random
import re
import browser_cookie3
-import requests
+from aiohttp import ClientSession
+import asyncio
from ..typing import Any, CreateResult
from .base_provider import BaseProvider
-
class Bard(BaseProvider):
url = "https://bard.google.com"
needs_auth = True
working = True
- @staticmethod
+ @classmethod
def create_completion(
+ cls,
model: str,
messages: list[dict[str, str]],
stream: bool,
+ proxy: str = None,
+ cookies: dict = {},
**kwargs: Any,
) -> CreateResult:
- psid = {
- cookie.name: cookie.value
- for cookie in browser_cookie3.chrome(domain_name=".google.com")
- }["__Secure-1PSID"]
+ yield asyncio.run(cls.create_async(str, messages, proxy, cookies))
+
+ @classmethod
+ async def create_async(
+ cls,
+ model: str,
+ messages: list[dict[str, str]],
+ proxy: str = None,
+ cookies: dict = {},
+ **kwargs: Any,
+ ) -> str:
+ if not cookies:
+ for cookie in browser_cookie3.load(domain_name='.google.com'):
+ cookies[cookie.name] = cookie.value
formatted = "\n".join(
["%s: %s" % (message["role"], message["content"]) for message in messages]
)
prompt = f"{formatted}\nAssistant:"
- proxy = kwargs.get("proxy", False)
- if proxy == False:
- print(
- "warning!, you did not give a proxy, a lot of countries are banned from Google Bard, so it may not work"
- )
-
- snlm0e = None
- conversation_id = None
- response_id = None
- choice_id = None
-
- client = requests.Session()
- client.proxies = (
- {"http": f"http://{proxy}", "https": f"http://{proxy}"} if proxy else {}
- )
+ if proxy and "://" not in proxy:
+ proxy = f"http://{proxy}"
- client.headers = {
- "authority": "bard.google.com",
- "content-type": "application/x-www-form-urlencoded;charset=UTF-8",
- "origin": "https://bard.google.com",
- "referer": "https://bard.google.com/",
- "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",
- "x-same-domain": "1",
- "cookie": f"__Secure-1PSID={psid}",
+ headers = {
+ 'authority': 'bard.google.com',
+ 'content-type': 'application/x-www-form-urlencoded;charset=UTF-8',
+ 'origin': 'https://bard.google.com',
+ 'referer': 'https://bard.google.com/',
+ 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
+ 'x-same-domain': '1',
}
- if snlm0e is not None:
- result = re.search(
- r"SNlM0e\":\"(.*?)\"", client.get("https://bard.google.com/").text
- )
- if result is not None:
- snlm0e = result.group(1)
-
- params = {
- "bl": "boq_assistant-bard-web-server_20230326.21_p0",
- "_reqid": random.randint(1111, 9999),
- "rt": "c",
- }
-
- data = {
- "at": snlm0e,
- "f.req": json.dumps(
- [
- None,
- json.dumps(
- [[prompt], None, [conversation_id, response_id, choice_id]]
- ),
- ]
- ),
- }
-
- intents = ".".join(["assistant", "lamda", "BardFrontendService"])
-
- response = client.post(
- f"https://bard.google.com/_/BardChatUi/data/{intents}/StreamGenerate",
- data=data,
- params=params,
- )
- response.raise_for_status()
-
- chat_data = json.loads(response.content.splitlines()[3])[0][2]
- if chat_data:
- json_chat_data = json.loads(chat_data)
-
- yield json_chat_data[0][0]
+ async with ClientSession(
+ cookies=cookies,
+ headers=headers
+ ) as session:
+ async with session.get(cls.url, proxy=proxy) as response:
+ text = await response.text()
+
+ match = re.search(r'SNlM0e\":\"(.*?)\"', text)
+ if match:
+ snlm0e = match.group(1)
+
+ params = {
+ 'bl': 'boq_assistant-bard-web-server_20230326.21_p0',
+ '_reqid': random.randint(1111, 9999),
+ 'rt': 'c'
+ }
+
+ data = {
+ 'at': snlm0e,
+ 'f.req': json.dumps([None, json.dumps([[prompt]])])
+ }
+
+ intents = '.'.join([
+ 'assistant',
+ 'lamda',
+ 'BardFrontendService'
+ ])
+
+ async with session.post(
+ f'{cls.url}/_/BardChatUi/data/{intents}/StreamGenerate',
+ data=data,
+ params=params,
+ proxy=proxy
+ ) as response:
+ response = await response.text()
+ response = json.loads(response.splitlines()[3])[0][2]
+ response = json.loads(response)[4][0][1][0]
+ return response
@classmethod
@property