mirrors/gpt4free
1
Fork 0
mirror of https://github.com/xtekky/gpt4free.git synced 2025-12-06 02:30:41 -08:00
Code Issues Projects Releases Packages Wiki Activity

Refactor response handling in Completions and AsyncCompletions; improve raw response processing and fallback mechanism for better stream handling

Browse source
This commit is contained in:
hlohaus 2025-10-03 08:39:18 +02:00
parent e9527637b1
commit 305f47314f
1 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

53
g4f/client/__init__.py
View file

@ -342,21 +342,29 @@ class Completions:
**kwargs
)
def fallback(response):
response = async_iter_response(response, stream, response_format, max_tokens, stop)
return async_iter_append_model_and_provider(response, model, provider)
if raw:
def filter_raw(response):
def raw_response(response):
chunks = []
started = False
for chunk in response:
if isinstance(chunk, JsonResponse):
yield chunk
raw_response = filter_raw(response)
started = True
else:
chunks.append(chunk)
if not started:
for chunk in fallback(chunks):
yield chunk
if stream:
return raw_response
return next(raw_response)
response = iter_response(response, stream, response_format, max_tokens, stop)
response = iter_append_model_and_provider(response, model, provider)
return raw_response(response)
return next(raw_response())
if stream:
return response
return next(response)
return fallback(response)
return next(fallback(response))
def stream(
self,
@ -672,22 +680,29 @@ class AsyncCompletions:
**kwargs
)
def fallback(response):
response = async_iter_response(response, stream, response_format, max_tokens, stop)
return async_iter_append_model_and_provider(response, model, provider)
if raw:
async def filter_raw(response):
async def raw_response(response):
chunks = []
started = False
async for chunk in response:
if isinstance(chunk, JsonResponse):
yield chunk
raw_response = filter_raw(response)
started = True
else:
chunks.append(chunk)
if not started:
async for chunk in fallback(chunks):
yield chunk
if stream:
return raw_response
return next(raw_response)
response = async_iter_response(response, stream, response_format, max_tokens, stop)
response = async_iter_append_model_and_provider(response, model, provider)
return raw_response(response)
return anext(raw_response())
if stream:
return response
return anext(response)
return fallback(response)
return anext(fallback(response))
def stream(
self,