Skip to content

Commit

Permalink
refactored code
Browse files Browse the repository at this point in the history
  • Loading branch information
sudouser777 committed May 1, 2023
1 parent 1eefa09 commit 05494eb
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 39 deletions.
7 changes: 3 additions & 4 deletions gpt4free/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from gpt4free import forefront
from gpt4free import quora
from gpt4free import theb
from gpt4free import you
from gpt4free import usesless
from gpt4free import you


class Provider(Enum):
Expand All @@ -24,7 +24,6 @@ class Completion:

@staticmethod
def create(provider: Provider, prompt: str, **kwargs) -> str:

"""
Invokes the given provider with given prompt and addition arguments and returns the string response
Expand All @@ -47,10 +46,10 @@ def create(provider: Provider, prompt: str, **kwargs) -> str:
return Completion.__useless_service(prompt, **kwargs)
else:
raise Exception('Provider not exist, Please try again')

@staticmethod
def __useless_service(prompt: str, **kwargs) -> str:
return usesless.Completion.create(prompt = prompt, **kwargs)
return usesless.Completion.create(prompt=prompt, **kwargs)

@staticmethod
def __you_service(prompt: str, **kwargs) -> str:
Expand Down
16 changes: 6 additions & 10 deletions gpt4free/forefront/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from uuid import uuid4

from fake_useragent import UserAgent
from requests import post
from pymailtm import MailTm, Message
from requests import post
from tls_client import Session

from .typing import ForeFrontResponse
Expand Down Expand Up @@ -43,10 +43,7 @@ def create(proxy: Optional[str] = None, logging: bool = False):

response = client.post(
f'https://clerk.forefront.ai/v1/client/sign_ups/{trace_token}/prepare_verification?_clerk_js_version=4.38.4',
data={
'strategy': 'email_link',
'redirect_url': 'https://accounts.forefront.ai/sign-up/verify'
},
data={'strategy': 'email_link', 'redirect_url': 'https://accounts.forefront.ai/sign-up/verify'},
)

if logging:
Expand Down Expand Up @@ -93,14 +90,14 @@ def create(
action_type='new',
default_persona='607e41fe-95be-497e-8e97-010a59b2e2c0', # default
model='gpt-4',
proxy=None
proxy=None,
) -> Generator[ForeFrontResponse, None, None]:
if not token:
raise Exception('Token is required!')
if not chat_id:
chat_id = str(uuid4())

proxies = { 'http': 'http:https://' + proxy, 'https': 'http:https://' + proxy } if proxy else None
proxies = {'http': 'http:https://' + proxy, 'https': 'http:https://' + proxy} if proxy else None

headers = {
'authority': 'chat-server.tenant-forefront-default.knative.chi.coreweave.com',
Expand Down Expand Up @@ -168,7 +165,7 @@ def create(
action_type='new',
default_persona='607e41fe-95be-497e-8e97-010a59b2e2c0', # default
model='gpt-4',
proxy=None
proxy=None,
) -> ForeFrontResponse:
text = ''
final_response = None
Expand All @@ -179,7 +176,7 @@ def create(
action_type=action_type,
default_persona=default_persona,
model=model,
proxy=proxy
proxy=proxy,
):
if response:
final_response = response
Expand All @@ -191,4 +188,3 @@ def create(
raise Exception('Unable to get the response, Please try again')

return final_response

3 changes: 2 additions & 1 deletion gpt4free/forefront/typing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Any, List

from pydantic import BaseModel


Expand All @@ -22,4 +23,4 @@ class ForeFrontResponse(BaseModel):
model: str
choices: List[Choice]
usage: Usage
text: str
text: str
30 changes: 19 additions & 11 deletions gpt4free/quora/backup-mail.py
Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
from requests import Session
from time import sleep
from json import loads
from re import findall
from time import sleep

from requests import Session


class Mail:
def __init__(self) -> None:
self.client = Session()
self.client.post("https://etempmail.com/")
self.cookies = {'acceptcookie': 'true'}
self.cookies["ci_session"] = self.client.cookies.get_dict()["ci_session"]
self.email = None

def get_mail(self):
respone=self.client.post("https://etempmail.com/getEmailAddress")
#cookies
respone = self.client.post("https://etempmail.com/getEmailAddress")
# cookies
self.cookies["lisansimo"] = eval(respone.text)["recover_key"]
self.email = eval(respone.text)["address"]
return self.email

def get_message(self):
print("Waiting for message...")
while True:
sleep(5)
respone=self.client.post("https://etempmail.com/getInbox")
mail_token=loads(respone.text)
respone = self.client.post("https://etempmail.com/getInbox")
mail_token = loads(respone.text)
print(self.client.cookies.get_dict())
if len(mail_token) == 1:
break

params = {'id': '1',}
self.mail_context = self.client.post("https://etempmail.com/getInbox",params=params)

params = {
'id': '1',
}
self.mail_context = self.client.post("https://etempmail.com/getInbox", params=params)
self.mail_context = eval(self.mail_context.text)[0]["body"]
return self.mail_context
#,cookies=self.cookies

# ,cookies=self.cookies
def get_verification_code(self):
message = self.mail_context
code = findall(r';">(\d{6,7})</div>', message)[0]
print(f"Verification code: {code}")
return code
return code
4 changes: 2 additions & 2 deletions gpt4free/theb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Completion:
stream_completed = False

@staticmethod
def request(prompt: str, proxy: Optional[str]=None):
def request(prompt: str, proxy: Optional[str] = None):
headers = {
'authority': 'chatbot.theb.ai',
'content-type': 'application/json',
Expand All @@ -40,7 +40,7 @@ def request(prompt: str, proxy: Optional[str]=None):
Completion.stream_completed = True

@staticmethod
def create(prompt: str, proxy: Optional[str]=None) -> Generator[str, None, None]:
def create(prompt: str, proxy: Optional[str] = None) -> Generator[str, None, None]:
Thread(target=Completion.request, args=[prompt, proxy]).start()

while not Completion.stream_completed or not Completion.message_queue.empty():
Expand Down
9 changes: 5 additions & 4 deletions gpt4free/usesless/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import requests
import json

import requests


class Completion:
headers = {
Expand All @@ -24,7 +25,7 @@ def create(
model: str = "gpt-3.5-turbo",
):
print(parentMessageId, prompt)

json_data = {
"openaiKey": "",
"prompt": prompt,
Expand All @@ -42,14 +43,14 @@ def create(
url = "https://ai.usesless.com/api/chat-process"
request = requests.post(url, headers=Completion.headers, json=json_data)
content = request.content

response = Completion.__response_to_json(content)
return response

@classmethod
def __response_to_json(cls, text) -> dict:
text = str(text.decode("utf-8"))

split_text = text.rsplit("\n", 1)[1]
to_json = json.loads(split_text)
return to_json
4 changes: 2 additions & 2 deletions gpt4free/you/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ def create(
include_links: bool = False,
detailed: bool = False,
debug: bool = False,
proxy: Optional[str] = None
proxy: Optional[str] = None,
) -> PoeResponse:
if chat is None:
chat = []

proxies = { 'http': 'http:https://' + proxy, 'https': 'http:https://' + proxy } if proxy else {}
proxies = {'http': 'http:https://' + proxy, 'https': 'http:https://' + proxy} if proxy else {}

client = Session(client_identifier='chrome_108')
client.headers = Completion.__get_headers()
Expand Down
2 changes: 1 addition & 1 deletion testing/theb_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

for token in theb.Completion.create('hello world'):
print(token, end='', flush=True)
print('asdsos')
print('asdsos')
6 changes: 2 additions & 4 deletions testing/useless_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
print(f"Answer: {req['text']}")
message_id = req["id"]


import gpt4free

message_id = ""
Expand All @@ -20,8 +19,7 @@
if prompt == "!stop":
break

req = gpt4free.Completion.create(provider = gpt4free.Provider.UseLess,
prompt=prompt, parentMessageId=message_id)
req = gpt4free.Completion.create(provider=gpt4free.Provider.UseLess, prompt=prompt, parentMessageId=message_id)

print(f"Answer: {req['text']}")
message_id = req["id"]
message_id = req["id"]

0 comments on commit 05494eb

Please sign in to comment.