Archives/gpt4free
2
0
Fork 0
mirror of https://github.com/xtekky/gpt4free.git synced 2024-11-10 19:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of get_event_loop helper

Browse Source
This commit is contained in:
Heiner Lohaus 2024-01-20 18:23:54 +01:00
parent 782edbdb6a
commit cb0e065581
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
g4f/Provider/base_provider.py
View File

@ -8,6 +8,7 @@ from inspect import signature, Parameter
from .helper import get_event_loop, get_cookies, format_prompt from .helper import get_event_loop, get_cookies, format_prompt
from ..typing import CreateResult, AsyncResult, Messages from ..typing import CreateResult, AsyncResult, Messages
from ..base_provider import BaseProvider from ..base_provider import BaseProvider
from ..errors import NestAsyncioError
if sys.version_info < (3, 10): if sys.version_info < (3, 10):
NoneType = type(None) NoneType = type(None)
@ -48,7 +49,7 @@ class AbstractProvider(BaseProvider):
Returns: Returns:
str: The created result as a string. str: The created result as a string.
""" """
loop = loop or get_event_loop() loop = loop or asyncio.get_running_loop()
def create_func() -> str: def create_func() -> str:
return "".join(cls.create_completion(model, messages, False, **kwargs)) return "".join(cls.create_completion(model, messages, False, **kwargs))
@ -101,8 +102,6 @@ class AsyncProvider(AbstractProvider):
model: str, model: str,
messages: Messages, messages: Messages,
stream: bool = False, stream: bool = False,
*,
loop: AbstractEventLoop = None,
**kwargs **kwargs
) -> CreateResult: ) -> CreateResult:
""" """
@ -119,9 +118,15 @@ class AsyncProvider(AbstractProvider):
Returns: Returns:
CreateResult: The result of the completion creation. CreateResult: The result of the completion creation.
""" """
loop = loop or get_event_loop() try:
coro = cls.create_async(model, messages, **kwargs) loop = asyncio.get_running_loop()
yield loop.run_until_complete(coro) if not hasattr(loop.__class__, "_nest_patched"):
raise NestAsyncioError(
'Use "create_async" instead of "create" function in a running event loop. Or use "nest_asyncio" package.'
)
except RuntimeError:
pass
yield asyncio.run(cls.create_async(model, messages, **kwargs))
@staticmethod @staticmethod
@abstractmethod @abstractmethod
@ -159,8 +164,6 @@ class AsyncGeneratorProvider(AsyncProvider):
model: str, model: str,
messages: Messages, messages: Messages,
stream: bool = True, stream: bool = True,
*,
loop: AbstractEventLoop = None,
**kwargs **kwargs
) -> CreateResult: ) -> CreateResult:
""" """
@ -177,7 +180,16 @@ class AsyncGeneratorProvider(AsyncProvider):
Returns: Returns:
CreateResult: The result of the streaming completion creation. CreateResult: The result of the streaming completion creation.
""" """
loop = loop or get_event_loop() try:
loop = asyncio.get_running_loop()
if not hasattr(loop.__class__, "_nest_patched"):
raise NestAsyncioError(
'Use "create_async" instead of "create" function in a running event loop. Or use "nest_asyncio" package.'
)
except RuntimeError:
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
generator = cls.create_async_generator(model, messages, stream=stream, **kwargs) generator = cls.create_async_generator(model, messages, stream=stream, **kwargs)
gen = generator.__aiter__() gen = generator.__aiter__()

3
g4f/errors.py
View File

@ -23,4 +23,7 @@ class RetryNoProviderError(Exception):
pass pass
class VersionNotFoundError(Exception): class VersionNotFoundError(Exception):
pass
class NestAsyncioError(Exception):
pass pass