0.0.2.6

2 files changed, 86 insertions, 60 deletions

diff --git a/testing/log_time.py b/testing/log_time.py
new file mode 100644
index 00000000..376ab86d
--- /dev/null
+++ b/testing/log_time.py
@@ -0,0 +1,25 @@
+from time import time
+
+
+async def log_time_async(method: callable, **kwargs):
+    start = time()
+    result = await method(**kwargs)
+    secs = f"{round(time() - start, 2)} secs"
+    if result:
+        return " ".join([result, secs])
+    return secs
+
+
+def log_time_yield(method: callable, **kwargs):
+    start = time()
+    result = yield from method(**kwargs)
+    yield f" {round(time() - start, 2)} secs"
+
+
+def log_time(method: callable, **kwargs):
+    start = time()
+    result = method(**kwargs)
+    secs = f"{round(time() - start, 2)} secs"
+    if result:
+        return " ".join([result, secs])
+    return secs
\ No newline at end of file
diff --git a/testing/test_needs_auth.py b/testing/test_needs_auth.py
index d44ed1df..eddb040a 100644
--- a/testing/test_needs_auth.py
+++ b/testing/test_needs_auth.py
@@ -1,95 +1,96 @@
 import sys
 from pathlib import Path
 import asyncio
-from time import time
 
 sys.path.append(str(Path(__file__).parent.parent))
 
 import g4f
+from  testing.log_time import log_time, log_time_async, log_time_yield
 
-providers = [g4f.Provider.OpenaiChat, g4f.Provider.Bard, g4f.Provider.Bing]
 
-# Async support
-async def log_time_async(method: callable, **kwargs):
-    start = time()
-    result = await method(**kwargs)
-    secs = f"{round(time() - start, 2)} secs"
-    if result:
-        return " ".join([result, secs])
-    return secs
+_providers = [
+    g4f.Provider.H2o,
+    g4f.Provider.You,
+    g4f.Provider.HuggingChat,
+    g4f.Provider.OpenAssistant,
+    g4f.Provider.Bing,
+    g4f.Provider.Bard
+]
 
-def log_time_yield(method: callable, **kwargs):
-    start = time()
-    result = yield from method(**kwargs)
-    yield f" {round(time() - start, 2)} secs"
+_instruct = "Hello, tell about you in one sentence."
+
+_example = """
+OpenaiChat: Hello! How can I assist you today? 2.0 secs
+Bard: Hello! How can I help you today? 3.44 secs
+Bing: Hello, this is Bing. How can I help? 😊 4.14 secs
+Async Total: 4.25 secs
+
+OpenaiChat: Hello! How can I assist you today? 1.85 secs
+Bard: Hello! How can I help you today? 3.38 secs
+Bing: Hello, this is Bing. How can I help? 😊 6.14 secs
+Stream Total: 11.37 secs
+
+OpenaiChat: Hello! How can I help you today? 3.28 secs
+Bard: Hello there! How can I help you today? 3.58 secs
+Bing: Hello! How can I help you today? 3.28 secs
+No Stream Total: 10.14 secs
+"""
+
+print("Yqcloud:", end="")
+for response in log_time_yield(
+    g4f.ChatCompletion.create,
+    model=g4f.models.gpt_35_turbo,
+    messages=[{"role": "user", "content": _instruct}],
+    provider=g4f.Provider.Yqcloud,
+    #cookies=g4f.get_cookies(".huggingface.co"),
+    stream=True,
+    auth=True
+):
+    print(response, end="")
+print()
+print()
 
-def log_time(method: callable, **kwargs):
-    start = time()
-    result = method(**kwargs)
-    secs = f"{round(time() - start, 2)} secs"
-    if result:
-        return " ".join([result, secs])
-    return secs
 
 async def run_async():
-    responses = []
-    for provider in providers:
-        responses.append(log_time_async(
+    responses = [
+        log_time_async(
             provider.create_async, 
             model=None,
-            messages=[{"role": "user", "content": "Hello"}],
-            log_time=True
-        ))
+            messages=[{"role": "user", "content": _instruct}],
+        )
+        for provider in _providers
+    ]
     responses = await asyncio.gather(*responses)
-    for idx, provider in enumerate(providers):
+    for idx, provider in enumerate(_providers):
         print(f"{provider.__name__}:", responses[idx])
 print("Async Total:", asyncio.run(log_time_async(run_async)))
+print()
+
 
-# Streaming support:
 def run_stream():
-    for provider in providers:
+    for provider in _providers:
         print(f"{provider.__name__}: ", end="")
         for response in log_time_yield(
             provider.create_completion,
             model=None,
-            messages=[{"role": "user", "content": "Hello"}],
+            messages=[{"role": "user", "content": _instruct}],
         ):
             print(response, end="")
         print()
 print("Stream Total:", log_time(run_stream))
+print()
+
 
-# No streaming support:
-def create_completion():
-    for provider in providers:
+def create_no_stream():
+    for provider in _providers:
         print(f"{provider.__name__}:", end=" ")
         for response in log_time_yield(
-            g4f.Provider.Bard.create_completion,
+            provider.create_completion,
             model=None,
-            messages=[{"role": "user", "content": "Hello"}],
+            messages=[{"role": "user", "content": _instruct}],
+            stream=False
         ):
             print(response, end="")
         print()
-print("No Stream Total:", log_time(create_completion))
-
-for response in g4f.Provider.Hugchat.create_completion(
-    model=None,
-    messages=[{"role": "user", "content": "Hello, tell about you."}],
-):
-    print("Hugchat:", response)
-
-"""
-OpenaiChat: Hello! How can I assist you today? 2.0 secs
-Bard: Hello! How can I help you today? 3.44 secs
-Bing: Hello, this is Bing. How can I help? 😊 4.14 secs
-Async Total: 4.25 secs
-
-OpenaiChat: Hello! How can I assist you today? 1.85 secs
-Bard: Hello! How can I help you today? 3.38 secs
-Bing: Hello, this is Bing. How can I help? 😊 6.14 secs
-Stream Total: 11.37 secs
-
-OpenaiChat: Hello! How can I help you today? 3.28 secs
-Bard: Hello there! How can I help you today? 3.58 secs
-Bing: Hello! How can I help you today? 3.28 secs
-No Stream Total: 10.14 secs
-"""
\ No newline at end of file
+print("No Stream Total:", log_time(create_no_stream))
+print()
\ No newline at end of file