~ | Merge pull request #1098 from Lin-jun-xiang/show_retryProvider

Fix: debug.logging not work in retry provider

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()

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