mirror of
https://github.com/xtekky/gpt4free.git
synced 2025-10-21 15:29:26 +08:00
Refactor SharedTokenManager to remove async from reloadCredentialsFromFile and update its invocation. Set default host in BrowserConfig to 127.0.0.1.
This commit is contained in:
@@ -118,7 +118,7 @@ class SharedTokenManager(AuthFileMixin):
|
|||||||
stat = file_path.stat()
|
stat = file_path.stat()
|
||||||
file_mod_time = int(stat.st_mtime * 1000)
|
file_mod_time = int(stat.st_mtime * 1000)
|
||||||
if file_mod_time > self.memory_cache["file_mod_time"]:
|
if file_mod_time > self.memory_cache["file_mod_time"]:
|
||||||
await self.reloadCredentialsFromFile()
|
self.reloadCredentialsFromFile()
|
||||||
self.memory_cache["file_mod_time"] = file_mod_time
|
self.memory_cache["file_mod_time"] = file_mod_time
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
self.memory_cache["file_mod_time"] = 0
|
self.memory_cache["file_mod_time"] = 0
|
||||||
@@ -126,7 +126,7 @@ class SharedTokenManager(AuthFileMixin):
|
|||||||
self.memory_cache["credentials"] = None
|
self.memory_cache["credentials"] = None
|
||||||
raise TokenManagerError(TokenError.FILE_ACCESS_ERROR, str(e), e)
|
raise TokenManagerError(TokenError.FILE_ACCESS_ERROR, str(e), e)
|
||||||
|
|
||||||
async def reloadCredentialsFromFile(self):
|
def reloadCredentialsFromFile(self):
|
||||||
file_path = self.getCredentialFilePath()
|
file_path = self.getCredentialFilePath()
|
||||||
try:
|
try:
|
||||||
with open(file_path, "r") as fs:
|
with open(file_path, "r") as fs:
|
||||||
|
@@ -103,8 +103,10 @@ async def lifespan(app: FastAPI):
|
|||||||
AppConfig.g4f_api_key = os.environ.get("G4F_API_KEY", AppConfig.g4f_api_key)
|
AppConfig.g4f_api_key = os.environ.get("G4F_API_KEY", AppConfig.g4f_api_key)
|
||||||
AppConfig.timeout = os.environ.get("G4F_TIMEOUT", AppConfig.timeout)
|
AppConfig.timeout = os.environ.get("G4F_TIMEOUT", AppConfig.timeout)
|
||||||
AppConfig.stream_timeout = os.environ.get("G4F_STREAM_TIMEOUT", AppConfig.stream_timeout)
|
AppConfig.stream_timeout = os.environ.get("G4F_STREAM_TIMEOUT", AppConfig.stream_timeout)
|
||||||
BrowserConfig.port = os.environ.get("G4F_BROWSER_PORT", BrowserConfig.port)
|
BrowserConfig.port = int(os.environ.get("G4F_BROWSER_PORT", BrowserConfig.port))
|
||||||
BrowserConfig.host = os.environ.get("G4F_BROWSER_HOST", BrowserConfig.host)
|
BrowserConfig.host = os.environ.get("G4F_BROWSER_HOST", BrowserConfig.host)
|
||||||
|
if BrowserConfig.port:
|
||||||
|
print(f"Using browser: {BrowserConfig.host}:{BrowserConfig.port}")
|
||||||
yield
|
yield
|
||||||
if has_nodriver:
|
if has_nodriver:
|
||||||
for browser in util.get_registered_instances():
|
for browser in util.get_registered_instances():
|
||||||
|
@@ -47,7 +47,7 @@ from .defaults import DEFAULT_HEADERS, WEBVIEW_HAEDERS
|
|||||||
|
|
||||||
class BrowserConfig:
|
class BrowserConfig:
|
||||||
port: int = None
|
port: int = None
|
||||||
host: str = None
|
host: str = "127.0.0.1"
|
||||||
stop_browser = lambda: None
|
stop_browser = lambda: None
|
||||||
browser_executable_path: str = None
|
browser_executable_path: str = None
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user