9 files changed, 81 insertions, 78 deletions

diff --git a/testing/forefront_test.py b/testing/forefront_test.py
index 4d5f4bc1..8d25ed89 100644
--- a/testing/forefront_test.py
+++ b/testing/forefront_test.py
@@ -1,10 +1,9 @@
-import forefront
+from openai_rev import forefront
 
 # create an account
 token = forefront.Account.create(logging=True)
 print(token)
 
 # get a response
-for response in forefront.StreamingCompletion.create(token=token,
-                                                     prompt='hello world', model='gpt-4'):
-    print(response.completion.choices[0].text, end='')
+for response in forefront.StreamingCompletion.create(token=token, prompt='hello world', model='gpt-4'):
+    print(response.text, end='')
diff --git a/testing/poe_account_create_test.py b/testing/poe_account_create_test.py
index 5d435b1f..7072597f 100644
--- a/testing/poe_account_create_test.py
+++ b/testing/poe_account_create_test.py
@@ -1,27 +1,28 @@
 from hashlib import md5
 from json import dumps
 from re import findall
+from typing import Optional
 
 from tls_client import Session as TLS
 from twocaptcha import TwoCaptcha
 
-from quora import extract_formkey
-from quora.mail import Emailnator
+from openai_rev.quora import extract_formkey
+from openai_rev.quora.mail import Emailnator
 
 solver = TwoCaptcha('72747bf24a9d89b4dcc1b24875efd358')
 
 
 class Account:
-    def create(proxy: None or str = None, logging: bool = False, enable_bot_creation: bool = False):
+    @staticmethod
+    def create(proxy: Optional[str] = None, logging: bool = False, enable_bot_creation: bool = False):
         client = TLS(client_identifier='chrome110')
-        client.proxies = {
-            'http': f'http://{proxy}',
-            'https': f'http://{proxy}'} if proxy else None
+        client.proxies = {'http': f'http://{proxy}', 'https': f'http://{proxy}'} if proxy else None
 
         mail_client = Emailnator()
         mail_address = mail_client.get_mail()
 
-        if logging: print('email', mail_address)
+        if logging:
+            print('email', mail_address)
 
         client.headers = {
             'authority': 'poe.com',
@@ -39,29 +40,30 @@ class Account:
             'sec-fetch-dest': 'empty',
             'sec-fetch-mode': 'cors',
             'sec-fetch-site': 'same-origin',
-            'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36'
+            'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36',
         }
 
         client.headers["poe-formkey"] = extract_formkey(client.get('https://poe.com/login').text)
         client.headers["poe-tchannel"] = client.get('https://poe.com/api/settings').json()['tchannelData']['channel']
 
         # token = reCaptchaV3('https://www.recaptcha.net/recaptcha/enterprise/anchor?ar=1&k=6LflhEElAAAAAI_ewVwRWI9hsyV4mbZnYAslSvlG&co=aHR0cHM6Ly9wb2UuY29tOjQ0Mw..&hl=en&v=4PnKmGB9wRHh1i04o7YUICeI&size=invisible&cb=bi6ivxoskyal')
-        token = solver.recaptcha(sitekey='6LflhEElAAAAAI_ewVwRWI9hsyV4mbZnYAslSvlG',
-                                 url='https://poe.com/login?redirect_url=%2F',
-                                 version='v3',
-                                 enterprise=1,
-                                 invisible=1,
-                                 action='login', )['code']
-
-        payload = dumps(separators=(',', ':'), obj={
-            'queryName': 'MainSignupLoginSection_sendVerificationCodeMutation_Mutation',
-            'variables': {
-                'emailAddress': mail_address,
-                'phoneNumber': None,
-                'recaptchaToken': token
+        token = solver.recaptcha(
+            sitekey='6LflhEElAAAAAI_ewVwRWI9hsyV4mbZnYAslSvlG',
+            url='https://poe.com/login?redirect_url=%2F',
+            version='v3',
+            enterprise=1,
+            invisible=1,
+            action='login',
+        )['code']
+
+        payload = dumps(
+            separators=(',', ':'),
+            obj={
+                'queryName': 'MainSignupLoginSection_sendVerificationCodeMutation_Mutation',
+                'variables': {'emailAddress': mail_address, 'phoneNumber': None, 'recaptchaToken': token},
+                'query': 'mutation MainSignupLoginSection_sendVerificationCodeMutation_Mutation(\n  $emailAddress: String\n  $phoneNumber: String\n  $recaptchaToken: String\n) {\n  sendVerificationCode(verificationReason: login, emailAddress: $emailAddress, phoneNumber: $phoneNumber, recaptchaToken: $recaptchaToken) {\n    status\n    errorMessage\n  }\n}\n',
             },
-            'query': 'mutation MainSignupLoginSection_sendVerificationCodeMutation_Mutation(\n  $emailAddress: String\n  $phoneNumber: String\n  $recaptchaToken: String\n) {\n  sendVerificationCode(verificationReason: login, emailAddress: $emailAddress, phoneNumber: $phoneNumber, recaptchaToken: $recaptchaToken) {\n    status\n    errorMessage\n  }\n}\n',
-        })
+        )
 
         base_string = payload + client.headers["poe-formkey"] + 'WpuLMiXEKKE98j56k'
         client.headers["poe-tag-id"] = md5(base_string.encode()).hexdigest()
@@ -74,31 +76,34 @@ class Account:
             print('please try using a proxy / wait for fix')
 
         if 'Bad Request' in response.text:
-            if logging: print('bad request, retrying...', response.json())
+            if logging:
+                print('bad request, retrying...', response.json())
             quit()
 
-        if logging: print('send_code', response.json())
+        if logging:
+            print('send_code', response.json())
 
         mail_content = mail_client.get_message()
         mail_token = findall(r';">(\d{6,7})</div>', mail_content)[0]
 
-        if logging: print('code', mail_token)
+        if logging:
+            print('code', mail_token)
 
-        payload = dumps(separators=(',', ':'), obj={
-            "queryName": "SignupOrLoginWithCodeSection_signupWithVerificationCodeMutation_Mutation",
-            "variables": {
-                "verificationCode": str(mail_token),
-                "emailAddress": mail_address,
-                "phoneNumber": None
+        payload = dumps(
+            separators=(',', ':'),
+            obj={
+                "queryName": "SignupOrLoginWithCodeSection_signupWithVerificationCodeMutation_Mutation",
+                "variables": {"verificationCode": str(mail_token), "emailAddress": mail_address, "phoneNumber": None},
+                "query": "mutation SignupOrLoginWithCodeSection_signupWithVerificationCodeMutation_Mutation(\n  $verificationCode: String!\n  $emailAddress: String\n  $phoneNumber: String\n) {\n  signupWithVerificationCode(verificationCode: $verificationCode, emailAddress: $emailAddress, phoneNumber: $phoneNumber) {\n    status\n    errorMessage\n  }\n}\n",
             },
-            "query": "mutation SignupOrLoginWithCodeSection_signupWithVerificationCodeMutation_Mutation(\n  $verificationCode: String!\n  $emailAddress: String\n  $phoneNumber: String\n) {\n  signupWithVerificationCode(verificationCode: $verificationCode, emailAddress: $emailAddress, phoneNumber: $phoneNumber) {\n    status\n    errorMessage\n  }\n}\n"
-        })
+        )
 
         base_string = payload + client.headers["poe-formkey"] + 'WpuLMiXEKKE98j56k'
         client.headers["poe-tag-id"] = md5(base_string.encode()).hexdigest()
 
         response = client.post('https://poe.com/api/gql_POST', data=payload)
-        if logging: print('verify_code', response.json())
+        if logging:
+            print('verify_code', response.json())
 
 
 Account.create(proxy='xtekky:wegwgwegwed_streaming-1@geo.iproyal.com:12321', logging=True)
diff --git a/testing/poe_test.py b/testing/poe_test.py
index 8d527879..809804f2 100644
--- a/testing/poe_test.py
+++ b/testing/poe_test.py
@@ -1,13 +1,11 @@
 from time import sleep
 
-import quora
+from  openai_rev import quora
 
 token = quora.Account.create(proxy=None, logging=True)
 print('token', token)
 
 sleep(2)
 
-for response in quora.StreamingCompletion.create(model='gpt-3.5-turbo',
-                                                 prompt='hello world',
-                                                 token=token):
-    print(response.completion.choices[0].text, end="", flush=True)
+for response in quora.StreamingCompletion.create(model='ChatGPT', prompt='hello world', token=token):
+    print(response.text, flush=True)
diff --git a/testing/quora_test_2.py b/testing/quora_test_2.py
index d5316946..5d06f9ed 100644
--- a/testing/quora_test_2.py
+++ b/testing/quora_test_2.py
@@ -1,17 +1,12 @@
-import quora
+from openai_rev import quora
 
 token = quora.Account.create(logging=True, enable_bot_creation=True)
 
 model = quora.Model.create(
-    token=token,
-    model='gpt-3.5-turbo',  # or claude-instant-v1.0
-    system_prompt='you are ChatGPT a large language model ...'
+    token=token, model='ChatGPT', system_prompt='you are ChatGPT a large language model ...'  # or claude-instant-v1.0
 )
 
 print(model.name)
 
-for response in quora.StreamingCompletion.create(
-        custom_model=model.name,
-        prompt='hello world',
-        token=token):
-    print(response.completion.choices[0].text)
+for response in quora.StreamingCompletion.create(custom_model=model.name, prompt='hello world', token=token):
+    print(response.text)
diff --git a/testing/sqlchat_test.py b/testing/sqlchat_test.py
index 577d85a6..1db71be2 100644
--- a/testing/sqlchat_test.py
+++ b/testing/sqlchat_test.py
@@ -1,6 +1,4 @@
 import sqlchat
 
-for response in sqlchat.StreamCompletion.create(
-        prompt='write python code to reverse a string',
-        messages=[]):
+for response in sqlchat.StreamCompletion.create(prompt='write python code to reverse a string', messages=[]):
     print(response.completion.choices[0].text, end='')
diff --git a/testing/t3nsor_test.py b/testing/t3nsor_test.py
index 1506a1b4..6d36400d 100644
--- a/testing/t3nsor_test.py
+++ b/testing/t3nsor_test.py
@@ -1,6 +1,4 @@
 import t3nsor
 
-for response in t3nsor.StreamCompletion.create(
-        prompt='write python code to reverse a string',
-        messages=[]):
+for response in t3nsor.StreamCompletion.create(prompt='write python code to reverse a string', messages=[]):
     print(response.completion.choices[0].text)
diff --git a/testing/test_main.py b/testing/test_main.py
new file mode 100644
index 00000000..612ec695
--- /dev/null
+++ b/testing/test_main.py
@@ -0,0 +1,24 @@
+from openai_rev import openai_rev, Provider, quora, forefront
+
+# usage You
+response = openai_rev.Completion.create(Provider.You, prompt='Write a poem on Lionel Messi')
+print(response)
+
+# usage Poe
+token = quora.Account.create(logging=False)
+response = openai_rev.Completion.create(
+    Provider.Poe, prompt='Write a poem on Lionel Messi', token=token, model='ChatGPT'
+)
+print(response)
+
+# usage forefront
+token = forefront.Account.create(logging=False)
+response = openai_rev.Completion.create(
+    Provider.ForeFront, prompt='Write a poem on Lionel Messi', model='gpt-4', token=token
+)
+print(response)
+print(f'END')
+
+# usage theb
+response = openai_rev.Completion.create(Provider.Theb, prompt='Write a poem on Lionel Messi')
+print(response)
diff --git a/testing/writesonic_test.py b/testing/writesonic_test.py
index 5c68bbe0..aff847f0 100644
--- a/testing/writesonic_test.py
+++ b/testing/writesonic_test.py
@@ -4,17 +4,14 @@ import writesonic
 # create account (3-4s)
 account = writesonic.Account.create(logging=True)
 
-# with loging: 
+# with loging:
 # 2023-04-06 21:50:25 INFO __main__ -> register success : '{"id":"51aa0809-3053-44f7-922a...' (2s)
 # 2023-04-06 21:50:25 INFO __main__ -> id : '51aa0809-3053-44f7-922a-2b85d8d07edf'
 # 2023-04-06 21:50:25 INFO __main__ -> token : 'eyJhbGciOiJIUzI1NiIsInR5cCI6Ik...'
 # 2023-04-06 21:50:28 INFO __main__ -> got key : '194158c4-d249-4be0-82c6-5049e869533c' (2s)
 
 # simple completion
-response = writesonic.Completion.create(
-    api_key=account.key,
-    prompt='hello world'
-)
+response = writesonic.Completion.create(api_key=account.key, prompt='hello world')
 
 print(response.completion.choices[0].text)  # Hello! How may I assist you today?
 
@@ -24,16 +21,7 @@ response = writesonic.Completion.create(
     api_key=account.key,
     prompt='what is my name ?',
     enable_memory=True,
-    history_data=[
-        {
-            'is_sent': True,
-            'message': 'my name is Tekky'
-        },
-        {
-            'is_sent': False,
-            'message': 'hello Tekky'
-        }
-    ]
+    history_data=[{'is_sent': True, 'message': 'my name is Tekky'}, {'is_sent': False, 'message': 'hello Tekky'}],
 )
 
 print(response.completion.choices[0].text)  # Your name is Tekky.
@@ -41,9 +29,7 @@ print(response.completion.choices[0].text)  # Your name is Tekky.
 # enable internet
 
 response = writesonic.Completion.create(
-    api_key=account.key,
-    prompt='who won the quatar world cup ?',
-    enable_google_results=True
+    api_key=account.key, prompt='who won the quatar world cup ?', enable_google_results=True
 )
 
 print(response.completion.choices[0].text)  # Argentina won the 2022 FIFA World Cup tournament held in Qatar ...
diff --git a/testing/you_test.py b/testing/you_test.py
index 6ba12f57..34800301 100644
--- a/testing/you_test.py
+++ b/testing/you_test.py
@@ -1,4 +1,4 @@
-import you
+from openai_rev import you
 
 # simple request with links and details
 response = you.Completion.create(prompt="hello world", detailed=True, include_links=True)