mirror of https://github.com/xtekky/gpt4free.git
Compare commits
5 Commits
0c69a34b5b
...
431621b274
| Author | SHA1 | Date |
|---|---|---|
H Lohaus
|
431621b274 | |
|
Heiner Lohaus
|
c9c1aa121d | |
|
H Lohaus
|
10f25fdcaf | |
|
Heiner Lohaus
|
74c399d675 | |
|
Heiner Lohaus
|
cb695f58e8 |
59
README.md
59
README.md
|
|
@ -347,29 +347,29 @@ While we wait for gpt-5, here is a list of new models that are at least better t
|
|||
|
||||
### Other
|
||||
|
||||
| Website | Provider | GPT-3.5 | GPT-4 | Stream | Status | Auth |
|
||||
| ------ | ------- | ------- | ----- | ------ | ------ | ---- |
|
||||
| [openchat.team](https://openchat.team) | `g4f.Provider.Aura` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [blackbox.ai](https://www.blackbox.ai) | `g4f.Provider.Blackbox` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [cohereforai-c4ai-command-r-plus.hf.space](https://cohereforai-c4ai-command-r-plus.hf.space) | `g4f.Provider.Cohere` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [deepinfra.com](https://deepinfra.com) | `g4f.Provider.DeepInfra` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [free.chatgpt.org.uk](https://free.chatgpt.org.uk) | `g4f.Provider.FreeChatgpt` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [gemini.google.com](https://gemini.google.com) | `g4f.Provider.Gemini` | ❌ | ❌ | ✔️ |  | ✔️ |
|
||||
| [ai.google.dev](https://ai.google.dev) | `g4f.Provider.GeminiPro` | ❌ | ❌ | ✔️ |  | ✔️ |
|
||||
| [gemini-chatbot-sigma.vercel.app](https://gemini-chatbot-sigma.vercel.app) | `g4f.Provider.GeminiProChat` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [developers.sber.ru](https://developers.sber.ru/gigachat) | `g4f.Provider.GigaChat` | ❌ | ❌ | ✔️ |  | ✔️ |
|
||||
| [console.groq.com](https://console.groq.com/playground) | `g4f.Provider.Groq` | ❌ | ❌ | ✔️ |  | ✔️ |
|
||||
| [huggingface.co](https://huggingface.co/chat) | `g4f.Provider.HuggingChat` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [huggingface.co](https://huggingface.co/chat) | `g4f.Provider.HuggingFace` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [llama2.ai](https://www.llama2.ai) | `g4f.Provider.Llama` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [meta.ai](https://www.meta.ai) | `g4f.Provider.MetaAI` | ❌ | ❌ | ✔️ |  | ❌+✔️ |
|
||||
| [openrouter.ai](https://openrouter.ai) | `g4f.Provider.OpenRouter` | ❌ | ❌ | ✔️ |  | ✔️ |
|
||||
| [labs.perplexity.ai](https://labs.perplexity.ai) | `g4f.Provider.PerplexityLabs` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [pi.ai](https://pi.ai/talk) | `g4f.Provider.Pi` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [replicate.com](https://replicate.com) | `g4f.Provider.ReplicateImage` | ❌ | ❌ | ✔️ |  | ❌ |
|
||||
| [theb.ai](https://theb.ai) | `g4f.Provider.ThebApi` | ❌ | ❌ | ✔️ |  | ✔️ |
|
||||
| [whiterabbitneo.com](https://www.whiterabbitneo.com) | `g4f.Provider.WhiteRabbitNeo` | ❌ | ❌ | ✔️ |  | ✔️ |
|
||||
| [bard.google.com](https://bard.google.com) | `g4f.Provider.Bard` | ❌ | ❌ | ❌ |  | ✔️ |
|
||||
| Website | Provider | Stream | Status | Auth |
|
||||
| ------ | ------- | ------ | ------ | ---- |
|
||||
| [openchat.team](https://openchat.team) | `g4f.Provider.Aura`| ✔️ |  | ❌ |
|
||||
| [blackbox.ai](https://www.blackbox.ai) | `g4f.Provider.Blackbox`| ✔️ |  | ❌ |
|
||||
| [cohereforai-c4ai-command-r-plus.hf.space](https://cohereforai-c4ai-command-r-plus.hf.space) | `g4f.Provider.Cohere`| ✔️ |  | ❌ |
|
||||
| [deepinfra.com](https://deepinfra.com) | `g4f.Provider.DeepInfra`| ✔️ |  | ❌ |
|
||||
| [free.chatgpt.org.uk](https://free.chatgpt.org.uk) | `g4f.Provider.FreeChatgpt`| ✔️ |  | ❌ |
|
||||
| [gemini.google.com](https://gemini.google.com) | `g4f.Provider.Gemini`| ✔️ |  | ✔️ |
|
||||
| [ai.google.dev](https://ai.google.dev) | `g4f.Provider.GeminiPro`| ✔️ |  | ✔️ |
|
||||
| [gemini-chatbot-sigma.vercel.app](https://gemini-chatbot-sigma.vercel.app) | `g4f.Provider.GeminiProChat`| ✔️ |  | ❌ |
|
||||
| [developers.sber.ru](https://developers.sber.ru/gigachat) | `g4f.Provider.GigaChat`| ✔️ |  | ✔️ |
|
||||
| [console.groq.com](https://console.groq.com/playground) | `g4f.Provider.Groq`| ✔️ |  | ✔️ |
|
||||
| [huggingface.co](https://huggingface.co/chat) | `g4f.Provider.HuggingChat`| ✔️ |  | ❌ |
|
||||
| [huggingface.co](https://huggingface.co/chat) | `g4f.Provider.HuggingFace`| ✔️ |  | ❌ |
|
||||
| [llama2.ai](https://www.llama2.ai) | `g4f.Provider.Llama`| ✔️ |  | ❌ |
|
||||
| [meta.ai](https://www.meta.ai) | `g4f.Provider.MetaAI`| ✔️ |  | ❌ |
|
||||
| [openrouter.ai](https://openrouter.ai) | `g4f.Provider.OpenRouter`| ✔️ |  | ✔️ |
|
||||
| [labs.perplexity.ai](https://labs.perplexity.ai) | `g4f.Provider.PerplexityLabs`| ✔️ |  | ❌ |
|
||||
| [pi.ai](https://pi.ai/talk) | `g4f.Provider.Pi`| ✔️ |  | ❌ |
|
||||
| [replicate.com](https://replicate.com) | `g4f.Provider.Replicate`| ✔️ |  | ❌ |
|
||||
| [theb.ai](https://theb.ai) | `g4f.Provider.ThebApi`| ✔️ |  | ✔️ |
|
||||
| [whiterabbitneo.com](https://www.whiterabbitneo.com) | `g4f.Provider.WhiteRabbitNeo`| ✔️ |  | ✔️ |
|
||||
| [bard.google.com](https://bard.google.com) | `g4f.Provider.Bard`| ❌ |  | ✔️ |
|
||||
|
||||
### Models
|
||||
|
||||
|
|
@ -405,13 +405,13 @@ While we wait for gpt-5, here is a list of new models that are at least better t
|
|||
| Label | Provider | Image Model | Vision Model | Website |
|
||||
| ----- | -------- | ----------- | ------------ | ------- |
|
||||
| Microsoft Copilot in Bing | `g4f.Provider.Bing` | dall-e-3 | gpt-4-vision | [bing.com](https://bing.com/chat) |
|
||||
| DeepInfra | `g4f.Provider.DeepInfra` | stability-ai/sdxl| llava-1.5-7b-hf | [deepinfra.com](https://deepinfra.com) |
|
||||
| Gemini | `g4f.Provider.Gemini` | gemini| gemini | [gemini.google.com](https://gemini.google.com) |
|
||||
| Gemini API | `g4f.Provider.GeminiPro` | ❌| gemini-1.5-pro-latest | [ai.google.dev](https://ai.google.dev) |
|
||||
| Meta AI | `g4f.Provider.MetaAI` | meta| ❌ | [meta.ai](https://www.meta.ai) |
|
||||
| DeepInfra | `g4f.Provider.DeepInfra` | stability-ai/sdxl | llava-1.5-7b-hf | [deepinfra.com](https://deepinfra.com) |
|
||||
| Gemini | `g4f.Provider.Gemini` | ✔️ | ✔️ | [gemini.google.com](https://gemini.google.com) |
|
||||
| Gemini API | `g4f.Provider.GeminiPro` | ❌ | gemini-1.5-pro | [ai.google.dev](https://ai.google.dev) |
|
||||
| Meta AI | `g4f.Provider.MetaAI` | ✔️ | ❌ | [meta.ai](https://www.meta.ai) |
|
||||
| OpenAI ChatGPT | `g4f.Provider.OpenaiChat` | dall-e-3 | gpt-4-vision | [chat.openai.com](https://chat.openai.com) |
|
||||
| Replicate | `g4f.Provider.Replicate` | stability-ai/sdxl| ❌ | [replicate.com](https://replicate.com) |
|
||||
| You.com | `g4f.Provider.You` | dall-e| agent | [you.com](https://you.com) |
|
||||
| Replicate | `g4f.Provider.Replicate` | stability-ai/sdxl| llava-v1.6-34b | [replicate.com](https://replicate.com) |
|
||||
| You.com | `g4f.Provider.You` | dall-e-3| ✔️ | [you.com](https://you.com) |
|
||||
|
||||
## 🔗 Powered by gpt4free
|
||||
|
||||
|
|
@ -875,7 +875,6 @@ A list of all contributors is available [here](https://github.com/xtekky/gpt4fre
|
|||
- The [`Gemini.py`](g4f/Provider/needs_auth/Gemini.py) has input from [dsdanielpark/Gemini-API](https://github.com/dsdanielpark/Gemini-API)
|
||||
- The [`MetaAI.py`](g4f/Provider/MetaAI.py) file contains code from [meta-ai-api](https://github.com/Strvm/meta-ai-api) by [@Strvm](https://github.com/Strvm)
|
||||
|
||||
|
||||
*Having input implies that the AI's code generation utilized it as one of many sources.*
|
||||
|
||||
## ©️ Copyright
|
||||
|
|
|
|||
|
|
@ -73,13 +73,11 @@ COPY requirements.txt $G4F_DIR
|
|||
|
||||
# Upgrade pip for the latest features and install the project's Python dependencies.
|
||||
RUN pip install --break-system-packages --upgrade pip \
|
||||
&& pip install --break-system-packages -r requirements.txt
|
||||
|
||||
# Install selenium driver and uninstall webdriver
|
||||
RUN pip install --break-system-packages \
|
||||
&& pip install --break-system-packages -r requirements.txt \
|
||||
&& pip install --break-system-packages \
|
||||
undetected-chromedriver selenium-wire \
|
||||
&& pip uninstall -y --break-system-packages \
|
||||
webdriver plyer nodriver
|
||||
pywebview plyer
|
||||
|
||||
# Copy the entire package into the container.
|
||||
ADD --chown=$G4F_USER:$G4F_USER g4f $G4F_DIR/g4f
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ async def stream_generate(
|
|||
elif message.get('contentType') == "IMAGE":
|
||||
prompt = message.get('text')
|
||||
try:
|
||||
image_client = BingCreateImages(cookies, proxy)
|
||||
image_client = BingCreateImages(cookies, proxy, api_key)
|
||||
image_response = await image_client.create_async(prompt)
|
||||
except Exception as e:
|
||||
if debug.logging:
|
||||
|
|
|
|||
|
|
@ -19,9 +19,13 @@ class BingCreateImages(AsyncGeneratorProvider, ProviderModelMixin):
|
|||
needs_auth = True
|
||||
image_models = ["dall-e"]
|
||||
|
||||
def __init__(self, cookies: Cookies = None, proxy: str = None) -> None:
|
||||
self.cookies: Cookies = cookies
|
||||
self.proxy: str = proxy
|
||||
def __init__(self, cookies: Cookies = None, proxy: str = None, api_key: str = None) -> None:
|
||||
if api_key is not None:
|
||||
if cookies is None:
|
||||
cookies = {}
|
||||
cookies["_U"] = api_key
|
||||
self.cookies = cookies
|
||||
self.proxy = proxy
|
||||
|
||||
@classmethod
|
||||
async def create_async_generator(
|
||||
|
|
@ -33,9 +37,7 @@ class BingCreateImages(AsyncGeneratorProvider, ProviderModelMixin):
|
|||
proxy: str = None,
|
||||
**kwargs
|
||||
) -> AsyncResult:
|
||||
if api_key is not None:
|
||||
cookies = {"_U": api_key}
|
||||
session = BingCreateImages(cookies, proxy)
|
||||
session = BingCreateImages(cookies, proxy, api_key)
|
||||
yield await session.create_async(messages[-1]["content"])
|
||||
|
||||
def create(self, prompt: str) -> Iterator[Union[ImageResponse, str]]:
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ class HuggingChat(AsyncGeneratorProvider, ProviderModelMixin):
|
|||
'mistralai/Mistral-7B-Instruct-v0.2',
|
||||
'meta-llama/Meta-Llama-3-70B-Instruct'
|
||||
]
|
||||
model_aliases = {
|
||||
"mistralai/Mistral-7B-Instruct-v0.1": "mistralai/Mistral-7B-Instruct-v0.2"
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def get_models(cls):
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ REQUEST_HEADERS = {
|
|||
'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
|
||||
'x-same-domain': '1',
|
||||
}
|
||||
REQUEST_BL_PARAM = "boq_assistant-bard-web-server_20240201.08_p8"
|
||||
REQUEST_BL_PARAM = "boq_assistant-bard-web-server_20240421.18_p0"
|
||||
REQUEST_URL = "https://gemini.google.com/_/BardChatUi/data/assistant.lamda.BardFrontendService/StreamGenerate"
|
||||
UPLOAD_IMAGE_URL = "https://content-push.googleapis.com/upload/"
|
||||
UPLOAD_IMAGE_HEADERS = {
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ sessionUrl = "https://chat.openai.com/api/auth/session"
|
|||
chatArk: arkReq = None
|
||||
accessToken: str = None
|
||||
cookies: dict = None
|
||||
headers: dict = None
|
||||
|
||||
def readHAR():
|
||||
dirPath = "./"
|
||||
|
|
@ -130,7 +131,7 @@ def getN() -> str:
|
|||
return base64.b64encode(timestamp.encode()).decode()
|
||||
|
||||
async def getArkoseAndAccessToken(proxy: str) -> tuple[str, str, dict, dict]:
|
||||
global chatArk, accessToken, cookies
|
||||
global chatArk, accessToken, cookies, headers
|
||||
if chatArk is None or accessToken is None:
|
||||
chatArk, accessToken, cookies, headers = readHAR()
|
||||
if chatArk is None:
|
||||
|
|
|
|||
|
|
@ -101,4 +101,4 @@ async def get_telemetry_ids(proxy: str = None) -> list:
|
|||
|
||||
return [await get_telemetry_id() for _ in range(1)]
|
||||
finally:
|
||||
await browser.stop()
|
||||
await tab.close()
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
</div>
|
||||
<div class="field box">
|
||||
<label for="OpenaiAccount-api_key" class="label" title="">OpenAI ChatGPT:</label>
|
||||
<textarea id="OpenaiAccount-api_key" name="OpenaiAccount[api_key]" placeholder="access_key"></textarea>
|
||||
<textarea id="OpenaiAccount-api_key" name="OpenaiAccount[api_key]" class="OpenaiChat-api_key" placeholder="access_key"></textarea>
|
||||
</div>
|
||||
<div class="field box">
|
||||
<label for="OpenRouter-api_key" class="label" title="">OpenRouter:</label>
|
||||
|
|
@ -230,9 +230,10 @@
|
|||
<select name="provider" id="provider">
|
||||
<option value="">Provider: Auto</option>
|
||||
<option value="Bing">Bing</option>
|
||||
<option value="OpenaiChat">OpenaiChat</option>
|
||||
<option value="OpenaiChat">OpenAI ChatGPT</option>
|
||||
<option value="Gemini">Gemini</option>
|
||||
<option value="Liaobots">Liaobots</option>
|
||||
<option value="MetaAI">Meta AI</option>
|
||||
<option value="You">You</option>
|
||||
<option value="">----</option>
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -210,7 +210,9 @@ body {
|
|||
|
||||
.conversations .convo .fa-ellipsis-vertical {
|
||||
position: absolute;
|
||||
right: 14px;
|
||||
right: 8px;
|
||||
width: 14px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.conversations .convo .choise {
|
||||
|
|
@ -224,6 +226,10 @@ body {
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.bottom_buttons i {
|
||||
width: 14px;
|
||||
}
|
||||
|
||||
.convo-title {
|
||||
color: var(--colour-3);
|
||||
font-size: 14px;
|
||||
|
|
@ -232,9 +238,17 @@ body {
|
|||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
margin-right: 10px;
|
||||
background-color: transparent;
|
||||
border: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.convo-title .datetime {
|
||||
.convo-title:focus {
|
||||
outline: 1px solid var(--colour-3) !important;
|
||||
}
|
||||
|
||||
.convo .datetime {
|
||||
white-space: nowrap;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -482,12 +482,35 @@ const clear_conversation = async () => {
|
|||
}
|
||||
};
|
||||
|
||||
async function set_conversation_title(conversation_id, title) {
|
||||
conversation = await get_conversation(conversation_id)
|
||||
conversation.new_title = title;
|
||||
appStorage.setItem(
|
||||
`conversation:${conversation.id}`,
|
||||
JSON.stringify(conversation)
|
||||
);
|
||||
}
|
||||
|
||||
const show_option = async (conversation_id) => {
|
||||
const conv = document.getElementById(`conv-${conversation_id}`);
|
||||
const choi = document.getElementById(`cho-${conversation_id}`);
|
||||
|
||||
conv.style.display = "none";
|
||||
choi.style.display = "block";
|
||||
|
||||
const el = document.getElementById(`convo-${conversation_id}`);
|
||||
const trash_el = el.querySelector(".fa-trash");
|
||||
const title_el = el.querySelector("span.convo-title");
|
||||
if (title_el) {
|
||||
const left_el = el.querySelector(".left");
|
||||
const input_el = document.createElement("input");
|
||||
input_el.value = title_el.innerText;
|
||||
input_el.classList.add("convo-title");
|
||||
input_el.onfocus = () => trash_el.style.display = "none";
|
||||
input_el.onchange = () => set_conversation_title(conversation_id, input_el.value);
|
||||
left_el.removeChild(title_el);
|
||||
left_el.appendChild(input_el);
|
||||
}
|
||||
};
|
||||
|
||||
const hide_option = async (conversation_id) => {
|
||||
|
|
@ -496,6 +519,18 @@ const hide_option = async (conversation_id) => {
|
|||
|
||||
conv.style.display = "block";
|
||||
choi.style.display = "none";
|
||||
|
||||
const el = document.getElementById(`convo-${conversation_id}`);
|
||||
el.querySelector(".fa-trash").style.display = "";
|
||||
const input_el = el.querySelector("input.convo-title");
|
||||
if (input_el) {
|
||||
const left_el = el.querySelector(".left");
|
||||
const span_el = document.createElement("span");
|
||||
span_el.innerText = input_el.value;
|
||||
span_el.classList.add("convo-title");
|
||||
left_el.removeChild(input_el);
|
||||
left_el.appendChild(span_el);
|
||||
}
|
||||
};
|
||||
|
||||
const delete_conversation = async (conversation_id) => {
|
||||
|
|
@ -709,18 +744,15 @@ const load_conversations = async () => {
|
|||
|
||||
let html = "";
|
||||
conversations.forEach((conversation) => {
|
||||
if (conversation?.items.length > 0) {
|
||||
let old_value = conversation.title;
|
||||
if (conversation?.items.length > 0 && !conversation.new_title) {
|
||||
let new_value = (conversation.items[0]["content"]).trim();
|
||||
let new_lenght = new_value.indexOf("\n");
|
||||
new_lenght = new_lenght > 200 || new_lenght < 0 ? 200 : new_lenght;
|
||||
conversation.title = new_value.substring(0, new_lenght);
|
||||
if (conversation.title != old_value) {
|
||||
appStorage.setItem(
|
||||
`conversation:${conversation.id}`,
|
||||
JSON.stringify(conversation)
|
||||
);
|
||||
}
|
||||
conversation.new_title = new_value.substring(0, new_lenght);
|
||||
appStorage.setItem(
|
||||
`conversation:${conversation.id}`,
|
||||
JSON.stringify(conversation)
|
||||
);
|
||||
}
|
||||
let updated = "";
|
||||
if (conversation.updated) {
|
||||
|
|
@ -730,9 +762,10 @@ const load_conversations = async () => {
|
|||
}
|
||||
html += `
|
||||
<div class="convo" id="convo-${conversation.id}">
|
||||
<div class="left" onclick="set_conversation('${conversation.id}')">
|
||||
<div class="left">
|
||||
<i class="fa-regular fa-comments"></i>
|
||||
<span class="convo-title"><span class="datetime">${updated}</span> ${conversation.title}</span>
|
||||
<span class="datetime" onclick="set_conversation('${conversation.id}')">${updated}</span>
|
||||
<span class="convo-title" onclick="set_conversation('${conversation.id}')">${conversation.new_title}</span>
|
||||
</div>
|
||||
<i onclick="show_option('${conversation.id}')" class="fa-solid fa-ellipsis-vertical" id="conv-${conversation.id}"></i>
|
||||
<div id="cho-${conversation.id}" class="choise" style="display:none;">
|
||||
|
|
@ -1213,6 +1246,8 @@ async function load_provider_models(providerIndex=null) {
|
|||
}
|
||||
const provider = providerSelect.options[providerIndex].value;
|
||||
if (!provider) {
|
||||
modelProvider.classList.add("hidden");
|
||||
modelSelect.classList.remove("hidden");
|
||||
return;
|
||||
}
|
||||
const models = await api('models', provider);
|
||||
|
|
|
|||
Loading…
Reference in New Issue