From 55577031d556c613daae9ed174fd6c02f3d0dcaa Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner@lohaus.eu>
Date: Wed, 20 Sep 2023 14:52:50 +0200
Subject: Add check_running_loop requirement Add create_async function in
 ChatCompletion Use SelectorEventLoop on windows

---
 g4f/__init__.py | 80 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 29 deletions(-)

(limited to 'g4f/__init__.py')

diff --git a/g4f/__init__.py b/g4f/__init__.py
index a49e60e9..e42be8a8 100644
--- a/g4f/__init__.py
+++ b/g4f/__init__.py
@@ -1,11 +1,42 @@
 from __future__ import annotations
 from g4f        import models
-from .Provider  import BaseProvider
+from .Provider  import BaseProvider, AsyncProvider
 from .typing    import Any, CreateResult, Union
 import random
 
 logging = False
 
+def get_model_and_provider(model: Union[models.Model, str], provider: type[BaseProvider], stream: bool):
+    if isinstance(model, str):
+        if model in models.ModelUtils.convert:
+            model = models.ModelUtils.convert[model]
+        else:
+            raise Exception(f'The model: {model} does not exist')
+
+    if not provider:
+        if isinstance(model.best_provider, list):
+            if stream:
+                provider = random.choice([p for p in model.best_provider if p.supports_stream])
+            else:
+                provider = random.choice(model.best_provider)
+        else:
+            provider = model.best_provider
+
+    if not provider:
+        raise Exception(f'No provider found for model: {model}')
+    
+    if not provider.working:
+        raise Exception(f'{provider.__name__} is not working')
+    
+    if not provider.supports_stream and stream:
+        raise Exception(
+                f'ValueError: {provider.__name__} does not support "stream" argument')
+    
+    if logging:
+        print(f'Using {provider.__name__} provider')
+
+    return model, provider
+
 class ChatCompletion:
     @staticmethod
     def create(
@@ -13,28 +44,11 @@ class ChatCompletion:
         messages : list[dict[str, str]],
         provider : Union[type[BaseProvider], None] = None,
         stream   : bool                            = False,
-        auth     : Union[str, None]                = None, **kwargs: Any) -> Union[CreateResult, str]:
+        auth     : Union[str, None]                = None,
+        **kwargs
+    ) -> Union[CreateResult, str]:
 
-        if isinstance(model, str):
-            if model in models.ModelUtils.convert:
-                model = models.ModelUtils.convert[model]
-            else:
-                raise Exception(f'The model: {model} does not exist')
-
-        if not provider:
-            if isinstance(model.best_provider, list):
-                if stream:
-                    provider = random.choice([p for p in model.best_provider if p.supports_stream])
-                else:
-                    provider = random.choice(model.best_provider)
-            else:
-                provider = model.best_provider
-
-        if not provider:
-            raise Exception(f'No provider found')
-
-        if not provider.working:
-            raise Exception(f'{provider.__name__} is not working')
+        model, provider = get_model_and_provider(model, provider, stream)
 
         if provider.needs_auth and not auth:
             raise Exception(
@@ -43,12 +57,20 @@ class ChatCompletion:
         if provider.needs_auth:
             kwargs['auth'] = auth
 
-        if not provider.supports_stream and stream:
-            raise Exception(
-                f'ValueError: {provider.__name__} does not support "stream" argument')
-
-        if logging:
-            print(f'Using {provider.__name__} provider')
-
         result = provider.create_completion(model.name, messages, stream, **kwargs)
         return result if stream else ''.join(result)
+
+    @staticmethod
+    async def create_async(
+        model    : Union[models.Model, str],
+        messages : list[dict[str, str]],
+        provider : Union[type[BaseProvider], None] = None,
+        **kwargs
+    ) -> str:
+        
+        model, provider = get_model_and_provider(model, provider, False)
+
+        if not issubclass(provider, AsyncProvider):
+            raise Exception(f"Provider: {provider.__name__} doesn't support create_async")
+
+        return await provider.create_async(model.name, messages, **kwargs)
-- 
cgit v1.2.3


From e9f96ced9c534f313fd2d3b82b2464cd8424281a Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner@lohaus.eu>
Date: Thu, 21 Sep 2023 20:10:59 +0200
Subject: Add RetryProvider

---
 g4f/__init__.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'g4f/__init__.py')

diff --git a/g4f/__init__.py b/g4f/__init__.py
index e42be8a8..8fdfe21f 100644
--- a/g4f/__init__.py
+++ b/g4f/__init__.py
@@ -14,13 +14,7 @@ def get_model_and_provider(model: Union[models.Model, str], provider: type[BaseP
             raise Exception(f'The model: {model} does not exist')
 
     if not provider:
-        if isinstance(model.best_provider, list):
-            if stream:
-                provider = random.choice([p for p in model.best_provider if p.supports_stream])
-            else:
-                provider = random.choice(model.best_provider)
-        else:
-            provider = model.best_provider
+        provider = model.best_provider
 
     if not provider:
         raise Exception(f'No provider found for model: {model}')
@@ -70,7 +64,7 @@ class ChatCompletion:
         
         model, provider = get_model_and_provider(model, provider, False)
 
-        if not issubclass(provider, AsyncProvider):
+        if not issubclass(type(provider), AsyncProvider):
             raise Exception(f"Provider: {provider.__name__} doesn't support create_async")
 
         return await provider.create_async(model.name, messages, **kwargs)
-- 
cgit v1.2.3