mirror of https://github.com/xtekky/gpt4free.git
Update async.py
This commit is contained in:
parent
1b571592ce
commit
8229b62ce3
|
@ -14,9 +14,9 @@ from ..image import ImageResponse as ImageProviderResponse
|
||||||
from ..errors import NoImageResponseError, RateLimitError, MissingAuthError
|
from ..errors import NoImageResponseError, RateLimitError, MissingAuthError
|
||||||
from .. import get_model_and_provider, get_last_provider
|
from .. import get_model_and_provider, get_last_provider
|
||||||
from .helper import read_json, find_stop, filter_none
|
from .helper import read_json, find_stop, filter_none
|
||||||
|
ä
|
||||||
async def iter_response(
|
async def iter_response(
|
||||||
response: AsyncIerator[str],
|
response: AsyncIterator[str],
|
||||||
stream: bool,
|
stream: bool,
|
||||||
response_format: dict = None,
|
response_format: dict = None,
|
||||||
max_tokens: int = None,
|
max_tokens: int = None,
|
||||||
|
@ -67,6 +67,39 @@ class Client(BaseClient):
|
||||||
self.chat: Chat = Chat(self, provider)
|
self.chat: Chat = Chat(self, provider)
|
||||||
self.images: Images = Images(self, image_provider)
|
self.images: Images = Images(self, image_provider)
|
||||||
|
|
||||||
|
async def cast_iter_async(iter):
|
||||||
|
for chunk in iter:
|
||||||
|
yield chunk
|
||||||
|
|
||||||
|
def create_response(
|
||||||
|
messages: Messages,
|
||||||
|
model: str,
|
||||||
|
provider: ProviderType = None,
|
||||||
|
stream: bool = False,
|
||||||
|
response_format: dict = None,
|
||||||
|
max_tokens: int = None,
|
||||||
|
stop: Union[list[str], str] = None,
|
||||||
|
api_key: str = None,
|
||||||
|
**kwargs
|
||||||
|
):
|
||||||
|
if hasattr(provider, "create_async_generator):
|
||||||
|
create = provider.create_async_generator
|
||||||
|
else:
|
||||||
|
create = provider.create_completion
|
||||||
|
response = create(
|
||||||
|
model, messages, stream,
|
||||||
|
**filter_none(
|
||||||
|
proxy=self.client.get_proxy(),
|
||||||
|
max_tokens=max_tokens,
|
||||||
|
stop=stop,
|
||||||
|
api_key=self.client.api_key if api_key is None else api_key
|
||||||
|
),
|
||||||
|
**kwargs
|
||||||
|
)
|
||||||
|
if not hasattr(provider, "create_async_generator")
|
||||||
|
response = cast_iter_async(response)
|
||||||
|
return response
|
||||||
|
|
||||||
class Completions():
|
class Completions():
|
||||||
def __init__(self, client: Client, provider: ProviderType = None):
|
def __init__(self, client: Client, provider: ProviderType = None):
|
||||||
self.client: Client = client
|
self.client: Client = client
|
||||||
|
@ -79,9 +112,6 @@ class Completions():
|
||||||
provider: ProviderType = None,
|
provider: ProviderType = None,
|
||||||
stream: bool = False,
|
stream: bool = False,
|
||||||
response_format: dict = None,
|
response_format: dict = None,
|
||||||
max_tokens: int = None,
|
|
||||||
stop: Union[list[str], str] = None,
|
|
||||||
api_key: str = None,
|
|
||||||
ignored : list[str] = None,
|
ignored : list[str] = None,
|
||||||
ignore_working: bool = False,
|
ignore_working: bool = False,
|
||||||
ignore_stream: bool = False,
|
ignore_stream: bool = False,
|
||||||
|
@ -97,16 +127,7 @@ class Completions():
|
||||||
**kwargs
|
**kwargs
|
||||||
)
|
)
|
||||||
stop = [stop] if isinstance(stop, str) else stop
|
stop = [stop] if isinstance(stop, str) else stop
|
||||||
response = provider.create_async(
|
response = create_response(messages, model, provider, stream, **kwargs)
|
||||||
model, messages, stream,
|
|
||||||
**filter_none(
|
|
||||||
proxy=self.client.get_proxy(),
|
|
||||||
max_tokens=max_tokens,
|
|
||||||
stop=stop,
|
|
||||||
api_key=self.client.api_key if api_key is None else api_key
|
|
||||||
),
|
|
||||||
**kwargs
|
|
||||||
)
|
|
||||||
response = iter_response(response, stream, response_format, max_tokens, stop)
|
response = iter_response(response, stream, response_format, max_tokens, stop)
|
||||||
response = iter_append_model_and_provider(response)
|
response = iter_append_model_and_provider(response)
|
||||||
return response if stream else anext(response)
|
return response if stream else anext(response)
|
||||||
|
@ -117,14 +138,14 @@ class Chat():
|
||||||
def __init__(self, client: Client, provider: ProviderType = None):
|
def __init__(self, client: Client, provider: ProviderType = None):
|
||||||
self.completions = Completions(client, provider)
|
self.completions = Completions(client, provider)
|
||||||
|
|
||||||
def iter_image_response(response: Iterator) -> Union[ImagesResponse, None]:
|
async def iter_image_response(response: Iterator) -> Union[ImagesResponse, None]:
|
||||||
for chunk in list(response):
|
async for chunk in list(response):
|
||||||
if isinstance(chunk, ImageProviderResponse):
|
if isinstance(chunk, ImageProviderResponse):
|
||||||
return ImagesResponse([Image(image) for image in chunk.get_list()])
|
return ImagesResponse([Image(image) for image in chunk.get_list()])
|
||||||
|
|
||||||
def create_image(client: Client, provider: ProviderType, prompt: str, model: str = "", **kwargs) -> Iterator:
|
def create_image(client: Client, provider: ProviderType, prompt: str, model: str = "", **kwargs) -> AsyncIterator:
|
||||||
prompt = f"create a image with: {prompt}"
|
prompt = f"create a image with: {prompt}"
|
||||||
return provider.create_completion(
|
return provider.create_async_generator(
|
||||||
model,
|
model,
|
||||||
[{"role": "user", "content": prompt}],
|
[{"role": "user", "content": prompt}],
|
||||||
True,
|
True,
|
||||||
|
@ -138,7 +159,7 @@ class Images():
|
||||||
self.provider: ImageProvider = provider
|
self.provider: ImageProvider = provider
|
||||||
self.models: ImageModels = ImageModels(client)
|
self.models: ImageModels = ImageModels(client)
|
||||||
|
|
||||||
def generate(self, prompt, model: str = None, **kwargs) -> ImagesResponse:
|
async def generate(self, prompt, model: str = None, **kwargs) -> ImagesResponse:
|
||||||
provider = self.models.get(model, self.provider)
|
provider = self.models.get(model, self.provider)
|
||||||
if isinstance(provider, type) and issubclass(provider, BaseProvider):
|
if isinstance(provider, type) and issubclass(provider, BaseProvider):
|
||||||
response = create_image(self.client, provider, prompt, **kwargs)
|
response = create_image(self.client, provider, prompt, **kwargs)
|
||||||
|
@ -156,11 +177,11 @@ class Images():
|
||||||
raise NoImageResponseError()
|
raise NoImageResponseError()
|
||||||
return image
|
return image
|
||||||
|
|
||||||
def create_variation(self, image: ImageType, model: str = None, **kwargs):
|
async def create_variation(self, image: ImageType, model: str = None, **kwargs):
|
||||||
provider = self.models.get(model, self.provider)
|
provider = self.models.get(model, self.provider)
|
||||||
result = None
|
result = None
|
||||||
if isinstance(provider, type) and issubclass(provider, BaseProvider):
|
if isinstance(provider, type) and issubclass(provider, BaseProvider):
|
||||||
response = provider.create_completion(
|
response = provider.create_async_generator(
|
||||||
"",
|
"",
|
||||||
[{"role": "user", "content": "create a image like this"}],
|
[{"role": "user", "content": "create a image like this"}],
|
||||||
True,
|
True,
|
||||||
|
@ -168,7 +189,7 @@ class Images():
|
||||||
proxy=self.client.get_proxy(),
|
proxy=self.client.get_proxy(),
|
||||||
**kwargs
|
**kwargs
|
||||||
)
|
)
|
||||||
for chunk in response:
|
async for chunk in response:
|
||||||
if isinstance(chunk, ImageProviderResponse):
|
if isinstance(chunk, ImageProviderResponse):
|
||||||
result = ([chunk.images] if isinstance(chunk.images, str) else chunk.images)
|
result = ([chunk.images] if isinstance(chunk.images, str) else chunk.images)
|
||||||
result = ImagesResponse([Image(image)for image in result])
|
result = ImagesResponse([Image(image)for image in result])
|
||||||
|
|
Loading…
Reference in New Issue