mirrors/gpt4free
1
Fork 0
mirror of https://github.com/xtekky/gpt4free.git synced 2026-01-02 07:12:29 -08:00
Code Issues Projects Releases Packages Wiki Activity

Debug logging support

Browse source 
Async browse access token
This commit is contained in:
Heiner Lohaus 2023-10-22 23:53:18 +02:00
parent 3ae90b57ed
commit 598255fa26
6 changed files with 47 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -175,7 +175,7 @@ docker compose down
```py
import g4f
g4f.logging = True # enable logging
g4f.debug.logging = True # enable logging
g4f.check_version = False # Disable automatic version checking
print(g4f.version) # check version
print(g4f.Provider.Ails.params) # supported args

4
g4f/Provider/AItianhuSpace.py
View file

@ -1,7 +1,7 @@
from __future__ import annotations
import random, json
from ..debug import logging
from .. import debug
from ..typing import AsyncResult, Messages
from ..requests import StreamSession
from .base_provider import AsyncGeneratorProvider, format_prompt, get_cookies
@ -36,7 +36,7 @@ class AItianhuSpace(AsyncGeneratorProvider):
rand = ''.join(random.choice(chars) for _ in range(6))
domain = f"{rand}.{domains[model]}"
if logging:
if debug.logging:
print(f"AItianhuSpace | using domain: {domain}")
if not cookies:

19
g4f/Provider/helper.py
View file

@ -10,7 +10,7 @@ from platformdirs import user_config_dir
from ..typing import Dict, Messages
from browser_cookie3 import chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox, BrowserCookieError
from .. import debug
# Change event loop policy on windows
if sys.platform == 'win32':
@ -45,7 +45,6 @@ def get_event_loop() -> AbstractEventLoop:
)
def init_cookies():
urls = [
'https://chat-gpt.org',
'https://www.aitianhu.com',
@ -73,22 +72,26 @@ def init_cookies():
# Load cookies for a domain from all supported browsers.
# Cache the results in the "_cookies" variable.
def get_cookies(domain_name=''):
if domain_name in _cookies:
return _cookies[domain_name]
def g4f(domain_name):
user_data_dir = user_config_dir("g4f")
cookie_file = path.join(user_data_dir, "Default", "Cookies")
if not path.exists(cookie_file):
return []
return chrome(cookie_file, domain_name)
cookie_jar = []
cookies = {}
for cookie_fn in [g4f, chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox]:
try:
cookie_jar = cookie_fn(domain_name=domain_name)
if len(cookie_jar) > 0:
break
except BrowserCookieError:
if len(cookie_jar) and debug.logging:
print(f"Read cookies from {cookie_fn.__name__} for {domain_name}")
for cookie in cookie_jar:
if cookie.name not in cookies:
cookies[cookie.name] = cookie.value
except BrowserCookieError as e:
pass
_cookies[domain_name] = {cookie.name: cookie.value for cookie in cookie_jar}
_cookies[domain_name] = cookies
return _cookies[domain_name]

15
g4f/Provider/needs_auth/OpenaiChat.py
View file

@ -3,7 +3,7 @@ from __future__ import annotations
import uuid, json, time
from ..base_provider import AsyncGeneratorProvider
from ..helper import get_browser, get_cookies, format_prompt
from ..helper import get_browser, get_cookies, format_prompt, get_event_loop
from ...typing import AsyncResult, Messages
from ...requests import StreamSession
@ -73,7 +73,8 @@ class OpenaiChat(AsyncGeneratorProvider):
last_message = new_message
@classmethod
def browse_access_token(cls) -> str:
async def browse_access_token(cls) -> str:
def browse() -> str:
try:
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
@ -91,8 +92,14 @@ class OpenaiChat(AsyncGeneratorProvider):
javascript = "return (await (await fetch('/api/auth/session')).json())['accessToken']"
return driver.execute_script(javascript)
finally:
time.sleep(1)
driver.close()
time.sleep(0.1)
driver.quit()
loop = get_event_loop()
return await loop.run_in_executor(
None,
browse
)
@classmethod
async def fetch_access_token(cls, cookies: dict, proxies: dict = None) -> str:
@ -110,7 +117,7 @@ class OpenaiChat(AsyncGeneratorProvider):
if cookies:
cls._access_token = await cls.fetch_access_token(cookies, proxies)
if not cls._access_token:
cls._access_token = cls.browse_access_token()
cls._access_token = await cls.browse_access_token()
if not cls._access_token:
raise RuntimeError("Read access token failed")
return cls._access_token

8
g4f/Provider/retry_provider.py
View file

@ -5,13 +5,13 @@ import random
from typing import List, Type, Dict
from ..typing import CreateResult, Messages
from .base_provider import BaseProvider, AsyncProvider
from .. import debug
class RetryProvider(AsyncProvider):
__name__: str = "RetryProvider"
working: bool = True
supports_stream: bool = True
logging: bool = False
def __init__(
self,
@ -39,7 +39,7 @@ class RetryProvider(AsyncProvider):
started: bool = False
for provider in providers:
try:
if self.logging:
if debug.logging:
print(f"Using {provider.__name__} provider")
for token in provider.create_completion(model, messages, stream, **kwargs):
@ -51,7 +51,7 @@ class RetryProvider(AsyncProvider):
except Exception as e:
self.exceptions[provider.__name__] = e
if self.logging:
if debug.logging:
print(f"{provider.__name__}: {e.__class__.__name__}: {e}")
if started:
raise e
@ -77,7 +77,7 @@ class RetryProvider(AsyncProvider):
)
except Exception as e:
self.exceptions[provider.__name__] = e
if self.logging:
if debug.logging:
print(f"{provider.__name__}: {e.__class__.__name__}: {e}")
self.raise_exceptions()

5
g4f/__init__.py
View file

@ -3,7 +3,7 @@ from requests import get
from .models import Model, ModelUtils, _all_models
from .Provider import BaseProvider, RetryProvider
from .typing import Messages, CreateResult, Union, List
from .debug import logging
from . import debug
version = '0.1.7.3'
version_check = True
@ -46,8 +46,7 @@ def get_model_and_provider(model : Union[Model, str],
if not provider.supports_stream and stream:
raise ValueError(f'{provider.__name__} does not support "stream" argument')
if logging:
RetryProvider.logging = True
if debug.logging:
print(f'Using {provider.__name__} provider')
return model, provider