gpt4free

公开

关注 0 Fork 0 Star 1

返回提交历史

XFEstudio/gpt4free

Improve logging

a2a1d638

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

提交于 2025-06-19 12:57

父提交 9f941ae

代码差异

3 个文件 +12 -6

Modified g4f/gui/server/api.py +8 -1

@@ -153,7 +153,8 @@ class Api:

153 153 debug.logs.append(" ".join([str(value) for value in values]))

154 154 if debug.logging:

155 155 debug.log_handler(*values, file=file)

156 debug.log = decorated_log

156 if "user" not in kwargs:

157 debug.log = decorated_log

157 158 proxy = os.environ.get("G4F_PROXY")

158 159 provider = kwargs.get("provider")

159 160 try:

@@ -241,7 +242,13 @@ class Api:

241 242 yield self._format_json("content", str(chunk))

242 243 except MissingAuthError as e:

243 244 yield self._format_json('auth', type(e).__name__, message=get_error_message(e))

245 except TimeoutError as e:

246 if "user" in kwargs:

247 debug.error(e, "User:", kwargs.get("user", "Unknown"))

248 yield self._format_json('error', type(e).__name__, message=get_error_message(e))

244 249 except Exception as e:

250 if "user" in kwargs:

251 debug.error(e, "User:", kwargs.get("user", "Unknown"))

245 252 logger.exception(e)

246 253 yield self._format_json('error', type(e).__name__, message=get_error_message(e))

247 254 finally:

Modified g4f/gui/server/backend_api.py +4 -3

@@ -134,9 +134,10 @@ class Backend_Api(Api):

134 134 json_data["provider"] = random.choice(models.demo_models[model][1])

135 135 else:

136 136 json_data["provider"] = models.HuggingFace

137 user = request.headers.get("Cf-Ipcountry", "")

138 ip = request.headers.get("X-Forwarded-For", "").split(":")[-1]

139 debug.log("User:", request.headers.get("x_user", f"{user}:{ip}"))

137 if app.demo:

138 user = request.headers.get("Cf-Ipcountry", "")

139 ip = request.headers.get("X-Forwarded-For", "").split(":")[-1]

140 json_data["user"] = request.headers.get("x_user", f"{user}:{ip}")

140 141 kwargs = self._prepare_conversation_kwargs(json_data)

141 142 return self.app.response_class(

142 143 safe_iter_generator(self._create_response_stream(

Modified g4f/providers/any_provider.py +0 -2

@@ -352,8 +352,6 @@ class AnyProvider(AsyncGeneratorProvider, ProviderModelMixin):

352 352 elif provider.__name__ == "GeminiPro":

353 353 if model and "gemini" in model or "gemma" in model:

354 354 providers.append(provider)

355 elif len(provider_models) > 3:

356 debug.error(f"Model '{model}' not found in provider {provider.__name__}")

357 355 if model in models.__models__:

358 356 for provider in models.__models__[model][1]:

359 357 providers.append(provider)