From 042ee7633b71b23ec67f22ece63d9d8b50a3d46b Mon Sep 17 00:00:00 2001 From: hs_junxiang Date: Thu, 19 Oct 2023 10:15:38 +0800 Subject: Fix: debug.logging not work in retry provider --- g4f/Provider/retry_provider.py | 11 +++++------ g4f/__init__.py | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/g4f/Provider/retry_provider.py b/g4f/Provider/retry_provider.py index 72170756..4ecfaffb 100644 --- a/g4f/Provider/retry_provider.py +++ b/g4f/Provider/retry_provider.py @@ -5,13 +5,13 @@ import random from typing import List, Type, Dict from ..typing import CreateResult, Messages from .base_provider import BaseProvider, AsyncProvider -from ..debug import logging class RetryProvider(AsyncProvider): __name__: str = "RetryProvider" working: bool = True supports_stream: bool = True + logging: bool = False def __init__( self, @@ -21,7 +21,6 @@ class RetryProvider(AsyncProvider): self.providers: List[Type[BaseProvider]] = providers self.shuffle: bool = shuffle - def create_completion( self, model: str, @@ -40,7 +39,7 @@ class RetryProvider(AsyncProvider): started: bool = False for provider in providers: try: - if logging: + if self.logging: print(f"Using {provider.__name__} provider") for token in provider.create_completion(model, messages, stream, **kwargs): yield token @@ -49,7 +48,7 @@ class RetryProvider(AsyncProvider): return except Exception as e: self.exceptions[provider.__name__] = e - if logging: + if self.logging: print(f"{provider.__name__}: {e.__class__.__name__}: {e}") if started: raise e @@ -72,11 +71,11 @@ class RetryProvider(AsyncProvider): return await asyncio.wait_for(provider.create_async(model, messages, **kwargs), timeout=60) except asyncio.TimeoutError as e: self.exceptions[provider.__name__] = e - if logging: + if self.logging: print(f"{provider.__name__}: TimeoutError: {e}") except Exception as e: self.exceptions[provider.__name__] = e - if logging: + if self.logging: print(f"{provider.__name__}: {e.__class__.__name__}: {e}") self.raise_exceptions() diff --git a/g4f/__init__.py b/g4f/__init__.py index e859dda5..492d4e5b 100644 --- a/g4f/__init__.py +++ b/g4f/__init__.py @@ -48,6 +48,7 @@ def get_model_and_provider(model : Union[Model, str], raise ValueError(f'{provider.__name__} does not support "stream" argument') if logging: + RetryProvider.logging = True print(f'Using {provider.__name__} provider') return model, provider -- cgit v1.2.3