返回提交历史
Modified
g4f/gui/client/html/index.html
+0
-1
Modified
g4f/gui/client/js/chat.v1.js
+15
-4
Modified
g4f/providers/helper.py
+5
-1
XFEstudio/gpt4free
Improve filter_messages in gui Add rdns suport for proxies
02b84fb5
代码差异
3 个文件
+20
-6
@@ -173,7 +173,6 @@
173
173
<option value="">Provider: Auto</option>
174
174
<option value="Bing">Bing</option>
175
175
<option value="OpenaiChat">OpenaiChat</option>
176
<option value="HuggingChat">HuggingChat</option>
177
176
<option value="Gemini">Gemini</option>
178
177
<option value="Liaobots">Liaobots</option>
179
178
<option value="Phind">Phind</option>
@@ -121,6 +121,20 @@ const remove_cancel_button = async () => {
121
121
};
122
122
123
123
const filter_messages = (messages) => {
124
// Removes none user messages at end
125
let last_message;
126
while (last_message = new_messages.pop()) {
127
if (last_message["role"] == "user") {
128
new_messages.push(last_message);
129
break;
130
}
131
}
132
133
// Remove history, if it is selected
134
if (document.getElementById('history')?.checked) {
135
messages = [messages[messages.length-1]];
136
}
137
124
138
let new_messages = [];
125
139
for (i in messages) {
126
140
new_message = messages[i];
@@ -135,6 +149,7 @@ const filter_messages = (messages) => {
135
149
new_messages.push(new_message)
136
150
}
137
151
}
152
138
153
return new_messages;
139
154
}
140
155
@@ -143,10 +158,6 @@ const ask_gpt = async () => {
143
158
messages = await get_messages(window.conversation_id);
144
159
total_messages = messages.length;
145
160
146
// Remove history, if it is selected
147
if (document.getElementById('history')?.checked) {
148
messages = [messages[messages.length-1]];
149
}
150
161
messages = filter_messages(messages);
151
162
152
163
window.scrollTo(0, 0);
@@ -55,7 +55,11 @@ def get_connector(connector: BaseConnector = None, proxy: str = None) -> Optiona
55
55
if proxy and not connector:
56
56
try:
57
57
from aiohttp_socks import ProxyConnector
58
connector = ProxyConnector.from_url(proxy)
58
rdns = False
59
if proxy.startswith("socks5h://"):
60
proxy = proxy.replace("socks5h://", "socks5://")
61
rdns = True
62
connector = ProxyConnector.from_url(proxy, rdns=rdns)
59
63
except ImportError:
60
64
raise MissingRequirementsError('Install "aiohttp_socks" package for proxy support')
61
65
return connector