Fix unittests

This commit is contained in:
Heiner Lohaus 2024-04-06 01:18:45 +02:00
parent d44b39b31c
commit a4ca5773bd
4 changed files with 16 additions and 7 deletions

View File

@ -19,8 +19,8 @@ class TestChatCompletion(unittest.TestCase):
return ChatCompletion.create(g4f.models.default, DEFAULT_MESSAGES, AsyncProviderMock)
def test_exception(self):
if hasattr(asyncio, '_nest_patched'):
self.skipTest('asyncio is already patched')
if has_nest_asyncio:
self.skipTest('has nest_asyncio')
self.assertRaises(g4f.errors.NestAsyncioError, asyncio.run, self.run_exception())
def test_create(self):

View File

@ -1,6 +1,12 @@
import unittest
import json
try:
import nest_asyncio
has_nest_asyncio = True
except:
has_nest_asyncio = False
from g4f.client import Client, ChatCompletion
from g4f.Provider import Bing, OpenaiChat
@ -8,6 +14,9 @@ DEFAULT_MESSAGES = [{"role": "system", "content": 'Response in json, Example: {"
{"role": "user", "content": "Say success true in json"}]
class TestProviderIntegration(unittest.TestCase):
def setUp(self):
if not has_nest_asyncio:
self.skipTest("nest_asyncio is not installed")
def test_bing(self):
client = Client(provider=Bing)

View File

@ -22,15 +22,15 @@ class RetryNoProviderError(Exception):
class VersionNotFoundError(Exception):
...
class NestAsyncioError(Exception):
...
class ModelNotSupportedError(Exception):
...
class MissingRequirementsError(Exception):
...
class NestAsyncioError(MissingRequirementsError):
...
class MissingAuthError(Exception):
...

View File

@ -9,7 +9,7 @@ from inspect import signature, Parameter
from typing import Callable, Union
from ..typing import CreateResult, AsyncResult, Messages
from .types import BaseProvider, FinishReason
from ..errors import NestAsyncioError, ModelNotSupportedError, MissingRequirementsError
from ..errors import NestAsyncioError, ModelNotSupportedError
from .. import debug
if sys.version_info < (3, 10):
@ -30,7 +30,7 @@ def get_running_loop(check_nested: bool) -> Union[AbstractEventLoop, None]:
import nest_asyncio
nest_asyncio.apply(loop)
except ImportError:
raise MissingRequirementsError('Install "nest_asyncio" package')
raise NestAsyncioError('Install "nest_asyncio" package')
return loop
except RuntimeError:
pass