mirror of
https://github.com/xtekky/gpt4free.git
synced 2024-09-17 10:29:29 -04:00
Use custom user dir
This commit is contained in:
parent
5b2efa4aaf
commit
136770e05b
@ -1,7 +1,6 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import uuid
|
import uuid, json, time
|
||||||
import json
|
|
||||||
|
|
||||||
from .base_provider import AsyncGeneratorProvider
|
from .base_provider import AsyncGeneratorProvider
|
||||||
from .helper import get_browser, get_cookies, format_prompt
|
from .helper import get_browser, get_cookies, format_prompt
|
||||||
@ -56,8 +55,13 @@ class OpenaiChat(AsyncGeneratorProvider):
|
|||||||
line = line[6:]
|
line = line[6:]
|
||||||
if line == b"[DONE]":
|
if line == b"[DONE]":
|
||||||
break
|
break
|
||||||
line = json.loads(line)
|
try:
|
||||||
if "message" in line and not line["message"]["end_turn"]:
|
line = json.loads(line)
|
||||||
|
except:
|
||||||
|
continue
|
||||||
|
if "message" not in line or "message_type" not in line["message"]["metadata"]:
|
||||||
|
continue
|
||||||
|
if line["message"]["metadata"]["message_type"] == "next":
|
||||||
new_message = line["message"]["content"]["parts"][0]
|
new_message = line["message"]["content"]["parts"][0]
|
||||||
yield new_message[len(last_message):]
|
yield new_message[len(last_message):]
|
||||||
last_message = new_message
|
last_message = new_message
|
||||||
@ -68,11 +72,9 @@ class OpenaiChat(AsyncGeneratorProvider):
|
|||||||
from selenium.webdriver.common.by import By
|
from selenium.webdriver.common.by import By
|
||||||
from selenium.webdriver.support.ui import WebDriverWait
|
from selenium.webdriver.support.ui import WebDriverWait
|
||||||
from selenium.webdriver.support import expected_conditions as EC
|
from selenium.webdriver.support import expected_conditions as EC
|
||||||
except ImportError:
|
|
||||||
return
|
|
||||||
|
|
||||||
driver = get_browser()
|
driver = get_browser()
|
||||||
if not driver:
|
except ImportError:
|
||||||
return
|
return
|
||||||
|
|
||||||
driver.get(f"{cls.url}/")
|
driver.get(f"{cls.url}/")
|
||||||
@ -83,6 +85,7 @@ class OpenaiChat(AsyncGeneratorProvider):
|
|||||||
javascript = "return (await (await fetch('/api/auth/session')).json())['accessToken']"
|
javascript = "return (await (await fetch('/api/auth/session')).json())['accessToken']"
|
||||||
return driver.execute_script(javascript)
|
return driver.execute_script(javascript)
|
||||||
finally:
|
finally:
|
||||||
|
time.sleep(1)
|
||||||
driver.quit()
|
driver.quit()
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -2,7 +2,7 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import asyncio, sys
|
import asyncio, sys
|
||||||
from asyncio import AbstractEventLoop
|
from asyncio import AbstractEventLoop
|
||||||
|
from os import path
|
||||||
import browser_cookie3
|
import browser_cookie3
|
||||||
|
|
||||||
# Change event loop policy on windows
|
# Change event loop policy on windows
|
||||||
@ -60,24 +60,11 @@ def format_prompt(messages: list[dict[str, str]], add_special_tokens=False):
|
|||||||
|
|
||||||
|
|
||||||
def get_browser(user_data_dir: str = None):
|
def get_browser(user_data_dir: str = None):
|
||||||
try:
|
from undetected_chromedriver import Chrome
|
||||||
from undetected_chromedriver import Chrome
|
from platformdirs import user_config_dir
|
||||||
except ImportError:
|
|
||||||
return None
|
|
||||||
|
|
||||||
def get_user_data_dir():
|
|
||||||
dirs = [
|
|
||||||
'~/.config/google-chrome/Default',
|
|
||||||
'~/.var/app/com.google.Chrome/config/google-chrome/Default',
|
|
||||||
'%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default',
|
|
||||||
'~/Library/Application Support/Google/Chrome/Default',
|
|
||||||
]
|
|
||||||
from os import path
|
|
||||||
for dir in dirs:
|
|
||||||
dir = path.expandvars(dir)
|
|
||||||
if path.exists(dir):
|
|
||||||
return dir
|
|
||||||
if not user_data_dir:
|
if not user_data_dir:
|
||||||
user_data_dir = get_user_data_dir()
|
user_data_dir = user_config_dir("g4f")
|
||||||
|
user_data_dir = path.join(user_data_dir, "Default")
|
||||||
|
|
||||||
return Chrome(user_data_dir=user_data_dir)
|
return Chrome(user_data_dir=user_data_dir)
|
Loading…
Reference in New Issue
Block a user