summaryrefslogtreecommitdiffstats
path: root/g4f/Provider/Pi.py
diff options
context:
space:
mode:
authorHeiner Lohaus <hlohaus@users.noreply.github.com>2023-12-02 05:40:07 +0100
committerHeiner Lohaus <hlohaus@users.noreply.github.com>2023-12-02 05:40:07 +0100
commit2157ccbcdb5d781d389e24db332d2fb78b1159a9 (patch)
tree0ba2ad0cb7fffd5b4882e2dad25bea1b6f984e33 /g4f/Provider/Pi.py
parentAdd proxy support / fix streaming (diff)
downloadgpt4free-2157ccbcdb5d781d389e24db332d2fb78b1159a9.tar
gpt4free-2157ccbcdb5d781d389e24db332d2fb78b1159a9.tar.gz
gpt4free-2157ccbcdb5d781d389e24db332d2fb78b1159a9.tar.bz2
gpt4free-2157ccbcdb5d781d389e24db332d2fb78b1159a9.tar.lz
gpt4free-2157ccbcdb5d781d389e24db332d2fb78b1159a9.tar.xz
gpt4free-2157ccbcdb5d781d389e24db332d2fb78b1159a9.tar.zst
gpt4free-2157ccbcdb5d781d389e24db332d2fb78b1159a9.zip
Diffstat (limited to '')
-rw-r--r--g4f/Provider/Pi.py77
1 files changed, 27 insertions, 50 deletions
diff --git a/g4f/Provider/Pi.py b/g4f/Provider/Pi.py
index 8acf3ec6..385f477b 100644
--- a/g4f/Provider/Pi.py
+++ b/g4f/Provider/Pi.py
@@ -4,10 +4,10 @@ from ..typing import CreateResult, Messages
from .base_provider import BaseProvider, format_prompt
import json
-from cloudscraper import CloudScraper, session, create_scraper
+from ..requests import Session, get_session_from_browser
class Pi(BaseProvider):
- url = "https://chat-gpt.com"
+ url = "https://pi.ai/talk"
working = True
supports_stream = True
@@ -17,75 +17,52 @@ class Pi(BaseProvider):
model: str,
messages: Messages,
stream: bool,
+ session: Session = None,
proxy: str = None,
- scraper: CloudScraper = None,
- conversation: dict = None,
+ timeout: int = 180,
+ conversation_id: str = None,
**kwargs
) -> CreateResult:
- if not scraper:
- scraper = cls.get_scraper(proxy)
- if not conversation:
- conversation = cls.start_conversation(scraper)
- answer = cls.ask(scraper, messages, conversation)
+ if not session:
+ session = get_session_from_browser(url=cls.url, proxy=proxy, timeout=timeout)
+ if not conversation_id:
+ conversation_id = cls.start_conversation(session)
+ answer = cls.ask(session, messages, conversation_id)
for line in answer:
if "text" in line:
yield line["text"]
-
- def get_scraper(proxy: str):
- return create_scraper(
- browser={
- 'browser': 'chrome',
- 'platform': 'windows',
- 'desktop': True
- },
- headers={
- 'Accept': '*/*',
- 'Accept-Encoding': 'deflate,gzip,br',
- },
- proxies={
- "https": proxy
- }
- )
-
- def start_conversation(scraper: CloudScraper):
- response = scraper.post('https://pi.ai/api/chat/start', data="{}", headers={
+
+ @classmethod
+ def start_conversation(cls, session: Session) -> str:
+ response = session.post('https://pi.ai/api/chat/start', data="{}", headers={
'accept': 'application/json',
'x-api-version': '3'
})
if 'Just a moment' in response.text:
raise RuntimeError('Error: Cloudflare detected')
- return Conversation(
- response.json()['conversations'][0]['sid'],
- response.cookies
- )
+ return response.json()['conversations'][0]['sid']
- def get_chat_history(scraper: CloudScraper, conversation: Conversation):
+ def get_chat_history(session: Session, conversation_id: str):
params = {
- 'conversation': conversation.sid,
+ 'conversation': conversation_id,
}
- response = scraper.get('https://pi.ai/api/chat/history', params=params, cookies=conversation.cookies)
+ response = session.get('https://pi.ai/api/chat/history', params=params)
if 'Just a moment' in response.text:
raise RuntimeError('Error: Cloudflare detected')
return response.json()
- def ask(scraper: CloudScraper, messages: Messages, conversation: Conversation):
+ def ask(session: Session, messages: Messages, conversation_id: str):
json_data = {
'text': format_prompt(messages),
- 'conversation': conversation.sid,
+ 'conversation': conversation_id,
'mode': 'BASE',
}
- response = scraper.post('https://pi.ai/api/chat', json=json_data, cookies=conversation.cookies, stream=True)
-
- for line in response.iter_lines(chunk_size=1024, decode_unicode=True):
- if 'Just a moment' in line:
+ response = session.post('https://pi.ai/api/chat', json=json_data, stream=True)
+ for line in response.iter_lines():
+ if b'Just a moment' in line:
raise RuntimeError('Error: Cloudflare detected')
- if line.startswith('data: {"text":'):
- yield json.loads(line.split('data: ')[1])
- if line.startswith('data: {"title":'):
- yield json.loads(line.split('data: ')[1])
-
-class Conversation():
- def __init__(self, sid: str, cookies):
- self.sid = sid
- self.cookies = cookies
+ if line.startswith(b'data: {"text":'):
+ yield json.loads(line.split(b'data: ')[1])
+ elif line.startswith(b'data: {"title":'):
+ yield json.loads(line.split(b'data: ')[1])
\ No newline at end of file