gpt4free

公开

关注 0 Fork 0 Star 0

返回提交历史

XFEstudio/gpt4free

Refactor SharedTokenManager to remove async from reloadCredentialsFromFile and update its invocation. Set default host in BrowserConfig to 127.0.0.1.

bca45481

hlohaus <983577+hlohaus@users.noreply.github.com>

提交于 2025-09-06 20:22

父提交 d0ae94d

代码差异

3 个文件 +6 -4

Modified g4f/Provider/qwen/sharedTokenManager.py +2 -2

@@ -118,7 +118,7 @@ class SharedTokenManager(AuthFileMixin):

118 118 stat = file_path.stat()

119 119 file_mod_time = int(stat.st_mtime * 1000)

120 120 if file_mod_time > self.memory_cache["file_mod_time"]:

121 await self.reloadCredentialsFromFile()

121 self.reloadCredentialsFromFile()

122 122 self.memory_cache["file_mod_time"] = file_mod_time

123 123 except FileNotFoundError:

124 124 self.memory_cache["file_mod_time"] = 0

@@ -126,7 +126,7 @@ class SharedTokenManager(AuthFileMixin):

126 126 self.memory_cache["credentials"] = None

127 127 raise TokenManagerError(TokenError.FILE_ACCESS_ERROR, str(e), e)

128 128

129 async def reloadCredentialsFromFile(self):

129 def reloadCredentialsFromFile(self):

130 130 file_path = self.getCredentialFilePath()

131 131 try:

132 132 with open(file_path, "r") as fs:

Modified g4f/api/__init__.py +3 -1

@@ -103,8 +103,10 @@ async def lifespan(app: FastAPI):

103 103 AppConfig.g4f_api_key = os.environ.get("G4F_API_KEY", AppConfig.g4f_api_key)

104 104 AppConfig.timeout = os.environ.get("G4F_TIMEOUT", AppConfig.timeout)

105 105 AppConfig.stream_timeout = os.environ.get("G4F_STREAM_TIMEOUT", AppConfig.stream_timeout)

106 BrowserConfig.port = os.environ.get("G4F_BROWSER_PORT", BrowserConfig.port)

106 BrowserConfig.port = int(os.environ.get("G4F_BROWSER_PORT", BrowserConfig.port))

107 107 BrowserConfig.host = os.environ.get("G4F_BROWSER_HOST", BrowserConfig.host)

108 if BrowserConfig.port:

109 print(f"Using browser: {BrowserConfig.host}:{BrowserConfig.port}")

108 110 yield

109 111 if has_nodriver:

110 112 for browser in util.get_registered_instances():

Modified g4f/requests/__init__.py +1 -1

@@ -47,7 +47,7 @@ from .defaults import DEFAULT_HEADERS, WEBVIEW_HAEDERS

47 47

48 48 class BrowserConfig:

49 49 port: int = None

50 host: str = None

50 host: str = "127.0.0.1"

51 51 stop_browser = lambda: None

52 52 browser_executable_path: str = None

53 53