返回提交历史
Modified
docker/Dockerfile
+24
-11
Modified
etc/testing/_providers.py
+17
-28
Modified
g4f/__init__.py
+1
-1
Modified
g4f/gui/server/backend.py
+2
-1
XFEstudio/gpt4free
Fix permissions for chromedriver Fix NoVNC server access Remove java from build
e0aaad8f
代码差异
4 个文件
+44
-41
@@ -1,18 +1,22 @@
1
1
FROM selenium/node-chrome
2
2
3
ENV SE_SCREEN_WIDTH 1850
4
ENV PYTHONUNBUFFERED 1
5
ENV G4F_DIR /app
6
ENV G4F_LOGIN_URL http://localhost:7900/?autoconnect=1&resize=scale&password=secret
7
3
ARG G4F_VERSION
8
ENV G4F_VERSION ${G4F_VERSION}
9
ARG G4F_USER
10
ENV G4F_USER ${G4F_USER:-g4f}
11
ARG G4F_USER_ID
12
ENV G4F_USER_ID ${G4F_USER_ID:-1000}
4
ARG G4F_USER=g4f
5
ARG G4F_USER_ID=1000
13
6
ARG G4F_NO_GUI
7
ARG G4F_PASS=secret
8
9
ENV G4F_VERSION $G4F_VERSION
10
ENV G4F_USER $G4F_USER
11
ENV G4F_USER_ID $G4F_USER_ID
14
12
ENV G4F_NO_GUI $G4F_NO_GUI
13
14
ENV SE_SCREEN_WIDTH 1850
15
ENV PYTHONUNBUFFERED 1
16
ENV G4F_DIR /app
17
ENV G4F_LOGIN_URL http://localhost:7900/?autoconnect=1&resize=scale&password=$G4F_PASS
15
18
ENV HOME /home/$G4F_USER
19
ENV PATH $PATH:$HOME/.local/bin
16
20
ENV SE_DOWNLOAD_DIR $HOME/Downloads
17
21
ENV SEL_USER $G4F_USER
18
22
ENV SEL_UID $G4F_USER_ID
@@ -33,6 +37,9 @@ RUN apt-get -qqy update \
33
37
python-is-python3 \
34
38
pip
35
39
40
# Remove java
41
RUN apt-get -qyy remove openjdk-11-jre-headless
42
36
43
# Cleanup
37
44
RUN rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
38
45
&& apt-get -qyy autoremove \
@@ -51,16 +58,22 @@ RUN if [ "$G4F_NO_GUI" ] ; then \
51
58
COPY docker/background.png /usr/share/images/fluxbox/ubuntu-light.png
52
59
53
60
# Add user
54
RUN groupadd -g $G4F_USER_ID $G4F_USER
55
RUN useradd -rm -G sudo -u $G4F_USER_ID -g $G4F_USER_ID $G4F_USER
61
RUN groupadd -g $G4F_USER_ID $G4F_USER \
62
&& useradd -rm -G sudo -u $G4F_USER_ID -g $G4F_USER_ID $G4F_USER \
63
&& echo "${G4F_USER}:${G4F_PASS}" | chpasswd
56
64
57
65
# Fix permissions
58
66
RUN mkdir "${SE_DOWNLOAD_DIR}"
59
67
RUN chown "${G4F_USER_ID}:${G4F_USER_ID}" $SE_DOWNLOAD_DIR /var/run/supervisor /var/log/supervisor
68
RUN chown "${G4F_USER_ID}:${G4F_USER_ID}" -R /opt/bin/ /usr/bin/chromedriver /opt/selenium/
60
69
61
70
# Switch user
62
71
USER $G4F_USER_ID
63
72
73
# Set VNC password
74
RUN mkdir -p ${HOME}/.vnc \
75
&& x11vnc -storepasswd ${G4F_PASS} ${HOME}/.vnc/passwd
76
64
77
# Set the working directory in the container.
65
78
WORKDIR $G4F_DIR
66
79
@@ -4,24 +4,22 @@ from colorama import Fore, Style
4
4
5
5
sys.path.append(str(Path(__file__).parent.parent))
6
6
7
from g4f import BaseProvider, models, Provider
8
9
logging = False
7
from g4f import Provider, ProviderType, models
8
from g4f.Provider import __providers__
10
9
11
10
12
11
def main():
13
12
providers = get_providers()
14
13
failed_providers = []
15
14
16
for _provider in providers:
17
if _provider.needs_auth:
15
for provider in providers:
16
if provider.needs_auth:
18
17
continue
19
print("Provider:", _provider.__name__)
20
result = test(_provider)
18
print("Provider:", provider.__name__)
19
result = test(provider)
21
20
print("Result:", result)
22
if _provider.working and not result:
23
failed_providers.append(_provider)
24
21
if provider.working and not result:
22
failed_providers.append(provider)
25
23
print()
26
24
27
25
if failed_providers:
@@ -32,38 +30,29 @@ def main():
32
30
print(f"{Fore.GREEN + Style.BRIGHT}All providers are working")
33
31
34
32
35
def get_providers() -> list[type[BaseProvider]]:
36
providers = dir(Provider)
37
providers = [getattr(Provider, provider) for provider in providers if provider != "RetryProvider"]
38
providers = [provider for provider in providers if isinstance(provider, type) and hasattr(provider, "url")]
33
def get_providers() -> list[ProviderType]:
39
34
return [
40
35
provider
41
for provider in providers
42
if issubclass(provider, BaseProvider)
43
and provider.__name__ not in dir(Provider.deprecated)
36
for provider in __providers__
37
if provider.__name__ not in dir(Provider.deprecated)
44
38
and provider.__name__ not in dir(Provider.unfinished)
45
39
]
46
40
47
48
def create_response(_provider: type[BaseProvider]) -> str:
49
model = models.gpt_35_turbo.name if _provider.supports_gpt_35_turbo else models.default.name
50
response = _provider.create_completion(
51
model=model,
41
def create_response(provider: ProviderType) -> str:
42
response = provider.create_completion(
43
model=models.default.name,
52
44
messages=[{"role": "user", "content": "Hello, who are you? Answer in detail much as possible."}],
53
45
stream=False,
54
46
)
55
47
return "".join(response)
56
48
57
58
def test(_provider: type[BaseProvider]) -> bool:
49
def test(provider: ProviderType) -> bool:
59
50
try:
60
response = create_response(_provider)
51
response = create_response(provider)
61
52
assert type(response) is str
62
53
assert len(response) > 0
63
54
return response
64
except Exception as e:
65
if logging:
66
print(e)
55
except Exception:
67
56
return False
68
57
69
58
@@ -128,7 +128,7 @@ class Completion:
128
128
129
129
return result if stream else ''.join(result)
130
130
131
def get_last_provider(as_dict: bool = False) -> ProviderType:
131
def get_last_provider(as_dict: bool = False) -> Union[ProviderType, dict[str, str]]:
132
132
last = debug.last_provider
133
133
if isinstance(last, BaseRetryProvider):
134
134
last = last.last_provider
@@ -1,3 +1,4 @@
1
import logging
1
2
import g4f
2
3
from g4f.Provider import __providers__
3
4
@@ -94,10 +95,10 @@ class Backend_Api:
94
95
}) + "\n"
95
96
96
97
except Exception as e:
98
logging.exception(e)
97
99
yield json.dumps({
98
100
'type' : 'error',
99
101
'error': f'{e.__class__.__name__}: {e}'
100
102
})
101
raise e
102
103
103
104
return self.app.response_class(try_response(), mimetype='text/event-stream')