From c617b18d12c2f9d82ce7c73aae46d353b83f625a Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <hlohaus@users.noreply.github.com>
Date: Mon, 1 Jan 2024 17:48:57 +0100
Subject: Add support for all models Add AbstractProvider class Add
 ProviderType type Add get_last_provider function Add version module and 
 VersionUtils Display used provider in gui Fix error response in api

---
 g4f/Provider/retry_provider.py | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'g4f/Provider/retry_provider.py')

diff --git a/g4f/Provider/retry_provider.py b/g4f/Provider/retry_provider.py
index e49b6da6..4d3e77ac 100644
--- a/g4f/Provider/retry_provider.py
+++ b/g4f/Provider/retry_provider.py
@@ -2,26 +2,13 @@ from __future__ import annotations
 
 import asyncio
 import random
-from typing import List, Type, Dict
 from ..typing import CreateResult, Messages
-from .base_provider import BaseProvider, AsyncProvider
+from ..base_provider import BaseRetryProvider
 from .. import debug
 from ..errors import RetryProviderError, RetryNoProviderError
 
 
-class RetryProvider(AsyncProvider):
-    __name__: str = "RetryProvider"
-    supports_stream: bool = True
-
-    def __init__(
-        self,
-        providers: List[Type[BaseProvider]],
-        shuffle: bool = True
-    ) -> None:
-        self.providers: List[Type[BaseProvider]] = providers
-        self.shuffle: bool = shuffle
-        self.working = True
-
+class RetryProvider(BaseRetryProvider):
     def create_completion(
         self,
         model: str,
@@ -36,20 +23,18 @@ class RetryProvider(AsyncProvider):
         if self.shuffle:
             random.shuffle(providers)
 
-        self.exceptions: Dict[str, Exception] = {}
+        self.exceptions = {}
         started: bool = False
         for provider in providers:
+            self.last_provider = provider
             try:
                 if debug.logging:
                     print(f"Using {provider.__name__} provider")
-                
                 for token in provider.create_completion(model, messages, stream, **kwargs):
                     yield token
                     started = True
-                
                 if started:
                     return
-                
             except Exception as e:
                 self.exceptions[provider.__name__] = e
                 if debug.logging:
@@ -69,8 +54,9 @@ class RetryProvider(AsyncProvider):
         if self.shuffle:
             random.shuffle(providers)
         
-        self.exceptions: Dict[str, Exception] = {}
+        self.exceptions = {}
         for provider in providers:
+            self.last_provider = provider
             try:
                 return await asyncio.wait_for(
                     provider.create_async(model, messages, **kwargs),
-- 
cgit v1.2.3