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

Fix unit tests

Browse source
This commit is contained in:
Heiner Lohaus 2024-11-26 23:38:48 +01:00
parent 4ae3d98df8
commit 16a11f991f
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
g4f/client/service.py
View file

@ -74,11 +74,13 @@ def get_model_and_provider(model : Union[Model, str],
if not provider:
raise ProviderNotFoundError(f'No provider found for model: {model}')
provider_name = provider.__name__ if hasattr(provider, "__name__") else type(provider).__name__
if isinstance(model, Model):
model = model.name
if not ignore_working and not provider.working:
raise ProviderNotWorkingError(f'{provider.__name__} is not working')
raise ProviderNotWorkingError(f"{provider_name} is not working")
if isinstance(provider, BaseRetryProvider):
if not ignore_working:
@ -87,12 +89,12 @@ def get_model_and_provider(model : Union[Model, str],
provider.providers = [p for p in provider.providers if p.__name__ not in ignored]
if not ignore_stream and not provider.supports_stream and stream:
raise StreamNotSupportedError(f'{provider.__name__} does not support "stream" argument')
raise StreamNotSupportedError(f'{provider_name} does not support "stream" argument')
if model:
debug.log(f'Using {type(provider).__name__} provider and {model} model')
debug.log(f'Using {provider_name} provider and {model} model')
else:
debug.log(f'Using {type(provider).__name__} provider')
debug.log(f'Using {provider_name} provider')
debug.last_provider = provider
debug.last_model = model
@ -115,7 +117,7 @@ def get_last_provider(as_dict: bool = False) -> Union[ProviderType, dict[str, st
if as_dict:
if last:
return {
"name": type(last).__name__,
"name": last.__name__ if hasattr(last, "__name__") else type(last).__name__,
"url": last.url,
"model": debug.last_model,
"label": getattr(last, "label", None) if hasattr(last, "label") else None