summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorabc <98614666+xtekky@users.noreply.github.com>2023-10-19 21:25:13 +0200
committerabc <98614666+xtekky@users.noreply.github.com>2023-10-19 21:25:13 +0200
commit04edb6606512172262b33859a42d132012373d88 (patch)
treeb7f8ce9e0a28f2972fab317fdb9df59e6065d0c7
parent~ (diff)
downloadgpt4free-04edb6606512172262b33859a42d132012373d88.tar
gpt4free-04edb6606512172262b33859a42d132012373d88.tar.gz
gpt4free-04edb6606512172262b33859a42d132012373d88.tar.bz2
gpt4free-04edb6606512172262b33859a42d132012373d88.tar.lz
gpt4free-04edb6606512172262b33859a42d132012373d88.tar.xz
gpt4free-04edb6606512172262b33859a42d132012373d88.tar.zst
gpt4free-04edb6606512172262b33859a42d132012373d88.zip
-rw-r--r--g4f/gui/client/css/style.css3
-rw-r--r--g4f/gui/client/html/index.html42
-rw-r--r--g4f/gui/client/js/chat.v1.js (renamed from g4f/gui/client/js/chat.v2.js)80
-rw-r--r--g4f/gui/server/backend.py9
-rw-r--r--g4f/models.py11
5 files changed, 101 insertions, 44 deletions
diff --git a/g4f/gui/client/css/style.css b/g4f/gui/client/css/style.css
index e68b9094..59efeda0 100644
--- a/g4f/gui/client/css/style.css
+++ b/g4f/gui/client/css/style.css
@@ -627,13 +627,12 @@ ul {
}
}
-@media screen and (max-height: 640px) {
+@media screen and (max-height: 640px) and (min-width: 990px) {
body {
height: 87vh
}
}
-
.shown {
display: flex;
}
diff --git a/g4f/gui/client/html/index.html b/g4f/gui/client/html/index.html
index d6715ede..9dea5fe6 100644
--- a/g4f/gui/client/html/index.html
+++ b/g4f/gui/client/html/index.html
@@ -17,7 +17,7 @@
<link rel="manifest" href="/assets/img/site.webmanifest">
<script src="/assets/js/icons.js"></script>
<script src="/assets/js/highlightjs-copy.min.js"></script>
- <script src="/assets/js/chat.v2.js" defer></script>
+ <script src="/assets/js/chat.v1.js" defer></script>
<script src="https://cdn.jsdelivr.net/npm/markdown-it@13.0.1/dist/markdown-it.min.js"></script>
<link rel="stylesheet"
href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.7.0/build/styles/base16/dracula.min.css">
@@ -80,13 +80,12 @@
</button>
<div class="info">
<i class="fa-brands fa-telegram"></i>
- <span class="convo-title">telegram: <a href="https://t.me/g4f_official">@g4f_official</a><br>
+ <span class="convo-title">tele ~ <a href="https://t.me/g4f_official">@g4f_official</a>
</span>
</div>
<div class="info">
<i class="fa-brands fa-github"></i>
- <span class="convo-title">github: <a href="https://github.com/xtekky/gpt4free">@gpt4free</a><br>
- leave a star ; )
+ <span class="convo-title">github ~ <a href="https://github.com/xtekky/gpt4free">@gpt4free</a>
</span>
</div>
</div>
@@ -117,7 +116,40 @@
</div>
<div class="field">
<select name="model" id="model">
- <option value="gpt-3.5-turbo" selected>gpt-3.5-turbo</option>
+ <option value="gpt-3.5-turbo" selected="">gpt-3.5-turbo</option>
+ <option value="gpt-3.5-turbo-0613">gpt-3.5-turbo-0613</option>
+ <option value="gpt-3.5-turbo-16k">gpt-3.5-turbo-16k</option>
+ <option value="gpt-3.5-turbo-16k-0613">gpt-3.5-turbo-16k-0613</option>
+ <option value="gpt-4">gpt-4</option>
+ <option value="gpt-4-0613">gpt-4-0613</option>
+ <option value="gpt-4-32k">gpt-4-32k</option>
+ <option value="gpt-4-32k-0613">gpt-4-32k-0613</option>
+ <option value="palm2">palm2</option>
+ <option value="palm">palm</option>
+ <option value="google">google</option>
+ <option value="google-bard">google-bard</option>
+ <option value="google-palm">google-palm</option>
+ <option value="bard">bard</option>
+ <option value="falcon-40b">falcon-40b</option>
+ <option value="falcon-7b">falcon-7b</option>
+ <option value="llama-13b">llama-13b</option>
+ <option value="command-nightly">command-nightly</option>
+ <option value="gpt-neox-20b">gpt-neox-20b</option>
+ <option value="santacoder">santacoder</option>
+ <option value="bloom">bloom</option>
+ <option value="flan-t5-xxl">flan-t5-xxl</option>
+ <option value="code-davinci-002">code-davinci-002</option>
+ <option value="text-ada-001">text-ada-001</option>
+ <option value="text-babbage-001">text-babbage-001</option>
+ <option value="text-curie-001">text-curie-001</option>
+ <option value="text-davinci-002">text-davinci-002</option>
+ <option value="text-davinci-003">text-davinci-003</option>
+ <option value="llama70b-v2-chat">llama70b-v2-chat</option>
+ <option value="llama13b-v2-chat">llama13b-v2-chat</option>
+ <option value="llama7b-v2-chat">llama7b-v2-chat</option>
+ <option value="oasst-sft-1-pythia-12b">oasst-sft-1-pythia-12b</option>
+ <option value="oasst-sft-4-pythia-12b-epoch-3.5">oasst-sft-4-pythia-12b-epoch-3.5</option>
+ <option value="command-light-nightly">command-light-nightly</option>
</select>
</div>
<div class="field">
diff --git a/g4f/gui/client/js/chat.v2.js b/g4f/gui/client/js/chat.v1.js
index 5c1cbca8..233347ff 100644
--- a/g4f/gui/client/js/chat.v2.js
+++ b/g4f/gui/client/js/chat.v1.js
@@ -505,28 +505,6 @@ colorThemes.forEach((themeOption) => {
});
-(() => {
- let check = false;
- (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
-
- if (check) {
- container = document.querySelector(".row")
- container.removeChild(container.querySelector('.ads'))
- }
-})();
-
-setTimeout(() => {
- ads_div = document.querySelector('.ads')
-
- if (ads_div != null && ads_div.getElementsByTagName("iframe").length == 0) {
- ads_div.removeChild(ads_div.querySelector('.sorry'))
-
- ads_div.innerHTML += `
- Please disable your adblocker to support us. <br><br>Maintaining this website costs us a lot of time and money.
- `
- }
-}, 3000);
-
window.onload = async () => {
load_settings_localstorage();
setTheme();
@@ -550,7 +528,7 @@ window.onload = async () => {
}
}
- await load_models();
+ // await load_models();
await say_hello()
message_input.addEventListener(`keydown`, async (evt) => {
@@ -597,18 +575,56 @@ observer.observe(message_input, { attributes: true });
const load_models = async () => {
- models = localStorage.getItem('_models')
+ // models = localStorage.getItem('_models')
- if (models === null) {
- response = await fetch('/backend-api/v2/models')
- models = await response.json()
- localStorage.setItem('_models', JSON.stringify(models))
+ // if (models === null) {
+ // response = await fetch('/backend-api/v2/models')
+ // models = await response.json()
+ // localStorage.setItem('_models', JSON.stringify(models))
+
+ // } else {
+ // models = JSON.parse(models)
+ // }
+
+ models = [
+ "gpt-3.5-turbo",
+ "gpt-3.5-turbo-0613",
+ "gpt-3.5-turbo-16k",
+ "gpt-3.5-turbo-16k-0613",
+ "gpt-4",
+ "gpt-4-0613",
+ "gpt-4-32k",
+ "gpt-4-32k-0613",
+ "palm2",
+ "palm",
+ "google",
+ "google-bard",
+ "google-palm",
+ "bard",
+ "falcon-40b",
+ "falcon-7b",
+ "llama-13b",
+ "command-nightly",
+ "gpt-neox-20b",
+ "santacoder",
+ "bloom",
+ "flan-t5-xxl",
+ "code-davinci-002",
+ "text-ada-001",
+ "text-babbage-001",
+ "text-curie-001",
+ "text-davinci-002",
+ "text-davinci-003",
+ "llama70b-v2-chat",
+ "llama13b-v2-chat",
+ "llama7b-v2-chat",
+ "oasst-sft-1-pythia-12b",
+ "oasst-sft-4-pythia-12b-epoch-3.5",
+ "command-light-nightly"
+ ]
- } else {
- models = JSON.parse(models)
- }
-
let MODELS_SELECT = document.getElementById('model');
+
for (model of models) {
let model_info = document.createElement('option');
diff --git a/g4f/gui/server/backend.py b/g4f/gui/server/backend.py
index e2c445a5..ef18a61b 100644
--- a/g4f/gui/server/backend.py
+++ b/g4f/gui/server/backend.py
@@ -23,8 +23,17 @@ class Backend_Api:
'function': self._gen_title,
'methods': ['POST']
},
+ '/backend-api/v2/error': {
+ 'function': self.error,
+ 'methods': ['POST']
+ }
}
+ def error(self):
+ print(request.json)
+
+ return 'ok', 200
+
def models(self):
models = g4f._all_models
diff --git a/g4f/models.py b/g4f/models.py
index af4958cc..affc36ed 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -3,7 +3,6 @@ from dataclasses import dataclass
from .typing import Union
from .Provider import BaseProvider, RetryProvider
from .Provider import (
- AItianhuSpace,
ChatgptLogin,
ChatgptDemo,
ChatgptDuo,
@@ -11,7 +10,6 @@ from .Provider import (
Opchatgpts,
ChatgptAi,
GptChatly,
- AItianhu,
Liaobots,
Yqcloud,
GeekGpt,
@@ -30,6 +28,9 @@ from .Provider import (
Bing,
You,
H2o,
+
+ ChatForAi,
+ ChatBase
)
@dataclass(unsafe_hash=True)
@@ -60,7 +61,7 @@ gpt_35_long = Model(
best_provider = RetryProvider([
AiAsk, Aichat, ChatgptDemo, FreeGpt, Liaobots, You,
GPTalk, ChatgptLogin, GptChatly, GptForLove, Opchatgpts,
- NoowAi, GeekGpt
+ NoowAi, GeekGpt, Phind
])
)
@@ -69,8 +70,8 @@ gpt_35_turbo = Model(
name = 'gpt-3.5-turbo',
base_provider = 'openai',
best_provider = RetryProvider([
- GeekGpt, ChatgptLogin, ChatgptAi, GptGo,
- AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, FreeGpt, Ylokh
+ Aichat, ChatgptDemo, AiAsk, ChatForAi, GPTalk,
+ GptGo, You, Vercel, GptForLove, ChatBase, Bing
])
)