From 2b9a95c5b322619eab211372e7a177ad32505ef8 Mon Sep 17 00:00:00 2001 From: H Lohaus Date: Sat, 6 Apr 2024 21:23:49 +0200 Subject: Update async.py --- g4f/client/async.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'g4f') diff --git a/g4f/client/async.py b/g4f/client/async.py index c9ffd6cf..72c31f05 100644 --- a/g4f/client/async.py +++ b/g4f/client/async.py @@ -13,7 +13,7 @@ from ..typing import Union, Iterator, Messages, ImageType, AsyncIerator from ..image import ImageResponse as ImageProviderResponse from ..errors import NoImageResponseError, RateLimitError, MissingAuthError from .. import get_model_and_provider, get_last_provider -from .helper import read_json, find_stop +from .helper import read_json, find_stop, filter_none from .Provider.BingCreateImages import BingCreateImages from .Provider.needs_auth import Gemini, OpenaiChat @@ -90,7 +90,7 @@ class Completions(): ignore_working: bool = False, ignore_stream: bool = False, **kwargs - ) -> Union[ChatCompletion, Iterator[ChatCompletionChunk]]: + ) -> Union[ChatCompletion, AsyncIterator[ChatCompletionChunk]]: model, provider = get_model_and_provider( model, self.provider if provider is None else provider, @@ -101,7 +101,7 @@ class Completions(): **kwargs ) stop = [stop] if isinstance(stop, str) else stop - response = provider.create_completion( + response = provider.create_async( model, messages, stream, **filter_none( proxy=self.client.get_proxy(), @@ -113,7 +113,7 @@ class Completions(): ) response = iter_response(response, stream, response_format, max_tokens, stop) response = iter_append_model_and_provider(response) - return response if stream else next(response) + return response if stream else anext(response) class Chat(): completions: Completions @@ -121,18 +121,6 @@ class Chat(): def __init__(self, client: Client, provider: ProviderType = None): self.completions = Completions(client, provider) -class ImageModels(): - gemini = Gemini - openai = OpenaiChat - you = You - - def __init__(self, client: Client) -> None: - self.client = client - self.default = BingCreateImages(proxy=self.client.get_proxy()) - - def get(self, name: str, default: ImageProvider = None) -> ImageProvider: - return getattr(self, name) if hasattr(self, name) else default or self.default - def iter_image_response(response: Iterator) -> Union[ImagesResponse, None]: for chunk in list(response): if isinstance(chunk, ImageProviderResponse): -- cgit v1.2.3